From 138267c876fb56891835501fa201122c2bf4fd61 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sun, 27 Nov 2016 19:40:49 -0500 Subject: [PATCH 1/7] Switch generator logic to use pkg/apis/meta/v1 --- cmd/libs/go2idl/conversion-gen/main.go | 2 +- cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go | 2 +- hack/lib/swagger.sh | 2 +- hack/update-generated-swagger-docs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/libs/go2idl/conversion-gen/main.go b/cmd/libs/go2idl/conversion-gen/main.go index 23452d72866..80cca4030e4 100644 --- a/cmd/libs/go2idl/conversion-gen/main.go +++ b/cmd/libs/go2idl/conversion-gen/main.go @@ -56,7 +56,7 @@ func main() { ExtraPeerDirs: []string{ "k8s.io/kubernetes/pkg/api", "k8s.io/kubernetes/pkg/api/v1", - "k8s.io/kubernetes/pkg/api/unversioned", + "k8s.io/kubernetes/pkg/apis/meta/v1", "k8s.io/kubernetes/pkg/conversion", "k8s.io/kubernetes/pkg/runtime", }, diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go index ebce4d91d5f..4131c038ab6 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go @@ -65,7 +65,7 @@ func New() *Generator { `+k8s.io/kubernetes/pkg/runtime/schema`, `+k8s.io/kubernetes/pkg/runtime`, `+k8s.io/kubernetes/pkg/watch/versioned`, - `k8s.io/kubernetes/pkg/api/unversioned`, + `k8s.io/kubernetes/pkg/apis/meta/v1`, `k8s.io/kubernetes/pkg/api/v1`, `k8s.io/kubernetes/pkg/apis/policy/v1beta1`, `k8s.io/kubernetes/pkg/apis/extensions/v1beta1`, diff --git a/hack/lib/swagger.sh b/hack/lib/swagger.sh index 2759370c32a..70afb7b87a0 100644 --- a/hack/lib/swagger.sh +++ b/hack/lib/swagger.sh @@ -30,7 +30,7 @@ KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)" kube::swagger::gen_types_swagger_doc() { local group_version=$1 local gv_dir=$2 - local TMPFILE="/tmp/types_swagger_doc_generated.$(date +%s).go" + local TMPFILE="${TMPDIR:-/tmp}/types_swagger_doc_generated.$(date +%s).go" echo "Generating swagger type docs for ${group_version} at ${gv_dir}" diff --git a/hack/update-generated-swagger-docs.sh b/hack/update-generated-swagger-docs.sh index 12091c3d934..915190ef280 100755 --- a/hack/update-generated-swagger-docs.sh +++ b/hack/update-generated-swagger-docs.sh @@ -28,7 +28,7 @@ source "${KUBE_ROOT}/hack/lib/swagger.sh" kube::golang::setup_env -GROUP_VERSIONS=(unversioned ${KUBE_AVAILABLE_GROUP_VERSIONS}) +GROUP_VERSIONS=(${KUBE_AVAILABLE_GROUP_VERSIONS}) # To avoid compile errors, remove the currently existing files. for group_version in "${GROUP_VERSIONS[@]}"; do From a53d89a34a3b42fdf146fbb81ccaf0a766e53c3d Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Mon, 14 Nov 2016 21:46:06 -0500 Subject: [PATCH 2/7] staging fails on mac --- staging/copy.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/staging/copy.sh b/staging/copy.sh index caaf9234b2b..02a219d03da 100755 --- a/staging/copy.sh +++ b/staging/copy.sh @@ -17,6 +17,7 @@ set -o errexit set -o nounset set -o pipefail +set -x VERIFYONLY=false while getopts ":v" opt; do @@ -44,7 +45,8 @@ CLIENT_REPO_TEMP="${MAIN_REPO}/staging/src/${CLIENT_REPO_TEMP_FROM_SRC}" DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cleanup() { - rm -rf "${CLIENT_REPO_TEMP}" + ls "${CLIENT_REPO_TEMP}" + # rm -rf "${CLIENT_REPO_TEMP}" } trap cleanup EXIT SIGINT @@ -61,8 +63,8 @@ function mkcp() { echo "copying client packages" mkcp "pkg/client/clientset_generated/${CLIENTSET}" "pkg/client/clientset_generated" -mkcp "/pkg/client/record/" "/pkg/client" -mkcp "/pkg/client/cache/" "/pkg/client" +mkcp "/pkg/client/record" "/pkg/client" +mkcp "/pkg/client/cache" "/pkg/client" # TODO: make this test file not depending on pkg/client/unversioned rm "${CLIENT_REPO_TEMP}"/pkg/client/cache/listwatch_test.go mkcp "/pkg/client/restclient" "/pkg/client" @@ -86,7 +88,7 @@ GO15VENDOREXPERIMENT=1 godep save ./... popd > /dev/null echo "moving vendor/k8s.io/kubernetes" -cp -rn "${CLIENT_REPO_TEMP}"/vendor/k8s.io/kubernetes/. "${CLIENT_REPO_TEMP}"/ +cp -rn "${CLIENT_REPO_TEMP}"/vendor/k8s.io/kubernetes/ "${CLIENT_REPO_TEMP}"/ || true rm -rf "${CLIENT_REPO_TEMP}"/vendor/k8s.io/kubernetes # client-go will share the vendor of the main repo for now. When client-go # becomes a standalone repo, it will have its own vendor @@ -110,7 +112,7 @@ gofmt -w -r 'Scheme -> api.Scheme' "${CLIENT_REPO_TEMP}"/pkg/api/v1/ref.go sed -i 's/package api/package v1/g' "${CLIENT_REPO_TEMP}"/pkg/api/v1/ref.go # ref.go refers api.Scheme, so manually import /pkg/api sed -i "s,import (,import (\n\"${CLIENT_REPO_FROM_SRC}/pkg/api\",g" "${CLIENT_REPO_TEMP}"/pkg/api/v1/ref.go -gofmt -w "${CLIENT_REPO_TEMP}"/pkg/api/v1/ref.go +gofmt -w "${CLIENT_REPO_TEMP}"/pkg/api/v1/ref.go # rewrite pkg/client/record to v1 gofmt -w -r 'api.a -> v1.a' "${CLIENT_REPO_TEMP}"/pkg/client/record # need to call sed to rewrite the strings in test cases... @@ -173,7 +175,7 @@ mvfolder cmd/kubeadm/app/apis/kubeadm pkg/apis/kubeadm if [ "$(find "${CLIENT_REPO_TEMP}"/pkg/client -type f -name "*.go")" ]; then echo "${CLIENT_REPO_TEMP}/pkg/client is expected to be empty" exit 1 -else +else rm -r "${CLIENT_REPO_TEMP}"/pkg/client fi mvfolder third_party pkg/third_party From 3e43343815d78a43ba7cbdca8367ca7504e9d19b Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 3 Dec 2016 13:46:02 -0500 Subject: [PATCH 3/7] Use `xargs -n1 dirname` for greater bash compat on Mac --- hack/update-codegen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 03c49e9a57f..6c5126a3a73 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -87,7 +87,7 @@ pkg/api/v1 $( cd ${KUBE_ROOT} # because client-gen doesn't do policy/v1alpha1, we have to skip it too - find pkg/apis -name types.go | xargs dirname | sort | grep -v pkg.apis.policy.v1alpha1 + find pkg/apis -name types.go | xargs -n1 dirname | sort | grep -v pkg.apis.policy.v1alpha1 ) ) From 6536dcfdc2cc758f9ae0bec4b928cb91a0605570 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 3 Dec 2016 13:55:11 -0500 Subject: [PATCH 4/7] refactor: move pkg/api/unversioned to pkg/apis/meta/v1 --- pkg/{api/unversioned => apis/meta/v1}/BUILD | 0 pkg/{api/unversioned => apis/meta/v1}/OWNERS | 0 pkg/{api/unversioned => apis/meta/v1}/doc.go | 0 pkg/{api/unversioned => apis/meta/v1}/duration.go | 0 pkg/{api/unversioned => apis/meta/v1}/duration_test.go | 0 pkg/{api/unversioned => apis/meta/v1}/generated.pb.go | 0 pkg/{api/unversioned => apis/meta/v1}/generated.proto | 0 pkg/{api/unversioned => apis/meta/v1}/group_version.go | 0 pkg/{api/unversioned => apis/meta/v1}/group_version_test.go | 0 pkg/{api/unversioned => apis/meta/v1}/helpers.go | 0 pkg/{api/unversioned => apis/meta/v1}/helpers_test.go | 0 pkg/{api/unversioned => apis/meta/v1}/meta.go | 0 pkg/{api/unversioned => apis/meta/v1}/register.go | 0 pkg/{api/unversioned => apis/meta/v1}/time.go | 0 pkg/{api/unversioned => apis/meta/v1}/time_proto.go | 0 pkg/{api/unversioned => apis/meta/v1}/time_test.go | 0 pkg/{api/unversioned => apis/meta/v1}/types.go | 0 .../unversioned => apis/meta/v1}/types_swagger_doc_generated.go | 0 pkg/{api/unversioned => apis/meta/v1}/validation/BUILD | 0 pkg/{api/unversioned => apis/meta/v1}/validation/validation.go | 0 .../unversioned => apis/meta/v1}/validation/validation_test.go | 0 pkg/{api/unversioned => apis/meta/v1}/well_known_labels.go | 0 pkg/{api/unversioned => apis/meta/v1}/zz_generated.deepcopy.go | 0 23 files changed, 0 insertions(+), 0 deletions(-) rename pkg/{api/unversioned => apis/meta/v1}/BUILD (100%) rename pkg/{api/unversioned => apis/meta/v1}/OWNERS (100%) rename pkg/{api/unversioned => apis/meta/v1}/doc.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/duration.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/duration_test.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/generated.pb.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/generated.proto (100%) rename pkg/{api/unversioned => apis/meta/v1}/group_version.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/group_version_test.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/helpers.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/helpers_test.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/meta.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/register.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/time.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/time_proto.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/time_test.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/types.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/types_swagger_doc_generated.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/validation/BUILD (100%) rename pkg/{api/unversioned => apis/meta/v1}/validation/validation.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/validation/validation_test.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/well_known_labels.go (100%) rename pkg/{api/unversioned => apis/meta/v1}/zz_generated.deepcopy.go (100%) diff --git a/pkg/api/unversioned/BUILD b/pkg/apis/meta/v1/BUILD similarity index 100% rename from pkg/api/unversioned/BUILD rename to pkg/apis/meta/v1/BUILD diff --git a/pkg/api/unversioned/OWNERS b/pkg/apis/meta/v1/OWNERS similarity index 100% rename from pkg/api/unversioned/OWNERS rename to pkg/apis/meta/v1/OWNERS diff --git a/pkg/api/unversioned/doc.go b/pkg/apis/meta/v1/doc.go similarity index 100% rename from pkg/api/unversioned/doc.go rename to pkg/apis/meta/v1/doc.go diff --git a/pkg/api/unversioned/duration.go b/pkg/apis/meta/v1/duration.go similarity index 100% rename from pkg/api/unversioned/duration.go rename to pkg/apis/meta/v1/duration.go diff --git a/pkg/api/unversioned/duration_test.go b/pkg/apis/meta/v1/duration_test.go similarity index 100% rename from pkg/api/unversioned/duration_test.go rename to pkg/apis/meta/v1/duration_test.go diff --git a/pkg/api/unversioned/generated.pb.go b/pkg/apis/meta/v1/generated.pb.go similarity index 100% rename from pkg/api/unversioned/generated.pb.go rename to pkg/apis/meta/v1/generated.pb.go diff --git a/pkg/api/unversioned/generated.proto b/pkg/apis/meta/v1/generated.proto similarity index 100% rename from pkg/api/unversioned/generated.proto rename to pkg/apis/meta/v1/generated.proto diff --git a/pkg/api/unversioned/group_version.go b/pkg/apis/meta/v1/group_version.go similarity index 100% rename from pkg/api/unversioned/group_version.go rename to pkg/apis/meta/v1/group_version.go diff --git a/pkg/api/unversioned/group_version_test.go b/pkg/apis/meta/v1/group_version_test.go similarity index 100% rename from pkg/api/unversioned/group_version_test.go rename to pkg/apis/meta/v1/group_version_test.go diff --git a/pkg/api/unversioned/helpers.go b/pkg/apis/meta/v1/helpers.go similarity index 100% rename from pkg/api/unversioned/helpers.go rename to pkg/apis/meta/v1/helpers.go diff --git a/pkg/api/unversioned/helpers_test.go b/pkg/apis/meta/v1/helpers_test.go similarity index 100% rename from pkg/api/unversioned/helpers_test.go rename to pkg/apis/meta/v1/helpers_test.go diff --git a/pkg/api/unversioned/meta.go b/pkg/apis/meta/v1/meta.go similarity index 100% rename from pkg/api/unversioned/meta.go rename to pkg/apis/meta/v1/meta.go diff --git a/pkg/api/unversioned/register.go b/pkg/apis/meta/v1/register.go similarity index 100% rename from pkg/api/unversioned/register.go rename to pkg/apis/meta/v1/register.go diff --git a/pkg/api/unversioned/time.go b/pkg/apis/meta/v1/time.go similarity index 100% rename from pkg/api/unversioned/time.go rename to pkg/apis/meta/v1/time.go diff --git a/pkg/api/unversioned/time_proto.go b/pkg/apis/meta/v1/time_proto.go similarity index 100% rename from pkg/api/unversioned/time_proto.go rename to pkg/apis/meta/v1/time_proto.go diff --git a/pkg/api/unversioned/time_test.go b/pkg/apis/meta/v1/time_test.go similarity index 100% rename from pkg/api/unversioned/time_test.go rename to pkg/apis/meta/v1/time_test.go diff --git a/pkg/api/unversioned/types.go b/pkg/apis/meta/v1/types.go similarity index 100% rename from pkg/api/unversioned/types.go rename to pkg/apis/meta/v1/types.go diff --git a/pkg/api/unversioned/types_swagger_doc_generated.go b/pkg/apis/meta/v1/types_swagger_doc_generated.go similarity index 100% rename from pkg/api/unversioned/types_swagger_doc_generated.go rename to pkg/apis/meta/v1/types_swagger_doc_generated.go diff --git a/pkg/api/unversioned/validation/BUILD b/pkg/apis/meta/v1/validation/BUILD similarity index 100% rename from pkg/api/unversioned/validation/BUILD rename to pkg/apis/meta/v1/validation/BUILD diff --git a/pkg/api/unversioned/validation/validation.go b/pkg/apis/meta/v1/validation/validation.go similarity index 100% rename from pkg/api/unversioned/validation/validation.go rename to pkg/apis/meta/v1/validation/validation.go diff --git a/pkg/api/unversioned/validation/validation_test.go b/pkg/apis/meta/v1/validation/validation_test.go similarity index 100% rename from pkg/api/unversioned/validation/validation_test.go rename to pkg/apis/meta/v1/validation/validation_test.go diff --git a/pkg/api/unversioned/well_known_labels.go b/pkg/apis/meta/v1/well_known_labels.go similarity index 100% rename from pkg/api/unversioned/well_known_labels.go rename to pkg/apis/meta/v1/well_known_labels.go diff --git a/pkg/api/unversioned/zz_generated.deepcopy.go b/pkg/apis/meta/v1/zz_generated.deepcopy.go similarity index 100% rename from pkg/api/unversioned/zz_generated.deepcopy.go rename to pkg/apis/meta/v1/zz_generated.deepcopy.go From 5df8cc39c98fa10129f137b2e44482204c133175 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 3 Dec 2016 13:57:26 -0500 Subject: [PATCH 5/7] refactor: generated --- cmd/kube-controller-manager/app/options/BUILD | 2 +- .../app/options/options.go | 28 +- cmd/kubeadm/app/apis/kubeadm/BUILD | 2 +- cmd/kubeadm/app/apis/kubeadm/register.go | 4 +- cmd/kubeadm/app/apis/kubeadm/types.go | 8 +- cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD | 2 +- .../app/apis/kubeadm/v1alpha1/register.go | 4 +- .../app/apis/kubeadm/v1alpha1/types.go | 8 +- cmd/kubeadm/app/master/BUILD | 2 +- cmd/kubeadm/app/master/apiclient.go | 12 +- cmd/kubeadm/app/master/manifests.go | 4 +- cmd/kubeadm/app/node/BUILD | 2 +- cmd/kubeadm/app/node/bootstrap_test.go | 20 +- .../discoverysummarizer/BUILD | 2 +- .../apis/config/v1alpha1/types.go | 2 +- .../discoverysummarizer.go | 20 +- .../client-gen/test_apis/testgroup/BUILD | 2 +- .../test_apis/testgroup/types.generated.go | 2 +- .../client-gen/test_apis/testgroup/types.go | 8 +- .../client-gen/test_apis/testgroup/v1/BUILD | 2 +- .../test_apis/testgroup/v1/register.go | 6 +- .../test_apis/testgroup/v1/types.generated.go | 2 +- .../test_apis/testgroup/v1/types.go | 8 +- .../go2idl/go-to-protobuf/protobuf/cmd.go | 2 +- federation/apis/core/BUILD | 2 +- federation/apis/core/conversion.go | 2 +- federation/apis/core/register.go | 16 +- federation/apis/core/v1/BUILD | 2 +- federation/apis/core/v1/register.go | 4 +- federation/apis/federation/BUILD | 2 +- federation/apis/federation/install/BUILD | 2 +- .../apis/federation/install/install_test.go | 4 +- federation/apis/federation/types.generated.go | 2 +- federation/apis/federation/types.go | 12 +- federation/apis/federation/v1beta1/BUILD | 2 +- .../apis/federation/v1beta1/register.go | 4 +- .../federation/v1beta1/types.generated.go | 2 +- federation/apis/federation/v1beta1/types.go | 12 +- federation/client/cache/cluster_cache.go | 2 +- .../app/options/BUILD | 2 +- .../app/options/options.go | 6 +- .../pkg/federation-controller/cluster/BUILD | 4 +- .../cluster/cluster_client.go | 12 +- .../cluster/clustercontroller_test.go | 8 +- .../pkg/federation-controller/daemonset/BUILD | 2 +- .../daemonset/daemonset_controller_test.go | 4 +- .../pkg/federation-controller/namespace/BUILD | 2 +- .../namespace/namespace_controller_test.go | 4 +- .../util/podanalyzer/BUILD | 4 +- .../util/podanalyzer/pod_helper.go | 6 +- .../util/podanalyzer/pod_helper_test.go | 6 +- federation/pkg/kubefed/BUILD | 2 +- federation/pkg/kubefed/init/BUILD | 2 +- federation/pkg/kubefed/init/init_test.go | 16 +- federation/pkg/kubefed/join_test.go | 4 +- federation/pkg/kubefed/unjoin_test.go | 6 +- pkg/api/BUILD | 6 +- pkg/api/conversion.go | 20 +- pkg/api/deep_copy_test.go | 8 +- pkg/api/defaulting_test.go | 4 +- pkg/api/errors/BUILD | 4 +- pkg/api/errors/errors.go | 180 +- pkg/api/errors/errors_test.go | 74 +- pkg/api/events/BUILD | 2 +- pkg/api/events/sorted_event_list_test.go | 14 +- pkg/api/helpers.go | 12 +- pkg/api/install/BUILD | 2 +- pkg/api/install/install_test.go | 6 +- pkg/api/meta.go | 16 +- pkg/api/meta/BUILD | 4 +- pkg/api/meta/interfaces.go | 14 +- pkg/api/meta/meta.go | 20 +- pkg/api/meta/meta_test.go | 14 +- pkg/api/meta/scheme_test.go | 18 +- pkg/api/meta_test.go | 4 +- pkg/api/ref_test.go | 10 +- pkg/api/register.go | 14 +- pkg/api/resource_helpers.go | 6 +- pkg/api/resource_helpers_test.go | 8 +- pkg/api/rest/BUILD | 2 +- pkg/api/rest/delete.go | 6 +- pkg/api/rest/rest.go | 4 +- pkg/api/rest/resttest/BUILD | 2 +- pkg/api/rest/resttest/resttest.go | 12 +- pkg/api/serialization_test.go | 12 +- pkg/api/testapi/BUILD | 2 +- pkg/api/testapi/testapi_test.go | 12 +- pkg/api/testing/BUILD | 2 +- pkg/api/testing/fuzzer.go | 14 +- pkg/api/types.generated.go | 2 +- pkg/api/types.go | 162 +- pkg/api/unversioned/BUILD | 26 + pkg/api/unversioned/duration.go | 47 + pkg/api/unversioned/time.go | 176 + pkg/api/unversioned/types.go | 60 + pkg/api/v1/BUILD | 6 +- pkg/api/v1/conversion_test.go | 4 +- pkg/api/v1/generated.pb.go | 2 +- pkg/api/v1/meta.go | 10 +- pkg/api/v1/register.go | 6 +- pkg/api/v1/resource_helpers.go | 6 +- pkg/api/v1/resource_helpers_test.go | 8 +- pkg/api/v1/types.generated.go | 2 +- pkg/api/v1/types.go | 162 +- pkg/api/v1/zz_generated.conversion.go | 22 +- pkg/api/v1/zz_generated.deepcopy.go | 16 +- pkg/api/validation/BUILD | 4 +- pkg/api/validation/validation.go | 2 +- pkg/api/validation/validation_test.go | 44 +- pkg/api/zz_generated.deepcopy.go | 16 +- pkg/apis/abac/BUILD | 2 +- pkg/apis/abac/types.go | 4 +- pkg/apis/abac/v0/BUILD | 2 +- pkg/apis/abac/v0/types.go | 4 +- pkg/apis/abac/v1beta1/BUILD | 2 +- pkg/apis/abac/v1beta1/types.go | 4 +- pkg/apis/apps/BUILD | 2 +- pkg/apis/apps/types.generated.go | 2 +- pkg/apis/apps/types.go | 10 +- pkg/apis/apps/v1beta1/BUILD | 2 +- pkg/apis/apps/v1beta1/conversion.go | 6 +- pkg/apis/apps/v1beta1/defaults.go | 4 +- pkg/apis/apps/v1beta1/generated.pb.go | 2 +- pkg/apis/apps/v1beta1/register.go | 4 +- pkg/apis/apps/v1beta1/types.generated.go | 2 +- pkg/apis/apps/v1beta1/types.go | 10 +- .../apps/v1beta1/zz_generated.conversion.go | 14 +- .../apps/v1beta1/zz_generated.deepcopy.go | 6 +- pkg/apis/apps/validation/BUILD | 6 +- pkg/apis/apps/validation/validation.go | 6 +- pkg/apis/apps/validation/validation_test.go | 48 +- pkg/apis/apps/zz_generated.deepcopy.go | 6 +- pkg/apis/authentication/BUILD | 2 +- pkg/apis/authentication/register.go | 4 +- pkg/apis/authentication/types.generated.go | 2 +- pkg/apis/authentication/types.go | 4 +- pkg/apis/authentication/v1beta1/BUILD | 2 +- pkg/apis/authentication/v1beta1/register.go | 4 +- .../authentication/v1beta1/types.generated.go | 2 +- pkg/apis/authentication/v1beta1/types.go | 4 +- pkg/apis/authorization/BUILD | 2 +- pkg/apis/authorization/types.generated.go | 2 +- pkg/apis/authorization/types.go | 8 +- pkg/apis/authorization/v1beta1/BUILD | 2 +- pkg/apis/authorization/v1beta1/register.go | 4 +- .../authorization/v1beta1/types.generated.go | 2 +- pkg/apis/authorization/v1beta1/types.go | 8 +- pkg/apis/autoscaling/BUILD | 2 +- pkg/apis/autoscaling/types.generated.go | 2 +- pkg/apis/autoscaling/types.go | 12 +- pkg/apis/autoscaling/v1/BUILD | 2 +- pkg/apis/autoscaling/v1/generated.pb.go | 2 +- pkg/apis/autoscaling/v1/register.go | 4 +- pkg/apis/autoscaling/v1/types.generated.go | 2 +- pkg/apis/autoscaling/v1/types.go | 12 +- .../autoscaling/v1/zz_generated.conversion.go | 6 +- .../autoscaling/v1/zz_generated.deepcopy.go | 4 +- pkg/apis/autoscaling/zz_generated.deepcopy.go | 4 +- pkg/apis/batch/BUILD | 2 +- pkg/apis/batch/types.generated.go | 2 +- pkg/apis/batch/types.go | 28 +- pkg/apis/batch/v1/BUILD | 2 +- pkg/apis/batch/v1/generated.pb.go | 2 +- pkg/apis/batch/v1/register.go | 4 +- pkg/apis/batch/v1/types.generated.go | 2 +- pkg/apis/batch/v1/types.go | 18 +- pkg/apis/batch/v1/zz_generated.conversion.go | 14 +- pkg/apis/batch/v1/zz_generated.deepcopy.go | 10 +- pkg/apis/batch/v2alpha1/BUILD | 2 +- pkg/apis/batch/v2alpha1/generated.pb.go | 2 +- pkg/apis/batch/v2alpha1/types.generated.go | 2 +- pkg/apis/batch/v2alpha1/types.go | 28 +- .../batch/v2alpha1/zz_generated.conversion.go | 28 +- .../batch/v2alpha1/zz_generated.deepcopy.go | 12 +- pkg/apis/batch/validation/BUILD | 6 +- pkg/apis/batch/validation/validation.go | 8 +- pkg/apis/batch/validation/validation_test.go | 14 +- pkg/apis/batch/zz_generated.deepcopy.go | 12 +- pkg/apis/certificates/BUILD | 2 +- pkg/apis/certificates/types.generated.go | 2 +- pkg/apis/certificates/types.go | 10 +- pkg/apis/certificates/v1alpha1/BUILD | 2 +- pkg/apis/certificates/v1alpha1/register.go | 4 +- .../certificates/v1alpha1/types.generated.go | 2 +- pkg/apis/certificates/v1alpha1/types.go | 10 +- pkg/apis/componentconfig/BUILD | 2 +- pkg/apis/componentconfig/types.generated.go | 2 +- pkg/apis/componentconfig/types.go | 82 +- pkg/apis/componentconfig/v1alpha1/BUILD | 2 +- pkg/apis/componentconfig/v1alpha1/defaults.go | 50 +- pkg/apis/componentconfig/v1alpha1/types.go | 52 +- pkg/apis/extensions/BUILD | 2 +- pkg/apis/extensions/register.go | 4 +- pkg/apis/extensions/types.generated.go | 2 +- pkg/apis/extensions/types.go | 78 +- pkg/apis/extensions/v1beta1/BUILD | 4 +- pkg/apis/extensions/v1beta1/conversion.go | 8 +- pkg/apis/extensions/v1beta1/defaults.go | 10 +- pkg/apis/extensions/v1beta1/defaults_test.go | 28 +- pkg/apis/extensions/v1beta1/generated.pb.go | 2 +- pkg/apis/extensions/v1beta1/register.go | 4 +- .../extensions/v1beta1/types.generated.go | 2 +- pkg/apis/extensions/v1beta1/types.go | 98 +- .../v1beta1/zz_generated.conversion.go | 76 +- .../v1beta1/zz_generated.deepcopy.go | 34 +- pkg/apis/extensions/validation/BUILD | 6 +- pkg/apis/extensions/validation/validation.go | 10 +- .../extensions/validation/validation_test.go | 164 +- pkg/apis/extensions/zz_generated.deepcopy.go | 28 +- pkg/apis/imagepolicy/BUILD | 2 +- pkg/apis/imagepolicy/register.go | 4 +- pkg/apis/imagepolicy/types.generated.go | 2 +- pkg/apis/imagepolicy/types.go | 4 +- pkg/apis/imagepolicy/v1alpha1/BUILD | 2 +- pkg/apis/imagepolicy/v1alpha1/register.go | 4 +- .../imagepolicy/v1alpha1/types.generated.go | 2 +- pkg/apis/imagepolicy/v1alpha1/types.go | 4 +- pkg/apis/meta/v1/doc.go | 3 +- pkg/apis/meta/v1/duration.go | 2 +- pkg/apis/meta/v1/duration_test.go | 2 +- pkg/apis/meta/v1/generated.pb.go | 2 +- pkg/apis/meta/v1/group_version.go | 2 +- pkg/apis/meta/v1/group_version_test.go | 2 +- pkg/apis/meta/v1/helpers.go | 2 +- pkg/apis/meta/v1/helpers_test.go | 2 +- pkg/apis/meta/v1/meta.go | 2 +- pkg/apis/meta/v1/register.go | 5 +- pkg/apis/meta/v1/time.go | 2 +- pkg/apis/meta/v1/time_proto.go | 2 +- pkg/apis/meta/v1/time_test.go | 2 +- pkg/apis/meta/v1/types.go | 2 +- .../meta/v1/types_swagger_doc_generated.go | 2 +- pkg/apis/meta/v1/validation/BUILD | 2 +- pkg/apis/meta/v1/validation/validation.go | 10 +- pkg/apis/meta/v1/well_known_labels.go | 2 +- pkg/apis/meta/v1/zz_generated.deepcopy.go | 58 +- pkg/apis/policy/BUILD | 2 +- pkg/apis/policy/types.generated.go | 2 +- pkg/apis/policy/types.go | 14 +- pkg/apis/policy/v1alpha1/BUILD | 2 +- pkg/apis/policy/v1alpha1/register.go | 4 +- pkg/apis/policy/v1alpha1/types.go | 12 +- pkg/apis/policy/v1beta1/BUILD | 2 +- pkg/apis/policy/v1beta1/generated.pb.go | 2 +- pkg/apis/policy/v1beta1/register.go | 4 +- pkg/apis/policy/v1beta1/types.generated.go | 2 +- pkg/apis/policy/v1beta1/types.go | 14 +- .../policy/v1beta1/zz_generated.conversion.go | 10 +- .../policy/v1beta1/zz_generated.deepcopy.go | 8 +- pkg/apis/policy/validation/BUILD | 2 +- pkg/apis/policy/validation/validation.go | 2 +- pkg/apis/policy/zz_generated.deepcopy.go | 8 +- pkg/apis/rbac/BUILD | 2 +- pkg/apis/rbac/register.go | 4 +- pkg/apis/rbac/types.go | 26 +- pkg/apis/rbac/v1alpha1/BUILD | 2 +- pkg/apis/rbac/v1alpha1/register.go | 4 +- pkg/apis/rbac/v1alpha1/types.generated.go | 2 +- pkg/apis/rbac/v1alpha1/types.go | 26 +- pkg/apis/storage/BUILD | 2 +- pkg/apis/storage/register.go | 4 +- pkg/apis/storage/types.generated.go | 2 +- pkg/apis/storage/types.go | 8 +- pkg/apis/storage/v1beta1/BUILD | 2 +- pkg/apis/storage/v1beta1/register.go | 4 +- pkg/apis/storage/v1beta1/types.generated.go | 2 +- pkg/apis/storage/v1beta1/types.go | 8 +- pkg/apiserver/BUILD | 4 +- pkg/apiserver/api_installer.go | 16 +- pkg/apiserver/api_installer_test.go | 4 +- pkg/apiserver/apiserver.go | 36 +- pkg/apiserver/apiserver_test.go | 42 +- pkg/apiserver/errors.go | 40 +- pkg/apiserver/errors_test.go | 18 +- pkg/apiserver/negotiate_test.go | 4 +- pkg/apiserver/resthandler.go | 24 +- pkg/apiserver/resthandler_test.go | 4 +- pkg/apiserver/testing/BUILD | 2 +- pkg/apiserver/testing/types.generated.go | 2 +- pkg/apiserver/testing/types.go | 12 +- pkg/apiserver/watch_test.go | 4 +- pkg/client/cache/BUILD | 4 +- pkg/client/cache/listers.go | 8 +- pkg/client/cache/listers_extensions.go | 8 +- pkg/client/cache/listers_test.go | 14 +- pkg/client/cache/listwatch_test.go | 6 +- pkg/client/cache/reflector_test.go | 12 +- .../informers_generated/apps/interface.go | 2 +- .../apps/internalversion/interface.go | 2 +- .../apps/internalversion/statefulset.go | 2 +- .../apps/v1beta1/interface.go | 2 +- .../apps/v1beta1/statefulset.go | 2 +- .../autoscaling/interface.go | 2 +- .../horizontalpodautoscaler.go | 2 +- .../autoscaling/internalversion/interface.go | 2 +- .../autoscaling/v1/horizontalpodautoscaler.go | 2 +- .../autoscaling/v1/interface.go | 2 +- .../informers_generated/batch/interface.go | 2 +- .../batch/internalversion/cronjob.go | 2 +- .../batch/internalversion/interface.go | 2 +- .../batch/internalversion/job.go | 2 +- .../informers_generated/batch/v1/interface.go | 2 +- .../informers_generated/batch/v1/job.go | 2 +- .../batch/v2alpha1/cronjob.go | 2 +- .../batch/v2alpha1/interface.go | 2 +- .../informers_generated/batch/v2alpha1/job.go | 2 +- .../certificates/interface.go | 2 +- .../certificatesigningrequest.go | 2 +- .../certificates/internalversion/interface.go | 2 +- .../v1alpha1/certificatesigningrequest.go | 2 +- .../certificates/v1alpha1/interface.go | 2 +- .../informers_generated/core/interface.go | 2 +- .../core/internalversion/componentstatus.go | 2 +- .../core/internalversion/configmap.go | 2 +- .../core/internalversion/endpoints.go | 2 +- .../core/internalversion/event.go | 2 +- .../core/internalversion/interface.go | 2 +- .../core/internalversion/limitrange.go | 2 +- .../core/internalversion/namespace.go | 2 +- .../core/internalversion/node.go | 2 +- .../core/internalversion/persistentvolume.go | 2 +- .../internalversion/persistentvolumeclaim.go | 2 +- .../core/internalversion/pod.go | 2 +- .../core/internalversion/podtemplate.go | 2 +- .../internalversion/replicationcontroller.go | 2 +- .../core/internalversion/resourcequota.go | 2 +- .../core/internalversion/secret.go | 2 +- .../core/internalversion/service.go | 2 +- .../core/internalversion/serviceaccount.go | 2 +- .../core/v1/componentstatus.go | 2 +- .../informers_generated/core/v1/configmap.go | 2 +- .../informers_generated/core/v1/endpoints.go | 2 +- .../informers_generated/core/v1/event.go | 2 +- .../informers_generated/core/v1/interface.go | 2 +- .../informers_generated/core/v1/limitrange.go | 2 +- .../informers_generated/core/v1/namespace.go | 2 +- .../informers_generated/core/v1/node.go | 2 +- .../core/v1/persistentvolume.go | 2 +- .../core/v1/persistentvolumeclaim.go | 2 +- .../informers_generated/core/v1/pod.go | 2 +- .../core/v1/podtemplate.go | 2 +- .../core/v1/replicationcontroller.go | 2 +- .../core/v1/resourcequota.go | 2 +- .../informers_generated/core/v1/secret.go | 2 +- .../informers_generated/core/v1/service.go | 2 +- .../core/v1/serviceaccount.go | 2 +- .../extensions/interface.go | 2 +- .../extensions/internalversion/daemonset.go | 2 +- .../extensions/internalversion/deployment.go | 2 +- .../extensions/internalversion/ingress.go | 2 +- .../extensions/internalversion/interface.go | 2 +- .../internalversion/networkpolicy.go | 2 +- .../internalversion/podsecuritypolicy.go | 2 +- .../extensions/internalversion/replicaset.go | 2 +- .../internalversion/thirdpartyresource.go | 2 +- .../extensions/v1beta1/daemonset.go | 2 +- .../extensions/v1beta1/deployment.go | 2 +- .../extensions/v1beta1/ingress.go | 2 +- .../extensions/v1beta1/interface.go | 2 +- .../extensions/v1beta1/job.go | 2 +- .../extensions/v1beta1/podsecuritypolicy.go | 2 +- .../extensions/v1beta1/replicaset.go | 2 +- .../extensions/v1beta1/thirdpartyresource.go | 2 +- .../informers/informers_generated/factory.go | 2 +- .../informers/informers_generated/generic.go | 2 +- .../informers_generated/policy/interface.go | 2 +- .../policy/internalversion/interface.go | 2 +- .../internalversion/poddisruptionbudget.go | 2 +- .../policy/v1beta1/interface.go | 2 +- .../policy/v1beta1/poddisruptionbudget.go | 2 +- .../informers_generated/rbac/interface.go | 2 +- .../rbac/internalversion/clusterrole.go | 2 +- .../internalversion/clusterrolebinding.go | 2 +- .../rbac/internalversion/interface.go | 2 +- .../rbac/internalversion/role.go | 2 +- .../rbac/internalversion/rolebinding.go | 2 +- .../rbac/v1alpha1/clusterrole.go | 2 +- .../rbac/v1alpha1/clusterrolebinding.go | 2 +- .../rbac/v1alpha1/interface.go | 2 +- .../informers_generated/rbac/v1alpha1/role.go | 2 +- .../rbac/v1alpha1/rolebinding.go | 2 +- .../informers_generated/storage/interface.go | 2 +- .../storage/internalversion/interface.go | 2 +- .../storage/internalversion/storageclass.go | 2 +- .../storage/v1beta1/interface.go | 2 +- .../storage/v1beta1/storageclass.go | 2 +- pkg/client/leaderelection/BUILD | 4 +- pkg/client/leaderelection/leaderelection.go | 10 +- .../leaderelection/leaderelection_test.go | 6 +- pkg/client/leaderelection/resourcelock/BUILD | 2 +- .../leaderelection/resourcelock/interface.go | 6 +- .../internalversion/expansion_generated.go | 2 +- .../apps/internalversion/statefulset.go | 2 +- .../apps/v1beta1/expansion_generated.go | 2 +- .../listers/apps/v1beta1/statefulset.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../internalversion/tokenreview.go | 2 +- .../v1beta1/expansion_generated.go | 2 +- .../authentication/v1beta1/tokenreview.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../localsubjectaccessreview.go | 2 +- .../selfsubjectaccessreview.go | 2 +- .../internalversion/subjectaccessreview.go | 2 +- .../v1beta1/expansion_generated.go | 2 +- .../v1beta1/localsubjectaccessreview.go | 2 +- .../v1beta1/selfsubjectaccessreview.go | 2 +- .../v1beta1/subjectaccessreview.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../horizontalpodautoscaler.go | 2 +- .../autoscaling/v1/expansion_generated.go | 2 +- .../autoscaling/v1/horizontalpodautoscaler.go | 2 +- .../listers/batch/internalversion/BUILD | 4 +- .../listers/batch/internalversion/cronjob.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../listers/batch/internalversion/job.go | 2 +- .../batch/internalversion/job_expansion.go | 4 +- .../listers/batch/internalversion/job_test.go | 12 +- pkg/client/listers/batch/v1/BUILD | 2 +- .../listers/batch/v1/expansion_generated.go | 2 +- pkg/client/listers/batch/v1/job.go | 2 +- pkg/client/listers/batch/v1/job_expansion.go | 4 +- pkg/client/listers/batch/v2alpha1/cronjob.go | 2 +- .../batch/v2alpha1/expansion_generated.go | 2 +- pkg/client/listers/batch/v2alpha1/job.go | 2 +- .../certificatesigningrequest.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../v1alpha1/certificatesigningrequest.go | 2 +- .../v1alpha1/expansion_generated.go | 2 +- .../core/internalversion/componentstatus.go | 2 +- .../listers/core/internalversion/configmap.go | 2 +- .../listers/core/internalversion/endpoints.go | 2 +- .../listers/core/internalversion/event.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../core/internalversion/limitrange.go | 2 +- .../listers/core/internalversion/namespace.go | 2 +- .../listers/core/internalversion/node.go | 2 +- .../core/internalversion/persistentvolume.go | 2 +- .../internalversion/persistentvolumeclaim.go | 2 +- .../listers/core/internalversion/pod.go | 2 +- .../core/internalversion/podtemplate.go | 2 +- .../internalversion/replicationcontroller.go | 2 +- .../core/internalversion/resourcequota.go | 2 +- .../listers/core/internalversion/secret.go | 2 +- .../listers/core/internalversion/service.go | 2 +- .../core/internalversion/serviceaccount.go | 2 +- pkg/client/listers/core/v1/componentstatus.go | 2 +- pkg/client/listers/core/v1/configmap.go | 2 +- pkg/client/listers/core/v1/endpoints.go | 2 +- pkg/client/listers/core/v1/event.go | 2 +- .../listers/core/v1/expansion_generated.go | 2 +- pkg/client/listers/core/v1/limitrange.go | 2 +- pkg/client/listers/core/v1/namespace.go | 2 +- pkg/client/listers/core/v1/node.go | 2 +- .../listers/core/v1/persistentvolume.go | 2 +- .../listers/core/v1/persistentvolumeclaim.go | 2 +- pkg/client/listers/core/v1/pod.go | 2 +- pkg/client/listers/core/v1/podtemplate.go | 2 +- .../listers/core/v1/replicationcontroller.go | 2 +- pkg/client/listers/core/v1/resourcequota.go | 2 +- pkg/client/listers/core/v1/secret.go | 2 +- pkg/client/listers/core/v1/service.go | 2 +- pkg/client/listers/core/v1/serviceaccount.go | 2 +- .../extensions/internalversion/daemonset.go | 2 +- .../extensions/internalversion/deployment.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../extensions/internalversion/ingress.go | 2 +- .../internalversion/networkpolicy.go | 2 +- .../internalversion/podsecuritypolicy.go | 2 +- .../extensions/internalversion/replicaset.go | 2 +- .../extensions/internalversion/scale.go | 2 +- .../internalversion/thirdpartyresource.go | 2 +- .../listers/extensions/v1beta1/daemonset.go | 2 +- .../listers/extensions/v1beta1/deployment.go | 2 +- .../extensions/v1beta1/expansion_generated.go | 2 +- .../listers/extensions/v1beta1/ingress.go | 2 +- pkg/client/listers/extensions/v1beta1/job.go | 2 +- .../extensions/v1beta1/podsecuritypolicy.go | 2 +- .../listers/extensions/v1beta1/replicaset.go | 2 +- .../listers/extensions/v1beta1/scale.go | 2 +- .../extensions/v1beta1/thirdpartyresource.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../internalversion/imagereview.go | 2 +- .../v1alpha1/expansion_generated.go | 2 +- .../imagepolicy/v1alpha1/imagereview.go | 2 +- .../policy/internalversion/eviction.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../internalversion/poddisruptionbudget.go | 2 +- .../policy/v1alpha1/expansion_generated.go | 2 +- .../policy/v1alpha1/poddisruptionbudget.go | 2 +- .../policy/v1beta1/expansion_generated.go | 2 +- .../policy/v1beta1/poddisruptionbudget.go | 2 +- .../rbac/internalversion/clusterrole.go | 2 +- .../internalversion/clusterrolebinding.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../listers/rbac/internalversion/role.go | 2 +- .../rbac/internalversion/rolebinding.go | 2 +- .../listers/rbac/v1alpha1/clusterrole.go | 2 +- .../rbac/v1alpha1/clusterrolebinding.go | 2 +- .../rbac/v1alpha1/expansion_generated.go | 2 +- pkg/client/listers/rbac/v1alpha1/role.go | 2 +- .../listers/rbac/v1alpha1/rolebinding.go | 2 +- .../internalversion/expansion_generated.go | 2 +- .../storage/internalversion/storageclass.go | 2 +- .../storage/v1beta1/expansion_generated.go | 2 +- .../listers/storage/v1beta1/storageclass.go | 2 +- pkg/client/record/BUILD | 4 +- pkg/client/record/event.go | 12 +- pkg/client/record/event_test.go | 6 +- pkg/client/record/events_cache.go | 10 +- pkg/client/record/events_cache_test.go | 8 +- pkg/client/record/fake.go | 4 +- pkg/client/restclient/BUILD | 4 +- pkg/client/restclient/client_test.go | 28 +- pkg/client/restclient/config.go | 4 +- pkg/client/restclient/request.go | 22 +- pkg/client/restclient/request_test.go | 22 +- pkg/client/restclient/versions.go | 6 +- pkg/client/testing/core/BUILD | 2 +- pkg/client/testing/core/fake.go | 10 +- pkg/client/testing/core/fixture.go | 8 +- pkg/client/typed/discovery/BUILD | 6 +- .../typed/discovery/discovery_client.go | 38 +- .../typed/discovery/discovery_client_test.go | 104 +- pkg/client/typed/discovery/fake/BUILD | 2 +- pkg/client/typed/discovery/fake/discovery.go | 8 +- pkg/client/typed/discovery/helper.go | 4 +- .../typed/discovery/helper_blackbox_test.go | 2 +- pkg/client/typed/discovery/restmapper.go | 8 +- pkg/client/typed/discovery/restmapper_test.go | 42 +- pkg/client/typed/dynamic/BUILD | 4 +- pkg/client/typed/dynamic/client.go | 10 +- pkg/client/typed/dynamic/client_test.go | 30 +- pkg/client/typed/dynamic/dynamic_util.go | 6 +- pkg/client/typed/dynamic/dynamic_util_test.go | 6 +- pkg/client/unversioned/BUILD | 2 +- pkg/client/unversioned/clientcmd/doc.go | 2 +- pkg/client/unversioned/helper_test.go | 12 +- pkg/client/unversioned/remotecommand/BUILD | 2 +- pkg/client/unversioned/remotecommand/v2.go | 2 +- pkg/client/unversioned/remotecommand/v4.go | 12 +- .../unversioned/testclient/simple/BUILD | 2 +- .../testclient/simple/simple_testclient.go | 6 +- pkg/cloudprovider/providers/aws/BUILD | 4 +- pkg/cloudprovider/providers/aws/aws.go | 6 +- pkg/cloudprovider/providers/aws/aws_test.go | 6 +- pkg/cloudprovider/providers/gce/BUILD | 2 +- pkg/cloudprovider/providers/gce/gce.go | 6 +- pkg/controller/BUILD | 4 +- pkg/controller/controller_utils.go | 8 +- pkg/controller/controller_utils_test.go | 8 +- pkg/controller/cronjob/BUILD | 4 +- pkg/controller/cronjob/controller.go | 6 +- pkg/controller/cronjob/controller_test.go | 16 +- pkg/controller/cronjob/utils_test.go | 24 +- pkg/controller/daemon/BUILD | 4 +- pkg/controller/daemon/daemoncontroller.go | 8 +- .../daemon/daemoncontroller_test.go | 16 +- pkg/controller/deployment/BUILD | 4 +- .../deployment/deployment_controller.go | 4 +- .../deployment/deployment_controller_test.go | 16 +- pkg/controller/deployment/sync.go | 4 +- pkg/controller/deployment/sync_test.go | 8 +- pkg/controller/deployment/util/BUILD | 4 +- .../deployment/util/deployment_util.go | 20 +- .../deployment/util/deployment_util_test.go | 12 +- pkg/controller/disruption/BUILD | 4 +- pkg/controller/disruption/disruption.go | 12 +- pkg/controller/disruption/disruption_test.go | 72 +- pkg/controller/endpoint/BUILD | 2 +- .../endpoint/endpoints_controller_test.go | 6 +- pkg/controller/garbagecollector/BUILD | 4 +- .../garbagecollector/garbagecollector.go | 14 +- .../garbagecollector/garbagecollector_test.go | 4 +- .../garbagecollector/metaonly/BUILD | 4 +- .../garbagecollector/metaonly/metaonly.go | 4 +- .../metaonly/metaonly_test.go | 6 +- .../metaonly/types.generated.go | 2 +- .../garbagecollector/metaonly/types.go | 8 +- pkg/controller/job/BUILD | 4 +- pkg/controller/job/jobcontroller.go | 14 +- pkg/controller/job/jobcontroller_test.go | 18 +- pkg/controller/namespace/BUILD | 4 +- .../namespace/namespace_controller_test.go | 10 +- .../namespace/namespace_controller_utils.go | 14 +- pkg/controller/node/BUILD | 4 +- pkg/controller/node/nodecontroller.go | 12 +- pkg/controller/node/nodecontroller_test.go | 464 +- pkg/controller/node/test_utils.go | 10 +- pkg/controller/petset/BUILD | 2 +- pkg/controller/petset/fakes.go | 8 +- pkg/controller/petset/pet_set.go | 4 +- pkg/controller/podautoscaler/BUILD | 4 +- pkg/controller/podautoscaler/horizontal.go | 8 +- .../podautoscaler/horizontal_test.go | 12 +- .../podautoscaler/horizontal_test.go.orig | 1080 +++++ .../podautoscaler/horizontal_test.go.rej | 11 + pkg/controller/podautoscaler/metrics/BUILD | 2 +- .../metrics/metrics_client_test.go | 4 +- .../metrics/metrics_client_test.go.orig | 373 ++ .../metrics/metrics_client_test.go.rej | 11 + .../podautoscaler/replica_calculator_test.go | 6 +- .../replica_calculator_test.go.orig | 654 +++ .../replica_calculator_test.go.rej | 11 + pkg/controller/podgc/BUILD | 2 +- pkg/controller/podgc/gc_controller_test.go | 18 +- pkg/controller/replicaset/BUILD | 4 +- pkg/controller/replicaset/replica_set.go | 6 +- pkg/controller/replicaset/replica_set_test.go | 26 +- .../replicaset/replica_set_utils.go | 6 +- pkg/controller/replication/BUILD | 4 +- .../replication_controller_test.go | 18 +- .../replication_controller_utils.go | 6 +- pkg/controller/route/BUILD | 2 +- pkg/controller/route/routecontroller.go | 4 +- pkg/controller/volume/persistentvolume/BUILD | 4 +- .../volume/persistentvolume/framework_test.go | 4 +- .../volume/persistentvolume/index.go | 4 +- .../volume/persistentvolume/index_test.go | 10 +- .../volume/persistentvolume/provision_test.go | 10 +- .../volume/persistentvolume/pv_controller.go | 4 +- pkg/conversion/queryparams/BUILD | 2 +- pkg/conversion/queryparams/convert_test.go | 8 +- pkg/dns/BUILD | 4 +- pkg/dns/config/BUILD | 2 +- pkg/dns/config/config.go | 2 +- pkg/dns/dns.go | 10 +- pkg/dns/dns_test.go | 6 +- pkg/generated/openapi/BUILD | 2 +- pkg/generated/openapi/zz_generated.openapi.go | 1792 ++++---- pkg/genericapiserver/BUILD | 4 +- pkg/genericapiserver/config.go | 4 +- pkg/genericapiserver/discovery.go | 14 +- pkg/genericapiserver/genericapiserver.go | 24 +- pkg/genericapiserver/genericapiserver_test.go | 18 +- pkg/genericapiserver/routes/BUILD | 2 +- pkg/genericapiserver/routes/index.go | 4 +- pkg/genericapiserver/routes/swagger.go | 2 +- pkg/kubectl/BUILD | 4 +- pkg/kubectl/cmd/BUILD | 4 +- pkg/kubectl/cmd/apiversions.go | 4 +- pkg/kubectl/cmd/certificates.go | 6 +- pkg/kubectl/cmd/cmd_test.go | 26 +- pkg/kubectl/cmd/delete_test.go | 8 +- pkg/kubectl/cmd/drain.go | 4 +- pkg/kubectl/cmd/drain_test.go | 42 +- pkg/kubectl/cmd/get_test.go | 18 +- pkg/kubectl/cmd/logs.go | 4 +- pkg/kubectl/cmd/run.go | 4 +- pkg/kubectl/cmd/taint_test.go | 4 +- pkg/kubectl/cmd/testing/BUILD | 2 +- pkg/kubectl/cmd/testing/fake.go | 10 +- pkg/kubectl/cmd/top_test.go | 18 +- pkg/kubectl/cmd/top_test.go.orig | 192 + pkg/kubectl/cmd/top_test.go.rej | 52 + pkg/kubectl/cmd/util/BUILD | 4 +- pkg/kubectl/cmd/util/cached_discovery.go | 16 +- pkg/kubectl/cmd/util/cached_discovery_test.go | 20 +- pkg/kubectl/cmd/util/factory.go | 8 +- pkg/kubectl/cmd/util/factory_test.go | 20 +- pkg/kubectl/cmd/util/helpers.go | 6 +- pkg/kubectl/cmd/util/helpers_test.go | 4 +- pkg/kubectl/custom_column_printer_test.go | 4 +- pkg/kubectl/deployment.go | 4 +- pkg/kubectl/deployment_test.go | 6 +- pkg/kubectl/describe.go | 24 +- pkg/kubectl/describe_test.go | 36 +- pkg/kubectl/pdb.go | 4 +- pkg/kubectl/resource/BUILD | 4 +- pkg/kubectl/resource/builder_test.go | 12 +- pkg/kubectl/resource/helper_test.go | 30 +- pkg/kubectl/resource/result.go | 4 +- pkg/kubectl/resource_printer.go | 20 +- pkg/kubectl/resource_printer_test.go | 60 +- pkg/kubectl/rolling_updater.go | 8 +- pkg/kubectl/rolling_updater_test.go | 18 +- pkg/kubectl/run.go | 6 +- pkg/kubectl/run_test.go | 6 +- pkg/kubectl/sorting_printer.go | 8 +- pkg/kubectl/sorting_printer_test.go | 14 +- pkg/kubectl/stop.go | 8 +- pkg/kubectl/stop_test.go | 18 +- pkg/kubectl/testing/BUILD | 2 +- pkg/kubectl/testing/types.generated.go | 2 +- pkg/kubectl/testing/types.go | 4 +- pkg/kubelet/BUILD | 4 +- pkg/kubelet/active_deadline_test.go | 6 +- pkg/kubelet/api/v1alpha1/stats/BUILD | 2 +- pkg/kubelet/api/v1alpha1/stats/types.go | 16 +- pkg/kubelet/config/BUILD | 2 +- pkg/kubelet/config/common_test.go | 6 +- pkg/kubelet/config/config_test.go | 4 +- pkg/kubelet/config/file_linux_test.go | 4 +- pkg/kubelet/config/http_test.go | 20 +- pkg/kubelet/container/BUILD | 4 +- pkg/kubelet/container/helpers.go | 4 +- pkg/kubelet/container/ref_test.go | 4 +- pkg/kubelet/dockertools/BUILD | 2 +- pkg/kubelet/dockertools/docker_manager.go | 12 +- pkg/kubelet/eviction/BUILD | 4 +- pkg/kubelet/eviction/helpers_test.go | 32 +- pkg/kubelet/eviction/types.go | 4 +- pkg/kubelet/kubelet_node_status.go | 30 +- pkg/kubelet/kubelet_node_status_test.go | 118 +- pkg/kubelet/kubelet_pods.go | 8 +- pkg/kubelet/kubelet_test.go | 22 +- pkg/kubelet/kuberuntime/BUILD | 4 +- .../kuberuntime/kuberuntime_container.go | 6 +- .../kuberuntime/kuberuntime_logs_test.go | 4 +- pkg/kubelet/network/BUILD | 2 +- pkg/kubelet/network/exec/BUILD | 2 +- pkg/kubelet/network/exec/exec.go | 4 +- pkg/kubelet/network/plugins.go | 4 +- pkg/kubelet/oom_watcher.go | 4 +- pkg/kubelet/prober/BUILD | 2 +- pkg/kubelet/prober/common_test.go | 4 +- pkg/kubelet/prober/worker_test.go | 4 +- pkg/kubelet/rkt/BUILD | 2 +- pkg/kubelet/rkt/log.go | 4 +- pkg/kubelet/server/BUILD | 2 +- pkg/kubelet/server/remotecommand/BUILD | 2 +- pkg/kubelet/server/remotecommand/attach.go | 6 +- pkg/kubelet/server/remotecommand/exec.go | 18 +- .../server/remotecommand/httpstream.go | 6 +- pkg/kubelet/server/server.go | 4 +- pkg/kubelet/server/stats/BUILD | 4 +- pkg/kubelet/server/stats/summary.go | 14 +- pkg/kubelet/server/stats/summary_test.go | 6 +- pkg/kubelet/status/BUILD | 4 +- pkg/kubelet/status/status_manager.go | 12 +- pkg/kubelet/status/status_manager_test.go | 20 +- pkg/kubelet/util/csr/BUILD | 2 +- pkg/kubelet/util/csr/csr.go | 4 +- pkg/master/BUILD | 2 +- pkg/master/master_test.go | 16 +- pkg/master/thirdparty/BUILD | 2 +- pkg/master/thirdparty/thirdparty.go | 20 +- pkg/quota/evaluator/core/BUILD | 2 +- .../core/persistent_volume_claims_test.go | 14 +- pkg/registry/apps/petset/BUILD | 2 +- pkg/registry/apps/petset/etcd/BUILD | 2 +- pkg/registry/apps/petset/etcd/etcd_test.go | 4 +- pkg/registry/apps/petset/strategy_test.go | 10 +- pkg/registry/batch/cronjob/BUILD | 2 +- pkg/registry/batch/cronjob/strategy_test.go | 6 +- pkg/registry/batch/job/BUILD | 4 +- pkg/registry/batch/job/etcd/BUILD | 2 +- pkg/registry/batch/job/etcd/etcd_test.go | 8 +- pkg/registry/batch/job/strategy.go | 4 +- pkg/registry/batch/job/strategy_test.go | 6 +- pkg/registry/core/namespace/BUILD | 2 +- pkg/registry/core/namespace/etcd/BUILD | 4 +- pkg/registry/core/namespace/etcd/etcd.go | 4 +- pkg/registry/core/namespace/etcd/etcd_test.go | 6 +- pkg/registry/core/namespace/strategy_test.go | 4 +- pkg/registry/core/pod/etcd/BUILD | 2 +- pkg/registry/core/pod/etcd/etcd.go | 4 +- pkg/registry/core/pod/etcd/eviction.go | 20 +- pkg/registry/core/service/BUILD | 2 +- pkg/registry/core/service/registry.go | 6 +- pkg/registry/core/service/rest.go | 6 +- pkg/registry/extensions/controller/etcd/BUILD | 4 +- .../extensions/controller/etcd/etcd.go | 4 +- .../extensions/controller/etcd/etcd_test.go | 4 +- pkg/registry/extensions/daemonset/etcd/BUILD | 2 +- .../extensions/daemonset/etcd/etcd_test.go | 6 +- pkg/registry/extensions/deployment/BUILD | 2 +- pkg/registry/extensions/deployment/etcd/BUILD | 4 +- .../extensions/deployment/etcd/etcd.go | 4 +- .../extensions/deployment/etcd/etcd_test.go | 8 +- .../extensions/deployment/strategy.go | 4 +- pkg/registry/extensions/networkpolicy/BUILD | 2 +- .../extensions/networkpolicy/etcd/BUILD | 2 +- .../networkpolicy/etcd/etcd_test.go | 10 +- .../extensions/networkpolicy/strategy_test.go | 4 +- pkg/registry/extensions/replicaset/BUILD | 2 +- pkg/registry/extensions/replicaset/etcd/BUILD | 2 +- .../extensions/replicaset/etcd/etcd_test.go | 8 +- .../extensions/replicaset/strategy_test.go | 8 +- .../extensions/thirdpartyresourcedata/BUILD | 4 +- .../thirdpartyresourcedata/codec.go | 10 +- .../thirdpartyresourcedata/codec_test.go | 24 +- pkg/registry/generic/registry/BUILD | 4 +- .../generic/registry/decorated_watcher.go | 8 +- pkg/registry/generic/registry/store.go | 14 +- pkg/registry/generic/registry/store_test.go | 8 +- pkg/registry/policy/poddisruptionbudget/BUILD | 2 +- .../policy/poddisruptionbudget/etcd/BUILD | 2 +- .../poddisruptionbudget/etcd/etcd_test.go | 4 +- .../poddisruptionbudget/strategy_test.go | 10 +- pkg/registry/registrytest/BUILD | 2 +- pkg/registry/registrytest/service.go | 4 +- pkg/runtime/BUILD | 4 +- pkg/runtime/serializer/BUILD | 2 +- pkg/runtime/serializer/codec_test.go | 6 +- pkg/runtime/types.go | 2 +- pkg/runtime/unstructured.go | 14 +- pkg/runtime/unstructured_test.go | 10 +- pkg/runtime/unversioned_test.go | 18 +- pkg/storage/BUILD | 6 +- pkg/storage/cacher.go | 8 +- pkg/storage/cacher_test.go | 4 +- pkg/storage/etcd/BUILD | 2 +- pkg/storage/etcd/etcd_watcher.go | 16 +- pkg/storage/etcd3/BUILD | 4 +- pkg/storage/etcd3/watcher.go | 16 +- pkg/storage/etcd3/watcher_test.go | 6 +- pkg/storage/testing/BUILD | 2 +- pkg/storage/testing/types.generated.go | 2 +- pkg/storage/testing/types.go | 4 +- pkg/storage/watch_cache_test.go | 4 +- pkg/util/httpstream/spdy/BUILD | 2 +- pkg/util/httpstream/spdy/roundtripper.go | 6 +- pkg/util/labels/BUILD | 4 +- pkg/util/labels/labels.go | 12 +- pkg/util/labels/labels_test.go | 10 +- pkg/util/node/BUILD | 4 +- pkg/util/node/node.go | 10 +- pkg/util/node/node_test.go | 6 +- pkg/util/replicaset/BUILD | 2 +- pkg/util/replicaset/replicaset.go | 4 +- pkg/volume/flocker/BUILD | 2 +- pkg/volume/flocker/flocker_volume_test.go | 4 +- plugin/pkg/admission/antiaffinity/BUILD | 4 +- .../pkg/admission/antiaffinity/admission.go | 8 +- .../admission/antiaffinity/admission_test.go | 10 +- plugin/pkg/admission/antiaffinity/doc.go | 2 +- plugin/pkg/admission/limitranger/BUILD | 2 +- .../admission/limitranger/admission_test.go | 4 +- .../admission/namespace/autoprovision/BUILD | 2 +- .../namespace/autoprovision/admission_test.go | 4 +- plugin/pkg/admission/namespace/exists/BUILD | 2 +- .../namespace/exists/admission_test.go | 4 +- .../pkg/admission/namespace/lifecycle/BUILD | 2 +- .../namespace/lifecycle/admission_test.go | 4 +- .../admission/persistentvolume/label/BUILD | 2 +- .../persistentvolume/label/admission.go | 4 +- .../pkg/admission/storageclass/default/BUILD | 2 +- .../storageclass/default/admission_test.go | 18 +- .../auth/authenticator/token/webhook/BUILD | 2 +- .../token/webhook/webhook_test.go | 4 +- plugin/pkg/auth/authorizer/webhook/BUILD | 2 +- .../auth/authorizer/webhook/webhook_test.go | 4 +- plugin/pkg/scheduler/algorithm/BUILD | 2 +- plugin/pkg/scheduler/algorithm/listers.go | 4 +- .../pkg/scheduler/algorithm/predicates/BUILD | 2 +- .../algorithm/predicates/predicates.go | 6 +- .../pkg/scheduler/algorithm/priorities/BUILD | 4 +- .../priorities/interpod_affinity_test.go | 4 +- .../priorities/selector_spreading.go | 4 +- .../priorities/selector_spreading_test.go | 12 +- .../scheduler/algorithm/priorities/util/BUILD | 2 +- .../algorithm/priorities/util/topologies.go | 4 +- plugin/pkg/scheduler/api/BUILD | 2 +- plugin/pkg/scheduler/api/register.go | 4 +- plugin/pkg/scheduler/api/types.go | 4 +- plugin/pkg/scheduler/api/v1/BUILD | 2 +- plugin/pkg/scheduler/api/v1/types.go | 4 +- .../api/unversioned/zz_generated.deepcopy.go | 390 -- .../pkg/api/v1/zz_generated.deepcopy.go | 3787 ---------------- .../pkg/api/zz_generated.deepcopy.go | 3804 ----------------- .../apps/v1beta1/zz_generated.deepcopy.go | 138 - .../pkg/apis/apps/zz_generated.deepcopy.go | 132 - .../v1beta1/zz_generated.deepcopy.go | 111 - .../authentication/zz_generated.deepcopy.go | 111 - .../v1beta1/zz_generated.deepcopy.go | 196 - .../authorization/zz_generated.deepcopy.go | 196 - .../autoscaling/v1/zz_generated.deepcopy.go | 186 - .../apis/autoscaling/zz_generated.deepcopy.go | 186 - .../apis/batch/v1/zz_generated.deepcopy.go | 182 - .../batch/v2alpha1/zz_generated.deepcopy.go | 307 -- .../pkg/apis/batch/zz_generated.deepcopy.go | 307 -- .../v1alpha1/zz_generated.deepcopy.go | 145 - .../certificates/zz_generated.deepcopy.go | 145 - .../v1alpha1/zz_generated.deepcopy.go | 521 --- .../componentconfig/zz_generated.deepcopy.go | 481 --- .../v1beta1/zz_generated.deepcopy.go | 1448 ------- .../apis/extensions/zz_generated.deepcopy.go | 1146 ----- .../v1alpha1/zz_generated.deepcopy.go | 105 - .../apis/imagepolicy/zz_generated.deepcopy.go | 105 - .../policy/v1beta1/zz_generated.deepcopy.go | 145 - .../pkg/apis/policy/zz_generated.deepcopy.go | 145 - .../rbac/v1alpha1/zz_generated.deepcopy.go | 293 -- .../pkg/apis/rbac/zz_generated.deepcopy.go | 298 -- .../storage/v1beta1/zz_generated.deepcopy.go | 84 - .../pkg/apis/storage/zz_generated.deepcopy.go | 84 - .../v1beta1/zz_generated.deepcopy.go | 159 - .../apis/federation/zz_generated.deepcopy.go | 200 - .../pkg/runtime/zz_generated.deepcopy.go | 75 - test/e2e/BUILD | 3 +- test/e2e/common/BUILD | 2 +- test/e2e/common/empty_dir.go | 4 +- test/e2e/common/host_path.go | 4 +- test/e2e/common/volumes.go | 10 +- test/e2e/daemon_set.go | 8 +- test/e2e/density.go | 16 +- test/e2e/deployment.go | 12 +- test/e2e/disruption.go | 6 +- test/e2e/dns.go | 4 +- test/e2e/dns_configmap.go | 6 +- test/e2e/federation-deployment.go | 4 +- test/e2e/federation-replicaset.go | 4 +- test/e2e/framework/BUILD | 2 +- test/e2e/framework/networking_utils.go | 6 +- test/e2e/framework/util.go | 10 +- test/e2e/garbage_collector.go | 4 +- test/e2e/gke_local_ssd.go | 4 +- test/e2e/kubectl.go | 6 +- test/e2e/mesos.go | 4 +- test/e2e/pd.go | 4 +- test/e2e/persistent_volumes.go | 4 +- test/e2e/petset.go | 10 +- test/e2e/replica_set.go | 4 +- test/e2e/resize_nodes.go | 4 +- test/e2e/third-party.go | 14 +- test/e2e/ubernetes_lite.go | 6 +- test/e2e/volume_provisioning.go | 6 +- test/e2e/volumes.go | 14 +- test/e2e_node/BUILD | 4 +- test/e2e_node/benchmark_util.go | 6 +- test/e2e_node/density_test.go | 26 +- test/e2e_node/kubelet_test.go | 2 +- test/e2e_node/simple_mount.go | 4 +- test/e2e_node/summary_test.go | 4 +- test/integration/client/client_test.go | 8 +- .../integration/client/dynamic_client_test.go | 4 +- test/integration/examples/apiserver_test.go | 10 +- test/integration/federation/server_test.go | 22 +- .../garbage_collector_test.go | 6 +- .../persistent_volumes_test.go | 18 +- .../integration/replicaset/replicaset_test.go | 8 +- .../replicationcontroller_test.go | 6 +- test/integration/scheduler/extender_test.go | 4 +- test/integration/scheduler/scheduler_test.go | 6 +- .../storageclasses/storage_classes_test.go | 4 +- .../integration/thirdparty/thirdparty_test.go | 10 +- test/soak/serve_hostnames/BUILD | 2 +- test/soak/serve_hostnames/serve_hostnames.go | 6 +- test/utils/BUILD | 2 +- test/utils/runners.go | 6 +- vendor/BUILD | 45 - 940 files changed, 7227 insertions(+), 20188 deletions(-) create mode 100644 pkg/api/unversioned/BUILD create mode 100644 pkg/api/unversioned/duration.go create mode 100644 pkg/api/unversioned/time.go create mode 100644 pkg/api/unversioned/types.go create mode 100644 pkg/controller/podautoscaler/horizontal_test.go.orig create mode 100644 pkg/controller/podautoscaler/horizontal_test.go.rej create mode 100644 pkg/controller/podautoscaler/metrics/metrics_client_test.go.orig create mode 100644 pkg/controller/podautoscaler/metrics/metrics_client_test.go.rej create mode 100644 pkg/controller/podautoscaler/replica_calculator_test.go.orig create mode 100644 pkg/controller/podautoscaler/replica_calculator_test.go.rej create mode 100644 pkg/kubectl/cmd/top_test.go.orig create mode 100644 pkg/kubectl/cmd/top_test.go.rej delete mode 100644 staging/src/k8s.io/client-go/pkg/api/unversioned/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/api/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go delete mode 100644 staging/src/k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go diff --git a/cmd/kube-controller-manager/app/options/BUILD b/cmd/kube-controller-manager/app/options/BUILD index e26cb5664f4..769db121132 100644 --- a/cmd/kube-controller-manager/app/options/BUILD +++ b/cmd/kube-controller-manager/app/options/BUILD @@ -15,8 +15,8 @@ go_library( srcs = ["options.go"], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/apis/componentconfig:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/leaderelection:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/util/config:go_default_library", diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index 477e7364eb1..0c48a5cd2fc 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -21,7 +21,7 @@ package options import ( "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/master/ports" @@ -57,19 +57,19 @@ func NewCMServer() *CMServer { LookupCacheSizeForRC: 4096, LookupCacheSizeForRS: 4096, LookupCacheSizeForDaemonSet: 1024, - ServiceSyncPeriod: unversioned.Duration{Duration: 5 * time.Minute}, - RouteReconciliationPeriod: unversioned.Duration{Duration: 10 * time.Second}, - ResourceQuotaSyncPeriod: unversioned.Duration{Duration: 5 * time.Minute}, - NamespaceSyncPeriod: unversioned.Duration{Duration: 5 * time.Minute}, - PVClaimBinderSyncPeriod: unversioned.Duration{Duration: 15 * time.Second}, - HorizontalPodAutoscalerSyncPeriod: unversioned.Duration{Duration: 30 * time.Second}, - DeploymentControllerSyncPeriod: unversioned.Duration{Duration: 30 * time.Second}, - MinResyncPeriod: unversioned.Duration{Duration: 12 * time.Hour}, + ServiceSyncPeriod: metav1.Duration{Duration: 5 * time.Minute}, + RouteReconciliationPeriod: metav1.Duration{Duration: 10 * time.Second}, + ResourceQuotaSyncPeriod: metav1.Duration{Duration: 5 * time.Minute}, + NamespaceSyncPeriod: metav1.Duration{Duration: 5 * time.Minute}, + PVClaimBinderSyncPeriod: metav1.Duration{Duration: 15 * time.Second}, + HorizontalPodAutoscalerSyncPeriod: metav1.Duration{Duration: 30 * time.Second}, + DeploymentControllerSyncPeriod: metav1.Duration{Duration: 30 * time.Second}, + MinResyncPeriod: metav1.Duration{Duration: 12 * time.Hour}, RegisterRetryCount: 10, - PodEvictionTimeout: unversioned.Duration{Duration: 5 * time.Minute}, - NodeMonitorGracePeriod: unversioned.Duration{Duration: 40 * time.Second}, - NodeStartupGracePeriod: unversioned.Duration{Duration: 60 * time.Second}, - NodeMonitorPeriod: unversioned.Duration{Duration: 5 * time.Second}, + PodEvictionTimeout: metav1.Duration{Duration: 5 * time.Minute}, + NodeMonitorGracePeriod: metav1.Duration{Duration: 40 * time.Second}, + NodeStartupGracePeriod: metav1.Duration{Duration: 60 * time.Second}, + NodeMonitorPeriod: metav1.Duration{Duration: 5 * time.Second}, ClusterName: "kubernetes", NodeCIDRMaskSize: 24, ConfigureCloudRoutes: true, @@ -90,7 +90,7 @@ func NewCMServer() *CMServer { KubeAPIQPS: 20.0, KubeAPIBurst: 30, LeaderElection: leaderelection.DefaultLeaderElectionConfiguration(), - ControllerStartInterval: unversioned.Duration{Duration: 0 * time.Second}, + ControllerStartInterval: metav1.Duration{Duration: 0 * time.Second}, EnableGarbageCollector: true, ConcurrentGCSyncs: 20, ClusterSigningCertFile: "/etc/kubernetes/ca/ca.pem", diff --git a/cmd/kubeadm/app/apis/kubeadm/BUILD b/cmd/kubeadm/app/apis/kubeadm/BUILD index 3eb1c182d66..bc0621efccb 100644 --- a/cmd/kubeadm/app/apis/kubeadm/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/BUILD @@ -21,7 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", ], diff --git a/cmd/kubeadm/app/apis/kubeadm/register.go b/cmd/kubeadm/app/apis/kubeadm/register.go index 0dddf1cd6a8..453c79fc15d 100644 --- a/cmd/kubeadm/app/apis/kubeadm/register.go +++ b/cmd/kubeadm/app/apis/kubeadm/register.go @@ -18,7 +18,7 @@ package kubeadm import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -51,7 +51,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterInfo{}, &api.ListOptions{}, &api.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) return nil } diff --git a/cmd/kubeadm/app/apis/kubeadm/types.go b/cmd/kubeadm/app/apis/kubeadm/types.go index 7d6ac94755b..ec7e361cf35 100644 --- a/cmd/kubeadm/app/apis/kubeadm/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/types.go @@ -16,7 +16,7 @@ limitations under the License. package kubeadm -import "k8s.io/kubernetes/pkg/api/unversioned" +import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) type EnvParams struct { KubernetesDir string @@ -30,7 +30,7 @@ type EnvParams struct { } type MasterConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta Secrets Secrets API API @@ -72,7 +72,7 @@ type Secrets struct { } type NodeConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta MasterAddresses []string Secrets Secrets @@ -82,7 +82,7 @@ type NodeConfiguration struct { // ClusterInfo TODO add description type ClusterInfo struct { - unversioned.TypeMeta + metav1.TypeMeta // TODO(phase1+) this may become simply `api.Config` CertificateAuthorities []string `json:"certificateAuthorities"` Endpoints []string `json:"endpoints"` diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD index 84e2f414613..dcd828f053d 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD @@ -21,8 +21,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", ], diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go index d566621d906..0eb7c88afbf 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -51,7 +51,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterInfo{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) return nil } diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go index 59c53e4b458..892262137d6 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go @@ -16,10 +16,10 @@ limitations under the License. package v1alpha1 -import "k8s.io/kubernetes/pkg/api/unversioned" +import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) type MasterConfiguration struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` Secrets Secrets `json:"secrets"` API API `json:"api"` @@ -61,7 +61,7 @@ type Secrets struct { } type NodeConfiguration struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` MasterAddresses []string `json:"masterAddresses"` Secrets Secrets `json:"secrets"` @@ -71,7 +71,7 @@ type NodeConfiguration struct { // ClusterInfo TODO add description type ClusterInfo struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // TODO(phase1+) this may become simply `api.Config` CertificateAuthorities []string `json:"certificateAuthorities"` Endpoints []string `json:"endpoints"` diff --git a/cmd/kubeadm/app/master/BUILD b/cmd/kubeadm/app/master/BUILD index 3bad43d249b..d5b3bb6f7d5 100644 --- a/cmd/kubeadm/app/master/BUILD +++ b/cmd/kubeadm/app/master/BUILD @@ -30,9 +30,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/client/unversioned/clientcmd/api:go_default_library", diff --git a/cmd/kubeadm/app/master/apiclient.go b/cmd/kubeadm/app/master/apiclient.go index 8966f33c1dd..adde4835132 100644 --- a/cmd/kubeadm/app/master/apiclient.go +++ b/cmd/kubeadm/app/master/apiclient.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/images" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - unversionedapi "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -116,7 +116,7 @@ func NewDaemonSet(daemonName string, podSpec v1.PodSpec) *extensions.DaemonSet { return &extensions.DaemonSet{ ObjectMeta: v1.ObjectMeta{Name: daemonName}, Spec: extensions.DaemonSetSpec{ - Selector: &unversionedapi.LabelSelector{MatchLabels: l}, + Selector: &metav1.LabelSelector{MatchLabels: l}, Template: v1.PodTemplateSpec{ ObjectMeta: v1.ObjectMeta{Labels: l}, Spec: podSpec, @@ -142,7 +142,7 @@ func NewDeployment(deploymentName string, replicas int32, podSpec v1.PodSpec) *e ObjectMeta: v1.ObjectMeta{Name: deploymentName}, Spec: extensions.DeploymentSpec{ Replicas: &replicas, - Selector: &unversionedapi.LabelSelector{MatchLabels: l}, + Selector: &metav1.LabelSelector{MatchLabels: l}, Template: v1.PodTemplateSpec{ ObjectMeta: v1.ObjectMeta{Labels: l}, Spec: podSpec, @@ -171,7 +171,7 @@ func attemptToUpdateMasterRoleLabelsAndTaints(client *clientset.Clientset, sched return err } - n.ObjectMeta.Labels[unversionedapi.NodeLabelKubeadmAlphaRole] = unversionedapi.NodeLabelRoleMaster + n.ObjectMeta.Labels[metav1.NodeLabelKubeadmAlphaRole] = metav1.NodeLabelRoleMaster if !schedulable { taintsAnnotation, _ := json.Marshal([]v1.Taint{{Key: "dedicated", Value: "master", Effect: "NoSchedule"}}) @@ -225,9 +225,9 @@ func SetNodeAffinity(meta *v1.ObjectMeta, expr ...v1.NodeSelectorRequirement) { // MasterNodeAffinity returns v1.NodeSelectorRequirement to be used with SetNodeAffinity to set affinity to master node func MasterNodeAffinity() v1.NodeSelectorRequirement { return v1.NodeSelectorRequirement{ - Key: unversionedapi.NodeLabelKubeadmAlphaRole, + Key: metav1.NodeLabelKubeadmAlphaRole, Operator: v1.NodeSelectorOpIn, - Values: []string{unversionedapi.NodeLabelRoleMaster}, + Values: []string{metav1.NodeLabelRoleMaster}, } } diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go index 62aafd77088..3167cbe9f27 100644 --- a/cmd/kubeadm/app/master/manifests.go +++ b/cmd/kubeadm/app/master/manifests.go @@ -27,7 +27,7 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/images" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api "k8s.io/kubernetes/pkg/api/v1" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/util/intstr" @@ -201,7 +201,7 @@ func componentProbe(port int, path string) *api.Probe { func componentPod(container api.Container, volumes ...api.Volume) api.Pod { return api.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: "v1", Kind: "Pod", }, diff --git a/cmd/kubeadm/app/node/BUILD b/cmd/kubeadm/app/node/BUILD index 3b8d4cf0698..86970ec037b 100644 --- a/cmd/kubeadm/app/node/BUILD +++ b/cmd/kubeadm/app/node/BUILD @@ -45,7 +45,7 @@ go_test( tags = ["automanaged"], deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/cmd/kubeadm/app/node/bootstrap_test.go b/cmd/kubeadm/app/node/bootstrap_test.go index b410b3a8125..0e943bb037d 100644 --- a/cmd/kubeadm/app/node/bootstrap_test.go +++ b/cmd/kubeadm/app/node/bootstrap_test.go @@ -23,7 +23,7 @@ import ( "testing" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/discovery" @@ -40,7 +40,7 @@ func TestEstablishMasterConnection(t *testing.T) { var obj interface{} switch req.URL.Path { case "/api": - obj = &unversioned.APIVersions{ + obj = &metav1.APIVersions{ Versions: []string{ "v1.4", }, @@ -54,11 +54,11 @@ func TestEstablishMasterConnection(t *testing.T) { w.WriteHeader(http.StatusOK) w.Write(output) case "/apis": - obj = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + obj = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "certificates.k8s.io", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, }, @@ -165,7 +165,7 @@ func TestCheckAPIEndpoint(t *testing.T) { var obj interface{} switch req.URL.Path { case "/api": - obj = &unversioned.APIVersions{ + obj = &metav1.APIVersions{ Versions: []string{ "v1.4", }, @@ -196,7 +196,7 @@ func TestCheckAPIEndpoint(t *testing.T) { var obj interface{} switch req.URL.Path { case "/api": - obj = &unversioned.APIVersions{ + obj = &metav1.APIVersions{ Versions: []string{ "v1.4", }, @@ -210,11 +210,11 @@ func TestCheckAPIEndpoint(t *testing.T) { w.WriteHeader(http.StatusOK) w.Write(output) case "/apis": - obj = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + obj = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "certificates.k8s.io", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, }, diff --git a/cmd/kubernetes-discovery/discoverysummarizer/BUILD b/cmd/kubernetes-discovery/discoverysummarizer/BUILD index ec6f5a91c5a..26855b0f28d 100644 --- a/cmd/kubernetes-discovery/discoverysummarizer/BUILD +++ b/cmd/kubernetes-discovery/discoverysummarizer/BUILD @@ -19,6 +19,6 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/kubernetes-discovery/discoverysummarizer/apis/config/v1alpha1:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/cmd/kubernetes-discovery/discoverysummarizer/apis/config/v1alpha1/types.go b/cmd/kubernetes-discovery/discoverysummarizer/apis/config/v1alpha1/types.go index 5451369d6f7..3313e18fe9e 100644 --- a/cmd/kubernetes-discovery/discoverysummarizer/apis/config/v1alpha1/types.go +++ b/cmd/kubernetes-discovery/discoverysummarizer/apis/config/v1alpha1/types.go @@ -38,6 +38,6 @@ type GroupVersionDiscoveryPath struct { Path string `json:"path"` // True if the path is for legacy group version. - // (i.e the path returns unversioned.APIVersions instead of unversioned.APIGroupList) + // (i.e the path returns metav1.APIVersions instead of metav1.APIGroupList) IsLegacy bool `json:"isLegacy"` } diff --git a/cmd/kubernetes-discovery/discoverysummarizer/discoverysummarizer.go b/cmd/kubernetes-discovery/discoverysummarizer/discoverysummarizer.go index 2fe19f62ab8..a6fe19eadd1 100644 --- a/cmd/kubernetes-discovery/discoverysummarizer/discoverysummarizer.go +++ b/cmd/kubernetes-discovery/discoverysummarizer/discoverysummarizer.go @@ -23,7 +23,7 @@ import ( "net/http" config "k8s.io/kubernetes/cmd/kubernetes-discovery/discoverysummarizer/apis/config/v1alpha1" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) type DiscoverySummarizer interface { @@ -101,13 +101,13 @@ func (ds *discoverySummarizerServer) indexHandler(w http.ResponseWriter, r *http // Handler for group versions summarizer. func (ds *discoverySummarizerServer) summarizeGroupVersionsHandler(path string) func(http.ResponseWriter, *http.Request) { return func(w http.ResponseWriter, r *http.Request) { - var apiGroupList *unversioned.APIGroupList + var apiGroupList *metav1.APIGroupList // TODO: We can cache calls to all servers. - groups := make(chan *unversioned.APIGroupList) + groups := make(chan *metav1.APIGroupList) errorChannel := make(chan error) for _, serverAddress := range ds.groupVersionPaths[path] { addr := serverAddress - go func(groups chan *unversioned.APIGroupList, error_channel chan error) { + go func(groups chan *metav1.APIGroupList, error_channel chan error) { groupList, err := ds.getAPIGroupList(addr + path) if err != nil { errorChannel <- err @@ -118,13 +118,13 @@ func (ds *discoverySummarizerServer) summarizeGroupVersionsHandler(path string) }(groups, errorChannel) } - var groupList *unversioned.APIGroupList + var groupList *metav1.APIGroupList var err error for range ds.groupVersionPaths[path] { select { case groupList = <-groups: if apiGroupList == nil { - apiGroupList = &unversioned.APIGroupList{} + apiGroupList = &metav1.APIGroupList{} *apiGroupList = *groupList } else { apiGroupList.Groups = append(apiGroupList.Groups, groupList.Groups...) @@ -158,7 +158,7 @@ func (ds *discoverySummarizerServer) summarizeLegacyVersionsHandler(path string) } } -func (ds *discoverySummarizerServer) getAPIGroupList(serverAddress string) (*unversioned.APIGroupList, error) { +func (ds *discoverySummarizerServer) getAPIGroupList(serverAddress string) (*metav1.APIGroupList, error) { response, err := http.Get(serverAddress) if err != nil { return nil, fmt.Errorf("Error in fetching %s: %v", serverAddress, err) @@ -168,7 +168,7 @@ func (ds *discoverySummarizerServer) getAPIGroupList(serverAddress string) (*unv if err != nil { return nil, fmt.Errorf("Error reading response from %s: %v", serverAddress, err) } - var apiGroupList unversioned.APIGroupList + var apiGroupList metav1.APIGroupList err = json.Unmarshal(contents, &apiGroupList) if err != nil { return nil, fmt.Errorf("Error in unmarshalling response from server %s: %v", serverAddress, err) @@ -176,7 +176,7 @@ func (ds *discoverySummarizerServer) getAPIGroupList(serverAddress string) (*unv return &apiGroupList, nil } -func (ds *discoverySummarizerServer) getAPIVersions(serverAddress string) (*unversioned.APIVersions, error) { +func (ds *discoverySummarizerServer) getAPIVersions(serverAddress string) (*metav1.APIVersions, error) { response, err := http.Get(serverAddress) if err != nil { return nil, fmt.Errorf("Error in fetching %s: %v", serverAddress, err) @@ -186,7 +186,7 @@ func (ds *discoverySummarizerServer) getAPIVersions(serverAddress string) (*unve if err != nil { return nil, fmt.Errorf("Error reading response from %s: %v", serverAddress, err) } - var apiVersions unversioned.APIVersions + var apiVersions metav1.APIVersions err = json.Unmarshal(contents, &apiVersions) if err != nil { return nil, fmt.Errorf("Error in unmarshalling response from server %s: %v", serverAddress, err) diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/BUILD b/cmd/libs/go2idl/client-gen/test_apis/testgroup/BUILD index 1d1d0e66d23..4c77fde7f1c 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/BUILD +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/BUILD @@ -21,7 +21,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/types:go_default_library", diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go index 5ed91f8e080..88ccebfde67 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go index 899361d9a33..616b279d9b2 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go @@ -18,20 +18,20 @@ package testgroup import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true type TestType struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` api.ObjectMeta `json:"metadata,omitempty"` Status TestTypeStatus `json:"status,omitempty"` } type TestTypeList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` Items []TestType `json:"items"` } diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/BUILD b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/BUILD index d629e09d0ea..57f1431470d 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/BUILD +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/BUILD @@ -21,8 +21,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/types:go_default_library", diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go index 3945d71759c..20664385c99 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -41,8 +41,8 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.Status{}, - &unversioned.ExportOptions{}, + &metav1.Status{}, + &metav1.ExportOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go index f22bcb3d754..16582411031 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go index 6b5069e5033..d948c6094ea 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go @@ -18,13 +18,13 @@ package v1 import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true type TestType struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // --- // the next tag removes the field from openapi spec. Adding unversioned objectMeta bring in a whole set of // unversioned objects in the generate file that is not used anywhere other than this test type. @@ -36,9 +36,9 @@ type TestType struct { } type TestTypeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []TestType `json:"items"` } diff --git a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go index 4131c038ab6..6f5580c51f5 100644 --- a/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go +++ b/cmd/libs/go2idl/go-to-protobuf/protobuf/cmd.go @@ -81,7 +81,7 @@ func New() *Generator { `k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1`, `k8s.io/kubernetes/pkg/apis/storage/v1beta1`, }, ","), - DropEmbeddedFields: "k8s.io/kubernetes/pkg/api/unversioned.TypeMeta", + DropEmbeddedFields: "k8s.io/kubernetes/pkg/apis/meta/v1.TypeMeta", } } diff --git a/federation/apis/core/BUILD b/federation/apis/core/BUILD index 6e392668121..25627832898 100644 --- a/federation/apis/core/BUILD +++ b/federation/apis/core/BUILD @@ -20,7 +20,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/runtime:go_default_library", diff --git a/federation/apis/core/conversion.go b/federation/apis/core/conversion.go index b91d22933de..3ef48516977 100644 --- a/federation/apis/core/conversion.go +++ b/federation/apis/core/conversion.go @@ -24,7 +24,7 @@ import ( func addConversionFuncs(scheme *runtime.Scheme) error { // Add non-generated conversion functions return scheme.AddConversionFuncs( - api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta, + api.Convert_v1_TypeMeta_To_v1_TypeMeta, api.Convert_unversioned_ListMeta_To_unversioned_ListMeta, api.Convert_intstr_IntOrString_To_intstr_IntOrString, api.Convert_unversioned_Time_To_unversioned_Time, diff --git a/federation/apis/core/register.go b/federation/apis/core/register.go index b33a9f512e0..25b8a993216 100644 --- a/federation/apis/core/register.go +++ b/federation/apis/core/register.go @@ -18,7 +18,7 @@ package core import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/serializer" @@ -59,7 +59,7 @@ var ( ) func addKnownTypes(scheme *runtime.Scheme) error { - if err := scheme.AddIgnoredConversionType(&unversioned.TypeMeta{}, &unversioned.TypeMeta{}); err != nil { + if err := scheme.AddIgnoredConversionType(&metav1.TypeMeta{}, &metav1.TypeMeta{}); err != nil { return err } scheme.AddKnownTypes(SchemeGroupVersion, @@ -79,12 +79,12 @@ func addKnownTypes(scheme *runtime.Scheme) error { // Register Unversioned types under their own special group scheme.AddUnversionedTypes(Unversioned, - &unversioned.ExportOptions{}, - &unversioned.Status{}, - &unversioned.APIVersions{}, - &unversioned.APIGroupList{}, - &unversioned.APIGroup{}, - &unversioned.APIResourceList{}, + &metav1.ExportOptions{}, + &metav1.Status{}, + &metav1.APIVersions{}, + &metav1.APIGroupList{}, + &metav1.APIGroup{}, + &metav1.APIResourceList{}, ) return nil } diff --git a/federation/apis/core/v1/BUILD b/federation/apis/core/v1/BUILD index b524176657a..ddde51718bc 100644 --- a/federation/apis/core/v1/BUILD +++ b/federation/apis/core/v1/BUILD @@ -21,8 +21,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/watch/versioned:go_default_library", diff --git a/federation/apis/core/v1/register.go b/federation/apis/core/v1/register.go index 202991e0905..bdeec38a704 100644 --- a/federation/apis/core/v1/register.go +++ b/federation/apis/core/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -53,7 +53,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { ) // Add common types - scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.Status{}) + scheme.AddKnownTypes(SchemeGroupVersion, &metav1.Status{}) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/federation/apis/federation/BUILD b/federation/apis/federation/BUILD index b52cd12b941..f73f7268b6c 100644 --- a/federation/apis/federation/BUILD +++ b/federation/apis/federation/BUILD @@ -22,7 +22,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/federation/apis/federation/install/BUILD b/federation/apis/federation/install/BUILD index dd6f6b4e826..00749f8072b 100644 --- a/federation/apis/federation/install/BUILD +++ b/federation/apis/federation/install/BUILD @@ -37,8 +37,8 @@ go_test( "//federation/apis/federation:go_default_library", "//federation/apis/federation/v1beta1:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", ], ) diff --git a/federation/apis/federation/install/install_test.go b/federation/apis/federation/install/install_test.go index a105703adcc..a6d01065118 100644 --- a/federation/apis/federation/install/install_test.go +++ b/federation/apis/federation/install/install_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/runtime" ) @@ -38,7 +38,7 @@ func TestResourceVersioner(t *testing.T) { t.Errorf("unexpected version %v", version) } - clusterList := federation.ClusterList{ListMeta: unversioned.ListMeta{ResourceVersion: "10"}} + clusterList := federation.ClusterList{ListMeta: metav1.ListMeta{ResourceVersion: "10"}} version, err = accessor.ResourceVersion(&clusterList) if err != nil { t.Fatalf("unexpected error: %v", err) diff --git a/federation/apis/federation/types.generated.go b/federation/apis/federation/types.generated.go index b154773ea41..16f29d623a4 100644 --- a/federation/apis/federation/types.generated.go +++ b/federation/apis/federation/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg1_api "k8s.io/kubernetes/pkg/api" - pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/federation/apis/federation/types.go b/federation/apis/federation/types.go index ebd44bc1026..799a39f4617 100644 --- a/federation/apis/federation/types.go +++ b/federation/apis/federation/types.go @@ -18,7 +18,7 @@ package federation import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match. @@ -64,10 +64,10 @@ type ClusterCondition struct { Status api.ConditionStatus `json:"status"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty"` @@ -95,7 +95,7 @@ type ClusterStatus struct { // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation. type Cluster struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -111,11 +111,11 @@ type Cluster struct { // A list of all the kubernetes clusters registered to the federation type ClusterList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // List of Cluster objects. Items []Cluster `json:"items"` diff --git a/federation/apis/federation/v1beta1/BUILD b/federation/apis/federation/v1beta1/BUILD index 635055e300f..8780532e860 100644 --- a/federation/apis/federation/v1beta1/BUILD +++ b/federation/apis/federation/v1beta1/BUILD @@ -28,8 +28,8 @@ go_library( deps = [ "//federation/apis/federation:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/federation/apis/federation/v1beta1/register.go b/federation/apis/federation/v1beta1/register.go index 1edc4445880..0eaa3288c84 100644 --- a/federation/apis/federation/v1beta1/register.go +++ b/federation/apis/federation/v1beta1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -41,7 +41,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/federation/apis/federation/v1beta1/types.generated.go b/federation/apis/federation/v1beta1/types.generated.go index 488be61eeca..4069793a023 100644 --- a/federation/apis/federation/v1beta1/types.generated.go +++ b/federation/apis/federation/v1beta1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg1_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" diff --git a/federation/apis/federation/v1beta1/types.go b/federation/apis/federation/v1beta1/types.go index 84931723952..ffcd5495961 100644 --- a/federation/apis/federation/v1beta1/types.go +++ b/federation/apis/federation/v1beta1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -64,10 +64,10 @@ type ClusterCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -95,7 +95,7 @@ type ClusterStatus struct { // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation. type Cluster struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -111,11 +111,11 @@ type Cluster struct { // A list of all the kubernetes clusters registered to the federation type ClusterList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of Cluster objects. Items []Cluster `json:"items" protobuf:"bytes,2,rep,name=items"` diff --git a/federation/client/cache/cluster_cache.go b/federation/client/cache/cluster_cache.go index 1e14bf1c3db..fc8928bfbc7 100644 --- a/federation/client/cache/cluster_cache.go +++ b/federation/client/cache/cluster_cache.go @@ -22,7 +22,7 @@ import ( kubecache "k8s.io/kubernetes/pkg/client/cache" ) -// StoreToClusterLister makes a Store have the List method of the unversioned.ClusterInterface +// StoreToClusterLister makes a Store have the List method of the metav1.ClusterInterface // The Store must contain (only) clusters. type StoreToClusterLister struct { kubecache.Store diff --git a/federation/cmd/federation-controller-manager/app/options/BUILD b/federation/cmd/federation-controller-manager/app/options/BUILD index e81b21db287..a7a9347c479 100644 --- a/federation/cmd/federation-controller-manager/app/options/BUILD +++ b/federation/cmd/federation-controller-manager/app/options/BUILD @@ -16,8 +16,8 @@ go_library( tags = ["automanaged"], deps = [ "//federation/pkg/dnsprovider:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/componentconfig:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/leaderelection:go_default_library", "//vendor:github.com/spf13/pflag", ], diff --git a/federation/cmd/federation-controller-manager/app/options/options.go b/federation/cmd/federation-controller-manager/app/options/options.go index 970aa1442eb..96cf227b105 100644 --- a/federation/cmd/federation-controller-manager/app/options/options.go +++ b/federation/cmd/federation-controller-manager/app/options/options.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/pflag" "k8s.io/kubernetes/federation/pkg/dnsprovider" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/client/leaderelection" ) @@ -56,7 +56,7 @@ type ControllerManagerConfiguration struct { // management, but more CPU (and network) load. ConcurrentReplicaSetSyncs int `json:"concurrentReplicaSetSyncs"` // clusterMonitorPeriod is the period for syncing ClusterStatus in cluster controller. - ClusterMonitorPeriod unversioned.Duration `json:"clusterMonitorPeriod"` + ClusterMonitorPeriod metav1.Duration `json:"clusterMonitorPeriod"` // APIServerQPS is the QPS to use while talking with federation apiserver. APIServerQPS float32 `json:"federatedAPIQPS"` // APIServerBurst is the burst to use while talking with federation apiserver. @@ -90,7 +90,7 @@ func NewCMServer() *CMServer { Address: "0.0.0.0", ConcurrentServiceSyncs: 10, ConcurrentReplicaSetSyncs: 10, - ClusterMonitorPeriod: unversioned.Duration{Duration: 40 * time.Second}, + ClusterMonitorPeriod: metav1.Duration{Duration: 40 * time.Second}, APIServerQPS: 20.0, APIServerBurst: 30, LeaderElection: leaderelection.DefaultLeaderElectionConfiguration(), diff --git a/federation/pkg/federation-controller/cluster/BUILD b/federation/pkg/federation-controller/cluster/BUILD index 24e5790a900..1c419ff08dc 100644 --- a/federation/pkg/federation-controller/cluster/BUILD +++ b/federation/pkg/federation-controller/cluster/BUILD @@ -24,8 +24,8 @@ go_library( "//federation/client/clientset_generated/federation_release_1_5:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/restclient:go_default_library", @@ -50,8 +50,8 @@ go_test( "//federation/client/clientset_generated/federation_release_1_5:go_default_library", "//federation/pkg/federation-controller/util:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", "//pkg/client/unversioned/clientcmd/api:go_default_library", diff --git a/federation/pkg/federation-controller/cluster/cluster_client.go b/federation/pkg/federation-controller/cluster/cluster_client.go index 5f4c2a3411a..00e0b00da6a 100644 --- a/federation/pkg/federation-controller/cluster/cluster_client.go +++ b/federation/pkg/federation-controller/cluster/cluster_client.go @@ -24,7 +24,7 @@ import ( federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -66,7 +66,7 @@ func NewClusterClientSet(c *federation_v1beta1.Cluster) (*ClusterClient, error) // GetClusterHealthStatus gets the kubernetes cluster health status by requesting "/healthz" func (self *ClusterClient) GetClusterHealthStatus() *federation_v1beta1.ClusterStatus { clusterStatus := federation_v1beta1.ClusterStatus{} - currentTime := unversioned.Now() + currentTime := metav1.Now() newClusterReadyCondition := federation_v1beta1.ClusterCondition{ Type: federation_v1beta1.ClusterReady, Status: v1.ConditionTrue, @@ -120,23 +120,23 @@ func (self *ClusterClient) GetClusterZones() (zones []string, region string, err // Find the name of the zone in which a Node is running func getZoneNameForNode(node api.Node) (string, error) { for key, value := range node.Labels { - if key == unversioned.LabelZoneFailureDomain { + if key == metav1.LabelZoneFailureDomain { return value, nil } } return "", fmt.Errorf("Zone name for node %s not found. No label with key %s", - node.Name, unversioned.LabelZoneFailureDomain) + node.Name, metav1.LabelZoneFailureDomain) } // Find the name of the region in which a Node is running func getRegionNameForNode(node api.Node) (string, error) { for key, value := range node.Labels { - if key == unversioned.LabelZoneRegion { + if key == metav1.LabelZoneRegion { return value, nil } } return "", fmt.Errorf("Region name for node %s not found. No label with key %s", - node.Name, unversioned.LabelZoneRegion) + node.Name, metav1.LabelZoneRegion) } // Find the names of all zones and the region in which we have nodes in this cluster. diff --git a/federation/pkg/federation-controller/cluster/clustercontroller_test.go b/federation/pkg/federation-controller/cluster/clustercontroller_test.go index f76c1b6bc43..67912636e4b 100644 --- a/federation/pkg/federation-controller/cluster/clustercontroller_test.go +++ b/federation/pkg/federation-controller/cluster/clustercontroller_test.go @@ -27,7 +27,7 @@ import ( federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" controllerutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" @@ -37,7 +37,7 @@ import ( func newCluster(clusterName string, serverUrl string) *federationv1beta1.Cluster { cluster := federationv1beta1.Cluster{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()}, + TypeMeta: metav1.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: clusterName, @@ -56,8 +56,8 @@ func newCluster(clusterName string, serverUrl string) *federationv1beta1.Cluster func newClusterList(cluster *federationv1beta1.Cluster) *federationv1beta1.ClusterList { clusterList := federationv1beta1.ClusterList{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()}, - ListMeta: unversioned.ListMeta{ + TypeMeta: metav1.TypeMeta{APIVersion: testapi.Federation.GroupVersion().String()}, + ListMeta: metav1.ListMeta{ SelfLink: "foobar", }, Items: []federationv1beta1.Cluster{}, diff --git a/federation/pkg/federation-controller/daemonset/BUILD b/federation/pkg/federation-controller/daemonset/BUILD index 3bf4643f497..624ca2b24af 100644 --- a/federation/pkg/federation-controller/daemonset/BUILD +++ b/federation/pkg/federation-controller/daemonset/BUILD @@ -48,9 +48,9 @@ go_test( "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/runtime:go_default_library", diff --git a/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go b/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go index 9acdb42a7f9..5e8a95068c5 100644 --- a/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go +++ b/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -88,7 +88,7 @@ func TestDaemonSetController(t *testing.T) { SelfLink: "/api/v1/namespaces/ns/daemonsets/test-daemonset", }, Spec: extensionsv1.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: make(map[string]string), }, }, diff --git a/federation/pkg/federation-controller/namespace/BUILD b/federation/pkg/federation-controller/namespace/BUILD index 78f2435d4b5..8aee96b9d8b 100644 --- a/federation/pkg/federation-controller/namespace/BUILD +++ b/federation/pkg/federation-controller/namespace/BUILD @@ -46,9 +46,9 @@ go_test( "//federation/pkg/federation-controller/util:go_default_library", "//federation/pkg/federation-controller/util/deletionhelper:go_default_library", "//federation/pkg/federation-controller/util/test:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/federation/pkg/federation-controller/namespace/namespace_controller_test.go b/federation/pkg/federation-controller/namespace/namespace_controller_test.go index 58d20185c30..a779f39b963 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller_test.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -156,7 +156,7 @@ func TestNamespaceController(t *testing.T) { // in underlying clusters be as is). // TODO: Add a test without orphan finalizer. ns1.ObjectMeta.Finalizers = append(ns1.ObjectMeta.Finalizers, apiv1.FinalizerOrphan) - ns1.DeletionTimestamp = &unversioned.Time{Time: time.Now()} + ns1.DeletionTimestamp = &metav1.Time{Time: time.Now()} namespaceWatch.Modify(&ns1) assert.Equal(t, ns1.Name, GetStringFromChan(nsDeleteChan)) assert.Equal(t, "all", GetStringFromChan(rsDeleteChan)) diff --git a/federation/pkg/federation-controller/util/podanalyzer/BUILD b/federation/pkg/federation-controller/util/podanalyzer/BUILD index 41f85428ab3..311413d9325 100644 --- a/federation/pkg/federation-controller/util/podanalyzer/BUILD +++ b/federation/pkg/federation-controller/util/podanalyzer/BUILD @@ -16,8 +16,8 @@ go_library( tags = ["automanaged"], deps = [ "//federation/pkg/federation-controller/util:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/labels:go_default_library", ], ) @@ -29,9 +29,9 @@ go_test( tags = ["automanaged"], deps = [ "//federation/pkg/federation-controller/util:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//vendor:github.com/stretchr/testify/assert", ], ) diff --git a/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go b/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go index 493d9172bdc..a9e88c37576 100644 --- a/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go +++ b/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/federation/pkg/federation-controller/util" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/labels" ) @@ -45,8 +45,8 @@ const ( // A function that calculates how many pods from the list are in one of // the meaningful (from the replica set perspective) states. This function is // a temporary workaround against the current lack of ownerRef in pods. -func AnalysePods(selectorv1 *unversioned.LabelSelector, allPods []util.FederatedObject, currentTime time.Time) (map[string]PodAnalysisResult, error) { - selector, err := unversioned.LabelSelectorAsSelector(selectorv1) +func AnalysePods(selectorv1 *metav1.LabelSelector, allPods []util.FederatedObject, currentTime time.Time) (map[string]PodAnalysisResult, error) { + selector, err := metav1.LabelSelectorAsSelector(selectorv1) if err != nil { return nil, fmt.Errorf("invalid selector: %v", err) } diff --git a/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go b/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go index fea46fc5163..6874e465721 100644 --- a/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go +++ b/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/federation/pkg/federation-controller/util" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -50,7 +50,7 @@ func TestAnalyze(t *testing.T) { Type: api_v1.PodScheduled, Status: api_v1.ConditionFalse, Reason: "Unschedulable", - LastTransitionTime: unversioned.Time{Time: now.Add(-10 * time.Minute)}, + LastTransitionTime: metav1.Time{Time: now.Add(-10 * time.Minute)}, }, }, }) @@ -101,7 +101,7 @@ func newReplicaSet(selectorMap map[string]string) *v1beta1.ReplicaSet { }, Spec: v1beta1.ReplicaSetSpec{ Replicas: &replicas, - Selector: &unversioned.LabelSelector{MatchLabels: selectorMap}, + Selector: &metav1.LabelSelector{MatchLabels: selectorMap}, }, } return rs diff --git a/federation/pkg/kubefed/BUILD b/federation/pkg/kubefed/BUILD index 8a9ecccf6f5..503d399837a 100644 --- a/federation/pkg/kubefed/BUILD +++ b/federation/pkg/kubefed/BUILD @@ -55,8 +55,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", diff --git a/federation/pkg/kubefed/init/BUILD b/federation/pkg/kubefed/init/BUILD index e515acbb949..a2c676d690e 100644 --- a/federation/pkg/kubefed/init/BUILD +++ b/federation/pkg/kubefed/init/BUILD @@ -46,9 +46,9 @@ go_test( "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index 09ea41526d2..a407a2d3651 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/federation/pkg/kubefed/init/init_test.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/restclient/fake" @@ -405,7 +405,7 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, replicas := int32(1) namespace := v1.Namespace{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Namespace", APIVersion: testapi.Default.GroupVersion().String(), }, @@ -415,7 +415,7 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, } svc := v1.Service{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Service", APIVersion: testapi.Default.GroupVersion().String(), }, @@ -450,7 +450,7 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, } credSecret := v1.Secret{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: testapi.Default.GroupVersion().String(), }, @@ -462,7 +462,7 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, } cmKubeconfigSecret := v1.Secret{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: testapi.Default.GroupVersion().String(), }, @@ -474,7 +474,7 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, } pvc := v1.PersistentVolumeClaim{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "PersistentVolumeClaim", APIVersion: testapi.Default.GroupVersion().String(), }, @@ -499,7 +499,7 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, } apiserver := v1beta1.Deployment{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Deployment", APIVersion: testapi.Extensions.GroupVersion().String(), }, @@ -592,7 +592,7 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, cmName := federationName + "-controller-manager" cm := v1beta1.Deployment{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Deployment", APIVersion: testapi.Extensions.GroupVersion().String(), }, diff --git a/federation/pkg/kubefed/join_test.go b/federation/pkg/kubefed/join_test.go index ca0de21e123..f9f02419c9c 100644 --- a/federation/pkg/kubefed/join_test.go +++ b/federation/pkg/kubefed/join_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/federation/pkg/kubefed/util" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/dynamic" @@ -233,7 +233,7 @@ func fakeJoinHostFactory(clusterName, clusterCtx, secretName, server, token stri return nil, err } secretObject := v1.Secret{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: "v1", }, diff --git a/federation/pkg/kubefed/unjoin_test.go b/federation/pkg/kubefed/unjoin_test.go index bc89ab725a3..aeeb90c3cbc 100644 --- a/federation/pkg/kubefed/unjoin_test.go +++ b/federation/pkg/kubefed/unjoin_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/dynamic" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" @@ -183,7 +183,7 @@ func testUnjoinFederationFactory(name, server, secret string) cmdutil.Factory { case http.MethodGet: return &http.Response{StatusCode: http.StatusOK, Header: kubefedtesting.DefaultHeader(), Body: kubefedtesting.ObjBody(codec, &cluster)}, nil case http.MethodDelete: - status := unversioned.Status{ + status := metav1.Status{ Status: "Success", } return &http.Response{StatusCode: http.StatusOK, Header: kubefedtesting.DefaultHeader(), Body: kubefedtesting.ObjBody(codec, &status)}, nil @@ -213,7 +213,7 @@ func fakeUnjoinHostFactory(name string) cmdutil.Factory { if got != name { return nil, errors.NewNotFound(api.Resource("secrets"), got) } - status := unversioned.Status{ + status := metav1.Status{ Status: "Success", } return &http.Response{StatusCode: http.StatusOK, Header: kubefedtesting.DefaultHeader(), Body: kubefedtesting.ObjBody(codec, &status)}, nil diff --git a/pkg/api/BUILD b/pkg/api/BUILD index 723ff0b52b1..84810d8cd85 100644 --- a/pkg/api/BUILD +++ b/pkg/api/BUILD @@ -35,7 +35,7 @@ go_library( "//pkg/api/meta:go_default_library", "//pkg/api/meta/metatypes:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/auth/user:go_default_library", "//pkg/conversion:go_default_library", "//pkg/fields:go_default_library", @@ -70,7 +70,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/labels:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", @@ -96,12 +96,12 @@ go_test( "//pkg/api/meta/metatypes:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/api/conversion.go b/pkg/api/conversion.go index 34fd1a1e872..600ba54313a 100644 --- a/pkg/api/conversion.go +++ b/pkg/api/conversion.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -32,7 +32,7 @@ import ( func addConversionFuncs(scheme *runtime.Scheme) error { return scheme.AddConversionFuncs( - Convert_unversioned_TypeMeta_To_unversioned_TypeMeta, + Convert_v1_TypeMeta_To_v1_TypeMeta, Convert_unversioned_ListMeta_To_unversioned_ListMeta, @@ -154,7 +154,7 @@ func Convert_bool_To_Pointer_bool(in *bool, out **bool, s conversion.Scope) erro } // +k8s:conversion-fn=drop -func Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(in, out *unversioned.TypeMeta, s conversion.Scope) error { +func Convert_v1_TypeMeta_To_v1_TypeMeta(in, out *metav1.TypeMeta, s conversion.Scope) error { // These values are explicitly not copied //out.APIVersion = in.APIVersion //out.Kind = in.Kind @@ -162,7 +162,7 @@ func Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(in, out *unversioned.T } // +k8s:conversion-fn=copy-only -func Convert_unversioned_ListMeta_To_unversioned_ListMeta(in, out *unversioned.ListMeta, s conversion.Scope) error { +func Convert_unversioned_ListMeta_To_unversioned_ListMeta(in, out *metav1.ListMeta, s conversion.Scope) error { *out = *in return nil } @@ -174,14 +174,14 @@ func Convert_intstr_IntOrString_To_intstr_IntOrString(in, out *intstr.IntOrStrin } // +k8s:conversion-fn=copy-only -func Convert_unversioned_Time_To_unversioned_Time(in *unversioned.Time, out *unversioned.Time, s conversion.Scope) error { +func Convert_unversioned_Time_To_unversioned_Time(in *metav1.Time, out *metav1.Time, s conversion.Scope) error { // Cannot deep copy these, because time.Time has unexported fields. *out = *in return nil } // Convert_Slice_string_To_unversioned_Time allows converting a URL query parameter value -func Convert_Slice_string_To_unversioned_Time(input *[]string, out *unversioned.Time, s conversion.Scope) error { +func Convert_Slice_string_To_unversioned_Time(input *[]string, out *metav1.Time, s conversion.Scope) error { str := "" if len(*input) > 0 { str = (*input)[0] @@ -229,20 +229,20 @@ func Convert_resource_Quantity_To_resource_Quantity(in *resource.Quantity, out * return nil } -func Convert_map_to_unversioned_LabelSelector(in *map[string]string, out *unversioned.LabelSelector, s conversion.Scope) error { +func Convert_map_to_unversioned_LabelSelector(in *map[string]string, out *metav1.LabelSelector, s conversion.Scope) error { if in == nil { return nil } - out = new(unversioned.LabelSelector) + out = new(metav1.LabelSelector) for labelKey, labelValue := range *in { utillabels.AddLabelToSelector(out, labelKey, labelValue) } return nil } -func Convert_unversioned_LabelSelector_to_map(in *unversioned.LabelSelector, out *map[string]string, s conversion.Scope) error { +func Convert_unversioned_LabelSelector_to_map(in *metav1.LabelSelector, out *map[string]string, s conversion.Scope) error { var err error - *out, err = unversioned.LabelSelectorAsMap(in) + *out, err = metav1.LabelSelectorAsMap(in) if err != nil { err = field.Invalid(field.NewPath("labelSelector"), *in, fmt.Sprintf("cannot convert to old selector: %v", err)) } diff --git a/pkg/api/deep_copy_test.go b/pkg/api/deep_copy_test.go index 5c85edbcb52..39bc858c0af 100644 --- a/pkg/api/deep_copy_test.go +++ b/pkg/api/deep_copy_test.go @@ -23,21 +23,21 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" ) -func parseTimeOrDie(ts string) unversioned.Time { +func parseTimeOrDie(ts string) metav1.Time { t, err := time.Parse(time.RFC3339, ts) if err != nil { panic(err) } - return unversioned.Time{Time: t} + return metav1.Time{Time: t} } var benchmarkPod api.Pod = api.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, diff --git a/pkg/api/defaulting_test.go b/pkg/api/defaulting_test.go index 782a95ff548..4cc34613834 100644 --- a/pkg/api/defaulting_test.go +++ b/pkg/api/defaulting_test.go @@ -25,7 +25,7 @@ import ( "github.com/google/gofuzz" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -117,7 +117,7 @@ func TestDefaulting(t *testing.T) { f := fuzz.New().NilChance(.5).NumElements(1, 1).RandSource(rand.NewSource(1)) f.Funcs( func(s *runtime.RawExtension, c fuzz.Continue) {}, - func(s *unversioned.LabelSelector, c fuzz.Continue) { + func(s *metav1.LabelSelector, c fuzz.Continue) { c.FuzzNoCustom(s) s.MatchExpressions = nil // need to fuzz this specially }, diff --git a/pkg/api/errors/BUILD b/pkg/api/errors/BUILD index 37c00a0d8e8..fe2104d9ed8 100644 --- a/pkg/api/errors/BUILD +++ b/pkg/api/errors/BUILD @@ -18,7 +18,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/util/validation/field:go_default_library", @@ -32,7 +32,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/util/validation/field:go_default_library", diff --git a/pkg/api/errors/errors.go b/pkg/api/errors/errors.go index 08760b90550..b71d5eaef62 100644 --- a/pkg/api/errors/errors.go +++ b/pkg/api/errors/errors.go @@ -22,7 +22,7 @@ import ( "net/http" "strings" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/validation/field" @@ -41,13 +41,13 @@ const ( // StatusError is an error intended for consumption by a REST API server; it can also be // reconstructed by clients from a REST response. Public to allow easy type switches. type StatusError struct { - ErrStatus unversioned.Status + ErrStatus metav1.Status } // APIStatus is exposed by errors that can be converted to an api.Status object // for finer grained details. type APIStatus interface { - Status() unversioned.Status + Status() metav1.Status } var _ error = &StatusError{} @@ -59,7 +59,7 @@ func (e *StatusError) Error() string { // Status allows access to e's status without having to know the detailed workings // of StatusError. Used by pkg/apiserver. -func (e *StatusError) Status() unversioned.Status { +func (e *StatusError) Status() metav1.Status { return e.ErrStatus } @@ -81,11 +81,11 @@ func (u *UnexpectedObjectError) Error() string { return fmt.Sprintf("unexpected object: %v", u.Object) } -// FromObject generates an StatusError from an unversioned.Status, if that is the type of obj; otherwise, +// FromObject generates an StatusError from an metav1.Status, if that is the type of obj; otherwise, // returns an UnexpecteObjectError. func FromObject(obj runtime.Object) error { switch t := obj.(type) { - case *unversioned.Status: + case *metav1.Status: return &StatusError{*t} } return &UnexpectedObjectError{obj} @@ -93,11 +93,11 @@ func FromObject(obj runtime.Object) error { // NewNotFound returns a new error which indicates that the resource of the kind and the name was not found. func NewNotFound(qualifiedResource schema.GroupResource, name string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusNotFound, - Reason: unversioned.StatusReasonNotFound, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonNotFound, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -108,11 +108,11 @@ func NewNotFound(qualifiedResource schema.GroupResource, name string) *StatusErr // NewAlreadyExists returns an error indicating the item requested exists by that identifier. func NewAlreadyExists(qualifiedResource schema.GroupResource, name string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusConflict, - Reason: unversioned.StatusReasonAlreadyExists, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonAlreadyExists, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -128,21 +128,21 @@ func NewUnauthorized(reason string) *StatusError { if len(message) == 0 { message = "not authorized" } - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusUnauthorized, - Reason: unversioned.StatusReasonUnauthorized, + Reason: metav1.StatusReasonUnauthorized, Message: message, }} } // NewForbidden returns an error indicating the requested action was forbidden func NewForbidden(qualifiedResource schema.GroupResource, name string, err error) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusForbidden, - Reason: unversioned.StatusReasonForbidden, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonForbidden, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -153,11 +153,11 @@ func NewForbidden(qualifiedResource schema.GroupResource, name string, err error // NewConflict returns an error indicating the item can't be updated as provided. func NewConflict(qualifiedResource schema.GroupResource, name string, err error) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusConflict, - Reason: unversioned.StatusReasonConflict, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonConflict, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -168,30 +168,30 @@ func NewConflict(qualifiedResource schema.GroupResource, name string, err error) // NewGone returns an error indicating the item no longer available at the server and no forwarding address is known. func NewGone(message string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusGone, - Reason: unversioned.StatusReasonGone, + Reason: metav1.StatusReasonGone, Message: message, }} } // NewInvalid returns an error indicating the item is invalid and cannot be processed. func NewInvalid(qualifiedKind schema.GroupKind, name string, errs field.ErrorList) *StatusError { - causes := make([]unversioned.StatusCause, 0, len(errs)) + causes := make([]metav1.StatusCause, 0, len(errs)) for i := range errs { err := errs[i] - causes = append(causes, unversioned.StatusCause{ - Type: unversioned.CauseType(err.Type), + causes = append(causes, metav1.StatusCause{ + Type: metav1.CauseType(err.Type), Message: err.ErrorBody(), Field: err.Field, }) } - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: StatusUnprocessableEntity, // RFC 4918: StatusUnprocessableEntity - Reason: unversioned.StatusReasonInvalid, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonInvalid, + Details: &metav1.StatusDetails{ Group: qualifiedKind.Group, Kind: qualifiedKind.Kind, Name: name, @@ -203,31 +203,31 @@ func NewInvalid(qualifiedKind schema.GroupKind, name string, errs field.ErrorLis // NewBadRequest creates an error that indicates that the request is invalid and can not be processed. func NewBadRequest(reason string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusBadRequest, - Reason: unversioned.StatusReasonBadRequest, + Reason: metav1.StatusReasonBadRequest, Message: reason, }} } // NewServiceUnavailable creates an error that indicates that the requested service is unavailable. func NewServiceUnavailable(reason string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusServiceUnavailable, - Reason: unversioned.StatusReasonServiceUnavailable, + Reason: metav1.StatusReasonServiceUnavailable, Message: reason, }} } // NewMethodNotSupported returns an error indicating the requested action is not supported on this kind. func NewMethodNotSupported(qualifiedResource schema.GroupResource, action string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusMethodNotAllowed, - Reason: unversioned.StatusReasonMethodNotAllowed, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonMethodNotAllowed, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, }, @@ -238,11 +238,11 @@ func NewMethodNotSupported(qualifiedResource schema.GroupResource, action string // NewServerTimeout returns an error indicating the requested action could not be completed due to a // transient error, and the client should try again. func NewServerTimeout(qualifiedResource schema.GroupResource, operation string, retryAfterSeconds int) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusInternalServerError, - Reason: unversioned.StatusReasonServerTimeout, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonServerTimeout, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: operation, @@ -260,12 +260,12 @@ func NewServerTimeoutForKind(qualifiedKind schema.GroupKind, operation string, r // NewInternalError returns an error indicating the item is invalid and cannot be processed. func NewInternalError(err error) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusInternalServerError, - Reason: unversioned.StatusReasonInternalError, - Details: &unversioned.StatusDetails{ - Causes: []unversioned.StatusCause{{Message: err.Error()}}, + Reason: metav1.StatusReasonInternalError, + Details: &metav1.StatusDetails{ + Causes: []metav1.StatusCause{{Message: err.Error()}}, }, Message: fmt.Sprintf("Internal error occurred: %v", err), }} @@ -274,12 +274,12 @@ func NewInternalError(err error) *StatusError { // NewTimeoutError returns an error indicating that a timeout occurred before the request // could be completed. Clients may retry, but the operation may still complete. func NewTimeoutError(message string, retryAfterSeconds int) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: StatusServerTimeout, - Reason: unversioned.StatusReasonTimeout, + Reason: metav1.StatusReasonTimeout, Message: fmt.Sprintf("Timeout: %s", message), - Details: &unversioned.StatusDetails{ + Details: &metav1.StatusDetails{ RetryAfterSeconds: int32(retryAfterSeconds), }, }} @@ -287,43 +287,43 @@ func NewTimeoutError(message string, retryAfterSeconds int) *StatusError { // NewGenericServerResponse returns a new error for server responses that are not in a recognizable form. func NewGenericServerResponse(code int, verb string, qualifiedResource schema.GroupResource, name, serverMessage string, retryAfterSeconds int, isUnexpectedResponse bool) *StatusError { - reason := unversioned.StatusReasonUnknown + reason := metav1.StatusReasonUnknown message := fmt.Sprintf("the server responded with the status code %d but did not return more information", code) switch code { case http.StatusConflict: if verb == "POST" { - reason = unversioned.StatusReasonAlreadyExists + reason = metav1.StatusReasonAlreadyExists } else { - reason = unversioned.StatusReasonConflict + reason = metav1.StatusReasonConflict } message = "the server reported a conflict" case http.StatusNotFound: - reason = unversioned.StatusReasonNotFound + reason = metav1.StatusReasonNotFound message = "the server could not find the requested resource" case http.StatusBadRequest: - reason = unversioned.StatusReasonBadRequest + reason = metav1.StatusReasonBadRequest message = "the server rejected our request for an unknown reason" case http.StatusUnauthorized: - reason = unversioned.StatusReasonUnauthorized + reason = metav1.StatusReasonUnauthorized message = "the server has asked for the client to provide credentials" case http.StatusForbidden: - reason = unversioned.StatusReasonForbidden + reason = metav1.StatusReasonForbidden message = "the server does not allow access to the requested resource" case http.StatusMethodNotAllowed: - reason = unversioned.StatusReasonMethodNotAllowed + reason = metav1.StatusReasonMethodNotAllowed message = "the server does not allow this method on the requested resource" case StatusUnprocessableEntity: - reason = unversioned.StatusReasonInvalid + reason = metav1.StatusReasonInvalid message = "the server rejected our request due to an error in our request" case StatusServerTimeout: - reason = unversioned.StatusReasonServerTimeout + reason = metav1.StatusReasonServerTimeout message = "the server cannot complete the requested operation at this time, try again later" case StatusTooManyRequests: - reason = unversioned.StatusReasonTimeout + reason = metav1.StatusReasonTimeout message = "the server has received too many requests and has asked us to try again later" default: if code >= 500 { - reason = unversioned.StatusReasonInternalError + reason = metav1.StatusReasonInternalError message = fmt.Sprintf("an error on the server (%q) has prevented the request from succeeding", serverMessage) } } @@ -333,22 +333,22 @@ func NewGenericServerResponse(code int, verb string, qualifiedResource schema.Gr case !qualifiedResource.Empty(): message = fmt.Sprintf("%s (%s %s)", message, strings.ToLower(verb), qualifiedResource.String()) } - var causes []unversioned.StatusCause + var causes []metav1.StatusCause if isUnexpectedResponse { - causes = []unversioned.StatusCause{ + causes = []metav1.StatusCause{ { - Type: unversioned.CauseTypeUnexpectedServerResponse, + Type: metav1.CauseTypeUnexpectedServerResponse, Message: serverMessage, }, } } else { causes = nil } - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: int32(code), Reason: reason, - Details: &unversioned.StatusDetails{ + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -362,56 +362,56 @@ func NewGenericServerResponse(code int, verb string, qualifiedResource schema.Gr // IsNotFound returns true if the specified error was created by NewNotFound. func IsNotFound(err error) bool { - return reasonForError(err) == unversioned.StatusReasonNotFound + return reasonForError(err) == metav1.StatusReasonNotFound } // IsAlreadyExists determines if the err is an error which indicates that a specified resource already exists. func IsAlreadyExists(err error) bool { - return reasonForError(err) == unversioned.StatusReasonAlreadyExists + return reasonForError(err) == metav1.StatusReasonAlreadyExists } // IsConflict determines if the err is an error which indicates the provided update conflicts. func IsConflict(err error) bool { - return reasonForError(err) == unversioned.StatusReasonConflict + return reasonForError(err) == metav1.StatusReasonConflict } // IsInvalid determines if the err is an error which indicates the provided resource is not valid. func IsInvalid(err error) bool { - return reasonForError(err) == unversioned.StatusReasonInvalid + return reasonForError(err) == metav1.StatusReasonInvalid } // IsMethodNotSupported determines if the err is an error which indicates the provided action could not // be performed because it is not supported by the server. func IsMethodNotSupported(err error) bool { - return reasonForError(err) == unversioned.StatusReasonMethodNotAllowed + return reasonForError(err) == metav1.StatusReasonMethodNotAllowed } // IsBadRequest determines if err is an error which indicates that the request is invalid. func IsBadRequest(err error) bool { - return reasonForError(err) == unversioned.StatusReasonBadRequest + return reasonForError(err) == metav1.StatusReasonBadRequest } // IsUnauthorized determines if err is an error which indicates that the request is unauthorized and // requires authentication by the user. func IsUnauthorized(err error) bool { - return reasonForError(err) == unversioned.StatusReasonUnauthorized + return reasonForError(err) == metav1.StatusReasonUnauthorized } // IsForbidden determines if err is an error which indicates that the request is forbidden and cannot // be completed as requested. func IsForbidden(err error) bool { - return reasonForError(err) == unversioned.StatusReasonForbidden + return reasonForError(err) == metav1.StatusReasonForbidden } // IsServerTimeout determines if err is an error which indicates that the request needs to be retried // by the client. func IsServerTimeout(err error) bool { - return reasonForError(err) == unversioned.StatusReasonServerTimeout + return reasonForError(err) == metav1.StatusReasonServerTimeout } // IsInternalError determines if err is an error which indicates an internal server error. func IsInternalError(err error) bool { - return reasonForError(err) == unversioned.StatusReasonInternalError + return reasonForError(err) == metav1.StatusReasonInternalError } // IsTooManyRequests determines if err is an error which indicates that there are too many requests @@ -432,7 +432,7 @@ func IsUnexpectedServerError(err error) bool { case APIStatus: if d := t.Status().Details; d != nil { for _, cause := range d.Causes { - if cause.Type == unversioned.CauseTypeUnexpectedServerResponse { + if cause.Type == metav1.CauseTypeUnexpectedServerResponse { return true } } @@ -454,7 +454,7 @@ func SuggestsClientDelay(err error) (int, bool) { case APIStatus: if t.Status().Details != nil { switch t.Status().Reason { - case unversioned.StatusReasonServerTimeout, unversioned.StatusReasonTimeout: + case metav1.StatusReasonServerTimeout, metav1.StatusReasonTimeout: return int(t.Status().Details.RetryAfterSeconds), true } } @@ -462,10 +462,10 @@ func SuggestsClientDelay(err error) (int, bool) { return 0, false } -func reasonForError(err error) unversioned.StatusReason { +func reasonForError(err error) metav1.StatusReason { switch t := err.(type) { case APIStatus: return t.Status().Reason } - return unversioned.StatusReasonUnknown + return metav1.StatusReasonUnknown } diff --git a/pkg/api/errors/errors_test.go b/pkg/api/errors/errors_test.go index d602da1bdc8..c5b6841f9df 100644 --- a/pkg/api/errors/errors_test.go +++ b/pkg/api/errors/errors_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/validation/field" @@ -32,118 +32,118 @@ import ( func TestErrorNew(t *testing.T) { err := NewAlreadyExists(api.Resource("tests"), "1") if !IsAlreadyExists(err) { - t.Errorf("expected to be %s", unversioned.StatusReasonAlreadyExists) + t.Errorf("expected to be %s", metav1.StatusReasonAlreadyExists) } if IsConflict(err) { - t.Errorf("expected to not be %s", unversioned.StatusReasonConflict) + t.Errorf("expected to not be %s", metav1.StatusReasonConflict) } if IsNotFound(err) { - t.Errorf(fmt.Sprintf("expected to not be %s", unversioned.StatusReasonNotFound)) + t.Errorf(fmt.Sprintf("expected to not be %s", metav1.StatusReasonNotFound)) } if IsInvalid(err) { - t.Errorf("expected to not be %s", unversioned.StatusReasonInvalid) + t.Errorf("expected to not be %s", metav1.StatusReasonInvalid) } if IsBadRequest(err) { - t.Errorf("expected to not be %s", unversioned.StatusReasonBadRequest) + t.Errorf("expected to not be %s", metav1.StatusReasonBadRequest) } if IsForbidden(err) { - t.Errorf("expected to not be %s", unversioned.StatusReasonForbidden) + t.Errorf("expected to not be %s", metav1.StatusReasonForbidden) } if IsServerTimeout(err) { - t.Errorf("expected to not be %s", unversioned.StatusReasonServerTimeout) + t.Errorf("expected to not be %s", metav1.StatusReasonServerTimeout) } if IsMethodNotSupported(err) { - t.Errorf("expected to not be %s", unversioned.StatusReasonMethodNotAllowed) + t.Errorf("expected to not be %s", metav1.StatusReasonMethodNotAllowed) } if !IsConflict(NewConflict(api.Resource("tests"), "2", errors.New("message"))) { t.Errorf("expected to be conflict") } if !IsNotFound(NewNotFound(api.Resource("tests"), "3")) { - t.Errorf("expected to be %s", unversioned.StatusReasonNotFound) + t.Errorf("expected to be %s", metav1.StatusReasonNotFound) } if !IsInvalid(NewInvalid(api.Kind("Test"), "2", nil)) { - t.Errorf("expected to be %s", unversioned.StatusReasonInvalid) + t.Errorf("expected to be %s", metav1.StatusReasonInvalid) } if !IsBadRequest(NewBadRequest("reason")) { - t.Errorf("expected to be %s", unversioned.StatusReasonBadRequest) + t.Errorf("expected to be %s", metav1.StatusReasonBadRequest) } if !IsForbidden(NewForbidden(api.Resource("tests"), "2", errors.New("reason"))) { - t.Errorf("expected to be %s", unversioned.StatusReasonForbidden) + t.Errorf("expected to be %s", metav1.StatusReasonForbidden) } if !IsUnauthorized(NewUnauthorized("reason")) { - t.Errorf("expected to be %s", unversioned.StatusReasonUnauthorized) + t.Errorf("expected to be %s", metav1.StatusReasonUnauthorized) } if !IsServerTimeout(NewServerTimeout(api.Resource("tests"), "reason", 0)) { - t.Errorf("expected to be %s", unversioned.StatusReasonServerTimeout) + t.Errorf("expected to be %s", metav1.StatusReasonServerTimeout) } if time, ok := SuggestsClientDelay(NewServerTimeout(api.Resource("tests"), "doing something", 10)); time != 10 || !ok { - t.Errorf("expected to be %s", unversioned.StatusReasonServerTimeout) + t.Errorf("expected to be %s", metav1.StatusReasonServerTimeout) } if time, ok := SuggestsClientDelay(NewTimeoutError("test reason", 10)); time != 10 || !ok { - t.Errorf("expected to be %s", unversioned.StatusReasonTimeout) + t.Errorf("expected to be %s", metav1.StatusReasonTimeout) } if !IsMethodNotSupported(NewMethodNotSupported(api.Resource("foos"), "delete")) { - t.Errorf("expected to be %s", unversioned.StatusReasonMethodNotAllowed) + t.Errorf("expected to be %s", metav1.StatusReasonMethodNotAllowed) } } func TestNewInvalid(t *testing.T) { testCases := []struct { Err *field.Error - Details *unversioned.StatusDetails + Details *metav1.StatusDetails }{ { field.Duplicate(field.NewPath("field[0].name"), "bar"), - &unversioned.StatusDetails{ + &metav1.StatusDetails{ Kind: "Kind", Name: "name", - Causes: []unversioned.StatusCause{{ - Type: unversioned.CauseTypeFieldValueDuplicate, + Causes: []metav1.StatusCause{{ + Type: metav1.CauseTypeFieldValueDuplicate, Field: "field[0].name", }}, }, }, { field.Invalid(field.NewPath("field[0].name"), "bar", "detail"), - &unversioned.StatusDetails{ + &metav1.StatusDetails{ Kind: "Kind", Name: "name", - Causes: []unversioned.StatusCause{{ - Type: unversioned.CauseTypeFieldValueInvalid, + Causes: []metav1.StatusCause{{ + Type: metav1.CauseTypeFieldValueInvalid, Field: "field[0].name", }}, }, }, { field.NotFound(field.NewPath("field[0].name"), "bar"), - &unversioned.StatusDetails{ + &metav1.StatusDetails{ Kind: "Kind", Name: "name", - Causes: []unversioned.StatusCause{{ - Type: unversioned.CauseTypeFieldValueNotFound, + Causes: []metav1.StatusCause{{ + Type: metav1.CauseTypeFieldValueNotFound, Field: "field[0].name", }}, }, }, { field.NotSupported(field.NewPath("field[0].name"), "bar", nil), - &unversioned.StatusDetails{ + &metav1.StatusDetails{ Kind: "Kind", Name: "name", - Causes: []unversioned.StatusCause{{ - Type: unversioned.CauseTypeFieldValueNotSupported, + Causes: []metav1.StatusCause{{ + Type: metav1.CauseTypeFieldValueNotSupported, Field: "field[0].name", }}, }, }, { field.Required(field.NewPath("field[0].name"), ""), - &unversioned.StatusDetails{ + &metav1.StatusDetails{ Kind: "Kind", Name: "name", - Causes: []unversioned.StatusCause{{ - Type: unversioned.CauseTypeFieldValueRequired, + Causes: []metav1.StatusCause{{ + Type: metav1.CauseTypeFieldValueRequired, Field: "field[0].name", }}, }, @@ -154,7 +154,7 @@ func TestNewInvalid(t *testing.T) { expected.Causes[0].Message = vErr.ErrorBody() err := NewInvalid(api.Kind("Kind"), "name", field.ErrorList{vErr}) status := err.ErrStatus - if status.Code != 422 || status.Reason != unversioned.StatusReasonInvalid { + if status.Code != 422 || status.Reason != metav1.StatusReasonInvalid { t.Errorf("%d: unexpected status: %#v", i, status) } if !reflect.DeepEqual(expected, status.Details) { @@ -164,7 +164,7 @@ func TestNewInvalid(t *testing.T) { } func Test_reasonForError(t *testing.T) { - if e, a := unversioned.StatusReasonUnknown, reasonForError(nil); e != a { + if e, a := metav1.StatusReasonUnknown, reasonForError(nil); e != a { t.Errorf("unexpected reason type: %#v", a) } } @@ -178,7 +178,7 @@ func TestFromObject(t *testing.T) { obj runtime.Object message string }{ - {&unversioned.Status{Message: "foobar"}, "foobar"}, + {&metav1.Status{Message: "foobar"}, "foobar"}, {&TestType{}, "unexpected object: &{}"}, } diff --git a/pkg/api/events/BUILD b/pkg/api/events/BUILD index dfde78d383b..a1665c304a2 100644 --- a/pkg/api/events/BUILD +++ b/pkg/api/events/BUILD @@ -24,6 +24,6 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/pkg/api/events/sorted_event_list_test.go b/pkg/api/events/sorted_event_list_test.go index bf2e2e6bcb2..ca1daa774f3 100644 --- a/pkg/api/events/sorted_event_list_test.go +++ b/pkg/api/events/sorted_event_list_test.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestSortableEvents(t *testing.T) { @@ -31,24 +31,24 @@ func TestSortableEvents(t *testing.T) { { Source: api.EventSource{Component: "kubelet"}, Message: "Item 1", - FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, { Source: api.EventSource{Component: "scheduler"}, Message: "Item 2", - FirstTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, { Source: api.EventSource{Component: "kubelet"}, Message: "Item 3", - FirstTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, diff --git a/pkg/api/helpers.go b/pkg/api/helpers.go index 58d1a33b532..dc7db863a4b 100644 --- a/pkg/api/helpers.go +++ b/pkg/api/helpers.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -61,7 +61,7 @@ var Semantic = conversion.EqualitiesOrDie( // Uninitialized quantities are equivalent to 0 quantities. return a.Cmp(b) == 0 }, - func(a, b unversioned.Time) bool { + func(a, b metav1.Time) bool { return a.UTC() == b.UTC() }, func(a, b labels.Selector) bool { @@ -397,15 +397,15 @@ func containsAccessMode(modes []PersistentVolumeAccessMode, mode PersistentVolum } // ParseRFC3339 parses an RFC3339 date in either RFC3339Nano or RFC3339 format. -func ParseRFC3339(s string, nowFn func() unversioned.Time) (unversioned.Time, error) { +func ParseRFC3339(s string, nowFn func() metav1.Time) (metav1.Time, error) { if t, timeErr := time.Parse(time.RFC3339Nano, s); timeErr == nil { - return unversioned.Time{Time: t}, nil + return metav1.Time{Time: t}, nil } t, err := time.Parse(time.RFC3339, s) if err != nil { - return unversioned.Time{}, err + return metav1.Time{}, err } - return unversioned.Time{Time: t}, nil + return metav1.Time{Time: t}, nil } // NodeSelectorRequirementsAsSelector converts the []NodeSelectorRequirement api type into a struct that implements diff --git a/pkg/api/install/BUILD b/pkg/api/install/BUILD index 44ffc1f8377..5f167384c55 100644 --- a/pkg/api/install/BUILD +++ b/pkg/api/install/BUILD @@ -34,8 +34,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", ], diff --git a/pkg/api/install/install_test.go b/pkg/api/install/install_test.go index 47b418e6bb0..7fdd05d4d92 100644 --- a/pkg/api/install/install_test.go +++ b/pkg/api/install/install_test.go @@ -22,7 +22,7 @@ import ( "testing" internal "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -38,7 +38,7 @@ func TestResourceVersioner(t *testing.T) { t.Errorf("unexpected version %v", version) } - podList := internal.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "10"}} + podList := internal.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "10"}} version, err = accessor.ResourceVersion(&podList) if err != nil { t.Fatalf("unexpected error: %v", err) @@ -120,7 +120,7 @@ func TestRESTMapper(t *testing.T) { func TestUnversioned(t *testing.T) { for _, obj := range []runtime.Object{ - &unversioned.Status{}, + &metav1.Status{}, } { if unversioned, ok := internal.Scheme.IsUnversioned(obj); !unversioned || !ok { t.Errorf("%v is expected to be unversioned", reflect.TypeOf(obj)) diff --git a/pkg/api/meta.go b/pkg/api/meta.go index a05d694435b..a0c33030068 100644 --- a/pkg/api/meta.go +++ b/pkg/api/meta.go @@ -19,7 +19,7 @@ package api import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" @@ -28,7 +28,7 @@ import ( // FillObjectMetaSystemFields populates fields that are managed by the system on ObjectMeta. func FillObjectMetaSystemFields(ctx Context, meta *ObjectMeta) { - meta.CreationTimestamp = unversioned.Now() + meta.CreationTimestamp = metav1.Now() // allows admission controllers to assign a UID earlier in the request processing // to support tracking resources pending creation. uid, found := UIDFrom(ctx) @@ -61,12 +61,12 @@ func ObjectMetaFor(obj runtime.Object) (*ObjectMeta, error) { // ListMetaFor returns a pointer to a provided object's ListMeta, // or an error if the object does not have that pointer. // TODO: allow runtime.Unknown to extract this object -func ListMetaFor(obj runtime.Object) (*unversioned.ListMeta, error) { +func ListMetaFor(obj runtime.Object) (*metav1.ListMeta, error) { v, err := conversion.EnforcePtr(obj) if err != nil { return nil, err } - var meta *unversioned.ListMeta + var meta *metav1.ListMeta err = runtime.FieldPtr(v, "ListMeta", &meta) return meta, err } @@ -87,12 +87,12 @@ func (meta *ObjectMeta) GetResourceVersion() string { return meta.Re func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } -func (meta *ObjectMeta) GetCreationTimestamp() unversioned.Time { return meta.CreationTimestamp } -func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp unversioned.Time) { +func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } +func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) { meta.CreationTimestamp = creationTimestamp } -func (meta *ObjectMeta) GetDeletionTimestamp() *unversioned.Time { return meta.DeletionTimestamp } -func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *unversioned.Time) { +func (meta *ObjectMeta) GetDeletionTimestamp() *metav1.Time { return meta.DeletionTimestamp } +func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *metav1.Time) { meta.DeletionTimestamp = deletionTimestamp } func (meta *ObjectMeta) GetLabels() map[string]string { return meta.Labels } diff --git a/pkg/api/meta/BUILD b/pkg/api/meta/BUILD index 04a099b1457..e057dffaf68 100644 --- a/pkg/api/meta/BUILD +++ b/pkg/api/meta/BUILD @@ -27,7 +27,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/meta/metatypes:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", @@ -66,8 +66,8 @@ go_test( "//pkg/api/meta:go_default_library", "//pkg/api/meta/metatypes:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/types:go_default_library", diff --git a/pkg/api/meta/interfaces.go b/pkg/api/meta/interfaces.go index 0ba53cbb247..6a86d0b6c2c 100644 --- a/pkg/api/meta/interfaces.go +++ b/pkg/api/meta/interfaces.go @@ -18,7 +18,7 @@ package meta import ( "k8s.io/kubernetes/pkg/api/meta/metatypes" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/types" @@ -51,10 +51,10 @@ type Object interface { SetResourceVersion(version string) GetSelfLink() string SetSelfLink(selfLink string) - GetCreationTimestamp() unversioned.Time - SetCreationTimestamp(timestamp unversioned.Time) - GetDeletionTimestamp() *unversioned.Time - SetDeletionTimestamp(timestamp *unversioned.Time) + GetCreationTimestamp() metav1.Time + SetCreationTimestamp(timestamp metav1.Time) + GetDeletionTimestamp() *metav1.Time + SetDeletionTimestamp(timestamp *metav1.Time) GetLabels() map[string]string SetLabels(labels map[string]string) GetAnnotations() map[string]string @@ -76,10 +76,10 @@ type ListMetaAccessor interface { // List lets you work with list metadata from any of the versioned or // internal API objects. Attempting to set or retrieve a field on an object that does // not support that field will be a no-op and return a default value. -type List unversioned.List +type List metav1.List // Type exposes the type and APIVersion of versioned or internal API objects. -type Type unversioned.Type +type Type metav1.Type // MetadataAccessor lets you work with object and list metadata from any of the versioned or // internal API objects. Attempting to set or retrieve a field on an object that does diff --git a/pkg/api/meta/meta.go b/pkg/api/meta/meta.go index 462fbb4123b..6ef7c0f440f 100644 --- a/pkg/api/meta/meta.go +++ b/pkg/api/meta/meta.go @@ -21,7 +21,7 @@ import ( "reflect" "k8s.io/kubernetes/pkg/api/meta/metatypes" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -43,14 +43,14 @@ func ListAccessor(obj interface{}) (List, error) { switch t := obj.(type) { case List: return t, nil - case unversioned.List: + case metav1.List: return t, nil case ListMetaAccessor: if m := t.GetListMeta(); m != nil { return m, nil } return nil, errNotList - case unversioned.ListMetaAccessor: + case metav1.ListMetaAccessor: if m := t.GetListMeta(); m != nil { return m, nil } @@ -85,7 +85,7 @@ func Accessor(obj interface{}) (Object, error) { return m, nil } return nil, errNotObject - case List, unversioned.List, ListMetaAccessor, unversioned.ListMetaAccessor: + case List, metav1.List, ListMetaAccessor, metav1.ListMetaAccessor: return nil, errNotObject default: return nil, errNotObject @@ -372,8 +372,8 @@ type genericAccessor struct { kind *string resourceVersion *string selfLink *string - creationTimestamp *unversioned.Time - deletionTimestamp **unversioned.Time + creationTimestamp *metav1.Time + deletionTimestamp **metav1.Time labels *map[string]string annotations *map[string]string ownerReferences reflect.Value @@ -468,19 +468,19 @@ func (a genericAccessor) SetSelfLink(selfLink string) { *a.selfLink = selfLink } -func (a genericAccessor) GetCreationTimestamp() unversioned.Time { +func (a genericAccessor) GetCreationTimestamp() metav1.Time { return *a.creationTimestamp } -func (a genericAccessor) SetCreationTimestamp(timestamp unversioned.Time) { +func (a genericAccessor) SetCreationTimestamp(timestamp metav1.Time) { *a.creationTimestamp = timestamp } -func (a genericAccessor) GetDeletionTimestamp() *unversioned.Time { +func (a genericAccessor) GetDeletionTimestamp() *metav1.Time { return *a.deletionTimestamp } -func (a genericAccessor) SetDeletionTimestamp(timestamp *unversioned.Time) { +func (a genericAccessor) SetDeletionTimestamp(timestamp *metav1.Time) { *a.deletionTimestamp = timestamp } diff --git a/pkg/api/meta/meta_test.go b/pkg/api/meta/meta_test.go index 129c5179910..5a847235078 100644 --- a/pkg/api/meta/meta_test.go +++ b/pkg/api/meta/meta_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -34,7 +34,7 @@ import ( func TestAPIObjectMeta(t *testing.T) { j := &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: "/a", Kind: "b"}, + TypeMeta: metav1.TypeMeta{APIVersion: "/a", Kind: "b"}, ObjectMeta: api.ObjectMeta{ Namespace: "bar", Name: "foo", @@ -148,7 +148,7 @@ func TestGenericTypeMeta(t *testing.T) { Name string `json:"name,omitempty"` GenerateName string `json:"generateName,omitempty"` UID string `json:"uid,omitempty"` - CreationTimestamp unversioned.Time `json:"creationTimestamp,omitempty"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` SelfLink string `json:"selfLink,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` APIVersion string `json:"apiVersion,omitempty"` @@ -198,7 +198,7 @@ type InternalTypeMeta struct { Name string `json:"name,omitempty"` GenerateName string `json:"generateName,omitempty"` UID string `json:"uid,omitempty"` - CreationTimestamp unversioned.Time `json:"creationTimestamp,omitempty"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` SelfLink string `json:"selfLink,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` APIVersion string `json:"apiVersion,omitempty"` @@ -217,7 +217,7 @@ type MyAPIObject struct { TypeMeta InternalTypeMeta `json:",inline"` } -func (obj *MyAPIObject) GetListMeta() unversioned.List { return &obj.TypeMeta } +func (obj *MyAPIObject) GetListMeta() metav1.List { return &obj.TypeMeta } func (obj *MyAPIObject) GetObjectKind() schema.ObjectKind { return obj } func (obj *MyAPIObject) SetGroupVersionKind(gvk schema.GroupVersionKind) { @@ -333,7 +333,7 @@ func TestTypeMetaSelfLinker(t *testing.T) { } type MyAPIObject2 struct { - unversioned.TypeMeta + metav1.TypeMeta v1.ObjectMeta } @@ -396,7 +396,7 @@ func TestAccessOwnerReferences(t *testing.T) { // BenchmarkAccessorSetFastPath shows the interface fast path func BenchmarkAccessorSetFastPath(b *testing.B) { obj := &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: "/a", Kind: "b"}, + TypeMeta: metav1.TypeMeta{APIVersion: "/a", Kind: "b"}, ObjectMeta: api.ObjectMeta{ Namespace: "bar", Name: "foo", diff --git a/pkg/api/meta/scheme_test.go b/pkg/api/meta/scheme_test.go index 5c0425622b7..12f07f941cc 100644 --- a/pkg/api/meta/scheme_test.go +++ b/pkg/api/meta/scheme_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/sets" ) @@ -80,26 +80,26 @@ func TestListTypes(t *testing.T) { } type WithoutMetaDataList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta + metav1.TypeMeta `json:",inline"` + metav1.ListMeta Items []interface{} `json:"items"` } type WithoutItemsList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` } type WrongItemsJSONTagList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` Items []interface{} `json:"items,omitempty"` } // If a type has Items, its name should end with "List" type ListWithWrongName struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` Items []interface{} `json:"items"` } diff --git a/pkg/api/meta_test.go b/pkg/api/meta_test.go index d36b86e2c8e..fcf84a235bc 100644 --- a/pkg/api/meta_test.go +++ b/pkg/api/meta_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -166,7 +166,7 @@ func TestAccessorImplementations(t *testing.T) { continue } default: - if _, ok := obj.(unversioned.ListMetaAccessor); ok { + if _, ok := obj.(metav1.ListMetaAccessor); ok { continue } if _, ok := value.Elem().Type().FieldByName("ObjectMeta"); ok { diff --git a/pkg/api/ref_test.go b/pkg/api/ref_test.go index 7b33ef61ded..7fa1205acc3 100644 --- a/pkg/api/ref_test.go +++ b/pkg/api/ref_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -30,7 +30,7 @@ type FakeAPIObject struct{} func (obj *FakeAPIObject) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } type ExtensionAPIObject struct { - unversioned.TypeMeta + metav1.TypeMeta ObjectMeta } @@ -72,7 +72,7 @@ func TestGetReference(t *testing.T) { }, "serviceList": { obj: &ServiceList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "42", SelfLink: "/api/version2/services", }, @@ -85,7 +85,7 @@ func TestGetReference(t *testing.T) { }, "extensionAPIObject": { obj: &ExtensionAPIObject{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "ExtensionAPIObject", }, ObjectMeta: ObjectMeta{ @@ -105,7 +105,7 @@ func TestGetReference(t *testing.T) { }, "badSelfLink": { obj: &ServiceList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "42", SelfLink: "version2/services", }, diff --git a/pkg/api/register.go b/pkg/api/register.go index 7e9a6aaa576..bac8f4361ed 100644 --- a/pkg/api/register.go +++ b/pkg/api/register.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/serializer" @@ -76,7 +76,7 @@ func init() { } func addKnownTypes(scheme *runtime.Scheme) error { - if err := scheme.AddIgnoredConversionType(&unversioned.TypeMeta{}, &unversioned.TypeMeta{}); err != nil { + if err := scheme.AddIgnoredConversionType(&metav1.TypeMeta{}, &metav1.TypeMeta{}); err != nil { return err } scheme.AddKnownTypes(SchemeGroupVersion, @@ -129,11 +129,11 @@ func addKnownTypes(scheme *runtime.Scheme) error { // Register Unversioned types under their own special group scheme.AddUnversionedTypes(Unversioned, - &unversioned.Status{}, - &unversioned.APIVersions{}, - &unversioned.APIGroupList{}, - &unversioned.APIGroup{}, - &unversioned.APIResourceList{}, + &metav1.Status{}, + &metav1.APIVersions{}, + &metav1.APIGroupList{}, + &metav1.APIGroup{}, + &metav1.APIResourceList{}, ) return nil } diff --git a/pkg/api/resource_helpers.go b/pkg/api/resource_helpers.go index e926094bb6f..816df56fb06 100644 --- a/pkg/api/resource_helpers.go +++ b/pkg/api/resource_helpers.go @@ -20,7 +20,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // Returns string version of ResourceName. @@ -81,7 +81,7 @@ func GetExistingContainerStatus(statuses []ContainerStatus, name string) Contain // of that, there are two cases when a pod can be considered available: // 1. minReadySeconds == 0, or // 2. LastTransitionTime (is set) + minReadySeconds < current time -func IsPodAvailable(pod *Pod, minReadySeconds int32, now unversioned.Time) bool { +func IsPodAvailable(pod *Pod, minReadySeconds int32, now metav1.Time) bool { if !IsPodReady(pod) { return false } @@ -144,7 +144,7 @@ func GetNodeCondition(status *NodeStatus, conditionType NodeConditionType) (int, // status has changed. // Returns true if pod condition has changed or has been added. func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool { - condition.LastTransitionTime = unversioned.Now() + condition.LastTransitionTime = metav1.Now() // Try to find this pod condition. conditionIndex, oldCondition := GetPodCondition(status, condition.Type) diff --git a/pkg/api/resource_helpers_test.go b/pkg/api/resource_helpers_test.go index 53803cfe1f2..2d10c7a6cf2 100644 --- a/pkg/api/resource_helpers_test.go +++ b/pkg/api/resource_helpers_test.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestResourceHelpers(t *testing.T) { @@ -64,7 +64,7 @@ func TestDefaultResourceHelpers(t *testing.T) { } } -func newPod(now unversioned.Time, ready bool, beforeSec int) *Pod { +func newPod(now metav1.Time, ready bool, beforeSec int) *Pod { conditionStatus := ConditionFalse if ready { conditionStatus = ConditionTrue @@ -74,7 +74,7 @@ func newPod(now unversioned.Time, ready bool, beforeSec int) *Pod { Conditions: []PodCondition{ { Type: PodReady, - LastTransitionTime: unversioned.NewTime(now.Time.Add(-1 * time.Duration(beforeSec) * time.Second)), + LastTransitionTime: metav1.NewTime(now.Time.Add(-1 * time.Duration(beforeSec) * time.Second)), Status: conditionStatus, }, }, @@ -83,7 +83,7 @@ func newPod(now unversioned.Time, ready bool, beforeSec int) *Pod { } func TestIsPodAvailable(t *testing.T) { - now := unversioned.Now() + now := metav1.Now() tests := []struct { pod *Pod minReadySeconds int32 diff --git a/pkg/api/rest/BUILD b/pkg/api/rest/BUILD index ec12d4dbc92..bf4c178c999 100644 --- a/pkg/api/rest/BUILD +++ b/pkg/api/rest/BUILD @@ -26,9 +26,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/api/validation/path:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/util/validation/field:go_default_library", diff --git a/pkg/api/rest/delete.go b/pkg/api/rest/delete.go index f56fd155db4..1134334b922 100644 --- a/pkg/api/rest/delete.go +++ b/pkg/api/rest/delete.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -98,7 +98,7 @@ func BeforeDelete(strategy RESTDeleteStrategy, ctx api.Context, obj runtime.Obje if period >= *objectMeta.DeletionGracePeriodSeconds { return false, true, nil } - newDeletionTimestamp := unversioned.NewTime( + newDeletionTimestamp := metav1.NewTime( objectMeta.DeletionTimestamp.Add(-time.Second * time.Duration(*objectMeta.DeletionGracePeriodSeconds)). Add(time.Second * time.Duration(*options.GracePeriodSeconds))) objectMeta.DeletionTimestamp = &newDeletionTimestamp @@ -113,7 +113,7 @@ func BeforeDelete(strategy RESTDeleteStrategy, ctx api.Context, obj runtime.Obje if !gracefulStrategy.CheckGracefulDelete(ctx, obj, options) { return false, false, nil } - now := unversioned.NewTime(unversioned.Now().Add(time.Second * time.Duration(*options.GracePeriodSeconds))) + now := metav1.NewTime(metav1.Now().Add(time.Second * time.Duration(*options.GracePeriodSeconds))) objectMeta.DeletionTimestamp = &now objectMeta.DeletionGracePeriodSeconds = options.GracePeriodSeconds // If it's the first graceful deletion we are going to set the DeletionTimestamp to non-nil. diff --git a/pkg/api/rest/rest.go b/pkg/api/rest/rest.go index cff22c477f7..993a9ccea1a 100644 --- a/pkg/api/rest/rest.go +++ b/pkg/api/rest/rest.go @@ -22,7 +22,7 @@ import ( "net/url" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/watch" @@ -78,7 +78,7 @@ type Exporter interface { // Export an object. Fields that are not user specified (e.g. Status, ObjectMeta.ResourceVersion) are stripped out // Returns the stripped object. If 'exact' is true, fields that are specific to the cluster (e.g. namespace) are // retained, otherwise they are stripped also. - Export(ctx api.Context, name string, opts unversioned.ExportOptions) (runtime.Object, error) + Export(ctx api.Context, name string, opts metav1.ExportOptions) (runtime.Object, error) } // Getter is an object that can retrieve a named RESTful resource. diff --git a/pkg/api/rest/resttest/BUILD b/pkg/api/rest/resttest/BUILD index 65d285f4a55..8e55e8809c7 100644 --- a/pkg/api/rest/resttest/BUILD +++ b/pkg/api/rest/resttest/BUILD @@ -18,8 +18,8 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/validation/path:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/api/rest/resttest/resttest.go b/pkg/api/rest/resttest/resttest.go index fe8ab7ad870..b237251ab13 100644 --- a/pkg/api/rest/resttest/resttest.go +++ b/pkg/api/rest/resttest/resttest.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/fields" @@ -415,7 +415,7 @@ func (t *Tester) testCreateRejectsMismatchedNamespace(valid runtime.Object) { func (t *Tester) testCreateResetsUserData(valid runtime.Object) { objectMeta := t.getObjectMetaOrFail(valid) - now := unversioned.Now() + now := metav1.Now() objectMeta.UID = "bad-uid" objectMeta.CreationTimestamp = now @@ -761,9 +761,9 @@ func (t *Tester) testDeleteNoGraceful(obj runtime.Object, createFn CreateFunc, g t.Errorf("unexpected error: %v", err) } if !t.returnDeletedObject { - if status, ok := obj.(*unversioned.Status); !ok { + if status, ok := obj.(*metav1.Status); !ok { t.Errorf("expected status of delete, got %v", status) - } else if status.Status != unversioned.StatusSuccess { + } else if status.Status != metav1.StatusSuccess { t.Errorf("expected success, got: %v", status.Status) } } @@ -807,9 +807,9 @@ func (t *Tester) testDeleteWithUID(obj runtime.Object, createFn CreateFunc, getF } if !t.returnDeletedObject { - if status, ok := obj.(*unversioned.Status); !ok { + if status, ok := obj.(*metav1.Status); !ok { t.Errorf("expected status of delete, got %v", status) - } else if status.Status != unversioned.StatusSuccess { + } else if status.Status != metav1.StatusSuccess { t.Errorf("expected success, got: %v", status.Status) } } diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index 467e8f14aa6..f7cb5a770f0 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -365,11 +365,11 @@ func TestBadJSONRejection(t *testing.T) { func TestUnversionedTypes(t *testing.T) { testcases := []runtime.Object{ - &unversioned.Status{Status: "Failure", Message: "something went wrong"}, - &unversioned.APIVersions{Versions: []string{"A", "B", "C"}}, - &unversioned.APIGroupList{Groups: []unversioned.APIGroup{{Name: "mygroup"}}}, - &unversioned.APIGroup{Name: "mygroup"}, - &unversioned.APIResourceList{GroupVersion: "mygroup/myversion"}, + &metav1.Status{Status: "Failure", Message: "something went wrong"}, + &metav1.APIVersions{Versions: []string{"A", "B", "C"}}, + &metav1.APIGroupList{Groups: []metav1.APIGroup{{Name: "mygroup"}}}, + &metav1.APIGroup{Name: "mygroup"}, + &metav1.APIResourceList{GroupVersion: "mygroup/myversion"}, } for _, obj := range testcases { diff --git a/pkg/api/testapi/BUILD b/pkg/api/testapi/BUILD index d39f540ddf3..9064e5325a4 100644 --- a/pkg/api/testapi/BUILD +++ b/pkg/api/testapi/BUILD @@ -57,7 +57,7 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", ], ) diff --git a/pkg/api/testapi/testapi_test.go b/pkg/api/testapi/testapi_test.go index 069cdc5a629..0ba1705426c 100644 --- a/pkg/api/testapi/testapi_test.go +++ b/pkg/api/testapi/testapi_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) @@ -67,10 +67,10 @@ func TestResourcePath(t *testing.T) { } } -var status = &unversioned.Status{ - Status: unversioned.StatusFailure, +var status = &metav1.Status{ + Status: metav1.StatusFailure, Code: 200, - Reason: unversioned.StatusReasonUnknown, + Reason: metav1.StatusReasonUnknown, Message: "", } @@ -81,7 +81,7 @@ func TestV1EncodeDecodeStatus(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - typeMeta := unversioned.TypeMeta{} + typeMeta := metav1.TypeMeta{} if err := json.Unmarshal(encoded, &typeMeta); err != nil { t.Errorf("unexpected error: %v", err) } @@ -105,7 +105,7 @@ func testEncodeDecodeStatus(t *testing.T, codec runtime.Codec) { if err != nil { t.Errorf("unexpected error: %v", err) } - typeMeta := unversioned.TypeMeta{} + typeMeta := metav1.TypeMeta{} if err := json.Unmarshal(encoded, &typeMeta); err != nil { t.Errorf("unexpected error: %v", err) } diff --git a/pkg/api/testing/BUILD b/pkg/api/testing/BUILD index 5db73ad5fe6..a318e6f6d66 100644 --- a/pkg/api/testing/BUILD +++ b/pkg/api/testing/BUILD @@ -23,11 +23,11 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/fields:go_default_library", diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index e2c0faebdac..d3675e50aa2 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" @@ -70,7 +70,7 @@ func FuzzerFor(t *testing.T, version schema.GroupVersion, src rand.Source) *fuzz j.APIVersion = "" j.Kind = "" }, - func(j *unversioned.TypeMeta, c fuzz.Continue) { + func(j *metav1.TypeMeta, c fuzz.Continue) { // We have to customize the randomization of TypeMetas because their // APIVersion and Kind must remain blank in memory. j.APIVersion = "" @@ -86,7 +86,7 @@ func FuzzerFor(t *testing.T, version schema.GroupVersion, src rand.Source) *fuzz var sec, nsec int64 c.Fuzz(&sec) c.Fuzz(&nsec) - j.CreationTimestamp = unversioned.Unix(sec, nsec).Rfc3339Copy() + j.CreationTimestamp = metav1.Unix(sec, nsec).Rfc3339Copy() }, func(j *api.ObjectReference, c fuzz.Continue) { // We have to customize the randomization of TypeMetas because their @@ -98,7 +98,7 @@ func FuzzerFor(t *testing.T, version schema.GroupVersion, src rand.Source) *fuzz j.ResourceVersion = strconv.FormatUint(c.RandUint64(), 10) j.FieldPath = c.RandString() }, - func(j *unversioned.ListMeta, c fuzz.Continue) { + func(j *metav1.ListMeta, c fuzz.Continue) { j.ResourceVersion = strconv.FormatUint(c.RandUint64(), 10) j.SelfLink = c.RandString() }, @@ -488,14 +488,14 @@ func FuzzerFor(t *testing.T, version schema.GroupVersion, src rand.Source) *fuzz // TODO: Implement a fuzzer to generate valid keys, values and operators for // selector requirements. if s.Status.Selector != nil { - s.Status.Selector = &unversioned.LabelSelector{ + s.Status.Selector = &metav1.LabelSelector{ MatchLabels: map[string]string{ "testlabelkey": "testlabelval", }, - MatchExpressions: []unversioned.LabelSelectorRequirement{ + MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "testkey", - Operator: unversioned.LabelSelectorOpIn, + Operator: metav1.LabelSelectorOpIn, Values: []string{"val1", "val2", "val3"}, }, }, diff --git a/pkg/api/types.generated.go b/pkg/api/types.generated.go index dcf3977fca0..82f4890488d 100644 --- a/pkg/api/types.generated.go +++ b/pkg/api/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" - pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg6_fields "k8s.io/kubernetes/pkg/fields" pkg5_labels "k8s.io/kubernetes/pkg/labels" pkg7_runtime "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/api/types.go b/pkg/api/types.go index 89d44798923..8c1122b8aab 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -18,7 +18,7 @@ package api import ( "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" @@ -112,7 +112,7 @@ type ObjectMeta struct { // created. It is not guaranteed to be set in happens-before order across separate operations. // Clients may not set this value. It is represented in RFC3339 form and is in UTC. // +optional - CreationTimestamp unversioned.Time `json:"creationTimestamp,omitempty"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // field is set by the server when a graceful deletion is requested by the user, and is not @@ -132,7 +132,7 @@ type ObjectMeta struct { // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - DeletionTimestamp *unversioned.Time `json:"deletionTimestamp,omitempty"` + DeletionTimestamp *metav1.Time `json:"deletionTimestamp,omitempty"` // DeletionGracePeriodSeconds records the graceful deletion value set when graceful deletion // was requested. Represents the most recent grace period, and may only be shortened once set. @@ -368,7 +368,7 @@ type PersistentVolumeClaimVolumeSource struct { // +nonNamespaced=true type PersistentVolume struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -429,9 +429,9 @@ type PersistentVolumeStatus struct { } type PersistentVolumeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []PersistentVolume `json:"items"` } @@ -439,7 +439,7 @@ type PersistentVolumeList struct { // PersistentVolumeClaim is a user's request for and claim to a persistent volume type PersistentVolumeClaim struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -453,9 +453,9 @@ type PersistentVolumeClaim struct { } type PersistentVolumeClaimList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []PersistentVolumeClaim `json:"items"` } @@ -468,7 +468,7 @@ type PersistentVolumeClaimSpec struct { // A label query over volumes to consider for binding. This selector is // ignored when VolumeName is set // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Resources represents the minimum resources required // +optional Resources ResourceRequirements `json:"resources,omitempty"` @@ -1362,7 +1362,7 @@ type ContainerStateWaiting struct { type ContainerStateRunning struct { // +optional - StartedAt unversioned.Time `json:"startedAt,omitempty"` + StartedAt metav1.Time `json:"startedAt,omitempty"` } type ContainerStateTerminated struct { @@ -1374,9 +1374,9 @@ type ContainerStateTerminated struct { // +optional Message string `json:"message,omitempty"` // +optional - StartedAt unversioned.Time `json:"startedAt,omitempty"` + StartedAt metav1.Time `json:"startedAt,omitempty"` // +optional - FinishedAt unversioned.Time `json:"finishedAt,omitempty"` + FinishedAt metav1.Time `json:"finishedAt,omitempty"` // +optional ContainerID string `json:"containerID,omitempty"` } @@ -1454,9 +1454,9 @@ type PodCondition struct { Type PodConditionType `json:"type"` Status ConditionStatus `json:"status"` // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"` // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // +optional Reason string `json:"reason,omitempty"` // +optional @@ -1477,9 +1477,9 @@ const ( // PodList is a list of Pods. type PodList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Pod `json:"items"` } @@ -1641,7 +1641,7 @@ type WeightedPodAffinityTerm struct { type PodAffinityTerm struct { // A label query over a set of resources, in this case pods. // +optional - LabelSelector *unversioned.LabelSelector `json:"labelSelector,omitempty"` + LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"` // namespaces specifies which namespaces the labelSelector applies to (matches against); // nil list means "this pod's namespace," empty list means "all namespaces" // The json tag here is not "omitempty" since we need to distinguish nil and empty. @@ -1916,7 +1916,7 @@ type PodStatus struct { // Date and time at which the object was acknowledged by the Kubelet. // This is before the Kubelet pulled the container image(s) for the pod. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty"` + StartTime *metav1.Time `json:"startTime,omitempty"` // The list has one entry per init container in the manifest. The most recent successful // init container will have ready = true, the most recently started container will have @@ -1934,7 +1934,7 @@ type PodStatus struct { // PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded type PodStatusResult struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` // Status represents the current information about a pod. This data may not be up @@ -1947,7 +1947,7 @@ type PodStatusResult struct { // Pod is a collection of containers, used as either input (create, update) or as output (list, get). type Pod struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -1976,7 +1976,7 @@ type PodTemplateSpec struct { // PodTemplate describes a template for creating copies of a predefined pod. type PodTemplate struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -1987,9 +1987,9 @@ type PodTemplate struct { // PodTemplateList is a list of PodTemplates. type PodTemplateList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []PodTemplate `json:"items"` } @@ -2068,7 +2068,7 @@ type ReplicationControllerCondition struct { Status ConditionStatus `json:"status"` // The last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // The reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty"` @@ -2081,7 +2081,7 @@ type ReplicationControllerCondition struct { // ReplicationController represents the configuration of a replication controller. type ReplicationController struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2097,9 +2097,9 @@ type ReplicationController struct { // ReplicationControllerList is a collection of replication controllers. type ReplicationControllerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []ReplicationController `json:"items"` } @@ -2112,9 +2112,9 @@ const ( // ServiceList holds a list of services. type ServiceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Service `json:"items"` } @@ -2286,7 +2286,7 @@ type ServicePort struct { // (for example 3306) that the proxy listens on, and the selector that determines which pods // will answer requests sent through the proxy. type Service struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2306,7 +2306,7 @@ type Service struct { // * a principal that can be authenticated and authorized // * a set of secrets type ServiceAccount struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2322,9 +2322,9 @@ type ServiceAccount struct { // ServiceAccountList is a list of ServiceAccount objects type ServiceAccountList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []ServiceAccount `json:"items"` } @@ -2344,7 +2344,7 @@ type ServiceAccountList struct { // }, // ] type Endpoints struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2401,9 +2401,9 @@ type EndpointPort struct { // EndpointsList is a list of endpoints. type EndpointsList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Endpoints `json:"items"` } @@ -2537,7 +2537,7 @@ type PreferAvoidPodsEntry struct { PodSignature PodSignature `json:"podSignature"` // Time at which this entry was added to the list. // +optional - EvictionTime unversioned.Time `json:"evictionTime,omitempty"` + EvictionTime metav1.Time `json:"evictionTime,omitempty"` // (brief) reason why this entry was added to the list. // +optional Reason string `json:"reason,omitempty"` @@ -2598,9 +2598,9 @@ type NodeCondition struct { Type NodeConditionType `json:"type"` Status ConditionStatus `json:"status"` // +optional - LastHeartbeatTime unversioned.Time `json:"lastHeartbeatTime,omitempty"` + LastHeartbeatTime metav1.Time `json:"lastHeartbeatTime,omitempty"` // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // +optional Reason string `json:"reason,omitempty"` // +optional @@ -2666,7 +2666,7 @@ type ResourceList map[ResourceName]resource.Quantity // Node is a worker node in Kubernetes // The name of the node according to etcd is in ObjectMeta.Name. type Node struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2681,9 +2681,9 @@ type Node struct { // NodeList is a list of nodes. type NodeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Node `json:"items"` } @@ -2725,7 +2725,7 @@ const ( // A namespace provides a scope for Names. // Use of multiple namespaces is optional type Namespace struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2740,16 +2740,16 @@ type Namespace struct { // NamespaceList is a list of Namespaces. type NamespaceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Namespace `json:"items"` } // Binding ties one object to another - for example, a pod is bound to a node by a scheduler. type Binding struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // ObjectMeta describes the object that is being bound. // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2767,7 +2767,7 @@ type Preconditions struct { // DeleteOptions may be provided when deleting an API object type DeleteOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Optional duration in seconds before the object should be deleted. Value must be non-negative integer. // The value zero indicates delete immediately. If this value is nil, the default grace period for the @@ -2789,7 +2789,7 @@ type DeleteOptions struct { // ListOptions is the query options to a standard REST list call, and has future support for // watch calls. type ListOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // A selector based on labels LabelSelector labels.Selector @@ -2809,7 +2809,7 @@ type ListOptions struct { // PodLogOptions is the query options for a Pod's logs REST call type PodLogOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Container for which to return logs Container string @@ -2826,7 +2826,7 @@ type PodLogOptions struct { // precedes the time a pod was started, only logs since the pod start will be returned. // If this value is in the future, no logs will be returned. // Only one of sinceSeconds or sinceTime may be specified. - SinceTime *unversioned.Time + SinceTime *metav1.Time // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // of log output. Timestamps bool @@ -2842,7 +2842,7 @@ type PodLogOptions struct { // PodAttachOptions is the query options to a Pod's remote attach call // TODO: merge w/ PodExecOptions below for stdin, stdout, etc type PodAttachOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Stdin if true indicates that stdin is to be redirected for the attach call // +optional @@ -2867,7 +2867,7 @@ type PodAttachOptions struct { // PodExecOptions is the query options to a Pod's remote exec call type PodExecOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Stdin if true indicates that stdin is to be redirected for the exec call Stdin bool @@ -2890,7 +2890,7 @@ type PodExecOptions struct { // PodProxyOptions is the query options to a Pod's proxy call type PodProxyOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Path is the URL path to use for the current proxy request Path string @@ -2898,7 +2898,7 @@ type PodProxyOptions struct { // NodeProxyOptions is the query options to a Node's proxy call type NodeProxyOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Path is the URL path to use for the current proxy request Path string @@ -2906,7 +2906,7 @@ type NodeProxyOptions struct { // ServiceProxyOptions is the query options to a Service's proxy call. type ServiceProxyOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Path is the part of URLs that include service endpoints, suffixes, // and parameters to use for the current proxy request to service. @@ -2970,7 +2970,7 @@ type LocalObjectReference struct { } type SerializedReference struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional Reference ObjectReference `json:"reference,omitempty"` } @@ -2997,7 +2997,7 @@ const ( // Event is a report of an event somewhere in the cluster. // TODO: Decide whether to store these separately or with the object they apply to. type Event struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3023,11 +3023,11 @@ type Event struct { // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // +optional - FirstTimestamp unversioned.Time `json:"firstTimestamp,omitempty"` + FirstTimestamp metav1.Time `json:"firstTimestamp,omitempty"` // The time at which the most recent occurrence of this event was recorded. // +optional - LastTimestamp unversioned.Time `json:"lastTimestamp,omitempty"` + LastTimestamp metav1.Time `json:"lastTimestamp,omitempty"` // The number of times this event has occurred. // +optional @@ -3040,18 +3040,18 @@ type Event struct { // EventList is a list of events. type EventList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Event `json:"items"` } // List holds a list of objects, which may not be known by the server. type List struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []runtime.Object `json:"items"` } @@ -3100,7 +3100,7 @@ type LimitRangeSpec struct { // LimitRange sets resource usage limits for each kind of resource in a Namespace type LimitRange struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3111,9 +3111,9 @@ type LimitRange struct { // LimitRangeList is a list of LimitRange items. type LimitRangeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is a list of LimitRange objects Items []LimitRange `json:"items"` @@ -3190,7 +3190,7 @@ type ResourceQuotaStatus struct { // ResourceQuota sets aggregate quota restrictions enforced per namespace type ResourceQuota struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3205,9 +3205,9 @@ type ResourceQuota struct { // ResourceQuotaList is a list of ResourceQuota items type ResourceQuotaList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is a list of ResourceQuota objects Items []ResourceQuota `json:"items"` @@ -3218,7 +3218,7 @@ type ResourceQuotaList struct { // Secret holds secret data of a certain type. The total bytes of the values in // the Data field must be less than MaxSecretSize bytes. type Secret struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3319,9 +3319,9 @@ const ( ) type SecretList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Secret `json:"items"` } @@ -3330,7 +3330,7 @@ type SecretList struct { // ConfigMap holds configuration data for components or applications to consume. type ConfigMap struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3342,9 +3342,9 @@ type ConfigMap struct { // ConfigMapList is a resource containing a list of ConfigMap objects. type ConfigMapList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of ConfigMaps. Items []ConfigMap `json:"items"` @@ -3424,7 +3424,7 @@ type ComponentCondition struct { // ComponentStatus (and ComponentStatusList) holds the cluster validation info. type ComponentStatus struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3433,9 +3433,9 @@ type ComponentStatus struct { } type ComponentStatusList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []ComponentStatus `json:"items"` } @@ -3503,7 +3503,7 @@ type SELinuxOptions struct { // data encoding hints). A range allocation should *ALWAYS* be recreatable at any time by observation // of the cluster, thus the object is less strongly typed than most. type RangeAllocation struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` // A string representing a unique label for a range of resources, such as a CIDR "10.0.0.0/8" or @@ -3529,5 +3529,5 @@ const ( // When the --failure-domains scheduler flag is not specified, // DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity. - DefaultFailureDomains string = unversioned.LabelHostname + "," + unversioned.LabelZoneFailureDomain + "," + unversioned.LabelZoneRegion + DefaultFailureDomains string = metav1.LabelHostname + "," + metav1.LabelZoneFailureDomain + "," + metav1.LabelZoneRegion ) diff --git a/pkg/api/unversioned/BUILD b/pkg/api/unversioned/BUILD new file mode 100644 index 00000000000..839ff89b32f --- /dev/null +++ b/pkg/api/unversioned/BUILD @@ -0,0 +1,26 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_binary", + "go_library", + "go_test", + "cgo_library", +) + +go_library( + name = "go_default_library", + srcs = [ + "duration.go", + "time.go", + "types.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/genericapiserver/openapi/common:go_default_library", + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/google/gofuzz", + ], +) diff --git a/pkg/api/unversioned/duration.go b/pkg/api/unversioned/duration.go new file mode 100644 index 00000000000..6b9a4371e67 --- /dev/null +++ b/pkg/api/unversioned/duration.go @@ -0,0 +1,47 @@ +/* +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 unversioned + +import ( + "encoding/json" + "time" +) + +// Duration is a wrapper around time.Duration which supports correct +// marshaling to YAML and JSON. In particular, it marshals into strings, which +// can be used as map keys in json. +type Duration struct { + time.Duration `protobuf:"-"` +} + +// UnmarshalJSON implements the json.Unmarshaller interface. +func (d *Duration) UnmarshalJSON(b []byte) error { + var str string + json.Unmarshal(b, &str) + + pd, err := time.ParseDuration(str) + if err != nil { + return err + } + d.Duration = pd + return nil +} + +// MarshalJSON implements the json.Marshaler interface. +func (d Duration) MarshalJSON() ([]byte, error) { + return json.Marshal(d.Duration.String()) +} diff --git a/pkg/api/unversioned/time.go b/pkg/api/unversioned/time.go new file mode 100644 index 00000000000..5362d547cbf --- /dev/null +++ b/pkg/api/unversioned/time.go @@ -0,0 +1,176 @@ +/* +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 unversioned + +import ( + "encoding/json" + "time" + + "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" + + "github.com/go-openapi/spec" + "github.com/google/gofuzz" +) + +// Time is a wrapper around time.Time which supports correct +// marshaling to YAML and JSON. Wrappers are provided for many +// of the factory methods that the time package offers. +type Time struct { + time.Time `protobuf:"-"` +} + +// DeepCopy returns a deep-copy of the Time value. The underlying time.Time +// type is effectively immutable in the time API, so it is safe to +// copy-by-assign, despite the presence of (unexported) Pointer fields. +func (t Time) DeepCopy() Time { + return t +} + +// String returns the representation of the time. +func (t Time) String() string { + return t.Time.String() +} + +// NewTime returns a wrapped instance of the provided time +func NewTime(time time.Time) Time { + return Time{time} +} + +// Date returns the Time corresponding to the supplied parameters +// by wrapping time.Date. +func Date(year int, month time.Month, day, hour, min, sec, nsec int, loc *time.Location) Time { + return Time{time.Date(year, month, day, hour, min, sec, nsec, loc)} +} + +// Now returns the current local time. +func Now() Time { + return Time{time.Now()} +} + +// IsZero returns true if the value is nil or time is zero. +func (t *Time) IsZero() bool { + if t == nil { + return true + } + return t.Time.IsZero() +} + +// Before reports whether the time instant t is before u. +func (t Time) Before(u Time) bool { + return t.Time.Before(u.Time) +} + +// Equal reports whether the time instant t is equal to u. +func (t Time) Equal(u Time) bool { + return t.Time.Equal(u.Time) +} + +// Unix returns the local time corresponding to the given Unix time +// by wrapping time.Unix. +func Unix(sec int64, nsec int64) Time { + return Time{time.Unix(sec, nsec)} +} + +// Rfc3339Copy returns a copy of the Time at second-level precision. +func (t Time) Rfc3339Copy() Time { + copied, _ := time.Parse(time.RFC3339, t.Format(time.RFC3339)) + return Time{copied} +} + +// UnmarshalJSON implements the json.Unmarshaller interface. +func (t *Time) UnmarshalJSON(b []byte) error { + if len(b) == 4 && string(b) == "null" { + t.Time = time.Time{} + return nil + } + + var str string + json.Unmarshal(b, &str) + + pt, err := time.Parse(time.RFC3339, str) + if err != nil { + return err + } + + t.Time = pt.Local() + return nil +} + +// UnmarshalQueryParameter converts from a URL query parameter value to an object +func (t *Time) UnmarshalQueryParameter(str string) error { + if len(str) == 0 { + t.Time = time.Time{} + return nil + } + // Tolerate requests from older clients that used JSON serialization to build query params + if len(str) == 4 && str == "null" { + t.Time = time.Time{} + return nil + } + + pt, err := time.Parse(time.RFC3339, str) + if err != nil { + return err + } + + t.Time = pt.Local() + return nil +} + +// MarshalJSON implements the json.Marshaler interface. +func (t Time) MarshalJSON() ([]byte, error) { + if t.IsZero() { + // Encode unset/nil objects as JSON's "null". + return []byte("null"), nil + } + + return json.Marshal(t.UTC().Format(time.RFC3339)) +} + +func (_ Time) OpenAPIDefinition() common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "date-time", + }, + }, + } +} + +// MarshalQueryParameter converts to a URL query parameter value +func (t Time) MarshalQueryParameter() (string, error) { + if t.IsZero() { + // Encode unset/nil objects as an empty string + return "", nil + } + + return t.UTC().Format(time.RFC3339), nil +} + +// Fuzz satisfies fuzz.Interface. +func (t *Time) Fuzz(c fuzz.Continue) { + if t == nil { + return + } + // Allow for about 1000 years of randomness. Leave off nanoseconds + // because JSON doesn't represent them so they can't round-trip + // properly. + t.Time = time.Unix(c.Rand.Int63n(1000*365*24*60*60), 0) +} + +var _ fuzz.Interface = &Time{} diff --git a/pkg/api/unversioned/types.go b/pkg/api/unversioned/types.go new file mode 100644 index 00000000000..6abe732b90b --- /dev/null +++ b/pkg/api/unversioned/types.go @@ -0,0 +1,60 @@ +/* +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 unversioned is deprecated and has been replaced with pkg/apis/meta/v1 +// +// DEPRECATED - Do not reference or add types to this package, it will be removed +// once Heapster is updated to use pkg/apis/meta/v1. +package unversioned + +// TypeMeta describes an individual object in an API response or request +// with strings representing the type of the object and its API schema version. +// Structures that are versioned or persisted should inline TypeMeta. +type TypeMeta struct { + // Kind is a string value representing the REST resource this object represents. + // Servers may infer this from the endpoint the client submits requests to. + // Cannot be updated. + // In CamelCase. + // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds + // +optional + Kind string `json:"kind,omitempty" protobuf:"bytes,1,opt,name=kind"` + + // 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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources + // +optional + APIVersion string `json:"apiVersion,omitempty" protobuf:"bytes,2,opt,name=apiVersion"` +} + +// ListMeta describes metadata that synthetic resources must have, including lists and +// various status objects. A resource may have only one of {ObjectMeta, ListMeta}. +type ListMeta struct { + // SelfLink is a URL representing this object. + // Populated by the system. + // Read-only. + // +optional + SelfLink string `json:"selfLink,omitempty" protobuf:"bytes,1,opt,name=selfLink"` + + // String that identifies the server's internal version of this object that + // can be used by clients to determine when objects have changed. + // Value must be treated as opaque by clients and passed unmodified back to the server. + // Populated by the system. + // Read-only. + // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency + // +optional + ResourceVersion string `json:"resourceVersion,omitempty" protobuf:"bytes,2,opt,name=resourceVersion"` +} diff --git a/pkg/api/v1/BUILD b/pkg/api/v1/BUILD index b7a391e11c5..4778545ea6d 100644 --- a/pkg/api/v1/BUILD +++ b/pkg/api/v1/BUILD @@ -36,8 +36,8 @@ go_library( "//pkg/api/meta:go_default_library", "//pkg/api/meta/metatypes:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", @@ -70,9 +70,9 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/testing/compat:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/util/diff:go_default_library", "//pkg/util/intstr:go_default_library", @@ -91,7 +91,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/labels:go_default_library", ], ) diff --git a/pkg/api/v1/conversion_test.go b/pkg/api/v1/conversion_test.go index 1384de341f7..6ea9da848d6 100644 --- a/pkg/api/v1/conversion_test.go +++ b/pkg/api/v1/conversion_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" versioned "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/diff" @@ -32,7 +32,7 @@ import ( func TestPodLogOptions(t *testing.T) { sinceSeconds := int64(1) - sinceTime := unversioned.NewTime(time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC).Local()) + sinceTime := metav1.NewTime(time.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC).Local()) tailLines := int64(2) limitBytes := int64(3) diff --git a/pkg/api/v1/generated.pb.go b/pkg/api/v1/generated.pb.go index 3da41ce543a..e8b52d3b09b 100644 --- a/pkg/api/v1/generated.pb.go +++ b/pkg/api/v1/generated.pb.go @@ -190,7 +190,7 @@ import fmt "fmt" import math "math" import k8s_io_kubernetes_pkg_api_resource "k8s.io/kubernetes/pkg/api/resource" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/api/unversioned" +import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_runtime "k8s.io/kubernetes/pkg/runtime" import k8s_io_kubernetes_pkg_types "k8s.io/kubernetes/pkg/types" diff --git a/pkg/api/v1/meta.go b/pkg/api/v1/meta.go index 6f95cf7bc73..7c13814b126 100644 --- a/pkg/api/v1/meta.go +++ b/pkg/api/v1/meta.go @@ -19,7 +19,7 @@ package v1 import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/types" ) @@ -39,12 +39,12 @@ func (meta *ObjectMeta) GetResourceVersion() string { return meta.Re func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } -func (meta *ObjectMeta) GetCreationTimestamp() unversioned.Time { return meta.CreationTimestamp } -func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp unversioned.Time) { +func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } +func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) { meta.CreationTimestamp = creationTimestamp } -func (meta *ObjectMeta) GetDeletionTimestamp() *unversioned.Time { return meta.DeletionTimestamp } -func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *unversioned.Time) { +func (meta *ObjectMeta) GetDeletionTimestamp() *metav1.Time { return meta.DeletionTimestamp } +func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *metav1.Time) { meta.DeletionTimestamp = deletionTimestamp } func (meta *ObjectMeta) GetLabels() map[string]string { return meta.Labels } diff --git a/pkg/api/v1/register.go b/pkg/api/v1/register.go index ced426fd865..73bf1371f47 100644 --- a/pkg/api/v1/register.go +++ b/pkg/api/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" @@ -76,7 +76,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &PersistentVolumeClaim{}, &PersistentVolumeClaimList{}, &DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &ListOptions{}, &PodAttachOptions{}, &PodLogOptions{}, @@ -91,7 +91,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { ) // Add common types - scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.Status{}) + scheme.AddKnownTypes(SchemeGroupVersion, &metav1.Status{}) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/api/v1/resource_helpers.go b/pkg/api/v1/resource_helpers.go index 9b7b9d16498..74e8a358db1 100644 --- a/pkg/api/v1/resource_helpers.go +++ b/pkg/api/v1/resource_helpers.go @@ -20,7 +20,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // Returns string version of ResourceName. @@ -81,7 +81,7 @@ func GetExistingContainerStatus(statuses []ContainerStatus, name string) Contain // of that, there are two cases when a pod can be considered available: // 1. minReadySeconds == 0, or // 2. LastTransitionTime (is set) + minReadySeconds < current time -func IsPodAvailable(pod *Pod, minReadySeconds int32, now unversioned.Time) bool { +func IsPodAvailable(pod *Pod, minReadySeconds int32, now metav1.Time) bool { if !IsPodReady(pod) { return false } @@ -144,7 +144,7 @@ func GetNodeCondition(status *NodeStatus, conditionType NodeConditionType) (int, // status has changed. // Returns true if pod condition has changed or has been added. func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool { - condition.LastTransitionTime = unversioned.Now() + condition.LastTransitionTime = metav1.Now() // Try to find this pod condition. conditionIndex, oldCondition := GetPodCondition(status, condition.Type) diff --git a/pkg/api/v1/resource_helpers_test.go b/pkg/api/v1/resource_helpers_test.go index e6d7fe3552b..91284bcbbd7 100644 --- a/pkg/api/v1/resource_helpers_test.go +++ b/pkg/api/v1/resource_helpers_test.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestResourceHelpers(t *testing.T) { @@ -64,7 +64,7 @@ func TestDefaultResourceHelpers(t *testing.T) { } } -func newPod(now unversioned.Time, ready bool, beforeSec int) *Pod { +func newPod(now metav1.Time, ready bool, beforeSec int) *Pod { conditionStatus := ConditionFalse if ready { conditionStatus = ConditionTrue @@ -74,7 +74,7 @@ func newPod(now unversioned.Time, ready bool, beforeSec int) *Pod { Conditions: []PodCondition{ { Type: PodReady, - LastTransitionTime: unversioned.NewTime(now.Time.Add(-1 * time.Duration(beforeSec) * time.Second)), + LastTransitionTime: metav1.NewTime(now.Time.Add(-1 * time.Duration(beforeSec) * time.Second)), Status: conditionStatus, }, }, @@ -83,7 +83,7 @@ func newPod(now unversioned.Time, ready bool, beforeSec int) *Pod { } func TestIsPodAvailable(t *testing.T) { - now := unversioned.Now() + now := metav1.Now() tests := []struct { pod *Pod minReadySeconds int32 diff --git a/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index 8917b9f2e82..914207638ec 100644 --- a/pkg/api/v1/types.generated.go +++ b/pkg/api/v1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" - pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg5_runtime "k8s.io/kubernetes/pkg/runtime" pkg1_types "k8s.io/kubernetes/pkg/types" pkg4_intstr "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index d975f83aaf4..8747d7d7790 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -18,7 +18,7 @@ package v1 import ( "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/intstr" @@ -147,7 +147,7 @@ type ObjectMeta struct { // Null for lists. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - CreationTimestamp unversioned.Time `json:"creationTimestamp,omitempty" protobuf:"bytes,8,opt,name=creationTimestamp"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty" protobuf:"bytes,8,opt,name=creationTimestamp"` // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // field is set by the server when a graceful deletion is requested by the user, and is not @@ -167,7 +167,7 @@ type ObjectMeta struct { // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - DeletionTimestamp *unversioned.Time `json:"deletionTimestamp,omitempty" protobuf:"bytes,9,opt,name=deletionTimestamp"` + DeletionTimestamp *metav1.Time `json:"deletionTimestamp,omitempty" protobuf:"bytes,9,opt,name=deletionTimestamp"` // Number of seconds allowed for this object to gracefully terminate before // it will be removed from the system. Only set when deletionTimestamp is also set. @@ -418,7 +418,7 @@ type PersistentVolumeSource struct { // It is analogous to a node. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes type PersistentVolume struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -496,11 +496,11 @@ type PersistentVolumeStatus struct { // PersistentVolumeList is a list of PersistentVolume items. type PersistentVolumeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of persistent volumes. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes Items []PersistentVolume `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -510,7 +510,7 @@ type PersistentVolumeList struct { // PersistentVolumeClaim is a user's request for and claim to a persistent volume type PersistentVolumeClaim struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -530,11 +530,11 @@ type PersistentVolumeClaim struct { // PersistentVolumeClaimList is a list of PersistentVolumeClaim items. type PersistentVolumeClaimList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // A list of persistent volume claims. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims Items []PersistentVolumeClaim `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -549,7 +549,7 @@ type PersistentVolumeClaimSpec struct { AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" protobuf:"bytes,1,rep,name=accessModes,casttype=PersistentVolumeAccessMode"` // A label query over volumes to consider for binding. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` // Resources represents the minimum resources the volume should have. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources // +optional @@ -1543,7 +1543,7 @@ type ContainerStateWaiting struct { type ContainerStateRunning struct { // Time at which the container was last (re-)started // +optional - StartedAt unversioned.Time `json:"startedAt,omitempty" protobuf:"bytes,1,opt,name=startedAt"` + StartedAt metav1.Time `json:"startedAt,omitempty" protobuf:"bytes,1,opt,name=startedAt"` } // ContainerStateTerminated is a terminated state of a container. @@ -1561,10 +1561,10 @@ type ContainerStateTerminated struct { Message string `json:"message,omitempty" protobuf:"bytes,4,opt,name=message"` // Time at which previous execution of the container started // +optional - StartedAt unversioned.Time `json:"startedAt,omitempty" protobuf:"bytes,5,opt,name=startedAt"` + StartedAt metav1.Time `json:"startedAt,omitempty" protobuf:"bytes,5,opt,name=startedAt"` // Time at which the container last terminated // +optional - FinishedAt unversioned.Time `json:"finishedAt,omitempty" protobuf:"bytes,6,opt,name=finishedAt"` + FinishedAt metav1.Time `json:"finishedAt,omitempty" protobuf:"bytes,6,opt,name=finishedAt"` // Container's ID in the format 'docker://' // +optional ContainerID string `json:"containerID,omitempty" protobuf:"bytes,7,opt,name=containerID"` @@ -1667,10 +1667,10 @@ type PodCondition struct { Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"` // Last time we probed the condition. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // Unique, one-word, CamelCase reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -1850,7 +1850,7 @@ type WeightedPodAffinityTerm struct { type PodAffinityTerm struct { // A label query over a set of resources, in this case pods. // +optional - LabelSelector *unversioned.LabelSelector `json:"labelSelector,omitempty" protobuf:"bytes,1,opt,name=labelSelector"` + LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty" protobuf:"bytes,1,opt,name=labelSelector"` // namespaces specifies which namespaces the labelSelector applies to (matches against); // nil list means "this pod's namespace," empty list means "all namespaces" // The json tag here is not "omitempty" since we need to distinguish nil and empty. @@ -2183,7 +2183,7 @@ type PodStatus struct { // RFC 3339 date and time at which the object was acknowledged by the Kubelet. // This is before the Kubelet pulled the container image(s) for the pod. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,7,opt,name=startTime"` + StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,7,opt,name=startTime"` // The list has one entry per init container in the manifest. The most recent successful // init container will have ready = true, the most recently started container will have @@ -2200,7 +2200,7 @@ type PodStatus struct { // PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded type PodStatusResult struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2219,7 +2219,7 @@ type PodStatusResult struct { // Pod is a collection of containers that can run on a host. This resource is created // by clients and scheduled onto hosts. type Pod struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2241,11 +2241,11 @@ type Pod struct { // PodList is a list of Pods. type PodList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of pods. // More info: http://kubernetes.io/docs/user-guide/pods @@ -2269,7 +2269,7 @@ type PodTemplateSpec struct { // PodTemplate describes a template for creating copies of a predefined pod. type PodTemplate struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2283,11 +2283,11 @@ type PodTemplate struct { // PodTemplateList is a list of PodTemplates. type PodTemplateList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of pod templates Items []PodTemplate `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -2375,7 +2375,7 @@ type ReplicationControllerCondition struct { Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"` // The last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"` // The reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` @@ -2388,7 +2388,7 @@ type ReplicationControllerCondition struct { // ReplicationController represents the configuration of a replication controller. type ReplicationController struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // If the Labels of a ReplicationController are empty, they are defaulted to // be the same as the Pod(s) that the replication controller manages. @@ -2412,11 +2412,11 @@ type ReplicationController struct { // ReplicationControllerList is a collection of replication controllers. type ReplicationControllerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of replication controllers. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -2623,7 +2623,7 @@ type ServicePort struct { // (for example 3306) that the proxy listens on, and the selector that determines which pods // will answer requests sent through the proxy. type Service struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2650,11 +2650,11 @@ const ( // ServiceList holds a list of services. type ServiceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of services Items []Service `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -2667,7 +2667,7 @@ type ServiceList struct { // * a principal that can be authenticated and authorized // * a set of secrets type ServiceAccount struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2688,11 +2688,11 @@ type ServiceAccount struct { // ServiceAccountList is a list of ServiceAccount objects type ServiceAccountList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of ServiceAccounts. // More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md#service-accounts @@ -2714,7 +2714,7 @@ type ServiceAccountList struct { // }, // ] type Endpoints struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2795,11 +2795,11 @@ type EndpointPort struct { // EndpointsList is a list of endpoints. type EndpointsList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of endpoints. Items []Endpoints `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -2939,7 +2939,7 @@ type PreferAvoidPodsEntry struct { PodSignature PodSignature `json:"podSignature" protobuf:"bytes,1,opt,name=podSignature"` // Time at which this entry was added to the list. // +optional - EvictionTime unversioned.Time `json:"evictionTime,omitempty" protobuf:"bytes,2,opt,name=evictionTime"` + EvictionTime metav1.Time `json:"evictionTime,omitempty" protobuf:"bytes,2,opt,name=evictionTime"` // (brief) reason why this entry was added to the list. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,3,opt,name=reason"` @@ -3007,10 +3007,10 @@ type NodeCondition struct { Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"` // Last time we got an update on a given condition. // +optional - LastHeartbeatTime unversioned.Time `json:"lastHeartbeatTime,omitempty" protobuf:"bytes,3,opt,name=lastHeartbeatTime"` + LastHeartbeatTime metav1.Time `json:"lastHeartbeatTime,omitempty" protobuf:"bytes,3,opt,name=lastHeartbeatTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -3072,7 +3072,7 @@ type ResourceList map[ResourceName]resource.Quantity // Node is a worker node in Kubernetes. // Each node will have a unique identifier in the cache (i.e. in etcd). type Node struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3093,11 +3093,11 @@ type Node struct { // NodeList is the whole list of all Nodes which have been registered with master. type NodeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of nodes Items []Node `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -3143,7 +3143,7 @@ const ( // Namespace provides a scope for Names. // Use of multiple namespaces is optional. type Namespace struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3162,11 +3162,11 @@ type Namespace struct { // NamespaceList is a list of Namespaces. type NamespaceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Namespace objects in the list. // More info: http://kubernetes.io/docs/user-guide/namespaces @@ -3176,7 +3176,7 @@ type NamespaceList struct { // Binding ties one object to another. // For example, a pod is bound to a node by a scheduler. type Binding struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3195,7 +3195,7 @@ type Preconditions struct { // DeleteOptions may be provided when deleting an API object type DeleteOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // The duration in seconds before the object should be deleted. Value must be non-negative integer. // The value zero indicates delete immediately. If this value is nil, the default grace period for the @@ -3217,7 +3217,7 @@ type DeleteOptions struct { // ListOptions is the query options to a standard REST list call. type ListOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // A selector to restrict the list of returned objects by their labels. // Defaults to everything. @@ -3242,7 +3242,7 @@ type ListOptions struct { // PodLogOptions is the query options for a Pod's logs REST call. type PodLogOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // The container for which to stream logs. Defaults to only container if there is one container in the pod. // +optional @@ -3264,7 +3264,7 @@ type PodLogOptions struct { // If this value is in the future, no logs will be returned. // Only one of sinceSeconds or sinceTime may be specified. // +optional - SinceTime *unversioned.Time `json:"sinceTime,omitempty" protobuf:"bytes,5,opt,name=sinceTime"` + SinceTime *metav1.Time `json:"sinceTime,omitempty" protobuf:"bytes,5,opt,name=sinceTime"` // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // of log output. Defaults to false. // +optional @@ -3285,7 +3285,7 @@ type PodLogOptions struct { // TODO: merge w/ PodExecOptions below for stdin, stdout, etc // and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY type PodAttachOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Stdin if true, redirects the standard input stream of the pod for this call. // Defaults to false. @@ -3320,7 +3320,7 @@ type PodAttachOptions struct { // TODO: This is largely identical to PodAttachOptions above, make sure they stay in sync and see about merging // and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY type PodExecOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Redirect the standard input stream of the pod for this call. // Defaults to false. @@ -3353,7 +3353,7 @@ type PodExecOptions struct { // PodProxyOptions is the query options to a Pod's proxy call. type PodProxyOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Path is the URL path to use for the current proxy request to pod. // +optional @@ -3362,7 +3362,7 @@ type PodProxyOptions struct { // NodeProxyOptions is the query options to a Node's proxy call. type NodeProxyOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Path is the URL path to use for the current proxy request to node. // +optional @@ -3371,7 +3371,7 @@ type NodeProxyOptions struct { // ServiceProxyOptions is the query options to a Service's proxy call. type ServiceProxyOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Path is the part of URLs that include service endpoints, suffixes, // and parameters to use for the current proxy request to service. @@ -3452,7 +3452,7 @@ type LocalObjectReference struct { // SerializedReference is a reference to serialized object. type SerializedReference struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // The reference to an object in the system. // +optional Reference ObjectReference `json:"reference,omitempty" protobuf:"bytes,1,opt,name=reference"` @@ -3481,7 +3481,7 @@ const ( // Event is a report of an event somewhere in the cluster. // TODO: Decide whether to store these separately or with the object they apply to. type Event struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata ObjectMeta `json:"metadata" protobuf:"bytes,1,opt,name=metadata"` @@ -3506,11 +3506,11 @@ type Event struct { // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // +optional - FirstTimestamp unversioned.Time `json:"firstTimestamp,omitempty" protobuf:"bytes,6,opt,name=firstTimestamp"` + FirstTimestamp metav1.Time `json:"firstTimestamp,omitempty" protobuf:"bytes,6,opt,name=firstTimestamp"` // The time at which the most recent occurrence of this event was recorded. // +optional - LastTimestamp unversioned.Time `json:"lastTimestamp,omitempty" protobuf:"bytes,7,opt,name=lastTimestamp"` + LastTimestamp metav1.Time `json:"lastTimestamp,omitempty" protobuf:"bytes,7,opt,name=lastTimestamp"` // The number of times this event has occurred. // +optional @@ -3523,11 +3523,11 @@ type Event struct { // EventList is a list of events. type EventList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of events Items []Event `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -3535,11 +3535,11 @@ type EventList struct { // List holds a list of objects, which may not be known by the server. type List struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of objects Items []runtime.RawExtension `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -3589,7 +3589,7 @@ type LimitRangeSpec struct { // LimitRange sets resource usage limits for each kind of resource in a Namespace. type LimitRange struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3603,11 +3603,11 @@ type LimitRange struct { // LimitRangeList is a list of LimitRange items. type LimitRangeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of LimitRange objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_limit_range.md @@ -3687,7 +3687,7 @@ type ResourceQuotaStatus struct { // ResourceQuota sets aggregate quota restrictions enforced per namespace type ResourceQuota struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3706,11 +3706,11 @@ type ResourceQuota struct { // ResourceQuotaList is a list of ResourceQuota items. type ResourceQuotaList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of ResourceQuota objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota @@ -3722,7 +3722,7 @@ type ResourceQuotaList struct { // Secret holds secret data of a certain type. The total bytes of the values in // the Data field must be less than MaxSecretSize bytes. type Secret struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3834,11 +3834,11 @@ const ( // SecretList is a list of Secret. type SecretList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of secret objects. // More info: http://kubernetes.io/docs/user-guide/secrets @@ -3849,7 +3849,7 @@ type SecretList struct { // ConfigMap holds configuration data for pods to consume. type ConfigMap struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3863,11 +3863,11 @@ type ConfigMap struct { // ConfigMapList is a resource containing a list of ConfigMap objects. type ConfigMapList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of ConfigMaps. Items []ConfigMap `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -3904,7 +3904,7 @@ type ComponentCondition struct { // ComponentStatus (and ComponentStatusList) holds the cluster validation info. type ComponentStatus struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3917,11 +3917,11 @@ type ComponentStatus struct { // Status of all the conditions for the component as a list of ComponentStatus objects. type ComponentStatusList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of ComponentStatus objects. Items []ComponentStatus `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -4022,7 +4022,7 @@ type SELinuxOptions struct { // RangeAllocation is not a public type. type RangeAllocation struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -4046,5 +4046,5 @@ const ( // When the --failure-domains scheduler flag is not specified, // DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity. - DefaultFailureDomains string = unversioned.LabelHostname + "," + unversioned.LabelZoneFailureDomain + "," + unversioned.LabelZoneRegion + DefaultFailureDomains string = metav1.LabelHostname + "," + metav1.LabelZoneFailureDomain + "," + metav1.LabelZoneRegion ) diff --git a/pkg/api/v1/zz_generated.conversion.go b/pkg/api/v1/zz_generated.conversion.go index 0f4b511b654..69c8b3d60e5 100644 --- a/pkg/api/v1/zz_generated.conversion.go +++ b/pkg/api/v1/zz_generated.conversion.go @@ -22,7 +22,7 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" types "k8s.io/kubernetes/pkg/types" @@ -2343,7 +2343,7 @@ func autoConvert_v1_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *api.Object out.ResourceVersion = in.ResourceVersion out.Generation = in.Generation out.CreationTimestamp = in.CreationTimestamp - out.DeletionTimestamp = (*unversioned.Time)(unsafe.Pointer(in.DeletionTimestamp)) + out.DeletionTimestamp = (*meta_v1.Time)(unsafe.Pointer(in.DeletionTimestamp)) out.DeletionGracePeriodSeconds = (*int64)(unsafe.Pointer(in.DeletionGracePeriodSeconds)) out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels)) out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations)) @@ -2366,7 +2366,7 @@ func autoConvert_api_ObjectMeta_To_v1_ObjectMeta(in *api.ObjectMeta, out *Object out.ResourceVersion = in.ResourceVersion out.Generation = in.Generation out.CreationTimestamp = in.CreationTimestamp - out.DeletionTimestamp = (*unversioned.Time)(unsafe.Pointer(in.DeletionTimestamp)) + out.DeletionTimestamp = (*meta_v1.Time)(unsafe.Pointer(in.DeletionTimestamp)) out.DeletionGracePeriodSeconds = (*int64)(unsafe.Pointer(in.DeletionGracePeriodSeconds)) out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels)) out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations)) @@ -2526,7 +2526,7 @@ func Convert_api_PersistentVolumeClaimList_To_v1_PersistentVolumeClaimList(in *a func autoConvert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *PersistentVolumeClaimSpec, out *api.PersistentVolumeClaimSpec, s conversion.Scope) error { out.AccessModes = *(*[]api.PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) if err := Convert_v1_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } @@ -2540,7 +2540,7 @@ func Convert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *P func autoConvert_api_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *api.PersistentVolumeClaimSpec, out *PersistentVolumeClaimSpec, s conversion.Scope) error { out.AccessModes = *(*[]PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) if err := Convert_api_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } @@ -2803,7 +2803,7 @@ func Convert_api_PodAffinity_To_v1_PodAffinity(in *api.PodAffinity, out *PodAffi } func autoConvert_v1_PodAffinityTerm_To_api_PodAffinityTerm(in *PodAffinityTerm, out *api.PodAffinityTerm, s conversion.Scope) error { - out.LabelSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.LabelSelector)) + out.LabelSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.LabelSelector)) out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) out.TopologyKey = in.TopologyKey return nil @@ -2814,7 +2814,7 @@ func Convert_v1_PodAffinityTerm_To_api_PodAffinityTerm(in *PodAffinityTerm, out } func autoConvert_api_PodAffinityTerm_To_v1_PodAffinityTerm(in *api.PodAffinityTerm, out *PodAffinityTerm, s conversion.Scope) error { - out.LabelSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.LabelSelector)) + out.LabelSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.LabelSelector)) out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) out.TopologyKey = in.TopologyKey return nil @@ -2971,7 +2971,7 @@ func autoConvert_v1_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out *a out.Follow = in.Follow out.Previous = in.Previous out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds)) - out.SinceTime = (*unversioned.Time)(unsafe.Pointer(in.SinceTime)) + out.SinceTime = (*meta_v1.Time)(unsafe.Pointer(in.SinceTime)) out.Timestamps = in.Timestamps out.TailLines = (*int64)(unsafe.Pointer(in.TailLines)) out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes)) @@ -2987,7 +2987,7 @@ func autoConvert_api_PodLogOptions_To_v1_PodLogOptions(in *api.PodLogOptions, ou out.Follow = in.Follow out.Previous = in.Previous out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds)) - out.SinceTime = (*unversioned.Time)(unsafe.Pointer(in.SinceTime)) + out.SinceTime = (*meta_v1.Time)(unsafe.Pointer(in.SinceTime)) out.Timestamps = in.Timestamps out.TailLines = (*int64)(unsafe.Pointer(in.TailLines)) out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes)) @@ -3138,7 +3138,7 @@ func autoConvert_v1_PodStatus_To_api_PodStatus(in *PodStatus, out *api.PodStatus out.Reason = in.Reason out.HostIP = in.HostIP out.PodIP = in.PodIP - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) + out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.InitContainerStatuses = *(*[]api.ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses)) out.ContainerStatuses = *(*[]api.ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses)) return nil @@ -3155,7 +3155,7 @@ func autoConvert_api_PodStatus_To_v1_PodStatus(in *api.PodStatus, out *PodStatus out.Reason = in.Reason out.HostIP = in.HostIP out.PodIP = in.PodIP - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) + out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.InitContainerStatuses = *(*[]ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses)) out.ContainerStatuses = *(*[]ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses)) return nil diff --git a/pkg/api/v1/zz_generated.deepcopy.go b/pkg/api/v1/zz_generated.deepcopy.go index bd08e9375eb..cd8d72912c2 100644 --- a/pkg/api/v1/zz_generated.deepcopy.go +++ b/pkg/api/v1/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package v1 import ( - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" types "k8s.io/kubernetes/pkg/types" @@ -1883,7 +1883,7 @@ func DeepCopy_v1_ObjectMeta(in interface{}, out interface{}, c *conversion.Clone out.CreationTimestamp = in.CreationTimestamp.DeepCopy() if in.DeletionTimestamp != nil { in, out := &in.DeletionTimestamp, &out.DeletionTimestamp - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.DeletionTimestamp = nil @@ -2040,8 +2040,8 @@ func DeepCopy_v1_PersistentVolumeClaimSpec(in interface{}, out interface{}, c *c } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -2362,8 +2362,8 @@ func DeepCopy_v1_PodAffinityTerm(in interface{}, out interface{}, c *conversion. out := out.(*PodAffinityTerm) if in.LabelSelector != nil { in, out := &in.LabelSelector, &out.LabelSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -2498,7 +2498,7 @@ func DeepCopy_v1_PodLogOptions(in interface{}, out interface{}, c *conversion.Cl } if in.SinceTime != nil { in, out := &in.SinceTime, &out.SinceTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.SinceTime = nil @@ -2706,7 +2706,7 @@ func DeepCopy_v1_PodStatus(in interface{}, out interface{}, c *conversion.Cloner out.PodIP = in.PodIP if in.StartTime != nil { in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.StartTime = nil diff --git a/pkg/api/validation/BUILD b/pkg/api/validation/BUILD index f00bdcecaed..bfccee1cf0c 100644 --- a/pkg/api/validation/BUILD +++ b/pkg/api/validation/BUILD @@ -26,10 +26,10 @@ go_library( "//pkg/api/pod:go_default_library", "//pkg/api/resource:go_default_library", "//pkg/api/service:go_default_library", - "//pkg/api/unversioned/validation:go_default_library", "//pkg/api/util:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1/validation:go_default_library", "//pkg/apis/storage/util:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/labels:go_default_library", @@ -73,9 +73,9 @@ go_test( "//pkg/api/service:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/storage/util:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index 823e468c27b..0ab490b0220 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -32,7 +32,7 @@ import ( utilpod "k8s.io/kubernetes/pkg/api/pod" "k8s.io/kubernetes/pkg/api/resource" apiservice "k8s.io/kubernetes/pkg/api/service" - unversionedvalidation "k8s.io/kubernetes/pkg/api/unversioned/validation" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/api/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/capabilities" diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index 257b1556215..0c0c46eb75b 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/service" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/capabilities" @@ -228,21 +228,21 @@ func TestValidateObjectMetaOwnerReferences(t *testing.T) { func TestValidateObjectMetaUpdateIgnoresCreationTimestamp(t *testing.T) { if errs := ValidateObjectMetaUpdate( &api.ObjectMeta{Name: "test", ResourceVersion: "1"}, - &api.ObjectMeta{Name: "test", ResourceVersion: "1", CreationTimestamp: unversioned.NewTime(time.Unix(10, 0))}, + &api.ObjectMeta{Name: "test", ResourceVersion: "1", CreationTimestamp: metav1.NewTime(time.Unix(10, 0))}, field.NewPath("field"), ); len(errs) != 0 { t.Fatalf("unexpected errors: %v", errs) } if errs := ValidateObjectMetaUpdate( - &api.ObjectMeta{Name: "test", ResourceVersion: "1", CreationTimestamp: unversioned.NewTime(time.Unix(10, 0))}, + &api.ObjectMeta{Name: "test", ResourceVersion: "1", CreationTimestamp: metav1.NewTime(time.Unix(10, 0))}, &api.ObjectMeta{Name: "test", ResourceVersion: "1"}, field.NewPath("field"), ); len(errs) != 0 { t.Fatalf("unexpected errors: %v", errs) } if errs := ValidateObjectMetaUpdate( - &api.ObjectMeta{Name: "test", ResourceVersion: "1", CreationTimestamp: unversioned.NewTime(time.Unix(10, 0))}, - &api.ObjectMeta{Name: "test", ResourceVersion: "1", CreationTimestamp: unversioned.NewTime(time.Unix(11, 0))}, + &api.ObjectMeta{Name: "test", ResourceVersion: "1", CreationTimestamp: metav1.NewTime(time.Unix(10, 0))}, + &api.ObjectMeta{Name: "test", ResourceVersion: "1", CreationTimestamp: metav1.NewTime(time.Unix(11, 0))}, field.NewPath("field"), ); len(errs) != 0 { t.Fatalf("unexpected errors: %v", errs) @@ -256,18 +256,18 @@ func TestValidateFinalizersUpdate(t *testing.T) { ExpectedErr string }{ "invalid adding finalizers": { - Old: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &unversioned.Time{}, Finalizers: []string{"x/a"}}, - New: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &unversioned.Time{}, Finalizers: []string{"x/a", "y/b"}}, + Old: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &metav1.Time{}, Finalizers: []string{"x/a"}}, + New: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &metav1.Time{}, Finalizers: []string{"x/a", "y/b"}}, ExpectedErr: "y/b", }, "invalid changing finalizers": { - Old: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &unversioned.Time{}, Finalizers: []string{"x/a"}}, - New: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &unversioned.Time{}, Finalizers: []string{"x/b"}}, + Old: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &metav1.Time{}, Finalizers: []string{"x/a"}}, + New: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &metav1.Time{}, Finalizers: []string{"x/b"}}, ExpectedErr: "x/b", }, "valid removing finalizers": { - Old: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &unversioned.Time{}, Finalizers: []string{"x/a", "y/b"}}, - New: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &unversioned.Time{}, Finalizers: []string{"x/a"}}, + Old: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &metav1.Time{}, Finalizers: []string{"x/a", "y/b"}}, + New: api.ObjectMeta{Name: "test", ResourceVersion: "1", DeletionTimestamp: &metav1.Time{}, Finalizers: []string{"x/a"}}, ExpectedErr: "", }, "valid adding finalizers for objects not being deleted": { @@ -289,8 +289,8 @@ func TestValidateFinalizersUpdate(t *testing.T) { } func TestValidateObjectMetaUpdatePreventsDeletionFieldMutation(t *testing.T) { - now := unversioned.NewTime(time.Unix(1000, 0).UTC()) - later := unversioned.NewTime(time.Unix(2000, 0).UTC()) + now := metav1.NewTime(time.Unix(1000, 0).UTC()) + later := metav1.NewTime(time.Unix(2000, 0).UTC()) gracePeriodShort := int64(30) gracePeriodLong := int64(40) @@ -700,8 +700,8 @@ func TestValidatePersistentVolumeClaim(t *testing.T) { "good-claim": { isExpectedFailure: false, claim: testVolumeClaim("foo", "ns", api.PersistentVolumeClaimSpec{ - Selector: &unversioned.LabelSelector{ - MatchExpressions: []unversioned.LabelSelectorRequirement{ + Selector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "key2", Operator: "Exists", @@ -722,8 +722,8 @@ func TestValidatePersistentVolumeClaim(t *testing.T) { "invalid-label-selector": { isExpectedFailure: true, claim: testVolumeClaim("foo", "ns", api.PersistentVolumeClaimSpec{ - Selector: &unversioned.LabelSelector{ - MatchExpressions: []unversioned.LabelSelectorRequirement{ + Selector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "key2", Operator: "InvalidOp", @@ -801,8 +801,8 @@ func TestValidatePersistentVolumeClaim(t *testing.T) { "negative-storage-request": { isExpectedFailure: true, claim: testVolumeClaim("foo", "ns", api.PersistentVolumeClaimSpec{ - Selector: &unversioned.LabelSelector{ - MatchExpressions: []unversioned.LabelSelectorRequirement{ + Selector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "key2", Operator: "Exists", @@ -4430,7 +4430,7 @@ func TestValidatePodUpdate(t *testing.T) { activeDeadlineSecondsPositive = int64(30) activeDeadlineSecondsLarger = int64(31) - now = unversioned.Now() + now = metav1.Now() grace = int64(30) grace2 = int64(31) ) @@ -7762,7 +7762,7 @@ func TestValidateNamespaceFinalizeUpdate(t *testing.T) { } func TestValidateNamespaceStatusUpdate(t *testing.T) { - now := unversioned.Now() + now := metav1.Now() tests := []struct { oldNamespace api.Namespace @@ -8509,7 +8509,7 @@ func fakeValidSecurityContext(priv bool) *api.SecurityContext { } func TestValidPodLogOptions(t *testing.T) { - now := unversioned.Now() + now := metav1.Now() negative := int64(-1) zero := int64(0) positive := int64(1) diff --git a/pkg/api/zz_generated.deepcopy.go b/pkg/api/zz_generated.deepcopy.go index 8e227119b3a..245117f64c4 100644 --- a/pkg/api/zz_generated.deepcopy.go +++ b/pkg/api/zz_generated.deepcopy.go @@ -21,7 +21,7 @@ limitations under the License. package api import ( - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" fields "k8s.io/kubernetes/pkg/fields" labels "k8s.io/kubernetes/pkg/labels" @@ -1923,7 +1923,7 @@ func DeepCopy_api_ObjectMeta(in interface{}, out interface{}, c *conversion.Clon out.CreationTimestamp = in.CreationTimestamp.DeepCopy() if in.DeletionTimestamp != nil { in, out := &in.DeletionTimestamp, &out.DeletionTimestamp - *out = new(unversioned.Time) + *out = new(v1.Time) **out = (*in).DeepCopy() } else { out.DeletionTimestamp = nil @@ -2080,8 +2080,8 @@ func DeepCopy_api_PersistentVolumeClaimSpec(in interface{}, out interface{}, c * } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -2402,8 +2402,8 @@ func DeepCopy_api_PodAffinityTerm(in interface{}, out interface{}, c *conversion out := out.(*PodAffinityTerm) if in.LabelSelector != nil { in, out := &in.LabelSelector, &out.LabelSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -2538,7 +2538,7 @@ func DeepCopy_api_PodLogOptions(in interface{}, out interface{}, c *conversion.C } if in.SinceTime != nil { in, out := &in.SinceTime, &out.SinceTime - *out = new(unversioned.Time) + *out = new(v1.Time) **out = (*in).DeepCopy() } else { out.SinceTime = nil @@ -2745,7 +2745,7 @@ func DeepCopy_api_PodStatus(in interface{}, out interface{}, c *conversion.Clone out.PodIP = in.PodIP if in.StartTime != nil { in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) + *out = new(v1.Time) **out = (*in).DeepCopy() } else { out.StartTime = nil diff --git a/pkg/apis/abac/BUILD b/pkg/apis/abac/BUILD index 91d01f8044c..d1e3e863597 100644 --- a/pkg/apis/abac/BUILD +++ b/pkg/apis/abac/BUILD @@ -18,7 +18,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/runtime/serializer:go_default_library", diff --git a/pkg/apis/abac/types.go b/pkg/apis/abac/types.go index dffb9925a42..d848b907510 100644 --- a/pkg/apis/abac/types.go +++ b/pkg/apis/abac/types.go @@ -17,11 +17,11 @@ limitations under the License. // +k8s:openapi-gen=true package abac -import "k8s.io/kubernetes/pkg/api/unversioned" +import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // Policy contains a single ABAC policy rule type Policy struct { - unversioned.TypeMeta + metav1.TypeMeta // Spec describes the policy rule Spec PolicySpec diff --git a/pkg/apis/abac/v0/BUILD b/pkg/apis/abac/v0/BUILD index dfa6747cefd..b659059629f 100644 --- a/pkg/apis/abac/v0/BUILD +++ b/pkg/apis/abac/v0/BUILD @@ -19,8 +19,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/apis/abac:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/abac/v0/types.go b/pkg/apis/abac/v0/types.go index d56ac3d9955..e3867023e5d 100644 --- a/pkg/apis/abac/v0/types.go +++ b/pkg/apis/abac/v0/types.go @@ -17,11 +17,11 @@ limitations under the License. // +k8s:openapi-gen=true package v0 -import "k8s.io/kubernetes/pkg/api/unversioned" +import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // Policy contains a single ABAC policy rule type Policy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // User is the username this rule applies to. // Either user or group is required to match the request. diff --git a/pkg/apis/abac/v1beta1/BUILD b/pkg/apis/abac/v1beta1/BUILD index 8930168817e..dbb74cf7232 100644 --- a/pkg/apis/abac/v1beta1/BUILD +++ b/pkg/apis/abac/v1beta1/BUILD @@ -18,8 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/apis/abac:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", ], diff --git a/pkg/apis/abac/v1beta1/types.go b/pkg/apis/abac/v1beta1/types.go index 93cb8cd049f..a7898001943 100644 --- a/pkg/apis/abac/v1beta1/types.go +++ b/pkg/apis/abac/v1beta1/types.go @@ -17,11 +17,11 @@ limitations under the License. // +k8s:openapi-gen=true package v1beta1 -import "k8s.io/kubernetes/pkg/api/unversioned" +import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // Policy contains a single ABAC policy rule type Policy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Spec describes the policy rule Spec PolicySpec `json:"spec"` diff --git a/pkg/apis/apps/BUILD b/pkg/apis/apps/BUILD index 0dc50903c11..bf8a3c2d5ee 100644 --- a/pkg/apis/apps/BUILD +++ b/pkg/apis/apps/BUILD @@ -23,7 +23,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/apps/types.generated.go b/pkg/apis/apps/types.generated.go index 444717153e2..5fe8db386d1 100644 --- a/pkg/apis/apps/types.generated.go +++ b/pkg/apis/apps/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" diff --git a/pkg/apis/apps/types.go b/pkg/apis/apps/types.go index b7cafa1820c..0b5de623973 100644 --- a/pkg/apis/apps/types.go +++ b/pkg/apis/apps/types.go @@ -18,7 +18,7 @@ package apps import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true @@ -30,7 +30,7 @@ import ( // The StatefulSet guarantees that a given network identity will always // map to the same storage identity. type StatefulSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -58,7 +58,7 @@ type StatefulSetSpec struct { // If empty, defaulted to labels on the pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Template is the object that describes the pod that will be created if // insufficient replicas are detected. Each pod stamped out by the StatefulSet @@ -96,8 +96,8 @@ type StatefulSetStatus struct { // StatefulSetList is a collection of StatefulSets. type StatefulSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []StatefulSet `json:"items"` } diff --git a/pkg/apis/apps/v1beta1/BUILD b/pkg/apis/apps/v1beta1/BUILD index f2fddd246cc..55f27c1731c 100644 --- a/pkg/apis/apps/v1beta1/BUILD +++ b/pkg/apis/apps/v1beta1/BUILD @@ -29,9 +29,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/apps:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/apps/v1beta1/conversion.go b/pkg/apis/apps/v1beta1/conversion.go index 1ab94d8bd5e..0998225ae2b 100644 --- a/pkg/apis/apps/v1beta1/conversion.go +++ b/pkg/apis/apps/v1beta1/conversion.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/conversion" @@ -58,7 +58,7 @@ func Convert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *StatefulSetSpec } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) + *out = new(metav1.LabelSelector) if err := s.Convert(*in, *out, 0); err != nil { return err } @@ -88,7 +88,7 @@ func Convert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.StatefulSe *out.Replicas = in.Replicas if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) + *out = new(metav1.LabelSelector) if err := s.Convert(*in, *out, 0); err != nil { return err } diff --git a/pkg/apis/apps/v1beta1/defaults.go b/pkg/apis/apps/v1beta1/defaults.go index f9cbe701d61..01ca9fb8499 100644 --- a/pkg/apis/apps/v1beta1/defaults.go +++ b/pkg/apis/apps/v1beta1/defaults.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) @@ -32,7 +32,7 @@ func SetDefaults_StatefulSet(obj *StatefulSet) { labels := obj.Spec.Template.Labels if labels != nil { if obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{ + obj.Spec.Selector = &metav1.LabelSelector{ MatchLabels: labels, } } diff --git a/pkg/apis/apps/v1beta1/generated.pb.go b/pkg/apis/apps/v1beta1/generated.pb.go index 3e944daef4f..d2e9bdf7910 100644 --- a/pkg/apis/apps/v1beta1/generated.pb.go +++ b/pkg/apis/apps/v1beta1/generated.pb.go @@ -36,7 +36,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/api/unversioned" +import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" import strings "strings" diff --git a/pkg/apis/apps/v1beta1/register.go b/pkg/apis/apps/v1beta1/register.go index 8ea0b17810f..e99fe0aa12f 100644 --- a/pkg/apis/apps/v1beta1/register.go +++ b/pkg/apis/apps/v1beta1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -47,7 +47,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &StatefulSetList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/apps/v1beta1/types.generated.go b/pkg/apis/apps/v1beta1/types.generated.go index f9ef2251873..99e788e8f1e 100644 --- a/pkg/apis/apps/v1beta1/types.generated.go +++ b/pkg/apis/apps/v1beta1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/apis/apps/v1beta1/types.go b/pkg/apis/apps/v1beta1/types.go index c7b179f2c6b..49f4343d74c 100644 --- a/pkg/apis/apps/v1beta1/types.go +++ b/pkg/apis/apps/v1beta1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -30,7 +30,7 @@ import ( // The StatefulSet guarantees that a given network identity will always // map to the same storage identity. type StatefulSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -58,7 +58,7 @@ type StatefulSetSpec struct { // If empty, defaulted to labels on the pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` // Template is the object that describes the pod that will be created if // insufficient replicas are detected. Each pod stamped out by the StatefulSet @@ -96,8 +96,8 @@ type StatefulSetStatus struct { // StatefulSetList is a collection of StatefulSets. type StatefulSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` } diff --git a/pkg/apis/apps/v1beta1/zz_generated.conversion.go b/pkg/apis/apps/v1beta1/zz_generated.conversion.go index 1fff844f008..57bd7ac6784 100644 --- a/pkg/apis/apps/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/apps/v1beta1/zz_generated.conversion.go @@ -22,9 +22,9 @@ package v1beta1 import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" - v1 "k8s.io/kubernetes/pkg/api/v1" + api_v1 "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" unsafe "unsafe" @@ -129,8 +129,8 @@ func autoConvert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *StatefulSet if err := api.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { return err } - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } out.VolumeClaimTemplates = *(*[]api.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) @@ -142,11 +142,11 @@ func autoConvert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.Statef if err := api.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { return err } - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } - out.VolumeClaimTemplates = *(*[]v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) + out.VolumeClaimTemplates = *(*[]api_v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.ServiceName = in.ServiceName return nil } diff --git a/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go b/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go index 26cda10bf4f..005ba44c5aa 100644 --- a/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v1beta1 import ( - unversioned "k8s.io/kubernetes/pkg/api/unversioned" v1 "k8s.io/kubernetes/pkg/api/v1" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" @@ -95,8 +95,8 @@ func DeepCopy_v1beta1_StatefulSetSpec(in interface{}, out interface{}, c *conver } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { diff --git a/pkg/apis/apps/validation/BUILD b/pkg/apis/apps/validation/BUILD index 7af237e83ca..65edc87e323 100644 --- a/pkg/apis/apps/validation/BUILD +++ b/pkg/apis/apps/validation/BUILD @@ -16,10 +16,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", - "//pkg/api/unversioned/validation:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/apps:go_default_library", + "//pkg/apis/meta/v1:go_default_library", + "//pkg/apis/meta/v1/validation:go_default_library", "//pkg/labels:go_default_library", "//pkg/util/validation/field:go_default_library", ], @@ -32,7 +32,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/apps:go_default_library", + "//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/pkg/apis/apps/validation/validation.go b/pkg/apis/apps/validation/validation.go index cf128a2fc63..00c573be11e 100644 --- a/pkg/apis/apps/validation/validation.go +++ b/pkg/apis/apps/validation/validation.go @@ -20,8 +20,8 @@ import ( "reflect" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" - unversionedvalidation "k8s.io/kubernetes/pkg/api/unversioned/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/labels" @@ -76,7 +76,7 @@ func ValidateStatefulSetSpec(spec *apps.StatefulSetSpec, fldPath *field.Path) fi } } - selector, err := unversioned.LabelSelectorAsSelector(spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(spec.Selector) if err != nil { allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), spec.Selector, "")) } else { diff --git a/pkg/apis/apps/validation/validation_test.go b/pkg/apis/apps/validation/validation_test.go index 2fcd5ac4608..38f97c33abb 100644 --- a/pkg/apis/apps/validation/validation_test.go +++ b/pkg/apis/apps/validation/validation_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" ) @@ -55,14 +55,14 @@ func TestValidateStatefulSet(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, { ObjectMeta: api.ObjectMeta{Name: "abc-123", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -77,14 +77,14 @@ func TestValidateStatefulSet(t *testing.T) { "zero-length ID": { ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, "missing-namespace": { ObjectMeta: api.ObjectMeta{Name: "abc-123"}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -97,21 +97,21 @@ func TestValidateStatefulSet(t *testing.T) { "selector_doesnt_match": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, Template: validPodTemplate.Template, }, }, "invalid manifest": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, }, }, "negative_replicas": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ Replicas: -1, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, }, }, "invalid_label": { @@ -123,7 +123,7 @@ func TestValidateStatefulSet(t *testing.T) { }, }, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -148,7 +148,7 @@ func TestValidateStatefulSet(t *testing.T) { }, }, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -158,7 +158,7 @@ func TestValidateStatefulSet(t *testing.T) { Namespace: api.NamespaceDefault, }, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: api.PodTemplateSpec{ Spec: api.PodSpec{ RestartPolicy: api.RestartPolicyOnFailure, @@ -177,7 +177,7 @@ func TestValidateStatefulSet(t *testing.T) { Namespace: api.NamespaceDefault, }, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: api.PodTemplateSpec{ Spec: api.PodSpec{ RestartPolicy: api.RestartPolicyNever, @@ -263,7 +263,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { old: apps.StatefulSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -271,7 +271,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ Replicas: 3, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -289,7 +289,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { old: apps.StatefulSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -297,7 +297,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ Replicas: 2, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: readWriteVolumePodTemplate.Template, }, }, @@ -306,7 +306,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { old: apps.StatefulSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -314,7 +314,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ Replicas: 1, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: readWriteVolumePodTemplate.Template, }, }, @@ -323,7 +323,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { old: apps.StatefulSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -331,7 +331,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ Replicas: 2, - Selector: &unversioned.LabelSelector{MatchLabels: invalidLabels}, + Selector: &metav1.LabelSelector{MatchLabels: invalidLabels}, Template: validPodTemplate.Template, }, }, @@ -340,7 +340,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { old: apps.StatefulSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -348,7 +348,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ Replicas: 2, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: invalidPodTemplate.Template, }, }, @@ -357,7 +357,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { old: apps.StatefulSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -365,7 +365,7 @@ func TestValidateStatefulSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ Replicas: -1, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, diff --git a/pkg/apis/apps/zz_generated.deepcopy.go b/pkg/apis/apps/zz_generated.deepcopy.go index c9d148140b7..14acc56d8b7 100644 --- a/pkg/apis/apps/zz_generated.deepcopy.go +++ b/pkg/apis/apps/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ package apps import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" @@ -89,8 +89,8 @@ func DeepCopy_apps_StatefulSetSpec(in interface{}, out interface{}, c *conversio out.Replicas = in.Replicas if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { diff --git a/pkg/apis/authentication/BUILD b/pkg/apis/authentication/BUILD index b52cd12b941..f73f7268b6c 100644 --- a/pkg/apis/authentication/BUILD +++ b/pkg/apis/authentication/BUILD @@ -22,7 +22,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/authentication/register.go b/pkg/apis/authentication/register.go index 6bc28500a18..de7949eb132 100644 --- a/pkg/apis/authentication/register.go +++ b/pkg/apis/authentication/register.go @@ -18,7 +18,7 @@ package authentication import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -48,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &api.ListOptions{}, &api.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &TokenReview{}, ) diff --git a/pkg/apis/authentication/types.generated.go b/pkg/apis/authentication/types.generated.go index ea0b8f0e32c..f5b26081527 100644 --- a/pkg/apis/authentication/types.generated.go +++ b/pkg/apis/authentication/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/pkg/apis/authentication/types.go b/pkg/apis/authentication/types.go index 16d7e8c2ae2..f053de1bf8b 100644 --- a/pkg/apis/authentication/types.go +++ b/pkg/apis/authentication/types.go @@ -18,7 +18,7 @@ package authentication import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) const ( @@ -42,7 +42,7 @@ const ( // TokenReview attempts to authenticate a token to a known user. type TokenReview struct { - unversioned.TypeMeta + metav1.TypeMeta // ObjectMeta fulfills the meta.ObjectMetaAccessor interface so that the stock // REST handler paths work api.ObjectMeta diff --git a/pkg/apis/authentication/v1beta1/BUILD b/pkg/apis/authentication/v1beta1/BUILD index caea0a53c04..4ec15f15c10 100644 --- a/pkg/apis/authentication/v1beta1/BUILD +++ b/pkg/apis/authentication/v1beta1/BUILD @@ -26,9 +26,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/authentication:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/authentication/v1beta1/register.go b/pkg/apis/authentication/v1beta1/register.go index 18418f55735..08fcb917c76 100644 --- a/pkg/apis/authentication/v1beta1/register.go +++ b/pkg/apis/authentication/v1beta1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -44,7 +44,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &TokenReview{}, ) diff --git a/pkg/apis/authentication/v1beta1/types.generated.go b/pkg/apis/authentication/v1beta1/types.generated.go index 83982830b58..1b4b4f1c87e 100644 --- a/pkg/apis/authentication/v1beta1/types.generated.go +++ b/pkg/apis/authentication/v1beta1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" diff --git a/pkg/apis/authentication/v1beta1/types.go b/pkg/apis/authentication/v1beta1/types.go index 3cab98f7a8e..7220e24ec42 100644 --- a/pkg/apis/authentication/v1beta1/types.go +++ b/pkg/apis/authentication/v1beta1/types.go @@ -19,7 +19,7 @@ package v1beta1 import ( "fmt" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -31,7 +31,7 @@ import ( // Note: TokenReview requests may be cached by the webhook token authenticator // plugin in the kube-apiserver. type TokenReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/pkg/apis/authorization/BUILD b/pkg/apis/authorization/BUILD index b52cd12b941..f73f7268b6c 100644 --- a/pkg/apis/authorization/BUILD +++ b/pkg/apis/authorization/BUILD @@ -22,7 +22,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/authorization/types.generated.go b/pkg/apis/authorization/types.generated.go index c3a10de56d4..fe2735d2988 100644 --- a/pkg/apis/authorization/types.generated.go +++ b/pkg/apis/authorization/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/pkg/apis/authorization/types.go b/pkg/apis/authorization/types.go index 545d1fa82ac..5d9f0afe08b 100644 --- a/pkg/apis/authorization/types.go +++ b/pkg/apis/authorization/types.go @@ -18,7 +18,7 @@ package authorization import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true @@ -28,7 +28,7 @@ import ( // SubjectAccessReview checks whether or not a user or group can perform an action. Not filling in a // spec.namespace means "in all namespaces". type SubjectAccessReview struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Spec holds information about the request being evaluated @@ -46,7 +46,7 @@ type SubjectAccessReview struct { // spec.namespace means "in all namespaces". Self is a special case, because users should always be able // to check whether they can perform an action type SelfSubjectAccessReview struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Spec holds information about the request being evaluated. @@ -63,7 +63,7 @@ type SelfSubjectAccessReview struct { // Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions // checking. type LocalSubjectAccessReview struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Spec holds information about the request being evaluated. spec.namespace must be equal to the namespace diff --git a/pkg/apis/authorization/v1beta1/BUILD b/pkg/apis/authorization/v1beta1/BUILD index 91d56f2884d..8c3c7d0cf8a 100644 --- a/pkg/apis/authorization/v1beta1/BUILD +++ b/pkg/apis/authorization/v1beta1/BUILD @@ -26,9 +26,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/authorization:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/authorization/v1beta1/register.go b/pkg/apis/authorization/v1beta1/register.go index 5bb54d31649..72abc46dba1 100644 --- a/pkg/apis/authorization/v1beta1/register.go +++ b/pkg/apis/authorization/v1beta1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -45,7 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &SelfSubjectAccessReview{}, &SubjectAccessReview{}, diff --git a/pkg/apis/authorization/v1beta1/types.generated.go b/pkg/apis/authorization/v1beta1/types.generated.go index 0e640dea72e..69ccda875c9 100644 --- a/pkg/apis/authorization/v1beta1/types.generated.go +++ b/pkg/apis/authorization/v1beta1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" diff --git a/pkg/apis/authorization/v1beta1/types.go b/pkg/apis/authorization/v1beta1/types.go index dccc6cc5aa5..6fe1b6e7cae 100644 --- a/pkg/apis/authorization/v1beta1/types.go +++ b/pkg/apis/authorization/v1beta1/types.go @@ -19,7 +19,7 @@ package v1beta1 import ( "fmt" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -29,7 +29,7 @@ import ( // SubjectAccessReview checks whether or not a user or group can perform an action. type SubjectAccessReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -49,7 +49,7 @@ type SubjectAccessReview struct { // spec.namespace means "in all namespaces". Self is a special case, because users should always be able // to check whether they can perform an action type SelfSubjectAccessReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -68,7 +68,7 @@ type SelfSubjectAccessReview struct { // Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions // checking. type LocalSubjectAccessReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/pkg/apis/autoscaling/BUILD b/pkg/apis/autoscaling/BUILD index b52cd12b941..f73f7268b6c 100644 --- a/pkg/apis/autoscaling/BUILD +++ b/pkg/apis/autoscaling/BUILD @@ -22,7 +22,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/autoscaling/types.generated.go b/pkg/apis/autoscaling/types.generated.go index ecca35d7f28..7a67c084d3f 100644 --- a/pkg/apis/autoscaling/types.generated.go +++ b/pkg/apis/autoscaling/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/pkg/apis/autoscaling/types.go b/pkg/apis/autoscaling/types.go index 94cd54cb1a0..8170226bbd2 100644 --- a/pkg/apis/autoscaling/types.go +++ b/pkg/apis/autoscaling/types.go @@ -18,12 +18,12 @@ package autoscaling import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // Scale represents a scaling request for a resource. type Scale struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -93,7 +93,7 @@ type HorizontalPodAutoscalerStatus struct { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty"` + LastScaleTime *metav1.Time `json:"lastScaleTime,omitempty"` // current number of replicas of pods managed by this autoscaler. CurrentReplicas int32 `json:"currentReplicas"` @@ -111,7 +111,7 @@ type HorizontalPodAutoscalerStatus struct { // configuration of a horizontal pod autoscaler. type HorizontalPodAutoscaler struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -126,9 +126,9 @@ type HorizontalPodAutoscaler struct { // list of horizontal pod autoscaler objects. type HorizontalPodAutoscalerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // list of horizontal pod autoscaler objects. Items []HorizontalPodAutoscaler `json:"items"` diff --git a/pkg/apis/autoscaling/v1/BUILD b/pkg/apis/autoscaling/v1/BUILD index 049f865baf5..5ed4c68a2c1 100644 --- a/pkg/apis/autoscaling/v1/BUILD +++ b/pkg/apis/autoscaling/v1/BUILD @@ -26,9 +26,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/autoscaling:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/autoscaling/v1/generated.pb.go b/pkg/apis/autoscaling/v1/generated.pb.go index 21ba1c69096..54b74a0cb8e 100644 --- a/pkg/apis/autoscaling/v1/generated.pb.go +++ b/pkg/apis/autoscaling/v1/generated.pb.go @@ -40,7 +40,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/api/unversioned" +import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" diff --git a/pkg/apis/autoscaling/v1/register.go b/pkg/apis/autoscaling/v1/register.go index 06cfee44328..89b4b552ca7 100644 --- a/pkg/apis/autoscaling/v1/register.go +++ b/pkg/apis/autoscaling/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -48,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Scale{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/autoscaling/v1/types.generated.go b/pkg/apis/autoscaling/v1/types.generated.go index 9b03510f5f0..29cb4e957bf 100644 --- a/pkg/apis/autoscaling/v1/types.generated.go +++ b/pkg/apis/autoscaling/v1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" diff --git a/pkg/apis/autoscaling/v1/types.go b/pkg/apis/autoscaling/v1/types.go index a47891c1b0c..5f5cf98ddfa 100644 --- a/pkg/apis/autoscaling/v1/types.go +++ b/pkg/apis/autoscaling/v1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -57,7 +57,7 @@ type HorizontalPodAutoscalerStatus struct { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"` + LastScaleTime *metav1.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"` // current number of replicas of pods managed by this autoscaler. CurrentReplicas int32 `json:"currentReplicas" protobuf:"varint,3,opt,name=currentReplicas"` @@ -75,7 +75,7 @@ type HorizontalPodAutoscalerStatus struct { // configuration of a horizontal pod autoscaler. type HorizontalPodAutoscaler struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -91,10 +91,10 @@ type HorizontalPodAutoscaler struct { // list of horizontal pod autoscaler objects. type HorizontalPodAutoscalerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // list of horizontal pod autoscaler objects. Items []HorizontalPodAutoscaler `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -102,7 +102,7 @@ type HorizontalPodAutoscalerList struct { // Scale represents a scaling request for a resource. type Scale struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/pkg/apis/autoscaling/v1/zz_generated.conversion.go b/pkg/apis/autoscaling/v1/zz_generated.conversion.go index 4f339e6d1e1..b9c79d0a6d4 100644 --- a/pkg/apis/autoscaling/v1/zz_generated.conversion.go +++ b/pkg/apis/autoscaling/v1/zz_generated.conversion.go @@ -21,8 +21,8 @@ limitations under the License. package v1 import ( - unversioned "k8s.io/kubernetes/pkg/api/unversioned" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" unsafe "unsafe" @@ -163,7 +163,7 @@ func Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscal func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error { out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) - out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) + out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) @@ -176,7 +176,7 @@ func Convert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutosc func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) - out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) + out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) diff --git a/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go b/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go index 70ed6d02798..63f59d84789 100644 --- a/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go +++ b/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v1 import ( - unversioned "k8s.io/kubernetes/pkg/api/unversioned" api_v1 "k8s.io/kubernetes/pkg/api/v1" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" @@ -134,7 +134,7 @@ func DeepCopy_v1_HorizontalPodAutoscalerStatus(in interface{}, out interface{}, } if in.LastScaleTime != nil { in, out := &in.LastScaleTime, &out.LastScaleTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.LastScaleTime = nil diff --git a/pkg/apis/autoscaling/zz_generated.deepcopy.go b/pkg/apis/autoscaling/zz_generated.deepcopy.go index dde5db7e466..ffdbd38c7b5 100644 --- a/pkg/apis/autoscaling/zz_generated.deepcopy.go +++ b/pkg/apis/autoscaling/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ package autoscaling import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" @@ -134,7 +134,7 @@ func DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(in interface{}, out inte } if in.LastScaleTime != nil { in, out := &in.LastScaleTime, &out.LastScaleTime - *out = new(unversioned.Time) + *out = new(v1.Time) **out = (*in).DeepCopy() } else { out.LastScaleTime = nil diff --git a/pkg/apis/batch/BUILD b/pkg/apis/batch/BUILD index 0dc50903c11..bf8a3c2d5ee 100644 --- a/pkg/apis/batch/BUILD +++ b/pkg/apis/batch/BUILD @@ -23,7 +23,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/batch/types.generated.go b/pkg/apis/batch/types.generated.go index c0aaee07bb2..376960cbcc9 100644 --- a/pkg/apis/batch/types.generated.go +++ b/pkg/apis/batch/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" diff --git a/pkg/apis/batch/types.go b/pkg/apis/batch/types.go index 8f919c265b0..1b5bd4433f3 100644 --- a/pkg/apis/batch/types.go +++ b/pkg/apis/batch/types.go @@ -18,14 +18,14 @@ package batch import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true // Job represents the configuration of a single job. type Job struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -44,11 +44,11 @@ type Job struct { // JobList is a collection of jobs. type JobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of Job. Items []Job `json:"items"` @@ -56,7 +56,7 @@ type JobList struct { // JobTemplate describes a template for creating copies of a predefined pod. type JobTemplate struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -107,7 +107,7 @@ type JobSpec struct { // Selector is a label query over pods that should match the pod count. // Normally, the system sets this field for you. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -137,13 +137,13 @@ type JobStatus struct { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty"` + StartTime *metav1.Time `json:"startTime,omitempty"` // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - CompletionTime *unversioned.Time `json:"completionTime,omitempty"` + CompletionTime *metav1.Time `json:"completionTime,omitempty"` // Active is the number of actively running pods. // +optional @@ -176,10 +176,10 @@ type JobCondition struct { Status api.ConditionStatus `json:"status"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty"` @@ -192,7 +192,7 @@ type JobCondition struct { // CronJob represents the configuration of a single cron job. type CronJob struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -211,11 +211,11 @@ type CronJob struct { // CronJobList is a collection of cron jobs. type CronJobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of CronJob. Items []CronJob `json:"items"` @@ -272,5 +272,5 @@ type CronJobStatus struct { // LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // +optional - LastScheduleTime *unversioned.Time `json:"lastScheduleTime,omitempty"` + LastScheduleTime *metav1.Time `json:"lastScheduleTime,omitempty"` } diff --git a/pkg/apis/batch/v1/BUILD b/pkg/apis/batch/v1/BUILD index 6f8f667aa16..2203c9265fe 100644 --- a/pkg/apis/batch/v1/BUILD +++ b/pkg/apis/batch/v1/BUILD @@ -29,9 +29,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/batch/v1/generated.pb.go b/pkg/apis/batch/v1/generated.pb.go index c743232142f..1bebc216552 100644 --- a/pkg/apis/batch/v1/generated.pb.go +++ b/pkg/apis/batch/v1/generated.pb.go @@ -37,7 +37,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/api/unversioned" +import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" import strings "strings" diff --git a/pkg/apis/batch/v1/register.go b/pkg/apis/batch/v1/register.go index 6342225a956..539210e4807 100644 --- a/pkg/apis/batch/v1/register.go +++ b/pkg/apis/batch/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -47,7 +47,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &JobList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/batch/v1/types.generated.go b/pkg/apis/batch/v1/types.generated.go index 0b6d641da2f..0f8b73c0da0 100644 --- a/pkg/apis/batch/v1/types.generated.go +++ b/pkg/apis/batch/v1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/apis/batch/v1/types.go b/pkg/apis/batch/v1/types.go index af179bcce64..6d549a91ff6 100644 --- a/pkg/apis/batch/v1/types.go +++ b/pkg/apis/batch/v1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -25,7 +25,7 @@ import ( // Job represents the configuration of a single job. type Job struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -44,11 +44,11 @@ type Job struct { // JobList is a collection of jobs. type JobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Job. Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -83,7 +83,7 @@ type JobSpec struct { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -116,13 +116,13 @@ type JobStatus struct { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` + StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - CompletionTime *unversioned.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` + CompletionTime *metav1.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` // Active is the number of actively running pods. // +optional @@ -155,10 +155,10 @@ type JobCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` diff --git a/pkg/apis/batch/v1/zz_generated.conversion.go b/pkg/apis/batch/v1/zz_generated.conversion.go index d47abdc43f9..5c5c4c037c3 100644 --- a/pkg/apis/batch/v1/zz_generated.conversion.go +++ b/pkg/apis/batch/v1/zz_generated.conversion.go @@ -22,9 +22,9 @@ package v1 import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" api_v1 "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" unsafe "unsafe" @@ -159,7 +159,7 @@ func autoConvert_v1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err @@ -171,7 +171,7 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err @@ -181,8 +181,8 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s func autoConvert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error { out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed @@ -195,8 +195,8 @@ func Convert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error { out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed diff --git a/pkg/apis/batch/v1/zz_generated.deepcopy.go b/pkg/apis/batch/v1/zz_generated.deepcopy.go index 162373788dc..df221842b6d 100644 --- a/pkg/apis/batch/v1/zz_generated.deepcopy.go +++ b/pkg/apis/batch/v1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v1 import ( - unversioned "k8s.io/kubernetes/pkg/api/unversioned" api_v1 "k8s.io/kubernetes/pkg/api/v1" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" @@ -124,8 +124,8 @@ func DeepCopy_v1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -162,14 +162,14 @@ func DeepCopy_v1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner } if in.StartTime != nil { in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.StartTime = nil } if in.CompletionTime != nil { in, out := &in.CompletionTime, &out.CompletionTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.CompletionTime = nil diff --git a/pkg/apis/batch/v2alpha1/BUILD b/pkg/apis/batch/v2alpha1/BUILD index 948ebd79d78..94297dc382a 100644 --- a/pkg/apis/batch/v2alpha1/BUILD +++ b/pkg/apis/batch/v2alpha1/BUILD @@ -29,9 +29,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/batch/v2alpha1/generated.pb.go b/pkg/apis/batch/v2alpha1/generated.pb.go index b4cf1b4c5f8..67ebb92298f 100644 --- a/pkg/apis/batch/v2alpha1/generated.pb.go +++ b/pkg/apis/batch/v2alpha1/generated.pb.go @@ -43,7 +43,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/api/unversioned" +import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" import strings "strings" diff --git a/pkg/apis/batch/v2alpha1/types.generated.go b/pkg/apis/batch/v2alpha1/types.generated.go index 88fc0d7a77d..8c4daef5dd2 100644 --- a/pkg/apis/batch/v2alpha1/types.generated.go +++ b/pkg/apis/batch/v2alpha1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/apis/batch/v2alpha1/types.go b/pkg/apis/batch/v2alpha1/types.go index 73aaa7e36d7..18d73912b49 100644 --- a/pkg/apis/batch/v2alpha1/types.go +++ b/pkg/apis/batch/v2alpha1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v2alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -25,7 +25,7 @@ import ( // Job represents the configuration of a single job. type Job struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -44,11 +44,11 @@ type Job struct { // JobList is a collection of jobs. type JobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Job. Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -56,7 +56,7 @@ type JobList struct { // JobTemplate describes a template for creating copies of a predefined pod. type JobTemplate struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -110,7 +110,7 @@ type JobSpec struct { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -143,13 +143,13 @@ type JobStatus struct { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` + StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - CompletionTime *unversioned.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` + CompletionTime *metav1.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` // Active is the number of actively running pods. // +optional @@ -182,10 +182,10 @@ type JobCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -198,7 +198,7 @@ type JobCondition struct { // CronJob represents the configuration of a single cron job. type CronJob struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -217,11 +217,11 @@ type CronJob struct { // CronJobList is a collection of cron jobs. type CronJobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of CronJob. Items []CronJob `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -278,5 +278,5 @@ type CronJobStatus struct { // LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // +optional - LastScheduleTime *unversioned.Time `json:"lastScheduleTime,omitempty" protobuf:"bytes,4,opt,name=lastScheduleTime"` + LastScheduleTime *metav1.Time `json:"lastScheduleTime,omitempty" protobuf:"bytes,4,opt,name=lastScheduleTime"` } diff --git a/pkg/apis/batch/v2alpha1/zz_generated.conversion.go b/pkg/apis/batch/v2alpha1/zz_generated.conversion.go index 01f760c52fa..502d0d65cf2 100644 --- a/pkg/apis/batch/v2alpha1/zz_generated.conversion.go +++ b/pkg/apis/batch/v2alpha1/zz_generated.conversion.go @@ -22,9 +22,9 @@ package v2alpha1 import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" - v1 "k8s.io/kubernetes/pkg/api/v1" + api_v1 "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" unsafe "unsafe" @@ -171,7 +171,7 @@ func Convert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(in *batch.CronJobSpec, ou func autoConvert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *CronJobStatus, out *batch.CronJobStatus, s conversion.Scope) error { out.Active = *(*[]api.ObjectReference)(unsafe.Pointer(&in.Active)) - out.LastScheduleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScheduleTime)) + out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime)) return nil } @@ -180,8 +180,8 @@ func Convert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *CronJobStatus, ou } func autoConvert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *CronJobStatus, s conversion.Scope) error { - out.Active = *(*[]v1.ObjectReference)(unsafe.Pointer(&in.Active)) - out.LastScheduleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScheduleTime)) + out.Active = *(*[]api_v1.ObjectReference)(unsafe.Pointer(&in.Active)) + out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime)) return nil } @@ -241,7 +241,7 @@ func Convert_v2alpha1_JobCondition_To_batch_JobCondition(in *JobCondition, out * func autoConvert_batch_JobCondition_To_v2alpha1_JobCondition(in *batch.JobCondition, out *JobCondition, s conversion.Scope) error { out.Type = JobConditionType(in.Type) - out.Status = v1.ConditionStatus(in.Status) + out.Status = api_v1.ConditionStatus(in.Status) out.LastProbeTime = in.LastProbeTime out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason @@ -297,9 +297,9 @@ func autoConvert_v2alpha1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSp out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -309,9 +309,9 @@ func autoConvert_batch_JobSpec_To_v2alpha1_JobSpec(in *batch.JobSpec, out *JobSp out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -319,8 +319,8 @@ func autoConvert_batch_JobSpec_To_v2alpha1_JobSpec(in *batch.JobSpec, out *JobSp func autoConvert_v2alpha1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error { out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed @@ -333,8 +333,8 @@ func Convert_v2alpha1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.Job func autoConvert_batch_JobStatus_To_v2alpha1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error { out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed diff --git a/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go b/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go index d3d6847c565..b3fd9253d88 100644 --- a/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v2alpha1 import ( - unversioned "k8s.io/kubernetes/pkg/api/unversioned" v1 "k8s.io/kubernetes/pkg/api/v1" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" @@ -131,7 +131,7 @@ func DeepCopy_v2alpha1_CronJobStatus(in interface{}, out interface{}, c *convers } if in.LastScheduleTime != nil { in, out := &in.LastScheduleTime, &out.LastScheduleTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.LastScheduleTime = nil @@ -220,8 +220,8 @@ func DeepCopy_v2alpha1_JobSpec(in interface{}, out interface{}, c *conversion.Cl } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -258,14 +258,14 @@ func DeepCopy_v2alpha1_JobStatus(in interface{}, out interface{}, c *conversion. } if in.StartTime != nil { in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.StartTime = nil } if in.CompletionTime != nil { in, out := &in.CompletionTime, &out.CompletionTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.CompletionTime = nil diff --git a/pkg/apis/batch/validation/BUILD b/pkg/apis/batch/validation/BUILD index 0987468d8c0..baa1381e60e 100644 --- a/pkg/apis/batch/validation/BUILD +++ b/pkg/apis/batch/validation/BUILD @@ -16,10 +16,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", - "//pkg/api/unversioned/validation:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", + "//pkg/apis/meta/v1/validation:go_default_library", "//pkg/labels:go_default_library", "//pkg/util/validation/field:go_default_library", "//vendor:github.com/robfig/cron", @@ -33,8 +33,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/types:go_default_library", ], ) diff --git a/pkg/apis/batch/validation/validation.go b/pkg/apis/batch/validation/validation.go index 45fdbd0f447..22f72b8bdfd 100644 --- a/pkg/apis/batch/validation/validation.go +++ b/pkg/apis/batch/validation/validation.go @@ -20,8 +20,8 @@ import ( "github.com/robfig/cron" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" - unversionedvalidation "k8s.io/kubernetes/pkg/api/unversioned/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/labels" @@ -65,7 +65,7 @@ func ValidateGeneratedSelector(obj *batch.Job) field.ErrorList { expectedLabels["controller-uid"] = string(obj.UID) expectedLabels["job-name"] = string(obj.Name) // Whether manually or automatically generated, the selector of the job must match the pods it will produce. - if selector, err := unversioned.LabelSelectorAsSelector(obj.Spec.Selector); err == nil { + if selector, err := metav1.LabelSelectorAsSelector(obj.Spec.Selector); err == nil { if !selector.Matches(labels.Set(expectedLabels)) { allErrs = append(allErrs, field.Invalid(field.NewPath("spec").Child("selector"), obj.Spec.Selector, "`selector` not auto-generated")) } @@ -92,7 +92,7 @@ func ValidateJobSpec(spec *batch.JobSpec, fldPath *field.Path) field.ErrorList { } // Whether manually or automatically generated, the selector of the job must match the pods it will produce. - if selector, err := unversioned.LabelSelectorAsSelector(spec.Selector); err == nil { + if selector, err := metav1.LabelSelectorAsSelector(spec.Selector); err == nil { labels := labels.Set(spec.Template.Labels) if !selector.Matches(labels) { allErrs = append(allErrs, field.Invalid(fldPath.Child("template", "metadata", "labels"), spec.Template.Labels, "`selector` does not match template `labels`")) diff --git a/pkg/apis/batch/validation/validation_test.go b/pkg/apis/batch/validation/validation_test.go index 91e9b42e1f3..0c7b00663cb 100644 --- a/pkg/apis/batch/validation/validation_test.go +++ b/pkg/apis/batch/validation/validation_test.go @@ -21,18 +21,18 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/types" ) -func getValidManualSelector() *unversioned.LabelSelector { - return &unversioned.LabelSelector{ +func getValidManualSelector() *metav1.LabelSelector { + return &metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, } } -func getValidPodTemplateSpecForManual(selector *unversioned.LabelSelector) api.PodTemplateSpec { +func getValidPodTemplateSpecForManual(selector *metav1.LabelSelector) api.PodTemplateSpec { return api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: selector.MatchLabels, @@ -45,13 +45,13 @@ func getValidPodTemplateSpecForManual(selector *unversioned.LabelSelector) api.P } } -func getValidGeneratedSelector() *unversioned.LabelSelector { - return &unversioned.LabelSelector{ +func getValidGeneratedSelector() *metav1.LabelSelector { + return &metav1.LabelSelector{ MatchLabels: map[string]string{"controller-uid": "1a2b3c", "job-name": "myjob"}, } } -func getValidPodTemplateSpecForGenerated(selector *unversioned.LabelSelector) api.PodTemplateSpec { +func getValidPodTemplateSpecForGenerated(selector *metav1.LabelSelector) api.PodTemplateSpec { return api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: selector.MatchLabels, diff --git a/pkg/apis/batch/zz_generated.deepcopy.go b/pkg/apis/batch/zz_generated.deepcopy.go index e9a54781da7..967231783cc 100644 --- a/pkg/apis/batch/zz_generated.deepcopy.go +++ b/pkg/apis/batch/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ package batch import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" @@ -131,7 +131,7 @@ func DeepCopy_batch_CronJobStatus(in interface{}, out interface{}, c *conversion } if in.LastScheduleTime != nil { in, out := &in.LastScheduleTime, &out.LastScheduleTime - *out = new(unversioned.Time) + *out = new(v1.Time) **out = (*in).DeepCopy() } else { out.LastScheduleTime = nil @@ -220,8 +220,8 @@ func DeepCopy_batch_JobSpec(in interface{}, out interface{}, c *conversion.Clone } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -258,14 +258,14 @@ func DeepCopy_batch_JobStatus(in interface{}, out interface{}, c *conversion.Clo } if in.StartTime != nil { in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) + *out = new(v1.Time) **out = (*in).DeepCopy() } else { out.StartTime = nil } if in.CompletionTime != nil { in, out := &in.CompletionTime, &out.CompletionTime - *out = new(unversioned.Time) + *out = new(v1.Time) **out = (*in).DeepCopy() } else { out.CompletionTime = nil diff --git a/pkg/apis/certificates/BUILD b/pkg/apis/certificates/BUILD index b52cd12b941..f73f7268b6c 100644 --- a/pkg/apis/certificates/BUILD +++ b/pkg/apis/certificates/BUILD @@ -22,7 +22,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/certificates/types.generated.go b/pkg/apis/certificates/types.generated.go index 6f5c513bc0b..262d23819d1 100644 --- a/pkg/apis/certificates/types.generated.go +++ b/pkg/apis/certificates/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/pkg/apis/certificates/types.go b/pkg/apis/certificates/types.go index e589ce74d74..fc85afbf130 100644 --- a/pkg/apis/certificates/types.go +++ b/pkg/apis/certificates/types.go @@ -18,7 +18,7 @@ package certificates import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true @@ -26,7 +26,7 @@ import ( // Describes a certificate signing request type CertificateSigningRequest struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -85,13 +85,13 @@ type CertificateSigningRequestCondition struct { Message string `json:"message,omitempty"` // timestamp for the last update to this condition // +optional - LastUpdateTime unversioned.Time `json:"lastUpdateTime,omitempty"` + LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"` } type CertificateSigningRequestList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // +optional Items []CertificateSigningRequest `json:"items,omitempty"` diff --git a/pkg/apis/certificates/v1alpha1/BUILD b/pkg/apis/certificates/v1alpha1/BUILD index d791e017bae..b89be07af45 100644 --- a/pkg/apis/certificates/v1alpha1/BUILD +++ b/pkg/apis/certificates/v1alpha1/BUILD @@ -26,9 +26,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/certificates:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/certificates/v1alpha1/register.go b/pkg/apis/certificates/v1alpha1/register.go index 420b836de2f..6cc4ce41261 100644 --- a/pkg/apis/certificates/v1alpha1/register.go +++ b/pkg/apis/certificates/v1alpha1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -52,7 +52,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &CertificateSigningRequestList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) // Add the watch version that applies diff --git a/pkg/apis/certificates/v1alpha1/types.generated.go b/pkg/apis/certificates/v1alpha1/types.generated.go index 5c6832b7026..a0d7b735f15 100644 --- a/pkg/apis/certificates/v1alpha1/types.generated.go +++ b/pkg/apis/certificates/v1alpha1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" diff --git a/pkg/apis/certificates/v1alpha1/types.go b/pkg/apis/certificates/v1alpha1/types.go index 54de065ae5c..2b04da43816 100644 --- a/pkg/apis/certificates/v1alpha1/types.go +++ b/pkg/apis/certificates/v1alpha1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -26,7 +26,7 @@ import ( // Describes a certificate signing request type CertificateSigningRequest struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -85,13 +85,13 @@ type CertificateSigningRequestCondition struct { Message string `json:"message,omitempty" protobuf:"bytes,3,opt,name=message"` // timestamp for the last update to this condition // +optional - LastUpdateTime unversioned.Time `json:"lastUpdateTime,omitempty" protobuf:"bytes,4,opt,name=lastUpdateTime"` + LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty" protobuf:"bytes,4,opt,name=lastUpdateTime"` } type CertificateSigningRequestList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` Items []CertificateSigningRequest `json:"items" protobuf:"bytes,2,rep,name=items"` } diff --git a/pkg/apis/componentconfig/BUILD b/pkg/apis/componentconfig/BUILD index 2d33359ddf0..80218fe06cd 100644 --- a/pkg/apis/componentconfig/BUILD +++ b/pkg/apis/componentconfig/BUILD @@ -22,7 +22,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/componentconfig/types.generated.go b/pkg/apis/componentconfig/types.generated.go index 435dbf6355b..be357cb7efe 100644 --- a/pkg/apis/componentconfig/types.generated.go +++ b/pkg/apis/componentconfig/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_config "k8s.io/kubernetes/pkg/util/config" "reflect" "runtime" diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index fb7100feaa7..b34de61372c 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -17,12 +17,12 @@ limitations under the License. package componentconfig import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" utilconfig "k8s.io/kubernetes/pkg/util/config" ) type KubeProxyConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // bindAddress is the IP address for the proxy server to serve on (set to 0.0.0.0 // for all interfaces) @@ -43,10 +43,10 @@ type KubeProxyConfiguration struct { IPTablesMasqueradeBit *int32 `json:"iptablesMasqueradeBit"` // iptablesSyncPeriod is the period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). Must be greater than 0. - IPTablesSyncPeriod unversioned.Duration `json:"iptablesSyncPeriodSeconds"` + IPTablesSyncPeriod metav1.Duration `json:"iptablesSyncPeriodSeconds"` // iptablesMinSyncPeriod is the minimum period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). - IPTablesMinSyncPeriod unversioned.Duration `json:"iptablesMinSyncPeriodSeconds"` + IPTablesMinSyncPeriod metav1.Duration `json:"iptablesMinSyncPeriodSeconds"` // kubeconfigPath is the path to the kubeconfig file with authorization information (the // master location is set by the master flag). KubeconfigPath string `json:"kubeconfigPath"` @@ -67,7 +67,7 @@ type KubeProxyConfiguration struct { ResourceContainer string `json:"resourceContainer"` // udpIdleTimeout is how long an idle UDP connection will be kept open (e.g. '250ms', '2s'). // Must be greater than 0. Only applicable for proxyMode=userspace. - UDPIdleTimeout unversioned.Duration `json:"udpTimeoutMilliseconds"` + UDPIdleTimeout metav1.Duration `json:"udpTimeoutMilliseconds"` // conntrackMax is the maximum number of NAT connections to track (0 to // leave as-is). This takes precedence over conntrackMaxPerCore and conntrackMin. ConntrackMax int32 `json:"conntrackMax"` @@ -79,11 +79,11 @@ type KubeProxyConfiguration struct { ConntrackMin int32 `json:"conntrackMin"` // conntrackTCPEstablishedTimeout is how long an idle TCP connection will be kept open // (e.g. '2s'). Must be greater than 0. - ConntrackTCPEstablishedTimeout unversioned.Duration `json:"conntrackTCPEstablishedTimeout"` + ConntrackTCPEstablishedTimeout metav1.Duration `json:"conntrackTCPEstablishedTimeout"` // conntrackTCPCloseWaitTimeout is how long an idle conntrack entry // in CLOSE_WAIT state will remain in the conntrack // table. (e.g. '60s'). Must be greater than 0 to set. - ConntrackTCPCloseWaitTimeout unversioned.Duration `json:"conntrackTCPCloseWaitTimeout"` + ConntrackTCPCloseWaitTimeout metav1.Duration `json:"conntrackTCPCloseWaitTimeout"` } // Currently two modes of proxying are available: 'userspace' (older, stable) or 'iptables' @@ -119,19 +119,19 @@ const ( // TODO: curate the ordering and structure of this config object type KubeletConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // podManifestPath is the path to the directory containing pod manifests to // run, or the path to a single manifest file PodManifestPath string `json:"podManifestPath"` // syncFrequency is the max period between synchronizing running // containers and config - SyncFrequency unversioned.Duration `json:"syncFrequency"` + SyncFrequency metav1.Duration `json:"syncFrequency"` // fileCheckFrequency is the duration between checking config files for // new data - FileCheckFrequency unversioned.Duration `json:"fileCheckFrequency"` + FileCheckFrequency metav1.Duration `json:"fileCheckFrequency"` // httpCheckFrequency is the duration between checking http for new data - HTTPCheckFrequency unversioned.Duration `json:"httpCheckFrequency"` + HTTPCheckFrequency metav1.Duration `json:"httpCheckFrequency"` // manifestURL is the URL for accessing the container manifest ManifestURL string `json:"manifestURL"` // manifestURLHeader is the HTTP header to use when accessing the manifest @@ -209,7 +209,7 @@ type KubeletConfiguration struct { EnableDebuggingHandlers bool `json:"enableDebuggingHandlers"` // minimumGCAge is the minimum age for a finished container before it is // garbage collected. - MinimumGCAge unversioned.Duration `json:"minimumGCAge"` + MinimumGCAge metav1.Duration `json:"minimumGCAge"` // maxPerPodContainerCount is the maximum number of old instances to // retain per container. Each container takes up some disk space. MaxPerPodContainerCount int32 `json:"maxPerPodContainerCount"` @@ -241,14 +241,14 @@ type KubeletConfiguration struct { ClusterDNS string `json:"clusterDNS"` // streamingConnectionIdleTimeout is the maximum time a streaming connection // can be idle before the connection is automatically closed. - StreamingConnectionIdleTimeout unversioned.Duration `json:"streamingConnectionIdleTimeout"` + StreamingConnectionIdleTimeout metav1.Duration `json:"streamingConnectionIdleTimeout"` // nodeStatusUpdateFrequency is the frequency that kubelet posts node // status to master. Note: be cautious when changing the constant, it // must work with nodeMonitorGracePeriod in nodecontroller. - NodeStatusUpdateFrequency unversioned.Duration `json:"nodeStatusUpdateFrequency"` + NodeStatusUpdateFrequency metav1.Duration `json:"nodeStatusUpdateFrequency"` // imageMinimumGCAge is the minimum age for an unused image before it is // garbage collected. - ImageMinimumGCAge unversioned.Duration `json:"imageMinimumGCAge"` + ImageMinimumGCAge metav1.Duration `json:"imageMinimumGCAge"` // imageGCHighThresholdPercent is the percent of disk usage after which // image garbage collection is always run. ImageGCHighThresholdPercent int32 `json:"imageGCHighThresholdPercent"` @@ -261,7 +261,7 @@ type KubeletConfiguration struct { // be rejected. LowDiskSpaceThresholdMB int32 `json:"lowDiskSpaceThresholdMB"` // How frequently to calculate and cache volume disk usage for all pods - VolumeStatsAggPeriod unversioned.Duration `json:"volumeStatsAggPeriod"` + VolumeStatsAggPeriod metav1.Duration `json:"volumeStatsAggPeriod"` // networkPluginName is the name of the network plugin to be invoked for // various events in kubelet/pod lifecycle NetworkPluginName string `json:"networkPluginName"` @@ -319,7 +319,7 @@ type KubeletConfiguration struct { // runtimeRequestTimeout is the timeout for all runtime requests except long running // requests - pull, logs, exec and attach. // +optional - RuntimeRequestTimeout unversioned.Duration `json:"runtimeRequestTimeout,omitempty"` + RuntimeRequestTimeout metav1.Duration `json:"runtimeRequestTimeout,omitempty"` // rktPath is the path of rkt binary. Leave empty to use the first rkt in // $PATH. // +optional @@ -395,7 +395,7 @@ type KubeletConfiguration struct { // outOfDiskTransitionFrequency is duration for which the kubelet has to // wait before transitioning out of out-of-disk node condition status. // +optional - OutOfDiskTransitionFrequency unversioned.Duration `json:"outOfDiskTransitionFrequency,omitempty"` + OutOfDiskTransitionFrequency metav1.Duration `json:"outOfDiskTransitionFrequency,omitempty"` // nodeIP is IP address of the node. If set, kubelet will use this IP // address for the node. // +optional @@ -417,7 +417,7 @@ type KubeletConfiguration struct { EvictionSoftGracePeriod string `json:"evictionSoftGracePeriod,omitempty"` // Duration for which the kubelet has to wait before transitioning out of an eviction pressure condition. // +optional - EvictionPressureTransitionPeriod unversioned.Duration `json:"evictionPressureTransitionPeriod,omitempty"` + EvictionPressureTransitionPeriod metav1.Duration `json:"evictionPressureTransitionPeriod,omitempty"` // Maximum allowed grace period (in seconds) to use when terminating pods in response to a soft eviction threshold being met. // +optional EvictionMaxPodGracePeriod int32 `json:"evictionMaxPodGracePeriod,omitempty"` @@ -493,9 +493,9 @@ type KubeletAuthorization struct { type KubeletWebhookAuthorization struct { // cacheAuthorizedTTL is the duration to cache 'authorized' responses from the webhook authorizer. - CacheAuthorizedTTL unversioned.Duration `json:"cacheAuthorizedTTL"` + CacheAuthorizedTTL metav1.Duration `json:"cacheAuthorizedTTL"` // cacheUnauthorizedTTL is the duration to cache 'unauthorized' responses from the webhook authorizer. - CacheUnauthorizedTTL unversioned.Duration `json:"cacheUnauthorizedTTL"` + CacheUnauthorizedTTL metav1.Duration `json:"cacheUnauthorizedTTL"` } type KubeletAuthentication struct { @@ -518,7 +518,7 @@ type KubeletWebhookAuthentication struct { // enabled allows bearer token authentication backed by the tokenreviews.authentication.k8s.io API Enabled bool `json:"enabled"` // cacheTTL enables caching of authentication results - CacheTTL unversioned.Duration `json:"cacheTTL"` + CacheTTL metav1.Duration `json:"cacheTTL"` } type KubeletAnonymousAuthentication struct { @@ -529,7 +529,7 @@ type KubeletAnonymousAuthentication struct { } type KubeSchedulerConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // port is the port that the scheduler's http service runs on. Port int32 `json:"port"` @@ -576,20 +576,20 @@ type LeaderElectionConfiguration struct { // maximum duration that a leader can be stopped before it is replaced // by another candidate. This is only applicable if leader election is // enabled. - LeaseDuration unversioned.Duration `json:"leaseDuration"` + LeaseDuration metav1.Duration `json:"leaseDuration"` // renewDeadline is the interval between attempts by the acting master to // renew a leadership slot before it stops leading. This must be less // than or equal to the lease duration. This is only applicable if leader // election is enabled. - RenewDeadline unversioned.Duration `json:"renewDeadline"` + RenewDeadline metav1.Duration `json:"renewDeadline"` // retryPeriod is the duration the clients should wait between attempting // acquisition and renewal of a leadership. This is only applicable if // leader election is enabled. - RetryPeriod unversioned.Duration `json:"retryPeriod"` + RetryPeriod metav1.Duration `json:"retryPeriod"` } type KubeControllerManagerConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // port is the port that the controller-manager's http service runs on. Port int32 `json:"port"` @@ -651,36 +651,36 @@ type KubeControllerManagerConfiguration struct { LookupCacheSizeForDaemonSet int32 `json:"lookupCacheSizeForDaemonSet"` // serviceSyncPeriod is the period for syncing services with their external // load balancers. - ServiceSyncPeriod unversioned.Duration `json:"serviceSyncPeriod"` + ServiceSyncPeriod metav1.Duration `json:"serviceSyncPeriod"` // nodeSyncPeriod is the period for syncing nodes from cloudprovider. Longer // periods will result in fewer calls to cloud provider, but may delay addition // of new nodes to cluster. - NodeSyncPeriod unversioned.Duration `json:"nodeSyncPeriod"` + NodeSyncPeriod metav1.Duration `json:"nodeSyncPeriod"` // routeReconciliationPeriod is the period for reconciling routes created for Nodes by cloud provider.. - RouteReconciliationPeriod unversioned.Duration `json:"routeReconciliationPeriod"` + RouteReconciliationPeriod metav1.Duration `json:"routeReconciliationPeriod"` // resourceQuotaSyncPeriod is the period for syncing quota usage status // in the system. - ResourceQuotaSyncPeriod unversioned.Duration `json:"resourceQuotaSyncPeriod"` + ResourceQuotaSyncPeriod metav1.Duration `json:"resourceQuotaSyncPeriod"` // namespaceSyncPeriod is the period for syncing namespace life-cycle // updates. - NamespaceSyncPeriod unversioned.Duration `json:"namespaceSyncPeriod"` + NamespaceSyncPeriod metav1.Duration `json:"namespaceSyncPeriod"` // pvClaimBinderSyncPeriod is the period for syncing persistent volumes // and persistent volume claims. - PVClaimBinderSyncPeriod unversioned.Duration `json:"pvClaimBinderSyncPeriod"` + PVClaimBinderSyncPeriod metav1.Duration `json:"pvClaimBinderSyncPeriod"` // minResyncPeriod is the resync period in reflectors; will be random between // minResyncPeriod and 2*minResyncPeriod. - MinResyncPeriod unversioned.Duration `json:"minResyncPeriod"` + MinResyncPeriod metav1.Duration `json:"minResyncPeriod"` // terminatedPodGCThreshold is the number of terminated pods that can exist // before the terminated pod garbage collector starts deleting terminated pods. // If <= 0, the terminated pod garbage collector is disabled. TerminatedPodGCThreshold int32 `json:"terminatedPodGCThreshold"` // horizontalPodAutoscalerSyncPeriod is the period for syncing the number of // pods in horizontal pod autoscaler. - HorizontalPodAutoscalerSyncPeriod unversioned.Duration `json:"horizontalPodAutoscalerSyncPeriod"` + HorizontalPodAutoscalerSyncPeriod metav1.Duration `json:"horizontalPodAutoscalerSyncPeriod"` // deploymentControllerSyncPeriod is the period for syncing the deployments. - DeploymentControllerSyncPeriod unversioned.Duration `json:"deploymentControllerSyncPeriod"` + DeploymentControllerSyncPeriod metav1.Duration `json:"deploymentControllerSyncPeriod"` // podEvictionTimeout is the grace period for deleting pods on failed nodes. - PodEvictionTimeout unversioned.Duration `json:"podEvictionTimeout"` + PodEvictionTimeout metav1.Duration `json:"podEvictionTimeout"` // DEPRECATED: deletingPodsQps is the number of nodes per second on which pods are deleted in // case of node failure. DeletingPodsQps float32 `json:"deletingPodsQps"` @@ -691,15 +691,15 @@ type KubeControllerManagerConfiguration struct { // unresponsive before marking it unhealthy. Must be N times more than kubelet's // nodeStatusUpdateFrequency, where N means number of retries allowed for kubelet // to post node status. - NodeMonitorGracePeriod unversioned.Duration `json:"nodeMonitorGracePeriod"` + NodeMonitorGracePeriod metav1.Duration `json:"nodeMonitorGracePeriod"` // registerRetryCount is the number of retries for initial node registration. // Retry interval equals node-sync-period. RegisterRetryCount int32 `json:"registerRetryCount"` // nodeStartupGracePeriod is the amount of time which we allow starting a node to // be unresponsive before marking it unhealthy. - NodeStartupGracePeriod unversioned.Duration `json:"nodeStartupGracePeriod"` + NodeStartupGracePeriod metav1.Duration `json:"nodeStartupGracePeriod"` // nodeMonitorPeriod is the period for syncing NodeStatus in NodeController. - NodeMonitorPeriod unversioned.Duration `json:"nodeMonitorPeriod"` + NodeMonitorPeriod metav1.Duration `json:"nodeMonitorPeriod"` // serviceAccountKeyFile is the filename containing a PEM-encoded private RSA key // used to sign service account tokens. ServiceAccountKeyFile string `json:"serviceAccountKeyFile"` @@ -745,7 +745,7 @@ type KubeControllerManagerConfiguration struct { // volumeConfiguration holds configuration for volume related features. VolumeConfiguration VolumeConfiguration `json:"volumeConfiguration"` // How long to wait between starting controller managers - ControllerStartInterval unversioned.Duration `json:"controllerStartInterval"` + ControllerStartInterval metav1.Duration `json:"controllerStartInterval"` // enables the generic garbage collector. MUST be synced with the // corresponding flag of the kube-apiserver. WARNING: the generic garbage // collector is an alpha feature. diff --git a/pkg/apis/componentconfig/v1alpha1/BUILD b/pkg/apis/componentconfig/v1alpha1/BUILD index d877888c4da..33015e77dfa 100644 --- a/pkg/apis/componentconfig/v1alpha1/BUILD +++ b/pkg/apis/componentconfig/v1alpha1/BUILD @@ -24,8 +24,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/componentconfig:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/kubelet/types:go_default_library", diff --git a/pkg/apis/componentconfig/v1alpha1/defaults.go b/pkg/apis/componentconfig/v1alpha1/defaults.go index 318cdd03cc2..59ea6a51397 100644 --- a/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubelet/qos" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/master/ports" @@ -48,7 +48,7 @@ const ( defaultIPTablesDropBit = 15 ) -var zeroDuration = unversioned.Duration{} +var zeroDuration = metav1.Duration{} func addDefaultingFuncs(scheme *kruntime.Scheme) error { RegisterDefaults(scheme) @@ -78,11 +78,11 @@ func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) { obj.ResourceContainer = "/kube-proxy" } if obj.IPTablesSyncPeriod.Duration == 0 { - obj.IPTablesSyncPeriod = unversioned.Duration{Duration: 30 * time.Second} + obj.IPTablesSyncPeriod = metav1.Duration{Duration: 30 * time.Second} } - zero := unversioned.Duration{} + zero := metav1.Duration{} if obj.UDPIdleTimeout == zero { - obj.UDPIdleTimeout = unversioned.Duration{Duration: 250 * time.Millisecond} + obj.UDPIdleTimeout = metav1.Duration{Duration: 250 * time.Millisecond} } // If ConntrackMax is set, respect it. if obj.ConntrackMax == 0 { @@ -99,7 +99,7 @@ func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) { obj.IPTablesMasqueradeBit = &temp } if obj.ConntrackTCPEstablishedTimeout == zero { - obj.ConntrackTCPEstablishedTimeout = unversioned.Duration{Duration: 24 * time.Hour} // 1 day (1/5 default) + obj.ConntrackTCPEstablishedTimeout = metav1.Duration{Duration: 24 * time.Hour} // 1 day (1/5 default) } if obj.ConntrackTCPCloseWaitTimeout == zero { // See https://github.com/kubernetes/kubernetes/issues/32551. @@ -122,7 +122,7 @@ func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) { // // We set CLOSE_WAIT to one hour by default to better match // typical server timeouts. - obj.ConntrackTCPCloseWaitTimeout = unversioned.Duration{Duration: 1 * time.Hour} + obj.ConntrackTCPCloseWaitTimeout = metav1.Duration{Duration: 1 * time.Hour} } } @@ -157,15 +157,15 @@ func SetDefaults_KubeSchedulerConfiguration(obj *KubeSchedulerConfiguration) { } func SetDefaults_LeaderElectionConfiguration(obj *LeaderElectionConfiguration) { - zero := unversioned.Duration{} + zero := metav1.Duration{} if obj.LeaseDuration == zero { - obj.LeaseDuration = unversioned.Duration{Duration: 15 * time.Second} + obj.LeaseDuration = metav1.Duration{Duration: 15 * time.Second} } if obj.RenewDeadline == zero { - obj.RenewDeadline = unversioned.Duration{Duration: 10 * time.Second} + obj.RenewDeadline = metav1.Duration{Duration: 10 * time.Second} } if obj.RetryPeriod == zero { - obj.RetryPeriod = unversioned.Duration{Duration: 2 * time.Second} + obj.RetryPeriod = metav1.Duration{Duration: 2 * time.Second} } } @@ -177,16 +177,16 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.Authentication.Webhook.Enabled = boolVar(false) } if obj.Authentication.Webhook.CacheTTL == zeroDuration { - obj.Authentication.Webhook.CacheTTL = unversioned.Duration{Duration: 2 * time.Minute} + obj.Authentication.Webhook.CacheTTL = metav1.Duration{Duration: 2 * time.Minute} } if obj.Authorization.Mode == "" { obj.Authorization.Mode = KubeletAuthorizationModeAlwaysAllow } if obj.Authorization.Webhook.CacheAuthorizedTTL == zeroDuration { - obj.Authorization.Webhook.CacheAuthorizedTTL = unversioned.Duration{Duration: 5 * time.Minute} + obj.Authorization.Webhook.CacheAuthorizedTTL = metav1.Duration{Duration: 5 * time.Minute} } if obj.Authorization.Webhook.CacheUnauthorizedTTL == zeroDuration { - obj.Authorization.Webhook.CacheUnauthorizedTTL = unversioned.Duration{Duration: 30 * time.Second} + obj.Authorization.Webhook.CacheUnauthorizedTTL = metav1.Duration{Duration: 30 * time.Second} } if obj.Address == "" { @@ -199,7 +199,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.CAdvisorPort = 4194 } if obj.VolumeStatsAggPeriod == zeroDuration { - obj.VolumeStatsAggPeriod = unversioned.Duration{Duration: time.Minute} + obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute} } if obj.CertDirectory == "" { obj.CertDirectory = "/var/run/kubernetes" @@ -211,7 +211,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.ContainerRuntime = "docker" } if obj.RuntimeRequestTimeout == zeroDuration { - obj.RuntimeRequestTimeout = unversioned.Duration{Duration: 2 * time.Minute} + obj.RuntimeRequestTimeout = metav1.Duration{Duration: 2 * time.Minute} } if obj.CPUCFSQuota == nil { obj.CPUCFSQuota = boolVar(true) @@ -239,7 +239,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.EnableServer = boolVar(true) } if obj.FileCheckFrequency == zeroDuration { - obj.FileCheckFrequency = unversioned.Duration{Duration: 20 * time.Second} + obj.FileCheckFrequency = metav1.Duration{Duration: 20 * time.Second} } if obj.HealthzBindAddress == "" { obj.HealthzBindAddress = "127.0.0.1" @@ -257,10 +257,10 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.HostIPCSources = []string{kubetypes.AllSource} } if obj.HTTPCheckFrequency == zeroDuration { - obj.HTTPCheckFrequency = unversioned.Duration{Duration: 20 * time.Second} + obj.HTTPCheckFrequency = metav1.Duration{Duration: 20 * time.Second} } if obj.ImageMinimumGCAge == zeroDuration { - obj.ImageMinimumGCAge = unversioned.Duration{Duration: 2 * time.Minute} + obj.ImageMinimumGCAge = metav1.Duration{Duration: 2 * time.Minute} } if obj.ImageGCHighThresholdPercent == nil { temp := int32(90) @@ -290,7 +290,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.MaxPods = 110 } if obj.MinimumGCAge == zeroDuration { - obj.MinimumGCAge = unversioned.Duration{Duration: 0} + obj.MinimumGCAge = metav1.Duration{Duration: 0} } if obj.NonMasqueradeCIDR == "" { obj.NonMasqueradeCIDR = "10.0.0.0/8" @@ -299,7 +299,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.VolumePluginDir = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/" } if obj.NodeStatusUpdateFrequency == zeroDuration { - obj.NodeStatusUpdateFrequency = unversioned.Duration{Duration: 10 * time.Second} + obj.NodeStatusUpdateFrequency = metav1.Duration{Duration: 10 * time.Second} } if obj.OOMScoreAdj == nil { temp := int32(qos.KubeletOOMScoreAdj) @@ -343,10 +343,10 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.SeccompProfileRoot = filepath.Join(defaultRootDir, "seccomp") } if obj.StreamingConnectionIdleTimeout == zeroDuration { - obj.StreamingConnectionIdleTimeout = unversioned.Duration{Duration: 4 * time.Hour} + obj.StreamingConnectionIdleTimeout = metav1.Duration{Duration: 4 * time.Hour} } if obj.SyncFrequency == zeroDuration { - obj.SyncFrequency = unversioned.Duration{Duration: 1 * time.Minute} + obj.SyncFrequency = metav1.Duration{Duration: 1 * time.Minute} } if obj.ReconcileCIDR == nil { obj.ReconcileCIDR = boolVar(true) @@ -362,7 +362,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.KubeAPIBurst = 10 } if obj.OutOfDiskTransitionFrequency == zeroDuration { - obj.OutOfDiskTransitionFrequency = unversioned.Duration{Duration: 5 * time.Minute} + obj.OutOfDiskTransitionFrequency = metav1.Duration{Duration: 5 * time.Minute} } if string(obj.HairpinMode) == "" { obj.HairpinMode = PromiscuousBridge @@ -372,7 +372,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.EvictionHard = &temp } if obj.EvictionPressureTransitionPeriod == zeroDuration { - obj.EvictionPressureTransitionPeriod = unversioned.Duration{Duration: 5 * time.Minute} + obj.EvictionPressureTransitionPeriod = metav1.Duration{Duration: 5 * time.Minute} } if obj.SystemReserved == nil { obj.SystemReserved = make(map[string]string) diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go index 6128ee73610..5ecd0eccf67 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.go +++ b/pkg/apis/componentconfig/v1alpha1/types.go @@ -16,10 +16,10 @@ limitations under the License. package v1alpha1 -import "k8s.io/kubernetes/pkg/api/unversioned" +import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) type KubeProxyConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // bindAddress is the IP address for the proxy server to serve on (set to 0.0.0.0 // for all interfaces) @@ -40,10 +40,10 @@ type KubeProxyConfiguration struct { IPTablesMasqueradeBit *int32 `json:"iptablesMasqueradeBit"` // iptablesSyncPeriod is the period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). Must be greater than 0. - IPTablesSyncPeriod unversioned.Duration `json:"iptablesSyncPeriodSeconds"` + IPTablesSyncPeriod metav1.Duration `json:"iptablesSyncPeriodSeconds"` // iptablesMinSyncPeriod is the minimum period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). - IPTablesMinSyncPeriod unversioned.Duration `json:"iptablesMinSyncPeriodSeconds"` + IPTablesMinSyncPeriod metav1.Duration `json:"iptablesMinSyncPeriodSeconds"` // kubeconfigPath is the path to the kubeconfig file with authorization information (the // master location is set by the master flag). KubeconfigPath string `json:"kubeconfigPath"` @@ -64,7 +64,7 @@ type KubeProxyConfiguration struct { ResourceContainer string `json:"resourceContainer"` // udpIdleTimeout is how long an idle UDP connection will be kept open (e.g. '250ms', '2s'). // Must be greater than 0. Only applicable for proxyMode=userspace. - UDPIdleTimeout unversioned.Duration `json:"udpTimeoutMilliseconds"` + UDPIdleTimeout metav1.Duration `json:"udpTimeoutMilliseconds"` // conntrackMax is the maximum number of NAT connections to track (0 to // leave as-is). This takes precedence over conntrackMaxPerCore and conntrackMin. ConntrackMax int32 `json:"conntrackMax"` @@ -76,11 +76,11 @@ type KubeProxyConfiguration struct { ConntrackMin int32 `json:"conntrackMin"` // conntrackTCPEstablishedTimeout is how long an idle TCP connection // will be kept open (e.g. '2s'). Must be greater than 0. - ConntrackTCPEstablishedTimeout unversioned.Duration `json:"conntrackTCPEstablishedTimeout"` + ConntrackTCPEstablishedTimeout metav1.Duration `json:"conntrackTCPEstablishedTimeout"` // conntrackTCPCloseWaitTimeout is how long an idle conntrack entry // in CLOSE_WAIT state will remain in the conntrack // table. (e.g. '60s'). Must be greater than 0 to set. - ConntrackTCPCloseWaitTimeout unversioned.Duration `json:"conntrackTCPCloseWaitTimeout"` + ConntrackTCPCloseWaitTimeout metav1.Duration `json:"conntrackTCPCloseWaitTimeout"` } // Currently two modes of proxying are available: 'userspace' (older, stable) or 'iptables' @@ -97,7 +97,7 @@ const ( ) type KubeSchedulerConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // port is the port that the scheduler's http service runs on. Port int `json:"port"` @@ -162,32 +162,32 @@ type LeaderElectionConfiguration struct { // maximum duration that a leader can be stopped before it is replaced // by another candidate. This is only applicable if leader election is // enabled. - LeaseDuration unversioned.Duration `json:"leaseDuration"` + LeaseDuration metav1.Duration `json:"leaseDuration"` // renewDeadline is the interval between attempts by the acting master to // renew a leadership slot before it stops leading. This must be less // than or equal to the lease duration. This is only applicable if leader // election is enabled. - RenewDeadline unversioned.Duration `json:"renewDeadline"` + RenewDeadline metav1.Duration `json:"renewDeadline"` // retryPeriod is the duration the clients should wait between attempting // acquisition and renewal of a leadership. This is only applicable if // leader election is enabled. - RetryPeriod unversioned.Duration `json:"retryPeriod"` + RetryPeriod metav1.Duration `json:"retryPeriod"` } type KubeletConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // podManifestPath is the path to the directory containing pod manifests to // run, or the path to a single manifest file PodManifestPath string `json:"podManifestPath"` // syncFrequency is the max period between synchronizing running // containers and config - SyncFrequency unversioned.Duration `json:"syncFrequency"` + SyncFrequency metav1.Duration `json:"syncFrequency"` // fileCheckFrequency is the duration between checking config files for // new data - FileCheckFrequency unversioned.Duration `json:"fileCheckFrequency"` + FileCheckFrequency metav1.Duration `json:"fileCheckFrequency"` // httpCheckFrequency is the duration between checking http for new data - HTTPCheckFrequency unversioned.Duration `json:"httpCheckFrequency"` + HTTPCheckFrequency metav1.Duration `json:"httpCheckFrequency"` // manifestURL is the URL for accessing the container manifest ManifestURL string `json:"manifestURL"` // manifestURLHeader is the HTTP header to use when accessing the manifest @@ -265,7 +265,7 @@ type KubeletConfiguration struct { EnableDebuggingHandlers *bool `json:"enableDebuggingHandlers"` // minimumGCAge is the minimum age for a finished container before it is // garbage collected. - MinimumGCAge unversioned.Duration `json:"minimumGCAge"` + MinimumGCAge metav1.Duration `json:"minimumGCAge"` // maxPerPodContainerCount is the maximum number of old instances to // retain per container. Each container takes up some disk space. MaxPerPodContainerCount int32 `json:"maxPerPodContainerCount"` @@ -297,14 +297,14 @@ type KubeletConfiguration struct { ClusterDNS string `json:"clusterDNS"` // streamingConnectionIdleTimeout is the maximum time a streaming connection // can be idle before the connection is automatically closed. - StreamingConnectionIdleTimeout unversioned.Duration `json:"streamingConnectionIdleTimeout"` + StreamingConnectionIdleTimeout metav1.Duration `json:"streamingConnectionIdleTimeout"` // nodeStatusUpdateFrequency is the frequency that kubelet posts node // status to master. Note: be cautious when changing the constant, it // must work with nodeMonitorGracePeriod in nodecontroller. - NodeStatusUpdateFrequency unversioned.Duration `json:"nodeStatusUpdateFrequency"` + NodeStatusUpdateFrequency metav1.Duration `json:"nodeStatusUpdateFrequency"` // imageMinimumGCAge is the minimum age for an unused image before it is // garbage collected. - ImageMinimumGCAge unversioned.Duration `json:"imageMinimumGCAge"` + ImageMinimumGCAge metav1.Duration `json:"imageMinimumGCAge"` // imageGCHighThresholdPercent is the percent of disk usage after which // image garbage collection is always run. The percent is calculated as // this field value out of 100. @@ -318,7 +318,7 @@ type KubeletConfiguration struct { // be rejected. LowDiskSpaceThresholdMB int32 `json:"lowDiskSpaceThresholdMB"` // How frequently to calculate and cache volume disk usage for all pods - VolumeStatsAggPeriod unversioned.Duration `json:"volumeStatsAggPeriod"` + VolumeStatsAggPeriod metav1.Duration `json:"volumeStatsAggPeriod"` // networkPluginName is the name of the network plugin to be invoked for // various events in kubelet/pod lifecycle NetworkPluginName string `json:"networkPluginName"` @@ -369,7 +369,7 @@ type KubeletConfiguration struct { RemoteImageEndpoint string `json:"remoteImageEndpoint"` // runtimeRequestTimeout is the timeout for all runtime requests except long running // requests - pull, logs, exec and attach. - RuntimeRequestTimeout unversioned.Duration `json:"runtimeRequestTimeout"` + RuntimeRequestTimeout metav1.Duration `json:"runtimeRequestTimeout"` // rktPath is the path of rkt binary. Leave empty to use the first rkt in // $PATH. RktPath string `json:"rktPath"` @@ -442,7 +442,7 @@ type KubeletConfiguration struct { SerializeImagePulls *bool `json:"serializeImagePulls"` // outOfDiskTransitionFrequency is duration for which the kubelet has to // wait before transitioning out of out-of-disk node condition status. - OutOfDiskTransitionFrequency unversioned.Duration `json:"outOfDiskTransitionFrequency"` + OutOfDiskTransitionFrequency metav1.Duration `json:"outOfDiskTransitionFrequency"` // nodeIP is IP address of the node. If set, kubelet will use this IP // address for the node. NodeIP string `json:"nodeIP"` @@ -459,7 +459,7 @@ type KubeletConfiguration struct { // Comma-delimeted list of grace periods for each soft eviction signal. For example, 'memory.available=30s'. EvictionSoftGracePeriod string `json:"evictionSoftGracePeriod"` // Duration for which the kubelet has to wait before transitioning out of an eviction pressure condition. - EvictionPressureTransitionPeriod unversioned.Duration `json:"evictionPressureTransitionPeriod"` + EvictionPressureTransitionPeriod metav1.Duration `json:"evictionPressureTransitionPeriod"` // Maximum allowed grace period (in seconds) to use when terminating pods in response to a soft eviction threshold being met. EvictionMaxPodGracePeriod int32 `json:"evictionMaxPodGracePeriod"` // Comma-delimited list of minimum reclaims (e.g. imagefs.available=2Gi) that describes the minimum amount of resource the kubelet will reclaim when performing a pod eviction if that resource is under pressure. @@ -534,9 +534,9 @@ type KubeletAuthorization struct { type KubeletWebhookAuthorization struct { // cacheAuthorizedTTL is the duration to cache 'authorized' responses from the webhook authorizer. - CacheAuthorizedTTL unversioned.Duration `json:"cacheAuthorizedTTL"` + CacheAuthorizedTTL metav1.Duration `json:"cacheAuthorizedTTL"` // cacheUnauthorizedTTL is the duration to cache 'unauthorized' responses from the webhook authorizer. - CacheUnauthorizedTTL unversioned.Duration `json:"cacheUnauthorizedTTL"` + CacheUnauthorizedTTL metav1.Duration `json:"cacheUnauthorizedTTL"` } type KubeletAuthentication struct { @@ -559,7 +559,7 @@ type KubeletWebhookAuthentication struct { // enabled allows bearer token authentication backed by the tokenreviews.authentication.k8s.io API Enabled *bool `json:"enabled"` // cacheTTL enables caching of authentication results - CacheTTL unversioned.Duration `json:"cacheTTL"` + CacheTTL metav1.Duration `json:"cacheTTL"` } type KubeletAnonymousAuthentication struct { diff --git a/pkg/apis/extensions/BUILD b/pkg/apis/extensions/BUILD index 2433b472790..b5a97ecfe70 100644 --- a/pkg/apis/extensions/BUILD +++ b/pkg/apis/extensions/BUILD @@ -24,9 +24,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go index 7a836eb3fad..993e7449d35 100644 --- a/pkg/apis/extensions/register.go +++ b/pkg/apis/extensions/register.go @@ -18,7 +18,7 @@ package extensions import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/runtime" @@ -72,7 +72,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.DeleteOptions{}, &ReplicaSet{}, &ReplicaSetList{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &PodSecurityPolicy{}, &PodSecurityPolicyList{}, &NetworkPolicy{}, diff --git a/pkg/apis/extensions/types.generated.go b/pkg/apis/extensions/types.generated.go index 8815ac362ee..61937a334cd 100644 --- a/pkg/apis/extensions/types.generated.go +++ b/pkg/apis/extensions/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" diff --git a/pkg/apis/extensions/types.go b/pkg/apis/extensions/types.go index 583fc323b23..2bb3f26e347 100644 --- a/pkg/apis/extensions/types.go +++ b/pkg/apis/extensions/types.go @@ -31,7 +31,7 @@ package extensions import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -57,7 +57,7 @@ type ScaleStatus struct { // label query over pods that should match the replicas count. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` } // +genclient=true @@ -65,7 +65,7 @@ type ScaleStatus struct { // represents a scaling request for a resource. type Scale struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -81,7 +81,7 @@ type Scale struct { // Dummy definition type ReplicationControllerDummy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` } // Alpha-level support for Custom Metrics in HPA (as annotations). @@ -113,7 +113,7 @@ type CustomMetricCurrentStatusList struct { // A ThirdPartyResource is a generic representation of a resource, it is used by add-ons and plugins to add new resource // types to the API. It consists of one or more Versions of the api. type ThirdPartyResource struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata // +optional @@ -128,18 +128,18 @@ type ThirdPartyResource struct { } type ThirdPartyResourceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of horizontal pod autoscalers. Items []ThirdPartyResource `json:"items"` } // An APIVersion represents a single concrete version of an object model. -// TODO: we should consider merge this struct with GroupVersion in unversioned.go +// TODO: we should consider merge this struct with GroupVersion in metav1.go type APIVersion struct { // Name of this version (e.g. 'v1'). Name string `json:"name,omitempty"` @@ -147,7 +147,7 @@ type APIVersion struct { // An internal object, used for versioned storage in etcd. Not exposed to the end user. type ThirdPartyResourceData struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -160,7 +160,7 @@ type ThirdPartyResourceData struct { // +genclient=true type Deployment struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -182,7 +182,7 @@ type DeploymentSpec struct { // Label selector for pods. Existing ReplicaSets whose pods are // selected by this will be the ones affected by this deployment. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Template describes the pods that will be created. Template api.PodTemplateSpec `json:"template"` @@ -223,7 +223,7 @@ type DeploymentSpec struct { // DeploymentRollback stores the information required to rollback a deployment. type DeploymentRollback struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Required: This must match the Name of a deployment. Name string `json:"name"` // The annotations to be updated to a deployment @@ -348,9 +348,9 @@ type DeploymentCondition struct { // Status of the condition, one of True, False, Unknown. Status api.ConditionStatus `json:"status"` // The last time this condition was updated. - LastUpdateTime unversioned.Time `json:"lastUpdateTime,omitempty"` + LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"` // Last time the condition transitioned from one status to another. - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // The reason for the condition's last transition. Reason string `json:"reason,omitempty"` // A human readable message indicating details about the transition. @@ -358,9 +358,9 @@ type DeploymentCondition struct { } type DeploymentList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of deployments. Items []Deployment `json:"items"` @@ -423,7 +423,7 @@ type DaemonSetSpec struct { // If empty, defaulted to labels on Pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Template is the object that describes the pod that will be created. // The DaemonSet will create exactly one copy of this pod on every node @@ -480,7 +480,7 @@ type DaemonSetStatus struct { // DaemonSet represents the configuration of a daemon set. type DaemonSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -502,22 +502,22 @@ type DaemonSet struct { // DaemonSetList is a collection of daemon sets. type DaemonSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is a list of daemon sets. Items []DaemonSet `json:"items"` } type ThirdPartyResourceDataList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is a list of third party objects Items []ThirdPartyResourceData `json:"items"` } @@ -529,7 +529,7 @@ type ThirdPartyResourceDataList struct { // externally-reachable urls, load balance traffic, terminate SSL, offer name // based virtual hosting etc. type Ingress struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -548,11 +548,11 @@ type Ingress struct { // IngressList is a collection of Ingress. type IngressList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of Ingress. Items []Ingress `json:"items"` @@ -692,7 +692,7 @@ type IngressBackend struct { // ReplicaSet represents the configuration of a replica set. type ReplicaSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -708,9 +708,9 @@ type ReplicaSet struct { // ReplicaSetList is a collection of ReplicaSets. type ReplicaSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []ReplicaSet `json:"items"` } @@ -733,7 +733,7 @@ type ReplicaSetSpec struct { // If empty, defaulted to labels on pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Template is the object that describes the pod that will be created if // insufficient replicas are detected. @@ -785,7 +785,7 @@ type ReplicaSetCondition struct { Status api.ConditionStatus `json:"status"` // The last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // The reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty"` @@ -800,7 +800,7 @@ type ReplicaSetCondition struct { // PodSecurityPolicy governs the ability to make requests that affect the SecurityContext // that will be applied to a pod and container. type PodSecurityPolicy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -997,9 +997,9 @@ const ( // PodSecurityPolicyList is a list of PodSecurityPolicy objects. type PodSecurityPolicyList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []PodSecurityPolicy `json:"items"` } @@ -1007,7 +1007,7 @@ type PodSecurityPolicyList struct { // +genclient=true type NetworkPolicy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -1022,7 +1022,7 @@ type NetworkPolicySpec struct { // same set of pods. In this case, the ingress rules for each are combined additively. // This field is NOT optional and follows standard label selector semantics. // An empty podSelector matches all pods in this namespace. - PodSelector unversioned.LabelSelector `json:"podSelector"` + PodSelector metav1.LabelSelector `json:"podSelector"` // List of ingress rules to be applied to the selected pods. // Traffic is allowed to a pod if namespace.networkPolicy.ingress.isolation is undefined and cluster policy allows it, @@ -1082,7 +1082,7 @@ type NetworkPolicyPeer struct { // If not provided, this selector selects no pods. // If present but empty, this selector selects all pods in this namespace. // +optional - PodSelector *unversioned.LabelSelector `json:"podSelector,omitempty"` + PodSelector *metav1.LabelSelector `json:"podSelector,omitempty"` // Selects Namespaces using cluster scoped-labels. This // matches all pods in all namespaces selected by this label selector. @@ -1090,14 +1090,14 @@ type NetworkPolicyPeer struct { // If omitted, this selector selects no namespaces. // If present but empty, this selector selects all namespaces. // +optional - NamespaceSelector *unversioned.LabelSelector `json:"namespaceSelector,omitempty"` + NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector,omitempty"` } // NetworkPolicyList is a list of NetworkPolicy objects. type NetworkPolicyList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []NetworkPolicy `json:"items"` } diff --git a/pkg/apis/extensions/v1beta1/BUILD b/pkg/apis/extensions/v1beta1/BUILD index 14a574b7bf9..a2ea885de5e 100644 --- a/pkg/apis/extensions/v1beta1/BUILD +++ b/pkg/apis/extensions/v1beta1/BUILD @@ -29,11 +29,11 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", @@ -57,11 +57,11 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/install:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions/install:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/util/intstr:go_default_library", ], diff --git a/pkg/apis/extensions/v1beta1/conversion.go b/pkg/apis/extensions/v1beta1/conversion.go index 0c1c37d0477..75d0f5dcb1d 100644 --- a/pkg/apis/extensions/v1beta1/conversion.go +++ b/pkg/apis/extensions/v1beta1/conversion.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" @@ -96,7 +96,7 @@ func Convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in *extensions.ScaleS out.Selector = in.Selector.MatchLabels } - selector, err := unversioned.LabelSelectorAsSelector(in.Selector) + selector, err := metav1.LabelSelectorAsSelector(in.Selector) if err != nil { return fmt.Errorf("invalid label selector: %v", err) } @@ -113,14 +113,14 @@ func Convert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(in *ScaleStatus, out // new field can be expected to know about the old field (though that's not quite true, due // to kubectl apply). However, these fields are readonly, so any non-nil value should work. if in.TargetSelector != "" { - labelSelector, err := unversioned.ParseToLabelSelector(in.TargetSelector) + labelSelector, err := metav1.ParseToLabelSelector(in.TargetSelector) if err != nil { out.Selector = nil return fmt.Errorf("failed to parse target selector: %v", err) } out.Selector = labelSelector } else if in.Selector != nil { - out.Selector = new(unversioned.LabelSelector) + out.Selector = new(metav1.LabelSelector) selector := make(map[string]string) for key, val := range in.Selector { selector[key] = val diff --git a/pkg/apis/extensions/v1beta1/defaults.go b/pkg/apis/extensions/v1beta1/defaults.go index 5b17d7ea118..43b76f47ec1 100644 --- a/pkg/apis/extensions/v1beta1/defaults.go +++ b/pkg/apis/extensions/v1beta1/defaults.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" @@ -41,7 +41,7 @@ func SetDefaults_DaemonSet(obj *DaemonSet) { // TODO: support templates defined elsewhere when we support them in the API if labels != nil { if obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{ + obj.Spec.Selector = &metav1.LabelSelector{ MatchLabels: labels, } } @@ -57,7 +57,7 @@ func SetDefaults_Deployment(obj *Deployment) { if labels != nil { if obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{MatchLabels: labels} + obj.Spec.Selector = &metav1.LabelSelector{MatchLabels: labels} } if len(obj.Labels) == 0 { obj.Labels = labels @@ -103,7 +103,7 @@ func SetDefaults_Job(obj *Job) { // and default behavior for an unspecified manual selector is to use the pod template labels if manualSelector && obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{ + obj.Spec.Selector = &metav1.LabelSelector{ MatchLabels: labels, } } @@ -141,7 +141,7 @@ func SetDefaults_ReplicaSet(obj *ReplicaSet) { // TODO: support templates defined elsewhere when we support them in the API if labels != nil { if obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{ + obj.Spec.Selector = &metav1.LabelSelector{ MatchLabels: labels, } } diff --git a/pkg/apis/extensions/v1beta1/defaults_test.go b/pkg/apis/extensions/v1beta1/defaults_test.go index add8ce0850d..1403a81f989 100644 --- a/pkg/apis/extensions/v1beta1/defaults_test.go +++ b/pkg/apis/extensions/v1beta1/defaults_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apis/extensions/install" . "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -68,7 +68,7 @@ func TestSetDefaultDaemonSet(t *testing.T) { Labels: defaultLabels, }, Spec: DaemonSetSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: defaultLabels, }, Template: defaultTemplate, @@ -93,7 +93,7 @@ func TestSetDefaultDaemonSet(t *testing.T) { }, }, Spec: DaemonSetSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: defaultLabels, }, Template: defaultTemplate, @@ -452,18 +452,18 @@ func TestSetDefaultJob(t *testing.T) { func TestSetDefaultJobSelector(t *testing.T) { tests := []struct { original *Job - expectedSelector *unversioned.LabelSelector + expectedSelector *metav1.LabelSelector }{ // selector set explicitly, nil autoSelector { original: &Job{ Spec: JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"job": "selector"}, }, }, }, - expectedSelector: &unversioned.LabelSelector{ + expectedSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"job": "selector"}, }, }, @@ -471,13 +471,13 @@ func TestSetDefaultJobSelector(t *testing.T) { { original: &Job{ Spec: JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"job": "selector"}, }, AutoSelector: newBool(true), }, }, - expectedSelector: &unversioned.LabelSelector{ + expectedSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"job": "selector"}, }, }, @@ -485,13 +485,13 @@ func TestSetDefaultJobSelector(t *testing.T) { { original: &Job{ Spec: JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"job": "selector"}, }, AutoSelector: newBool(false), }, }, - expectedSelector: &unversioned.LabelSelector{ + expectedSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"job": "selector"}, }, }, @@ -506,7 +506,7 @@ func TestSetDefaultJobSelector(t *testing.T) { }, }, }, - expectedSelector: &unversioned.LabelSelector{ + expectedSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"job": "selector"}, }, }, @@ -522,7 +522,7 @@ func TestSetDefaultJobSelector(t *testing.T) { AutoSelector: newBool(false), }, }, - expectedSelector: &unversioned.LabelSelector{ + expectedSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"job": "selector"}, }, }, @@ -604,7 +604,7 @@ func TestSetDefaultReplicaSet(t *testing.T) { }, }, Spec: ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "some": "other", }, @@ -624,7 +624,7 @@ func TestSetDefaultReplicaSet(t *testing.T) { { rs: &ReplicaSet{ Spec: ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "some": "other", }, diff --git a/pkg/apis/extensions/v1beta1/generated.pb.go b/pkg/apis/extensions/v1beta1/generated.pb.go index 1a8ae6ec969..0ced69f5686 100644 --- a/pkg/apis/extensions/v1beta1/generated.pb.go +++ b/pkg/apis/extensions/v1beta1/generated.pb.go @@ -99,7 +99,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/api/unversioned" +import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" import k8s_io_kubernetes_pkg_util_intstr "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/apis/extensions/v1beta1/register.go b/pkg/apis/extensions/v1beta1/register.go index f84311ee591..a89a6f51298 100644 --- a/pkg/apis/extensions/v1beta1/register.go +++ b/pkg/apis/extensions/v1beta1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -62,7 +62,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &IngressList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &ReplicaSet{}, &ReplicaSetList{}, &PodSecurityPolicy{}, diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index 5b66f08a592..b4266118246 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/apis/extensions/v1beta1/types.go b/pkg/apis/extensions/v1beta1/types.go index 613c841b013..cf375647dbd 100644 --- a/pkg/apis/extensions/v1beta1/types.go +++ b/pkg/apis/extensions/v1beta1/types.go @@ -18,7 +18,7 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -54,7 +54,7 @@ type ScaleStatus struct { // represents a scaling request for a resource. type Scale struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -70,7 +70,7 @@ type Scale struct { // Dummy definition type ReplicationControllerDummy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` } // SubresourceReference contains enough information to let you inspect or modify the referred subresource. @@ -143,7 +143,7 @@ type HorizontalPodAutoscalerStatus struct { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"` + LastScaleTime *metav1.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"` // current number of replicas of pods managed by this autoscaler. CurrentReplicas int32 `json:"currentReplicas" protobuf:"varint,3,opt,name=currentReplicas"` @@ -159,7 +159,7 @@ type HorizontalPodAutoscalerStatus struct { // configuration of a horizontal pod autoscaler. type HorizontalPodAutoscaler struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -175,10 +175,10 @@ type HorizontalPodAutoscaler struct { // list of horizontal pod autoscaler objects. type HorizontalPodAutoscalerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // list of horizontal pod autoscaler objects. Items []HorizontalPodAutoscaler `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -190,7 +190,7 @@ type HorizontalPodAutoscalerList struct { // A ThirdPartyResource is a generic representation of a resource, it is used by add-ons and plugins to add new resource // types to the API. It consists of one or more Versions of the api. type ThirdPartyResource struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata // +optional @@ -207,11 +207,11 @@ type ThirdPartyResource struct { // ThirdPartyResourceList is a list of ThirdPartyResources. type ThirdPartyResourceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of ThirdPartyResources. Items []ThirdPartyResource `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -226,7 +226,7 @@ type APIVersion struct { // An internal object, used for versioned storage in etcd. Not exposed to the end user. type ThirdPartyResourceData struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -240,7 +240,7 @@ type ThirdPartyResourceData struct { // Deployment enables declarative updates for Pods and ReplicaSets. type Deployment struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -264,7 +264,7 @@ type DeploymentSpec struct { // Label selector for pods. Existing ReplicaSets whose pods are // selected by this will be the ones affected by this deployment. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` // Template describes the pods that will be created. Template v1.PodTemplateSpec `json:"template" protobuf:"bytes,3,opt,name=template"` @@ -305,7 +305,7 @@ type DeploymentSpec struct { // DeploymentRollback stores the information required to rollback a deployment. type DeploymentRollback struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Required: This must match the Name of a deployment. Name string `json:"name" protobuf:"bytes,1,opt,name=name"` // The annotations to be updated to a deployment @@ -433,9 +433,9 @@ type DeploymentCondition struct { // Status of the condition, one of True, False, Unknown. Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // The last time this condition was updated. - LastUpdateTime unversioned.Time `json:"lastUpdateTime,omitempty" protobuf:"bytes,6,opt,name=lastUpdateTime"` + LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty" protobuf:"bytes,6,opt,name=lastUpdateTime"` // Last time the condition transitioned from one status to another. - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,7,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,7,opt,name=lastTransitionTime"` // The reason for the condition's last transition. Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` // A human readable message indicating details about the transition. @@ -444,10 +444,10 @@ type DeploymentCondition struct { // DeploymentList is a list of Deployments. type DeploymentList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Deployments. Items []Deployment `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -510,7 +510,7 @@ type DaemonSetSpec struct { // If empty, defaulted to labels on Pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,1,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,1,opt,name=selector"` // Template is the object that describes the pod that will be created. // The DaemonSet will create exactly one copy of this pod on every node @@ -570,7 +570,7 @@ type DaemonSetStatus struct { // DaemonSet represents the configuration of a daemon set. type DaemonSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -592,11 +592,11 @@ type DaemonSet struct { // DaemonSetList is a collection of daemon sets. type DaemonSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of daemon sets. Items []DaemonSet `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -604,11 +604,11 @@ type DaemonSetList struct { // ThirdPartyResrouceDataList is a list of ThirdPartyResourceData. type ThirdPartyResourceDataList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of ThirdpartyResourceData. Items []ThirdPartyResourceData `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -619,7 +619,7 @@ type ThirdPartyResourceDataList struct { // Job represents the configuration of a single job. // DEPRECATED: extensions/v1beta1.Job is deprecated, use batch/v1.Job instead. type Job struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -639,11 +639,11 @@ type Job struct { // JobList is a collection of jobs. // DEPRECATED: extensions/v1beta1.JobList is deprecated, use batch/v1.JobList instead. type JobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Job. Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -678,7 +678,7 @@ type JobSpec struct { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` // AutoSelector controls generation of pod labels and pod selectors. // It was not present in the original extensions/v1beta1 Job definition, but exists @@ -706,13 +706,13 @@ type JobStatus struct { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` + StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - CompletionTime *unversioned.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` + CompletionTime *metav1.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` // Active is the number of actively running pods. // +optional @@ -745,10 +745,10 @@ type JobCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -764,7 +764,7 @@ type JobCondition struct { // externally-reachable urls, load balance traffic, terminate SSL, offer name // based virtual hosting etc. type Ingress struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -783,11 +783,11 @@ type Ingress struct { // IngressList is a collection of Ingress. type IngressList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Ingress. Items []Ingress `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -927,7 +927,7 @@ type IngressBackend struct { // ReplicaSet represents the configuration of a ReplicaSet. type ReplicaSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // If the Labels of a ReplicaSet are empty, they are defaulted to // be the same as the Pod(s) that the ReplicaSet manages. @@ -951,11 +951,11 @@ type ReplicaSet struct { // ReplicaSetList is a collection of ReplicaSets. type ReplicaSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of ReplicaSets. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -982,7 +982,7 @@ type ReplicaSetSpec struct { // Label keys and values that must match in order to be controlled by this replica set. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` // Template is the object that describes the pod that will be created if // insufficient replicas are detected. @@ -1036,7 +1036,7 @@ type ReplicaSetCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // The last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"` // The reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` @@ -1051,7 +1051,7 @@ type ReplicaSetCondition struct { // Pod Security Policy governs the ability to make requests that affect the Security Context // that will be applied to a pod and container. type PodSecurityPolicy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -1248,18 +1248,18 @@ const ( // Pod Security Policy List is a list of PodSecurityPolicy objects. type PodSecurityPolicyList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of schema objects. Items []PodSecurityPolicy `json:"items" protobuf:"bytes,2,rep,name=items"` } type NetworkPolicy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -1276,7 +1276,7 @@ type NetworkPolicySpec struct { // same set of pods. In this case, the ingress rules for each are combined additively. // This field is NOT optional and follows standard label selector semantics. // An empty podSelector matches all pods in this namespace. - PodSelector unversioned.LabelSelector `json:"podSelector" protobuf:"bytes,1,opt,name=podSelector"` + PodSelector metav1.LabelSelector `json:"podSelector" protobuf:"bytes,1,opt,name=podSelector"` // List of ingress rules to be applied to the selected pods. // Traffic is allowed to a pod if namespace.networkPolicy.ingress.isolation is undefined and cluster policy allows it, @@ -1336,7 +1336,7 @@ type NetworkPolicyPeer struct { // If not provided, this selector selects no pods. // If present but empty, this selector selects all pods in this namespace. // +optional - PodSelector *unversioned.LabelSelector `json:"podSelector,omitempty" protobuf:"bytes,1,opt,name=podSelector"` + PodSelector *metav1.LabelSelector `json:"podSelector,omitempty" protobuf:"bytes,1,opt,name=podSelector"` // Selects Namespaces using cluster scoped-labels. This // matches all pods in all namespaces selected by this label selector. @@ -1344,16 +1344,16 @@ type NetworkPolicyPeer struct { // If omitted, this selector selects no namespaces. // If present but empty, this selector selects all namespaces. // +optional - NamespaceSelector *unversioned.LabelSelector `json:"namespaceSelector,omitempty" protobuf:"bytes,2,opt,name=namespaceSelector"` + NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector,omitempty" protobuf:"bytes,2,opt,name=namespaceSelector"` } // Network Policy List is a list of NetworkPolicy objects. type NetworkPolicyList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of schema objects. Items []NetworkPolicy `json:"items" protobuf:"bytes,2,rep,name=items"` diff --git a/pkg/apis/extensions/v1beta1/zz_generated.conversion.go b/pkg/apis/extensions/v1beta1/zz_generated.conversion.go index 8aa0a6f8745..621359fb06f 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/extensions/v1beta1/zz_generated.conversion.go @@ -22,11 +22,11 @@ package v1beta1 import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" - v1 "k8s.io/kubernetes/pkg/api/v1" + api_v1 "k8s.io/kubernetes/pkg/api/v1" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" batch "k8s.io/kubernetes/pkg/apis/batch" extensions "k8s.io/kubernetes/pkg/apis/extensions" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" intstr "k8s.io/kubernetes/pkg/util/intstr" @@ -345,8 +345,8 @@ func Convert_extensions_DaemonSetList_To_v1beta1_DaemonSetList(in *extensions.Da } func autoConvert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error { - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -357,8 +357,8 @@ func Convert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *DaemonSetSpec } func autoConvert_extensions_DaemonSetSpec_To_v1beta1_DaemonSetSpec(in *extensions.DaemonSetSpec, out *DaemonSetSpec, s conversion.Scope) error { - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -444,7 +444,7 @@ func Convert_v1beta1_DeploymentCondition_To_extensions_DeploymentCondition(in *D func autoConvert_extensions_DeploymentCondition_To_v1beta1_DeploymentCondition(in *extensions.DeploymentCondition, out *DeploymentCondition, s conversion.Scope) error { out.Type = DeploymentConditionType(in.Type) - out.Status = v1.ConditionStatus(in.Status) + out.Status = api_v1.ConditionStatus(in.Status) out.LastUpdateTime = in.LastUpdateTime out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason @@ -526,8 +526,8 @@ func autoConvert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *Deploym if err := api.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { return err } - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } if err := Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { @@ -545,8 +545,8 @@ func autoConvert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensi if err := api.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { return err } - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } if err := Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { @@ -772,7 +772,7 @@ func autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v1beta1_HorizontalPo func autoConvert_v1beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error { out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) - out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) + out.LastScaleTime = (*v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) @@ -785,7 +785,7 @@ func Convert_v1beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodA func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1beta1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) - out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) + out.LastScaleTime = (*v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) @@ -1072,7 +1072,7 @@ func Convert_v1beta1_JobCondition_To_batch_JobCondition(in *JobCondition, out *b func autoConvert_batch_JobCondition_To_v1beta1_JobCondition(in *batch.JobCondition, out *JobCondition, s conversion.Scope) error { out.Type = JobConditionType(in.Type) - out.Status = v1.ConditionStatus(in.Status) + out.Status = api_v1.ConditionStatus(in.Status) out.LastProbeTime = in.LastProbeTime out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason @@ -1128,9 +1128,9 @@ func autoConvert_v1beta1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpe out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) // WARNING: in.AutoSelector requires manual conversion: does not exist in peer-type - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -1140,9 +1140,9 @@ func autoConvert_batch_JobSpec_To_v1beta1_JobSpec(in *batch.JobSpec, out *JobSpe out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) // WARNING: in.ManualSelector requires manual conversion: does not exist in peer-type - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -1150,8 +1150,8 @@ func autoConvert_batch_JobSpec_To_v1beta1_JobSpec(in *batch.JobSpec, out *JobSpe func autoConvert_v1beta1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error { out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed @@ -1164,8 +1164,8 @@ func Convert_v1beta1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobS func autoConvert_batch_JobStatus_To_v1beta1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error { out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed @@ -1247,8 +1247,8 @@ func Convert_extensions_NetworkPolicyList_To_v1beta1_NetworkPolicyList(in *exten } func autoConvert_v1beta1_NetworkPolicyPeer_To_extensions_NetworkPolicyPeer(in *NetworkPolicyPeer, out *extensions.NetworkPolicyPeer, s conversion.Scope) error { - out.PodSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.PodSelector)) - out.NamespaceSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) + out.PodSelector = (*v1.LabelSelector)(unsafe.Pointer(in.PodSelector)) + out.NamespaceSelector = (*v1.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) return nil } @@ -1257,8 +1257,8 @@ func Convert_v1beta1_NetworkPolicyPeer_To_extensions_NetworkPolicyPeer(in *Netwo } func autoConvert_extensions_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer(in *extensions.NetworkPolicyPeer, out *NetworkPolicyPeer, s conversion.Scope) error { - out.PodSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.PodSelector)) - out.NamespaceSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) + out.PodSelector = (*v1.LabelSelector)(unsafe.Pointer(in.PodSelector)) + out.NamespaceSelector = (*v1.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) return nil } @@ -1277,7 +1277,7 @@ func Convert_v1beta1_NetworkPolicyPort_To_extensions_NetworkPolicyPort(in *Netwo } func autoConvert_extensions_NetworkPolicyPort_To_v1beta1_NetworkPolicyPort(in *extensions.NetworkPolicyPort, out *NetworkPolicyPort, s conversion.Scope) error { - out.Protocol = (*v1.Protocol)(unsafe.Pointer(in.Protocol)) + out.Protocol = (*api_v1.Protocol)(unsafe.Pointer(in.Protocol)) out.Port = (*intstr.IntOrString)(unsafe.Pointer(in.Port)) return nil } @@ -1418,9 +1418,9 @@ func Convert_v1beta1_PodSecurityPolicySpec_To_extensions_PodSecurityPolicySpec(i func autoConvert_extensions_PodSecurityPolicySpec_To_v1beta1_PodSecurityPolicySpec(in *extensions.PodSecurityPolicySpec, out *PodSecurityPolicySpec, s conversion.Scope) error { out.Privileged = in.Privileged - out.DefaultAddCapabilities = *(*[]v1.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities)) - out.RequiredDropCapabilities = *(*[]v1.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities)) - out.AllowedCapabilities = *(*[]v1.Capability)(unsafe.Pointer(&in.AllowedCapabilities)) + out.DefaultAddCapabilities = *(*[]api_v1.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities)) + out.RequiredDropCapabilities = *(*[]api_v1.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities)) + out.AllowedCapabilities = *(*[]api_v1.Capability)(unsafe.Pointer(&in.AllowedCapabilities)) out.Volumes = *(*[]FSType)(unsafe.Pointer(&in.Volumes)) out.HostNetwork = in.HostNetwork if in.HostPorts != nil { @@ -1507,7 +1507,7 @@ func Convert_v1beta1_ReplicaSetCondition_To_extensions_ReplicaSetCondition(in *R func autoConvert_extensions_ReplicaSetCondition_To_v1beta1_ReplicaSetCondition(in *extensions.ReplicaSetCondition, out *ReplicaSetCondition, s conversion.Scope) error { out.Type = ReplicaSetConditionType(in.Type) - out.Status = v1.ConditionStatus(in.Status) + out.Status = api_v1.ConditionStatus(in.Status) out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason out.Message = in.Message @@ -1563,8 +1563,8 @@ func autoConvert_v1beta1_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *Replica return err } out.MinReadySeconds = in.MinReadySeconds - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -1575,8 +1575,8 @@ func autoConvert_extensions_ReplicaSetSpec_To_v1beta1_ReplicaSetSpec(in *extensi return err } out.MinReadySeconds = in.MinReadySeconds - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -1688,7 +1688,7 @@ func Convert_v1beta1_SELinuxStrategyOptions_To_extensions_SELinuxStrategyOptions func autoConvert_extensions_SELinuxStrategyOptions_To_v1beta1_SELinuxStrategyOptions(in *extensions.SELinuxStrategyOptions, out *SELinuxStrategyOptions, s conversion.Scope) error { out.Rule = SELinuxStrategy(in.Rule) - out.SELinuxOptions = (*v1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions)) + out.SELinuxOptions = (*api_v1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions)) return nil } @@ -1752,14 +1752,14 @@ func Convert_extensions_ScaleSpec_To_v1beta1_ScaleSpec(in *extensions.ScaleSpec, func autoConvert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(in *ScaleStatus, out *extensions.ScaleStatus, s conversion.Scope) error { out.Replicas = in.Replicas - // WARNING: in.Selector requires manual conversion: inconvertible types (map[string]string vs *k8s.io/kubernetes/pkg/api/unversioned.LabelSelector) + // WARNING: in.Selector requires manual conversion: inconvertible types (map[string]string vs *k8s.io/kubernetes/pkg/apis/meta/v1.LabelSelector) // WARNING: in.TargetSelector requires manual conversion: does not exist in peer-type return nil } func autoConvert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in *extensions.ScaleStatus, out *ScaleStatus, s conversion.Scope) error { out.Replicas = in.Replicas - // WARNING: in.Selector requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/api/unversioned.LabelSelector vs map[string]string) + // WARNING: in.Selector requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/apis/meta/v1.LabelSelector vs map[string]string) return nil } diff --git a/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go b/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go index 2a260e050c1..17ab644ca73 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v1beta1 import ( - unversioned "k8s.io/kubernetes/pkg/api/unversioned" v1 "k8s.io/kubernetes/pkg/api/v1" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" intstr "k8s.io/kubernetes/pkg/util/intstr" @@ -226,8 +226,8 @@ func DeepCopy_v1beta1_DaemonSetSpec(in interface{}, out interface{}, c *conversi out := out.(*DaemonSetSpec) if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -338,8 +338,8 @@ func DeepCopy_v1beta1_DeploymentSpec(in interface{}, out interface{}, c *convers } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -541,7 +541,7 @@ func DeepCopy_v1beta1_HorizontalPodAutoscalerStatus(in interface{}, out interfac } if in.LastScaleTime != nil { in, out := &in.LastScaleTime, &out.LastScaleTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.LastScaleTime = nil @@ -801,8 +801,8 @@ func DeepCopy_v1beta1_JobSpec(in interface{}, out interface{}, c *conversion.Clo } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -839,14 +839,14 @@ func DeepCopy_v1beta1_JobStatus(in interface{}, out interface{}, c *conversion.C } if in.StartTime != nil { in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.StartTime = nil } if in.CompletionTime != nil { in, out := &in.CompletionTime, &out.CompletionTime - *out = new(unversioned.Time) + *out = new(meta_v1.Time) **out = (*in).DeepCopy() } else { out.CompletionTime = nil @@ -930,8 +930,8 @@ func DeepCopy_v1beta1_NetworkPolicyPeer(in interface{}, out interface{}, c *conv out := out.(*NetworkPolicyPeer) if in.PodSelector != nil { in, out := &in.PodSelector, &out.PodSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -939,8 +939,8 @@ func DeepCopy_v1beta1_NetworkPolicyPeer(in interface{}, out interface{}, c *conv } if in.NamespaceSelector != nil { in, out := &in.NamespaceSelector, &out.NamespaceSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -976,7 +976,7 @@ func DeepCopy_v1beta1_NetworkPolicySpec(in interface{}, out interface{}, c *conv { in := in.(*NetworkPolicySpec) out := out.(*NetworkPolicySpec) - if err := unversioned.DeepCopy_unversioned_LabelSelector(&in.PodSelector, &out.PodSelector, c); err != nil { + if err := meta_v1.DeepCopy_v1_LabelSelector(&in.PodSelector, &out.PodSelector, c); err != nil { return err } if in.Ingress != nil { @@ -1166,8 +1166,8 @@ func DeepCopy_v1beta1_ReplicaSetSpec(in interface{}, out interface{}, c *convers out.MinReadySeconds = in.MinReadySeconds if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { diff --git a/pkg/apis/extensions/validation/BUILD b/pkg/apis/extensions/validation/BUILD index 1aa5a0df1d5..f7d158d7b48 100644 --- a/pkg/apis/extensions/validation/BUILD +++ b/pkg/apis/extensions/validation/BUILD @@ -16,10 +16,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", - "//pkg/api/unversioned/validation:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", + "//pkg/apis/meta/v1/validation:go_default_library", "//pkg/labels:go_default_library", "//pkg/security/apparmor:go_default_library", "//pkg/security/podsecuritypolicy/seccomp:go_default_library", @@ -38,8 +38,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/security/apparmor:go_default_library", "//pkg/security/podsecuritypolicy/seccomp:go_default_library", "//pkg/security/podsecuritypolicy/util:go_default_library", diff --git a/pkg/apis/extensions/validation/validation.go b/pkg/apis/extensions/validation/validation.go index bb5224f1329..d0a5e0c2a50 100644 --- a/pkg/apis/extensions/validation/validation.go +++ b/pkg/apis/extensions/validation/validation.go @@ -25,8 +25,8 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" - unversionedvalidation "k8s.io/kubernetes/pkg/api/unversioned/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/labels" @@ -124,7 +124,7 @@ func ValidateDaemonSetSpec(spec *extensions.DaemonSetSpec, fldPath *field.Path) allErrs = append(allErrs, unversionedvalidation.ValidateLabelSelector(spec.Selector, fldPath.Child("selector"))...) - selector, err := unversioned.LabelSelectorAsSelector(spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(spec.Selector) if err == nil && !selector.Matches(labels.Set(spec.Template.Labels)) { allErrs = append(allErrs, field.Invalid(fldPath.Child("template", "metadata", "labels"), spec.Template.Labels, "`selector` does not match template `labels`")) } @@ -249,7 +249,7 @@ func ValidateDeploymentSpec(spec *extensions.DeploymentSpec, fldPath *field.Path } } - selector, err := unversioned.LabelSelectorAsSelector(spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(spec.Selector) if err != nil { allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), spec.Selector, "invalid label selector.")) } else { @@ -523,7 +523,7 @@ func ValidateReplicaSetSpec(spec *extensions.ReplicaSetSpec, fldPath *field.Path } } - selector, err := unversioned.LabelSelectorAsSelector(spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(spec.Selector) if err != nil { allErrs = append(allErrs, field.Invalid(fldPath.Child("selector"), spec.Selector, "invalid label selector.")) } else { diff --git a/pkg/apis/extensions/validation/validation_test.go b/pkg/apis/extensions/validation/validation_test.go index 60fec1ffc79..58d31742b4e 100644 --- a/pkg/apis/extensions/validation/validation_test.go +++ b/pkg/apis/extensions/validation/validation_test.go @@ -22,7 +22,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" @@ -195,14 +195,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) { old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, @@ -211,14 +211,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) { old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector2}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector2}, Template: validPodTemplateAbc2.Template, }, }, @@ -227,14 +227,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) { old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateNodeSelector.Template, }, }, @@ -252,14 +252,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) { old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, @@ -268,14 +268,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) { old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: invalidSelector}, + Selector: &metav1.LabelSelector{MatchLabels: invalidSelector}, Template: validPodTemplateAbc.Template, }, }, @@ -284,14 +284,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) { old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: invalidPodTemplate.Template, }, }, @@ -300,14 +300,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) { old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateDef.Template, }, }, @@ -316,14 +316,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) { old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: readWriteVolumePodTemplate.Template, }, }, @@ -332,14 +332,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) { old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplateAbc.Template, }, }, update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: invalidSelector}, + Selector: &metav1.LabelSelector{MatchLabels: invalidSelector}, Template: validPodTemplateAbc.Template, }, }, @@ -382,14 +382,14 @@ func TestValidateDaemonSet(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, }, { ObjectMeta: api.ObjectMeta{Name: "abc-123", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, }, @@ -404,14 +404,14 @@ func TestValidateDaemonSet(t *testing.T) { "zero-length ID": { ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, }, "missing-namespace": { ObjectMeta: api.ObjectMeta{Name: "abc-123"}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, }, @@ -424,21 +424,21 @@ func TestValidateDaemonSet(t *testing.T) { "empty selector": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{}, + Selector: &metav1.LabelSelector{}, Template: validPodTemplate.Template, }, }, "selector_doesnt_match": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, Template: validPodTemplate.Template, }, }, "invalid template": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, }, }, "invalid_label": { @@ -450,7 +450,7 @@ func TestValidateDaemonSet(t *testing.T) { }, }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, }, @@ -475,7 +475,7 @@ func TestValidateDaemonSet(t *testing.T) { }, }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, }, @@ -485,7 +485,7 @@ func TestValidateDaemonSet(t *testing.T) { Namespace: api.NamespaceDefault, }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: api.PodTemplateSpec{ Spec: api.PodSpec{ RestartPolicy: api.RestartPolicyOnFailure, @@ -504,7 +504,7 @@ func TestValidateDaemonSet(t *testing.T) { Namespace: api.NamespaceDefault, }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: api.PodTemplateSpec{ Spec: api.PodSpec{ RestartPolicy: api.RestartPolicyNever, @@ -548,7 +548,7 @@ func validDeployment() *extensions.Deployment { Namespace: api.NamespaceDefault, }, Spec: extensions.DeploymentSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "name": "abc", }, @@ -605,7 +605,7 @@ func TestValidateDeployment(t *testing.T) { } // selector should match the labels in pod template. invalidSelectorDeployment := validDeployment() - invalidSelectorDeployment.Spec.Selector = &unversioned.LabelSelector{ + invalidSelectorDeployment.Spec.Selector = &metav1.LabelSelector{ MatchLabels: map[string]string{ "name": "def", }, @@ -1078,7 +1078,7 @@ func TestValidateReplicaSetStatusUpdate(t *testing.T) { old: extensions.ReplicaSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, Status: extensions.ReplicaSetStatus{ @@ -1089,7 +1089,7 @@ func TestValidateReplicaSetStatusUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: 3, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, Status: extensions.ReplicaSetStatus{ @@ -1110,7 +1110,7 @@ func TestValidateReplicaSetStatusUpdate(t *testing.T) { old: extensions.ReplicaSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, Status: extensions.ReplicaSetStatus{ @@ -1121,7 +1121,7 @@ func TestValidateReplicaSetStatusUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: 2, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, Status: extensions.ReplicaSetStatus{ @@ -1186,7 +1186,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { old: extensions.ReplicaSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1194,7 +1194,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: 3, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1203,7 +1203,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { old: extensions.ReplicaSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1211,7 +1211,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: 1, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: readWriteVolumePodTemplate.Template, }, }, @@ -1229,7 +1229,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { old: extensions.ReplicaSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1237,7 +1237,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: 2, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: readWriteVolumePodTemplate.Template, }, }, @@ -1246,7 +1246,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { old: extensions.ReplicaSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1254,7 +1254,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: 2, - Selector: &unversioned.LabelSelector{MatchLabels: invalidLabels}, + Selector: &metav1.LabelSelector{MatchLabels: invalidLabels}, Template: validPodTemplate.Template, }, }, @@ -1263,7 +1263,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { old: extensions.ReplicaSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1271,7 +1271,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: 2, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: invalidPodTemplate.Template, }, }, @@ -1280,7 +1280,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { old: extensions.ReplicaSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1288,7 +1288,7 @@ func TestValidateReplicaSetUpdate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: -1, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1344,14 +1344,14 @@ func TestValidateReplicaSet(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, { ObjectMeta: api.ObjectMeta{Name: "abc-123", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1359,7 +1359,7 @@ func TestValidateReplicaSet(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc-123", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: 1, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: readWriteVolumePodTemplate.Template, }, }, @@ -1374,14 +1374,14 @@ func TestValidateReplicaSet(t *testing.T) { "zero-length ID": { ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, "missing-namespace": { ObjectMeta: api.ObjectMeta{Name: "abc-123"}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1394,21 +1394,21 @@ func TestValidateReplicaSet(t *testing.T) { "selector_doesnt_match": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, Template: validPodTemplate.Template, }, }, "invalid manifest": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, }, }, "read-write persistent disk with > 1 pod": { ObjectMeta: api.ObjectMeta{Name: "abc"}, Spec: extensions.ReplicaSetSpec{ Replicas: 2, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: readWriteVolumePodTemplate.Template, }, }, @@ -1416,7 +1416,7 @@ func TestValidateReplicaSet(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ Replicas: -1, - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, }, }, "invalid_label": { @@ -1428,7 +1428,7 @@ func TestValidateReplicaSet(t *testing.T) { }, }, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1453,7 +1453,7 @@ func TestValidateReplicaSet(t *testing.T) { }, }, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: validPodTemplate.Template, }, }, @@ -1463,7 +1463,7 @@ func TestValidateReplicaSet(t *testing.T) { Namespace: api.NamespaceDefault, }, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: api.PodTemplateSpec{ Spec: api.PodSpec{ RestartPolicy: api.RestartPolicyOnFailure, @@ -1482,7 +1482,7 @@ func TestValidateReplicaSet(t *testing.T) { Namespace: api.NamespaceDefault, }, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validLabels}, + Selector: &metav1.LabelSelector{MatchLabels: validLabels}, Template: api.PodTemplateSpec{ Spec: api.PodSpec{ RestartPolicy: api.RestartPolicyNever, @@ -1883,7 +1883,7 @@ func TestValidateNetworkPolicy(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{ + PodSelector: metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, }, Ingress: []extensions.NetworkPolicyIngressRule{}, @@ -1892,7 +1892,7 @@ func TestValidateNetworkPolicy(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{ + PodSelector: metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, }, Ingress: []extensions.NetworkPolicyIngressRule{ @@ -1906,14 +1906,14 @@ func TestValidateNetworkPolicy(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{ + PodSelector: metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, }, Ingress: []extensions.NetworkPolicyIngressRule{ { From: []extensions.NetworkPolicyPeer{ { - PodSelector: &unversioned.LabelSelector{ + PodSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"c": "d"}, }, }, @@ -1925,14 +1925,14 @@ func TestValidateNetworkPolicy(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{ + PodSelector: metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, }, Ingress: []extensions.NetworkPolicyIngressRule{ { From: []extensions.NetworkPolicyPeer{ { - NamespaceSelector: &unversioned.LabelSelector{ + NamespaceSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"c": "d"}, }, }, @@ -1955,17 +1955,17 @@ func TestValidateNetworkPolicy(t *testing.T) { "namespaceSelector and podSelector": { ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{ + PodSelector: metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, }, Ingress: []extensions.NetworkPolicyIngressRule{ { From: []extensions.NetworkPolicyPeer{ { - PodSelector: &unversioned.LabelSelector{ + PodSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"c": "d"}, }, - NamespaceSelector: &unversioned.LabelSelector{ + NamespaceSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"c": "d"}, }, }, @@ -1977,14 +1977,14 @@ func TestValidateNetworkPolicy(t *testing.T) { "invalid spec.podSelector": { ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{ + PodSelector: metav1.LabelSelector{ MatchLabels: invalidSelector, }, Ingress: []extensions.NetworkPolicyIngressRule{ { From: []extensions.NetworkPolicyPeer{ { - NamespaceSelector: &unversioned.LabelSelector{ + NamespaceSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{"c": "d"}, }, }, @@ -1996,12 +1996,12 @@ func TestValidateNetworkPolicy(t *testing.T) { "invalid ingress.from.podSelector": { ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{}, + PodSelector: metav1.LabelSelector{}, Ingress: []extensions.NetworkPolicyIngressRule{ { From: []extensions.NetworkPolicyPeer{ { - PodSelector: &unversioned.LabelSelector{ + PodSelector: &metav1.LabelSelector{ MatchLabels: invalidSelector, }, }, @@ -2013,12 +2013,12 @@ func TestValidateNetworkPolicy(t *testing.T) { "invalid ingress.from.namespaceSelector": { ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{}, + PodSelector: metav1.LabelSelector{}, Ingress: []extensions.NetworkPolicyIngressRule{ { From: []extensions.NetworkPolicyPeer{ { - NamespaceSelector: &unversioned.LabelSelector{ + NamespaceSelector: &metav1.LabelSelector{ MatchLabels: invalidSelector, }, }, @@ -2047,7 +2047,7 @@ func TestValidateNetworkPolicyUpdate(t *testing.T) { old: extensions.NetworkPolicy{ ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{ + PodSelector: metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, }, Ingress: []extensions.NetworkPolicyIngressRule{}, @@ -2056,7 +2056,7 @@ func TestValidateNetworkPolicyUpdate(t *testing.T) { update: extensions.NetworkPolicy{ ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{ + PodSelector: metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, }, Ingress: []extensions.NetworkPolicyIngressRule{}, @@ -2077,14 +2077,14 @@ func TestValidateNetworkPolicyUpdate(t *testing.T) { old: extensions.NetworkPolicy{ ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{}, + PodSelector: metav1.LabelSelector{}, Ingress: []extensions.NetworkPolicyIngressRule{}, }, }, update: extensions.NetworkPolicy{ ObjectMeta: api.ObjectMeta{Name: "baz", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{}, + PodSelector: metav1.LabelSelector{}, Ingress: []extensions.NetworkPolicyIngressRule{}, }, }, @@ -2093,14 +2093,14 @@ func TestValidateNetworkPolicyUpdate(t *testing.T) { old: extensions.NetworkPolicy{ ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{}, + PodSelector: metav1.LabelSelector{}, Ingress: []extensions.NetworkPolicyIngressRule{}, }, }, update: extensions.NetworkPolicy{ ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "bar"}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{ + PodSelector: metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, }, Ingress: []extensions.NetworkPolicyIngressRule{}, diff --git a/pkg/apis/extensions/zz_generated.deepcopy.go b/pkg/apis/extensions/zz_generated.deepcopy.go index 8714d2dbe8c..e88a59b2a29 100644 --- a/pkg/apis/extensions/zz_generated.deepcopy.go +++ b/pkg/apis/extensions/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ package extensions import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" intstr "k8s.io/kubernetes/pkg/util/intstr" @@ -206,8 +206,8 @@ func DeepCopy_extensions_DaemonSetSpec(in interface{}, out interface{}, c *conve out := out.(*DaemonSetSpec) if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -312,8 +312,8 @@ func DeepCopy_extensions_DeploymentSpec(in interface{}, out interface{}, c *conv out.Replicas = in.Replicas if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -671,8 +671,8 @@ func DeepCopy_extensions_NetworkPolicyPeer(in interface{}, out interface{}, c *c out := out.(*NetworkPolicyPeer) if in.PodSelector != nil { in, out := &in.PodSelector, &out.PodSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -680,8 +680,8 @@ func DeepCopy_extensions_NetworkPolicyPeer(in interface{}, out interface{}, c *c } if in.NamespaceSelector != nil { in, out := &in.NamespaceSelector, &out.NamespaceSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -717,7 +717,7 @@ func DeepCopy_extensions_NetworkPolicySpec(in interface{}, out interface{}, c *c { in := in.(*NetworkPolicySpec) out := out.(*NetworkPolicySpec) - if err := unversioned.DeepCopy_unversioned_LabelSelector(&in.PodSelector, &out.PodSelector, c); err != nil { + if err := v1.DeepCopy_v1_LabelSelector(&in.PodSelector, &out.PodSelector, c); err != nil { return err } if in.Ingress != nil { @@ -901,8 +901,8 @@ func DeepCopy_extensions_ReplicaSetSpec(in interface{}, out interface{}, c *conv out.MinReadySeconds = in.MinReadySeconds if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -1033,8 +1033,8 @@ func DeepCopy_extensions_ScaleStatus(in interface{}, out interface{}, c *convers out.Replicas = in.Replicas if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { diff --git a/pkg/apis/imagepolicy/BUILD b/pkg/apis/imagepolicy/BUILD index b52cd12b941..f73f7268b6c 100644 --- a/pkg/apis/imagepolicy/BUILD +++ b/pkg/apis/imagepolicy/BUILD @@ -22,7 +22,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/imagepolicy/register.go b/pkg/apis/imagepolicy/register.go index d5afee0a68d..aa469b913f5 100644 --- a/pkg/apis/imagepolicy/register.go +++ b/pkg/apis/imagepolicy/register.go @@ -18,7 +18,7 @@ package imagepolicy import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -48,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &api.ListOptions{}, &api.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &ImageReview{}, ) diff --git a/pkg/apis/imagepolicy/types.generated.go b/pkg/apis/imagepolicy/types.generated.go index 450f19f4d74..ad407d8322a 100644 --- a/pkg/apis/imagepolicy/types.generated.go +++ b/pkg/apis/imagepolicy/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/pkg/apis/imagepolicy/types.go b/pkg/apis/imagepolicy/types.go index 0be81f38b9b..e9a91868a3e 100644 --- a/pkg/apis/imagepolicy/types.go +++ b/pkg/apis/imagepolicy/types.go @@ -18,7 +18,7 @@ package imagepolicy import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true @@ -27,7 +27,7 @@ import ( // ImageReview checks if the set of images in a pod are allowed. type ImageReview struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Spec holds information about the pod being evaluated diff --git a/pkg/apis/imagepolicy/v1alpha1/BUILD b/pkg/apis/imagepolicy/v1alpha1/BUILD index e5cbc28f207..05fcfd3ff51 100644 --- a/pkg/apis/imagepolicy/v1alpha1/BUILD +++ b/pkg/apis/imagepolicy/v1alpha1/BUILD @@ -24,9 +24,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/imagepolicy:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/imagepolicy/v1alpha1/register.go b/pkg/apis/imagepolicy/v1alpha1/register.go index 35e7d28688d..8dad71f414d 100644 --- a/pkg/apis/imagepolicy/v1alpha1/register.go +++ b/pkg/apis/imagepolicy/v1alpha1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -44,7 +44,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &ImageReview{}, ) diff --git a/pkg/apis/imagepolicy/v1alpha1/types.generated.go b/pkg/apis/imagepolicy/v1alpha1/types.generated.go index 1363b20f0ab..403f805dca3 100644 --- a/pkg/apis/imagepolicy/v1alpha1/types.generated.go +++ b/pkg/apis/imagepolicy/v1alpha1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" diff --git a/pkg/apis/imagepolicy/v1alpha1/types.go b/pkg/apis/imagepolicy/v1alpha1/types.go index e62d874e5d6..228491b1ee7 100644 --- a/pkg/apis/imagepolicy/v1alpha1/types.go +++ b/pkg/apis/imagepolicy/v1alpha1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -27,7 +27,7 @@ import ( // ImageReview checks if the set of images in a pod are allowed. type ImageReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/pkg/apis/meta/v1/doc.go b/pkg/apis/meta/v1/doc.go index 2bc11a625be..52273240f0e 100644 --- a/pkg/apis/meta/v1/doc.go +++ b/pkg/apis/meta/v1/doc.go @@ -18,4 +18,5 @@ limitations under the License. // +k8s:openapi-gen=true // +k8s:defaulter-gen=TypeMeta -package unversioned // import "k8s.io/kubernetes/pkg/api/unversioned" +// +groupName=meta.k8s.io +package v1 diff --git a/pkg/apis/meta/v1/duration.go b/pkg/apis/meta/v1/duration.go index ed54e515dae..fea458dfb3a 100644 --- a/pkg/apis/meta/v1/duration.go +++ b/pkg/apis/meta/v1/duration.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "encoding/json" diff --git a/pkg/apis/meta/v1/duration_test.go b/pkg/apis/meta/v1/duration_test.go index 9c7beaf10f0..7230cb28ab4 100644 --- a/pkg/apis/meta/v1/duration_test.go +++ b/pkg/apis/meta/v1/duration_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "encoding/json" diff --git a/pkg/apis/meta/v1/generated.pb.go b/pkg/apis/meta/v1/generated.pb.go index 085de58f79c..6d1f25700bb 100644 --- a/pkg/apis/meta/v1/generated.pb.go +++ b/pkg/apis/meta/v1/generated.pb.go @@ -50,7 +50,7 @@ limitations under the License. Timestamp TypeMeta */ -package unversioned +package v1 import proto "github.com/gogo/protobuf/proto" import fmt "fmt" diff --git a/pkg/apis/meta/v1/group_version.go b/pkg/apis/meta/v1/group_version.go index 7e4bc1e0c0d..304a9e05ba1 100644 --- a/pkg/apis/meta/v1/group_version.go +++ b/pkg/apis/meta/v1/group_version.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "encoding/json" diff --git a/pkg/apis/meta/v1/group_version_test.go b/pkg/apis/meta/v1/group_version_test.go index dedde8d96b3..5daf9010f66 100644 --- a/pkg/apis/meta/v1/group_version_test.go +++ b/pkg/apis/meta/v1/group_version_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "encoding/json" diff --git a/pkg/apis/meta/v1/helpers.go b/pkg/apis/meta/v1/helpers.go index aed3f0edac7..908c2920424 100644 --- a/pkg/apis/meta/v1/helpers.go +++ b/pkg/apis/meta/v1/helpers.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "fmt" diff --git a/pkg/apis/meta/v1/helpers_test.go b/pkg/apis/meta/v1/helpers_test.go index 8b0bca620fa..84fd55d4973 100644 --- a/pkg/apis/meta/v1/helpers_test.go +++ b/pkg/apis/meta/v1/helpers_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "reflect" diff --git a/pkg/apis/meta/v1/meta.go b/pkg/apis/meta/v1/meta.go index 603c915efa0..5d9113a7615 100644 --- a/pkg/apis/meta/v1/meta.go +++ b/pkg/apis/meta/v1/meta.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/apis/meta/v1/register.go b/pkg/apis/meta/v1/register.go index c3e327b8a82..827eeedd622 100644 --- a/pkg/apis/meta/v1/register.go +++ b/pkg/apis/meta/v1/register.go @@ -14,12 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "k8s.io/kubernetes/pkg/runtime/schema" ) +// GroupName is the group name for this API. +const GroupName = "meta.k8s.io" + // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: "", Version: ""} diff --git a/pkg/apis/meta/v1/time.go b/pkg/apis/meta/v1/time.go index 636e24a3ba7..6de5a8bea4c 100644 --- a/pkg/apis/meta/v1/time.go +++ b/pkg/apis/meta/v1/time.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "encoding/json" diff --git a/pkg/apis/meta/v1/time_proto.go b/pkg/apis/meta/v1/time_proto.go index ba25e9164f5..aea28e410ba 100644 --- a/pkg/apis/meta/v1/time_proto.go +++ b/pkg/apis/meta/v1/time_proto.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "time" diff --git a/pkg/apis/meta/v1/time_test.go b/pkg/apis/meta/v1/time_test.go index ce9851592d8..3ab1d5fd1ae 100644 --- a/pkg/apis/meta/v1/time_test.go +++ b/pkg/apis/meta/v1/time_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "encoding/json" diff --git a/pkg/apis/meta/v1/types.go b/pkg/apis/meta/v1/types.go index b45817caacb..31c7a8b93b0 100644 --- a/pkg/apis/meta/v1/types.go +++ b/pkg/apis/meta/v1/types.go @@ -23,7 +23,7 @@ limitations under the License. // (e.g. LabelSelector). // In the future, we will probably move these categories of objects into // separate packages. -package unversioned +package v1 import "strings" diff --git a/pkg/apis/meta/v1/types_swagger_doc_generated.go b/pkg/apis/meta/v1/types_swagger_doc_generated.go index ad94c265ffa..c943611d1e8 100644 --- a/pkg/apis/meta/v1/types_swagger_doc_generated.go +++ b/pkg/apis/meta/v1/types_swagger_doc_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 // 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 diff --git a/pkg/apis/meta/v1/validation/BUILD b/pkg/apis/meta/v1/validation/BUILD index d0d0cbd14fa..31b74635d27 100644 --- a/pkg/apis/meta/v1/validation/BUILD +++ b/pkg/apis/meta/v1/validation/BUILD @@ -15,7 +15,7 @@ go_library( srcs = ["validation.go"], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/util/validation:go_default_library", "//pkg/util/validation/field:go_default_library", ], diff --git a/pkg/apis/meta/v1/validation/validation.go b/pkg/apis/meta/v1/validation/validation.go index ecb968bdcb1..40d27a80c5d 100644 --- a/pkg/apis/meta/v1/validation/validation.go +++ b/pkg/apis/meta/v1/validation/validation.go @@ -17,12 +17,12 @@ limitations under the License. package validation import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/validation" "k8s.io/kubernetes/pkg/util/validation/field" ) -func ValidateLabelSelector(ps *unversioned.LabelSelector, fldPath *field.Path) field.ErrorList { +func ValidateLabelSelector(ps *metav1.LabelSelector, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} if ps == nil { return allErrs @@ -34,14 +34,14 @@ func ValidateLabelSelector(ps *unversioned.LabelSelector, fldPath *field.Path) f return allErrs } -func ValidateLabelSelectorRequirement(sr unversioned.LabelSelectorRequirement, fldPath *field.Path) field.ErrorList { +func ValidateLabelSelectorRequirement(sr metav1.LabelSelectorRequirement, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} switch sr.Operator { - case unversioned.LabelSelectorOpIn, unversioned.LabelSelectorOpNotIn: + case metav1.LabelSelectorOpIn, metav1.LabelSelectorOpNotIn: if len(sr.Values) == 0 { allErrs = append(allErrs, field.Required(fldPath.Child("values"), "must be specified when `operator` is 'In' or 'NotIn'")) } - case unversioned.LabelSelectorOpExists, unversioned.LabelSelectorOpDoesNotExist: + case metav1.LabelSelectorOpExists, metav1.LabelSelectorOpDoesNotExist: if len(sr.Values) > 0 { allErrs = append(allErrs, field.Forbidden(fldPath.Child("values"), "may not be specified when `operator` is 'Exists' or 'DoesNotExist'")) } diff --git a/pkg/apis/meta/v1/well_known_labels.go b/pkg/apis/meta/v1/well_known_labels.go index 7556181e88b..fb0ccad7075 100644 --- a/pkg/apis/meta/v1/well_known_labels.go +++ b/pkg/apis/meta/v1/well_known_labels.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 const ( // If you add a new topology domain here, also consider adding it to the set of default values diff --git a/pkg/apis/meta/v1/zz_generated.deepcopy.go b/pkg/apis/meta/v1/zz_generated.deepcopy.go index 627bb817ecb..04ca94c98de 100644 --- a/pkg/apis/meta/v1/zz_generated.deepcopy.go +++ b/pkg/apis/meta/v1/zz_generated.deepcopy.go @@ -18,14 +18,14 @@ limitations under the License. // This file was autogenerated by deepcopy-gen. Do not edit it manually! -package unversioned +package v1 import ( conversion "k8s.io/kubernetes/pkg/conversion" time "time" ) -func DeepCopy_unversioned_APIGroup(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_APIGroup(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*APIGroup) out := out.(*APIGroup) @@ -54,7 +54,7 @@ func DeepCopy_unversioned_APIGroup(in interface{}, out interface{}, c *conversio } } -func DeepCopy_unversioned_APIGroupList(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_APIGroupList(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*APIGroupList) out := out.(*APIGroupList) @@ -63,7 +63,7 @@ func DeepCopy_unversioned_APIGroupList(in interface{}, out interface{}, c *conve in, out := &in.Groups, &out.Groups *out = make([]APIGroup, len(*in)) for i := range *in { - if err := DeepCopy_unversioned_APIGroup(&(*in)[i], &(*out)[i], c); err != nil { + if err := DeepCopy_v1_APIGroup(&(*in)[i], &(*out)[i], c); err != nil { return err } } @@ -74,7 +74,7 @@ func DeepCopy_unversioned_APIGroupList(in interface{}, out interface{}, c *conve } } -func DeepCopy_unversioned_APIResource(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_APIResource(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*APIResource) out := out.(*APIResource) @@ -85,7 +85,7 @@ func DeepCopy_unversioned_APIResource(in interface{}, out interface{}, c *conver } } -func DeepCopy_unversioned_APIResourceList(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_APIResourceList(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*APIResourceList) out := out.(*APIResourceList) @@ -104,7 +104,7 @@ func DeepCopy_unversioned_APIResourceList(in interface{}, out interface{}, c *co } } -func DeepCopy_unversioned_APIVersions(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_APIVersions(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*APIVersions) out := out.(*APIVersions) @@ -129,7 +129,7 @@ func DeepCopy_unversioned_APIVersions(in interface{}, out interface{}, c *conver } } -func DeepCopy_unversioned_Duration(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_Duration(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*Duration) out := out.(*Duration) @@ -138,7 +138,7 @@ func DeepCopy_unversioned_Duration(in interface{}, out interface{}, c *conversio } } -func DeepCopy_unversioned_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*ExportOptions) out := out.(*ExportOptions) @@ -149,7 +149,7 @@ func DeepCopy_unversioned_ExportOptions(in interface{}, out interface{}, c *conv } } -func DeepCopy_unversioned_GroupKind(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_GroupKind(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*GroupKind) out := out.(*GroupKind) @@ -159,7 +159,7 @@ func DeepCopy_unversioned_GroupKind(in interface{}, out interface{}, c *conversi } } -func DeepCopy_unversioned_GroupResource(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_GroupResource(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*GroupResource) out := out.(*GroupResource) @@ -169,7 +169,7 @@ func DeepCopy_unversioned_GroupResource(in interface{}, out interface{}, c *conv } } -func DeepCopy_unversioned_GroupVersion(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_GroupVersion(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*GroupVersion) out := out.(*GroupVersion) @@ -179,7 +179,7 @@ func DeepCopy_unversioned_GroupVersion(in interface{}, out interface{}, c *conve } } -func DeepCopy_unversioned_GroupVersionForDiscovery(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_GroupVersionForDiscovery(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*GroupVersionForDiscovery) out := out.(*GroupVersionForDiscovery) @@ -189,7 +189,7 @@ func DeepCopy_unversioned_GroupVersionForDiscovery(in interface{}, out interface } } -func DeepCopy_unversioned_GroupVersionKind(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_GroupVersionKind(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*GroupVersionKind) out := out.(*GroupVersionKind) @@ -200,7 +200,7 @@ func DeepCopy_unversioned_GroupVersionKind(in interface{}, out interface{}, c *c } } -func DeepCopy_unversioned_GroupVersionResource(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_GroupVersionResource(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*GroupVersionResource) out := out.(*GroupVersionResource) @@ -211,7 +211,7 @@ func DeepCopy_unversioned_GroupVersionResource(in interface{}, out interface{}, } } -func DeepCopy_unversioned_LabelSelector(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_LabelSelector(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*LabelSelector) out := out.(*LabelSelector) @@ -228,7 +228,7 @@ func DeepCopy_unversioned_LabelSelector(in interface{}, out interface{}, c *conv in, out := &in.MatchExpressions, &out.MatchExpressions *out = make([]LabelSelectorRequirement, len(*in)) for i := range *in { - if err := DeepCopy_unversioned_LabelSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil { + if err := DeepCopy_v1_LabelSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil { return err } } @@ -239,7 +239,7 @@ func DeepCopy_unversioned_LabelSelector(in interface{}, out interface{}, c *conv } } -func DeepCopy_unversioned_LabelSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_LabelSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*LabelSelectorRequirement) out := out.(*LabelSelectorRequirement) @@ -256,7 +256,7 @@ func DeepCopy_unversioned_LabelSelectorRequirement(in interface{}, out interface } } -func DeepCopy_unversioned_ListMeta(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_ListMeta(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*ListMeta) out := out.(*ListMeta) @@ -266,7 +266,7 @@ func DeepCopy_unversioned_ListMeta(in interface{}, out interface{}, c *conversio } } -func DeepCopy_unversioned_Patch(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_Patch(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*Patch) out := out.(*Patch) @@ -276,7 +276,7 @@ func DeepCopy_unversioned_Patch(in interface{}, out interface{}, c *conversion.C } } -func DeepCopy_unversioned_RootPaths(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_RootPaths(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*RootPaths) out := out.(*RootPaths) @@ -291,7 +291,7 @@ func DeepCopy_unversioned_RootPaths(in interface{}, out interface{}, c *conversi } } -func DeepCopy_unversioned_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*ServerAddressByClientCIDR) out := out.(*ServerAddressByClientCIDR) @@ -301,7 +301,7 @@ func DeepCopy_unversioned_ServerAddressByClientCIDR(in interface{}, out interfac } } -func DeepCopy_unversioned_Status(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_Status(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*Status) out := out.(*Status) @@ -313,7 +313,7 @@ func DeepCopy_unversioned_Status(in interface{}, out interface{}, c *conversion. if in.Details != nil { in, out := &in.Details, &out.Details *out = new(StatusDetails) - if err := DeepCopy_unversioned_StatusDetails(*in, *out, c); err != nil { + if err := DeepCopy_v1_StatusDetails(*in, *out, c); err != nil { return err } } else { @@ -324,7 +324,7 @@ func DeepCopy_unversioned_Status(in interface{}, out interface{}, c *conversion. } } -func DeepCopy_unversioned_StatusCause(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_StatusCause(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*StatusCause) out := out.(*StatusCause) @@ -335,7 +335,7 @@ func DeepCopy_unversioned_StatusCause(in interface{}, out interface{}, c *conver } } -func DeepCopy_unversioned_StatusDetails(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_StatusDetails(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*StatusDetails) out := out.(*StatusDetails) @@ -356,7 +356,7 @@ func DeepCopy_unversioned_StatusDetails(in interface{}, out interface{}, c *conv } } -func DeepCopy_unversioned_Time(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_Time(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*Time) out := out.(*Time) @@ -369,7 +369,7 @@ func DeepCopy_unversioned_Time(in interface{}, out interface{}, c *conversion.Cl } } -func DeepCopy_unversioned_Timestamp(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_Timestamp(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*Timestamp) out := out.(*Timestamp) @@ -379,7 +379,7 @@ func DeepCopy_unversioned_Timestamp(in interface{}, out interface{}, c *conversi } } -func DeepCopy_unversioned_TypeMeta(in interface{}, out interface{}, c *conversion.Cloner) error { +func DeepCopy_v1_TypeMeta(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*TypeMeta) out := out.(*TypeMeta) diff --git a/pkg/apis/policy/BUILD b/pkg/apis/policy/BUILD index fe2a06583a0..af1a58fbf43 100644 --- a/pkg/apis/policy/BUILD +++ b/pkg/apis/policy/BUILD @@ -22,7 +22,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/policy/types.generated.go b/pkg/apis/policy/types.generated.go index cc6848fbf8b..cdd6c4eee7d 100644 --- a/pkg/apis/policy/types.generated.go +++ b/pkg/apis/policy/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_api "k8s.io/kubernetes/pkg/api" - pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg4_types "k8s.io/kubernetes/pkg/types" pkg1_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" diff --git a/pkg/apis/policy/types.go b/pkg/apis/policy/types.go index b9f298f0e65..02f3f75535c 100644 --- a/pkg/apis/policy/types.go +++ b/pkg/apis/policy/types.go @@ -18,7 +18,7 @@ package policy import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -34,7 +34,7 @@ type PodDisruptionBudgetSpec struct { // Label query over pods whose evictions are managed by the disruption // budget. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` } // PodDisruptionBudgetStatus represents information about the status of a @@ -56,7 +56,7 @@ type PodDisruptionBudgetStatus struct { // the list automatically by PodDisruptionBudget controller after some time. // If everything goes smooth this map should be empty for the most of the time. // Large number of entries in the map may indicate problems with pod deletions. - DisruptedPods map[string]unversioned.Time `json:"disruptedPods" protobuf:"bytes,5,rep,name=disruptedPods"` + DisruptedPods map[string]metav1.Time `json:"disruptedPods" protobuf:"bytes,5,rep,name=disruptedPods"` // Number of pod disruptions that are currently allowed. PodDisruptionsAllowed int32 `json:"disruptionsAllowed"` @@ -75,7 +75,7 @@ type PodDisruptionBudgetStatus struct { // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods type PodDisruptionBudget struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -89,9 +89,9 @@ type PodDisruptionBudget struct { // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. type PodDisruptionBudgetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []PodDisruptionBudget `json:"items"` } @@ -102,7 +102,7 @@ type PodDisruptionBudgetList struct { // This is a subresource of Pod. A request to cause such an eviction is // created by POSTing to .../pods//eviction. type Eviction struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // ObjectMeta describes the pod that is being evicted. // +optional diff --git a/pkg/apis/policy/v1alpha1/BUILD b/pkg/apis/policy/v1alpha1/BUILD index d3681c6e0bc..4f37c2119d9 100644 --- a/pkg/apis/policy/v1alpha1/BUILD +++ b/pkg/apis/policy/v1alpha1/BUILD @@ -19,8 +19,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/util/intstr:go_default_library", diff --git a/pkg/apis/policy/v1alpha1/register.go b/pkg/apis/policy/v1alpha1/register.go index 6517b4249b1..b898c9f3281 100644 --- a/pkg/apis/policy/v1alpha1/register.go +++ b/pkg/apis/policy/v1alpha1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -48,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Eviction{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/apis/policy/v1alpha1/types.go b/pkg/apis/policy/v1alpha1/types.go index e2dfc733155..5c05d5610bb 100644 --- a/pkg/apis/policy/v1alpha1/types.go +++ b/pkg/apis/policy/v1alpha1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -34,7 +34,7 @@ type PodDisruptionBudgetSpec struct { // Label query over pods whose evictions are managed by the disruption // budget. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` } // PodDisruptionBudgetStatus represents information about the status of a @@ -57,7 +57,7 @@ type PodDisruptionBudgetStatus struct { // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods type PodDisruptionBudget struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -71,9 +71,9 @@ type PodDisruptionBudget struct { // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. type PodDisruptionBudgetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` } @@ -81,7 +81,7 @@ type PodDisruptionBudgetList struct { // This is a subresource of Pod. A request to cause such an eviction is // created by POSTing to .../pods//eviction. type Eviction struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // ObjectMeta describes the pod that is being evicted. // +optional diff --git a/pkg/apis/policy/v1beta1/BUILD b/pkg/apis/policy/v1beta1/BUILD index dd6de45216e..05b8a9369fe 100644 --- a/pkg/apis/policy/v1beta1/BUILD +++ b/pkg/apis/policy/v1beta1/BUILD @@ -25,8 +25,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/apis/policy/v1beta1/generated.pb.go b/pkg/apis/policy/v1beta1/generated.pb.go index 0fa1cab7184..1c33839feaf 100644 --- a/pkg/apis/policy/v1beta1/generated.pb.go +++ b/pkg/apis/policy/v1beta1/generated.pb.go @@ -37,7 +37,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/api/unversioned" +import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" import strings "strings" diff --git a/pkg/apis/policy/v1beta1/register.go b/pkg/apis/policy/v1beta1/register.go index 0ff7c07a75d..af7cbfd4ffd 100644 --- a/pkg/apis/policy/v1beta1/register.go +++ b/pkg/apis/policy/v1beta1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -48,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Eviction{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/apis/policy/v1beta1/types.generated.go b/pkg/apis/policy/v1beta1/types.generated.go index 1918cba5606..c5355112ffd 100644 --- a/pkg/apis/policy/v1beta1/types.generated.go +++ b/pkg/apis/policy/v1beta1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_v1 "k8s.io/kubernetes/pkg/api/v1" pkg4_types "k8s.io/kubernetes/pkg/types" pkg1_intstr "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/apis/policy/v1beta1/types.go b/pkg/apis/policy/v1beta1/types.go index 0e7cff85725..5a8eda46b4c 100644 --- a/pkg/apis/policy/v1beta1/types.go +++ b/pkg/apis/policy/v1beta1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -32,7 +32,7 @@ type PodDisruptionBudgetSpec struct { // Label query over pods whose evictions are managed by the disruption // budget. - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` } // PodDisruptionBudgetStatus represents information about the status of a @@ -54,7 +54,7 @@ type PodDisruptionBudgetStatus struct { // the list automatically by PodDisruptionBudget controller after some time. // If everything goes smooth this map should be empty for the most of the time. // Large number of entries in the map may indicate problems with pod deletions. - DisruptedPods map[string]unversioned.Time `json:"disruptedPods" protobuf:"bytes,2,rep,name=disruptedPods"` + DisruptedPods map[string]metav1.Time `json:"disruptedPods" protobuf:"bytes,2,rep,name=disruptedPods"` // Number of pod disruptions that are currently allowed. PodDisruptionsAllowed int32 `json:"disruptionsAllowed" protobuf:"varint,3,opt,name=disruptionsAllowed"` @@ -73,7 +73,7 @@ type PodDisruptionBudgetStatus struct { // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods type PodDisruptionBudget struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Specification of the desired behavior of the PodDisruptionBudget. @@ -84,8 +84,8 @@ type PodDisruptionBudget struct { // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. type PodDisruptionBudgetList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` } @@ -93,7 +93,7 @@ type PodDisruptionBudgetList struct { // This is a subresource of Pod. A request to cause such an eviction is // created by POSTing to .../pods//evictions. type Eviction struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // ObjectMeta describes the pod that is being evicted. v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/pkg/apis/policy/v1beta1/zz_generated.conversion.go b/pkg/apis/policy/v1beta1/zz_generated.conversion.go index e3015bb0a1b..5057ff00e9f 100644 --- a/pkg/apis/policy/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/policy/v1beta1/zz_generated.conversion.go @@ -22,8 +22,8 @@ package v1beta1 import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" v1 "k8s.io/kubernetes/pkg/api/v1" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" policy "k8s.io/kubernetes/pkg/apis/policy" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" @@ -135,7 +135,7 @@ func Convert_policy_PodDisruptionBudgetList_To_v1beta1_PodDisruptionBudgetList(i func autoConvert_v1beta1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(in *PodDisruptionBudgetSpec, out *policy.PodDisruptionBudgetSpec, s conversion.Scope) error { out.MinAvailable = in.MinAvailable - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) return nil } @@ -145,7 +145,7 @@ func Convert_v1beta1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(i func autoConvert_policy_PodDisruptionBudgetSpec_To_v1beta1_PodDisruptionBudgetSpec(in *policy.PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, s conversion.Scope) error { out.MinAvailable = in.MinAvailable - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) return nil } @@ -155,7 +155,7 @@ func Convert_policy_PodDisruptionBudgetSpec_To_v1beta1_PodDisruptionBudgetSpec(i func autoConvert_v1beta1_PodDisruptionBudgetStatus_To_policy_PodDisruptionBudgetStatus(in *PodDisruptionBudgetStatus, out *policy.PodDisruptionBudgetStatus, s conversion.Scope) error { out.ObservedGeneration = in.ObservedGeneration - out.DisruptedPods = *(*map[string]unversioned.Time)(unsafe.Pointer(&in.DisruptedPods)) + out.DisruptedPods = *(*map[string]meta_v1.Time)(unsafe.Pointer(&in.DisruptedPods)) out.PodDisruptionsAllowed = in.PodDisruptionsAllowed out.CurrentHealthy = in.CurrentHealthy out.DesiredHealthy = in.DesiredHealthy @@ -169,7 +169,7 @@ func Convert_v1beta1_PodDisruptionBudgetStatus_To_policy_PodDisruptionBudgetStat func autoConvert_policy_PodDisruptionBudgetStatus_To_v1beta1_PodDisruptionBudgetStatus(in *policy.PodDisruptionBudgetStatus, out *PodDisruptionBudgetStatus, s conversion.Scope) error { out.ObservedGeneration = in.ObservedGeneration - out.DisruptedPods = *(*map[string]unversioned.Time)(unsafe.Pointer(&in.DisruptedPods)) + out.DisruptedPods = *(*map[string]meta_v1.Time)(unsafe.Pointer(&in.DisruptedPods)) out.PodDisruptionsAllowed = in.PodDisruptionsAllowed out.CurrentHealthy = in.CurrentHealthy out.DesiredHealthy = in.DesiredHealthy diff --git a/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go b/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go index c60bac0bd82..c739382ab3b 100644 --- a/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v1beta1 import ( - unversioned "k8s.io/kubernetes/pkg/api/unversioned" v1 "k8s.io/kubernetes/pkg/api/v1" + meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" @@ -111,8 +111,8 @@ func DeepCopy_v1beta1_PodDisruptionBudgetSpec(in interface{}, out interface{}, c out.MinAvailable = in.MinAvailable if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -129,7 +129,7 @@ func DeepCopy_v1beta1_PodDisruptionBudgetStatus(in interface{}, out interface{}, out.ObservedGeneration = in.ObservedGeneration if in.DisruptedPods != nil { in, out := &in.DisruptedPods, &out.DisruptedPods - *out = make(map[string]unversioned.Time) + *out = make(map[string]meta_v1.Time) for key, val := range *in { (*out)[key] = val.DeepCopy() } diff --git a/pkg/apis/policy/validation/BUILD b/pkg/apis/policy/validation/BUILD index 9c2998dd121..f7073a6c984 100644 --- a/pkg/apis/policy/validation/BUILD +++ b/pkg/apis/policy/validation/BUILD @@ -15,9 +15,9 @@ go_library( srcs = ["validation.go"], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned/validation:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/apis/meta/v1/validation:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/util/validation/field:go_default_library", ], diff --git a/pkg/apis/policy/validation/validation.go b/pkg/apis/policy/validation/validation.go index 886583f0b59..cfc073a52e1 100644 --- a/pkg/apis/policy/validation/validation.go +++ b/pkg/apis/policy/validation/validation.go @@ -19,7 +19,7 @@ package validation import ( "reflect" - unversionedvalidation "k8s.io/kubernetes/pkg/api/unversioned/validation" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" extensionsvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/apis/policy" diff --git a/pkg/apis/policy/zz_generated.deepcopy.go b/pkg/apis/policy/zz_generated.deepcopy.go index 3b840ec04d6..0712bcba872 100644 --- a/pkg/apis/policy/zz_generated.deepcopy.go +++ b/pkg/apis/policy/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ package policy import ( api "k8s.io/kubernetes/pkg/api" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" conversion "k8s.io/kubernetes/pkg/conversion" runtime "k8s.io/kubernetes/pkg/runtime" reflect "reflect" @@ -111,8 +111,8 @@ func DeepCopy_policy_PodDisruptionBudgetSpec(in interface{}, out interface{}, c out.MinAvailable = in.MinAvailable if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { return err } } else { @@ -129,7 +129,7 @@ func DeepCopy_policy_PodDisruptionBudgetStatus(in interface{}, out interface{}, out.ObservedGeneration = in.ObservedGeneration if in.DisruptedPods != nil { in, out := &in.DisruptedPods, &out.DisruptedPods - *out = make(map[string]unversioned.Time) + *out = make(map[string]v1.Time) for key, val := range *in { (*out)[key] = val.DeepCopy() } diff --git a/pkg/apis/rbac/BUILD b/pkg/apis/rbac/BUILD index 9f78c2230e2..f0ceda59a22 100644 --- a/pkg/apis/rbac/BUILD +++ b/pkg/apis/rbac/BUILD @@ -22,7 +22,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/rbac/register.go b/pkg/apis/rbac/register.go index 6b298409cbf..8f962c9cda9 100644 --- a/pkg/apis/rbac/register.go +++ b/pkg/apis/rbac/register.go @@ -18,7 +18,7 @@ package rbac import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/watch/versioned" @@ -59,7 +59,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) versioned.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/rbac/types.go b/pkg/apis/rbac/types.go index 361654f479c..78251017d49 100644 --- a/pkg/apis/rbac/types.go +++ b/pkg/apis/rbac/types.go @@ -18,7 +18,7 @@ package rbac import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) @@ -94,7 +94,7 @@ type RoleRef struct { // Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding. type Role struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. api.ObjectMeta @@ -108,7 +108,7 @@ type Role struct { // It adds who information via Subjects and namespace information by which namespace it exists in. RoleBindings in a given // namespace only have effect in that namespace. type RoleBinding struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Subjects holds references to the objects the role applies to. @@ -121,9 +121,9 @@ type RoleBinding struct { // RoleBindingList is a collection of RoleBindings type RoleBindingList struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. - unversioned.ListMeta + metav1.ListMeta // Items is a list of roleBindings Items []RoleBinding @@ -131,9 +131,9 @@ type RoleBindingList struct { // RoleList is a collection of Roles type RoleList struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. - unversioned.ListMeta + metav1.ListMeta // Items is a list of roles Items []Role @@ -144,7 +144,7 @@ type RoleList struct { // ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding. type ClusterRole struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. api.ObjectMeta @@ -158,7 +158,7 @@ type ClusterRole struct { // ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, // and adds who information via Subject. type ClusterRoleBinding struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. api.ObjectMeta @@ -172,9 +172,9 @@ type ClusterRoleBinding struct { // ClusterRoleBindingList is a collection of ClusterRoleBindings type ClusterRoleBindingList struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. - unversioned.ListMeta + metav1.ListMeta // Items is a list of ClusterRoleBindings Items []ClusterRoleBinding @@ -182,9 +182,9 @@ type ClusterRoleBindingList struct { // ClusterRoleList is a collection of ClusterRoles type ClusterRoleList struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. - unversioned.ListMeta + metav1.ListMeta // Items is a list of ClusterRoles Items []ClusterRole diff --git a/pkg/apis/rbac/v1alpha1/BUILD b/pkg/apis/rbac/v1alpha1/BUILD index ddfcf17eac9..fc77d9d7c2d 100644 --- a/pkg/apis/rbac/v1alpha1/BUILD +++ b/pkg/apis/rbac/v1alpha1/BUILD @@ -27,8 +27,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/apis/rbac/v1alpha1/register.go b/pkg/apis/rbac/v1alpha1/register.go index de3f3b6a775..261662554a6 100644 --- a/pkg/apis/rbac/v1alpha1/register.go +++ b/pkg/apis/rbac/v1alpha1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -54,7 +54,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, ) versioned.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/pkg/apis/rbac/v1alpha1/types.generated.go b/pkg/apis/rbac/v1alpha1/types.generated.go index 4481709b7aa..30a5c8f7d23 100644 --- a/pkg/apis/rbac/v1alpha1/types.generated.go +++ b/pkg/apis/rbac/v1alpha1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_v1 "k8s.io/kubernetes/pkg/api/v1" pkg1_runtime "k8s.io/kubernetes/pkg/runtime" pkg4_types "k8s.io/kubernetes/pkg/types" diff --git a/pkg/apis/rbac/v1alpha1/types.go b/pkg/apis/rbac/v1alpha1/types.go index 9b336bb533d..85bdd61f256 100644 --- a/pkg/apis/rbac/v1alpha1/types.go +++ b/pkg/apis/rbac/v1alpha1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" ) @@ -105,7 +105,7 @@ type RoleRef struct { // Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding. type Role struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -120,7 +120,7 @@ type Role struct { // It adds who information via Subjects and namespace information by which namespace it exists in. RoleBindings in a given // namespace only have effect in that namespace. type RoleBinding struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -135,10 +135,10 @@ type RoleBinding struct { // RoleBindingList is a collection of RoleBindings type RoleBindingList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of RoleBindings Items []RoleBinding `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -146,10 +146,10 @@ type RoleBindingList struct { // RoleList is a collection of Roles type RoleList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of Roles Items []Role `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -160,7 +160,7 @@ type RoleList struct { // ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding. type ClusterRole struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -175,7 +175,7 @@ type ClusterRole struct { // ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, // and adds who information via Subject. type ClusterRoleBinding struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -190,10 +190,10 @@ type ClusterRoleBinding struct { // ClusterRoleBindingList is a collection of ClusterRoleBindings type ClusterRoleBindingList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of ClusterRoleBindings Items []ClusterRoleBinding `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -201,10 +201,10 @@ type ClusterRoleBindingList struct { // ClusterRoleList is a collection of ClusterRoles type ClusterRoleList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of ClusterRoles Items []ClusterRole `json:"items" protobuf:"bytes,2,rep,name=items"` diff --git a/pkg/apis/storage/BUILD b/pkg/apis/storage/BUILD index b52cd12b941..f73f7268b6c 100644 --- a/pkg/apis/storage/BUILD +++ b/pkg/apis/storage/BUILD @@ -22,7 +22,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/apis/storage/register.go b/pkg/apis/storage/register.go index 8ded5e9b08d..6e5375d2faf 100644 --- a/pkg/apis/storage/register.go +++ b/pkg/apis/storage/register.go @@ -18,7 +18,7 @@ package storage import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -48,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &api.ListOptions{}, &api.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &StorageClass{}, &StorageClassList{}, diff --git a/pkg/apis/storage/types.generated.go b/pkg/apis/storage/types.generated.go index 25c4b04c86a..65dc2dd1a47 100644 --- a/pkg/apis/storage/types.generated.go +++ b/pkg/apis/storage/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/pkg/apis/storage/types.go b/pkg/apis/storage/types.go index 1e4baae59e3..5ea67c53a27 100644 --- a/pkg/apis/storage/types.go +++ b/pkg/apis/storage/types.go @@ -18,7 +18,7 @@ package storage import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true @@ -31,7 +31,7 @@ import ( // called "profiles" in other storage systems. // The name of a StorageClass object is significant, and is how users can request a particular class. type StorageClass struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -52,11 +52,11 @@ type StorageClass struct { // StorageClassList is a collection of storage classes. type StorageClassList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of StorageClasses Items []StorageClass `json:"items"` diff --git a/pkg/apis/storage/v1beta1/BUILD b/pkg/apis/storage/v1beta1/BUILD index 5f8b7c52afb..9bd98a079e9 100644 --- a/pkg/apis/storage/v1beta1/BUILD +++ b/pkg/apis/storage/v1beta1/BUILD @@ -24,8 +24,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/apis/storage/v1beta1/register.go b/pkg/apis/storage/v1beta1/register.go index 108b487b35b..87a347e7a69 100644 --- a/pkg/apis/storage/v1beta1/register.go +++ b/pkg/apis/storage/v1beta1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -45,7 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}, &v1.DeleteOptions{}, - &unversioned.ExportOptions{}, + &metav1.ExportOptions{}, &StorageClass{}, &StorageClassList{}, diff --git a/pkg/apis/storage/v1beta1/types.generated.go b/pkg/apis/storage/v1beta1/types.generated.go index 7f59ec8f5c4..993cee3f3f6 100644 --- a/pkg/apis/storage/v1beta1/types.generated.go +++ b/pkg/apis/storage/v1beta1/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" diff --git a/pkg/apis/storage/v1beta1/types.go b/pkg/apis/storage/v1beta1/types.go index f36d9319e56..c97ba423afc 100644 --- a/pkg/apis/storage/v1beta1/types.go +++ b/pkg/apis/storage/v1beta1/types.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -30,7 +30,7 @@ import ( // StorageClasses are non-namespaced; the name of the storage class // according to etcd is in ObjectMeta.Name. type StorageClass struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -47,11 +47,11 @@ type StorageClass struct { // StorageClassList is a collection of storage classes. type StorageClassList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of StorageClasses Items []StorageClass `json:"items" protobuf:"bytes,2,rep,name=items"` diff --git a/pkg/apiserver/BUILD b/pkg/apiserver/BUILD index 635a99af2d9..41170e6afad 100644 --- a/pkg/apiserver/BUILD +++ b/pkg/apiserver/BUILD @@ -31,8 +31,8 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apiserver/metrics:go_default_library", "//pkg/apiserver/request:go_default_library", "//pkg/conversion:go_default_library", @@ -88,8 +88,8 @@ go_test( "//pkg/api/rest:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apiserver/filters:go_default_library", "//pkg/apiserver/request:go_default_library", "//pkg/apiserver/testing:go_default_library", diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go index 643c20ec09a..17652022d58 100644 --- a/pkg/apiserver/api_installer.go +++ b/pkg/apiserver/api_installer.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apiserver/metrics" "k8s.io/kubernetes/pkg/conversion" @@ -66,7 +66,7 @@ type documentable interface { var errEmptyName = errors.NewBadRequest("name must be provided") // Installs handlers for API resources. -func (a *APIInstaller) Install(ws *restful.WebService) (apiResources []unversioned.APIResource, errors []error) { +func (a *APIInstaller) Install(ws *restful.WebService) (apiResources []metav1.APIResource, errors []error) { errors = make([]error, 0) proxyHandler := (&ProxyHandler{ @@ -170,7 +170,7 @@ func (a *APIInstaller) restMapping(resource string) (*meta.RESTMapping, error) { return a.group.Mapper.RESTMapping(fqKindToRegister.GroupKind(), fqKindToRegister.Version) } -func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storage, ws *restful.WebService, proxyHandler http.Handler) (*unversioned.APIResource, error) { +func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storage, ws *restful.WebService, proxyHandler http.Handler) (*metav1.APIResource, error) { admit := a.group.Admit context := a.group.Context @@ -350,7 +350,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag resourceKind = kind } - var apiResource unversioned.APIResource + var apiResource metav1.APIResource // Get the list of actions for the given scope. switch scope.Name() { case meta.RESTScopeNameRoot: @@ -611,7 +611,7 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag Operation("patch"+namespaced+kind+strings.Title(subresource)+operationSuffix). Produces(append(storageMeta.ProducesMIMETypes(action.Verb), mediaTypes...)...). Returns(http.StatusOK, "OK", versionedObject). - Reads(unversioned.Patch{}). + Reads(metav1.Patch{}). Writes(versionedObject) addParams(route, action.Params) ws.Route(route) @@ -964,8 +964,8 @@ func addObjectParams(ws *restful.WebService, route *restful.RouteBuilder, obj in switch sf.Type.Kind() { case reflect.Interface, reflect.Struct: case reflect.Ptr: - // TODO: This is a hack to let unversioned.Time through. This needs to be fixed in a more generic way eventually. bug #36191 - if (sf.Type.Elem().Kind() == reflect.Interface || sf.Type.Elem().Kind() == reflect.Struct) && strings.TrimPrefix(sf.Type.String(), "*") != "unversioned.Time" { + // TODO: This is a hack to let metav1.Time through. This needs to be fixed in a more generic way eventually. bug #36191 + if (sf.Type.Elem().Kind() == reflect.Interface || sf.Type.Elem().Kind() == reflect.Struct) && strings.TrimPrefix(sf.Type.String(), "*") != "metav1.Time" { continue } fallthrough @@ -1000,7 +1000,7 @@ func typeToJSON(typeName string) string { return "integer" case "float64", "*float64", "float32", "*float32": return "number" - case "unversioned.Time", "*unversioned.Time": + case "metav1.Time", "*metav1.Time": return "string" case "byte", "*byte": return "string" diff --git a/pkg/apiserver/api_installer_test.go b/pkg/apiserver/api_installer_test.go index 0d8028c7897..7126cbb5f3d 100644 --- a/pkg/apiserver/api_installer_test.go +++ b/pkg/apiserver/api_installer_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "github.com/emicklei/go-restful" ) @@ -47,7 +47,7 @@ func TestScopeNamingGenerateLink(t *testing.T) { Name: "foo", Namespace: "other", }, - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Service", }, } diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 69695d35ae4..5e5a16a56ec 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -35,7 +35,7 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver/metrics" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -55,7 +55,7 @@ func init() { } type APIResourceLister interface { - ListAPIResources() []unversioned.APIResource + ListAPIResources() []metav1.APIResource } // APIGroupVersion is a helper for exposing rest.Storage objects as http.Handlers via go-restful @@ -118,10 +118,10 @@ const ( // staticLister implements the APIResourceLister interface type staticLister struct { - list []unversioned.APIResource + list []metav1.APIResource } -func (s staticLister) ListAPIResources() []unversioned.APIResource { +func (s staticLister) ListAPIResources() []metav1.APIResource { return s.list } @@ -209,7 +209,7 @@ func logStackOnRecover(s runtime.NegotiatedSerializer, panicReason interface{}, } // Adds a service to return the supported api versions at the legacy /api. -func AddApiWebService(s runtime.NegotiatedSerializer, container *restful.Container, apiPrefix string, getAPIVersionsFunc func(req *restful.Request) *unversioned.APIVersions) { +func AddApiWebService(s runtime.NegotiatedSerializer, container *restful.Container, apiPrefix string, getAPIVersionsFunc func(req *restful.Request) *metav1.APIVersions) { // TODO: InstallREST should register each version automatically // Because in release 1.1, /api returns response with empty APIVersion, we @@ -226,7 +226,7 @@ func AddApiWebService(s runtime.NegotiatedSerializer, container *restful.Contain Operation("getAPIVersions"). Produces(mediaTypes...). Consumes(mediaTypes...). - Writes(unversioned.APIVersions{})) + Writes(metav1.APIVersions{})) container.Add(ws) } @@ -277,7 +277,7 @@ func keepUnversioned(group string) bool { } // NewApisWebService returns a webservice serving the available api version under /apis. -func NewApisWebService(s runtime.NegotiatedSerializer, apiPrefix string, f func(req *restful.Request) []unversioned.APIGroup) *restful.WebService { +func NewApisWebService(s runtime.NegotiatedSerializer, apiPrefix string, f func(req *restful.Request) []metav1.APIGroup) *restful.WebService { // Because in release 1.1, /apis returns response with empty APIVersion, we // use StripVersionNegotiatedSerializer to keep the response backwards // compatible. @@ -292,13 +292,13 @@ func NewApisWebService(s runtime.NegotiatedSerializer, apiPrefix string, f func( Operation("getAPIVersions"). Produces(mediaTypes...). Consumes(mediaTypes...). - Writes(unversioned.APIGroupList{})) + Writes(metav1.APIGroupList{})) return ws } // NewGroupWebService returns a webservice serving the supported versions, preferred version, and name // of a group. E.g., such a web service will be registered at /apis/extensions. -func NewGroupWebService(s runtime.NegotiatedSerializer, path string, group unversioned.APIGroup) *restful.WebService { +func NewGroupWebService(s runtime.NegotiatedSerializer, path string, group metav1.APIGroup) *restful.WebService { ss := s if keepUnversioned(group.Name) { // Because in release 1.1, /apis/extensions returns response with empty @@ -316,7 +316,7 @@ func NewGroupWebService(s runtime.NegotiatedSerializer, path string, group unver Operation("getAPIGroup"). Produces(mediaTypes...). Consumes(mediaTypes...). - Writes(unversioned.APIGroup{})) + Writes(metav1.APIGroup{})) return ws } @@ -337,11 +337,11 @@ func AddSupportedResourcesWebService(s runtime.NegotiatedSerializer, ws *restful Operation("getAPIResources"). Produces(mediaTypes...). Consumes(mediaTypes...). - Writes(unversioned.APIResourceList{})) + Writes(metav1.APIResourceList{})) } // APIVersionHandler returns a handler which will list the provided versions as available. -func APIVersionHandler(s runtime.NegotiatedSerializer, getAPIVersionsFunc func(req *restful.Request) *unversioned.APIVersions) restful.RouteFunction { +func APIVersionHandler(s runtime.NegotiatedSerializer, getAPIVersionsFunc func(req *restful.Request) *metav1.APIVersions) restful.RouteFunction { return func(req *restful.Request, resp *restful.Response) { writeNegotiated(s, schema.GroupVersion{}, resp.ResponseWriter, req.Request, http.StatusOK, getAPIVersionsFunc(req)) } @@ -370,12 +370,12 @@ func isOldKubectl(userAgent string) bool { var groupsWithNewVersionsIn1_5 = sets.NewString("apps", "policy") // TODO: Remove in 1.6. -func filterAPIGroups(req *restful.Request, groups []unversioned.APIGroup) []unversioned.APIGroup { +func filterAPIGroups(req *restful.Request, groups []metav1.APIGroup) []metav1.APIGroup { if !isOldKubectl(req.HeaderParameter("User-Agent")) { return groups } // hide API group that has new versions added in 1.5. - var ret []unversioned.APIGroup + var ret []metav1.APIGroup for _, group := range groups { if groupsWithNewVersionsIn1_5.Has(group.Name) { continue @@ -386,15 +386,15 @@ func filterAPIGroups(req *restful.Request, groups []unversioned.APIGroup) []unve } // RootAPIHandler returns a handler which will list the provided groups and versions as available. -func RootAPIHandler(s runtime.NegotiatedSerializer, f func(req *restful.Request) []unversioned.APIGroup) restful.RouteFunction { +func RootAPIHandler(s runtime.NegotiatedSerializer, f func(req *restful.Request) []metav1.APIGroup) restful.RouteFunction { return func(req *restful.Request, resp *restful.Response) { - writeNegotiated(s, schema.GroupVersion{}, resp.ResponseWriter, req.Request, http.StatusOK, &unversioned.APIGroupList{Groups: filterAPIGroups(req, f(req))}) + writeNegotiated(s, schema.GroupVersion{}, resp.ResponseWriter, req.Request, http.StatusOK, &metav1.APIGroupList{Groups: filterAPIGroups(req, f(req))}) } } // GroupHandler returns a handler which will return the api.GroupAndVersion of // the group. -func GroupHandler(s runtime.NegotiatedSerializer, group unversioned.APIGroup) restful.RouteFunction { +func GroupHandler(s runtime.NegotiatedSerializer, group metav1.APIGroup) restful.RouteFunction { return func(req *restful.Request, resp *restful.Response) { writeNegotiated(s, schema.GroupVersion{}, resp.ResponseWriter, req.Request, http.StatusOK, &group) } @@ -403,7 +403,7 @@ func GroupHandler(s runtime.NegotiatedSerializer, group unversioned.APIGroup) re // SupportedResourcesHandler returns a handler which will list the provided resources as available. func SupportedResourcesHandler(s runtime.NegotiatedSerializer, groupVersion schema.GroupVersion, lister APIResourceLister) restful.RouteFunction { return func(req *restful.Request, resp *restful.Response) { - writeNegotiated(s, schema.GroupVersion{}, resp.ResponseWriter, req.Request, http.StatusOK, &unversioned.APIResourceList{GroupVersion: groupVersion.String(), APIResources: lister.ListAPIResources()}) + writeNegotiated(s, schema.GroupVersion{}, resp.ResponseWriter, req.Request, http.StatusOK, &metav1.APIResourceList{GroupVersion: groupVersion.String(), APIResources: lister.ListAPIResources()}) } } diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go index 6f4591ea7d1..bfcfec8bd9e 100644 --- a/pkg/apiserver/apiserver_test.go +++ b/pkg/apiserver/apiserver_test.go @@ -38,7 +38,7 @@ import ( apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apiserver/filters" "k8s.io/kubernetes/pkg/apiserver/request" @@ -123,7 +123,7 @@ func newMapper() *meta.DefaultRESTMapper { func addGrouplessTypes() { type ListOptions struct { Object runtime.Object - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` LabelSelector string `json:"labelSelector,omitempty"` FieldSelector string `json:"fieldSelector,omitempty"` Watch bool `json:"watch,omitempty"` @@ -131,17 +131,17 @@ func addGrouplessTypes() { TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } api.Scheme.AddKnownTypes(grouplessGroupVersion, - &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &unversioned.ExportOptions{}, + &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{}, &api.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{}) api.Scheme.AddKnownTypes(grouplessInternalGroupVersion, - &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &api.ListOptions{}, &unversioned.ExportOptions{}, + &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &api.ListOptions{}, &metav1.ExportOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{}) } func addTestTypes() { type ListOptions struct { Object runtime.Object - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` LabelSelector string `json:"labelSelector,omitempty"` FieldSelector string `json:"fieldSelector,omitempty"` Watch bool `json:"watch,omitempty"` @@ -149,27 +149,27 @@ func addTestTypes() { TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } api.Scheme.AddKnownTypes(testGroupVersion, - &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &unversioned.ExportOptions{}, + &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{}, &api.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{}, &SimpleXGSubresource{}) api.Scheme.AddKnownTypes(testGroupVersion, &v1.Pod{}) api.Scheme.AddKnownTypes(testInternalGroupVersion, - &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &api.ListOptions{}, &unversioned.ExportOptions{}, + &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &api.ListOptions{}, &metav1.ExportOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{}, &SimpleXGSubresource{}) api.Scheme.AddKnownTypes(testInternalGroupVersion, &api.Pod{}) // Register SimpleXGSubresource in both testGroupVersion and testGroup2Version, and also their // their corresponding internal versions, to verify that the desired group version object is // served in the tests. - api.Scheme.AddKnownTypes(testGroup2Version, &SimpleXGSubresource{}, &unversioned.ExportOptions{}) - api.Scheme.AddKnownTypes(testInternalGroup2Version, &SimpleXGSubresource{}, &unversioned.ExportOptions{}) + api.Scheme.AddKnownTypes(testGroup2Version, &SimpleXGSubresource{}, &metav1.ExportOptions{}) + api.Scheme.AddKnownTypes(testInternalGroup2Version, &SimpleXGSubresource{}, &metav1.ExportOptions{}) versioned.AddToGroupVersion(api.Scheme, testGroupVersion) } func addNewTestTypes() { type ListOptions struct { Object runtime.Object - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` LabelSelector string `json:"labelSelector,omitempty"` FieldSelector string `json:"fieldSelector,omitempty"` Watch bool `json:"watch,omitempty"` @@ -177,7 +177,7 @@ func addNewTestTypes() { TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } api.Scheme.AddKnownTypes(newGroupVersion, - &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &unversioned.ExportOptions{}, + &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{}, &api.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{}, &v1.Pod{}, ) @@ -382,7 +382,7 @@ type SimpleRESTStorage struct { injectedFunction func(obj runtime.Object) (returnObj runtime.Object, err error) } -func (storage *SimpleRESTStorage) Export(ctx api.Context, name string, opts unversioned.ExportOptions) (runtime.Object, error) { +func (storage *SimpleRESTStorage) Export(ctx api.Context, name string, opts metav1.ExportOptions) (runtime.Object, error) { obj, err := storage.Get(ctx, name) if err != nil { return nil, err @@ -467,7 +467,7 @@ func (storage *SimpleRESTStorage) Delete(ctx api.Context, id string, options *ap if err := storage.errors["delete"]; err != nil { return nil, err } - var obj runtime.Object = &unversioned.Status{Status: unversioned.StatusSuccess} + var obj runtime.Object = &metav1.Status{Status: metav1.StatusSuccess} var err error if storage.injectedFunction != nil { obj, err = storage.injectedFunction(&apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: id}}) @@ -1242,7 +1242,7 @@ func TestExport(t *testing.T) { item: apiservertesting.Simple{ ObjectMeta: api.ObjectMeta{ ResourceVersion: "1234", - CreationTimestamp: unversioned.NewTime(time.Unix(10, 10)), + CreationTimestamp: metav1.NewTime(time.Unix(10, 10)), }, Other: "foo", }, @@ -1796,7 +1796,7 @@ func TestConnectResponderError(t *testing.T) { if err != nil { t.Fatal(err) } - if obj.(*unversioned.Status).Code != http.StatusForbidden { + if obj.(*metav1.Status).Code != http.StatusForbidden { t.Errorf("Unexpected response: %#v", obj) } } @@ -3035,7 +3035,7 @@ func TestCreateInvokesAdmissionControl(t *testing.T) { } } -func expectApiStatus(t *testing.T, method, url string, data []byte, code int) *unversioned.Status { +func expectApiStatus(t *testing.T, method, url string, data []byte, code int) *metav1.Status { client := http.Client{} request, err := http.NewRequest(method, url, bytes.NewBuffer(data)) if err != nil { @@ -3047,7 +3047,7 @@ func expectApiStatus(t *testing.T, method, url string, data []byte, code int) *u t.Fatalf("unexpected error on %s %s: %v", method, url, err) return nil } - var status unversioned.Status + var status metav1.Status if body, err := extractBody(response, &status); err != nil { t.Fatalf("unexpected error on %s %s: %v\nbody:\n%s", method, url, err, body) return nil @@ -3069,7 +3069,7 @@ func TestDelayReturnsError(t *testing.T) { defer server.Close() status := expectApiStatus(t, "DELETE", fmt.Sprintf("%s/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/foo/bar", server.URL), nil, http.StatusConflict) - if status.Status != unversioned.StatusFailure || status.Message == "" || status.Details == nil || status.Reason != unversioned.StatusReasonAlreadyExists { + if status.Status != metav1.StatusFailure || status.Message == "" || status.Details == nil || status.Reason != metav1.StatusReasonAlreadyExists { t.Errorf("Unexpected status %#v", status) } } @@ -3091,7 +3091,7 @@ func TestWriteJSONDecodeError(t *testing.T) { // still be an error object. This seems ok, the alternative is to validate the object before // encoding, but this really should never happen, so it's wasted compute for every API request. status := expectApiStatus(t, "GET", server.URL, nil, http.StatusOK) - if status.Reason != unversioned.StatusReasonUnknown { + if status.Reason != metav1.StatusReasonUnknown { t.Errorf("unexpected reason %#v", status) } if !strings.Contains(status.Message, "no kind is registered for the type apiserver.UnregisteredAPIObject") { @@ -3145,7 +3145,7 @@ func TestCreateTimeout(t *testing.T) { t.Errorf("unexpected error: %v", err) } itemOut := expectApiStatus(t, "POST", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/foo?timeout=4ms", data, apierrs.StatusServerTimeout) - if itemOut.Status != unversioned.StatusFailure || itemOut.Reason != unversioned.StatusReasonTimeout { + if itemOut.Status != metav1.StatusFailure || itemOut.Reason != metav1.StatusReasonTimeout { t.Errorf("Unexpected status %#v", itemOut) } } @@ -3249,7 +3249,7 @@ func TestUpdateChecksAPIVersion(t *testing.T) { // SimpleXGSubresource is a cross group subresource, i.e. the subresource does not belong to the // same group as its parent resource. type SimpleXGSubresource struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` api.ObjectMeta `json:"metadata"` SubresourceInfo string `json:"subresourceInfo,omitempty"` Labels map[string]string `json:"labels,omitempty"` diff --git a/pkg/apiserver/errors.go b/pkg/apiserver/errors.go index 689652311e2..d1df90b2186 100755 --- a/pkg/apiserver/errors.go +++ b/pkg/apiserver/errors.go @@ -21,29 +21,29 @@ import ( "net/http" "strings" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/util/runtime" ) -// statusError is an object that can be converted into an unversioned.Status +// statusError is an object that can be converted into an metav1.Status type statusError interface { - Status() unversioned.Status + Status() metav1.Status } -// errToAPIStatus converts an error to an unversioned.Status object. -func errToAPIStatus(err error) *unversioned.Status { +// errToAPIStatus converts an error to an metav1.Status object. +func errToAPIStatus(err error) *metav1.Status { switch t := err.(type) { case statusError: status := t.Status() if len(status.Status) == 0 { - status.Status = unversioned.StatusFailure + status.Status = metav1.StatusFailure } if status.Code == 0 { switch status.Status { - case unversioned.StatusSuccess: + case metav1.StatusSuccess: status.Code = http.StatusOK - case unversioned.StatusFailure: + case metav1.StatusFailure: status.Code = http.StatusInternalServerError } } @@ -60,11 +60,11 @@ func errToAPIStatus(err error) *unversioned.Status { // by REST storage - these typically indicate programmer // error by not using pkg/api/errors, or unexpected failure // cases. - runtime.HandleError(fmt.Errorf("apiserver received an error that is not an unversioned.Status: %v", err)) - return &unversioned.Status{ - Status: unversioned.StatusFailure, + runtime.HandleError(fmt.Errorf("apiserver received an error that is not an metav1.Status: %v", err)) + return &metav1.Status{ + Status: metav1.StatusFailure, Code: int32(status), - Reason: unversioned.StatusReasonUnknown, + Reason: metav1.StatusReasonUnknown, Message: err.Error(), } } @@ -112,11 +112,11 @@ func (e errNotAcceptable) Error() string { return fmt.Sprintf("only the following media types are accepted: %v", strings.Join(e.accepted, ", ")) } -func (e errNotAcceptable) Status() unversioned.Status { - return unversioned.Status{ - Status: unversioned.StatusFailure, +func (e errNotAcceptable) Status() metav1.Status { + return metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusNotAcceptable, - Reason: unversioned.StatusReason("NotAcceptable"), + Reason: metav1.StatusReason("NotAcceptable"), Message: e.Error(), } } @@ -131,11 +131,11 @@ func (e errUnsupportedMediaType) Error() string { return fmt.Sprintf("the body of the request was in an unknown format - accepted media types include: %v", strings.Join(e.accepted, ", ")) } -func (e errUnsupportedMediaType) Status() unversioned.Status { - return unversioned.Status{ - Status: unversioned.StatusFailure, +func (e errUnsupportedMediaType) Status() metav1.Status { + return metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusUnsupportedMediaType, - Reason: unversioned.StatusReason("UnsupportedMediaType"), + Reason: metav1.StatusReason("UnsupportedMediaType"), Message: e.Error(), } } diff --git a/pkg/apiserver/errors_test.go b/pkg/apiserver/errors_test.go index a3d4b7c8948..1d92e3c0f61 100644 --- a/pkg/apiserver/errors_test.go +++ b/pkg/apiserver/errors_test.go @@ -24,40 +24,40 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) func TestErrorsToAPIStatus(t *testing.T) { - cases := map[error]unversioned.Status{ + cases := map[error]metav1.Status{ errors.NewNotFound(schema.GroupResource{Group: "legacy.kubernetes.io", Resource: "foos"}, "bar"): { - Status: unversioned.StatusFailure, + Status: metav1.StatusFailure, Code: http.StatusNotFound, - Reason: unversioned.StatusReasonNotFound, + Reason: metav1.StatusReasonNotFound, Message: "foos.legacy.kubernetes.io \"bar\" not found", - Details: &unversioned.StatusDetails{ + Details: &metav1.StatusDetails{ Group: "legacy.kubernetes.io", Kind: "foos", Name: "bar", }, }, errors.NewAlreadyExists(api.Resource("foos"), "bar"): { - Status: unversioned.StatusFailure, + Status: metav1.StatusFailure, Code: http.StatusConflict, Reason: "AlreadyExists", Message: "foos \"bar\" already exists", - Details: &unversioned.StatusDetails{ + Details: &metav1.StatusDetails{ Group: "", Kind: "foos", Name: "bar", }, }, errors.NewConflict(api.Resource("foos"), "bar", stderrs.New("failure")): { - Status: unversioned.StatusFailure, + Status: metav1.StatusFailure, Code: http.StatusConflict, Reason: "Conflict", Message: "Operation cannot be fulfilled on foos \"bar\": failure", - Details: &unversioned.StatusDetails{ + Details: &metav1.StatusDetails{ Group: "", Kind: "foos", Name: "bar", diff --git a/pkg/apiserver/negotiate_test.go b/pkg/apiserver/negotiate_test.go index 514b359c2da..8e9f59ee364 100644 --- a/pkg/apiserver/negotiate_test.go +++ b/pkg/apiserver/negotiate_test.go @@ -21,7 +21,7 @@ import ( "net/url" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) @@ -224,7 +224,7 @@ func TestNegotiate(t *testing.T) { t.Errorf("%d: failed, error should be statusError: %v", i, err) continue } - if status.Status().Status != unversioned.StatusFailure || status.Status().Code != http.StatusNotAcceptable { + if status.Status().Status != metav1.StatusFailure || status.Status().Code != http.StatusNotAcceptable { t.Errorf("%d: failed: %v", i, err) continue } diff --git a/pkg/apiserver/resthandler.go b/pkg/apiserver/resthandler.go index a1e0b54b016..1d37f9e08c1 100644 --- a/pkg/apiserver/resthandler.go +++ b/pkg/apiserver/resthandler.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -132,7 +132,7 @@ func GetResource(r rest.Getter, e rest.Exporter, scope RequestScope) restful.Rou // check for export if values := req.Request.URL.Query(); len(values) > 0 { - exports := unversioned.ExportOptions{} + exports := metav1.ExportOptions{} if err := scope.ParameterCodec.DecodeParameters(values, schema.GroupVersion{Version: "v1"}, &exports); err != nil { return nil, err } @@ -402,7 +402,7 @@ func createHandler(r rest.NamedCreater, scope RequestScope, typer runtime.Object trace.Step("About to store object in database") result, err := finishRequest(timeout, func() (runtime.Object, error) { out, err := r.Create(ctx, name, obj) - if status, ok := out.(*unversioned.Status); ok && err == nil && status.Code == 0 { + if status, ok := out.(*metav1.Status); ok && err == nil && status.Code == 0 { status.Code = http.StatusCreated } return out, err @@ -815,17 +815,17 @@ func DeleteResource(r rest.GracefulDeleter, allowsOptions bool, scope RequestSco // if the rest.Deleter returns a nil object, fill out a status. Callers may return a valid // object with the response. if result == nil { - result = &unversioned.Status{ - Status: unversioned.StatusSuccess, + result = &metav1.Status{ + Status: metav1.StatusSuccess, Code: http.StatusOK, - Details: &unversioned.StatusDetails{ + Details: &metav1.StatusDetails{ Name: name, Kind: scope.Kind.Kind, }, } } else { // when a non-status response is returned, set the self link - if _, ok := result.(*unversioned.Status); !ok { + if _, ok := result.(*metav1.Status); !ok { if err := setSelfLink(result, req, scope.Namer); err != nil { scope.err(err, res.ResponseWriter, req.Request) return @@ -920,16 +920,16 @@ func DeleteCollection(r rest.CollectionDeleter, checkBody bool, scope RequestSco // if the rest.Deleter returns a nil object, fill out a status. Callers may return a valid // object with the response. if result == nil { - result = &unversioned.Status{ - Status: unversioned.StatusSuccess, + result = &metav1.Status{ + Status: metav1.StatusSuccess, Code: http.StatusOK, - Details: &unversioned.StatusDetails{ + Details: &metav1.StatusDetails{ Kind: scope.Kind.Kind, }, } } else { // when a non-status response is returned, set the self link - if _, ok := result.(*unversioned.Status); !ok { + if _, ok := result.(*metav1.Status); !ok { if _, err := setListSelfLink(result, req, scope.Namer); err != nil { scope.err(err, res.ResponseWriter, req.Request) return @@ -967,7 +967,7 @@ func finishRequest(timeout time.Duration, fn resultFunc) (result runtime.Object, select { case result = <-ch: - if status, ok := result.(*unversioned.Status); ok { + if status, ok := result.(*metav1.Status); ok { return nil, errors.FromObject(status) } return result, nil diff --git a/pkg/apiserver/resthandler_test.go b/pkg/apiserver/resthandler_test.go index 7a010e7f6d6..0ffb5af49b5 100644 --- a/pkg/apiserver/resthandler_test.go +++ b/pkg/apiserver/resthandler_test.go @@ -30,7 +30,7 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -40,7 +40,7 @@ import ( ) type testPatchType struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` TestPatchSubType `json:",inline"` } diff --git a/pkg/apiserver/testing/BUILD b/pkg/apiserver/testing/BUILD index ac432f5e484..bbc2989068a 100644 --- a/pkg/apiserver/testing/BUILD +++ b/pkg/apiserver/testing/BUILD @@ -19,7 +19,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/types:go_default_library", "//vendor:github.com/ugorji/go/codec", diff --git a/pkg/apiserver/testing/types.generated.go b/pkg/apiserver/testing/types.generated.go index 634eedfb71b..a468170ac71 100644 --- a/pkg/apiserver/testing/types.generated.go +++ b/pkg/apiserver/testing/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/pkg/apiserver/testing/types.go b/pkg/apiserver/testing/types.go index d7ae7561a30..ca34d3084fa 100644 --- a/pkg/apiserver/testing/types.go +++ b/pkg/apiserver/testing/types.go @@ -18,12 +18,12 @@ package testing import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) type Simple struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` api.ObjectMeta `json:"metadata"` // +optional Other string `json:"other,omitempty"` @@ -34,7 +34,7 @@ type Simple struct { func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } type SimpleRoot struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` api.ObjectMeta `json:"metadata"` // +optional Other string `json:"other,omitempty"` @@ -45,7 +45,7 @@ type SimpleRoot struct { func (obj *SimpleRoot) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } type SimpleGetOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` Param1 string `json:"param1"` Param2 string `json:"param2"` Path string `json:"atAPath"` @@ -61,8 +61,8 @@ func (SimpleGetOptions) SwaggerDoc() map[string]string { func (obj *SimpleGetOptions) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } type SimpleList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,inline"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,inline"` // +optional Items []Simple `json:"items,omitempty"` } diff --git a/pkg/apiserver/watch_test.go b/pkg/apiserver/watch_test.go index 83b3312bbc5..b924cfd0da2 100644 --- a/pkg/apiserver/watch_test.go +++ b/pkg/apiserver/watch_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiservertesting "k8s.io/kubernetes/pkg/apiserver/testing" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -603,7 +603,7 @@ func TestWatchHTTPTimeout(t *testing.T) { req, _ := http.NewRequest("GET", dest.String(), nil) client := http.Client{} resp, err := client.Do(req) - watcher.Add(&apiservertesting.Simple{TypeMeta: unversioned.TypeMeta{APIVersion: newGroupVersion.String()}}) + watcher.Add(&apiservertesting.Simple{TypeMeta: metav1.TypeMeta{APIVersion: newGroupVersion.String()}}) // Make sure we can actually watch an endpoint decoder := json.NewDecoder(resp.Body) diff --git a/pkg/client/cache/BUILD b/pkg/client/cache/BUILD index ff635370e9a..89d674b04b9 100644 --- a/pkg/client/cache/BUILD +++ b/pkg/client/cache/BUILD @@ -38,12 +38,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", "//pkg/apis/certificates/v1alpha1:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/storage:go_default_library", @@ -85,10 +85,10 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/cache:go_default_library", diff --git a/pkg/client/cache/listers.go b/pkg/client/cache/listers.go index c8e42605400..92079a0dc1b 100644 --- a/pkg/client/cache/listers.go +++ b/pkg/client/cache/listers.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" @@ -252,7 +252,7 @@ func (s *StoreToDaemonSetLister) GetPodDaemonSets(pod *v1.Pod) (daemonSets []ext if daemonSet.Namespace != pod.Namespace { continue } - selector, err = unversioned.LabelSelectorAsSelector(daemonSet.Spec.Selector) + selector, err = metav1.LabelSelectorAsSelector(daemonSet.Spec.Selector) if err != nil { // this should not happen if the DaemonSet passed validation return nil, err @@ -361,7 +361,7 @@ func (s *StoreToStatefulSetLister) GetPodStatefulSets(pod *v1.Pod) (psList []app if ps.Namespace != pod.Namespace { continue } - selector, err = unversioned.LabelSelectorAsSelector(ps.Spec.Selector) + selector, err = metav1.LabelSelectorAsSelector(ps.Spec.Selector) if err != nil { err = fmt.Errorf("invalid selector: %v", err) return @@ -423,7 +423,7 @@ func (s *StoreToPodDisruptionBudgetLister) GetPodPodDisruptionBudgets(pod *v1.Po if pdb.Namespace != pod.Namespace { continue } - selector, err = unversioned.LabelSelectorAsSelector(pdb.Spec.Selector) + selector, err = metav1.LabelSelectorAsSelector(pdb.Spec.Selector) if err != nil { glog.Warningf("invalid selector: %v", err) // TODO(mml): add an event to the PDB diff --git a/pkg/client/cache/listers_extensions.go b/pkg/client/cache/listers_extensions.go index 922c2943fd8..f0b81d86c0d 100644 --- a/pkg/client/cache/listers_extensions.go +++ b/pkg/client/cache/listers_extensions.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -90,7 +90,7 @@ func (s *StoreToDeploymentLister) GetDeploymentsForReplicaSet(rs *extensions.Rep return } for _, d := range dList { - selector, err := unversioned.LabelSelectorAsSelector(d.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(d.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid label selector: %v", err) } @@ -123,7 +123,7 @@ func (s *StoreToDeploymentLister) GetDeploymentsForPod(pod *v1.Pod) (deployments return } for _, d := range dList { - selector, err := unversioned.LabelSelectorAsSelector(d.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(d.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid label selector: %v", err) } @@ -193,7 +193,7 @@ func (s *StoreToReplicaSetLister) GetPodReplicaSets(pod *v1.Pod) (rss []*extensi if rs.Namespace != pod.Namespace { continue } - selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid selector: %v", err) } diff --git a/pkg/client/cache/listers_test.go b/pkg/client/cache/listers_test.go index a904e89c842..3498e9942d8 100644 --- a/pkg/client/cache/listers_test.go +++ b/pkg/client/cache/listers_test.go @@ -20,7 +20,7 @@ import ( "testing" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/labels" @@ -303,7 +303,7 @@ func TestStoreToReplicaSetLister(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "basic", Namespace: "ns"}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "baz"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "baz"}}, }, }, }, @@ -342,13 +342,13 @@ func TestStoreToReplicaSetLister(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "foo"}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, { ObjectMeta: v1.ObjectMeta{Name: "bar", Namespace: "ns"}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, }, @@ -429,7 +429,7 @@ func TestStoreToDaemonSetLister(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "basic", Namespace: "ns"}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "baz"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "baz"}}, }, }, }, @@ -468,13 +468,13 @@ func TestStoreToDaemonSetLister(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "foo"}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, { ObjectMeta: v1.ObjectMeta{Name: "bar", Namespace: "ns"}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, }, diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index 3c5663daf50..87636162181 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/pkg/client/cache/listwatch_test.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" @@ -60,7 +60,7 @@ func buildLocation(resourcePath string, query url.Values) string { } func TestListWatchesCanList(t *testing.T) { - fieldSelectorQueryParamName := unversioned.FieldSelectorQueryParam(registered.GroupOrDie(v1.GroupName).GroupVersion.String()) + fieldSelectorQueryParamName := metav1.FieldSelectorQueryParam(registered.GroupOrDie(v1.GroupName).GroupVersion.String()) table := []struct { location string resource string @@ -110,7 +110,7 @@ func TestListWatchesCanList(t *testing.T) { } func TestListWatchesCanWatch(t *testing.T) { - fieldSelectorQueryParamName := unversioned.FieldSelectorQueryParam(registered.GroupOrDie(v1.GroupName).GroupVersion.String()) + fieldSelectorQueryParamName := metav1.FieldSelectorQueryParam(registered.GroupOrDie(v1.GroupName).GroupVersion.String()) table := []struct { rv string location string diff --git a/pkg/client/cache/reflector_test.go b/pkg/client/cache/reflector_test.go index eabe810a159..85230a7b948 100644 --- a/pkg/client/cache/reflector_test.go +++ b/pkg/client/cache/reflector_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/wait" @@ -54,7 +54,7 @@ func TestCloseWatchChannelOnError(t *testing.T) { return fw, nil }, ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "1"}}, nil + return &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "1"}}, nil }, } go r.ListAndWatch(wait.NeverStop) @@ -80,7 +80,7 @@ func TestRunUntil(t *testing.T) { return fw, nil }, ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "1"}}, nil + return &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "1"}}, nil }, } r.RunUntil(stopCh) @@ -228,7 +228,7 @@ func TestReflectorListAndWatch(t *testing.T) { return fw, nil }, ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "1"}}, nil + return &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "1"}}, nil }, } s := NewFIFO(MetaNamespaceKeyFunc) @@ -271,7 +271,7 @@ func TestReflectorListAndWatchWithErrors(t *testing.T) { return &v1.Pod{ObjectMeta: v1.ObjectMeta{Name: id, ResourceVersion: rv}} } mkList := func(rv string, pods ...*v1.Pod) *v1.PodList { - list := &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: rv}} + list := &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: rv}} for _, pod := range pods { list.Items = append(list.Items, *pod) } @@ -374,7 +374,7 @@ func TestReflectorResync(t *testing.T) { return fw, nil }, ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "0"}}, nil + return &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "0"}}, nil }, } resyncPeriod := 1 * time.Millisecond diff --git a/pkg/client/informers/informers_generated/apps/interface.go b/pkg/client/informers/informers_generated/apps/interface.go index 178125e6030..ade8b27d224 100644 --- a/pkg/client/informers/informers_generated/apps/interface.go +++ b/pkg/client/informers/informers_generated/apps/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package apps diff --git a/pkg/client/informers/informers_generated/apps/internalversion/interface.go b/pkg/client/informers/informers_generated/apps/internalversion/interface.go index 104032a9143..7d419651dc4 100644 --- a/pkg/client/informers/informers_generated/apps/internalversion/interface.go +++ b/pkg/client/informers/informers_generated/apps/internalversion/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go b/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go index ca8e71157ae..88c7074f978 100644 --- a/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go +++ b/pkg/client/informers/informers_generated/apps/internalversion/statefulset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/apps/v1beta1/interface.go b/pkg/client/informers/informers_generated/apps/v1beta1/interface.go index 27ffcf7516a..bb26f4358a1 100644 --- a/pkg/client/informers/informers_generated/apps/v1beta1/interface.go +++ b/pkg/client/informers/informers_generated/apps/v1beta1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go b/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go index 4457333b285..d7ec88fbee1 100644 --- a/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go +++ b/pkg/client/informers/informers_generated/apps/v1beta1/statefulset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/autoscaling/interface.go b/pkg/client/informers/informers_generated/autoscaling/interface.go index 47b093d66c6..846b209d214 100644 --- a/pkg/client/informers/informers_generated/autoscaling/interface.go +++ b/pkg/client/informers/informers_generated/autoscaling/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package autoscaling diff --git a/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go index a605e9c6596..e84f4544f82 100644 --- a/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go +++ b/pkg/client/informers/informers_generated/autoscaling/internalversion/horizontalpodautoscaler.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/autoscaling/internalversion/interface.go b/pkg/client/informers/informers_generated/autoscaling/internalversion/interface.go index d4ca48ca77d..6f1bb37d1fe 100644 --- a/pkg/client/informers/informers_generated/autoscaling/internalversion/interface.go +++ b/pkg/client/informers/informers_generated/autoscaling/internalversion/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go index d49bc9c94fa..64c9f25d85a 100644 --- a/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/informers/informers_generated/autoscaling/v1/horizontalpodautoscaler.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/autoscaling/v1/interface.go b/pkg/client/informers/informers_generated/autoscaling/v1/interface.go index dba74b65504..a63a69cdb0f 100644 --- a/pkg/client/informers/informers_generated/autoscaling/v1/interface.go +++ b/pkg/client/informers/informers_generated/autoscaling/v1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/batch/interface.go b/pkg/client/informers/informers_generated/batch/interface.go index 0dba0815c51..73b45d24621 100644 --- a/pkg/client/informers/informers_generated/batch/interface.go +++ b/pkg/client/informers/informers_generated/batch/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package batch diff --git a/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go b/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go index 77ba2c35be1..e1ecb2fe99a 100644 --- a/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go +++ b/pkg/client/informers/informers_generated/batch/internalversion/cronjob.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/batch/internalversion/interface.go b/pkg/client/informers/informers_generated/batch/internalversion/interface.go index 11034a83a48..b33c63ed842 100644 --- a/pkg/client/informers/informers_generated/batch/internalversion/interface.go +++ b/pkg/client/informers/informers_generated/batch/internalversion/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/batch/internalversion/job.go b/pkg/client/informers/informers_generated/batch/internalversion/job.go index 1768e431ecd..154ea316ed6 100644 --- a/pkg/client/informers/informers_generated/batch/internalversion/job.go +++ b/pkg/client/informers/informers_generated/batch/internalversion/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/batch/v1/interface.go b/pkg/client/informers/informers_generated/batch/v1/interface.go index 79251e3a308..fb7ac0483b4 100644 --- a/pkg/client/informers/informers_generated/batch/v1/interface.go +++ b/pkg/client/informers/informers_generated/batch/v1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/batch/v1/job.go b/pkg/client/informers/informers_generated/batch/v1/job.go index 3c15e97dd04..7a1dbfa61da 100644 --- a/pkg/client/informers/informers_generated/batch/v1/job.go +++ b/pkg/client/informers/informers_generated/batch/v1/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go b/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go index 01857695cb7..6901f606bb7 100644 --- a/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go +++ b/pkg/client/informers/informers_generated/batch/v2alpha1/cronjob.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v2alpha1 diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/interface.go b/pkg/client/informers/informers_generated/batch/v2alpha1/interface.go index 30175a5e8f5..f21a4ca7088 100644 --- a/pkg/client/informers/informers_generated/batch/v2alpha1/interface.go +++ b/pkg/client/informers/informers_generated/batch/v2alpha1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v2alpha1 diff --git a/pkg/client/informers/informers_generated/batch/v2alpha1/job.go b/pkg/client/informers/informers_generated/batch/v2alpha1/job.go index 8471d8e8941..5e8c3466fd0 100644 --- a/pkg/client/informers/informers_generated/batch/v2alpha1/job.go +++ b/pkg/client/informers/informers_generated/batch/v2alpha1/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v2alpha1 diff --git a/pkg/client/informers/informers_generated/certificates/interface.go b/pkg/client/informers/informers_generated/certificates/interface.go index ba7cf198ef3..53758738c30 100644 --- a/pkg/client/informers/informers_generated/certificates/interface.go +++ b/pkg/client/informers/informers_generated/certificates/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package certificates diff --git a/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go b/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go index 3daac2d7d5e..ae4640106e1 100644 --- a/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go +++ b/pkg/client/informers/informers_generated/certificates/internalversion/certificatesigningrequest.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/certificates/internalversion/interface.go b/pkg/client/informers/informers_generated/certificates/internalversion/interface.go index 08aa5e7bfd4..60a4d8350ab 100644 --- a/pkg/client/informers/informers_generated/certificates/internalversion/interface.go +++ b/pkg/client/informers/informers_generated/certificates/internalversion/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go b/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go index 5358ffd0dde..61a6111dc68 100644 --- a/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go +++ b/pkg/client/informers/informers_generated/certificates/v1alpha1/certificatesigningrequest.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1alpha1 diff --git a/pkg/client/informers/informers_generated/certificates/v1alpha1/interface.go b/pkg/client/informers/informers_generated/certificates/v1alpha1/interface.go index 04d53c536b8..8d21c5aaa37 100644 --- a/pkg/client/informers/informers_generated/certificates/v1alpha1/interface.go +++ b/pkg/client/informers/informers_generated/certificates/v1alpha1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1alpha1 diff --git a/pkg/client/informers/informers_generated/core/interface.go b/pkg/client/informers/informers_generated/core/interface.go index 884fd50af24..e7dfee7cc2f 100644 --- a/pkg/client/informers/informers_generated/core/interface.go +++ b/pkg/client/informers/informers_generated/core/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package core diff --git a/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go b/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go index 1ed9e515e92..2dc0cae5685 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go +++ b/pkg/client/informers/informers_generated/core/internalversion/componentstatus.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/configmap.go b/pkg/client/informers/informers_generated/core/internalversion/configmap.go index 2059e12d875..c4a12e2c93c 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/configmap.go +++ b/pkg/client/informers/informers_generated/core/internalversion/configmap.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/endpoints.go b/pkg/client/informers/informers_generated/core/internalversion/endpoints.go index d4b1d1c4a76..f6611d8067b 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/endpoints.go +++ b/pkg/client/informers/informers_generated/core/internalversion/endpoints.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/event.go b/pkg/client/informers/informers_generated/core/internalversion/event.go index 3df3aa51889..26f2a736368 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/event.go +++ b/pkg/client/informers/informers_generated/core/internalversion/event.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/interface.go b/pkg/client/informers/informers_generated/core/internalversion/interface.go index 26980d165db..168b9777e4d 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/interface.go +++ b/pkg/client/informers/informers_generated/core/internalversion/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/limitrange.go b/pkg/client/informers/informers_generated/core/internalversion/limitrange.go index 6e40087a7c1..e1eabc1f87f 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/limitrange.go +++ b/pkg/client/informers/informers_generated/core/internalversion/limitrange.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/namespace.go b/pkg/client/informers/informers_generated/core/internalversion/namespace.go index 3c49418f83d..060271e6029 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/namespace.go +++ b/pkg/client/informers/informers_generated/core/internalversion/namespace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/node.go b/pkg/client/informers/informers_generated/core/internalversion/node.go index 5effe7eb452..c92113a545a 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/node.go +++ b/pkg/client/informers/informers_generated/core/internalversion/node.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go b/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go index 5fabcc5e3e6..3d77b908eb9 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go +++ b/pkg/client/informers/informers_generated/core/internalversion/persistentvolume.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go b/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go index 0413e12b21c..68eb878b02c 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go +++ b/pkg/client/informers/informers_generated/core/internalversion/persistentvolumeclaim.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/pod.go b/pkg/client/informers/informers_generated/core/internalversion/pod.go index 0d0de0aa6b7..f4d35fc2880 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/pod.go +++ b/pkg/client/informers/informers_generated/core/internalversion/pod.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go b/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go index 9567b1ebfe8..6722cad1494 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go +++ b/pkg/client/informers/informers_generated/core/internalversion/podtemplate.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go b/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go index 7b4f8e3c4a7..3473db71a8c 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go +++ b/pkg/client/informers/informers_generated/core/internalversion/replicationcontroller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go b/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go index 8babaaa6d89..20400752231 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go +++ b/pkg/client/informers/informers_generated/core/internalversion/resourcequota.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/secret.go b/pkg/client/informers/informers_generated/core/internalversion/secret.go index 728fc334f3d..d68a77a232a 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/secret.go +++ b/pkg/client/informers/informers_generated/core/internalversion/secret.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/service.go b/pkg/client/informers/informers_generated/core/internalversion/service.go index 92432900a56..d9f4704f9b0 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/service.go +++ b/pkg/client/informers/informers_generated/core/internalversion/service.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go b/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go index adf71b010e6..5ea40cd2c7c 100644 --- a/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go +++ b/pkg/client/informers/informers_generated/core/internalversion/serviceaccount.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/core/v1/componentstatus.go b/pkg/client/informers/informers_generated/core/v1/componentstatus.go index 2d5df5bac0c..f760ef1f26b 100644 --- a/pkg/client/informers/informers_generated/core/v1/componentstatus.go +++ b/pkg/client/informers/informers_generated/core/v1/componentstatus.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/configmap.go b/pkg/client/informers/informers_generated/core/v1/configmap.go index cea2f5d1168..8de43d4f871 100644 --- a/pkg/client/informers/informers_generated/core/v1/configmap.go +++ b/pkg/client/informers/informers_generated/core/v1/configmap.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/endpoints.go b/pkg/client/informers/informers_generated/core/v1/endpoints.go index 38f8920ccde..a728c028502 100644 --- a/pkg/client/informers/informers_generated/core/v1/endpoints.go +++ b/pkg/client/informers/informers_generated/core/v1/endpoints.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/event.go b/pkg/client/informers/informers_generated/core/v1/event.go index f025f4cf065..8042680d0e3 100644 --- a/pkg/client/informers/informers_generated/core/v1/event.go +++ b/pkg/client/informers/informers_generated/core/v1/event.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/interface.go b/pkg/client/informers/informers_generated/core/v1/interface.go index 14934324599..3373f98c839 100644 --- a/pkg/client/informers/informers_generated/core/v1/interface.go +++ b/pkg/client/informers/informers_generated/core/v1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/limitrange.go b/pkg/client/informers/informers_generated/core/v1/limitrange.go index 502153c61d6..63705de48f4 100644 --- a/pkg/client/informers/informers_generated/core/v1/limitrange.go +++ b/pkg/client/informers/informers_generated/core/v1/limitrange.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/namespace.go b/pkg/client/informers/informers_generated/core/v1/namespace.go index 8c38ac1ee35..8ffece2fb3a 100644 --- a/pkg/client/informers/informers_generated/core/v1/namespace.go +++ b/pkg/client/informers/informers_generated/core/v1/namespace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/node.go b/pkg/client/informers/informers_generated/core/v1/node.go index 63102b32511..d389f041453 100644 --- a/pkg/client/informers/informers_generated/core/v1/node.go +++ b/pkg/client/informers/informers_generated/core/v1/node.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/persistentvolume.go b/pkg/client/informers/informers_generated/core/v1/persistentvolume.go index 372324715b9..47cb64b8d36 100644 --- a/pkg/client/informers/informers_generated/core/v1/persistentvolume.go +++ b/pkg/client/informers/informers_generated/core/v1/persistentvolume.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go b/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go index 8fa7dfcdc25..e6c77783e70 100644 --- a/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go +++ b/pkg/client/informers/informers_generated/core/v1/persistentvolumeclaim.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/pod.go b/pkg/client/informers/informers_generated/core/v1/pod.go index dda0544c032..d318deee40a 100644 --- a/pkg/client/informers/informers_generated/core/v1/pod.go +++ b/pkg/client/informers/informers_generated/core/v1/pod.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/podtemplate.go b/pkg/client/informers/informers_generated/core/v1/podtemplate.go index 7be84b2cfbe..baf1277861f 100644 --- a/pkg/client/informers/informers_generated/core/v1/podtemplate.go +++ b/pkg/client/informers/informers_generated/core/v1/podtemplate.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go b/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go index 91013773740..8cc31f2295e 100644 --- a/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go +++ b/pkg/client/informers/informers_generated/core/v1/replicationcontroller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/resourcequota.go b/pkg/client/informers/informers_generated/core/v1/resourcequota.go index bb24c6cac04..3900bc32be8 100644 --- a/pkg/client/informers/informers_generated/core/v1/resourcequota.go +++ b/pkg/client/informers/informers_generated/core/v1/resourcequota.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/secret.go b/pkg/client/informers/informers_generated/core/v1/secret.go index f4828db9bb6..5910e252566 100644 --- a/pkg/client/informers/informers_generated/core/v1/secret.go +++ b/pkg/client/informers/informers_generated/core/v1/secret.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/service.go b/pkg/client/informers/informers_generated/core/v1/service.go index 128f8af497d..b48155ec563 100644 --- a/pkg/client/informers/informers_generated/core/v1/service.go +++ b/pkg/client/informers/informers_generated/core/v1/service.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/core/v1/serviceaccount.go b/pkg/client/informers/informers_generated/core/v1/serviceaccount.go index 9138a8de508..fc5f976521c 100644 --- a/pkg/client/informers/informers_generated/core/v1/serviceaccount.go +++ b/pkg/client/informers/informers_generated/core/v1/serviceaccount.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1 diff --git a/pkg/client/informers/informers_generated/extensions/interface.go b/pkg/client/informers/informers_generated/extensions/interface.go index a3591be1cae..94a347a357b 100644 --- a/pkg/client/informers/informers_generated/extensions/interface.go +++ b/pkg/client/informers/informers_generated/extensions/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package extensions diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go b/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go index 015630951c2..7c05fbe1487 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go +++ b/pkg/client/informers/informers_generated/extensions/internalversion/daemonset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go b/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go index 2f1f17b5038..d56d03fb5ea 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go +++ b/pkg/client/informers/informers_generated/extensions/internalversion/deployment.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go b/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go index 41ebe328474..e86f408bb75 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go +++ b/pkg/client/informers/informers_generated/extensions/internalversion/ingress.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/interface.go b/pkg/client/informers/informers_generated/extensions/internalversion/interface.go index 5c881330a86..9fa3628edbd 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/interface.go +++ b/pkg/client/informers/informers_generated/extensions/internalversion/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go b/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go index 817fef19513..ced27d1f697 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go +++ b/pkg/client/informers/informers_generated/extensions/internalversion/networkpolicy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go b/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go index 048c640349c..d2df7a07429 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go +++ b/pkg/client/informers/informers_generated/extensions/internalversion/podsecuritypolicy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go b/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go index 2d138bd34b0..dc949545399 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go +++ b/pkg/client/informers/informers_generated/extensions/internalversion/replicaset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go b/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go index d52de0d51ea..21b277a9e80 100644 --- a/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go +++ b/pkg/client/informers/informers_generated/extensions/internalversion/thirdpartyresource.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go b/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go index 4bdbe101b1e..46ae573a03b 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/daemonset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go b/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go index 1a0bdac617e..97b964d1e77 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/deployment.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go b/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go index c3defb1ebfe..dee4c9f4e28 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/ingress.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/interface.go b/pkg/client/informers/informers_generated/extensions/v1beta1/interface.go index c89a3919116..7e6a5851703 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/interface.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/job.go b/pkg/client/informers/informers_generated/extensions/v1beta1/job.go index 489f03eb19e..92d518051bf 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/job.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go index 69ead97fa02..bba64d303b6 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/podsecuritypolicy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go b/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go index 2b41098a529..1160388d610 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/replicaset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go b/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go index 49b11155064..15a6eb2fc1d 100644 --- a/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/informers/informers_generated/extensions/v1beta1/thirdpartyresource.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/factory.go b/pkg/client/informers/informers_generated/factory.go index b5a17f79c6f..2c2124f72f2 100644 --- a/pkg/client/informers/informers_generated/factory.go +++ b/pkg/client/informers/informers_generated/factory.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package informers_generated diff --git a/pkg/client/informers/informers_generated/generic.go b/pkg/client/informers/informers_generated/generic.go index b1b73ea8e91..8a8b188a022 100644 --- a/pkg/client/informers/informers_generated/generic.go +++ b/pkg/client/informers/informers_generated/generic.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package informers_generated diff --git a/pkg/client/informers/informers_generated/policy/interface.go b/pkg/client/informers/informers_generated/policy/interface.go index a48bcc4beda..a0136cde1df 100644 --- a/pkg/client/informers/informers_generated/policy/interface.go +++ b/pkg/client/informers/informers_generated/policy/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package policy diff --git a/pkg/client/informers/informers_generated/policy/internalversion/interface.go b/pkg/client/informers/informers_generated/policy/internalversion/interface.go index 9eed68fc31c..0f20dc853be 100644 --- a/pkg/client/informers/informers_generated/policy/internalversion/interface.go +++ b/pkg/client/informers/informers_generated/policy/internalversion/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go b/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go index b4106ce4962..38a9ad6ce6e 100644 --- a/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go +++ b/pkg/client/informers/informers_generated/policy/internalversion/poddisruptionbudget.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/policy/v1beta1/interface.go b/pkg/client/informers/informers_generated/policy/v1beta1/interface.go index 550b4bff11d..ce008b41a7b 100644 --- a/pkg/client/informers/informers_generated/policy/v1beta1/interface.go +++ b/pkg/client/informers/informers_generated/policy/v1beta1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go b/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go index f6b96c91a44..6d427ac30e2 100644 --- a/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go +++ b/pkg/client/informers/informers_generated/policy/v1beta1/poddisruptionbudget.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/rbac/interface.go b/pkg/client/informers/informers_generated/rbac/interface.go index be6cb588213..1ca853fef53 100644 --- a/pkg/client/informers/informers_generated/rbac/interface.go +++ b/pkg/client/informers/informers_generated/rbac/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package rbac diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go index cf818a706ae..69825b2fa5f 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go +++ b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrole.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go index 0fcc416d980..4747d51a3e4 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go +++ b/pkg/client/informers/informers_generated/rbac/internalversion/clusterrolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/interface.go b/pkg/client/informers/informers_generated/rbac/internalversion/interface.go index 33a15a5debb..78d8f5b2b6a 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/interface.go +++ b/pkg/client/informers/informers_generated/rbac/internalversion/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/role.go b/pkg/client/informers/informers_generated/rbac/internalversion/role.go index c0e3980dbd0..71c8b7a8c48 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/role.go +++ b/pkg/client/informers/informers_generated/rbac/internalversion/role.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go b/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go index dc7aec4c2c1..ecb903fa08c 100644 --- a/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go +++ b/pkg/client/informers/informers_generated/rbac/internalversion/rolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go index 4fede30633a..4c3b2729394 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrole.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1alpha1 diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go index 232f3143ea8..afad92fdcca 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/clusterrolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1alpha1 diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/interface.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/interface.go index 002b00de6e8..8ad54db3a69 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/interface.go +++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1alpha1 diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go index d33d70f4a93..e9279f5bc13 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go +++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/role.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1alpha1 diff --git a/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go b/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go index 83dd5e67e79..74b8c19dc7d 100644 --- a/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/informers/informers_generated/rbac/v1alpha1/rolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1alpha1 diff --git a/pkg/client/informers/informers_generated/storage/interface.go b/pkg/client/informers/informers_generated/storage/interface.go index 79d2d0f2fd0..49255248107 100644 --- a/pkg/client/informers/informers_generated/storage/interface.go +++ b/pkg/client/informers/informers_generated/storage/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package storage diff --git a/pkg/client/informers/informers_generated/storage/internalversion/interface.go b/pkg/client/informers/informers_generated/storage/internalversion/interface.go index 269b89c2c8c..6233eedb709 100644 --- a/pkg/client/informers/informers_generated/storage/internalversion/interface.go +++ b/pkg/client/informers/informers_generated/storage/internalversion/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go b/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go index a8680d0504e..8bb75b99c1e 100644 --- a/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go +++ b/pkg/client/informers/informers_generated/storage/internalversion/storageclass.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package internalversion diff --git a/pkg/client/informers/informers_generated/storage/v1beta1/interface.go b/pkg/client/informers/informers_generated/storage/v1beta1/interface.go index 442662cbafb..550a5139f18 100644 --- a/pkg/client/informers/informers_generated/storage/v1beta1/interface.go +++ b/pkg/client/informers/informers_generated/storage/v1beta1/interface.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go b/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go index 60d245bee23..bc0d9c4dd4a 100644 --- a/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go +++ b/pkg/client/informers/informers_generated/storage/v1beta1/storageclass.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 +// This file was automatically generated by informer-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] --internal-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset --listers-package=k8s.io/kubernetes/pkg/client/listers --versioned-clientset-package=k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5 package v1beta1 diff --git a/pkg/client/leaderelection/BUILD b/pkg/client/leaderelection/BUILD index 8ceffa3df0c..4cd67507c9d 100644 --- a/pkg/client/leaderelection/BUILD +++ b/pkg/client/leaderelection/BUILD @@ -16,8 +16,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/componentconfig:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/util/runtime:go_default_library", "//pkg/util/wait:go_default_library", @@ -33,8 +33,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/leaderelection/resourcelock:go_default_library", "//pkg/client/record:go_default_library", diff --git a/pkg/client/leaderelection/leaderelection.go b/pkg/client/leaderelection/leaderelection.go index a5c752dc8c9..81bdf0119ae 100644 --- a/pkg/client/leaderelection/leaderelection.go +++ b/pkg/client/leaderelection/leaderelection.go @@ -54,7 +54,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" rl "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/util/runtime" @@ -213,7 +213,7 @@ func (le *LeaderElector) renew() { // else it tries to renew the lease if it has already been acquired. Returns true // on success else returns false. func (le *LeaderElector) tryAcquireOrRenew() bool { - now := unversioned.Now() + now := metav1.Now() leaderElectionRecord := rl.LeaderElectionRecord{ HolderIdentity: le.config.Lock.Identity(), LeaseDurationSeconds: int(le.config.LeaseDuration / time.Second), @@ -279,9 +279,9 @@ func (l *LeaderElector) maybeReportTransition() { func DefaultLeaderElectionConfiguration() componentconfig.LeaderElectionConfiguration { return componentconfig.LeaderElectionConfiguration{ LeaderElect: false, - LeaseDuration: unversioned.Duration{Duration: DefaultLeaseDuration}, - RenewDeadline: unversioned.Duration{Duration: DefaultRenewDeadline}, - RetryPeriod: unversioned.Duration{Duration: DefaultRetryPeriod}, + LeaseDuration: metav1.Duration{Duration: DefaultLeaseDuration}, + RenewDeadline: metav1.Duration{Duration: DefaultRenewDeadline}, + RetryPeriod: metav1.Duration{Duration: DefaultRetryPeriod}, } } diff --git a/pkg/client/leaderelection/leaderelection_test.go b/pkg/client/leaderelection/leaderelection_test.go index 422b9179da8..1a5908d8aa9 100644 --- a/pkg/client/leaderelection/leaderelection_test.go +++ b/pkg/client/leaderelection/leaderelection_test.go @@ -27,7 +27,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" rl "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" @@ -242,8 +242,8 @@ func TestTryAcquireOrRenew(t *testing.T) { t.Errorf("[%v]unexpected result of tryAcquireOrRenew: [succeded=%v]", i, !test.expectSuccess) } - le.observedRecord.AcquireTime = unversioned.Time{} - le.observedRecord.RenewTime = unversioned.Time{} + le.observedRecord.AcquireTime = metav1.Time{} + le.observedRecord.RenewTime = metav1.Time{} if le.observedRecord.HolderIdentity != test.outHolder { t.Errorf("[%v]expected holder:\n\t%+v\ngot:\n\t%+v", i, test.outHolder, le.observedRecord.HolderIdentity) } diff --git a/pkg/client/leaderelection/resourcelock/BUILD b/pkg/client/leaderelection/resourcelock/BUILD index 3e1077b516f..058a2d7c492 100644 --- a/pkg/client/leaderelection/resourcelock/BUILD +++ b/pkg/client/leaderelection/resourcelock/BUILD @@ -18,8 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/record:go_default_library", ], diff --git a/pkg/client/leaderelection/resourcelock/interface.go b/pkg/client/leaderelection/resourcelock/interface.go index 8bf97c5caf6..eccfb339e7f 100644 --- a/pkg/client/leaderelection/resourcelock/interface.go +++ b/pkg/client/leaderelection/resourcelock/interface.go @@ -17,7 +17,7 @@ limitations under the License. package resourcelock import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" ) @@ -32,8 +32,8 @@ const ( type LeaderElectionRecord struct { HolderIdentity string `json:"holderIdentity"` LeaseDurationSeconds int `json:"leaseDurationSeconds"` - AcquireTime unversioned.Time `json:"acquireTime"` - RenewTime unversioned.Time `json:"renewTime"` + AcquireTime metav1.Time `json:"acquireTime"` + RenewTime metav1.Time `json:"renewTime"` LeaderTransitions int `json:"leaderTransitions"` } diff --git a/pkg/client/listers/apps/internalversion/expansion_generated.go b/pkg/client/listers/apps/internalversion/expansion_generated.go index 1966973aaf8..84f9d48fbf7 100644 --- a/pkg/client/listers/apps/internalversion/expansion_generated.go +++ b/pkg/client/listers/apps/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/apps/internalversion/statefulset.go b/pkg/client/listers/apps/internalversion/statefulset.go index 3b80ebdd019..1faac8177a3 100644 --- a/pkg/client/listers/apps/internalversion/statefulset.go +++ b/pkg/client/listers/apps/internalversion/statefulset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/apps/v1beta1/expansion_generated.go b/pkg/client/listers/apps/v1beta1/expansion_generated.go index 19807bcc8fa..cd807fd4ef2 100644 --- a/pkg/client/listers/apps/v1beta1/expansion_generated.go +++ b/pkg/client/listers/apps/v1beta1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/apps/v1beta1/statefulset.go b/pkg/client/listers/apps/v1beta1/statefulset.go index 8102da4fe8d..f1af671fb82 100644 --- a/pkg/client/listers/apps/v1beta1/statefulset.go +++ b/pkg/client/listers/apps/v1beta1/statefulset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/authentication/internalversion/expansion_generated.go b/pkg/client/listers/authentication/internalversion/expansion_generated.go index 07467692987..85627061f85 100644 --- a/pkg/client/listers/authentication/internalversion/expansion_generated.go +++ b/pkg/client/listers/authentication/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/authentication/internalversion/tokenreview.go b/pkg/client/listers/authentication/internalversion/tokenreview.go index db0a798f6f9..4ca5d533363 100644 --- a/pkg/client/listers/authentication/internalversion/tokenreview.go +++ b/pkg/client/listers/authentication/internalversion/tokenreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/authentication/v1beta1/expansion_generated.go b/pkg/client/listers/authentication/v1beta1/expansion_generated.go index e767592edc5..91d2d511416 100644 --- a/pkg/client/listers/authentication/v1beta1/expansion_generated.go +++ b/pkg/client/listers/authentication/v1beta1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/authentication/v1beta1/tokenreview.go b/pkg/client/listers/authentication/v1beta1/tokenreview.go index 7a399c6e956..1ec32bbbd1a 100644 --- a/pkg/client/listers/authentication/v1beta1/tokenreview.go +++ b/pkg/client/listers/authentication/v1beta1/tokenreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/authorization/internalversion/expansion_generated.go b/pkg/client/listers/authorization/internalversion/expansion_generated.go index 3f3822cb70a..7bf38d8ba01 100644 --- a/pkg/client/listers/authorization/internalversion/expansion_generated.go +++ b/pkg/client/listers/authorization/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/authorization/internalversion/localsubjectaccessreview.go b/pkg/client/listers/authorization/internalversion/localsubjectaccessreview.go index 20a74eadd14..0e308fb7222 100644 --- a/pkg/client/listers/authorization/internalversion/localsubjectaccessreview.go +++ b/pkg/client/listers/authorization/internalversion/localsubjectaccessreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go b/pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go index 7c6d7a088fa..4d88f45f440 100644 --- a/pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go +++ b/pkg/client/listers/authorization/internalversion/selfsubjectaccessreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/authorization/internalversion/subjectaccessreview.go b/pkg/client/listers/authorization/internalversion/subjectaccessreview.go index e7c59143394..aecaac08f90 100644 --- a/pkg/client/listers/authorization/internalversion/subjectaccessreview.go +++ b/pkg/client/listers/authorization/internalversion/subjectaccessreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/authorization/v1beta1/expansion_generated.go b/pkg/client/listers/authorization/v1beta1/expansion_generated.go index a5c226e85e0..3442a71164c 100644 --- a/pkg/client/listers/authorization/v1beta1/expansion_generated.go +++ b/pkg/client/listers/authorization/v1beta1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go index 9d799e85f4d..ed3103faeca 100644 --- a/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go +++ b/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go index ecd1cd8bcd8..b8e02237c9d 100644 --- a/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go +++ b/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go index a9511568137..7dc965039a6 100644 --- a/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go +++ b/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/autoscaling/internalversion/expansion_generated.go b/pkg/client/listers/autoscaling/internalversion/expansion_generated.go index 027effe3209..a46672953e9 100644 --- a/pkg/client/listers/autoscaling/internalversion/expansion_generated.go +++ b/pkg/client/listers/autoscaling/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/autoscaling/internalversion/horizontalpodautoscaler.go b/pkg/client/listers/autoscaling/internalversion/horizontalpodautoscaler.go index 4b73982d6e0..a1e41e7557f 100644 --- a/pkg/client/listers/autoscaling/internalversion/horizontalpodautoscaler.go +++ b/pkg/client/listers/autoscaling/internalversion/horizontalpodautoscaler.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/autoscaling/v1/expansion_generated.go b/pkg/client/listers/autoscaling/v1/expansion_generated.go index 60a34c19231..397078b7bc7 100644 --- a/pkg/client/listers/autoscaling/v1/expansion_generated.go +++ b/pkg/client/listers/autoscaling/v1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go index a6c7e3f0c84..16d23603cdb 100644 --- a/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/batch/internalversion/BUILD b/pkg/client/listers/batch/internalversion/BUILD index 364fe5de720..ba1acd18609 100644 --- a/pkg/client/listers/batch/internalversion/BUILD +++ b/pkg/client/listers/batch/internalversion/BUILD @@ -22,8 +22,8 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", ], @@ -36,8 +36,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", "//pkg/util/sets:go_default_library", diff --git a/pkg/client/listers/batch/internalversion/cronjob.go b/pkg/client/listers/batch/internalversion/cronjob.go index 0d085d874c2..8964fb9c18b 100644 --- a/pkg/client/listers/batch/internalversion/cronjob.go +++ b/pkg/client/listers/batch/internalversion/cronjob.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/batch/internalversion/expansion_generated.go b/pkg/client/listers/batch/internalversion/expansion_generated.go index 8c5401f2003..47c73cfbdc0 100644 --- a/pkg/client/listers/batch/internalversion/expansion_generated.go +++ b/pkg/client/listers/batch/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/batch/internalversion/job.go b/pkg/client/listers/batch/internalversion/job.go index 49e02f8ae68..85c537dd9c8 100644 --- a/pkg/client/listers/batch/internalversion/job.go +++ b/pkg/client/listers/batch/internalversion/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/batch/internalversion/job_expansion.go b/pkg/client/listers/batch/internalversion/job_expansion.go index e73ce519219..646aa66cd5b 100644 --- a/pkg/client/listers/batch/internalversion/job_expansion.go +++ b/pkg/client/listers/batch/internalversion/job_expansion.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/labels" ) @@ -47,7 +47,7 @@ func (l *jobLister) GetPodJobs(pod *api.Pod) (jobs []batch.Job, err error) { return } for _, job := range list { - selector, _ := unversioned.LabelSelectorAsSelector(job.Spec.Selector) + selector, _ := metav1.LabelSelectorAsSelector(job.Spec.Selector) if !selector.Matches(labels.Set(pod.Labels)) { continue } diff --git a/pkg/client/listers/batch/internalversion/job_test.go b/pkg/client/listers/batch/internalversion/job_test.go index f0d99b3184b..abefa6f9c02 100644 --- a/pkg/client/listers/batch/internalversion/job_test.go +++ b/pkg/client/listers/batch/internalversion/job_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" @@ -69,7 +69,7 @@ func TestJobLister(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "basic", Namespace: "ns"}, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "baz"}, }, }, @@ -122,7 +122,7 @@ func TestJobLister(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "foo"}, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar"}, }, }, @@ -130,7 +130,7 @@ func TestJobLister(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "bar", Namespace: "ns"}, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar"}, }, }, @@ -160,7 +160,7 @@ func TestJobLister(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "foo"}, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar"}, }, }, @@ -168,7 +168,7 @@ func TestJobLister(t *testing.T) { { ObjectMeta: api.ObjectMeta{Name: "bar", Namespace: "bar"}, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar"}, }, }, diff --git a/pkg/client/listers/batch/v1/BUILD b/pkg/client/listers/batch/v1/BUILD index 77698b69e4f..90744510e91 100644 --- a/pkg/client/listers/batch/v1/BUILD +++ b/pkg/client/listers/batch/v1/BUILD @@ -20,10 +20,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/labels:go_default_library", ], diff --git a/pkg/client/listers/batch/v1/expansion_generated.go b/pkg/client/listers/batch/v1/expansion_generated.go index c9652cbfe9a..b2fdf5eabd1 100644 --- a/pkg/client/listers/batch/v1/expansion_generated.go +++ b/pkg/client/listers/batch/v1/expansion_generated.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/batch/v1/job.go b/pkg/client/listers/batch/v1/job.go index dc8d4ae7bef..1858b72a0ae 100644 --- a/pkg/client/listers/batch/v1/job.go +++ b/pkg/client/listers/batch/v1/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/batch/v1/job_expansion.go b/pkg/client/listers/batch/v1/job_expansion.go index cfded28c34a..51d2a457794 100644 --- a/pkg/client/listers/batch/v1/job_expansion.go +++ b/pkg/client/listers/batch/v1/job_expansion.go @@ -19,7 +19,7 @@ package v1 import ( "fmt" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/labels" @@ -47,7 +47,7 @@ func (l *jobLister) GetPodJobs(pod *v1.Pod) (jobs []batch.Job, err error) { return } for _, job := range list { - selector, _ := unversioned.LabelSelectorAsSelector(job.Spec.Selector) + selector, _ := metav1.LabelSelectorAsSelector(job.Spec.Selector) if !selector.Matches(labels.Set(pod.Labels)) { continue } diff --git a/pkg/client/listers/batch/v2alpha1/cronjob.go b/pkg/client/listers/batch/v2alpha1/cronjob.go index c3feb8978c1..da0fd213381 100644 --- a/pkg/client/listers/batch/v2alpha1/cronjob.go +++ b/pkg/client/listers/batch/v2alpha1/cronjob.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v2alpha1 diff --git a/pkg/client/listers/batch/v2alpha1/expansion_generated.go b/pkg/client/listers/batch/v2alpha1/expansion_generated.go index 338a6499358..be007e8c33d 100644 --- a/pkg/client/listers/batch/v2alpha1/expansion_generated.go +++ b/pkg/client/listers/batch/v2alpha1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v2alpha1 diff --git a/pkg/client/listers/batch/v2alpha1/job.go b/pkg/client/listers/batch/v2alpha1/job.go index a66e5632d47..3cf48cd0a40 100644 --- a/pkg/client/listers/batch/v2alpha1/job.go +++ b/pkg/client/listers/batch/v2alpha1/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v2alpha1 diff --git a/pkg/client/listers/certificates/internalversion/certificatesigningrequest.go b/pkg/client/listers/certificates/internalversion/certificatesigningrequest.go index 72ff6635608..d6089185d61 100644 --- a/pkg/client/listers/certificates/internalversion/certificatesigningrequest.go +++ b/pkg/client/listers/certificates/internalversion/certificatesigningrequest.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/certificates/internalversion/expansion_generated.go b/pkg/client/listers/certificates/internalversion/expansion_generated.go index 1b28f5c34c4..7d4641ce96b 100644 --- a/pkg/client/listers/certificates/internalversion/expansion_generated.go +++ b/pkg/client/listers/certificates/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/certificates/v1alpha1/certificatesigningrequest.go b/pkg/client/listers/certificates/v1alpha1/certificatesigningrequest.go index ffc58abab26..f1716065f24 100644 --- a/pkg/client/listers/certificates/v1alpha1/certificatesigningrequest.go +++ b/pkg/client/listers/certificates/v1alpha1/certificatesigningrequest.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/certificates/v1alpha1/expansion_generated.go b/pkg/client/listers/certificates/v1alpha1/expansion_generated.go index dfbd823c4bf..8a0bc7421cc 100644 --- a/pkg/client/listers/certificates/v1alpha1/expansion_generated.go +++ b/pkg/client/listers/certificates/v1alpha1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/core/internalversion/componentstatus.go b/pkg/client/listers/core/internalversion/componentstatus.go index 711cba1e757..a0d0d7c1825 100644 --- a/pkg/client/listers/core/internalversion/componentstatus.go +++ b/pkg/client/listers/core/internalversion/componentstatus.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/configmap.go b/pkg/client/listers/core/internalversion/configmap.go index 6de8d43ccf1..e4154d2816e 100644 --- a/pkg/client/listers/core/internalversion/configmap.go +++ b/pkg/client/listers/core/internalversion/configmap.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/endpoints.go b/pkg/client/listers/core/internalversion/endpoints.go index 881b4873c6b..ce7e75292f4 100644 --- a/pkg/client/listers/core/internalversion/endpoints.go +++ b/pkg/client/listers/core/internalversion/endpoints.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/event.go b/pkg/client/listers/core/internalversion/event.go index b1ec8289b77..2986f569e5a 100644 --- a/pkg/client/listers/core/internalversion/event.go +++ b/pkg/client/listers/core/internalversion/event.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/expansion_generated.go b/pkg/client/listers/core/internalversion/expansion_generated.go index 0fa7a1efeef..445938d6a0f 100644 --- a/pkg/client/listers/core/internalversion/expansion_generated.go +++ b/pkg/client/listers/core/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/limitrange.go b/pkg/client/listers/core/internalversion/limitrange.go index 60868afec07..cc9641eebd3 100644 --- a/pkg/client/listers/core/internalversion/limitrange.go +++ b/pkg/client/listers/core/internalversion/limitrange.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/namespace.go b/pkg/client/listers/core/internalversion/namespace.go index 9fe35bbbe6e..e1ac65d7a42 100644 --- a/pkg/client/listers/core/internalversion/namespace.go +++ b/pkg/client/listers/core/internalversion/namespace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/node.go b/pkg/client/listers/core/internalversion/node.go index a0289ad1392..d8e355144fd 100644 --- a/pkg/client/listers/core/internalversion/node.go +++ b/pkg/client/listers/core/internalversion/node.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/persistentvolume.go b/pkg/client/listers/core/internalversion/persistentvolume.go index 2aca397e4f9..c7f50d666f9 100644 --- a/pkg/client/listers/core/internalversion/persistentvolume.go +++ b/pkg/client/listers/core/internalversion/persistentvolume.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/persistentvolumeclaim.go b/pkg/client/listers/core/internalversion/persistentvolumeclaim.go index b46fdc2912e..fd52978d2cc 100644 --- a/pkg/client/listers/core/internalversion/persistentvolumeclaim.go +++ b/pkg/client/listers/core/internalversion/persistentvolumeclaim.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/pod.go b/pkg/client/listers/core/internalversion/pod.go index b5fd25cff07..7879c32b3b6 100644 --- a/pkg/client/listers/core/internalversion/pod.go +++ b/pkg/client/listers/core/internalversion/pod.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/podtemplate.go b/pkg/client/listers/core/internalversion/podtemplate.go index 1a0091f1c02..7e1f5e8510f 100644 --- a/pkg/client/listers/core/internalversion/podtemplate.go +++ b/pkg/client/listers/core/internalversion/podtemplate.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/replicationcontroller.go b/pkg/client/listers/core/internalversion/replicationcontroller.go index c9b475bd14c..21f591d6bab 100644 --- a/pkg/client/listers/core/internalversion/replicationcontroller.go +++ b/pkg/client/listers/core/internalversion/replicationcontroller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/resourcequota.go b/pkg/client/listers/core/internalversion/resourcequota.go index 3d6ed077c67..b4ca20a788a 100644 --- a/pkg/client/listers/core/internalversion/resourcequota.go +++ b/pkg/client/listers/core/internalversion/resourcequota.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/secret.go b/pkg/client/listers/core/internalversion/secret.go index cc6563fbabd..9c66872f4e0 100644 --- a/pkg/client/listers/core/internalversion/secret.go +++ b/pkg/client/listers/core/internalversion/secret.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/service.go b/pkg/client/listers/core/internalversion/service.go index 2c0e69408e1..9190d6579c3 100644 --- a/pkg/client/listers/core/internalversion/service.go +++ b/pkg/client/listers/core/internalversion/service.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/internalversion/serviceaccount.go b/pkg/client/listers/core/internalversion/serviceaccount.go index 91c700d1381..7aa3b1b85ff 100644 --- a/pkg/client/listers/core/internalversion/serviceaccount.go +++ b/pkg/client/listers/core/internalversion/serviceaccount.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/core/v1/componentstatus.go b/pkg/client/listers/core/v1/componentstatus.go index 02e656aaacf..5db8c0a01e4 100644 --- a/pkg/client/listers/core/v1/componentstatus.go +++ b/pkg/client/listers/core/v1/componentstatus.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/configmap.go b/pkg/client/listers/core/v1/configmap.go index 343ecb32c23..72c824c291a 100644 --- a/pkg/client/listers/core/v1/configmap.go +++ b/pkg/client/listers/core/v1/configmap.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/endpoints.go b/pkg/client/listers/core/v1/endpoints.go index f19326eed07..513d3c05e89 100644 --- a/pkg/client/listers/core/v1/endpoints.go +++ b/pkg/client/listers/core/v1/endpoints.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/event.go b/pkg/client/listers/core/v1/event.go index 93a5b4959d3..edb3f14e83c 100644 --- a/pkg/client/listers/core/v1/event.go +++ b/pkg/client/listers/core/v1/event.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/expansion_generated.go b/pkg/client/listers/core/v1/expansion_generated.go index fa8b872e3cb..ead1bd51a97 100644 --- a/pkg/client/listers/core/v1/expansion_generated.go +++ b/pkg/client/listers/core/v1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/limitrange.go b/pkg/client/listers/core/v1/limitrange.go index fa1e3582fcc..398c5ed9428 100644 --- a/pkg/client/listers/core/v1/limitrange.go +++ b/pkg/client/listers/core/v1/limitrange.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/namespace.go b/pkg/client/listers/core/v1/namespace.go index 85fbc985ce2..df049bd44ea 100644 --- a/pkg/client/listers/core/v1/namespace.go +++ b/pkg/client/listers/core/v1/namespace.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/node.go b/pkg/client/listers/core/v1/node.go index 85bb71fecd7..b5c5a63f194 100644 --- a/pkg/client/listers/core/v1/node.go +++ b/pkg/client/listers/core/v1/node.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/persistentvolume.go b/pkg/client/listers/core/v1/persistentvolume.go index 3a1e63bd56c..43a791d8f6d 100644 --- a/pkg/client/listers/core/v1/persistentvolume.go +++ b/pkg/client/listers/core/v1/persistentvolume.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/persistentvolumeclaim.go b/pkg/client/listers/core/v1/persistentvolumeclaim.go index 08fc4928b1c..644027927b2 100644 --- a/pkg/client/listers/core/v1/persistentvolumeclaim.go +++ b/pkg/client/listers/core/v1/persistentvolumeclaim.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/pod.go b/pkg/client/listers/core/v1/pod.go index 34c387a6c66..9a7193f1012 100644 --- a/pkg/client/listers/core/v1/pod.go +++ b/pkg/client/listers/core/v1/pod.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/podtemplate.go b/pkg/client/listers/core/v1/podtemplate.go index 8583b26ad19..6f21e338a37 100644 --- a/pkg/client/listers/core/v1/podtemplate.go +++ b/pkg/client/listers/core/v1/podtemplate.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/replicationcontroller.go b/pkg/client/listers/core/v1/replicationcontroller.go index 83c8e7b0d17..750654fa9ff 100644 --- a/pkg/client/listers/core/v1/replicationcontroller.go +++ b/pkg/client/listers/core/v1/replicationcontroller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/resourcequota.go b/pkg/client/listers/core/v1/resourcequota.go index a0f34d1540a..dfb64ddf813 100644 --- a/pkg/client/listers/core/v1/resourcequota.go +++ b/pkg/client/listers/core/v1/resourcequota.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/secret.go b/pkg/client/listers/core/v1/secret.go index c57872538ec..552da7d724f 100644 --- a/pkg/client/listers/core/v1/secret.go +++ b/pkg/client/listers/core/v1/secret.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/service.go b/pkg/client/listers/core/v1/service.go index 77e8795a459..eb0ed562d96 100644 --- a/pkg/client/listers/core/v1/service.go +++ b/pkg/client/listers/core/v1/service.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/core/v1/serviceaccount.go b/pkg/client/listers/core/v1/serviceaccount.go index 5128b089a26..de8b91cc450 100644 --- a/pkg/client/listers/core/v1/serviceaccount.go +++ b/pkg/client/listers/core/v1/serviceaccount.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1 diff --git a/pkg/client/listers/extensions/internalversion/daemonset.go b/pkg/client/listers/extensions/internalversion/daemonset.go index 9911980bdf4..19828519252 100644 --- a/pkg/client/listers/extensions/internalversion/daemonset.go +++ b/pkg/client/listers/extensions/internalversion/daemonset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/extensions/internalversion/deployment.go b/pkg/client/listers/extensions/internalversion/deployment.go index fff232a4a71..5efd5051a05 100644 --- a/pkg/client/listers/extensions/internalversion/deployment.go +++ b/pkg/client/listers/extensions/internalversion/deployment.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/extensions/internalversion/expansion_generated.go b/pkg/client/listers/extensions/internalversion/expansion_generated.go index 35565e2a28c..b5572d7fffa 100644 --- a/pkg/client/listers/extensions/internalversion/expansion_generated.go +++ b/pkg/client/listers/extensions/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/extensions/internalversion/ingress.go b/pkg/client/listers/extensions/internalversion/ingress.go index c71fd3fe212..43a9f55f478 100644 --- a/pkg/client/listers/extensions/internalversion/ingress.go +++ b/pkg/client/listers/extensions/internalversion/ingress.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/extensions/internalversion/networkpolicy.go b/pkg/client/listers/extensions/internalversion/networkpolicy.go index bf81b258710..b0bb615333a 100644 --- a/pkg/client/listers/extensions/internalversion/networkpolicy.go +++ b/pkg/client/listers/extensions/internalversion/networkpolicy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go b/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go index 894ad8c5aef..7131a6184bd 100644 --- a/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go +++ b/pkg/client/listers/extensions/internalversion/podsecuritypolicy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/extensions/internalversion/replicaset.go b/pkg/client/listers/extensions/internalversion/replicaset.go index be321f90658..2d1940188d0 100644 --- a/pkg/client/listers/extensions/internalversion/replicaset.go +++ b/pkg/client/listers/extensions/internalversion/replicaset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/extensions/internalversion/scale.go b/pkg/client/listers/extensions/internalversion/scale.go index 61b6cafff80..31f125467d7 100644 --- a/pkg/client/listers/extensions/internalversion/scale.go +++ b/pkg/client/listers/extensions/internalversion/scale.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/extensions/internalversion/thirdpartyresource.go b/pkg/client/listers/extensions/internalversion/thirdpartyresource.go index 8898100fb83..3993f98d518 100644 --- a/pkg/client/listers/extensions/internalversion/thirdpartyresource.go +++ b/pkg/client/listers/extensions/internalversion/thirdpartyresource.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/extensions/v1beta1/daemonset.go b/pkg/client/listers/extensions/v1beta1/daemonset.go index 5183449d22e..29469aec6cb 100644 --- a/pkg/client/listers/extensions/v1beta1/daemonset.go +++ b/pkg/client/listers/extensions/v1beta1/daemonset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/extensions/v1beta1/deployment.go b/pkg/client/listers/extensions/v1beta1/deployment.go index 332659fa0e2..2606f66e650 100644 --- a/pkg/client/listers/extensions/v1beta1/deployment.go +++ b/pkg/client/listers/extensions/v1beta1/deployment.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/extensions/v1beta1/expansion_generated.go b/pkg/client/listers/extensions/v1beta1/expansion_generated.go index 57a96bed233..e8c28b0ba9d 100644 --- a/pkg/client/listers/extensions/v1beta1/expansion_generated.go +++ b/pkg/client/listers/extensions/v1beta1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/extensions/v1beta1/ingress.go b/pkg/client/listers/extensions/v1beta1/ingress.go index 01009134a8f..de1bfbc3fb5 100644 --- a/pkg/client/listers/extensions/v1beta1/ingress.go +++ b/pkg/client/listers/extensions/v1beta1/ingress.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/extensions/v1beta1/job.go b/pkg/client/listers/extensions/v1beta1/job.go index 25bc78f854b..fdfb22c34f1 100644 --- a/pkg/client/listers/extensions/v1beta1/job.go +++ b/pkg/client/listers/extensions/v1beta1/job.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go index eadf28fcc56..7874a6645e4 100644 --- a/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/extensions/v1beta1/replicaset.go b/pkg/client/listers/extensions/v1beta1/replicaset.go index 9c82c3b3acf..fc5e05b4105 100644 --- a/pkg/client/listers/extensions/v1beta1/replicaset.go +++ b/pkg/client/listers/extensions/v1beta1/replicaset.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/extensions/v1beta1/scale.go b/pkg/client/listers/extensions/v1beta1/scale.go index 9045ab6148b..c8750b45d07 100644 --- a/pkg/client/listers/extensions/v1beta1/scale.go +++ b/pkg/client/listers/extensions/v1beta1/scale.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go b/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go index 10a066a5579..608af077314 100644 --- a/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/imagepolicy/internalversion/expansion_generated.go b/pkg/client/listers/imagepolicy/internalversion/expansion_generated.go index e31647644c2..42fba773a18 100644 --- a/pkg/client/listers/imagepolicy/internalversion/expansion_generated.go +++ b/pkg/client/listers/imagepolicy/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/imagepolicy/internalversion/imagereview.go b/pkg/client/listers/imagepolicy/internalversion/imagereview.go index 4ee9d8388d5..f85f1e768f4 100644 --- a/pkg/client/listers/imagepolicy/internalversion/imagereview.go +++ b/pkg/client/listers/imagepolicy/internalversion/imagereview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/imagepolicy/v1alpha1/expansion_generated.go b/pkg/client/listers/imagepolicy/v1alpha1/expansion_generated.go index 2f6afd4c7e9..97f85aa0f96 100644 --- a/pkg/client/listers/imagepolicy/v1alpha1/expansion_generated.go +++ b/pkg/client/listers/imagepolicy/v1alpha1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go b/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go index 49d8a68edbf..97f2fd9d69e 100644 --- a/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go +++ b/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/policy/internalversion/eviction.go b/pkg/client/listers/policy/internalversion/eviction.go index fd307f9fb01..da82aad3437 100644 --- a/pkg/client/listers/policy/internalversion/eviction.go +++ b/pkg/client/listers/policy/internalversion/eviction.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/policy/internalversion/expansion_generated.go b/pkg/client/listers/policy/internalversion/expansion_generated.go index 3c3fc2262d1..c23b6d306e3 100644 --- a/pkg/client/listers/policy/internalversion/expansion_generated.go +++ b/pkg/client/listers/policy/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/policy/internalversion/poddisruptionbudget.go b/pkg/client/listers/policy/internalversion/poddisruptionbudget.go index cf352f12527..f83436c32c6 100644 --- a/pkg/client/listers/policy/internalversion/poddisruptionbudget.go +++ b/pkg/client/listers/policy/internalversion/poddisruptionbudget.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/policy/v1alpha1/expansion_generated.go b/pkg/client/listers/policy/v1alpha1/expansion_generated.go index 11c9a40ddde..bb81c02f235 100644 --- a/pkg/client/listers/policy/v1alpha1/expansion_generated.go +++ b/pkg/client/listers/policy/v1alpha1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/policy/v1alpha1/poddisruptionbudget.go b/pkg/client/listers/policy/v1alpha1/poddisruptionbudget.go index 26dbfbdf1db..05252619088 100644 --- a/pkg/client/listers/policy/v1alpha1/poddisruptionbudget.go +++ b/pkg/client/listers/policy/v1alpha1/poddisruptionbudget.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/policy/v1beta1/expansion_generated.go b/pkg/client/listers/policy/v1beta1/expansion_generated.go index a712d2d403e..e3c6960406b 100644 --- a/pkg/client/listers/policy/v1beta1/expansion_generated.go +++ b/pkg/client/listers/policy/v1beta1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go b/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go index b9c236a3c12..f945796aa73 100644 --- a/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go +++ b/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/rbac/internalversion/clusterrole.go b/pkg/client/listers/rbac/internalversion/clusterrole.go index 24cb88a6462..616bc544a1c 100644 --- a/pkg/client/listers/rbac/internalversion/clusterrole.go +++ b/pkg/client/listers/rbac/internalversion/clusterrole.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/rbac/internalversion/clusterrolebinding.go b/pkg/client/listers/rbac/internalversion/clusterrolebinding.go index c5facd19b46..bdb70bfbc62 100644 --- a/pkg/client/listers/rbac/internalversion/clusterrolebinding.go +++ b/pkg/client/listers/rbac/internalversion/clusterrolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/rbac/internalversion/expansion_generated.go b/pkg/client/listers/rbac/internalversion/expansion_generated.go index fb889a4d6dd..882487afc07 100644 --- a/pkg/client/listers/rbac/internalversion/expansion_generated.go +++ b/pkg/client/listers/rbac/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/rbac/internalversion/role.go b/pkg/client/listers/rbac/internalversion/role.go index d06bd74b7fd..ae0f6e334bf 100644 --- a/pkg/client/listers/rbac/internalversion/role.go +++ b/pkg/client/listers/rbac/internalversion/role.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/rbac/internalversion/rolebinding.go b/pkg/client/listers/rbac/internalversion/rolebinding.go index defe6f1a108..59a9be0dab4 100644 --- a/pkg/client/listers/rbac/internalversion/rolebinding.go +++ b/pkg/client/listers/rbac/internalversion/rolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/rbac/v1alpha1/clusterrole.go b/pkg/client/listers/rbac/v1alpha1/clusterrole.go index c3f9146b834..60d5d54722c 100644 --- a/pkg/client/listers/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/listers/rbac/v1alpha1/clusterrole.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go index 2a97551377e..494c6e46200 100644 --- a/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/rbac/v1alpha1/expansion_generated.go b/pkg/client/listers/rbac/v1alpha1/expansion_generated.go index 4e42431add9..0e9157e8415 100644 --- a/pkg/client/listers/rbac/v1alpha1/expansion_generated.go +++ b/pkg/client/listers/rbac/v1alpha1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/rbac/v1alpha1/role.go b/pkg/client/listers/rbac/v1alpha1/role.go index 3fc9945570a..0d72f6a5586 100644 --- a/pkg/client/listers/rbac/v1alpha1/role.go +++ b/pkg/client/listers/rbac/v1alpha1/role.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/rbac/v1alpha1/rolebinding.go b/pkg/client/listers/rbac/v1alpha1/rolebinding.go index 805d57e03e8..f332f5ae925 100644 --- a/pkg/client/listers/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/listers/rbac/v1alpha1/rolebinding.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1alpha1 diff --git a/pkg/client/listers/storage/internalversion/expansion_generated.go b/pkg/client/listers/storage/internalversion/expansion_generated.go index 463b8b48c53..3055cf5d816 100644 --- a/pkg/client/listers/storage/internalversion/expansion_generated.go +++ b/pkg/client/listers/storage/internalversion/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/storage/internalversion/storageclass.go b/pkg/client/listers/storage/internalversion/storageclass.go index f407ec8d709..8e325765f9a 100644 --- a/pkg/client/listers/storage/internalversion/storageclass.go +++ b/pkg/client/listers/storage/internalversion/storageclass.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package internalversion diff --git a/pkg/client/listers/storage/v1beta1/expansion_generated.go b/pkg/client/listers/storage/v1beta1/expansion_generated.go index 68450941373..ea7c207a944 100644 --- a/pkg/client/listers/storage/v1beta1/expansion_generated.go +++ b/pkg/client/listers/storage/v1beta1/expansion_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/listers/storage/v1beta1/storageclass.go b/pkg/client/listers/storage/v1beta1/storageclass.go index 23e2d843f90..9c348918f0b 100644 --- a/pkg/client/listers/storage/v1beta1/storageclass.go +++ b/pkg/client/listers/storage/v1beta1/storageclass.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] +// This file was automatically generated by lister-gen with arguments: --input-dirs=[k8s.io/kubernetes/pkg/api,k8s.io/kubernetes/pkg/api/v1,k8s.io/kubernetes/pkg/apis/abac,k8s.io/kubernetes/pkg/apis/abac/v0,k8s.io/kubernetes/pkg/apis/abac/v1beta1,k8s.io/kubernetes/pkg/apis/apps,k8s.io/kubernetes/pkg/apis/apps/v1beta1,k8s.io/kubernetes/pkg/apis/authentication,k8s.io/kubernetes/pkg/apis/authentication/v1beta1,k8s.io/kubernetes/pkg/apis/authorization,k8s.io/kubernetes/pkg/apis/authorization/v1beta1,k8s.io/kubernetes/pkg/apis/autoscaling,k8s.io/kubernetes/pkg/apis/autoscaling/v1,k8s.io/kubernetes/pkg/apis/batch,k8s.io/kubernetes/pkg/apis/batch/v1,k8s.io/kubernetes/pkg/apis/batch/v2alpha1,k8s.io/kubernetes/pkg/apis/certificates,k8s.io/kubernetes/pkg/apis/certificates/v1alpha1,k8s.io/kubernetes/pkg/apis/componentconfig,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,k8s.io/kubernetes/pkg/apis/extensions,k8s.io/kubernetes/pkg/apis/extensions/v1beta1,k8s.io/kubernetes/pkg/apis/imagepolicy,k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1,k8s.io/kubernetes/pkg/apis/meta/v1,k8s.io/kubernetes/pkg/apis/policy,k8s.io/kubernetes/pkg/apis/policy/v1alpha1,k8s.io/kubernetes/pkg/apis/policy/v1beta1,k8s.io/kubernetes/pkg/apis/rbac,k8s.io/kubernetes/pkg/apis/rbac/v1alpha1,k8s.io/kubernetes/pkg/apis/storage,k8s.io/kubernetes/pkg/apis/storage/v1beta1] package v1beta1 diff --git a/pkg/client/record/BUILD b/pkg/client/record/BUILD index 37161fcc6f7..96780994b46 100644 --- a/pkg/client/record/BUILD +++ b/pkg/client/record/BUILD @@ -21,8 +21,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/runtime:go_default_library", "//pkg/util/clock:go_default_library", @@ -46,8 +46,8 @@ go_test( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/install:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/runtime:go_default_library", "//pkg/util/clock:go_default_library", diff --git a/pkg/client/record/event.go b/pkg/client/record/event.go index e3daba2af60..337c3324133 100644 --- a/pkg/client/record/event.go +++ b/pkg/client/record/event.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" @@ -70,7 +70,7 @@ type EventRecorder interface { Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) // PastEventf is just like Eventf, but with an option to specify the event's 'timestamp' field. - PastEventf(object runtime.Object, timestamp unversioned.Time, eventtype, reason, messageFmt string, args ...interface{}) + PastEventf(object runtime.Object, timestamp metav1.Time, eventtype, reason, messageFmt string, args ...interface{}) } // EventBroadcaster knows how to receive events and send them to any EventSink, watcher, or log. @@ -252,7 +252,7 @@ type recorderImpl struct { clock clock.Clock } -func (recorder *recorderImpl) generateEvent(object runtime.Object, timestamp unversioned.Time, eventtype, reason, message string) { +func (recorder *recorderImpl) generateEvent(object runtime.Object, timestamp metav1.Time, eventtype, reason, message string) { ref, err := v1.GetReference(object) if err != nil { glog.Errorf("Could not construct reference to: '%#v' due to: '%v'. Will not report event: '%v' '%v' '%v'", object, err, eventtype, reason, message) @@ -283,19 +283,19 @@ func validateEventType(eventtype string) bool { } func (recorder *recorderImpl) Event(object runtime.Object, eventtype, reason, message string) { - recorder.generateEvent(object, unversioned.Now(), eventtype, reason, message) + recorder.generateEvent(object, metav1.Now(), eventtype, reason, message) } func (recorder *recorderImpl) Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) { recorder.Event(object, eventtype, reason, fmt.Sprintf(messageFmt, args...)) } -func (recorder *recorderImpl) PastEventf(object runtime.Object, timestamp unversioned.Time, eventtype, reason, messageFmt string, args ...interface{}) { +func (recorder *recorderImpl) PastEventf(object runtime.Object, timestamp metav1.Time, eventtype, reason, messageFmt string, args ...interface{}) { recorder.generateEvent(object, timestamp, eventtype, reason, fmt.Sprintf(messageFmt, args...)) } func (recorder *recorderImpl) makeEvent(ref *v1.ObjectReference, eventtype, reason, message string) *v1.Event { - t := unversioned.Time{Time: recorder.clock.Now()} + t := metav1.Time{Time: recorder.clock.Now()} namespace := ref.Namespace if namespace == "" { namespace = v1.NamespaceDefault diff --git a/pkg/client/record/event_test.go b/pkg/client/record/event_test.go index fa50936f399..d646dc2ba4a 100644 --- a/pkg/client/record/event_test.go +++ b/pkg/client/record/event_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" _ "k8s.io/kubernetes/pkg/api/install" // To register api.Pod used in tests below - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" k8sruntime "k8s.io/kubernetes/pkg/runtime" @@ -442,9 +442,9 @@ func TestUpdateExpiredEvent(t *testing.T) { sink := &testEventSink{ OnPatch: func(*v1.Event, []byte) (*v1.Event, error) { return nil, &errors.StatusError{ - ErrStatus: unversioned.Status{ + ErrStatus: metav1.Status{ Code: http.StatusNotFound, - Reason: unversioned.StatusReasonNotFound, + Reason: metav1.StatusReasonNotFound, }} }, OnCreate: func(event *v1.Event) (*v1.Event, error) { diff --git a/pkg/client/record/events_cache.go b/pkg/client/record/events_cache.go index 5b1d84a42c8..07ee61b5658 100644 --- a/pkg/client/record/events_cache.go +++ b/pkg/client/record/events_cache.go @@ -25,7 +25,7 @@ import ( "github.com/golang/groupcache/lru" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/clock" "k8s.io/kubernetes/pkg/util/sets" @@ -138,13 +138,13 @@ type aggregateRecord struct { // if the size of this set exceeds the max, we know we need to aggregate localKeys sets.String // The last time at which the aggregate was recorded - lastTimestamp unversioned.Time + lastTimestamp metav1.Time } // EventAggregate identifies similar events and groups into a common event if required func (e *EventAggregator) EventAggregate(newEvent *v1.Event) (*v1.Event, error) { aggregateKey, localKey := e.keyFunc(newEvent) - now := unversioned.NewTime(e.clock.Now()) + now := metav1.NewTime(e.clock.Now()) record := aggregateRecord{localKeys: sets.NewString(), lastTimestamp: now} e.Lock() defer e.Unlock() @@ -194,7 +194,7 @@ type eventLog struct { count int // The time at which the event was first recorded. - firstTimestamp unversioned.Time + firstTimestamp metav1.Time // The unique name of the first occurrence of this event name string @@ -240,7 +240,7 @@ func (e *eventLogger) eventObserve(newEvent *v1.Event) (*v1.Event, []byte, error eventCopy2 := *event eventCopy2.Count = 0 - eventCopy2.LastTimestamp = unversioned.NewTime(time.Unix(0, 0)) + eventCopy2.LastTimestamp = metav1.NewTime(time.Unix(0, 0)) newData, _ := json.Marshal(event) oldData, _ := json.Marshal(eventCopy2) diff --git a/pkg/client/record/events_cache_test.go b/pkg/client/record/events_cache_test.go index 7b7b5036a78..a285a8b0523 100644 --- a/pkg/client/record/events_cache_test.go +++ b/pkg/client/record/events_cache_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/clock" "k8s.io/kubernetes/pkg/util/diff" @@ -39,7 +39,7 @@ func makeObjectReference(kind, name, namespace string) v1.ObjectReference { } func makeEvent(reason, message string, involvedObject v1.ObjectReference) v1.Event { - eventTime := unversioned.Now() + eventTime := metav1.Now() event := v1.Event{ Reason: reason, Message: message, @@ -227,7 +227,7 @@ func TestEventCorrelator(t *testing.T) { correlator := NewEventCorrelator(&clock) for i := range testInput.previousEvents { event := testInput.previousEvents[i] - now := unversioned.NewTime(clock.Now()) + now := metav1.NewTime(clock.Now()) event.FirstTimestamp = now event.LastTimestamp = now result, err := correlator.EventCorrelate(&event) @@ -238,7 +238,7 @@ func TestEventCorrelator(t *testing.T) { } // update the input to current clock value - now := unversioned.NewTime(clock.Now()) + now := metav1.NewTime(clock.Now()) testInput.newEvent.FirstTimestamp = now testInput.newEvent.LastTimestamp = now result, err := correlator.EventCorrelate(&testInput.newEvent) diff --git a/pkg/client/record/fake.go b/pkg/client/record/fake.go index e063a4fc643..3e4cc5466c9 100644 --- a/pkg/client/record/fake.go +++ b/pkg/client/record/fake.go @@ -19,7 +19,7 @@ package record import ( "fmt" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) @@ -42,7 +42,7 @@ func (f *FakeRecorder) Eventf(object runtime.Object, eventtype, reason, messageF } } -func (f *FakeRecorder) PastEventf(object runtime.Object, timestamp unversioned.Time, eventtype, reason, messageFmt string, args ...interface{}) { +func (f *FakeRecorder) PastEventf(object runtime.Object, timestamp metav1.Time, eventtype, reason, messageFmt string, args ...interface{}) { } // NewFakeRecorder creates new fake event recorder with event channel with diff --git a/pkg/client/restclient/BUILD b/pkg/client/restclient/BUILD index bec7964e56e..3b62bfd7868 100644 --- a/pkg/client/restclient/BUILD +++ b/pkg/client/restclient/BUILD @@ -26,9 +26,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation/path:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/metrics:go_default_library", "//pkg/client/transport:go_default_library", "//pkg/client/unversioned/clientcmd/api:go_default_library", @@ -64,9 +64,9 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/unversioned/clientcmd/api:go_default_library", "//pkg/labels:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/client/restclient/client_test.go b/pkg/client/restclient/client_test.go index f4239d1586c..3db16117188 100644 --- a/pkg/client/restclient/client_test.go +++ b/pkg/client/restclient/client_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -43,7 +43,7 @@ type TestParam struct { expectingError bool actualCreated bool expCreated bool - expStatus *unversioned.Status + expStatus *metav1.Status testBody bool testBodyErrorIsNotNil bool } @@ -84,12 +84,12 @@ func TestDoRequestSuccess(t *testing.T) { } func TestDoRequestFailed(t *testing.T) { - status := &unversioned.Status{ + status := &metav1.Status{ Code: http.StatusNotFound, - Status: unversioned.StatusFailure, - Reason: unversioned.StatusReasonNotFound, + Status: metav1.StatusFailure, + Reason: metav1.StatusReasonNotFound, Message: " \"\" not found", - Details: &unversioned.StatusDetails{}, + Details: &metav1.StatusDetails{}, } expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status) fakeHandler := utiltesting.FakeHandler{ @@ -119,14 +119,14 @@ func TestDoRequestFailed(t *testing.T) { } func TestDoRawRequestFailed(t *testing.T) { - status := &unversioned.Status{ + status := &metav1.Status{ Code: http.StatusNotFound, - Status: unversioned.StatusFailure, - Reason: unversioned.StatusReasonNotFound, + Status: metav1.StatusFailure, + Reason: metav1.StatusReasonNotFound, Message: "the server could not find the requested resource", - Details: &unversioned.StatusDetails{ - Causes: []unversioned.StatusCause{ - {Type: unversioned.CauseTypeUnexpectedServerResponse, Message: "unknown"}, + Details: &metav1.StatusDetails{ + Causes: []metav1.StatusCause{ + {Type: metav1.CauseTypeUnexpectedServerResponse, Message: "unknown"}, }, }, } @@ -314,8 +314,8 @@ func TestCreateBackoffManager(t *testing.T) { } -func testServerEnv(t *testing.T, statusCode int) (*httptest.Server, *utiltesting.FakeHandler, *unversioned.Status) { - status := &unversioned.Status{Status: fmt.Sprintf("%s", unversioned.StatusSuccess)} +func testServerEnv(t *testing.T, statusCode int) (*httptest.Server, *utiltesting.FakeHandler, *metav1.Status) { + status := &metav1.Status{Status: fmt.Sprintf("%s", metav1.StatusSuccess)} expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status) fakeHandler := utiltesting.FakeHandler{ StatusCode: statusCode, diff --git a/pkg/client/restclient/config.go b/pkg/client/restclient/config.go index 031af8af198..74468b6fee9 100644 --- a/pkg/client/restclient/config.go +++ b/pkg/client/restclient/config.go @@ -30,7 +30,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -236,7 +236,7 @@ func UnversionedRESTClientFor(config *Config) (*RESTClient, error) { versionConfig := config.ContentConfig if versionConfig.GroupVersion == nil { - v := unversioned.SchemeGroupVersion + v := metav1.SchemeGroupVersion versionConfig.GroupVersion = &v } diff --git a/pkg/client/restclient/request.go b/pkg/client/restclient/request.go index 548985b5595..4e76dac83ae 100644 --- a/pkg/client/restclient/request.go +++ b/pkg/client/restclient/request.go @@ -33,7 +33,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" pathvalidation "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/client/metrics" @@ -405,7 +405,7 @@ func (r *Request) FieldsSelectorParam(s fields.Selector) *Request { r.err = err return r } - return r.setParam(unversioned.FieldSelectorQueryParam(r.content.GroupVersion.String()), s2.String()) + return r.setParam(metav1.FieldSelectorQueryParam(r.content.GroupVersion.String()), s2.String()) } // LabelsSelectorParam adds the given selector as a query parameter @@ -419,7 +419,7 @@ func (r *Request) LabelsSelectorParam(s labels.Selector) *Request { if s.Empty() { return r } - return r.setParam(unversioned.LabelSelectorQueryParam(r.content.GroupVersion.String()), s.String()) + return r.setParam(metav1.LabelSelectorQueryParam(r.content.GroupVersion.String()), s.String()) } // UintParam creates a query parameter with the given value. @@ -454,14 +454,14 @@ func (r *Request) VersionedParams(obj runtime.Object, codec runtime.ParameterCod for _, value := range v { // TODO: Move it to setParam method, once we get rid of // FieldSelectorParam & LabelSelectorParam methods. - if k == unversioned.LabelSelectorQueryParam(r.content.GroupVersion.String()) && value == "" { + if k == metav1.LabelSelectorQueryParam(r.content.GroupVersion.String()) && value == "" { // Don't set an empty selector for backward compatibility. // Since there is no way to get the difference between empty // and unspecified string, we don't set it to avoid having // labelSelector= param in every request. continue } - if k == unversioned.FieldSelectorQueryParam(r.content.GroupVersion.String()) { + if k == metav1.FieldSelectorQueryParam(r.content.GroupVersion.String()) { if len(value) == 0 { // Don't set an empty selector for backward compatibility. // Since there is no way to get the difference between empty @@ -1083,9 +1083,9 @@ func (r Result) Get() (runtime.Object, error) { return nil, err } switch t := out.(type) { - case *unversioned.Status: + case *metav1.Status: // any status besides StatusSuccess is considered an error. - if t.Status != unversioned.StatusSuccess { + if t.Status != metav1.StatusSuccess { return nil, errors.FromObject(t) } } @@ -1118,9 +1118,9 @@ func (r Result) Into(obj runtime.Object) error { // if a different object is returned, see if it is Status and avoid double decoding // the object. switch t := out.(type) { - case *unversioned.Status: + case *metav1.Status: // any status besides StatusSuccess is considered an error. - if t.Status != unversioned.StatusSuccess { + if t.Status != metav1.StatusSuccess { return errors.FromObject(t) } } @@ -1153,9 +1153,9 @@ func (r Result) Error() error { return r.err } switch t := out.(type) { - case *unversioned.Status: + case *metav1.Status: // because we default the kind, we *must* check for StatusFailure - if t.Status == unversioned.StatusFailure { + if t.Status == metav1.StatusFailure { return errors.FromObject(t) } } diff --git a/pkg/client/restclient/request_test.go b/pkg/client/restclient/request_test.go index a0e1bc8b20b..9d82538ba91 100755 --- a/pkg/client/restclient/request_test.go +++ b/pkg/client/restclient/request_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/labels" @@ -635,7 +635,7 @@ func TestTransformUnstructuredError(t *testing.T) { Res: &http.Response{StatusCode: http.StatusBadRequest, Body: ioutil.NopCloser(bytes.NewReader([]byte(`{"kind":"Status","apiVersion":"v1","status":"Failure","code":404}`)))}, ErrFn: apierrors.IsBadRequest, Transformed: &apierrors.StatusError{ - ErrStatus: unversioned.Status{Status: unversioned.StatusFailure, Code: http.StatusNotFound}, + ErrStatus: metav1.Status{Status: metav1.StatusFailure, Code: http.StatusNotFound}, }, }, { @@ -657,7 +657,7 @@ func TestTransformUnstructuredError(t *testing.T) { Res: &http.Response{StatusCode: http.StatusBadRequest, Body: ioutil.NopCloser(bytes.NewReader([]byte(`{"kind":"Status","status":"Failure","code":404}`)))}, ErrFn: apierrors.IsBadRequest, Transformed: &apierrors.StatusError{ - ErrStatus: unversioned.Status{Status: unversioned.StatusFailure, Code: http.StatusNotFound}, + ErrStatus: metav1.Status{Status: metav1.StatusFailure, Code: http.StatusNotFound}, }, }, { @@ -783,9 +783,9 @@ func TestRequestWatch(t *testing.T) { client: clientFunc(func(req *http.Request) (*http.Response, error) { return &http.Response{ StatusCode: http.StatusUnauthorized, - Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &unversioned.Status{ - Status: unversioned.StatusFailure, - Reason: unversioned.StatusReasonUnauthorized, + Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &metav1.Status{ + Status: metav1.StatusFailure, + Reason: metav1.StatusReasonUnauthorized, })))), }, nil }), @@ -889,9 +889,9 @@ func TestRequestStream(t *testing.T) { client: clientFunc(func(req *http.Request) (*http.Response, error) { return &http.Response{ StatusCode: http.StatusUnauthorized, - Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &unversioned.Status{ - Status: unversioned.StatusFailure, - Reason: unversioned.StatusReasonUnauthorized, + Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &metav1.Status{ + Status: metav1.StatusFailure, + Reason: metav1.StatusReasonUnauthorized, })))), }, nil }), @@ -1222,7 +1222,7 @@ func TestDoRequestNewWayReader(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePathWithPrefix("foo", "bar", "", "baz") - requestURL += "?" + unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } @@ -1262,7 +1262,7 @@ func TestDoRequestNewWayObj(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePath("foo", "", "bar/baz") - requestURL += "?" + unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } diff --git a/pkg/client/restclient/versions.go b/pkg/client/restclient/versions.go index 33764344744..63e1e1fd941 100644 --- a/pkg/client/restclient/versions.go +++ b/pkg/client/restclient/versions.go @@ -22,7 +22,7 @@ import ( "net/http" "path" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) const ( @@ -57,7 +57,7 @@ func ServerAPIVersions(c *Config) (groupVersions []string, err error) { if err != nil { return nil, err } - var v unversioned.APIVersions + var v metav1.APIVersions defer resp.Body.Close() err = json.NewDecoder(resp.Body).Decode(&v) if err != nil { @@ -71,7 +71,7 @@ func ServerAPIVersions(c *Config) (groupVersions []string, err error) { if err != nil { return nil, err } - var apiGroupList unversioned.APIGroupList + var apiGroupList metav1.APIGroupList defer resp2.Body.Close() err = json.NewDecoder(resp2.Body).Decode(&apiGroupList) if err != nil { diff --git a/pkg/client/testing/core/BUILD b/pkg/client/testing/core/BUILD index dd50b9c626b..0d21dc3fa31 100644 --- a/pkg/client/testing/core/BUILD +++ b/pkg/client/testing/core/BUILD @@ -22,9 +22,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/client/testing/core/fake.go b/pkg/client/testing/core/fake.go index b25ad095375..4bd72f18333 100644 --- a/pkg/client/testing/core/fake.go +++ b/pkg/client/testing/core/fake.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -45,7 +45,7 @@ type Fake struct { // for every request in the order they are tried. ProxyReactionChain []ProxyReactor - Resources map[string]*unversioned.APIResourceList + Resources map[string]*metav1.APIResourceList } // Reactor is an interface to allow the composition of reaction functions. @@ -219,7 +219,7 @@ type FakeDiscovery struct { *Fake } -func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { +func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { action := ActionImpl{ Verb: "get", Resource: schema.GroupVersionResource{Resource: "resource"}, @@ -228,7 +228,7 @@ func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*un return c.Resources[groupVersion], nil } -func (c *FakeDiscovery) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (c *FakeDiscovery) ServerResources() (map[string]*metav1.APIResourceList, error) { action := ActionImpl{ Verb: "get", Resource: schema.GroupVersionResource{Resource: "resource"}, @@ -237,7 +237,7 @@ func (c *FakeDiscovery) ServerResources() (map[string]*unversioned.APIResourceLi return c.Resources, nil } -func (c *FakeDiscovery) ServerGroups() (*unversioned.APIGroupList, error) { +func (c *FakeDiscovery) ServerGroups() (*metav1.APIGroupList, error) { return nil, nil } diff --git a/pkg/client/testing/core/fixture.go b/pkg/client/testing/core/fixture.go index 3528adfbbf1..5f674bbff05 100644 --- a/pkg/client/testing/core/fixture.go +++ b/pkg/client/testing/core/fixture.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" @@ -230,11 +230,11 @@ func (t *tracker) Get(gvk schema.GroupVersionKind, ns, name string) (runtime.Obj return nil, err } - if status, ok := obj.(*unversioned.Status); ok { + if status, ok := obj.(*metav1.Status); ok { if status.Details != nil { status.Details.Kind = gvk.Kind } - if status.Status != unversioned.StatusSuccess { + if status.Status != metav1.StatusSuccess { return nil, &errors.StatusError{ErrStatus: *status} } } @@ -277,7 +277,7 @@ func (t *tracker) add(obj runtime.Object, replaceExisting bool) error { return err } - if status, ok := obj.(*unversioned.Status); ok && status.Details != nil { + if status, ok := obj.(*metav1.Status); ok && status.Details != nil { gvk.Kind = status.Details.Kind } diff --git a/pkg/client/typed/discovery/BUILD b/pkg/client/typed/discovery/BUILD index ba1e444204e..e79cb621a31 100644 --- a/pkg/client/typed/discovery/BUILD +++ b/pkg/client/typed/discovery/BUILD @@ -23,8 +23,8 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", @@ -47,9 +47,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/runtime/schema:go_default_library", @@ -66,8 +66,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/client/typed/discovery:go_default_library", diff --git a/pkg/client/typed/discovery/discovery_client.go b/pkg/client/typed/discovery/discovery_client.go index ede47596269..ec971efb48e 100644 --- a/pkg/client/typed/discovery/discovery_client.go +++ b/pkg/client/typed/discovery/discovery_client.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" @@ -59,15 +59,15 @@ type CachedDiscoveryInterface interface { type ServerGroupsInterface interface { // ServerGroups returns the supported groups, with information like supported versions and the // preferred version. - ServerGroups() (*unversioned.APIGroupList, error) + ServerGroups() (*metav1.APIGroupList, error) } // ServerResourcesInterface has methods for obtaining supported resources on the API server type ServerResourcesInterface interface { // ServerResourcesForGroupVersion returns the supported resources for a group and version. - ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) + ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) // ServerResources returns the supported resources for all groups and versions. - ServerResources() (map[string]*unversioned.APIResourceList, error) + ServerResources() (map[string]*metav1.APIResourceList, error) // ServerPreferredResources returns the supported resources with the version preferred by the // server. ServerPreferredResources() ([]schema.GroupVersionResource, error) @@ -96,12 +96,12 @@ type DiscoveryClient struct { LegacyPrefix string } -// Convert unversioned.APIVersions to unversioned.APIGroup. APIVersions is used by legacy v1, so +// Convert metav1.APIVersions to metav1.APIGroup. APIVersions is used by legacy v1, so // group would be "". -func apiVersionsToAPIGroup(apiVersions *unversioned.APIVersions) (apiGroup unversioned.APIGroup) { - groupVersions := []unversioned.GroupVersionForDiscovery{} +func apiVersionsToAPIGroup(apiVersions *metav1.APIVersions) (apiGroup metav1.APIGroup) { + groupVersions := []metav1.GroupVersionForDiscovery{} for _, version := range apiVersions.Versions { - groupVersion := unversioned.GroupVersionForDiscovery{ + groupVersion := metav1.GroupVersionForDiscovery{ GroupVersion: version, Version: version, } @@ -115,11 +115,11 @@ func apiVersionsToAPIGroup(apiVersions *unversioned.APIVersions) (apiGroup unver // ServerGroups returns the supported groups, with information like supported versions and the // preferred version. -func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList, err error) { +func (d *DiscoveryClient) ServerGroups() (apiGroupList *metav1.APIGroupList, err error) { // Get the groupVersions exposed at /api - v := &unversioned.APIVersions{} + v := &metav1.APIVersions{} err = d.restClient.Get().AbsPath(d.LegacyPrefix).Do().Into(v) - apiGroup := unversioned.APIGroup{} + apiGroup := metav1.APIGroup{} if err == nil { apiGroup = apiVersionsToAPIGroup(v) } @@ -128,14 +128,14 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList } // Get the groupVersions exposed at /apis - apiGroupList = &unversioned.APIGroupList{} + apiGroupList = &metav1.APIGroupList{} err = d.restClient.Get().AbsPath("/apis").Do().Into(apiGroupList) if err != nil && !errors.IsNotFound(err) && !errors.IsForbidden(err) { return nil, err } // to be compatible with a v1.0 server, if it's a 403 or 404, ignore and return whatever we got from /api if err != nil && (errors.IsNotFound(err) || errors.IsForbidden(err)) { - apiGroupList = &unversioned.APIGroupList{} + apiGroupList = &metav1.APIGroupList{} } // append the group retrieved from /api to the list @@ -144,7 +144,7 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList } // ServerResourcesForGroupVersion returns the supported resources for a group and version. -func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (resources *unversioned.APIResourceList, err error) { +func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (resources *metav1.APIResourceList, err error) { url := url.URL{} if len(groupVersion) == 0 { return nil, fmt.Errorf("groupVersion shouldn't be empty") @@ -154,7 +154,7 @@ func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (r } else { url.Path = "/apis/" + groupVersion } - resources = &unversioned.APIResourceList{} + resources = &metav1.APIResourceList{} err = d.restClient.Get().AbsPath(url.String()).Do().Into(resources) if err != nil { // ignore 403 or 404 error to be compatible with an v1.0 server. @@ -167,13 +167,13 @@ func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (r } // ServerResources returns the supported resources for all groups and versions. -func (d *DiscoveryClient) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (d *DiscoveryClient) ServerResources() (map[string]*metav1.APIResourceList, error) { apiGroups, err := d.ServerGroups() if err != nil { return nil, err } - groupVersions := unversioned.ExtractGroupVersions(apiGroups) - result := map[string]*unversioned.APIResourceList{} + groupVersions := metav1.ExtractGroupVersions(apiGroups) + result := map[string]*metav1.APIResourceList{} for _, groupVersion := range groupVersions { resources, err := d.ServerResourcesForGroupVersion(groupVersion) if err != nil { @@ -305,7 +305,7 @@ func (d *DiscoveryClient) SwaggerSchema(version schema.GroupVersion) (*swagger.A if err != nil { return nil, err } - groupVersions := unversioned.ExtractGroupVersions(groupList) + groupVersions := metav1.ExtractGroupVersions(groupList) // This check also takes care the case that kubectl is newer than the running endpoint if stringDoesntExistIn(version.String(), groupVersions) { return nil, fmt.Errorf("API version: %v is not supported by the server. Use one of: %v", version, groupVersions) diff --git a/pkg/client/typed/discovery/discovery_client_test.go b/pkg/client/typed/discovery/discovery_client_test.go index 86b875f6138..c1f2557fe01 100644 --- a/pkg/client/typed/discovery/discovery_client_test.go +++ b/pkg/client/typed/discovery/discovery_client_test.go @@ -25,7 +25,7 @@ import ( "github.com/emicklei/go-restful/swagger" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime/schema" @@ -65,7 +65,7 @@ func TestGetServerGroupsWithV1Server(t *testing.T) { var obj interface{} switch req.URL.Path { case "/api": - obj = &unversioned.APIVersions{ + obj = &metav1.APIVersions{ Versions: []string{ "v1", }, @@ -90,7 +90,7 @@ func TestGetServerGroupsWithV1Server(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - groupVersions := unversioned.ExtractGroupVersions(apiGroupList) + groupVersions := metav1.ExtractGroupVersions(apiGroupList) if !reflect.DeepEqual(groupVersions, []string{"v1"}) { t.Errorf("expected: %q, got: %q", []string{"v1"}, groupVersions) } @@ -108,7 +108,7 @@ func TestGetServerGroupsWithBrokenServer(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - groupVersions := unversioned.ExtractGroupVersions(apiGroupList) + groupVersions := metav1.ExtractGroupVersions(apiGroupList) if len(groupVersions) != 0 { t.Errorf("expected empty list, got: %q", groupVersions) } @@ -120,7 +120,7 @@ func TestGetServerResourcesWithV1Server(t *testing.T) { var obj interface{} switch req.URL.Path { case "/api": - obj = &unversioned.APIVersions{ + obj = &metav1.APIVersions{ Versions: []string{ "v1", }, @@ -152,24 +152,24 @@ func TestGetServerResourcesWithV1Server(t *testing.T) { } func TestGetServerResources(t *testing.T) { - stable := unversioned.APIResourceList{ + stable := metav1.APIResourceList{ GroupVersion: "v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "services", Namespaced: true, Kind: "Service"}, {Name: "namespaces", Namespaced: false, Kind: "Namespace"}, }, } - beta := unversioned.APIResourceList{ + beta := metav1.APIResourceList{ GroupVersion: "extensions/v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "deployments", Namespaced: true, Kind: "Deployment"}, {Name: "ingresses", Namespaced: true, Kind: "Ingress"}, {Name: "jobs", Namespaced: true, Kind: "Job"}, }, } tests := []struct { - resourcesList *unversioned.APIResourceList + resourcesList *metav1.APIResourceList path string request string expectErr bool @@ -201,16 +201,16 @@ func TestGetServerResources(t *testing.T) { case "/apis/extensions/v1beta1": list = &beta case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, } case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, }, @@ -267,7 +267,7 @@ func swaggerSchemaFakeServer() (*httptest.Server, error) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { var resp interface{} if request == 1 { - resp = unversioned.APIVersions{Versions: []string{"v1", "v2", "v3"}} + resp = metav1.APIVersions{Versions: []string{"v1", "v2", "v3"}} request++ } else { resp = swagger.ApiDeclaration{} @@ -323,16 +323,16 @@ func TestGetSwaggerSchemaFail(t *testing.T) { } func TestServerPreferredResources(t *testing.T) { - stable := unversioned.APIResourceList{ + stable := metav1.APIResourceList{ GroupVersion: "v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "services", Namespaced: true, Kind: "Service"}, {Name: "namespaces", Namespaced: false, Kind: "Namespace"}, }, } tests := []struct { - resourcesList *unversioned.APIResourceList + resourcesList *metav1.APIResourceList response func(w http.ResponseWriter, req *http.Request) expectErr func(err error) bool }{ @@ -348,16 +348,16 @@ func TestServerPreferredResources(t *testing.T) { case "/api/v1": list = &stable case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, } case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, }, @@ -390,16 +390,16 @@ func TestServerPreferredResources(t *testing.T) { case "/api/v1": w.WriteHeader(http.StatusInternalServerError) case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, } case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, }, @@ -446,15 +446,15 @@ func TestServerPreferredResources(t *testing.T) { } func TestServerPreferredResourcesRetries(t *testing.T) { - stable := unversioned.APIResourceList{ + stable := metav1.APIResourceList{ GroupVersion: "v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "pods", Namespaced: true, Kind: "Pod"}, }, } - beta := unversioned.APIResourceList{ + beta := metav1.APIResourceList{ GroupVersion: "extensions/v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "deployments", Namespaced: true, Kind: "Deployment"}, }, } @@ -474,20 +474,20 @@ func TestServerPreferredResourcesRetries(t *testing.T) { case "/api/v1": list = &stable case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, } case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "extensions", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{ + PreferredVersion: metav1.GroupVersionForDiscovery{ GroupVersion: "extensions/v1beta1", Version: "v1beta1", }, @@ -545,30 +545,30 @@ func TestServerPreferredResourcesRetries(t *testing.T) { } func TestServerPreferredNamespacedResources(t *testing.T) { - stable := unversioned.APIResourceList{ + stable := metav1.APIResourceList{ GroupVersion: "v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "services", Namespaced: true, Kind: "Service"}, {Name: "namespaces", Namespaced: false, Kind: "Namespace"}, }, } - batchv1 := unversioned.APIResourceList{ + batchv1 := metav1.APIResourceList{ GroupVersion: "batch/v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "jobs", Namespaced: true, Kind: "Job"}, }, } - batchv2alpha1 := unversioned.APIResourceList{ + batchv2alpha1 := metav1.APIResourceList{ GroupVersion: "batch/v2alpha1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "jobs", Namespaced: true, Kind: "Job"}, {Name: "cronjobs", Namespaced: true, Kind: "CronJob"}, }, } - batchv3alpha1 := unversioned.APIResourceList{ + batchv3alpha1 := metav1.APIResourceList{ GroupVersion: "batch/v3alpha1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "jobs", Namespaced: true, Kind: "Job"}, {Name: "cronjobs", Namespaced: true, Kind: "CronJob"}, }, @@ -584,7 +584,7 @@ func TestServerPreferredNamespacedResources(t *testing.T) { case "/api/v1": list = &stable case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, @@ -613,16 +613,16 @@ func TestServerPreferredNamespacedResources(t *testing.T) { var list interface{} switch req.URL.Path { case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "batch", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "batch/v1", Version: "v1"}, {GroupVersion: "batch/v2alpha1", Version: "v2alpha1"}, {GroupVersion: "batch/v3alpha1", Version: "v3alpha1"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{GroupVersion: "batch/v1", Version: "v1"}, + PreferredVersion: metav1.GroupVersionForDiscovery{GroupVersion: "batch/v1", Version: "v1"}, }, }, } @@ -656,16 +656,16 @@ func TestServerPreferredNamespacedResources(t *testing.T) { var list interface{} switch req.URL.Path { case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "batch", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "batch/v1", Version: "v1"}, {GroupVersion: "batch/v2alpha1", Version: "v2alpha1"}, {GroupVersion: "batch/v3alpha1", Version: "v3alpha1"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{GroupVersion: "batch/v2alpha", Version: "v2alpha1"}, + PreferredVersion: metav1.GroupVersionForDiscovery{GroupVersion: "batch/v2alpha", Version: "v2alpha1"}, }, }, } diff --git a/pkg/client/typed/discovery/fake/BUILD b/pkg/client/typed/discovery/fake/BUILD index 825c8373b98..9de7ef6821c 100644 --- a/pkg/client/typed/discovery/fake/BUILD +++ b/pkg/client/typed/discovery/fake/BUILD @@ -15,8 +15,8 @@ go_library( srcs = ["discovery.go"], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/client/typed/discovery/fake/discovery.go b/pkg/client/typed/discovery/fake/discovery.go index a0cce856f94..058db8ceb16 100644 --- a/pkg/client/typed/discovery/fake/discovery.go +++ b/pkg/client/typed/discovery/fake/discovery.go @@ -18,7 +18,7 @@ package fake import ( "github.com/emicklei/go-restful/swagger" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/testing/core" @@ -30,7 +30,7 @@ type FakeDiscovery struct { *core.Fake } -func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { +func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { action := core.ActionImpl{ Verb: "get", Resource: schema.GroupVersionResource{Resource: "resource"}, @@ -39,7 +39,7 @@ func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*un return c.Resources[groupVersion], nil } -func (c *FakeDiscovery) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (c *FakeDiscovery) ServerResources() (map[string]*metav1.APIResourceList, error) { action := core.ActionImpl{ Verb: "get", Resource: schema.GroupVersionResource{Resource: "resource"}, @@ -56,7 +56,7 @@ func (c *FakeDiscovery) ServerPreferredNamespacedResources() ([]schema.GroupVers return nil, nil } -func (c *FakeDiscovery) ServerGroups() (*unversioned.APIGroupList, error) { +func (c *FakeDiscovery) ServerGroups() (*metav1.APIGroupList, error) { return nil, nil } diff --git a/pkg/client/typed/discovery/helper.go b/pkg/client/typed/discovery/helper.go index be9eac24026..4a9b4d88520 100644 --- a/pkg/client/typed/discovery/helper.go +++ b/pkg/client/typed/discovery/helper.go @@ -19,7 +19,7 @@ package discovery import ( "fmt" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/version" @@ -61,7 +61,7 @@ func NegotiateVersion(client DiscoveryInterface, requiredGV *schema.GroupVersion // not a negotiation specific error. return nil, err } - versions := unversioned.ExtractGroupVersions(groups) + versions := metav1.ExtractGroupVersions(groups) serverVersions := sets.String{} for _, v := range versions { serverVersions.Insert(v) diff --git a/pkg/client/typed/discovery/helper_blackbox_test.go b/pkg/client/typed/discovery/helper_blackbox_test.go index 5cfad05ac63..9541ca37a10 100644 --- a/pkg/client/typed/discovery/helper_blackbox_test.go +++ b/pkg/client/typed/discovery/helper_blackbox_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - uapi "k8s.io/kubernetes/pkg/api/unversioned" + uapi "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" diff --git a/pkg/client/typed/discovery/restmapper.go b/pkg/client/typed/discovery/restmapper.go index 53866584f1c..b3c193b9969 100644 --- a/pkg/client/typed/discovery/restmapper.go +++ b/pkg/client/typed/discovery/restmapper.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" "github.com/golang/glog" @@ -31,10 +31,10 @@ import ( // APIGroupResources is an API group with a mapping of versions to // resources. type APIGroupResources struct { - Group unversioned.APIGroup + Group metav1.APIGroup // A mapping of version string to a slice of APIResources for // that version. - VersionedResources map[string][]unversioned.APIResource + VersionedResources map[string][]metav1.APIResource } // NewRESTMapper returns a PriorityRESTMapper based on the discovered @@ -121,7 +121,7 @@ func GetAPIGroupResources(cl DiscoveryInterface) ([]*APIGroupResources, error) { for _, group := range apiGroups.Groups { groupResources := &APIGroupResources{ Group: group, - VersionedResources: make(map[string][]unversioned.APIResource), + VersionedResources: make(map[string][]metav1.APIResource), } for _, version := range group.Versions { resources, err := cl.ServerResourcesForGroupVersion(version.GroupVersion) diff --git a/pkg/client/typed/discovery/restmapper_test.go b/pkg/client/typed/discovery/restmapper_test.go index 352817628cc..a712de09763 100644 --- a/pkg/client/typed/discovery/restmapper_test.go +++ b/pkg/client/typed/discovery/restmapper_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" @@ -35,14 +35,14 @@ import ( func TestRESTMapper(t *testing.T) { resources := []*APIGroupResources{ { - Group: unversioned.APIGroup{ - Versions: []unversioned.GroupVersionForDiscovery{ + Group: metav1.APIGroup{ + Versions: []metav1.GroupVersionForDiscovery{ {Version: "v1"}, {Version: "v2"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{Version: "v1"}, + PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1"}, }, - VersionedResources: map[string][]unversioned.APIResource{ + VersionedResources: map[string][]metav1.APIResource{ "v1": { {Name: "pods", Namespaced: true, Kind: "Pod"}, }, @@ -52,14 +52,14 @@ func TestRESTMapper(t *testing.T) { }, }, { - Group: unversioned.APIGroup{ + Group: metav1.APIGroup{ Name: "extensions", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {Version: "v1beta"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{Version: "v1beta"}, + PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1beta"}, }, - VersionedResources: map[string][]unversioned.APIResource{ + VersionedResources: map[string][]metav1.APIResource{ "v1beta": { {Name: "jobs", Namespaced: true, Kind: "Job"}, }, @@ -250,19 +250,19 @@ func (c *fakeCachedDiscoveryInterface) RESTClient() restclient.Interface { return &fake.RESTClient{} } -func (c *fakeCachedDiscoveryInterface) ServerGroups() (*unversioned.APIGroupList, error) { +func (c *fakeCachedDiscoveryInterface) ServerGroups() (*metav1.APIGroupList, error) { if c.enabledA { - return &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + return &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "a", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ { GroupVersion: "a/v1", Version: "v1", }, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{ + PreferredVersion: metav1.GroupVersionForDiscovery{ GroupVersion: "a/v1", Version: "v1", }, @@ -270,14 +270,14 @@ func (c *fakeCachedDiscoveryInterface) ServerGroups() (*unversioned.APIGroupList }, }, nil } - return &unversioned.APIGroupList{}, nil + return &metav1.APIGroupList{}, nil } -func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { +func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { if c.enabledA && groupVersion == "a/v1" { - return &unversioned.APIResourceList{ + return &metav1.APIResourceList{ GroupVersion: "a/v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ { Name: "foo", Kind: "Foo", @@ -290,14 +290,14 @@ func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersi return nil, errors.NewNotFound(schema.GroupResource{}, "") } -func (c *fakeCachedDiscoveryInterface) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (c *fakeCachedDiscoveryInterface) ServerResources() (map[string]*metav1.APIResourceList, error) { if c.enabledA { av1, _ := c.ServerResourcesForGroupVersion("a/v1") - return map[string]*unversioned.APIResourceList{ + return map[string]*metav1.APIResourceList{ "a/v1": av1, }, nil } - return map[string]*unversioned.APIResourceList{}, nil + return map[string]*metav1.APIResourceList{}, nil } func (c *fakeCachedDiscoveryInterface) ServerPreferredResources() ([]schema.GroupVersionResource, error) { diff --git a/pkg/client/typed/dynamic/BUILD b/pkg/client/typed/dynamic/BUILD index a74ba41c8ee..c32a81aaea2 100644 --- a/pkg/client/typed/dynamic/BUILD +++ b/pkg/client/typed/dynamic/BUILD @@ -21,8 +21,8 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/conversion/queryparams:go_default_library", "//pkg/runtime:go_default_library", @@ -43,8 +43,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/client/typed/dynamic/client.go b/pkg/client/typed/dynamic/client.go index 8fdb9a9232b..863645bd510 100644 --- a/pkg/client/typed/dynamic/client.go +++ b/pkg/client/typed/dynamic/client.go @@ -27,7 +27,7 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/conversion/queryparams" @@ -83,7 +83,7 @@ func (c *Client) GetRateLimiter() flowcontrol.RateLimiter { // Resource returns an API interface to the specified resource for this client's // group and version. If resource is not a namespaced resource, then namespace // is ignored. The ResourceClient inherits the parameter codec of c. -func (c *Client) Resource(resource *unversioned.APIResource, namespace string) *ResourceClient { +func (c *Client) Resource(resource *metav1.APIResource, namespace string) *ResourceClient { return &ResourceClient{ cl: c.cl, resource: resource, @@ -104,7 +104,7 @@ func (c *Client) ParameterCodec(parameterCodec runtime.ParameterCodec) *Client { // dynamic client. type ResourceClient struct { cl *restclient.RESTClient - resource *unversioned.APIResource + resource *metav1.APIResource ns string parameterCodec runtime.ParameterCodec } @@ -225,8 +225,8 @@ func (dynamicCodec) Decode(data []byte, gvk *schema.GroupVersionKind, obj runtim return nil, nil, err } - if _, ok := obj.(*unversioned.Status); !ok && strings.ToLower(gvk.Kind) == "status" { - obj = &unversioned.Status{} + if _, ok := obj.(*metav1.Status); !ok && strings.ToLower(gvk.Kind) == "status" { + obj = &metav1.Status{} err := json.Unmarshal(data, obj) if err != nil { return nil, nil, err diff --git a/pkg/client/typed/dynamic/client_test.go b/pkg/client/typed/dynamic/client_test.go index 5e0abdc9265..bb4f0856655 100644 --- a/pkg/client/typed/dynamic/client_test.go +++ b/pkg/client/typed/dynamic/client_test.go @@ -26,7 +26,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" @@ -117,7 +117,7 @@ func TestList(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "GET" { t.Errorf("List(%q) got HTTP method %s. wanted GET", tc.name, r.Method) @@ -172,7 +172,7 @@ func TestGet(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "GET" { t.Errorf("Get(%q) got HTTP method %s. wanted GET", tc.name, r.Method) @@ -204,9 +204,9 @@ func TestGet(t *testing.T) { } func TestDelete(t *testing.T) { - statusOK := &unversioned.Status{ - TypeMeta: unversioned.TypeMeta{Kind: "Status"}, - Status: unversioned.StatusSuccess, + statusOK := &metav1.Status{ + TypeMeta: metav1.TypeMeta{Kind: "Status"}, + Status: metav1.StatusSuccess, } tcs := []struct { namespace string @@ -225,7 +225,7 @@ func TestDelete(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "DELETE" { t.Errorf("Delete(%q) got HTTP method %s. wanted DELETE", tc.name, r.Method) @@ -253,9 +253,9 @@ func TestDelete(t *testing.T) { } func TestDeleteCollection(t *testing.T) { - statusOK := &unversioned.Status{ - TypeMeta: unversioned.TypeMeta{Kind: "Status"}, - Status: unversioned.StatusSuccess, + statusOK := &metav1.Status{ + TypeMeta: metav1.TypeMeta{Kind: "Status"}, + Status: metav1.StatusSuccess, } tcs := []struct { namespace string @@ -274,7 +274,7 @@ func TestDeleteCollection(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "DELETE" { t.Errorf("DeleteCollection(%q) got HTTP method %s. wanted DELETE", tc.name, r.Method) @@ -322,7 +322,7 @@ func TestCreate(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "POST" { t.Errorf("Create(%q) got HTTP method %s. wanted POST", tc.name, r.Method) @@ -381,7 +381,7 @@ func TestUpdate(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "PUT" { t.Errorf("Update(%q) got HTTP method %s. wanted PUT", tc.name, r.Method) @@ -448,7 +448,7 @@ func TestWatch(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "GET" { t.Errorf("Watch(%q) got HTTP method %s. wanted GET", tc.name, r.Method) @@ -508,7 +508,7 @@ func TestPatch(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "PATCH" { t.Errorf("Patch(%q) got HTTP method %s. wanted PATCH", tc.name, r.Method) diff --git a/pkg/client/typed/dynamic/dynamic_util.go b/pkg/client/typed/dynamic/dynamic_util.go index bc362a7f473..b251d4b6b5a 100644 --- a/pkg/client/typed/dynamic/dynamic_util.go +++ b/pkg/client/typed/dynamic/dynamic_util.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -35,7 +35,7 @@ func VersionInterfaces(schema.GroupVersion) (*meta.VersionInterfaces, error) { } // NewDiscoveryRESTMapper returns a RESTMapper based on discovery information. -func NewDiscoveryRESTMapper(resources []*unversioned.APIResourceList, versionFunc meta.VersionInterfacesFunc) (*meta.DefaultRESTMapper, error) { +func NewDiscoveryRESTMapper(resources []*metav1.APIResourceList, versionFunc meta.VersionInterfacesFunc) (*meta.DefaultRESTMapper, error) { rm := meta.NewDefaultRESTMapper(nil, versionFunc) for _, resourceList := range resources { gv, err := schema.ParseGroupVersion(resourceList.GroupVersion) @@ -62,7 +62,7 @@ type ObjectTyper struct { } // NewObjectTyper constructs an ObjectTyper from discovery information. -func NewObjectTyper(resources []*unversioned.APIResourceList) (runtime.ObjectTyper, error) { +func NewObjectTyper(resources []*metav1.APIResourceList) (runtime.ObjectTyper, error) { ot := &ObjectTyper{registered: make(map[schema.GroupVersionKind]bool)} for _, resourceList := range resources { gv, err := schema.ParseGroupVersion(resourceList.GroupVersion) diff --git a/pkg/client/typed/dynamic/dynamic_util_test.go b/pkg/client/typed/dynamic/dynamic_util_test.go index 3f4661562d0..d53bc69fb68 100644 --- a/pkg/client/typed/dynamic/dynamic_util_test.go +++ b/pkg/client/typed/dynamic/dynamic_util_test.go @@ -19,15 +19,15 @@ package dynamic import ( "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) func TestDiscoveryRESTMapper(t *testing.T) { - resources := []*unversioned.APIResourceList{ + resources := []*metav1.APIResourceList{ { GroupVersion: "test/beta1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ { Name: "test_kinds", Namespaced: true, diff --git a/pkg/client/unversioned/BUILD b/pkg/client/unversioned/BUILD index 8d8ba42a700..d03d5ab88f8 100644 --- a/pkg/client/unversioned/BUILD +++ b/pkg/client/unversioned/BUILD @@ -44,8 +44,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/client/unversioned/clientcmd/doc.go b/pkg/client/unversioned/clientcmd/doc.go index b5261697ba8..0c5979f1f7c 100644 --- a/pkg/client/unversioned/clientcmd/doc.go +++ b/pkg/client/unversioned/clientcmd/doc.go @@ -31,7 +31,7 @@ Sample usage from merged .kubeconfig files (local directory, home directory) if err != nil { // Do something } - client, err := unversioned.New(config) + client, err := metav1.New(config) // ... */ package clientcmd // import "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" diff --git a/pkg/client/unversioned/helper_test.go b/pkg/client/unversioned/helper_test.go index db5f3807961..2a3cef14ba6 100644 --- a/pkg/client/unversioned/helper_test.go +++ b/pkg/client/unversioned/helper_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" @@ -80,12 +80,12 @@ func TestSetKubernetesDefaults(t *testing.T) { func TestHelperGetServerAPIVersions(t *testing.T) { expect := []string{"v1", "v2", "v3"} - APIVersions := unversioned.APIVersions{Versions: expect} + APIVersions := metav1.APIVersions{Versions: expect} expect = append(expect, "group1/v1", "group1/v2", "group2/v1", "group2/v2") - APIGroupList := unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + APIGroupList := metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ { GroupVersion: "group1/v1", }, @@ -95,7 +95,7 @@ func TestHelperGetServerAPIVersions(t *testing.T) { }, }, { - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ { GroupVersion: "group2/v1", }, diff --git a/pkg/client/unversioned/remotecommand/BUILD b/pkg/client/unversioned/remotecommand/BUILD index 3db88956cdc..bb99348f27a 100644 --- a/pkg/client/unversioned/remotecommand/BUILD +++ b/pkg/client/unversioned/remotecommand/BUILD @@ -24,7 +24,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/transport:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", diff --git a/pkg/client/unversioned/remotecommand/v2.go b/pkg/client/unversioned/remotecommand/v2.go index ce2249080a0..88094b10b81 100644 --- a/pkg/client/unversioned/remotecommand/v2.go +++ b/pkg/client/unversioned/remotecommand/v2.go @@ -28,7 +28,7 @@ import ( ) // streamProtocolV2 implements version 2 of the streaming protocol for attach -// and exec. The original streaming protocol was unversioned. As a result, this +// and exec. The original streaming protocol was metav1. As a result, this // version is referred to as version 2, even though it is the first actual // numbered version. type streamProtocolV2 struct { diff --git a/pkg/client/unversioned/remotecommand/v4.go b/pkg/client/unversioned/remotecommand/v4.go index 5b8bb3ba55d..f88cd69e5ee 100644 --- a/pkg/client/unversioned/remotecommand/v4.go +++ b/pkg/client/unversioned/remotecommand/v4.go @@ -23,14 +23,14 @@ import ( "strconv" "sync" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" "k8s.io/kubernetes/pkg/util/exec" ) // streamProtocolV4 implements version 4 of the streaming protocol for attach // and exec. This version adds support for exit codes on the error stream through -// the use of unversioned.Status instead of plain text messages. +// the use of metav1.Status instead of plain text messages. type streamProtocolV4 struct { *streamProtocolV3 } @@ -75,20 +75,20 @@ func (p *streamProtocolV4) stream(conn streamCreator) error { return <-errorChan } -// errorDecoderV4 interprets the json-marshaled unversioned.Status on the error channel +// errorDecoderV4 interprets the json-marshaled metav1.Status on the error channel // and creates an exec.ExitError from it. type errorDecoderV4 struct{} func (d *errorDecoderV4) decode(message []byte) error { - status := unversioned.Status{} + status := metav1.Status{} err := json.Unmarshal(message, &status) if err != nil { return fmt.Errorf("error stream protocol error: %v in %q", err, string(message)) } switch status.Status { - case unversioned.StatusSuccess: + case metav1.StatusSuccess: return nil - case unversioned.StatusFailure: + case metav1.StatusFailure: if status.Reason == remotecommand.NonZeroExitCodeReason { if status.Details == nil { return errors.New("error stream protocol error: details must be set") diff --git a/pkg/client/unversioned/testclient/simple/BUILD b/pkg/client/unversioned/testclient/simple/BUILD index 4ae067539b0..bea283a5a54 100644 --- a/pkg/client/unversioned/testclient/simple/BUILD +++ b/pkg/client/unversioned/testclient/simple/BUILD @@ -17,8 +17,8 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/fields:go_default_library", diff --git a/pkg/client/unversioned/testclient/simple/simple_testclient.go b/pkg/client/unversioned/testclient/simple/simple_testclient.go index ad0371846e9..e02629ca767 100644 --- a/pkg/client/unversioned/testclient/simple/simple_testclient.go +++ b/pkg/client/unversioned/testclient/simple/simple_testclient.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -141,9 +141,9 @@ func (c *Client) ValidateCommon(t *testing.T, err error) { validator, ok := c.QueryValidator[key] if !ok { switch key { - case unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()): + case metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()): validator = ValidateLabels - case unversioned.FieldSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()): + case metav1.FieldSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()): validator = validateFields default: validator = func(a, b string) bool { return a == b } diff --git a/pkg/cloudprovider/providers/aws/BUILD b/pkg/cloudprovider/providers/aws/BUILD index ca7eea3aefa..48eb1cdcaaa 100644 --- a/pkg/cloudprovider/providers/aws/BUILD +++ b/pkg/cloudprovider/providers/aws/BUILD @@ -25,9 +25,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/service:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/credentialprovider/aws:go_default_library", "//pkg/types:go_default_library", @@ -57,8 +57,8 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/types:go_default_library", "//pkg/util/sets:go_default_library", "//vendor:github.com/aws/aws-sdk-go/aws", diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index b3f7c2ae572..92cfa5f6d46 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -41,7 +41,7 @@ import ( "github.com/aws/aws-sdk-go/service/elb" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/service" "k8s.io/kubernetes/pkg/cloudprovider" @@ -1694,12 +1694,12 @@ func (c *Cloud) GetVolumeLabels(volumeName KubernetesVolumeID) (map[string]strin return nil, fmt.Errorf("volume did not have AZ information: %q", info.VolumeId) } - labels[unversioned.LabelZoneFailureDomain] = az + labels[metav1.LabelZoneFailureDomain] = az region, err := azToRegion(az) if err != nil { return nil, err } - labels[unversioned.LabelZoneRegion] = region + labels[metav1.LabelZoneRegion] = region return labels, nil } diff --git a/pkg/cloudprovider/providers/aws/aws_test.go b/pkg/cloudprovider/providers/aws/aws_test.go index 7f81aad2090..350d2253a36 100644 --- a/pkg/cloudprovider/providers/aws/aws_test.go +++ b/pkg/cloudprovider/providers/aws/aws_test.go @@ -28,7 +28,7 @@ import ( "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/sets" @@ -1176,8 +1176,8 @@ func TestGetVolumeLabels(t *testing.T) { assert.Nil(t, err, "Error creating Volume %v", err) assert.Equal(t, map[string]string{ - unversioned.LabelZoneFailureDomain: "us-east-1a", - unversioned.LabelZoneRegion: "us-east-1"}, labels) + metav1.LabelZoneFailureDomain: "us-east-1a", + metav1.LabelZoneRegion: "us-east-1"}, labels) awsServices.ec2.AssertExpectations(t) } diff --git a/pkg/cloudprovider/providers/gce/BUILD b/pkg/cloudprovider/providers/gce/BUILD index 52d263fcc29..324265d0ddc 100644 --- a/pkg/cloudprovider/providers/gce/BUILD +++ b/pkg/cloudprovider/providers/gce/BUILD @@ -19,9 +19,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/service:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/types:go_default_library", "//pkg/util/errors:go_default_library", diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index a4063718b27..2c2ed11ab59 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -30,7 +30,7 @@ import ( "gopkg.in/gcfg.v1" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apiservice "k8s.io/kubernetes/pkg/api/v1/service" "k8s.io/kubernetes/pkg/cloudprovider" @@ -2582,8 +2582,8 @@ func (gce *GCECloud) GetAutoLabelsForPD(name string, zone string) (map[string]st } labels := make(map[string]string) - labels[unversioned.LabelZoneFailureDomain] = zone - labels[unversioned.LabelZoneRegion] = region + labels[metav1.LabelZoneFailureDomain] = zone + labels[metav1.LabelZoneRegion] = region return labels, nil } diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index eefa855aead..2e23dfddc2b 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -24,10 +24,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", @@ -57,9 +57,9 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/record:go_default_library", diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 853a2615973..3933d45d58e 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -685,14 +685,14 @@ func (s ActivePods) Less(i, j int) bool { // afterOrZero checks if time t1 is after time t2; if one of them // is zero, the zero time is seen as after non-zero time. -func afterOrZero(t1, t2 unversioned.Time) bool { +func afterOrZero(t1, t2 metav1.Time) bool { if t1.Time.IsZero() || t2.Time.IsZero() { return t1.Time.IsZero() } return t1.After(t2.Time) } -func podReadyTime(pod *v1.Pod) unversioned.Time { +func podReadyTime(pod *v1.Pod) metav1.Time { if v1.IsPodReady(pod) { for _, c := range pod.Status.Conditions { // we only care about pod ready conditions @@ -701,7 +701,7 @@ func podReadyTime(pod *v1.Pod) unversioned.Time { } } } - return unversioned.Time{} + return metav1.Time{} } func maxContainerRestarts(pod *v1.Pod) int { diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index a802e705f25..ff60f2dd950 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/cache" @@ -56,7 +56,7 @@ func NewFakeControllerExpectationsLookup(ttl time.Duration) (*ControllerExpectat func newReplicationController(replicas int) *v1.ReplicationController { rc := &v1.ReplicationController{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -328,7 +328,7 @@ func TestSortingActivePods(t *testing.T) { pods[3].Spec.NodeName = "foo" pods[3].Status.Phase = v1.PodRunning // pods[4] is running and ready but without LastTransitionTime. - now := unversioned.Now() + now := metav1.Now() pods[4].Spec.NodeName = "foo" pods[4].Status.Phase = v1.PodRunning pods[4].Status.Conditions = []v1.PodCondition{{Type: v1.PodReady, Status: v1.ConditionTrue}} @@ -339,7 +339,7 @@ func TestSortingActivePods(t *testing.T) { pods[5].Status.Conditions = []v1.PodCondition{{Type: v1.PodReady, Status: v1.ConditionTrue, LastTransitionTime: now}} pods[5].Status.ContainerStatuses = []v1.ContainerStatus{{RestartCount: 3}, {RestartCount: 0}} // pods[6] is running ready for a longer time than pods[5]. - then := unversioned.Time{Time: now.AddDate(0, -1, 0)} + then := metav1.Time{Time: now.AddDate(0, -1, 0)} pods[6].Spec.NodeName = "foo" pods[6].Status.Phase = v1.PodRunning pods[6].Status.Conditions = []v1.PodCondition{{Type: v1.PodReady, Status: v1.ConditionTrue, LastTransitionTime: then}} diff --git a/pkg/controller/cronjob/BUILD b/pkg/controller/cronjob/BUILD index 41ebb8ba97f..ccb6416e6d9 100644 --- a/pkg/controller/cronjob/BUILD +++ b/pkg/controller/cronjob/BUILD @@ -22,9 +22,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", "//pkg/client/record:go_default_library", @@ -50,9 +50,9 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/record:go_default_library", "//pkg/types:go_default_library", ], diff --git a/pkg/controller/cronjob/controller.go b/pkg/controller/cronjob/controller.go index 7ec35a1315f..f6389eed8fe 100644 --- a/pkg/controller/cronjob/controller.go +++ b/pkg/controller/cronjob/controller.go @@ -35,7 +35,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -222,7 +222,7 @@ func SyncOne(sj batch.CronJob, js []batch.Job, now time.Time, jc jobControlInter } } // remove all pods... - selector, _ := unversioned.LabelSelectorAsSelector(job.Spec.Selector) + selector, _ := metav1.LabelSelectorAsSelector(job.Spec.Selector) options := v1.ListOptions{LabelSelector: selector.String()} podList, err := pc.ListPods(job.Namespace, options) if err != nil { @@ -284,7 +284,7 @@ func SyncOne(sj batch.CronJob, js []batch.Job, now time.Time, jc jobControlInter } else { sj.Status.Active = append(sj.Status.Active, *ref) } - sj.Status.LastScheduleTime = &unversioned.Time{Time: scheduledTime} + sj.Status.LastScheduleTime = &metav1.Time{Time: scheduledTime} if _, err := sjc.UpdateStatus(&sj); err != nil { glog.Infof("Unable to update status for %s (rv = %s): %v", nameForLog, sj.ResourceVersion, err) } diff --git a/pkg/controller/cronjob/controller_test.go b/pkg/controller/cronjob/controller_test.go index 28042a15e0c..8b33a997178 100644 --- a/pkg/controller/cronjob/controller_test.go +++ b/pkg/controller/cronjob/controller_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/client/record" @@ -80,7 +80,7 @@ func cronJob() batch.CronJob { Namespace: "snazzycats", UID: types.UID("1a2b3c"), SelfLink: "/apis/batch/v2alpha1/namespaces/snazzycats/cronjobs/mycronjob", - CreationTimestamp: unversioned.Time{Time: justBeforeTheHour()}, + CreationTimestamp: metav1.Time{Time: justBeforeTheHour()}, }, Spec: batch.CronJobSpec{ Schedule: "* * * * ?", @@ -204,8 +204,8 @@ func TestSyncOne_RunOrNot(t *testing.T) { ) js := []batch.Job{} if tc.ranPreviously { - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: justBeforeThePriorHour()} - sj.Status.LastScheduleTime = &unversioned.Time{Time: justAfterThePriorHour()} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: justBeforeThePriorHour()} + sj.Status.LastScheduleTime = &metav1.Time{Time: justAfterThePriorHour()} job, err = getJobFromTemplate(&sj, sj.Status.LastScheduleTime.Time) if err != nil { t.Fatalf("%s: nexpected error creating a job from template: %v", name, err) @@ -217,7 +217,7 @@ func TestSyncOne_RunOrNot(t *testing.T) { js = append(js, *job) } } else { - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: justBeforeTheHour()} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: justBeforeTheHour()} if tc.stillActive { t.Errorf("%s: test setup error: this case makes no sense", name) } @@ -346,13 +346,13 @@ func TestSyncOne_Status(t *testing.T) { sj.Spec.StartingDeadlineSeconds = &tc.deadline } if tc.ranPreviously { - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: justBeforeThePriorHour()} - sj.Status.LastScheduleTime = &unversioned.Time{Time: justAfterThePriorHour()} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: justBeforeThePriorHour()} + sj.Status.LastScheduleTime = &metav1.Time{Time: justAfterThePriorHour()} } else { if tc.hasFinishedJob || tc.hasUnexpectedJob { t.Errorf("%s: test setup error: this case makes no sense", name) } - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: justBeforeTheHour()} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: justBeforeTheHour()} } jobs := []batch.Job{} if tc.hasFinishedJob { diff --git a/pkg/controller/cronjob/utils_test.go b/pkg/controller/cronjob/utils_test.go index 8a9e57b683a..76ed9e4c52a 100644 --- a/pkg/controller/cronjob/utils_test.go +++ b/pkg/controller/cronjob/utils_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/types" @@ -107,7 +107,7 @@ func TestGetParentUIDFromJob(t *testing.T) { Namespace: v1.NamespaceDefault, }, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar"}, }, Template: v1.PodTemplateSpec{ @@ -284,7 +284,7 @@ func TestGetRecentUnmetScheduleTimes(t *testing.T) { { // Case 1: no known start times, and none needed yet. // Creation time is before T1. - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: T1.Add(-10 * time.Minute)} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: T1.Add(-10 * time.Minute)} // Current time is more than creation time, but less than T1. now := T1.Add(-7 * time.Minute) times, err := getRecentUnmetScheduleTimes(sj, now) @@ -298,7 +298,7 @@ func TestGetRecentUnmetScheduleTimes(t *testing.T) { { // Case 2: no known start times, and one needed. // Creation time is before T1. - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: T1.Add(-10 * time.Minute)} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: T1.Add(-10 * time.Minute)} // Current time is after T1 now := T1.Add(2 * time.Second) times, err := getRecentUnmetScheduleTimes(sj, now) @@ -314,9 +314,9 @@ func TestGetRecentUnmetScheduleTimes(t *testing.T) { { // Case 3: known LastScheduleTime, no start needed. // Creation time is before T1. - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: T1.Add(-10 * time.Minute)} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: T1.Add(-10 * time.Minute)} // Status shows a start at the expected time. - sj.Status.LastScheduleTime = &unversioned.Time{Time: T1} + sj.Status.LastScheduleTime = &metav1.Time{Time: T1} // Current time is after T1 now := T1.Add(2 * time.Minute) times, err := getRecentUnmetScheduleTimes(sj, now) @@ -330,9 +330,9 @@ func TestGetRecentUnmetScheduleTimes(t *testing.T) { { // Case 4: known LastScheduleTime, a start needed // Creation time is before T1. - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: T1.Add(-10 * time.Minute)} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: T1.Add(-10 * time.Minute)} // Status shows a start at the expected time. - sj.Status.LastScheduleTime = &unversioned.Time{Time: T1} + sj.Status.LastScheduleTime = &metav1.Time{Time: T1} // Current time is after T1 and after T2 now := T2.Add(5 * time.Minute) times, err := getRecentUnmetScheduleTimes(sj, now) @@ -347,8 +347,8 @@ func TestGetRecentUnmetScheduleTimes(t *testing.T) { } { // Case 5: known LastScheduleTime, two starts needed - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: T1.Add(-2 * time.Hour)} - sj.Status.LastScheduleTime = &unversioned.Time{Time: T1.Add(-1 * time.Hour)} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: T1.Add(-2 * time.Hour)} + sj.Status.LastScheduleTime = &metav1.Time{Time: T1.Add(-1 * time.Hour)} // Current time is after T1 and after T2 now := T2.Add(5 * time.Minute) times, err := getRecentUnmetScheduleTimes(sj, now) @@ -368,8 +368,8 @@ func TestGetRecentUnmetScheduleTimes(t *testing.T) { } { // Case 6: now is way way ahead of last start time. - sj.ObjectMeta.CreationTimestamp = unversioned.Time{Time: T1.Add(-2 * time.Hour)} - sj.Status.LastScheduleTime = &unversioned.Time{Time: T1.Add(-1 * time.Hour)} + sj.ObjectMeta.CreationTimestamp = metav1.Time{Time: T1.Add(-2 * time.Hour)} + sj.Status.LastScheduleTime = &metav1.Time{Time: T1.Add(-1 * time.Hour)} now := T2.Add(10 * 24 * time.Hour) _, err := getRecentUnmetScheduleTimes(sj, now) if err == nil { diff --git a/pkg/controller/daemon/BUILD b/pkg/controller/daemon/BUILD index 7484407b821..67d98e250e1 100644 --- a/pkg/controller/daemon/BUILD +++ b/pkg/controller/daemon/BUILD @@ -18,9 +18,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", @@ -48,10 +48,10 @@ go_test( deps = [ "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index ed0eef1b483..71a79ee9e77 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" @@ -287,7 +287,7 @@ func isDaemonSetMatch(pod *v1.Pod, ds *extensions.DaemonSet) bool { if ds.Namespace != pod.Namespace { return false } - selector, err := unversioned.LabelSelectorAsSelector(ds.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(ds.Spec.Selector) if err != nil { err = fmt.Errorf("invalid selector: %v", err) return false @@ -414,7 +414,7 @@ func (dsc *DaemonSetsController) updateNode(old, cur interface{}) { // getNodesToDaemonSetPods returns a map from nodes to daemon pods (corresponding to ds) running on the nodes. func (dsc *DaemonSetsController) getNodesToDaemonPods(ds *extensions.DaemonSet) (map[string][]*v1.Pod, error) { nodeToDaemonPods := make(map[string][]*v1.Pod) - selector, err := unversioned.LabelSelectorAsSelector(ds.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(ds.Spec.Selector) if err != nil { return nil, err } @@ -621,7 +621,7 @@ func (dsc *DaemonSetsController) syncDaemonSet(key string) error { } ds := obj.(*extensions.DaemonSet) - everything := unversioned.LabelSelector{} + everything := metav1.LabelSelector{} if reflect.DeepEqual(ds.Spec.Selector, &everything) { dsc.eventRecorder.Eventf(ds, v1.EventTypeWarning, "SelectingAll", "This daemon set is selecting all pods. A non-empty selector is required.") return nil diff --git a/pkg/controller/daemon/daemoncontroller_test.go b/pkg/controller/daemon/daemoncontroller_test.go index b0f4e7f472d..9dbf8ed0e72 100644 --- a/pkg/controller/daemon/daemoncontroller_test.go +++ b/pkg/controller/daemon/daemoncontroller_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -54,13 +54,13 @@ func getKey(ds *extensions.DaemonSet, t *testing.T) string { func newDaemonSet(name string) *extensions.DaemonSet { return &extensions.DaemonSet{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Extensions.GroupVersion().String()}, + TypeMeta: metav1.TypeMeta{APIVersion: testapi.Extensions.GroupVersion().String()}, ObjectMeta: v1.ObjectMeta{ Name: name, Namespace: v1.NamespaceDefault, }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: simpleDaemonSetLabel}, + Selector: &metav1.LabelSelector{MatchLabels: simpleDaemonSetLabel}, Template: v1.PodTemplateSpec{ ObjectMeta: v1.ObjectMeta{ Labels: simpleDaemonSetLabel, @@ -83,7 +83,7 @@ func newDaemonSet(name string) *extensions.DaemonSet { func newNode(name string, label map[string]string) *v1.Node { return &v1.Node{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ Name: name, Labels: label, @@ -108,7 +108,7 @@ func addNodes(nodeStore cache.Store, startIndex, numNodes int, label map[string] func newPod(podName string, nodeName string, label map[string]string) *v1.Pod { pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ GenerateName: podName, Labels: label, @@ -311,7 +311,7 @@ func TestDontDoAnythingIfBeingDeleted(t *testing.T) { }) ds := newDaemonSet("foo") ds.Spec.Template.Spec = podSpec - now := unversioned.Now() + now := metav1.Now() ds.DeletionTimestamp = &now manager.dsStore.Add(ds) syncAndValidateDaemonSets(t, manager, ds, podControl, 0, 0) @@ -426,7 +426,7 @@ func TestPodIsNotDeletedByDaemonsetWithEmptyLabelSelector(t *testing.T) { // should detect this misconfiguration and choose not to sync the DaemonSet. We should // not observe a deletion of the pod on node1. ds := newDaemonSet("foo") - ls := unversioned.LabelSelector{} + ls := metav1.LabelSelector{} ds.Spec.Selector = &ls ds.Spec.Template.Spec.NodeSelector = map[string]string{"foo": "bar"} manager.dsStore.Add(ds) @@ -583,7 +583,7 @@ func TestNumberReadyStatus(t *testing.T) { t.Errorf("Wrong daemon %s status: %v", daemon.Name, daemon.Status) } - selector, _ := unversioned.LabelSelectorAsSelector(daemon.Spec.Selector) + selector, _ := metav1.LabelSelectorAsSelector(daemon.Spec.Selector) daemonPods, _ := manager.podStore.Pods(daemon.Namespace).List(selector) for _, pod := range daemonPods { condition := v1.PodCondition{Type: v1.PodReady, Status: v1.ConditionTrue} diff --git a/pkg/controller/deployment/BUILD b/pkg/controller/deployment/BUILD index 3e7739e0082..0867df21808 100644 --- a/pkg/controller/deployment/BUILD +++ b/pkg/controller/deployment/BUILD @@ -24,9 +24,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", @@ -59,10 +59,10 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/record:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 7a8fe1eb748..362b9a2d12f 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" @@ -332,7 +332,7 @@ func (dc *DeploymentController) syncDeployment(key string) error { return err } - everything := unversioned.LabelSelector{} + everything := metav1.LabelSelector{} if reflect.DeepEqual(d.Spec.Selector, &everything) { dc.eventRecorder.Eventf(d, v1.EventTypeWarning, "SelectingAll", "This deployment is selecting all pods. A non-empty selector is required.") if d.Status.ObservedGeneration < d.Generation { diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index 7cffe3d62ac..8ddc8f331a1 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/pkg/controller/deployment/deployment_controller_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -37,10 +37,10 @@ import ( var ( alwaysReady = func() bool { return true } - noTimestamp = unversioned.Time{} + noTimestamp = metav1.Time{} ) -func rs(name string, replicas int, selector map[string]string, timestamp unversioned.Time) *extensions.ReplicaSet { +func rs(name string, replicas int, selector map[string]string, timestamp metav1.Time) *extensions.ReplicaSet { return &extensions.ReplicaSet{ ObjectMeta: v1.ObjectMeta{ Name: name, @@ -49,7 +49,7 @@ func rs(name string, replicas int, selector map[string]string, timestamp unversi }, Spec: extensions.ReplicaSetSpec{ Replicas: func() *int32 { i := int32(replicas); return &i }(), - Selector: &unversioned.LabelSelector{MatchLabels: selector}, + Selector: &metav1.LabelSelector{MatchLabels: selector}, Template: v1.PodTemplateSpec{}, }, } @@ -65,7 +65,7 @@ func newRSWithStatus(name string, specReplicas, statusReplicas int, selector map func newDeployment(name string, replicas int, revisionHistoryLimit *int32, maxSurge, maxUnavailable *intstr.IntOrString, selector map[string]string) *extensions.Deployment { d := extensions.Deployment{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(extensions.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(extensions.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: name, @@ -80,7 +80,7 @@ func newDeployment(name string, replicas int, revisionHistoryLimit *int32, maxSu }, }, Replicas: func() *int32 { i := int32(replicas); return &i }(), - Selector: &unversioned.LabelSelector{MatchLabels: selector}, + Selector: &metav1.LabelSelector{MatchLabels: selector}, Template: v1.PodTemplateSpec{ ObjectMeta: v1.ObjectMeta{ Labels: selector, @@ -228,7 +228,7 @@ func TestSyncDeploymentDontDoAnythingDuringDeletion(t *testing.T) { f := newFixture(t) d := newDeployment("foo", 1, nil, nil, nil, map[string]string{"foo": "bar"}) - now := unversioned.Now() + now := metav1.Now() d.DeletionTimestamp = &now f.dLister = append(f.dLister, d) @@ -250,7 +250,7 @@ func TestDeploymentController_dontSyncDeploymentsWithEmptyPodSelector(t *testing informers.Start(stopCh) d := newDeployment("foo", 1, nil, nil, nil, map[string]string{"foo": "bar"}) - empty := unversioned.LabelSelector{} + empty := metav1.LabelSelector{} d.Spec.Selector = &empty controller.dLister.Indexer.Add(d) // We expect the deployment controller to not take action here since it's configuration diff --git a/pkg/controller/deployment/sync.go b/pkg/controller/deployment/sync.go index 0379fbe1c28..05362472186 100644 --- a/pkg/controller/deployment/sync.go +++ b/pkg/controller/deployment/sync.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" @@ -203,7 +203,7 @@ func (dc *DeploymentController) addHashKeyToRSAndPods(rs *extensions.ReplicaSet) glog.V(4).Infof("Observed the update of %s %s/%s's pod template with hash %s.", rs.Kind, rs.Namespace, rs.Name, hash) // 2. Update all pods managed by the rs to have the new hash label, so they will be correctly adopted. - selector, err := unversioned.LabelSelectorAsSelector(updatedRS.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(updatedRS.Spec.Selector) if err != nil { return nil, fmt.Errorf("error in converting selector to label selector for replica set %s: %s", updatedRS.Name, err) } diff --git a/pkg/controller/deployment/sync_test.go b/pkg/controller/deployment/sync_test.go index 6baae690905..b4e0263feec 100644 --- a/pkg/controller/deployment/sync_test.go +++ b/pkg/controller/deployment/sync_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" @@ -37,9 +37,9 @@ func maxSurge(val int) *intstr.IntOrString { } func TestScale(t *testing.T) { - newTimestamp := unversioned.Date(2016, 5, 20, 2, 0, 0, 0, time.UTC) - oldTimestamp := unversioned.Date(2016, 5, 20, 1, 0, 0, 0, time.UTC) - olderTimestamp := unversioned.Date(2016, 5, 20, 0, 0, 0, 0, time.UTC) + newTimestamp := metav1.Date(2016, 5, 20, 2, 0, 0, 0, time.UTC) + oldTimestamp := metav1.Date(2016, 5, 20, 1, 0, 0, 0, time.UTC) + olderTimestamp := metav1.Date(2016, 5, 20, 0, 0, 0, 0, time.UTC) var updatedTemplate = func(replicas int) *extensions.Deployment { d := newDeployment("foo", replicas, nil, nil, nil, map[string]string{"foo": "bar"}) diff --git a/pkg/controller/deployment/util/BUILD b/pkg/controller/deployment/util/BUILD index f9af42154a2..e52c6beac8c 100644 --- a/pkg/controller/deployment/util/BUILD +++ b/pkg/controller/deployment/util/BUILD @@ -18,10 +18,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/annotations:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/controller:go_default_library", "//pkg/labels:go_default_library", @@ -43,9 +43,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/testing/core:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/controller/deployment/util/deployment_util.go b/pkg/controller/deployment/util/deployment_util.go index 92df779438d..84fa25d3a6c 100644 --- a/pkg/controller/deployment/util/deployment_util.go +++ b/pkg/controller/deployment/util/deployment_util.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/annotations" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" internalextensions "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -114,8 +114,8 @@ func NewDeploymentCondition(condType extensions.DeploymentConditionType, status return &extensions.DeploymentCondition{ Type: condType, Status: status, - LastUpdateTime: unversioned.Now(), - LastTransitionTime: unversioned.Now(), + LastUpdateTime: metav1.Now(), + LastTransitionTime: metav1.Now(), Reason: reason, Message: message, } @@ -568,7 +568,7 @@ func ListReplicaSets(deployment *extensions.Deployment, getRSList rsListFunc) ([ // should be a superset of the deployment's selector, see https://github.com/kubernetes/kubernetes/issues/19830; // or use controllerRef, see https://github.com/kubernetes/kubernetes/issues/2210 namespace := deployment.Namespace - selector, err := unversioned.LabelSelectorAsSelector(deployment.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(deployment.Spec.Selector) if err != nil { return nil, err } @@ -579,7 +579,7 @@ func ListReplicaSets(deployment *extensions.Deployment, getRSList rsListFunc) ([ // ListPods returns a list of pods the given deployment targets. func ListPods(deployment *extensions.Deployment, getPodList podListFunc) (*v1.PodList, error) { namespace := deployment.Namespace - selector, err := unversioned.LabelSelectorAsSelector(deployment.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(deployment.Spec.Selector) if err != nil { return nil, err } @@ -643,7 +643,7 @@ func FindOldReplicaSets(deployment *extensions.Deployment, rsList []*extensions. for _, pod := range podList.Items { podLabelsSelector := labels.Set(pod.ObjectMeta.Labels) for _, rs := range rsList { - rsLabelsSelector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector) + rsLabelsSelector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector) if err != nil { return nil, nil, fmt.Errorf("invalid label selector: %v", err) } @@ -1000,7 +1000,7 @@ func SelectorUpdatedBefore(d1, d2 *extensions.Deployment) bool { } // LastSelectorUpdate returns the last time given deployment's selector is updated -func LastSelectorUpdate(d *extensions.Deployment) unversioned.Time { +func LastSelectorUpdate(d *extensions.Deployment) metav1.Time { t := d.Annotations[SelectorUpdateAnnotation] if len(t) > 0 { parsedTime, err := time.Parse(t, time.RFC3339) @@ -1008,7 +1008,7 @@ func LastSelectorUpdate(d *extensions.Deployment) unversioned.Time { if err != nil { return d.CreationTimestamp } - return unversioned.Time{Time: parsedTime} + return metav1.Time{Time: parsedTime} } // If it's never updated, use creation timestamp instead return d.CreationTimestamp @@ -1036,11 +1036,11 @@ func OverlapsWith(current, other *extensions.Deployment) (bool, error) { if current.UID == other.UID { return false, nil } - currentSelector, err := unversioned.LabelSelectorAsSelector(current.Spec.Selector) + currentSelector, err := metav1.LabelSelectorAsSelector(current.Spec.Selector) if err != nil { return false, fmt.Errorf("deployment %s/%s has invalid label selector: %v", current.Namespace, current.Name, err) } - otherSelector, err := unversioned.LabelSelectorAsSelector(other.Spec.Selector) + otherSelector, err := metav1.LabelSelectorAsSelector(other.Spec.Selector) if err != nil { // Broken selectors from other deployments shouldn't block current deployment. Just log the error and continue. glog.V(2).Infof("Skip overlapping check: deployment %s/%s has invalid label selector: %v", other.Namespace, other.Name, err) diff --git a/pkg/controller/deployment/util/deployment_util_test.go b/pkg/controller/deployment/util/deployment_util_test.go index 1bc31a9ba2a..d51aeda86c9 100644 --- a/pkg/controller/deployment/util/deployment_util_test.go +++ b/pkg/controller/deployment/util/deployment_util_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" @@ -91,7 +91,7 @@ func newPod(now time.Time, ready bool, beforeSec int) v1.Pod { Conditions: []v1.PodCondition{ { Type: v1.PodReady, - LastTransitionTime: unversioned.NewTime(now.Add(-1 * time.Duration(beforeSec) * time.Second)), + LastTransitionTime: metav1.NewTime(now.Add(-1 * time.Duration(beforeSec) * time.Second)), Status: conditionStatus, }, }, @@ -135,7 +135,7 @@ func generateRSWithLabel(labels map[string]string, image string) extensions.Repl }, Spec: extensions.ReplicaSetSpec{ Replicas: func(i int32) *int32 { return &i }(1), - Selector: &unversioned.LabelSelector{MatchLabels: labels}, + Selector: &metav1.LabelSelector{MatchLabels: labels}, Template: v1.PodTemplateSpec{ ObjectMeta: v1.ObjectMeta{ Labels: labels, @@ -166,7 +166,7 @@ func generateRS(deployment extensions.Deployment) extensions.ReplicaSet { Spec: extensions.ReplicaSetSpec{ Replicas: func() *int32 { i := int32(0); return &i }(), Template: template, - Selector: &unversioned.LabelSelector{MatchLabels: template.Labels}, + Selector: &metav1.LabelSelector{MatchLabels: template.Labels}, }, } } @@ -181,7 +181,7 @@ func generateDeployment(image string) extensions.Deployment { }, Spec: extensions.DeploymentSpec{ Replicas: func(i int32) *int32 { return &i }(1), - Selector: &unversioned.LabelSelector{MatchLabels: podLabels}, + Selector: &metav1.LabelSelector{MatchLabels: podLabels}, Template: v1.PodTemplateSpec{ ObjectMeta: v1.ObjectMeta{ Labels: podLabels, @@ -1060,7 +1060,7 @@ func TestDeploymentTimedOut(t *testing.T) { { Type: condType, Status: status, - LastUpdateTime: unversioned.Time{Time: from}, + LastUpdateTime: metav1.Time{Time: from}, }, }, }, diff --git a/pkg/controller/disruption/BUILD b/pkg/controller/disruption/BUILD index 0b2ba48769c..9ed01817b8a 100644 --- a/pkg/controller/disruption/BUILD +++ b/pkg/controller/disruption/BUILD @@ -16,9 +16,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", @@ -44,10 +44,10 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/record:go_default_library", diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index 805663794d2..48ab2e1917c 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" @@ -400,7 +400,7 @@ func (dc *DisruptionController) getPdbForPod(pod *v1.Pod) *policy.PodDisruptionB } func (dc *DisruptionController) getPodsForPdb(pdb *policy.PodDisruptionBudget) ([]*v1.Pod, error) { - sel, err := unversioned.LabelSelectorAsSelector(pdb.Spec.Selector) + sel, err := metav1.LabelSelectorAsSelector(pdb.Spec.Selector) if sel.Empty() { return []*v1.Pod{}, nil } @@ -582,7 +582,7 @@ func (dc *DisruptionController) getExpectedPodCount(pdb *policy.PodDisruptionBud return } -func countHealthyPods(pods []*v1.Pod, disruptedPods map[string]unversioned.Time, currentTime time.Time) (currentHealthy int32) { +func countHealthyPods(pods []*v1.Pod, disruptedPods map[string]metav1.Time, currentTime time.Time) (currentHealthy int32) { Pod: for _, pod := range pods { // Pod is beeing deleted. @@ -604,9 +604,9 @@ Pod: // Builds new PodDisruption map, possibly removing items that refer to non-existing, already deleted // or not-deleted at all items. Also returns an information when this check should be repeated. -func (dc *DisruptionController) buildDisruptedPodMap(pods []*v1.Pod, pdb *policy.PodDisruptionBudget, currentTime time.Time) (map[string]unversioned.Time, *time.Time) { +func (dc *DisruptionController) buildDisruptedPodMap(pods []*v1.Pod, pdb *policy.PodDisruptionBudget, currentTime time.Time) (map[string]metav1.Time, *time.Time) { disruptedPods := pdb.Status.DisruptedPods - result := make(map[string]unversioned.Time) + result := make(map[string]metav1.Time) var recheckTime *time.Time if disruptedPods == nil || len(disruptedPods) == 0 { @@ -655,7 +655,7 @@ func (dc *DisruptionController) failSafe(pdb *policy.PodDisruptionBudget) error } func (dc *DisruptionController) updatePdbStatus(pdb *policy.PodDisruptionBudget, currentHealthy, desiredHealthy, expectedCount int32, - disruptedPods map[string]unversioned.Time) error { + disruptedPods map[string]metav1.Time) error { // We require expectedCount to be > 0 so that PDBs which currently match no // pods are in a safe state when their first pods appear but this controller diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index 7eb8a5657e8..0024e9657f9 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_test.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -58,7 +58,7 @@ func (ps *pdbStates) Get(key string) policy.PodDisruptionBudget { } func (ps *pdbStates) VerifyPdbStatus(t *testing.T, key string, disruptionsAllowed, currentHealthy, desiredHealthy, expectedPods int32, - disruptedPodMap map[string]unversioned.Time) { + disruptedPodMap map[string]metav1.Time) { actualPDB := ps.Get(key) expectedStatus := policy.PodDisruptionBudgetStatus{ PodDisruptionsAllowed: disruptionsAllowed, @@ -105,18 +105,18 @@ func fooBar() map[string]string { return map[string]string{"foo": "bar"} } -func newSel(labels map[string]string) *unversioned.LabelSelector { - return &unversioned.LabelSelector{MatchLabels: labels} +func newSel(labels map[string]string) *metav1.LabelSelector { + return &metav1.LabelSelector{MatchLabels: labels} } -func newSelFooBar() *unversioned.LabelSelector { +func newSelFooBar() *metav1.LabelSelector { return newSel(map[string]string{"foo": "bar"}) } func newPodDisruptionBudget(t *testing.T, minAvailable intstr.IntOrString) (*policy.PodDisruptionBudget, string) { pdb := &policy.PodDisruptionBudget{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -139,7 +139,7 @@ func newPodDisruptionBudget(t *testing.T, minAvailable intstr.IntOrString) (*pol func newPod(t *testing.T, name string) (*v1.Pod, string) { pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Annotations: make(map[string]string), @@ -166,7 +166,7 @@ func newPod(t *testing.T, name string) (*v1.Pod, string) { func newReplicationController(t *testing.T, size int32) (*v1.ReplicationController, string) { rc := &v1.ReplicationController{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -190,7 +190,7 @@ func newReplicationController(t *testing.T, size int32) (*v1.ReplicationControll func newDeployment(t *testing.T, size int32) (*extensions.Deployment, string) { d := &extensions.Deployment{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -214,7 +214,7 @@ func newDeployment(t *testing.T, size int32) (*extensions.Deployment, string) { func newReplicaSet(t *testing.T, size int32) (*extensions.ReplicaSet, string) { rs := &extensions.ReplicaSet{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -253,16 +253,16 @@ func TestNoSelector(t *testing.T) { dc, ps := newFakeDisruptionController() pdb, pdbName := newPodDisruptionBudget(t, intstr.FromInt(3)) - pdb.Spec.Selector = &unversioned.LabelSelector{} + pdb.Spec.Selector = &metav1.LabelSelector{} pod, _ := newPod(t, "yo-yo-yo") add(t, dc.pdbLister.Store, pdb) dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 0, 0, 3, 0, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, 0, 3, 0, map[string]metav1.Time{}) add(t, dc.podLister.Indexer, pod) dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 0, 0, 3, 0, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, 0, 3, 0, map[string]metav1.Time{}) } // Verify that available/expected counts go up as we add pods, then verify that @@ -277,13 +277,13 @@ func TestUnavailable(t *testing.T) { // Add three pods, verifying that the counts go up at each step. pods := []*v1.Pod{} for i := int32(0); i < 4; i++ { - ps.VerifyPdbStatus(t, pdbName, 0, i, 3, i, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, i, 3, i, map[string]metav1.Time{}) pod, _ := newPod(t, fmt.Sprintf("yo-yo-yo %d", i)) pods = append(pods, pod) add(t, dc.podLister.Indexer, pod) dc.sync(pdbName) } - ps.VerifyPdbStatus(t, pdbName, 1, 4, 3, 4, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 1, 4, 3, 4, map[string]metav1.Time{}) // Now set one pod as unavailable pods[0].Status.Conditions = []v1.PodCondition{} @@ -291,7 +291,7 @@ func TestUnavailable(t *testing.T) { dc.sync(pdbName) // Verify expected update - ps.VerifyPdbStatus(t, pdbName, 0, 3, 3, 4, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, 3, 3, 4, map[string]metav1.Time{}) } // Create a pod with no controller, and verify that a PDB with a percentage @@ -325,7 +325,7 @@ func TestReplicaSet(t *testing.T) { pod, _ := newPod(t, "pod") add(t, dc.podLister.Indexer, pod) dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 0, 1, 2, 10, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, 1, 2, 10, map[string]metav1.Time{}) } // Verify that multiple controllers doesn't allow the PDB to be set true. @@ -386,7 +386,7 @@ func TestReplicationController(t *testing.T) { // It starts out at 0 expected because, with no pods, the PDB doesn't know // about the RC. This is a known bug. TODO(mml): file issue - ps.VerifyPdbStatus(t, pdbName, 0, 0, 0, 0, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, 0, 0, 0, map[string]metav1.Time{}) pods := []*v1.Pod{} @@ -397,9 +397,9 @@ func TestReplicationController(t *testing.T) { add(t, dc.podLister.Indexer, pod) dc.sync(pdbName) if i < 2 { - ps.VerifyPdbStatus(t, pdbName, 0, i+1, 2, 3, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, i+1, 2, 3, map[string]metav1.Time{}) } else { - ps.VerifyPdbStatus(t, pdbName, 1, 3, 2, 3, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 1, 3, 2, 3, map[string]metav1.Time{}) } } @@ -438,7 +438,7 @@ func TestTwoControllers(t *testing.T) { add(t, dc.rcLister.Indexer, rc) dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 0, 0, 0, 0, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, 0, 0, 0, map[string]metav1.Time{}) pods := []*v1.Pod{} @@ -453,11 +453,11 @@ func TestTwoControllers(t *testing.T) { add(t, dc.podLister.Indexer, pod) dc.sync(pdbName) if i <= unavailablePods { - ps.VerifyPdbStatus(t, pdbName, 0, 0, minimumOne, collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, 0, minimumOne, collectionSize, map[string]metav1.Time{}) } else if i-unavailablePods <= minimumOne { - ps.VerifyPdbStatus(t, pdbName, 0, i-unavailablePods, minimumOne, collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, i-unavailablePods, minimumOne, collectionSize, map[string]metav1.Time{}) } else { - ps.VerifyPdbStatus(t, pdbName, 1, i-unavailablePods, minimumOne, collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 1, i-unavailablePods, minimumOne, collectionSize, map[string]metav1.Time{}) } } @@ -465,14 +465,14 @@ func TestTwoControllers(t *testing.T) { d.Spec.Selector = newSel(dLabels) add(t, dc.dLister.Indexer, d) dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 1, minimumOne+1, minimumOne, collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 1, minimumOne+1, minimumOne, collectionSize, map[string]metav1.Time{}) rs, _ := newReplicaSet(t, collectionSize) rs.Spec.Selector = newSel(dLabels) rs.Labels = dLabels add(t, dc.rsLister.Indexer, rs) dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 1, minimumOne+1, minimumOne, collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 1, minimumOne+1, minimumOne, collectionSize, map[string]metav1.Time{}) // By the end of this loop, the number of ready pods should be N+2 (hence minimumTwo+2). unavailablePods = 2*collectionSize - (minimumTwo + 2) - unavailablePods @@ -486,33 +486,33 @@ func TestTwoControllers(t *testing.T) { add(t, dc.podLister.Indexer, pod) dc.sync(pdbName) if i <= unavailablePods { - ps.VerifyPdbStatus(t, pdbName, 0, minimumOne+1, minimumTwo, 2*collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, minimumOne+1, minimumTwo, 2*collectionSize, map[string]metav1.Time{}) } else if i-unavailablePods <= minimumTwo-(minimumOne+1) { - ps.VerifyPdbStatus(t, pdbName, 0, (minimumOne+1)+(i-unavailablePods), minimumTwo, 2*collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, (minimumOne+1)+(i-unavailablePods), minimumTwo, 2*collectionSize, map[string]metav1.Time{}) } else { ps.VerifyPdbStatus(t, pdbName, i-unavailablePods-(minimumTwo-(minimumOne+1)), - (minimumOne+1)+(i-unavailablePods), minimumTwo, 2*collectionSize, map[string]unversioned.Time{}) + (minimumOne+1)+(i-unavailablePods), minimumTwo, 2*collectionSize, map[string]metav1.Time{}) } } // Now we verify we can bring down 1 pod and a disruption is still permitted, // but if we bring down two, it's not. Then we make the pod ready again and // verify that a disruption is permitted again. - ps.VerifyPdbStatus(t, pdbName, 2, 2+minimumTwo, minimumTwo, 2*collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 2, 2+minimumTwo, minimumTwo, 2*collectionSize, map[string]metav1.Time{}) pods[collectionSize-1].Status.Conditions = []v1.PodCondition{} update(t, dc.podLister.Indexer, pods[collectionSize-1]) dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 1, 1+minimumTwo, minimumTwo, 2*collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 1, 1+minimumTwo, minimumTwo, 2*collectionSize, map[string]metav1.Time{}) pods[collectionSize-2].Status.Conditions = []v1.PodCondition{} update(t, dc.podLister.Indexer, pods[collectionSize-2]) dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 0, minimumTwo, minimumTwo, 2*collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 0, minimumTwo, minimumTwo, 2*collectionSize, map[string]metav1.Time{}) pods[collectionSize-1].Status.Conditions = []v1.PodCondition{{Type: v1.PodReady, Status: v1.ConditionTrue}} update(t, dc.podLister.Indexer, pods[collectionSize-1]) dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 1, 1+minimumTwo, minimumTwo, 2*collectionSize, map[string]unversioned.Time{}) + ps.VerifyPdbStatus(t, pdbName, 1, 1+minimumTwo, minimumTwo, 2*collectionSize, map[string]metav1.Time{}) } // Test pdb doesn't exist @@ -530,7 +530,7 @@ func TestUpdateDisruptedPods(t *testing.T) { dc.recheckQueue = workqueue.NewNamedDelayingQueue("pdb-queue") pdb, pdbName := newPodDisruptionBudget(t, intstr.FromInt(1)) currentTime := time.Now() - pdb.Status.DisruptedPods = map[string]unversioned.Time{ + pdb.Status.DisruptedPods = map[string]metav1.Time{ "p1": {Time: currentTime}, // Should be removed, pod deletion started. "p2": {Time: currentTime.Add(-5 * time.Minute)}, // Should be removed, expired. "p3": {Time: currentTime}, // Should remain, pod untouched. @@ -539,7 +539,7 @@ func TestUpdateDisruptedPods(t *testing.T) { add(t, dc.pdbLister.Store, pdb) pod1, _ := newPod(t, "p1") - pod1.DeletionTimestamp = &unversioned.Time{Time: time.Now()} + pod1.DeletionTimestamp = &metav1.Time{Time: time.Now()} pod2, _ := newPod(t, "p2") pod3, _ := newPod(t, "p3") @@ -549,5 +549,5 @@ func TestUpdateDisruptedPods(t *testing.T) { dc.sync(pdbName) - ps.VerifyPdbStatus(t, pdbName, 0, 1, 1, 3, map[string]unversioned.Time{"p3": {Time: currentTime}}) + ps.VerifyPdbStatus(t, pdbName, 0, 1, 1, 3, map[string]metav1.Time{"p3": {Time: currentTime}}) } diff --git a/pkg/controller/endpoint/BUILD b/pkg/controller/endpoint/BUILD index c9f91a1fceb..248be22b4cf 100644 --- a/pkg/controller/endpoint/BUILD +++ b/pkg/controller/endpoint/BUILD @@ -45,10 +45,10 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/endpoints:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 4489dd0da87..7555196d30d 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" endptspkg "k8s.io/kubernetes/pkg/api/v1/endpoints" "k8s.io/kubernetes/pkg/apimachinery/registered" @@ -43,7 +43,7 @@ var emptyNodeName string func addPods(store cache.Store, namespace string, nPods int, nPorts int, nNotReady int) { for i := 0; i < nPods+nNotReady; i++ { p := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ Namespace: namespace, Name: fmt.Sprintf("pod%d", i), @@ -125,7 +125,7 @@ func TestCheckLeftoverEndpoints(t *testing.T) { // below. testServer, _ := makeTestServer(t, v1.NamespaceAll, serverResponse{http.StatusOK, &v1.EndpointsList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "1", }, Items: []v1.Endpoints{{ diff --git a/pkg/controller/garbagecollector/BUILD b/pkg/controller/garbagecollector/BUILD index b505e8581a8..a84c7d2da97 100644 --- a/pkg/controller/garbagecollector/BUILD +++ b/pkg/controller/garbagecollector/BUILD @@ -24,8 +24,8 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/meta/metatypes:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/controller/garbagecollector/metaonly:go_default_library", @@ -54,9 +54,9 @@ go_test( deps = [ "//pkg/api/install:go_default_library", "//pkg/api/meta/metatypes:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/typed/dynamic:go_default_library", "//pkg/controller/garbagecollector/metaonly:go_default_library", diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index 1c442bfb3ab..6a60c768106 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/typed/dynamic" @@ -456,7 +456,7 @@ func gcListWatcher(client *dynamic.Client, resource schema.GroupVersionResource) // leave it empty. We want to list this resource in all // namespaces if it's namespace scoped, so leave // APIResource.Namespaced as false is all right. - apiResource := unversioned.APIResource{Name: resource.Resource} + apiResource := metav1.APIResource{Name: resource.Resource} return client.ParameterCodec(dynamic.VersionedParameterEncoderWithV1Fallback). Resource(&apiResource, v1.NamespaceAll). List(&options) @@ -466,7 +466,7 @@ func gcListWatcher(client *dynamic.Client, resource schema.GroupVersionResource) // leave it empty. We want to list this resource in all // namespaces if it's namespace scoped, so leave // APIResource.Namespaced as false is all right. - apiResource := unversioned.APIResource{Name: resource.Resource} + apiResource := metav1.APIResource{Name: resource.Resource} return client.ParameterCodec(dynamic.VersionedParameterEncoderWithV1Fallback). Resource(&apiResource, v1.NamespaceAll). Watch(&options) @@ -592,15 +592,15 @@ func (gc *GarbageCollector) worker() { } // apiResource consults the REST mapper to translate an tuple to a unversioned.APIResource struct. -func (gc *GarbageCollector) apiResource(apiVersion, kind string, namespaced bool) (*unversioned.APIResource, error) { +// namespace> tuple to a metav1.APIResource struct. +func (gc *GarbageCollector) apiResource(apiVersion, kind string, namespaced bool) (*metav1.APIResource, error) { fqKind := schema.FromAPIVersionAndKind(apiVersion, kind) mapping, err := gc.restMapper.RESTMapping(fqKind.GroupKind(), apiVersion) if err != nil { return nil, fmt.Errorf("unable to get REST mapping for kind: %s, version: %s", kind, apiVersion) } glog.V(6).Infof("map kind %s, version %s to resource %s", kind, apiVersion, mapping.Resource) - resource := unversioned.APIResource{ + resource := metav1.APIResource{ Name: mapping.Resource, Namespaced: namespaced, Kind: kind, @@ -667,7 +667,7 @@ func objectReferenceToUnstructured(ref objectReference) *runtime.Unstructured { func objectReferenceToMetadataOnlyObject(ref objectReference) *metaonly.MetadataOnlyObject { return &metaonly.MetadataOnlyObject{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: ref.APIVersion, Kind: ref.Kind, }, diff --git a/pkg/controller/garbagecollector/garbagecollector_test.go b/pkg/controller/garbagecollector/garbagecollector_test.go index 46632d5f0cd..4f7a7186437 100644 --- a/pkg/controller/garbagecollector/garbagecollector_test.go +++ b/pkg/controller/garbagecollector/garbagecollector_test.go @@ -28,7 +28,7 @@ import ( _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/meta/metatypes" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient" @@ -123,7 +123,7 @@ func setupGC(t *testing.T, config *restclient.Config) *GarbageCollector { func getPod(podName string, ownerReferences []v1.OwnerReference) *v1.Pod { return &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, diff --git a/pkg/controller/garbagecollector/metaonly/BUILD b/pkg/controller/garbagecollector/metaonly/BUILD index aa0a957b5cb..22d550766d5 100644 --- a/pkg/controller/garbagecollector/metaonly/BUILD +++ b/pkg/controller/garbagecollector/metaonly/BUILD @@ -20,8 +20,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/runtime/serializer:go_default_library", @@ -38,8 +38,8 @@ go_test( deps = [ "//pkg/api/install:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/runtime/serializer:go_default_library", diff --git a/pkg/controller/garbagecollector/metaonly/metaonly.go b/pkg/controller/garbagecollector/metaonly/metaonly.go index a864f3ea367..690858b5c29 100644 --- a/pkg/controller/garbagecollector/metaonly/metaonly.go +++ b/pkg/controller/garbagecollector/metaonly/metaonly.go @@ -21,7 +21,7 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/serializer" @@ -55,7 +55,7 @@ func NewMetadataCodecFactory() serializer.CodecFactory { metaOnlyObject := gvkToMetadataOnlyObject(kind) scheme.AddKnownTypeWithName(kind, metaOnlyObject) } - scheme.AddUnversionedTypes(api.Unversioned, &unversioned.Status{}) + scheme.AddUnversionedTypes(api.Unversioned, &metav1.Status{}) return serializer.NewCodecFactory(scheme) } diff --git a/pkg/controller/garbagecollector/metaonly/metaonly_test.go b/pkg/controller/garbagecollector/metaonly/metaonly_test.go index d58d1cfa157..89818e0b534 100644 --- a/pkg/controller/garbagecollector/metaonly/metaonly_test.go +++ b/pkg/controller/garbagecollector/metaonly/metaonly_test.go @@ -23,7 +23,7 @@ import ( _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -32,7 +32,7 @@ import ( func getPod() *v1.Pod { return &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, @@ -63,7 +63,7 @@ func getPodJson(t *testing.T) []byte { func getPodListJson(t *testing.T) []byte { data, err := json.Marshal(&v1.PodList{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "PodList", APIVersion: "v1", }, diff --git a/pkg/controller/garbagecollector/metaonly/types.generated.go b/pkg/controller/garbagecollector/metaonly/types.generated.go index 0cea419eb26..e7d5d9ec398 100644 --- a/pkg/controller/garbagecollector/metaonly/types.generated.go +++ b/pkg/controller/garbagecollector/metaonly/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" diff --git a/pkg/controller/garbagecollector/metaonly/types.go b/pkg/controller/garbagecollector/metaonly/types.go index 6b42e2e058e..020ea6723d1 100644 --- a/pkg/controller/garbagecollector/metaonly/types.go +++ b/pkg/controller/garbagecollector/metaonly/types.go @@ -17,7 +17,7 @@ limitations under the License. package metaonly import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -25,7 +25,7 @@ import ( // JSON data. // TODO: enable meta-only decoding for protobuf. type MetadataOnlyObject struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty"` } @@ -34,9 +34,9 @@ type MetadataOnlyObject struct { // a list, and those of the enclosing objects. // TODO: enable meta-only decoding for protobuf. type MetadataOnlyObjectList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []MetadataOnlyObject `json:"items"` } diff --git a/pkg/controller/job/BUILD b/pkg/controller/job/BUILD index ef41567a3c7..6540abbd912 100644 --- a/pkg/controller/job/BUILD +++ b/pkg/controller/job/BUILD @@ -20,9 +20,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/batch/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", @@ -48,10 +48,10 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/batch/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", diff --git a/pkg/controller/job/jobcontroller.go b/pkg/controller/job/jobcontroller.go index 928456db97a..b4efca0c10f 100644 --- a/pkg/controller/job/jobcontroller.go +++ b/pkg/controller/job/jobcontroller.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/client/cache" @@ -306,7 +306,7 @@ func (jm *JobController) syncJob(key string) error { // and update the expectations after we've retrieved active pods from the store. If a new pod enters // the store after we've checked the expectation, the job sync is just deferred till the next relist. jobNeedsSync := jm.expectations.SatisfiedExpectations(key) - selector, _ := unversioned.LabelSelectorAsSelector(job.Spec.Selector) + selector, _ := metav1.LabelSelectorAsSelector(job.Spec.Selector) pods, err := jm.podStore.Pods(job.Namespace).List(selector) if err != nil { return err @@ -317,7 +317,7 @@ func (jm *JobController) syncJob(key string) error { succeeded, failed := getStatus(pods) conditions := len(job.Status.Conditions) if job.Status.StartTime == nil { - now := unversioned.Now() + now := metav1.Now() job.Status.StartTime = &now } // if job was finished previously, we don't want to redo the termination @@ -380,7 +380,7 @@ func (jm *JobController) syncJob(key string) error { } if complete { job.Status.Conditions = append(job.Status.Conditions, newCondition(batch.JobComplete, "", "")) - now := unversioned.Now() + now := metav1.Now() job.Status.CompletionTime = &now } } @@ -403,7 +403,7 @@ func pastActiveDeadline(job *batch.Job) bool { if job.Spec.ActiveDeadlineSeconds == nil || job.Status.StartTime == nil { return false } - now := unversioned.Now() + now := metav1.Now() start := job.Status.StartTime.Time duration := now.Time.Sub(start) allowedDuration := time.Duration(*job.Spec.ActiveDeadlineSeconds) * time.Second @@ -414,8 +414,8 @@ func newCondition(conditionType batch.JobConditionType, reason, message string) return batch.JobCondition{ Type: conditionType, Status: v1.ConditionTrue, - LastProbeTime: unversioned.Now(), - LastTransitionTime: unversioned.Now(), + LastProbeTime: metav1.Now(), + LastTransitionTime: metav1.Now(), Reason: reason, Message: message, } diff --git a/pkg/controller/job/jobcontroller_test.go b/pkg/controller/job/jobcontroller_test.go index 5216ab5081f..aba09f0d865 100644 --- a/pkg/controller/job/jobcontroller_test.go +++ b/pkg/controller/job/jobcontroller_test.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" batch "k8s.io/kubernetes/pkg/apis/batch/v1" @@ -47,7 +47,7 @@ func newJob(parallelism, completions int32) *batch.Job { Namespace: v1.NamespaceDefault, }, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar"}, }, Template: v1.PodTemplateSpec{ @@ -243,7 +243,7 @@ func TestControllerSyncJob(t *testing.T) { // job & pods setup job := newJob(tc.parallelism, tc.completions) if tc.deleting { - now := unversioned.Now() + now := metav1.Now() job.DeletionTimestamp = &now } sharedInformerFactory.Jobs().Informer().GetIndexer().Add(job) @@ -347,7 +347,7 @@ func TestSyncJobPastDeadline(t *testing.T) { // job & pods setup job := newJob(tc.parallelism, tc.completions) job.Spec.ActiveDeadlineSeconds = &tc.activeDeadlineSeconds - start := unversioned.Unix(unversioned.Now().Time.Unix()-tc.startTime, 0) + start := metav1.Unix(metav1.Now().Time.Unix()-tc.startTime, 0) job.Status.StartTime = &start sharedInformerFactory.Jobs().Informer().GetIndexer().Add(job) podIndexer := sharedInformerFactory.Pods().Informer().GetIndexer() @@ -419,7 +419,7 @@ func TestSyncPastDeadlineJobFinished(t *testing.T) { job := newJob(1, 1) activeDeadlineSeconds := int64(10) job.Spec.ActiveDeadlineSeconds = &activeDeadlineSeconds - start := unversioned.Unix(unversioned.Now().Time.Unix()-15, 0) + start := metav1.Unix(metav1.Now().Time.Unix()-15, 0) job.Status.StartTime = &start job.Status.Conditions = append(job.Status.Conditions, newCondition(batch.JobFailed, "DeadlineExceeded", "Job was active longer than specified deadline")) sharedInformerFactory.Jobs().Informer().GetIndexer().Add(job) @@ -536,7 +536,7 @@ func TestJobPodLookup(t *testing.T) { job: &batch.Job{ ObjectMeta: v1.ObjectMeta{Name: "foo"}, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar"}, }, }, @@ -555,11 +555,11 @@ func TestJobPodLookup(t *testing.T) { job: &batch.Job{ ObjectMeta: v1.ObjectMeta{Name: "bar", Namespace: "ns"}, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ - MatchExpressions: []unversioned.LabelSelectorRequirement{ + Selector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "foo", - Operator: unversioned.LabelSelectorOpIn, + Operator: metav1.LabelSelectorOpIn, Values: []string{"bar"}, }, }, diff --git a/pkg/controller/namespace/BUILD b/pkg/controller/namespace/BUILD index 41586fdab2c..15ce51b132f 100644 --- a/pkg/controller/namespace/BUILD +++ b/pkg/controller/namespace/BUILD @@ -20,8 +20,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/typed/dynamic:go_default_library", @@ -46,9 +46,9 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/restclient:go_default_library", diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index 56e5842a5d7..47745a91510 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -83,8 +83,8 @@ func TestFinalizeNamespaceFunc(t *testing.T) { } } -func testSyncNamespaceThatIsTerminating(t *testing.T, versions *unversioned.APIVersions) { - now := unversioned.Now() +func testSyncNamespaceThatIsTerminating(t *testing.T, versions *metav1.APIVersions) { + now := metav1.Now() namespaceName := "test" testNamespacePendingFinalize := &v1.Namespace{ ObjectMeta: v1.ObjectMeta{ @@ -222,11 +222,11 @@ func TestRetryOnConflictError(t *testing.T) { } func TestSyncNamespaceThatIsTerminatingNonExperimental(t *testing.T) { - testSyncNamespaceThatIsTerminating(t, &unversioned.APIVersions{}) + testSyncNamespaceThatIsTerminating(t, &metav1.APIVersions{}) } func TestSyncNamespaceThatIsTerminatingV1Beta1(t *testing.T) { - testSyncNamespaceThatIsTerminating(t, &unversioned.APIVersions{Versions: []string{"extensions/v1beta1"}}) + testSyncNamespaceThatIsTerminating(t, &metav1.APIVersions{Versions: []string{"extensions/v1beta1"}}) } func TestSyncNamespaceThatIsActive(t *testing.T) { diff --git a/pkg/controller/namespace/namespace_controller_utils.go b/pkg/controller/namespace/namespace_controller_utils.go index e2770161d28..2f121f8d34a 100644 --- a/pkg/controller/namespace/namespace_controller_utils.go +++ b/pkg/controller/namespace/namespace_controller_utils.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/typed/dynamic" @@ -172,7 +172,7 @@ func deleteCollection( return false, nil } - apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true} + apiResource := metav1.APIResource{Name: gvr.Resource, Namespaced: true} // namespace controller does not want the garbage collector to insert the orphan finalizer since it calls // resource deletions generically. it will ensure all resources in the namespace are purged prior to releasing @@ -219,7 +219,7 @@ func listCollection( return nil, false, nil } - apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true} + apiResource := metav1.APIResource{Name: gvr.Resource, Namespaced: true} obj, err := dynamicClient.Resource(&apiResource, namespace).List(&v1.ListOptions{}) if err == nil { unstructuredList, ok := obj.(*runtime.UnstructuredList) @@ -260,7 +260,7 @@ func deleteEachItem( if !listSupported { return nil } - apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true} + apiResource := metav1.APIResource{Name: gvr.Resource, Namespaced: true} for _, item := range unstructuredList.Items { if err = dynamicClient.Resource(&apiResource, namespace).Delete(item.GetName(), nil); err != nil && !errors.IsNotFound(err) && !errors.IsMethodNotSupported(err) { return err @@ -278,7 +278,7 @@ func deleteAllContentForGroupVersionResource( opCache *operationNotSupportedCache, gvr schema.GroupVersionResource, namespace string, - namespaceDeletedAt unversioned.Time, + namespaceDeletedAt metav1.Time, ) (int64, error) { glog.V(5).Infof("namespace controller - deleteAllContentForGroupVersionResource - namespace: %s, gvr: %v", namespace, gvr) @@ -346,7 +346,7 @@ func deleteAllContent( opCache *operationNotSupportedCache, groupVersionResources []schema.GroupVersionResource, namespace string, - namespaceDeletedAt unversioned.Time, + namespaceDeletedAt metav1.Time, ) (int64, error) { estimate := int64(0) glog.V(4).Infof("namespace controller - deleteAllContent - namespace: %s, gvrs: %v", namespace, groupVersionResources) @@ -458,7 +458,7 @@ func syncNamespace( } // estimateGrracefulTermination will estimate the graceful termination required for the specific entity in the namespace -func estimateGracefulTermination(kubeClient clientset.Interface, groupVersionResource schema.GroupVersionResource, ns string, namespaceDeletedAt unversioned.Time) (int64, error) { +func estimateGracefulTermination(kubeClient clientset.Interface, groupVersionResource schema.GroupVersionResource, ns string, namespaceDeletedAt metav1.Time) (int64, error) { groupResource := groupVersionResource.GroupResource() glog.V(5).Infof("namespace controller - estimateGracefulTermination - group %s, resource: %s", groupResource.Group, groupResource.Resource) estimate := int64(0) diff --git a/pkg/controller/node/BUILD b/pkg/controller/node/BUILD index 9ef42302861..7def0aae24a 100644 --- a/pkg/controller/node/BUILD +++ b/pkg/controller/node/BUILD @@ -27,8 +27,8 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", @@ -70,9 +70,9 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 6c539aec3a9..8ac1a7b2832 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -82,8 +82,8 @@ const ( ) type nodeStatusData struct { - probeTimestamp unversioned.Time - readyTransitionTimestamp unversioned.Time + probeTimestamp metav1.Time + readyTransitionTimestamp metav1.Time status v1.NodeStatus } @@ -122,7 +122,7 @@ type NodeController struct { // This timestamp is to be used instead of LastProbeTime stored in Condition. We do this // to aviod the problem with time skew across the cluster. nodeStatusMap map[string]nodeStatusData - now func() unversioned.Time + now func() metav1.Time // Lock to access evictor workers evictorLock sync.Mutex // workers that evicts pods from unresponsive nodes. @@ -220,7 +220,7 @@ func NewNodeController( nodeMonitorPeriod: nodeMonitorPeriod, nodeStartupGracePeriod: nodeStartupGracePeriod, lookupIP: net.LookupIP, - now: unversioned.Now, + now: metav1.Now, clusterCIDR: clusterCIDR, serviceCIDR: serviceCIDR, allocateNodeCIDRs: allocateNodeCIDRs, @@ -698,7 +698,7 @@ func (nc *NodeController) tryUpdateNodeStatus(node *v1.Node) (time.Duration, v1. readyTransitionTimestamp: nc.now(), } } else if savedCondition != nil && observedCondition != nil && savedCondition.LastHeartbeatTime != observedCondition.LastHeartbeatTime { - var transitionTime unversioned.Time + var transitionTime metav1.Time // If ReadyCondition changed since the last time we checked, we update the transition timestamp to "now", // otherwise we leave it as it is. if savedCondition.LastTransitionTime != observedCondition.LastTransitionTime { diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index bd43c2c3f7e..40ceb240580 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" @@ -79,7 +79,7 @@ func NewNodeControllerFromClient( } func TestMonitorNodeStatusEvictPods(t *testing.T) { - fakeNow := unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) + fakeNow := metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) evictionTimeout := 10 * time.Minute // Because of the logic that prevents NC from evicting anything when all Nodes are NotReady @@ -91,8 +91,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionTrue, // Node status has just been updated, and is NotReady for 10min. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 9, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 9, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, } @@ -115,18 +115,18 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { Name: "node0", CreationTimestamp: fakeNow, Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, }, { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -134,8 +134,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -157,10 +157,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -168,8 +168,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionFalse, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -177,10 +177,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -188,8 +188,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -205,8 +205,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionFalse, // Node status has just been updated, and is NotReady for 10min. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 9, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 9, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -221,10 +221,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -232,8 +232,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionFalse, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -241,10 +241,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -252,8 +252,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -283,7 +283,7 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { Namespace: "default", }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"daemon": "yes"}, }, }, @@ -296,8 +296,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionFalse, // Node status has just been updated, and is NotReady for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 59, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 59, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -312,10 +312,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -323,8 +323,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionFalse, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -332,10 +332,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -343,8 +343,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -360,8 +360,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionFalse, // Node status has just been updated, and is NotReady for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 59, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 59, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -376,10 +376,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -387,8 +387,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -396,10 +396,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -407,8 +407,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -424,8 +424,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionUnknown, // Node status was updated by nodecontroller 10min ago - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -440,10 +440,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -451,8 +451,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -460,10 +460,10 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -471,8 +471,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -488,8 +488,8 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionUnknown, // Node status was updated by nodecontroller 1hr ago - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -503,7 +503,7 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { nodeController, _ := NewNodeControllerFromClient(nil, item.fakeNodeHandler, evictionTimeout, testRateLimiterQPS, testRateLimiterQPS, testLargeClusterThreshold, testUnhealtyThreshold, testNodeMonitorGracePeriod, testNodeStartupGracePeriod, testNodeMonitorPeriod, nil, nil, 0, false) - nodeController.now = func() unversioned.Time { return fakeNow } + nodeController.now = func() metav1.Time { return fakeNow } for _, ds := range item.daemonSets { nodeController.daemonSetStore.Add(&ds) } @@ -511,7 +511,7 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { t.Errorf("unexpected error: %v", err) } if item.timeToPass > 0 { - nodeController.now = func() unversioned.Time { return unversioned.Time{Time: fakeNow.Add(item.timeToPass)} } + nodeController.now = func() metav1.Time { return metav1.Time{Time: fakeNow.Add(item.timeToPass)} } item.fakeNodeHandler.Existing[0].Status = item.newNodeStatus item.fakeNodeHandler.Existing[1].Status = item.secondNodeNewStatus } @@ -542,7 +542,7 @@ func TestMonitorNodeStatusEvictPods(t *testing.T) { } func TestPodStatusChange(t *testing.T) { - fakeNow := unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) + fakeNow := metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) evictionTimeout := 10 * time.Minute // Because of the logic that prevents NC from evicting anything when all Nodes are NotReady @@ -554,8 +554,8 @@ func TestPodStatusChange(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionTrue, // Node status has just been updated, and is NotReady for 10min. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 9, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 9, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, } @@ -577,10 +577,10 @@ func TestPodStatusChange(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -588,8 +588,8 @@ func TestPodStatusChange(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -597,10 +597,10 @@ func TestPodStatusChange(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -608,8 +608,8 @@ func TestPodStatusChange(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -624,8 +624,8 @@ func TestPodStatusChange(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionUnknown, // Node status was updated by nodecontroller 1hr ago - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -641,12 +641,12 @@ func TestPodStatusChange(t *testing.T) { nodeController, _ := NewNodeControllerFromClient(nil, item.fakeNodeHandler, evictionTimeout, testRateLimiterQPS, testRateLimiterQPS, testLargeClusterThreshold, testUnhealtyThreshold, testNodeMonitorGracePeriod, testNodeStartupGracePeriod, testNodeMonitorPeriod, nil, nil, 0, false) - nodeController.now = func() unversioned.Time { return fakeNow } + nodeController.now = func() metav1.Time { return fakeNow } if err := nodeController.monitorNodeStatus(); err != nil { t.Errorf("unexpected error: %v", err) } if item.timeToPass > 0 { - nodeController.now = func() unversioned.Time { return unversioned.Time{Time: fakeNow.Add(item.timeToPass)} } + nodeController.now = func() metav1.Time { return metav1.Time{Time: fakeNow.Add(item.timeToPass)} } item.fakeNodeHandler.Existing[0].Status = item.newNodeStatus item.fakeNodeHandler.Existing[1].Status = item.secondNodeNewStatus } @@ -681,7 +681,7 @@ func TestPodStatusChange(t *testing.T) { } func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { - fakeNow := unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) + fakeNow := metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) evictionTimeout := 10 * time.Minute timeToPass := 60 * time.Minute @@ -693,8 +693,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 13, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 13, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, } @@ -704,8 +704,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionUnknown, // Node status was updated by nodecontroller 1hr ago - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, } @@ -726,10 +726,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -737,8 +737,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -746,10 +746,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -757,8 +757,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -781,10 +781,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -792,8 +792,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -801,10 +801,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region2", - unversioned.LabelZoneFailureDomain: "zone2", + metav1.LabelZoneRegion: "region2", + metav1.LabelZoneFailureDomain: "zone2", }, }, Status: v1.NodeStatus{ @@ -812,8 +812,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -843,10 +843,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -854,8 +854,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -863,10 +863,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone2", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone2", }, }, Status: v1.NodeStatus{ @@ -874,8 +874,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -904,10 +904,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -915,8 +915,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -924,10 +924,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node-master", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -935,8 +935,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -963,10 +963,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -974,8 +974,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -983,10 +983,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone2", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone2", }, }, Status: v1.NodeStatus{ @@ -994,8 +994,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -1025,10 +1025,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -1036,8 +1036,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -1045,10 +1045,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node1", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -1056,8 +1056,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -1065,10 +1065,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node2", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -1076,8 +1076,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -1085,10 +1085,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node3", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -1096,8 +1096,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -1105,10 +1105,10 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node4", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), Labels: map[string]string{ - unversioned.LabelZoneRegion: "region1", - unversioned.LabelZoneFailureDomain: "zone1", + metav1.LabelZoneRegion: "region1", + metav1.LabelZoneFailureDomain: "zone1", }, }, Status: v1.NodeStatus{ @@ -1116,8 +1116,8 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionTrue, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -1151,7 +1151,7 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { nodeController, _ := NewNodeControllerFromClient(nil, fakeNodeHandler, evictionTimeout, testRateLimiterQPS, testRateLimiterQPS, testLargeClusterThreshold, testUnhealtyThreshold, testNodeMonitorGracePeriod, testNodeStartupGracePeriod, testNodeMonitorPeriod, nil, nil, 0, false) - nodeController.now = func() unversioned.Time { return fakeNow } + nodeController.now = func() metav1.Time { return fakeNow } nodeController.enterPartialDisruptionFunc = func(nodeNum int) float32 { return testRateLimiterQPS } @@ -1168,7 +1168,7 @@ func TestMonitorNodeStatusEvictPodsWithDisruption(t *testing.T) { } } - nodeController.now = func() unversioned.Time { return unversioned.Time{Time: fakeNow.Add(timeToPass)} } + nodeController.now = func() metav1.Time { return metav1.Time{Time: fakeNow.Add(timeToPass)} } for i := range item.updatedNodeStatuses { fakeNodeHandler.Existing[i].Status = item.updatedNodeStatuses[i] } @@ -1216,15 +1216,15 @@ func TestCloudProviderNoRateLimit(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, }, @@ -1238,7 +1238,7 @@ func TestCloudProviderNoRateLimit(t *testing.T) { testNodeMonitorGracePeriod, testNodeStartupGracePeriod, testNodeMonitorPeriod, nil, nil, 0, false) nodeController.cloud = &fakecloud.FakeCloud{} - nodeController.now = func() unversioned.Time { return unversioned.Date(2016, 1, 1, 12, 0, 0, 0, time.UTC) } + nodeController.now = func() metav1.Time { return metav1.Date(2016, 1, 1, 12, 0, 0, 0, time.UTC) } nodeController.nodeExistsInCloudProvider = func(nodeName types.NodeName) (bool, error) { return false, nil } @@ -1260,7 +1260,7 @@ func TestCloudProviderNoRateLimit(t *testing.T) { } func TestMonitorNodeStatusUpdateStatus(t *testing.T) { - fakeNow := unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) + fakeNow := metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) table := []struct { fakeNodeHandler *FakeNodeHandler timeToPass time.Duration @@ -1277,7 +1277,7 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, }, }, @@ -1288,7 +1288,7 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ @@ -1297,7 +1297,7 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { Status: v1.ConditionUnknown, Reason: "NodeStatusNeverUpdated", Message: "Kubelet never posted node status.", - LastHeartbeatTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), LastTransitionTime: fakeNow, }, { @@ -1305,7 +1305,7 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { Status: v1.ConditionUnknown, Reason: "NodeStatusNeverUpdated", Message: "Kubelet never posted node status.", - LastHeartbeatTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), LastTransitionTime: fakeNow, }, }, @@ -1338,7 +1338,7 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ @@ -1346,15 +1346,15 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionTrue, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, { Type: v1.NodeOutOfDisk, Status: v1.ConditionFalse, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, Capacity: v1.ResourceList{ @@ -1377,15 +1377,15 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionTrue, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, { Type: v1.NodeOutOfDisk, Status: v1.ConditionFalse, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, Capacity: v1.ResourceList{ @@ -1397,7 +1397,7 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ @@ -1406,16 +1406,16 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { Status: v1.ConditionUnknown, Reason: "NodeStatusUnknown", Message: "Kubelet stopped posting node status.", - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Time{Time: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC).Add(time.Hour)}, + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Time{Time: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC).Add(time.Hour)}, }, { Type: v1.NodeOutOfDisk, Status: v1.ConditionUnknown, Reason: "NodeStatusUnknown", Message: "Kubelet stopped posting node status.", - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Time{Time: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC).Add(time.Hour)}, + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Time{Time: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC).Add(time.Hour)}, }, }, Capacity: v1.ResourceList{ @@ -1437,7 +1437,7 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ @@ -1470,12 +1470,12 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { nodeController, _ := NewNodeControllerFromClient(nil, item.fakeNodeHandler, 5*time.Minute, testRateLimiterQPS, testRateLimiterQPS, testLargeClusterThreshold, testUnhealtyThreshold, testNodeMonitorGracePeriod, testNodeStartupGracePeriod, testNodeMonitorPeriod, nil, nil, 0, false) - nodeController.now = func() unversioned.Time { return fakeNow } + nodeController.now = func() metav1.Time { return fakeNow } if err := nodeController.monitorNodeStatus(); err != nil { t.Errorf("unexpected error: %v", err) } if item.timeToPass > 0 { - nodeController.now = func() unversioned.Time { return unversioned.Time{Time: fakeNow.Add(item.timeToPass)} } + nodeController.now = func() metav1.Time { return metav1.Time{Time: fakeNow.Add(item.timeToPass)} } item.fakeNodeHandler.Existing[0].Status = item.newNodeStatus if err := nodeController.monitorNodeStatus(); err != nil { t.Errorf("unexpected error: %v", err) @@ -1494,7 +1494,7 @@ func TestMonitorNodeStatusUpdateStatus(t *testing.T) { } func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { - fakeNow := unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) + fakeNow := metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC) table := []struct { fakeNodeHandler *FakeNodeHandler timeToPass time.Duration @@ -1525,7 +1525,7 @@ func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ @@ -1559,7 +1559,7 @@ func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, Status: v1.NodeStatus{ NodeInfo: v1.NodeSystemInfo{ @@ -1570,15 +1570,15 @@ func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionTrue, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, { Type: v1.NodeOutOfDisk, Status: v1.ConditionFalse, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, Capacity: v1.ResourceList{ @@ -1603,15 +1603,15 @@ func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionTrue, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, { Type: v1.NodeOutOfDisk, Status: v1.ConditionFalse, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, Capacity: v1.ResourceList{ @@ -1629,7 +1629,7 @@ func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { { ObjectMeta: v1.ObjectMeta{ Name: "node0", - CreationTimestamp: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, Status: v1.NodeStatus{ NodeInfo: v1.NodeSystemInfo{ @@ -1640,15 +1640,15 @@ func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionTrue, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, { Type: v1.NodeOutOfDisk, Status: v1.ConditionFalse, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, Capacity: v1.ResourceList{ @@ -1673,15 +1673,15 @@ func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { Type: v1.NodeReady, Status: v1.ConditionTrue, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, { Type: v1.NodeOutOfDisk, Status: v1.ConditionFalse, // Node status hasn't been updated for 1hr. - LastHeartbeatTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC), }, }, Capacity: v1.ResourceList{ @@ -1697,12 +1697,12 @@ func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { nodeController, _ := NewNodeControllerFromClient(nil, item.fakeNodeHandler, 5*time.Minute, testRateLimiterQPS, testRateLimiterQPS, testLargeClusterThreshold, testUnhealtyThreshold, testNodeMonitorGracePeriod, testNodeStartupGracePeriod, testNodeMonitorPeriod, nil, nil, 0, false) - nodeController.now = func() unversioned.Time { return fakeNow } + nodeController.now = func() metav1.Time { return fakeNow } if err := nodeController.monitorNodeStatus(); err != nil { t.Errorf("Case[%d] unexpected error: %v", i, err) } if item.timeToPass > 0 { - nodeController.now = func() unversioned.Time { return unversioned.Time{Time: fakeNow.Add(item.timeToPass)} } + nodeController.now = func() metav1.Time { return metav1.Time{Time: fakeNow.Add(item.timeToPass)} } item.fakeNodeHandler.Existing[0].Status = item.newNodeStatus if err := nodeController.monitorNodeStatus(); err != nil { t.Errorf("Case[%d] unexpected error: %v", i, err) @@ -1722,14 +1722,14 @@ func TestMonitorNodeStatusMarkPodsNotReady(t *testing.T) { } func TestNodeEventGeneration(t *testing.T) { - fakeNow := unversioned.Date(2016, 9, 10, 12, 0, 0, 0, time.UTC) + fakeNow := metav1.Date(2016, 9, 10, 12, 0, 0, 0, time.UTC) fakeNodeHandler := &FakeNodeHandler{ Existing: []*v1.Node{ { ObjectMeta: v1.ObjectMeta{ Name: "node0", UID: "1234567890", - CreationTimestamp: unversioned.Date(2015, 8, 10, 0, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2015, 8, 10, 0, 0, 0, 0, time.UTC), }, Spec: v1.NodeSpec{ ExternalID: "node0", @@ -1739,8 +1739,8 @@ func TestNodeEventGeneration(t *testing.T) { { Type: v1.NodeReady, Status: v1.ConditionUnknown, - LastHeartbeatTime: unversioned.Date(2015, 8, 10, 0, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2015, 8, 10, 0, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2015, 8, 10, 0, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2015, 8, 10, 0, 0, 0, 0, time.UTC), }, }, }, @@ -1757,7 +1757,7 @@ func TestNodeEventGeneration(t *testing.T) { nodeController.nodeExistsInCloudProvider = func(nodeName types.NodeName) (bool, error) { return false, nil } - nodeController.now = func() unversioned.Time { return fakeNow } + nodeController.now = func() metav1.Time { return fakeNow } fakeRecorder := NewFakeRecorder() nodeController.recorder = fakeRecorder if err := nodeController.monitorNodeStatus(); err != nil { @@ -1818,42 +1818,42 @@ func TestCheckPod(t *testing.T) { }, { pod: v1.Pod{ - ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &unversioned.Time{}}, + ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &metav1.Time{}}, Spec: v1.PodSpec{NodeName: "new"}, }, prune: false, }, { pod: v1.Pod{ - ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &unversioned.Time{}}, + ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &metav1.Time{}}, Spec: v1.PodSpec{NodeName: "old"}, }, prune: true, }, { pod: v1.Pod{ - ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &unversioned.Time{}}, + ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &metav1.Time{}}, Spec: v1.PodSpec{NodeName: "older"}, }, prune: true, }, { pod: v1.Pod{ - ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &unversioned.Time{}}, + ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &metav1.Time{}}, Spec: v1.PodSpec{NodeName: "oldest"}, }, prune: true, }, { pod: v1.Pod{ - ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &unversioned.Time{}}, + ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &metav1.Time{}}, Spec: v1.PodSpec{NodeName: ""}, }, prune: false, }, { pod: v1.Pod{ - ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &unversioned.Time{}}, + ObjectMeta: v1.ObjectMeta{DeletionTimestamp: &metav1.Time{}}, Spec: v1.PodSpec{NodeName: "nonexistant"}, }, prune: false, diff --git a/pkg/controller/node/test_utils.go b/pkg/controller/node/test_utils.go index e5bd2a5d1e5..1d92d275e2c 100644 --- a/pkg/controller/node/test_utils.go +++ b/pkg/controller/node/test_utils.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" @@ -218,17 +218,17 @@ type FakeRecorder struct { } func (f *FakeRecorder) Event(obj runtime.Object, eventtype, reason, message string) { - f.generateEvent(obj, unversioned.Now(), eventtype, reason, message) + f.generateEvent(obj, metav1.Now(), eventtype, reason, message) } func (f *FakeRecorder) Eventf(obj runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) { f.Event(obj, eventtype, reason, fmt.Sprintf(messageFmt, args...)) } -func (f *FakeRecorder) PastEventf(obj runtime.Object, timestamp unversioned.Time, eventtype, reason, messageFmt string, args ...interface{}) { +func (f *FakeRecorder) PastEventf(obj runtime.Object, timestamp metav1.Time, eventtype, reason, messageFmt string, args ...interface{}) { } -func (f *FakeRecorder) generateEvent(obj runtime.Object, timestamp unversioned.Time, eventtype, reason, message string) { +func (f *FakeRecorder) generateEvent(obj runtime.Object, timestamp metav1.Time, eventtype, reason, message string) { ref, err := v1.GetReference(obj) if err != nil { return @@ -243,7 +243,7 @@ func (f *FakeRecorder) generateEvent(obj runtime.Object, timestamp unversioned.T func (f *FakeRecorder) makeEvent(ref *v1.ObjectReference, eventtype, reason, message string) *v1.Event { fmt.Println("make event") - t := unversioned.Time{Time: f.clock.Now()} + t := metav1.Time{Time: f.clock.Now()} namespace := ref.Namespace if namespace == "" { namespace = v1.NamespaceDefault diff --git a/pkg/controller/petset/BUILD b/pkg/controller/petset/BUILD index cd410f8c399..de8f5e56c34 100644 --- a/pkg/controller/petset/BUILD +++ b/pkg/controller/petset/BUILD @@ -24,10 +24,10 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/apps/v1beta1:go_default_library", diff --git a/pkg/controller/petset/fakes.go b/pkg/controller/petset/fakes.go index e74faf7ab14..721b7ebf16f 100644 --- a/pkg/controller/petset/fakes.go +++ b/pkg/controller/petset/fakes.go @@ -23,7 +23,7 @@ import ( inf "gopkg.in/inf.v0" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apipod "k8s.io/kubernetes/pkg/api/v1/pod" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" @@ -71,7 +71,7 @@ func newStatefulSetWithVolumes(replicas int, name string, petMounts []v1.VolumeM } return &apps.StatefulSet{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StatefulSet", APIVersion: "apps/v1beta1", }, @@ -81,7 +81,7 @@ func newStatefulSetWithVolumes(replicas int, name string, petMounts []v1.VolumeM UID: types.UID("test"), }, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar"}, }, Replicas: func() *int32 { i := int32(replicas); return &i }(), @@ -273,7 +273,7 @@ func (f *fakePetClient) setDeletionTimestamp(index int) error { if len(f.pets) <= index { return fmt.Errorf("Index out of range, len %v index %v", len(f.pets), index) } - f.pets[index].pod.DeletionTimestamp = &unversioned.Time{Time: time.Now()} + f.pets[index].pod.DeletionTimestamp = &metav1.Time{Time: time.Now()} return nil } diff --git a/pkg/controller/petset/pet_set.go b/pkg/controller/petset/pet_set.go index b93d8ed8c41..bbbfdedf343 100644 --- a/pkg/controller/petset/pet_set.go +++ b/pkg/controller/petset/pet_set.go @@ -22,7 +22,7 @@ import ( "sort" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" "k8s.io/kubernetes/pkg/client/cache" @@ -216,7 +216,7 @@ func (psc *StatefulSetController) deletePod(obj interface{}) { // getPodsForStatefulSets returns the pods that match the selectors of the given statefulset. func (psc *StatefulSetController) getPodsForStatefulSet(ps *apps.StatefulSet) ([]*v1.Pod, error) { // TODO: Do we want the statefulset to fight with RCs? check parent statefulset annoation, or name prefix? - sel, err := unversioned.LabelSelectorAsSelector(ps.Spec.Selector) + sel, err := metav1.LabelSelectorAsSelector(ps.Spec.Selector) if err != nil { return []*v1.Pod{}, err } diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index e9e260b0162..c9522cb3b91 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -20,10 +20,10 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", @@ -49,11 +49,11 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", "//pkg/client/record:go_default_library", diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index 91615a0546e..1bf20cb5f7b 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -157,7 +157,7 @@ func (a *HorizontalController) computeReplicasForCPUUtilization(hpa *autoscaling return 0, nil, time.Time{}, fmt.Errorf(errMsg) } - selector, err := unversioned.LabelSelectorAsSelector(&unversioned.LabelSelector{MatchLabels: scale.Status.Selector}) + selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{MatchLabels: scale.Status.Selector}) if err != nil { errMsg := fmt.Sprintf("couldn't convert selector string to a corresponding selector object: %v", err) a.eventRecorder.Event(hpa, v1.EventTypeWarning, "InvalidSelector", errMsg) @@ -220,7 +220,7 @@ func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling. return 0, "", "", time.Time{}, fmt.Errorf("selector is required") } - selector, err := unversioned.LabelSelectorAsSelector(&unversioned.LabelSelector{MatchLabels: scale.Status.Selector}) + selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{MatchLabels: scale.Status.Selector}) if err != nil { errMsg := fmt.Sprintf("couldn't convert selector string to a corresponding selector object: %v", err) a.eventRecorder.Event(hpa, v1.EventTypeWarning, "InvalidSelector", errMsg) @@ -426,7 +426,7 @@ func (a *HorizontalController) updateStatus(hpa *autoscaling.HorizontalPodAutosc } if rescale { - now := unversioned.NewTime(time.Now()) + now := metav1.NewTime(time.Now()) hpa.Status.LastScaleTime = &now } diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 232ee7d7fb9..879756e2e55 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -28,7 +28,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apimachinery/registered" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1" @@ -97,7 +97,7 @@ type testCase struct { resource *fakeResource // Last scale time - lastScaleTime *unversioned.Time + lastScaleTime *metav1.Time } // Needs to be called under a lock. @@ -120,7 +120,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { namespace := "test-namespace" hpaName := "test-hpa" podNamePrefix := "test-pod" - selector := &unversioned.LabelSelector{ + selector := &metav1.LabelSelector{ MatchLabels: map[string]string{"name": podNamePrefix}, } @@ -308,7 +308,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: namespace, }, - Timestamp: unversioned.Time{Time: time.Now()}, + Timestamp: metav1.Time{Time: time.Now()}, Containers: []metricsapi.ContainerMetrics{ { Name: "container", @@ -1046,7 +1046,7 @@ func TestComputedToleranceAlgImplementation(t *testing.T) { } func TestScaleUpRCImmediately(t *testing.T) { - time := unversioned.Time{Time: time.Now()} + time := metav1.Time{Time: time.Now()} tc := testCase{ minReplicas: 2, maxReplicas: 6, @@ -1062,7 +1062,7 @@ func TestScaleUpRCImmediately(t *testing.T) { } func TestScaleDownRCImmediately(t *testing.T) { - time := unversioned.Time{Time: time.Now()} + time := metav1.Time{Time: time.Now()} tc := testCase{ minReplicas: 2, maxReplicas: 5, diff --git a/pkg/controller/podautoscaler/horizontal_test.go.orig b/pkg/controller/podautoscaler/horizontal_test.go.orig new file mode 100644 index 00000000000..879756e2e55 --- /dev/null +++ b/pkg/controller/podautoscaler/horizontal_test.go.orig @@ -0,0 +1,1080 @@ +/* +Copyright 2015 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 podautoscaler + +import ( + "encoding/json" + "fmt" + "io" + "math" + "strconv" + "strings" + "sync" + "testing" + "time" + + "k8s.io/kubernetes/pkg/api/resource" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/v1" + _ "k8s.io/kubernetes/pkg/apimachinery/registered" + autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" + v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" + "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/restclient" + "k8s.io/kubernetes/pkg/client/testing/core" + "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" + "k8s.io/kubernetes/pkg/runtime" + "k8s.io/kubernetes/pkg/watch" + + heapster "k8s.io/heapster/metrics/api/v1/types" + metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" + + "github.com/stretchr/testify/assert" +) + +func (w fakeResponseWrapper) DoRaw() ([]byte, error) { + return w.raw, nil +} + +func (w fakeResponseWrapper) Stream() (io.ReadCloser, error) { + return nil, nil +} + +func newFakeResponseWrapper(raw []byte) fakeResponseWrapper { + return fakeResponseWrapper{raw: raw} +} + +type fakeResponseWrapper struct { + raw []byte +} + +type fakeResource struct { + name string + apiVersion string + kind string +} + +type testCase struct { + sync.Mutex + minReplicas int32 + maxReplicas int32 + initialReplicas int32 + desiredReplicas int32 + + // CPU target utilization as a percentage of the requested resources. + CPUTarget int32 + CPUCurrent int32 + verifyCPUCurrent bool + reportedLevels []uint64 + reportedCPURequests []resource.Quantity + reportedPodReadiness []v1.ConditionStatus + cmTarget *extensions.CustomMetricTargetList + scaleUpdated bool + statusUpdated bool + eventCreated bool + verifyEvents bool + useMetricsApi bool + // Channel with names of HPA objects which we have reconciled. + processed chan string + + // Target resource information. + resource *fakeResource + + // Last scale time + lastScaleTime *metav1.Time +} + +// Needs to be called under a lock. +func (tc *testCase) computeCPUCurrent() { + if len(tc.reportedLevels) != len(tc.reportedCPURequests) || len(tc.reportedLevels) == 0 { + return + } + reported := 0 + for _, r := range tc.reportedLevels { + reported += int(r) + } + requested := 0 + for _, req := range tc.reportedCPURequests { + requested += int(req.MilliValue()) + } + tc.CPUCurrent = int32(100 * reported / requested) +} + +func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { + namespace := "test-namespace" + hpaName := "test-hpa" + podNamePrefix := "test-pod" + selector := &metav1.LabelSelector{ + MatchLabels: map[string]string{"name": podNamePrefix}, + } + + tc.Lock() + + tc.scaleUpdated = false + tc.statusUpdated = false + tc.eventCreated = false + tc.processed = make(chan string, 100) + if tc.CPUCurrent == 0 { + tc.computeCPUCurrent() + } + + // TODO(madhusudancs): HPA only supports resources in extensions/v1beta1 right now. Add + // tests for "v1" replicationcontrollers when HPA adds support for cross-group scale. + if tc.resource == nil { + tc.resource = &fakeResource{ + name: "test-rc", + apiVersion: "extensions/v1beta1", + kind: "replicationcontrollers", + } + } + tc.Unlock() + + fakeClient := &fake.Clientset{} + fakeClient.AddReactor("list", "horizontalpodautoscalers", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := &autoscaling.HorizontalPodAutoscalerList{ + Items: []autoscaling.HorizontalPodAutoscaler{ + { + ObjectMeta: v1.ObjectMeta{ + Name: hpaName, + Namespace: namespace, + SelfLink: "experimental/v1/namespaces/" + namespace + "/horizontalpodautoscalers/" + hpaName, + }, + Spec: autoscaling.HorizontalPodAutoscalerSpec{ + ScaleTargetRef: autoscaling.CrossVersionObjectReference{ + Kind: tc.resource.kind, + Name: tc.resource.name, + APIVersion: tc.resource.apiVersion, + }, + MinReplicas: &tc.minReplicas, + MaxReplicas: tc.maxReplicas, + }, + Status: autoscaling.HorizontalPodAutoscalerStatus{ + CurrentReplicas: tc.initialReplicas, + DesiredReplicas: tc.initialReplicas, + }, + }, + }, + } + + if tc.CPUTarget > 0.0 { + obj.Items[0].Spec.TargetCPUUtilizationPercentage = &tc.CPUTarget + } + if tc.cmTarget != nil { + b, err := json.Marshal(tc.cmTarget) + if err != nil { + t.Fatalf("Failed to marshal cm: %v", err) + } + obj.Items[0].Annotations = make(map[string]string) + obj.Items[0].Annotations[HpaCustomMetricsTargetAnnotationName] = string(b) + } + return true, obj, nil + }) + + fakeClient.AddReactor("get", "replicationcontrollers", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := &extensions.Scale{ + ObjectMeta: v1.ObjectMeta{ + Name: tc.resource.name, + Namespace: namespace, + }, + Spec: extensions.ScaleSpec{ + Replicas: tc.initialReplicas, + }, + Status: extensions.ScaleStatus{ + Replicas: tc.initialReplicas, + Selector: selector.MatchLabels, + }, + } + return true, obj, nil + }) + + fakeClient.AddReactor("get", "deployments", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := &extensions.Scale{ + ObjectMeta: v1.ObjectMeta{ + Name: tc.resource.name, + Namespace: namespace, + }, + Spec: extensions.ScaleSpec{ + Replicas: tc.initialReplicas, + }, + Status: extensions.ScaleStatus{ + Replicas: tc.initialReplicas, + Selector: selector.MatchLabels, + }, + } + return true, obj, nil + }) + + fakeClient.AddReactor("get", "replicasets", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := &extensions.Scale{ + ObjectMeta: v1.ObjectMeta{ + Name: tc.resource.name, + Namespace: namespace, + }, + Spec: extensions.ScaleSpec{ + Replicas: tc.initialReplicas, + }, + Status: extensions.ScaleStatus{ + Replicas: tc.initialReplicas, + Selector: selector.MatchLabels, + }, + } + return true, obj, nil + }) + + fakeClient.AddReactor("list", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := &v1.PodList{} + for i := 0; i < len(tc.reportedCPURequests); i++ { + podReadiness := v1.ConditionTrue + if tc.reportedPodReadiness != nil { + podReadiness = tc.reportedPodReadiness[i] + } + podName := fmt.Sprintf("%s-%d", podNamePrefix, i) + pod := v1.Pod{ + Status: v1.PodStatus{ + Phase: v1.PodRunning, + Conditions: []v1.PodCondition{ + { + Type: v1.PodReady, + Status: podReadiness, + }, + }, + }, + ObjectMeta: v1.ObjectMeta{ + Name: podName, + Namespace: namespace, + Labels: map[string]string{ + "name": podNamePrefix, + }, + }, + Spec: v1.PodSpec{ + Containers: []v1.Container{ + { + Resources: v1.ResourceRequirements{ + Requests: v1.ResourceList{ + v1.ResourceCPU: tc.reportedCPURequests[i], + }, + }, + }, + }, + }, + } + obj.Items = append(obj.Items, pod) + } + return true, obj, nil + }) + + fakeClient.AddProxyReactor("services", func(action core.Action) (handled bool, ret restclient.ResponseWrapper, err error) { + tc.Lock() + defer tc.Unlock() + + var heapsterRawMemResponse []byte + + if tc.useMetricsApi { + metrics := metricsapi.PodMetricsList{} + for i, cpu := range tc.reportedLevels { + podMetric := metricsapi.PodMetrics{ + ObjectMeta: v1.ObjectMeta{ + Name: fmt.Sprintf("%s-%d", podNamePrefix, i), + Namespace: namespace, + }, + Timestamp: metav1.Time{Time: time.Now()}, + Containers: []metricsapi.ContainerMetrics{ + { + Name: "container", + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity( + int64(cpu), + resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity( + int64(1024*1024), + resource.BinarySI), + }, + }, + }, + } + metrics.Items = append(metrics.Items, podMetric) + } + heapsterRawMemResponse, _ = json.Marshal(&metrics) + } else { + // only return the pods that we actually asked for + proxyAction := action.(core.ProxyGetAction) + pathParts := strings.Split(proxyAction.GetPath(), "/") + // pathParts should look like [ api, v1, model, namespaces, $NS, pod-list, $PODS, metrics, $METRIC... ] + if len(pathParts) < 9 { + return true, nil, fmt.Errorf("invalid heapster path %q", proxyAction.GetPath()) + } + + podNames := strings.Split(pathParts[7], ",") + podPresent := make([]bool, len(tc.reportedLevels)) + for _, name := range podNames { + if len(name) <= len(podNamePrefix)+1 { + return true, nil, fmt.Errorf("unknown pod %q", name) + } + num, err := strconv.Atoi(name[len(podNamePrefix)+1:]) + if err != nil { + return true, nil, fmt.Errorf("unknown pod %q", name) + } + podPresent[num] = true + } + + timestamp := time.Now() + metrics := heapster.MetricResultList{} + for i, level := range tc.reportedLevels { + if !podPresent[i] { + continue + } + + metric := heapster.MetricResult{ + Metrics: []heapster.MetricPoint{{Timestamp: timestamp, Value: level, FloatValue: nil}}, + LatestTimestamp: timestamp, + } + metrics.Items = append(metrics.Items, metric) + } + heapsterRawMemResponse, _ = json.Marshal(&metrics) + } + + return true, newFakeResponseWrapper(heapsterRawMemResponse), nil + }) + + fakeClient.AddReactor("update", "replicationcontrollers", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := action.(core.UpdateAction).GetObject().(*extensions.Scale) + replicas := action.(core.UpdateAction).GetObject().(*extensions.Scale).Spec.Replicas + assert.Equal(t, tc.desiredReplicas, replicas, "the replica count of the RC should be as expected") + tc.scaleUpdated = true + return true, obj, nil + }) + + fakeClient.AddReactor("update", "deployments", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := action.(core.UpdateAction).GetObject().(*extensions.Scale) + replicas := action.(core.UpdateAction).GetObject().(*extensions.Scale).Spec.Replicas + assert.Equal(t, tc.desiredReplicas, replicas, "the replica count of the deployment should be as expected") + tc.scaleUpdated = true + return true, obj, nil + }) + + fakeClient.AddReactor("update", "replicasets", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := action.(core.UpdateAction).GetObject().(*extensions.Scale) + replicas := action.(core.UpdateAction).GetObject().(*extensions.Scale).Spec.Replicas + assert.Equal(t, tc.desiredReplicas, replicas, "the replica count of the replicaset should be as expected") + tc.scaleUpdated = true + return true, obj, nil + }) + + fakeClient.AddReactor("update", "horizontalpodautoscalers", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := action.(core.UpdateAction).GetObject().(*autoscaling.HorizontalPodAutoscaler) + assert.Equal(t, namespace, obj.Namespace, "the HPA namespace should be as expected") + assert.Equal(t, hpaName, obj.Name, "the HPA name should be as expected") + assert.Equal(t, tc.desiredReplicas, obj.Status.DesiredReplicas, "the desired replica count reported in the object status should be as expected") + if tc.verifyCPUCurrent { + assert.NotNil(t, obj.Status.CurrentCPUUtilizationPercentage, "the reported CPU utilization percentage should be non-nil") + assert.Equal(t, tc.CPUCurrent, *obj.Status.CurrentCPUUtilizationPercentage, "the report CPU utilization percentage should be as expected") + } + tc.statusUpdated = true + // Every time we reconcile HPA object we are updating status. + tc.processed <- obj.Name + return true, obj, nil + }) + + fakeClient.AddReactor("*", "events", func(action core.Action) (handled bool, ret runtime.Object, err error) { + tc.Lock() + defer tc.Unlock() + + obj := action.(core.CreateAction).GetObject().(*v1.Event) + if tc.verifyEvents { + switch obj.Reason { + case "SuccessfulRescale": + assert.Equal(t, fmt.Sprintf("New size: %d; reason: CPU utilization above target", tc.desiredReplicas), obj.Message) + case "DesiredReplicasComputed": + assert.Equal(t, fmt.Sprintf( + "Computed the desired num of replicas: %d (avgCPUutil: %d, current replicas: %d)", + tc.desiredReplicas, + (int64(tc.reportedLevels[0])*100)/tc.reportedCPURequests[0].MilliValue(), tc.initialReplicas), obj.Message) + default: + assert.False(t, true, fmt.Sprintf("Unexpected event: %s / %s", obj.Reason, obj.Message)) + } + } + tc.eventCreated = true + return true, obj, nil + }) + + fakeWatch := watch.NewFake() + fakeClient.AddWatchReactor("*", core.DefaultWatchReactor(fakeWatch, nil)) + + return fakeClient +} + +func (tc *testCase) verifyResults(t *testing.T) { + tc.Lock() + defer tc.Unlock() + + assert.Equal(t, tc.initialReplicas != tc.desiredReplicas, tc.scaleUpdated, "the scale should only be updated if we expected a change in replicas") + assert.True(t, tc.statusUpdated, "the status should have been updated") + if tc.verifyEvents { + assert.Equal(t, tc.initialReplicas != tc.desiredReplicas, tc.eventCreated, "an event should have been created only if we expected a change in replicas") + } +} + +func (tc *testCase) runTest(t *testing.T) { + testClient := tc.prepareTestClient(t) + metricsClient := metrics.NewHeapsterMetricsClient(testClient, metrics.DefaultHeapsterNamespace, metrics.DefaultHeapsterScheme, metrics.DefaultHeapsterService, metrics.DefaultHeapsterPort) + + broadcaster := record.NewBroadcasterForTests(0) + broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: testClient.Core().Events("")}) + recorder := broadcaster.NewRecorder(v1.EventSource{Component: "horizontal-pod-autoscaler"}) + + replicaCalc := &ReplicaCalculator{ + metricsClient: metricsClient, + podsGetter: testClient.Core(), + } + + hpaController := &HorizontalController{ + replicaCalc: replicaCalc, + eventRecorder: recorder, + scaleNamespacer: testClient.Extensions(), + hpaNamespacer: testClient.Autoscaling(), + } + + store, frameworkController := newInformer(hpaController, time.Minute) + hpaController.store = store + hpaController.controller = frameworkController + + stop := make(chan struct{}) + defer close(stop) + go hpaController.Run(stop) + + tc.Lock() + if tc.verifyEvents { + tc.Unlock() + // We need to wait for events to be broadcasted (sleep for longer than record.sleepDuration). + time.Sleep(2 * time.Second) + } else { + tc.Unlock() + } + // Wait for HPA to be processed. + <-tc.processed + tc.verifyResults(t) +} + +func TestDefaultScaleUpRC(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 4, + desiredReplicas: 5, + verifyCPUCurrent: true, + reportedLevels: []uint64{900, 950, 950, 1000}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestDefaultScaleUpDeployment(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 4, + desiredReplicas: 5, + verifyCPUCurrent: true, + reportedLevels: []uint64{900, 950, 950, 1000}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + resource: &fakeResource{ + name: "test-dep", + apiVersion: "extensions/v1beta1", + kind: "deployments", + }, + } + tc.runTest(t) +} + +func TestDefaultScaleUpReplicaSet(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 4, + desiredReplicas: 5, + verifyCPUCurrent: true, + reportedLevels: []uint64{900, 950, 950, 1000}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + resource: &fakeResource{ + name: "test-replicaset", + apiVersion: "extensions/v1beta1", + kind: "replicasets", + }, + } + tc.runTest(t) +} + +func TestScaleUp(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 3, + desiredReplicas: 5, + CPUTarget: 30, + verifyCPUCurrent: true, + reportedLevels: []uint64{300, 500, 700}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestScaleUpUnreadyLessScale(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 3, + desiredReplicas: 4, + CPUTarget: 30, + CPUCurrent: 60, + verifyCPUCurrent: true, + reportedLevels: []uint64{300, 500, 700}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + reportedPodReadiness: []v1.ConditionStatus{v1.ConditionFalse, v1.ConditionTrue, v1.ConditionTrue}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestScaleUpUnreadyNoScale(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 3, + desiredReplicas: 3, + CPUTarget: 30, + CPUCurrent: 40, + verifyCPUCurrent: true, + reportedLevels: []uint64{400, 500, 700}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + reportedPodReadiness: []v1.ConditionStatus{v1.ConditionTrue, v1.ConditionFalse, v1.ConditionFalse}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestScaleUpDeployment(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 3, + desiredReplicas: 5, + CPUTarget: 30, + verifyCPUCurrent: true, + reportedLevels: []uint64{300, 500, 700}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + resource: &fakeResource{ + name: "test-dep", + apiVersion: "extensions/v1beta1", + kind: "deployments", + }, + } + tc.runTest(t) +} + +func TestScaleUpReplicaSet(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 3, + desiredReplicas: 5, + CPUTarget: 30, + verifyCPUCurrent: true, + reportedLevels: []uint64{300, 500, 700}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + resource: &fakeResource{ + name: "test-replicaset", + apiVersion: "extensions/v1beta1", + kind: "replicasets", + }, + } + tc.runTest(t) +} + +func TestScaleUpCM(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 3, + desiredReplicas: 4, + CPUTarget: 0, + cmTarget: &extensions.CustomMetricTargetList{ + Items: []extensions.CustomMetricTarget{{ + Name: "qps", + TargetValue: resource.MustParse("15.0"), + }}, + }, + reportedLevels: []uint64{20, 10, 30}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + } + tc.runTest(t) +} + +func TestScaleUpCMUnreadyLessScale(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 3, + desiredReplicas: 4, + CPUTarget: 0, + cmTarget: &extensions.CustomMetricTargetList{ + Items: []extensions.CustomMetricTarget{{ + Name: "qps", + TargetValue: resource.MustParse("15.0"), + }}, + }, + reportedLevels: []uint64{50, 10, 30}, + reportedPodReadiness: []v1.ConditionStatus{v1.ConditionTrue, v1.ConditionTrue, v1.ConditionFalse}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + } + tc.runTest(t) +} + +func TestScaleUpCMUnreadyNoScaleWouldScaleDown(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 3, + desiredReplicas: 3, + CPUTarget: 0, + cmTarget: &extensions.CustomMetricTargetList{ + Items: []extensions.CustomMetricTarget{{ + Name: "qps", + TargetValue: resource.MustParse("15.0"), + }}, + }, + reportedLevels: []uint64{50, 15, 30}, + reportedPodReadiness: []v1.ConditionStatus{v1.ConditionFalse, v1.ConditionTrue, v1.ConditionFalse}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + } + tc.runTest(t) +} + +func TestDefaultScaleDown(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 5, + desiredReplicas: 4, + verifyCPUCurrent: true, + reportedLevels: []uint64{400, 500, 600, 700, 800}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestScaleDown(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 5, + desiredReplicas: 3, + CPUTarget: 50, + verifyCPUCurrent: true, + reportedLevels: []uint64{100, 300, 500, 250, 250}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestScaleDownCM(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 5, + desiredReplicas: 3, + CPUTarget: 0, + cmTarget: &extensions.CustomMetricTargetList{ + Items: []extensions.CustomMetricTarget{{ + Name: "qps", + TargetValue: resource.MustParse("20"), + }}}, + reportedLevels: []uint64{12, 12, 12, 12, 12}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + } + tc.runTest(t) +} + +func TestScaleDownIgnoresUnreadyPods(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 5, + desiredReplicas: 2, + CPUTarget: 50, + CPUCurrent: 30, + verifyCPUCurrent: true, + reportedLevels: []uint64{100, 300, 500, 250, 250}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + reportedPodReadiness: []v1.ConditionStatus{v1.ConditionTrue, v1.ConditionTrue, v1.ConditionTrue, v1.ConditionFalse, v1.ConditionFalse}, + } + tc.runTest(t) +} + +func TestTolerance(t *testing.T) { + tc := testCase{ + minReplicas: 1, + maxReplicas: 5, + initialReplicas: 3, + desiredReplicas: 3, + CPUTarget: 100, + reportedLevels: []uint64{1010, 1030, 1020}, + reportedCPURequests: []resource.Quantity{resource.MustParse("0.9"), resource.MustParse("1.0"), resource.MustParse("1.1")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestToleranceCM(t *testing.T) { + tc := testCase{ + minReplicas: 1, + maxReplicas: 5, + initialReplicas: 3, + desiredReplicas: 3, + cmTarget: &extensions.CustomMetricTargetList{ + Items: []extensions.CustomMetricTarget{{ + Name: "qps", + TargetValue: resource.MustParse("20"), + }}}, + reportedLevels: []uint64{20, 21, 21}, + reportedCPURequests: []resource.Quantity{resource.MustParse("0.9"), resource.MustParse("1.0"), resource.MustParse("1.1")}, + } + tc.runTest(t) +} + +func TestMinReplicas(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 5, + initialReplicas: 3, + desiredReplicas: 2, + CPUTarget: 90, + reportedLevels: []uint64{10, 95, 10}, + reportedCPURequests: []resource.Quantity{resource.MustParse("0.9"), resource.MustParse("1.0"), resource.MustParse("1.1")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestZeroReplicas(t *testing.T) { + tc := testCase{ + minReplicas: 3, + maxReplicas: 5, + initialReplicas: 0, + desiredReplicas: 0, + CPUTarget: 90, + reportedLevels: []uint64{}, + reportedCPURequests: []resource.Quantity{}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestTooFewReplicas(t *testing.T) { + tc := testCase{ + minReplicas: 3, + maxReplicas: 5, + initialReplicas: 2, + desiredReplicas: 3, + CPUTarget: 90, + reportedLevels: []uint64{}, + reportedCPURequests: []resource.Quantity{}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestTooManyReplicas(t *testing.T) { + tc := testCase{ + minReplicas: 3, + maxReplicas: 5, + initialReplicas: 10, + desiredReplicas: 5, + CPUTarget: 90, + reportedLevels: []uint64{}, + reportedCPURequests: []resource.Quantity{}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestMaxReplicas(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 5, + initialReplicas: 3, + desiredReplicas: 5, + CPUTarget: 90, + reportedLevels: []uint64{8000, 9500, 1000}, + reportedCPURequests: []resource.Quantity{resource.MustParse("0.9"), resource.MustParse("1.0"), resource.MustParse("1.1")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestSuperfluousMetrics(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 4, + desiredReplicas: 6, + CPUTarget: 100, + reportedLevels: []uint64{4000, 9500, 3000, 7000, 3200, 2000}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestMissingMetrics(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 4, + desiredReplicas: 3, + CPUTarget: 100, + reportedLevels: []uint64{400, 95}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestEmptyMetrics(t *testing.T) { + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 4, + desiredReplicas: 4, + CPUTarget: 100, + reportedLevels: []uint64{}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestEmptyCPURequest(t *testing.T) { + tc := testCase{ + minReplicas: 1, + maxReplicas: 5, + initialReplicas: 1, + desiredReplicas: 1, + CPUTarget: 100, + reportedLevels: []uint64{200}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestEventCreated(t *testing.T) { + tc := testCase{ + minReplicas: 1, + maxReplicas: 5, + initialReplicas: 1, + desiredReplicas: 2, + CPUTarget: 50, + reportedLevels: []uint64{200}, + reportedCPURequests: []resource.Quantity{resource.MustParse("0.2")}, + verifyEvents: true, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestEventNotCreated(t *testing.T) { + tc := testCase{ + minReplicas: 1, + maxReplicas: 5, + initialReplicas: 2, + desiredReplicas: 2, + CPUTarget: 50, + reportedLevels: []uint64{200, 200}, + reportedCPURequests: []resource.Quantity{resource.MustParse("0.4"), resource.MustParse("0.4")}, + verifyEvents: true, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestMissingReports(t *testing.T) { + tc := testCase{ + minReplicas: 1, + maxReplicas: 5, + initialReplicas: 4, + desiredReplicas: 2, + CPUTarget: 50, + reportedLevels: []uint64{200}, + reportedCPURequests: []resource.Quantity{resource.MustParse("0.2")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +func TestUpscaleCap(t *testing.T) { + tc := testCase{ + minReplicas: 1, + maxReplicas: 100, + initialReplicas: 3, + desiredReplicas: 6, + CPUTarget: 10, + reportedLevels: []uint64{100, 200, 300}, + reportedCPURequests: []resource.Quantity{resource.MustParse("0.1"), resource.MustParse("0.1"), resource.MustParse("0.1")}, + useMetricsApi: true, + } + tc.runTest(t) +} + +// TestComputedToleranceAlgImplementation is a regression test which +// back-calculates a minimal percentage for downscaling based on a small percentage +// increase in pod utilization which is calibrated against the tolerance value. +func TestComputedToleranceAlgImplementation(t *testing.T) { + + startPods := int32(10) + // 150 mCPU per pod. + totalUsedCPUOfAllPods := uint64(startPods * 150) + // Each pod starts out asking for 2X what is really needed. + // This means we will have a 50% ratio of used/requested + totalRequestedCPUOfAllPods := int32(2 * totalUsedCPUOfAllPods) + requestedToUsed := float64(totalRequestedCPUOfAllPods / int32(totalUsedCPUOfAllPods)) + // Spread the amount we ask over 10 pods. We can add some jitter later in reportedLevels. + perPodRequested := totalRequestedCPUOfAllPods / startPods + + // Force a minimal scaling event by satisfying (tolerance < 1 - resourcesUsedRatio). + target := math.Abs(1/(requestedToUsed*(1-tolerance))) + .01 + finalCpuPercentTarget := int32(target * 100) + resourcesUsedRatio := float64(totalUsedCPUOfAllPods) / float64(float64(totalRequestedCPUOfAllPods)*target) + + // i.e. .60 * 20 -> scaled down expectation. + finalPods := int32(math.Ceil(resourcesUsedRatio * float64(startPods))) + + // To breach tolerance we will create a utilization ratio difference of tolerance to usageRatioToleranceValue) + tc := testCase{ + minReplicas: 0, + maxReplicas: 1000, + initialReplicas: startPods, + desiredReplicas: finalPods, + CPUTarget: finalCpuPercentTarget, + reportedLevels: []uint64{ + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + }, + reportedCPURequests: []resource.Quantity{ + resource.MustParse(fmt.Sprint(perPodRequested+100) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested-100) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested+10) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested-10) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested+2) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested-2) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested+1) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested-1) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested) + "m"), + }, + useMetricsApi: true, + } + + tc.runTest(t) + + // Reuse the data structure above, now testing "unscaling". + // Now, we test that no scaling happens if we are in a very close margin to the tolerance + target = math.Abs(1/(requestedToUsed*(1-tolerance))) + .004 + finalCpuPercentTarget = int32(target * 100) + tc.CPUTarget = finalCpuPercentTarget + tc.initialReplicas = startPods + tc.desiredReplicas = startPods + tc.runTest(t) +} + +func TestScaleUpRCImmediately(t *testing.T) { + time := metav1.Time{Time: time.Now()} + tc := testCase{ + minReplicas: 2, + maxReplicas: 6, + initialReplicas: 1, + desiredReplicas: 2, + verifyCPUCurrent: true, + reportedLevels: []uint64{0, 0, 0, 0}, + reportedCPURequests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + useMetricsApi: true, + lastScaleTime: &time, + } + tc.runTest(t) +} + +func TestScaleDownRCImmediately(t *testing.T) { + time := metav1.Time{Time: time.Now()} + tc := testCase{ + minReplicas: 2, + maxReplicas: 5, + initialReplicas: 6, + desiredReplicas: 5, + CPUTarget: 50, + reportedLevels: []uint64{8000, 9500, 1000}, + reportedCPURequests: []resource.Quantity{resource.MustParse("0.9"), resource.MustParse("1.0"), resource.MustParse("1.1")}, + useMetricsApi: true, + lastScaleTime: &time, + } + tc.runTest(t) +} + +// TODO: add more tests diff --git a/pkg/controller/podautoscaler/horizontal_test.go.rej b/pkg/controller/podautoscaler/horizontal_test.go.rej new file mode 100644 index 00000000000..7ef3b261675 --- /dev/null +++ b/pkg/controller/podautoscaler/horizontal_test.go.rej @@ -0,0 +1,11 @@ +--- pkg/controller/podautoscaler/horizontal_test.go ++++ pkg/controller/podautoscaler/horizontal_test.go +@@ -306,7 +307,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { + Name: fmt.Sprintf("%s-%d", podNamePrefix, i), + Namespace: namespace, + }, +- Timestamp: metav1.Time{Time: time.Now()}, ++ Timestamp: unversioned.Time{Time: time.Now()}, + Containers: []metrics_api.ContainerMetrics{ + { + Name: "container", diff --git a/pkg/controller/podautoscaler/metrics/BUILD b/pkg/controller/podautoscaler/metrics/BUILD index 6d663f224ed..52d30749973 100644 --- a/pkg/controller/podautoscaler/metrics/BUILD +++ b/pkg/controller/podautoscaler/metrics/BUILD @@ -35,9 +35,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/pkg/controller/podautoscaler/metrics/metrics_client_test.go b/pkg/controller/podautoscaler/metrics/metrics_client_test.go index 1a892bab81c..5e89f90ce06 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/metrics_client_test.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" @@ -110,7 +110,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: namespace, }, - Timestamp: unversioned.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, + Timestamp: metav1.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, Containers: []metricsapi.ContainerMetrics{}, } for j, cpu := range containers { diff --git a/pkg/controller/podautoscaler/metrics/metrics_client_test.go.orig b/pkg/controller/podautoscaler/metrics/metrics_client_test.go.orig new file mode 100644 index 00000000000..5e89f90ce06 --- /dev/null +++ b/pkg/controller/podautoscaler/metrics/metrics_client_test.go.orig @@ -0,0 +1,373 @@ +/* +Copyright 2015 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 metrics + +import ( + "encoding/json" + "fmt" + "io" + "testing" + "time" + + "k8s.io/kubernetes/pkg/api/resource" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/v1" + _ "k8s.io/kubernetes/pkg/apimachinery/registered" + "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" + "k8s.io/kubernetes/pkg/client/restclient" + "k8s.io/kubernetes/pkg/client/testing/core" + "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/runtime" + + heapster "k8s.io/heapster/metrics/api/v1/types" + metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" + + "github.com/stretchr/testify/assert" +) + +var fixedTimestamp = time.Date(2015, time.November, 10, 12, 30, 0, 0, time.UTC) + +func (w fakeResponseWrapper) DoRaw() ([]byte, error) { + return w.raw, nil +} + +func (w fakeResponseWrapper) Stream() (io.ReadCloser, error) { + return nil, nil +} + +func newFakeResponseWrapper(raw []byte) fakeResponseWrapper { + return fakeResponseWrapper{raw: raw} +} + +type fakeResponseWrapper struct { + raw []byte +} + +// timestamp is used for establishing order on metricPoints +type metricPoint struct { + level uint64 + timestamp int +} + +type testCase struct { + desiredResourceValues PodResourceInfo + desiredMetricValues PodMetricsInfo + desiredError error + + replicas int + targetTimestamp int + reportedMetricsPoints [][]metricPoint + reportedPodMetrics [][]int64 + + namespace string + selector labels.Selector + resourceName v1.ResourceName + metricName string +} + +func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { + namespace := "test-namespace" + tc.namespace = namespace + podNamePrefix := "test-pod" + podLabels := map[string]string{"name": podNamePrefix} + tc.selector = labels.SelectorFromSet(podLabels) + + // it's a resource test if we have a resource name + isResource := len(tc.resourceName) > 0 + + fakeClient := &fake.Clientset{} + + fakeClient.AddReactor("list", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) { + obj := &v1.PodList{} + for i := 0; i < tc.replicas; i++ { + podName := fmt.Sprintf("%s-%d", podNamePrefix, i) + pod := buildPod(namespace, podName, podLabels, v1.PodRunning, "1024") + obj.Items = append(obj.Items, pod) + } + return true, obj, nil + }) + + if isResource { + fakeClient.AddProxyReactor("services", func(action core.Action) (handled bool, ret restclient.ResponseWrapper, err error) { + metrics := metricsapi.PodMetricsList{} + for i, containers := range tc.reportedPodMetrics { + metric := metricsapi.PodMetrics{ + ObjectMeta: v1.ObjectMeta{ + Name: fmt.Sprintf("%s-%d", podNamePrefix, i), + Namespace: namespace, + }, + Timestamp: metav1.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, + Containers: []metricsapi.ContainerMetrics{}, + } + for j, cpu := range containers { + cm := metricsapi.ContainerMetrics{ + Name: fmt.Sprintf("%s-%d-container-%d", podNamePrefix, i, j), + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity( + cpu, + resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity( + int64(1024*1024), + resource.BinarySI), + }, + } + metric.Containers = append(metric.Containers, cm) + } + metrics.Items = append(metrics.Items, metric) + } + heapsterRawMemResponse, _ := json.Marshal(&metrics) + return true, newFakeResponseWrapper(heapsterRawMemResponse), nil + }) + } else { + fakeClient.AddProxyReactor("services", func(action core.Action) (handled bool, ret restclient.ResponseWrapper, err error) { + metrics := heapster.MetricResultList{} + var latestTimestamp time.Time + for _, reportedMetricPoints := range tc.reportedMetricsPoints { + var heapsterMetricPoints []heapster.MetricPoint + for _, reportedMetricPoint := range reportedMetricPoints { + timestamp := fixedTimestamp.Add(time.Duration(reportedMetricPoint.timestamp) * time.Minute) + if latestTimestamp.Before(timestamp) { + latestTimestamp = timestamp + } + heapsterMetricPoint := heapster.MetricPoint{Timestamp: timestamp, Value: reportedMetricPoint.level, FloatValue: nil} + heapsterMetricPoints = append(heapsterMetricPoints, heapsterMetricPoint) + } + metric := heapster.MetricResult{ + Metrics: heapsterMetricPoints, + LatestTimestamp: latestTimestamp, + } + metrics.Items = append(metrics.Items, metric) + } + heapsterRawMemResponse, _ := json.Marshal(&metrics) + return true, newFakeResponseWrapper(heapsterRawMemResponse), nil + }) + } + + return fakeClient +} + +func buildPod(namespace, podName string, podLabels map[string]string, phase v1.PodPhase, request string) v1.Pod { + return v1.Pod{ + ObjectMeta: v1.ObjectMeta{ + Name: podName, + Namespace: namespace, + Labels: podLabels, + }, + Spec: v1.PodSpec{ + Containers: []v1.Container{ + { + Resources: v1.ResourceRequirements{ + Requests: v1.ResourceList{ + v1.ResourceCPU: resource.MustParse(request), + }, + }, + }, + }, + }, + Status: v1.PodStatus{ + Phase: phase, + Conditions: []v1.PodCondition{ + { + Type: v1.PodReady, + Status: v1.ConditionTrue, + }, + }, + }, + } +} + +func (tc *testCase) verifyResults(t *testing.T, metrics interface{}, timestamp time.Time, err error) { + if tc.desiredError != nil { + assert.Error(t, err, "there should be an error retrieving the metrics") + assert.Contains(t, fmt.Sprintf("%v", err), fmt.Sprintf("%v", tc.desiredError), "the error message should be eas expected") + return + } + assert.NoError(t, err, "there should be no error retrieving the metrics") + assert.NotNil(t, metrics, "there should be metrics returned") + + if metricsInfo, wasRaw := metrics.(PodMetricsInfo); wasRaw { + assert.Equal(t, tc.desiredMetricValues, metricsInfo, "the raw metrics values should be as expected") + } else if resourceInfo, wasResource := metrics.(PodResourceInfo); wasResource { + assert.Equal(t, tc.desiredResourceValues, resourceInfo, "the resource metrics values be been as expected") + } else { + assert.False(t, true, "should return either resource metrics info or raw metrics info") + } + + targetTimestamp := fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute) + assert.True(t, targetTimestamp.Equal(timestamp), fmt.Sprintf("the timestamp should be as expected (%s) but was %s", targetTimestamp, timestamp)) +} + +func (tc *testCase) runTest(t *testing.T) { + testClient := tc.prepareTestClient(t) + metricsClient := NewHeapsterMetricsClient(testClient, DefaultHeapsterNamespace, DefaultHeapsterScheme, DefaultHeapsterService, DefaultHeapsterPort) + isResource := len(tc.resourceName) > 0 + if isResource { + info, timestamp, err := metricsClient.GetResourceMetric(tc.resourceName, tc.namespace, tc.selector) + tc.verifyResults(t, info, timestamp, err) + } else { + info, timestamp, err := metricsClient.GetRawMetric(tc.metricName, tc.namespace, tc.selector) + tc.verifyResults(t, info, timestamp, err) + } +} + +func TestCPU(t *testing.T) { + tc := testCase{ + replicas: 3, + desiredResourceValues: PodResourceInfo{ + "test-pod-0": 5000, "test-pod-1": 5000, "test-pod-2": 5000, + }, + resourceName: v1.ResourceCPU, + targetTimestamp: 1, + reportedPodMetrics: [][]int64{{5000}, {5000}, {5000}}, + } + tc.runTest(t) +} + +func TestQPS(t *testing.T) { + tc := testCase{ + replicas: 3, + desiredMetricValues: PodMetricsInfo{ + "test-pod-0": 10, "test-pod-1": 20, "test-pod-2": 10, + }, + metricName: "qps", + targetTimestamp: 1, + reportedMetricsPoints: [][]metricPoint{{{10, 1}}, {{20, 1}}, {{10, 1}}}, + } + tc.runTest(t) +} + +func TestQpsSumEqualZero(t *testing.T) { + tc := testCase{ + replicas: 3, + desiredMetricValues: PodMetricsInfo{ + "test-pod-0": 0, "test-pod-1": 0, "test-pod-2": 0, + }, + metricName: "qps", + targetTimestamp: 0, + reportedMetricsPoints: [][]metricPoint{{{0, 0}}, {{0, 0}}, {{0, 0}}}, + } + tc.runTest(t) +} + +func TestCPUMoreMetrics(t *testing.T) { + tc := testCase{ + replicas: 5, + desiredResourceValues: PodResourceInfo{ + "test-pod-0": 5000, "test-pod-1": 5000, "test-pod-2": 5000, + "test-pod-3": 5000, "test-pod-4": 5000, + }, + resourceName: v1.ResourceCPU, + targetTimestamp: 10, + reportedPodMetrics: [][]int64{{1000, 2000, 2000}, {5000}, {1000, 1000, 1000, 2000}, {4000, 1000}, {5000}}, + } + tc.runTest(t) +} + +func TestCPUMissingMetrics(t *testing.T) { + tc := testCase{ + replicas: 3, + desiredResourceValues: PodResourceInfo{ + "test-pod-0": 4000, + }, + resourceName: v1.ResourceCPU, + reportedPodMetrics: [][]int64{{4000}}, + } + tc.runTest(t) +} + +func TestQpsMissingMetrics(t *testing.T) { + tc := testCase{ + replicas: 3, + desiredError: fmt.Errorf("requested metrics for 3 pods, got metrics for 1"), + metricName: "qps", + targetTimestamp: 1, + reportedMetricsPoints: [][]metricPoint{{{4000, 4}}}, + } + tc.runTest(t) +} + +func TestQpsSuperfluousMetrics(t *testing.T) { + tc := testCase{ + replicas: 3, + desiredError: fmt.Errorf("requested metrics for 3 pods, got metrics for 6"), + metricName: "qps", + reportedMetricsPoints: [][]metricPoint{{{1000, 1}}, {{2000, 4}}, {{2000, 1}}, {{4000, 5}}, {{2000, 1}}, {{4000, 4}}}, + } + tc.runTest(t) +} + +func TestCPUEmptyMetrics(t *testing.T) { + tc := testCase{ + replicas: 3, + resourceName: v1.ResourceCPU, + desiredError: fmt.Errorf("no metrics returned from heapster"), + reportedMetricsPoints: [][]metricPoint{}, + reportedPodMetrics: [][]int64{}, + } + tc.runTest(t) +} + +func TestQpsEmptyEntries(t *testing.T) { + tc := testCase{ + replicas: 3, + metricName: "qps", + desiredMetricValues: PodMetricsInfo{ + "test-pod-0": 4000, "test-pod-2": 2000, + }, + targetTimestamp: 4, + reportedMetricsPoints: [][]metricPoint{{{4000, 4}}, {}, {{2000, 4}}}, + } + tc.runTest(t) +} + +func TestCPUZeroReplicas(t *testing.T) { + tc := testCase{ + replicas: 0, + resourceName: v1.ResourceCPU, + desiredError: fmt.Errorf("no metrics returned from heapster"), + reportedPodMetrics: [][]int64{}, + } + tc.runTest(t) +} + +func TestCPUEmptyMetricsForOnePod(t *testing.T) { + tc := testCase{ + replicas: 3, + resourceName: v1.ResourceCPU, + desiredResourceValues: PodResourceInfo{ + "test-pod-0": 100, "test-pod-1": 700, + }, + reportedPodMetrics: [][]int64{{100}, {300, 400}, {}}, + } + tc.runTest(t) +} + +func testCollapseTimeSamples(t *testing.T) { + now := time.Now() + metrics := heapster.MetricResult{ + Metrics: []heapster.MetricPoint{ + {Timestamp: now, Value: 50, FloatValue: nil}, + {Timestamp: now.Add(-15 * time.Second), Value: 100, FloatValue: nil}, + {Timestamp: now.Add(-60 * time.Second), Value: 100000, FloatValue: nil}}, + LatestTimestamp: now, + } + + val, timestamp, hadMetrics := collapseTimeSamples(metrics, time.Minute) + assert.True(t, hadMetrics, "should report that it received a populated list of metrics") + assert.InEpsilon(t, float64(75), val, 0.1, "collapsed sample value should be as expected") + assert.True(t, timestamp.Equal(now), "timestamp should be the current time (the newest)") +} diff --git a/pkg/controller/podautoscaler/metrics/metrics_client_test.go.rej b/pkg/controller/podautoscaler/metrics/metrics_client_test.go.rej new file mode 100644 index 00000000000..f398fbcc3b7 --- /dev/null +++ b/pkg/controller/podautoscaler/metrics/metrics_client_test.go.rej @@ -0,0 +1,11 @@ +--- pkg/controller/podautoscaler/metrics/metrics_client_test.go ++++ pkg/controller/podautoscaler/metrics/metrics_client_test.go +@@ -110,7 +110,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { + Name: fmt.Sprintf("%s-%d", podNamePrefix, i), + Namespace: namespace, + }, +- Timestamp: metav1.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, ++ Timestamp: unversioned.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, + Containers: []metrics_api.ContainerMetrics{}, + } + for j, cpu := range containers { diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index 03e193fdb37..394e2921aed 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -26,7 +26,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" @@ -138,7 +138,7 @@ func (tc *replicaCalcTestCase) prepareTestClient(t *testing.T) *fake.Clientset { Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: testNamespace, }, - Timestamp: unversioned.Time{Time: tc.timestamp}, + Timestamp: metav1.Time{Time: tc.timestamp}, Containers: []metricsapi.ContainerMetrics{ { Name: "container1", @@ -214,7 +214,7 @@ func (tc *replicaCalcTestCase) runTest(t *testing.T) { podsGetter: testClient.Core(), } - selector, err := unversioned.LabelSelectorAsSelector(&unversioned.LabelSelector{ + selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{ MatchLabels: map[string]string{"name": podNamePrefix}, }) if err != nil { diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go.orig b/pkg/controller/podautoscaler/replica_calculator_test.go.orig new file mode 100644 index 00000000000..394e2921aed --- /dev/null +++ b/pkg/controller/podautoscaler/replica_calculator_test.go.orig @@ -0,0 +1,654 @@ +/* +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 podautoscaler + +import ( + "encoding/json" + "fmt" + "math" + "strconv" + "strings" + "testing" + "time" + + "k8s.io/kubernetes/pkg/api/resource" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/v1" + _ "k8s.io/kubernetes/pkg/apimachinery/registered" + "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" + "k8s.io/kubernetes/pkg/client/restclient" + "k8s.io/kubernetes/pkg/client/testing/core" + "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" + "k8s.io/kubernetes/pkg/runtime" + + heapster "k8s.io/heapster/metrics/api/v1/types" + metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +type resourceInfo struct { + name v1.ResourceName + requests []resource.Quantity + levels []int64 + + targetUtilization int32 + expectedUtilization int32 +} + +type metricInfo struct { + name string + levels []float64 + + targetUtilization float64 + expectedUtilization float64 +} + +type replicaCalcTestCase struct { + currentReplicas int32 + expectedReplicas int32 + expectedError error + + timestamp time.Time + + resource *resourceInfo + metric *metricInfo + + podReadiness []v1.ConditionStatus +} + +const ( + testNamespace = "test-namespace" + podNamePrefix = "test-pod" +) + +func (tc *replicaCalcTestCase) prepareTestClient(t *testing.T) *fake.Clientset { + + fakeClient := &fake.Clientset{} + fakeClient.AddReactor("list", "pods", func(action core.Action) (handled bool, ret runtime.Object, err error) { + obj := &v1.PodList{} + for i := 0; i < int(tc.currentReplicas); i++ { + podReadiness := v1.ConditionTrue + if tc.podReadiness != nil { + podReadiness = tc.podReadiness[i] + } + podName := fmt.Sprintf("%s-%d", podNamePrefix, i) + pod := v1.Pod{ + Status: v1.PodStatus{ + Phase: v1.PodRunning, + Conditions: []v1.PodCondition{ + { + Type: v1.PodReady, + Status: podReadiness, + }, + }, + }, + ObjectMeta: v1.ObjectMeta{ + Name: podName, + Namespace: testNamespace, + Labels: map[string]string{ + "name": podNamePrefix, + }, + }, + Spec: v1.PodSpec{ + Containers: []v1.Container{{}, {}}, + }, + } + + if tc.resource != nil && i < len(tc.resource.requests) { + pod.Spec.Containers[0].Resources = v1.ResourceRequirements{ + Requests: v1.ResourceList{ + tc.resource.name: tc.resource.requests[i], + }, + } + pod.Spec.Containers[1].Resources = v1.ResourceRequirements{ + Requests: v1.ResourceList{ + tc.resource.name: tc.resource.requests[i], + }, + } + } + obj.Items = append(obj.Items, pod) + } + return true, obj, nil + }) + + fakeClient.AddProxyReactor("services", func(action core.Action) (handled bool, ret restclient.ResponseWrapper, err error) { + var heapsterRawMemResponse []byte + + if tc.resource != nil { + metrics := metricsapi.PodMetricsList{} + for i, resValue := range tc.resource.levels { + podMetric := metricsapi.PodMetrics{ + ObjectMeta: v1.ObjectMeta{ + Name: fmt.Sprintf("%s-%d", podNamePrefix, i), + Namespace: testNamespace, + }, + Timestamp: metav1.Time{Time: tc.timestamp}, + Containers: []metricsapi.ContainerMetrics{ + { + Name: "container1", + Usage: v1.ResourceList{ + v1.ResourceName(tc.resource.name): *resource.NewMilliQuantity( + int64(resValue), + resource.DecimalSI), + }, + }, + { + Name: "container2", + Usage: v1.ResourceList{ + v1.ResourceName(tc.resource.name): *resource.NewMilliQuantity( + int64(resValue), + resource.DecimalSI), + }, + }, + }, + } + metrics.Items = append(metrics.Items, podMetric) + } + heapsterRawMemResponse, _ = json.Marshal(&metrics) + } else { + // only return the pods that we actually asked for + proxyAction := action.(core.ProxyGetAction) + pathParts := strings.Split(proxyAction.GetPath(), "/") + // pathParts should look like [ api, v1, model, namespaces, $NS, pod-list, $PODS, metrics, $METRIC... ] + if len(pathParts) < 9 { + return true, nil, fmt.Errorf("invalid heapster path %q", proxyAction.GetPath()) + } + + podNames := strings.Split(pathParts[7], ",") + podPresent := make([]bool, len(tc.metric.levels)) + for _, name := range podNames { + if len(name) <= len(podNamePrefix)+1 { + return true, nil, fmt.Errorf("unknown pod %q", name) + } + num, err := strconv.Atoi(name[len(podNamePrefix)+1:]) + if err != nil { + return true, nil, fmt.Errorf("unknown pod %q", name) + } + podPresent[num] = true + } + + timestamp := tc.timestamp + metrics := heapster.MetricResultList{} + for i, level := range tc.metric.levels { + if !podPresent[i] { + continue + } + + metric := heapster.MetricResult{ + Metrics: []heapster.MetricPoint{{Timestamp: timestamp, Value: uint64(level), FloatValue: &tc.metric.levels[i]}}, + LatestTimestamp: timestamp, + } + metrics.Items = append(metrics.Items, metric) + } + heapsterRawMemResponse, _ = json.Marshal(&metrics) + } + + return true, newFakeResponseWrapper(heapsterRawMemResponse), nil + }) + + return fakeClient +} + +func (tc *replicaCalcTestCase) runTest(t *testing.T) { + testClient := tc.prepareTestClient(t) + metricsClient := metrics.NewHeapsterMetricsClient(testClient, metrics.DefaultHeapsterNamespace, metrics.DefaultHeapsterScheme, metrics.DefaultHeapsterService, metrics.DefaultHeapsterPort) + + replicaCalc := &ReplicaCalculator{ + metricsClient: metricsClient, + podsGetter: testClient.Core(), + } + + selector, err := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{ + MatchLabels: map[string]string{"name": podNamePrefix}, + }) + if err != nil { + require.Nil(t, err, "something went horribly wrong...") + } + + if tc.resource != nil { + outReplicas, outUtilization, outTimestamp, err := replicaCalc.GetResourceReplicas(tc.currentReplicas, tc.resource.targetUtilization, tc.resource.name, testNamespace, selector) + + if tc.expectedError != nil { + require.Error(t, err, "there should be an error calculating the replica count") + assert.Contains(t, err.Error(), tc.expectedError.Error(), "the error message should have contained the expected error message") + return + } + require.NoError(t, err, "there should not have been an error calculating the replica count") + assert.Equal(t, tc.expectedReplicas, outReplicas, "replicas should be as expected") + assert.Equal(t, tc.resource.expectedUtilization, outUtilization, "utilization should be as expected") + assert.True(t, tc.timestamp.Equal(outTimestamp), "timestamp should be as expected") + + } else { + outReplicas, outUtilization, outTimestamp, err := replicaCalc.GetMetricReplicas(tc.currentReplicas, tc.metric.targetUtilization, tc.metric.name, testNamespace, selector) + + if tc.expectedError != nil { + require.Error(t, err, "there should be an error calculating the replica count") + assert.Contains(t, err.Error(), tc.expectedError.Error(), "the error message should have contained the expected error message") + return + } + require.NoError(t, err, "there should not have been an error calculating the replica count") + assert.Equal(t, tc.expectedReplicas, outReplicas, "replicas should be as expected") + assert.InDelta(t, tc.metric.expectedUtilization, 0.1, outUtilization, "utilization should be as expected") + assert.True(t, tc.timestamp.Equal(outTimestamp), "timestamp should be as expected") + } +} + +func TestReplicaCalcScaleUp(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 5, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{300, 500, 700}, + + targetUtilization: 30, + expectedUtilization: 50, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcScaleUpUnreadyLessScale(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 4, + podReadiness: []v1.ConditionStatus{v1.ConditionFalse, v1.ConditionTrue, v1.ConditionTrue}, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{300, 500, 700}, + + targetUtilization: 30, + expectedUtilization: 60, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcScaleUpUnreadyNoScale(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 3, + podReadiness: []v1.ConditionStatus{v1.ConditionTrue, v1.ConditionFalse, v1.ConditionFalse}, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{400, 500, 700}, + + targetUtilization: 30, + expectedUtilization: 40, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcScaleUpCM(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 4, + metric: &metricInfo{ + name: "qps", + levels: []float64{20.0, 10.0, 30.0}, + targetUtilization: 15.0, + expectedUtilization: 20.0, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcScaleUpCMUnreadyLessScale(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 4, + podReadiness: []v1.ConditionStatus{v1.ConditionTrue, v1.ConditionTrue, v1.ConditionFalse}, + metric: &metricInfo{ + name: "qps", + levels: []float64{50.0, 10.0, 30.0}, + targetUtilization: 15.0, + expectedUtilization: 30.0, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcScaleUpCMUnreadyNoScaleWouldScaleDown(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 3, + podReadiness: []v1.ConditionStatus{v1.ConditionFalse, v1.ConditionTrue, v1.ConditionFalse}, + metric: &metricInfo{ + name: "qps", + levels: []float64{50.0, 15.0, 30.0}, + targetUtilization: 15.0, + expectedUtilization: 15.0, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcScaleDown(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 5, + expectedReplicas: 3, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{100, 300, 500, 250, 250}, + + targetUtilization: 50, + expectedUtilization: 28, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcScaleDownCM(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 5, + expectedReplicas: 3, + metric: &metricInfo{ + name: "qps", + levels: []float64{12.0, 12.0, 12.0, 12.0, 12.0}, + targetUtilization: 20.0, + expectedUtilization: 12.0, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcScaleDownIgnoresUnreadyPods(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 5, + expectedReplicas: 2, + podReadiness: []v1.ConditionStatus{v1.ConditionTrue, v1.ConditionTrue, v1.ConditionTrue, v1.ConditionFalse, v1.ConditionFalse}, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{100, 300, 500, 250, 250}, + + targetUtilization: 50, + expectedUtilization: 30, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcTolerance(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 3, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("0.9"), resource.MustParse("1.0"), resource.MustParse("1.1")}, + levels: []int64{1010, 1030, 1020}, + + targetUtilization: 100, + expectedUtilization: 102, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcToleranceCM(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 3, + metric: &metricInfo{ + name: "qps", + levels: []float64{20.0, 21.0, 21.0}, + targetUtilization: 20.0, + expectedUtilization: 20.66666, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcSuperfluousMetrics(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 4, + expectedReplicas: 24, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{4000, 9500, 3000, 7000, 3200, 2000}, + targetUtilization: 100, + expectedUtilization: 587, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcMissingMetrics(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 4, + expectedReplicas: 3, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{400, 95}, + + targetUtilization: 100, + expectedUtilization: 24, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcEmptyMetrics(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 4, + expectedError: fmt.Errorf("unable to get metrics for resource cpu: no metrics returned from heapster"), + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{}, + + targetUtilization: 100, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcEmptyCPURequest(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 1, + expectedError: fmt.Errorf("missing request for"), + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{}, + levels: []int64{200}, + + targetUtilization: 100, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcMissingMetricsNoChangeEq(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 2, + expectedReplicas: 2, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{1000}, + + targetUtilization: 100, + expectedUtilization: 100, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcMissingMetricsNoChangeGt(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 2, + expectedReplicas: 2, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{1900}, + + targetUtilization: 100, + expectedUtilization: 190, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcMissingMetricsNoChangeLt(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 2, + expectedReplicas: 2, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{600}, + + targetUtilization: 100, + expectedUtilization: 60, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcMissingMetricsUnreadyNoChange(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 3, + podReadiness: []v1.ConditionStatus{v1.ConditionFalse, v1.ConditionTrue, v1.ConditionTrue}, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{100, 450}, + + targetUtilization: 50, + expectedUtilization: 45, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcMissingMetricsUnreadyScaleUp(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 3, + expectedReplicas: 4, + podReadiness: []v1.ConditionStatus{v1.ConditionFalse, v1.ConditionTrue, v1.ConditionTrue}, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{100, 2000}, + + targetUtilization: 50, + expectedUtilization: 200, + }, + } + tc.runTest(t) +} + +func TestReplicaCalcMissingMetricsUnreadyScaleDown(t *testing.T) { + tc := replicaCalcTestCase{ + currentReplicas: 4, + expectedReplicas: 3, + podReadiness: []v1.ConditionStatus{v1.ConditionFalse, v1.ConditionTrue, v1.ConditionTrue, v1.ConditionTrue}, + resource: &resourceInfo{ + name: v1.ResourceCPU, + requests: []resource.Quantity{resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0"), resource.MustParse("1.0")}, + levels: []int64{100, 100, 100}, + + targetUtilization: 50, + expectedUtilization: 10, + }, + } + tc.runTest(t) +} + +// TestComputedToleranceAlgImplementation is a regression test which +// back-calculates a minimal percentage for downscaling based on a small percentage +// increase in pod utilization which is calibrated against the tolerance value. +func TestReplicaCalcComputedToleranceAlgImplementation(t *testing.T) { + + startPods := int32(10) + // 150 mCPU per pod. + totalUsedCPUOfAllPods := int64(startPods * 150) + // Each pod starts out asking for 2X what is really needed. + // This means we will have a 50% ratio of used/requested + totalRequestedCPUOfAllPods := int32(2 * totalUsedCPUOfAllPods) + requestedToUsed := float64(totalRequestedCPUOfAllPods / int32(totalUsedCPUOfAllPods)) + // Spread the amount we ask over 10 pods. We can add some jitter later in reportedLevels. + perPodRequested := totalRequestedCPUOfAllPods / startPods + + // Force a minimal scaling event by satisfying (tolerance < 1 - resourcesUsedRatio). + target := math.Abs(1/(requestedToUsed*(1-tolerance))) + .01 + finalCpuPercentTarget := int32(target * 100) + resourcesUsedRatio := float64(totalUsedCPUOfAllPods) / float64(float64(totalRequestedCPUOfAllPods)*target) + + // i.e. .60 * 20 -> scaled down expectation. + finalPods := int32(math.Ceil(resourcesUsedRatio * float64(startPods))) + + // To breach tolerance we will create a utilization ratio difference of tolerance to usageRatioToleranceValue) + tc := replicaCalcTestCase{ + currentReplicas: startPods, + expectedReplicas: finalPods, + resource: &resourceInfo{ + name: v1.ResourceCPU, + levels: []int64{ + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + totalUsedCPUOfAllPods / 10, + }, + requests: []resource.Quantity{ + resource.MustParse(fmt.Sprint(perPodRequested+100) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested-100) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested+10) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested-10) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested+2) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested-2) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested+1) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested-1) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested) + "m"), + resource.MustParse(fmt.Sprint(perPodRequested) + "m"), + }, + + targetUtilization: finalCpuPercentTarget, + expectedUtilization: int32(totalUsedCPUOfAllPods*100) / totalRequestedCPUOfAllPods, + }, + } + + tc.runTest(t) + + // Reuse the data structure above, now testing "unscaling". + // Now, we test that no scaling happens if we are in a very close margin to the tolerance + target = math.Abs(1/(requestedToUsed*(1-tolerance))) + .004 + finalCpuPercentTarget = int32(target * 100) + tc.resource.targetUtilization = finalCpuPercentTarget + tc.currentReplicas = startPods + tc.expectedReplicas = startPods + tc.runTest(t) +} + +// TODO: add more tests diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go.rej b/pkg/controller/podautoscaler/replica_calculator_test.go.rej new file mode 100644 index 00000000000..02190d3f7b1 --- /dev/null +++ b/pkg/controller/podautoscaler/replica_calculator_test.go.rej @@ -0,0 +1,11 @@ +--- pkg/controller/podautoscaler/replica_calculator_test.go ++++ pkg/controller/podautoscaler/replica_calculator_test.go +@@ -139,7 +140,7 @@ func (tc *replicaCalcTestCase) prepareTestClient(t *testing.T) *fake.Clientset { + Name: fmt.Sprintf("%s-%d", podNamePrefix, i), + Namespace: testNamespace, + }, +- Timestamp: metav1.Time{Time: tc.timestamp}, ++ Timestamp: unversioned.Time{Time: tc.timestamp}, + Containers: []metrics_api.ContainerMetrics{ + { + Name: "container1", diff --git a/pkg/controller/podgc/BUILD b/pkg/controller/podgc/BUILD index 2338a99d3ab..f7f74136200 100644 --- a/pkg/controller/podgc/BUILD +++ b/pkg/controller/podgc/BUILD @@ -39,8 +39,8 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/controller/podgc/gc_controller_test.go b/pkg/controller/podgc/gc_controller_test.go index 8a98d7f7b47..2194cf8d585 100644 --- a/pkg/controller/podgc/gc_controller_test.go +++ b/pkg/controller/podgc/gc_controller_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" @@ -109,7 +109,7 @@ func TestGCTerminated(t *testing.T) { for _, pod := range test.pods { creationTime = creationTime.Add(1 * time.Hour) gcc.podStore.Indexer.Add(&v1.Pod{ - ObjectMeta: v1.ObjectMeta{Name: pod.name, CreationTimestamp: unversioned.Time{Time: creationTime}}, + ObjectMeta: v1.ObjectMeta{Name: pod.name, CreationTimestamp: metav1.Time{Time: creationTime}}, Status: v1.PodStatus{Phase: pod.phase}, Spec: v1.PodSpec{NodeName: "node"}, }) @@ -184,7 +184,7 @@ func TestGCOrphaned(t *testing.T) { for _, pod := range test.pods { creationTime = creationTime.Add(1 * time.Hour) gcc.podStore.Indexer.Add(&v1.Pod{ - ObjectMeta: v1.ObjectMeta{Name: pod.name, CreationTimestamp: unversioned.Time{Time: creationTime}}, + ObjectMeta: v1.ObjectMeta{Name: pod.name, CreationTimestamp: metav1.Time{Time: creationTime}}, Status: v1.PodStatus{Phase: pod.phase}, Spec: v1.PodSpec{NodeName: "node"}, }) @@ -221,7 +221,7 @@ func TestGCUnscheduledTerminating(t *testing.T) { type nameToPhase struct { name string phase v1.PodPhase - deletionTimeStamp *unversioned.Time + deletionTimeStamp *metav1.Time nodeName string } @@ -233,9 +233,9 @@ func TestGCUnscheduledTerminating(t *testing.T) { { name: "Unscheduled pod in any phase must be deleted", pods: []nameToPhase{ - {name: "a", phase: v1.PodFailed, deletionTimeStamp: &unversioned.Time{}, nodeName: ""}, - {name: "b", phase: v1.PodSucceeded, deletionTimeStamp: &unversioned.Time{}, nodeName: ""}, - {name: "c", phase: v1.PodRunning, deletionTimeStamp: &unversioned.Time{}, nodeName: ""}, + {name: "a", phase: v1.PodFailed, deletionTimeStamp: &metav1.Time{}, nodeName: ""}, + {name: "b", phase: v1.PodSucceeded, deletionTimeStamp: &metav1.Time{}, nodeName: ""}, + {name: "c", phase: v1.PodRunning, deletionTimeStamp: &metav1.Time{}, nodeName: ""}, }, deletedPodNames: sets.NewString("a", "b", "c"), }, @@ -244,7 +244,7 @@ func TestGCUnscheduledTerminating(t *testing.T) { pods: []nameToPhase{ {name: "a", phase: v1.PodFailed, deletionTimeStamp: nil, nodeName: ""}, {name: "b", phase: v1.PodSucceeded, deletionTimeStamp: nil, nodeName: "node"}, - {name: "c", phase: v1.PodRunning, deletionTimeStamp: &unversioned.Time{}, nodeName: "node"}, + {name: "c", phase: v1.PodRunning, deletionTimeStamp: &metav1.Time{}, nodeName: "node"}, }, deletedPodNames: sets.NewString(), }, @@ -266,7 +266,7 @@ func TestGCUnscheduledTerminating(t *testing.T) { for _, pod := range test.pods { creationTime = creationTime.Add(1 * time.Hour) gcc.podStore.Indexer.Add(&v1.Pod{ - ObjectMeta: v1.ObjectMeta{Name: pod.name, CreationTimestamp: unversioned.Time{Time: creationTime}, + ObjectMeta: v1.ObjectMeta{Name: pod.name, CreationTimestamp: metav1.Time{Time: creationTime}, DeletionTimestamp: pod.deletionTimeStamp}, Status: v1.PodStatus{Phase: pod.phase}, Spec: v1.PodSpec{NodeName: pod.nodeName}, diff --git a/pkg/controller/replicaset/BUILD b/pkg/controller/replicaset/BUILD index 0bb6c25fd71..36479794b2f 100644 --- a/pkg/controller/replicaset/BUILD +++ b/pkg/controller/replicaset/BUILD @@ -21,9 +21,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", @@ -50,10 +50,10 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index 9a1d8f72f6a..50319dbae29 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -270,7 +270,7 @@ func isReplicaSetMatch(pod *v1.Pod, rs *extensions.ReplicaSet) bool { if rs.Namespace != pod.Namespace { return false } - selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector) if err != nil { err = fmt.Errorf("invalid selector: %v", err) return false @@ -559,7 +559,7 @@ func (rsc *ReplicaSetController) syncReplicaSet(key string) error { return nil } rsNeedsSync := rsc.expectations.SatisfiedExpectations(key) - selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector) if err != nil { utilruntime.HandleError(fmt.Errorf("Error converting pod selector to selector: %v", err)) return nil diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index 2b077f790e6..4c8bf54e4b4 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -99,7 +99,7 @@ func getKey(rs *extensions.ReplicaSet, t *testing.T) string { func newReplicaSet(replicas int, selectorMap map[string]string) *extensions.ReplicaSet { rs := &extensions.ReplicaSet{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -108,7 +108,7 @@ func newReplicaSet(replicas int, selectorMap map[string]string) *extensions.Repl }, Spec: extensions.ReplicaSetSpec{ Replicas: func() *int32 { i := int32(replicas); return &i }(), - Selector: &unversioned.LabelSelector{MatchLabels: selectorMap}, + Selector: &metav1.LabelSelector{MatchLabels: selectorMap}, Template: v1.PodTemplateSpec{ ObjectMeta: v1.ObjectMeta{ Labels: map[string]string{ @@ -138,7 +138,7 @@ func newReplicaSet(replicas int, selectorMap map[string]string) *extensions.Repl } // create a pod with the given phase for the given rs (same selectors and namespace) -func newPod(name string, rs *extensions.ReplicaSet, status v1.PodPhase, lastTransitionTime *unversioned.Time) *v1.Pod { +func newPod(name string, rs *extensions.ReplicaSet, status v1.PodPhase, lastTransitionTime *metav1.Time) *v1.Pod { var conditions []v1.PodCondition if status == v1.PodRunning { condition := v1.PodCondition{Type: v1.PodReady, Status: v1.ConditionTrue} @@ -474,7 +474,7 @@ func TestPodControllerLookup(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "foo"}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, }, @@ -489,7 +489,7 @@ func TestPodControllerLookup(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "bar", Namespace: "ns"}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, }, @@ -630,7 +630,7 @@ func TestUpdatePods(t *testing.T) { manager.rsLister.Indexer.Add(testRSSpec1) testRSSpec2 := *testRSSpec1 labelMap2 := map[string]string{"bar": "foo"} - testRSSpec2.Spec.Selector = &unversioned.LabelSelector{MatchLabels: labelMap2} + testRSSpec2.Spec.Selector = &metav1.LabelSelector{MatchLabels: labelMap2} testRSSpec2.Name = "barfoo" manager.rsLister.Indexer.Add(&testRSSpec2) @@ -1008,7 +1008,7 @@ func TestOverlappingRSs(t *testing.T) { var controllers []*extensions.ReplicaSet for j := 1; j < 10; j++ { rsSpec := newReplicaSet(1, labelMap) - rsSpec.CreationTimestamp = unversioned.Date(2014, time.December, j, 0, 0, 0, 0, time.Local) + rsSpec.CreationTimestamp = metav1.Date(2014, time.December, j, 0, 0, 0, 0, time.Local) rsSpec.Name = string(uuid.NewUUID()) controllers = append(controllers, rsSpec) } @@ -1044,7 +1044,7 @@ func TestDeletionTimestamp(t *testing.T) { t.Errorf("Couldn't get key for object %#v: %v", rs, err) } pod := newPodList(nil, 1, v1.PodPending, labelMap, rs, "pod").Items[0] - pod.DeletionTimestamp = &unversioned.Time{Time: time.Now()} + pod.DeletionTimestamp = &metav1.Time{Time: time.Now()} pod.ResourceVersion = "1" manager.expectations.ExpectDeletions(rsKey, []string{controller.PodKey(&pod)}) @@ -1090,7 +1090,7 @@ func TestDeletionTimestamp(t *testing.T) { }, } manager.expectations.ExpectDeletions(rsKey, []string{controller.PodKey(secondPod)}) - oldPod.DeletionTimestamp = &unversioned.Time{Time: time.Now()} + oldPod.DeletionTimestamp = &metav1.Time{Time: time.Now()} oldPod.ResourceVersion = "2" manager.updatePod(&oldPod, &pod) @@ -1326,7 +1326,7 @@ func TestDoNotAdoptOrCreateIfBeingDeleted(t *testing.T) { stopCh := make(chan struct{}) defer close(stopCh) manager, fakePodControl := setupManagerWithGCEnabled(stopCh, rs) - now := unversioned.Now() + now := metav1.Now() rs.DeletionTimestamp = &now manager.rsLister.Indexer.Add(rs) pod1 := newPod("pod1", rs, v1.PodRunning, nil) @@ -1409,12 +1409,12 @@ func TestAvailableReplicas(t *testing.T) { manager.rsLister.Indexer.Add(rs) // First pod becomes ready 20s ago - moment := unversioned.Time{Time: time.Now().Add(-2e10)} + moment := metav1.Time{Time: time.Now().Add(-2e10)} pod := newPod("pod", rs, v1.PodRunning, &moment) manager.podLister.Indexer.Add(pod) // Second pod becomes ready now - otherMoment := unversioned.Now() + otherMoment := metav1.Now() otherPod := newPod("otherPod", rs, v1.PodRunning, &otherMoment) manager.podLister.Indexer.Add(otherPod) diff --git a/pkg/controller/replicaset/replica_set_utils.go b/pkg/controller/replicaset/replica_set_utils.go index 5c2a899b038..6067deeb8c6 100644 --- a/pkg/controller/replicaset/replica_set_utils.go +++ b/pkg/controller/replicaset/replica_set_utils.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" @@ -113,7 +113,7 @@ func calculateStatus(rs extensions.ReplicaSet, filteredPods []*v1.Pod, manageRep } if v1.IsPodReady(pod) { readyReplicasCount++ - if v1.IsPodAvailable(pod, rs.Spec.MinReadySeconds, unversioned.Now()) { + if v1.IsPodAvailable(pod, rs.Spec.MinReadySeconds, metav1.Now()) { availableReplicasCount++ } } @@ -145,7 +145,7 @@ func NewReplicaSetCondition(condType extensions.ReplicaSetConditionType, status return extensions.ReplicaSetCondition{ Type: condType, Status: status, - LastTransitionTime: unversioned.Now(), + LastTransitionTime: metav1.Now(), Reason: reason, Message: msg, } diff --git a/pkg/controller/replication/BUILD b/pkg/controller/replication/BUILD index a1669d79bee..1bd18930a68 100644 --- a/pkg/controller/replication/BUILD +++ b/pkg/controller/replication/BUILD @@ -20,8 +20,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", @@ -50,9 +50,9 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index 91d87452817..9e8ed414adb 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/cache" @@ -61,7 +61,7 @@ func getKey(rc *v1.ReplicationController, t *testing.T) string { func newReplicationController(replicas int) *v1.ReplicationController { rc := &v1.ReplicationController{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, ObjectMeta: v1.ObjectMeta{ UID: uuid.NewUUID(), Name: "foobar", @@ -100,7 +100,7 @@ func newReplicationController(replicas int) *v1.ReplicationController { } // create a pod with the given phase for the given rc (same selectors and namespace). -func newPod(name string, rc *v1.ReplicationController, status v1.PodPhase, lastTransitionTime *unversioned.Time) *v1.Pod { +func newPod(name string, rc *v1.ReplicationController, status v1.PodPhase, lastTransitionTime *metav1.Time) *v1.Pod { var conditions []v1.PodCondition if status == v1.PodRunning { condition := v1.PodCondition{Type: v1.PodReady, Status: v1.ConditionTrue} @@ -947,7 +947,7 @@ func TestOverlappingRCs(t *testing.T) { var controllers []*v1.ReplicationController for j := 1; j < 10; j++ { controllerSpec := newReplicationController(1) - controllerSpec.CreationTimestamp = unversioned.Date(2014, time.December, j, 0, 0, 0, 0, time.Local) + controllerSpec.CreationTimestamp = metav1.Date(2014, time.December, j, 0, 0, 0, 0, time.Local) controllerSpec.Name = string(uuid.NewUUID()) controllers = append(controllers, controllerSpec) } @@ -979,7 +979,7 @@ func TestDeletionTimestamp(t *testing.T) { t.Errorf("Couldn't get key for object %#v: %v", controllerSpec, err) } pod := newPodList(nil, 1, v1.PodPending, controllerSpec, "pod").Items[0] - pod.DeletionTimestamp = &unversioned.Time{Time: time.Now()} + pod.DeletionTimestamp = &metav1.Time{Time: time.Now()} pod.ResourceVersion = "1" manager.expectations.ExpectDeletions(rcKey, []string{controller.PodKey(&pod)}) @@ -1025,7 +1025,7 @@ func TestDeletionTimestamp(t *testing.T) { }, } manager.expectations.ExpectDeletions(rcKey, []string{controller.PodKey(secondPod)}) - oldPod.DeletionTimestamp = &unversioned.Time{Time: time.Now()} + oldPod.DeletionTimestamp = &metav1.Time{Time: time.Now()} oldPod.ResourceVersion = "2" manager.updatePod(&oldPod, &pod) @@ -1321,7 +1321,7 @@ func TestUpdateSelectorControllerRef(t *testing.T) { func TestDoNotAdoptOrCreateIfBeingDeleted(t *testing.T) { manager, fakePodControl := setupManagerWithGCEnabled() rc := newReplicationController(2) - now := unversioned.Now() + now := metav1.Now() rc.DeletionTimestamp = &now manager.rcStore.Indexer.Add(rc) pod1 := newPod("pod1", rc, v1.PodRunning, nil) @@ -1396,12 +1396,12 @@ func TestAvailableReplicas(t *testing.T) { manager.rcStore.Indexer.Add(rc) // First pod becomes ready 20s ago - moment := unversioned.Time{Time: time.Now().Add(-2e10)} + moment := metav1.Time{Time: time.Now().Add(-2e10)} pod := newPod("pod", rc, v1.PodRunning, &moment) manager.podStore.Indexer.Add(pod) // Second pod becomes ready now - otherMoment := unversioned.Now() + otherMoment := metav1.Now() otherPod := newPod("otherPod", rc, v1.PodRunning, &otherMoment) manager.podStore.Indexer.Add(otherPod) diff --git a/pkg/controller/replication/replication_controller_utils.go b/pkg/controller/replication/replication_controller_utils.go index c7d0260ee36..2364199f8ee 100644 --- a/pkg/controller/replication/replication_controller_utils.go +++ b/pkg/controller/replication/replication_controller_utils.go @@ -23,7 +23,7 @@ import ( "reflect" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/labels" @@ -101,7 +101,7 @@ func calculateStatus(rc v1.ReplicationController, filteredPods []*v1.Pod, manage } if v1.IsPodReady(pod) { readyReplicasCount++ - if v1.IsPodAvailable(pod, rc.Spec.MinReadySeconds, unversioned.Now()) { + if v1.IsPodAvailable(pod, rc.Spec.MinReadySeconds, metav1.Now()) { availableReplicasCount++ } } @@ -133,7 +133,7 @@ func NewReplicationControllerCondition(condType v1.ReplicationControllerConditio return v1.ReplicationControllerCondition{ Type: condType, Status: status, - LastTransitionTime: unversioned.Now(), + LastTransitionTime: metav1.Now(), Reason: reason, Message: msg, } diff --git a/pkg/controller/route/BUILD b/pkg/controller/route/BUILD index 98e0e680bac..edd52c2ad85 100644 --- a/pkg/controller/route/BUILD +++ b/pkg/controller/route/BUILD @@ -19,8 +19,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/cloudprovider:go_default_library", diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index c17f41fd906..755b9953e2d 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -201,7 +201,7 @@ func (rc *RouteController) updateNetworkingCondition(nodeName types.NodeName, ro for i := 0; i < updateNodeStatusMaxRetries; i++ { // Patch could also fail, even though the chance is very slim. So we still do // patch in the retry loop. - currentTime := unversioned.Now() + currentTime := metav1.Now() if routeCreated { err = nodeutil.SetNodeCondition(rc.kubeClient, nodeName, v1.NodeCondition{ Type: v1.NodeNetworkUnavailable, diff --git a/pkg/controller/volume/persistentvolume/BUILD b/pkg/controller/volume/persistentvolume/BUILD index fe4d8b7064a..773293927f3 100644 --- a/pkg/controller/volume/persistentvolume/BUILD +++ b/pkg/controller/volume/persistentvolume/BUILD @@ -22,8 +22,8 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/apis/storage/v1beta1/util:go_default_library", "//pkg/client/cache:go_default_library", @@ -60,8 +60,8 @@ go_test( deps = [ "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/apis/storage/v1beta1/util:go_default_library", "//pkg/client/cache:go_default_library", diff --git a/pkg/controller/volume/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go index 86bd1219474..17d8d9d47e2 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" @@ -674,7 +674,7 @@ func withLabels(labels map[string]string, volumes []*v1.PersistentVolume) []*v1. // to be MatchLabels of the given label set and returns the array. Meant // to be used to compose claims specified inline in a test. func withLabelSelector(labels map[string]string, claims []*v1.PersistentVolumeClaim) []*v1.PersistentVolumeClaim { - claims[0].Spec.Selector = &unversioned.LabelSelector{ + claims[0].Spec.Selector = &metav1.LabelSelector{ MatchLabels: labels, } diff --git a/pkg/controller/volume/persistentvolume/index.go b/pkg/controller/volume/persistentvolume/index.go index 90705c8138b..219e36ebe3a 100644 --- a/pkg/controller/volume/persistentvolume/index.go +++ b/pkg/controller/volume/persistentvolume/index.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" "k8s.io/kubernetes/pkg/client/cache" @@ -97,7 +97,7 @@ func (pvIndex *persistentVolumeOrderedIndex) findByClaim(claim *v1.PersistentVol var selector labels.Selector if claim.Spec.Selector != nil { - internalSelector, err := unversioned.LabelSelectorAsSelector(claim.Spec.Selector) + internalSelector, err := metav1.LabelSelectorAsSelector(claim.Spec.Selector) if err != nil { // should be unreachable code due to validation return nil, fmt.Errorf("error creating internal label selector for claim: %v: %v", claimToClaimKey(claim), err) diff --git a/pkg/controller/volume/persistentvolume/index_test.go b/pkg/controller/volume/persistentvolume/index_test.go index 45d9d641301..3f72901048e 100644 --- a/pkg/controller/volume/persistentvolume/index_test.go +++ b/pkg/controller/volume/persistentvolume/index_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" ) @@ -113,7 +113,7 @@ func TestMatchVolume(t *testing.T) { Namespace: "myns", }, Spec: v1.PersistentVolumeClaimSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "should-not-exist": "true", }, @@ -135,7 +135,7 @@ func TestMatchVolume(t *testing.T) { Namespace: "myns", }, Spec: v1.PersistentVolumeClaimSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "should-exist": "true", }, @@ -157,7 +157,7 @@ func TestMatchVolume(t *testing.T) { Namespace: "myns", }, Spec: v1.PersistentVolumeClaimSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "should-exist": "true", }, @@ -183,7 +183,7 @@ func TestMatchVolume(t *testing.T) { }, Spec: v1.PersistentVolumeClaimSpec{ AccessModes: []v1.PersistentVolumeAccessMode{v1.ReadWriteOnce}, - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "should-exist": "true", }, diff --git a/pkg/controller/volume/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go index 88250ffdc7a..b59da31bb2e 100644 --- a/pkg/controller/volume/persistentvolume/provision_test.go +++ b/pkg/controller/volume/persistentvolume/provision_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" @@ -34,7 +34,7 @@ var class2Parameters = map[string]string{ } var storageClasses = []*storage.StorageClass{ { - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, @@ -46,7 +46,7 @@ var storageClasses = []*storage.StorageClass{ Parameters: class1Parameters, }, { - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: v1.ObjectMeta{ @@ -56,7 +56,7 @@ var storageClasses = []*storage.StorageClass{ Parameters: class2Parameters, }, { - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: v1.ObjectMeta{ @@ -66,7 +66,7 @@ var storageClasses = []*storage.StorageClass{ Parameters: class1Parameters, }, { - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: v1.ObjectMeta{ diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go index dbf0b674aeb..8ff07d43062 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" @@ -1476,7 +1476,7 @@ func (ctrl *PersistentVolumeController) findAlphaProvisionablePlugin() (vol.Prov // Return a dummy StorageClass instance with no parameters storageClass := &storage.StorageClass{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: v1.ObjectMeta{ diff --git a/pkg/conversion/queryparams/BUILD b/pkg/conversion/queryparams/BUILD index 5de18ce0e82..68a886a305a 100644 --- a/pkg/conversion/queryparams/BUILD +++ b/pkg/conversion/queryparams/BUILD @@ -24,7 +24,7 @@ go_test( srcs = ["convert_test.go"], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion/queryparams:go_default_library", "//pkg/runtime/schema:go_default_library", ], diff --git a/pkg/conversion/queryparams/convert_test.go b/pkg/conversion/queryparams/convert_test.go index 2c048019700..fc2b6506031 100644 --- a/pkg/conversion/queryparams/convert_test.go +++ b/pkg/conversion/queryparams/convert_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion/queryparams" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -70,8 +70,8 @@ type childStructs struct { Follow bool `json:"follow,omitempty"` Previous bool `json:"previous,omitempty"` SinceSeconds *int64 `json:"sinceSeconds,omitempty"` - SinceTime *unversioned.Time `json:"sinceTime,omitempty"` - EmptyTime *unversioned.Time `json:"emptyTime"` + SinceTime *metav1.Time `json:"sinceTime,omitempty"` + EmptyTime *metav1.Time `json:"emptyTime"` } func (obj *childStructs) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind } @@ -98,7 +98,7 @@ func validateResult(t *testing.T, input interface{}, actual, expected url.Values func TestConvert(t *testing.T) { sinceSeconds := int64(123) - sinceTime := unversioned.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC) + sinceTime := metav1.Date(2000, 1, 1, 12, 34, 56, 0, time.UTC) tests := []struct { input interface{} diff --git a/pkg/dns/BUILD b/pkg/dns/BUILD index 7134f0b4bd4..5da7e4f5a4c 100644 --- a/pkg/dns/BUILD +++ b/pkg/dns/BUILD @@ -18,9 +18,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/endpoints:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/dns/config:go_default_library", @@ -43,9 +43,9 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/endpoints:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/dns/config:go_default_library", diff --git a/pkg/dns/config/BUILD b/pkg/dns/config/BUILD index f3a4bedbb7b..b6c2df3afa0 100644 --- a/pkg/dns/config/BUILD +++ b/pkg/dns/config/BUILD @@ -20,8 +20,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/dns/federation:go_default_library", diff --git a/pkg/dns/config/config.go b/pkg/dns/config/config.go index 075fdbb9b1b..ccea793e850 100644 --- a/pkg/dns/config/config.go +++ b/pkg/dns/config/config.go @@ -17,7 +17,7 @@ limitations under the License. package config import ( - types "k8s.io/kubernetes/pkg/api/unversioned" + types "k8s.io/kubernetes/pkg/apis/meta/v1" fed "k8s.io/kubernetes/pkg/dns/federation" ) diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go index c44ddfc4856..4add22f5227 100644 --- a/pkg/dns/dns.go +++ b/pkg/dns/dns.go @@ -27,7 +27,7 @@ import ( etcd "github.com/coreos/etcd/client" "github.com/miekg/dns" skymsg "github.com/skynetservices/skydns/msg" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/endpoints" kcache "k8s.io/kubernetes/pkg/client/cache" @@ -861,8 +861,8 @@ func (kd *KubeDNS) getClusterZoneAndRegion() (string, string, error) { // Select a node (arbitrarily the first node) that has // `LabelZoneFailureDomain` and `LabelZoneRegion` set. for _, nodeItem := range nodeList.Items { - _, zfound := nodeItem.Labels[unversioned.LabelZoneFailureDomain] - _, rfound := nodeItem.Labels[unversioned.LabelZoneRegion] + _, zfound := nodeItem.Labels[metav1.LabelZoneFailureDomain] + _, rfound := nodeItem.Labels[metav1.LabelZoneRegion] if !zfound || !rfound { continue } @@ -880,11 +880,11 @@ func (kd *KubeDNS) getClusterZoneAndRegion() (string, string, error) { return "", "", fmt.Errorf("Could not find any nodes") } - zone, ok := node.Labels[unversioned.LabelZoneFailureDomain] + zone, ok := node.Labels[metav1.LabelZoneFailureDomain] if !ok || zone == "" { return "", "", fmt.Errorf("unknown cluster zone") } - region, ok := node.Labels[unversioned.LabelZoneRegion] + region, ok := node.Labels[metav1.LabelZoneRegion] if !ok || region == "" { return "", "", fmt.Errorf("unknown cluster region") } diff --git a/pkg/dns/dns_test.go b/pkg/dns/dns_test.go index 3fb6fb2e254..0ce3ff61dbd 100644 --- a/pkg/dns/dns_test.go +++ b/pkg/dns/dns_test.go @@ -32,7 +32,7 @@ import ( skyserver "github.com/skynetservices/skydns/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" endpointsapi "k8s.io/kubernetes/pkg/api/v1/endpoints" "k8s.io/kubernetes/pkg/client/cache" @@ -606,8 +606,8 @@ func newNodes() *v1.NodeList { // Note: The zone name here is an arbitrary string and doesn't exactly follow the // format used by the cloud providers to name their zones. But that shouldn't matter // for these tests here. - unversioned.LabelZoneFailureDomain: "testcontinent-testreg-testzone", - unversioned.LabelZoneRegion: "testcontinent-testreg", + metav1.LabelZoneFailureDomain: "testcontinent-testreg-testzone", + metav1.LabelZoneRegion: "testcontinent-testreg", }, }, }, diff --git a/pkg/generated/openapi/BUILD b/pkg/generated/openapi/BUILD index 3dcdab14b99..1a0c17e52d1 100644 --- a/pkg/generated/openapi/BUILD +++ b/pkg/generated/openapi/BUILD @@ -19,7 +19,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/genericapiserver/openapi/common:go_default_library", "//pkg/util/intstr:go_default_library", "//vendor:github.com/go-openapi/spec", diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index e84ccadcb93..660fa057e6e 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -23,7 +23,7 @@ package openapi import ( spec "github.com/go-openapi/spec" resource "k8s.io/kubernetes/pkg/api/resource" - unversioned "k8s.io/kubernetes/pkg/api/unversioned" + v1 "k8s.io/kubernetes/pkg/apis/meta/v1" common "k8s.io/kubernetes/pkg/genericapiserver/openapi/common" intstr "k8s.io/kubernetes/pkg/util/intstr" ) @@ -64,7 +64,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -84,7 +84,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "apps.StatefulSet", "unversioned.ListMeta"}, + "apps.StatefulSet", "v1.ListMeta"}, }, "apps.StatefulSetSpec": { Schema: spec.Schema{ @@ -101,7 +101,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that should match the replica count. If empty, defaulted to labels on the pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "template": { @@ -135,7 +135,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.PersistentVolumeClaim", "api.PodTemplateSpec", "unversioned.LabelSelector"}, + "api.PersistentVolumeClaim", "api.PodTemplateSpec", "v1.LabelSelector"}, }, "apps.StatefulSetStatus": { Schema: spec.Schema{ @@ -169,7 +169,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ObjectMeta": { @@ -195,7 +195,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.ObjectMeta", "authentication.TokenReviewSpec", "authentication.TokenReviewStatus", "unversioned.TypeMeta"}, + "api.ObjectMeta", "authentication.TokenReviewSpec", "authentication.TokenReviewStatus", "v1.TypeMeta"}, }, "authentication.TokenReviewSpec": { Schema: spec.Schema{ @@ -314,7 +314,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ObjectMeta": { @@ -339,7 +339,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.ObjectMeta", "authorization.SubjectAccessReviewSpec", "authorization.SubjectAccessReviewStatus", "unversioned.TypeMeta"}, + "api.ObjectMeta", "authorization.SubjectAccessReviewSpec", "authorization.SubjectAccessReviewStatus", "v1.TypeMeta"}, }, "authorization.NonResourceAttributes": { Schema: spec.Schema{ @@ -433,7 +433,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ObjectMeta": { @@ -458,7 +458,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.ObjectMeta", "authorization.SelfSubjectAccessReviewSpec", "authorization.SubjectAccessReviewStatus", "unversioned.TypeMeta"}, + "api.ObjectMeta", "authorization.SelfSubjectAccessReviewSpec", "authorization.SubjectAccessReviewStatus", "v1.TypeMeta"}, }, "authorization.SelfSubjectAccessReviewSpec": { Schema: spec.Schema{ @@ -491,7 +491,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ObjectMeta": { @@ -516,7 +516,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.ObjectMeta", "authorization.SubjectAccessReviewSpec", "authorization.SubjectAccessReviewStatus", "unversioned.TypeMeta"}, + "api.ObjectMeta", "authorization.SubjectAccessReviewSpec", "authorization.SubjectAccessReviewStatus", "v1.TypeMeta"}, }, "authorization.SubjectAccessReviewSpec": { Schema: spec.Schema{ @@ -683,7 +683,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -704,7 +704,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "autoscaling.HorizontalPodAutoscaler", "unversioned.ListMeta"}, + "autoscaling.HorizontalPodAutoscaler", "v1.ListMeta"}, }, "autoscaling.HorizontalPodAutoscalerSpec": { Schema: spec.Schema{ @@ -760,7 +760,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastScaleTime": { SchemaProps: spec.SchemaProps{ Description: "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "currentReplicas": { @@ -789,7 +789,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "autoscaling.Scale": { Schema: spec.Schema{ @@ -899,7 +899,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -920,7 +920,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "batch.CronJob", "unversioned.ListMeta"}, + "batch.CronJob", "v1.ListMeta"}, }, "batch.CronJobSpec": { Schema: spec.Schema{ @@ -989,14 +989,14 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastScheduleTime": { SchemaProps: spec.SchemaProps{ Description: "LastScheduleTime keeps information of when was the last time the job was successfully scheduled.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, }, }, }, Dependencies: []string{ - "api.ObjectReference", "unversioned.Time"}, + "api.ObjectReference", "v1.Time"}, }, "batch.Job": { Schema: spec.Schema{ @@ -1049,13 +1049,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastProbeTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition was checked.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition transit from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -1077,7 +1077,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "batch.JobList": { Schema: spec.Schema{ @@ -1087,7 +1087,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -1108,7 +1108,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "batch.Job", "unversioned.ListMeta"}, + "batch.Job", "v1.ListMeta"}, }, "batch.JobSpec": { Schema: spec.Schema{ @@ -1139,7 +1139,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "manualSelector": { @@ -1160,7 +1160,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.PodTemplateSpec", "unversioned.LabelSelector"}, + "api.PodTemplateSpec", "v1.LabelSelector"}, }, "batch.JobStatus": { Schema: spec.Schema{ @@ -1183,13 +1183,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "startTime": { SchemaProps: spec.SchemaProps{ Description: "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "completionTime": { SchemaProps: spec.SchemaProps{ Description: "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "active": { @@ -1217,7 +1217,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "batch.JobCondition", "unversioned.Time"}, + "batch.JobCondition", "v1.Time"}, }, "batch.JobTemplate": { Schema: spec.Schema{ @@ -1321,7 +1321,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastUpdateTime": { SchemaProps: spec.SchemaProps{ Description: "timestamp for the last update to this condition", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, }, @@ -1329,7 +1329,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "certificates.CertificateSigningRequestList": { Schema: spec.Schema{ @@ -1337,7 +1337,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -1356,7 +1356,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "certificates.CertificateSigningRequest", "unversioned.ListMeta"}, + "certificates.CertificateSigningRequest", "v1.ListMeta"}, }, "certificates.CertificateSigningRequestSpec": { Schema: spec.Schema{ @@ -1454,7 +1454,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "port": { @@ -1586,43 +1586,43 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "serviceSyncPeriod": { SchemaProps: spec.SchemaProps{ Description: "serviceSyncPeriod is the period for syncing services with their external load balancers.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "nodeSyncPeriod": { SchemaProps: spec.SchemaProps{ Description: "nodeSyncPeriod is the period for syncing nodes from cloudprovider. Longer periods will result in fewer calls to cloud provider, but may delay addition of new nodes to cluster.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "routeReconciliationPeriod": { SchemaProps: spec.SchemaProps{ Description: "routeReconciliationPeriod is the period for reconciling routes created for Nodes by cloud provider..", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "resourceQuotaSyncPeriod": { SchemaProps: spec.SchemaProps{ Description: "resourceQuotaSyncPeriod is the period for syncing quota usage status in the system.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "namespaceSyncPeriod": { SchemaProps: spec.SchemaProps{ Description: "namespaceSyncPeriod is the period for syncing namespace life-cycle updates.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "pvClaimBinderSyncPeriod": { SchemaProps: spec.SchemaProps{ Description: "pvClaimBinderSyncPeriod is the period for syncing persistent volumes and persistent volume claims.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "minResyncPeriod": { SchemaProps: spec.SchemaProps{ Description: "minResyncPeriod is the resync period in reflectors; will be random between minResyncPeriod and 2*minResyncPeriod.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "terminatedPodGCThreshold": { @@ -1635,19 +1635,19 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "horizontalPodAutoscalerSyncPeriod": { SchemaProps: spec.SchemaProps{ Description: "horizontalPodAutoscalerSyncPeriod is the period for syncing the number of pods in horizontal pod autoscaler.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "deploymentControllerSyncPeriod": { SchemaProps: spec.SchemaProps{ Description: "deploymentControllerSyncPeriod is the period for syncing the deployments.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "podEvictionTimeout": { SchemaProps: spec.SchemaProps{ Description: "podEvictionTimeout is the grace period for deleting pods on failed nodes.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "deletingPodsQps": { @@ -1667,7 +1667,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "nodeMonitorGracePeriod": { SchemaProps: spec.SchemaProps{ Description: "nodeMontiorGracePeriod is the amount of time which we allow a running node to be unresponsive before marking it unhealthy. Must be N times more than kubelet's nodeStatusUpdateFrequency, where N means number of retries allowed for kubelet to post node status.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "registerRetryCount": { @@ -1680,13 +1680,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "nodeStartupGracePeriod": { SchemaProps: spec.SchemaProps{ Description: "nodeStartupGracePeriod is the amount of time which we allow starting a node to be unresponsive before marking it unhealthy.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "nodeMonitorPeriod": { SchemaProps: spec.SchemaProps{ Description: "nodeMonitorPeriod is the period for syncing NodeStatus in NodeController.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "serviceAccountKeyFile": { @@ -1809,7 +1809,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "controllerStartInterval": { SchemaProps: spec.SchemaProps{ Description: "How long to wait between starting controller managers", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "enableGarbageCollector": { @@ -1859,7 +1859,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "componentconfig.LeaderElectionConfiguration", "componentconfig.VolumeConfiguration", "unversioned.Duration", "unversioned.TypeMeta"}, + "componentconfig.LeaderElectionConfiguration", "componentconfig.VolumeConfiguration", "v1.Duration", "v1.TypeMeta"}, }, "componentconfig.KubeProxyConfiguration": { Schema: spec.Schema{ @@ -1867,7 +1867,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "bindAddress": { @@ -1915,13 +1915,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "iptablesSyncPeriodSeconds": { SchemaProps: spec.SchemaProps{ Description: "iptablesSyncPeriod is the period that iptables rules are refreshed (e.g. '5s', '1m', '2h22m'). Must be greater than 0.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "iptablesMinSyncPeriodSeconds": { SchemaProps: spec.SchemaProps{ Description: "iptablesMinSyncPeriod is the minimum period that iptables rules are refreshed (e.g. '5s', '1m', '2h22m').", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "kubeconfigPath": { @@ -1976,7 +1976,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "udpTimeoutMilliseconds": { SchemaProps: spec.SchemaProps{ Description: "udpIdleTimeout is how long an idle UDP connection will be kept open (e.g. '250ms', '2s'). Must be greater than 0. Only applicable for proxyMode=userspace.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "conntrackMax": { @@ -2003,13 +2003,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "conntrackTCPEstablishedTimeout": { SchemaProps: spec.SchemaProps{ Description: "conntrackTCPEstablishedTimeout is how long an idle TCP connection will be kept open (e.g. '2s'). Must be greater than 0.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "conntrackTCPCloseWaitTimeout": { SchemaProps: spec.SchemaProps{ Description: "conntrackTCPCloseWaitTimeout is how long an idle conntrack entry in CLOSE_WAIT state will remain in the conntrack table. (e.g. '60s'). Must be greater than 0 to set.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, }, @@ -2017,7 +2017,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Duration", "unversioned.TypeMeta"}, + "v1.Duration", "v1.TypeMeta"}, }, "componentconfig.KubeSchedulerConfiguration": { Schema: spec.Schema{ @@ -2025,7 +2025,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "port": { @@ -2123,7 +2123,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "componentconfig.LeaderElectionConfiguration", "unversioned.TypeMeta"}, + "componentconfig.LeaderElectionConfiguration", "v1.TypeMeta"}, }, "componentconfig.KubeletAnonymousAuthentication": { Schema: spec.Schema{ @@ -2201,7 +2201,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "podManifestPath": { @@ -2214,19 +2214,19 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "syncFrequency": { SchemaProps: spec.SchemaProps{ Description: "syncFrequency is the max period between synchronizing running containers and config", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "fileCheckFrequency": { SchemaProps: spec.SchemaProps{ Description: "fileCheckFrequency is the duration between checking config files for new data", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "httpCheckFrequency": { SchemaProps: spec.SchemaProps{ Description: "httpCheckFrequency is the duration between checking http for new data", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "manifestURL": { @@ -2426,7 +2426,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "minimumGCAge": { SchemaProps: spec.SchemaProps{ Description: "minimumGCAge is the minimum age for a finished container before it is garbage collected.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "maxPerPodContainerCount": { @@ -2502,19 +2502,19 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "streamingConnectionIdleTimeout": { SchemaProps: spec.SchemaProps{ Description: "streamingConnectionIdleTimeout is the maximum time a streaming connection can be idle before the connection is automatically closed.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "nodeStatusUpdateFrequency": { SchemaProps: spec.SchemaProps{ Description: "nodeStatusUpdateFrequency is the frequency that kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "imageMinimumGCAge": { SchemaProps: spec.SchemaProps{ Description: "imageMinimumGCAge is the minimum age for an unused image before it is garbage collected.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "imageGCHighThresholdPercent": { @@ -2541,7 +2541,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "volumeStatsAggPeriod": { SchemaProps: spec.SchemaProps{ Description: "How frequently to calculate and cache volume disk usage for all pods", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "networkPluginName": { @@ -2666,7 +2666,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "runtimeRequestTimeout": { SchemaProps: spec.SchemaProps{ Description: "runtimeRequestTimeout is the timeout for all runtime requests except long running requests - pull, logs, exec and attach.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "rktPath": { @@ -2826,7 +2826,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "outOfDiskTransitionFrequency": { SchemaProps: spec.SchemaProps{ Description: "outOfDiskTransitionFrequency is duration for which the kubelet has to wait before transitioning out of out-of-disk node condition status.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "nodeIP": { @@ -2888,7 +2888,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "evictionPressureTransitionPeriod": { SchemaProps: spec.SchemaProps{ Description: "Duration for which the kubelet has to wait before transitioning out of an eviction pressure condition.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "evictionMaxPodGracePeriod": { @@ -3022,7 +3022,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "componentconfig.KubeletAuthentication", "componentconfig.KubeletAuthorization", "unversioned.Duration", "unversioned.TypeMeta"}, + "componentconfig.KubeletAuthentication", "componentconfig.KubeletAuthorization", "v1.Duration", "v1.TypeMeta"}, }, "componentconfig.KubeletWebhookAuthentication": { Schema: spec.Schema{ @@ -3038,7 +3038,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "cacheTTL": { SchemaProps: spec.SchemaProps{ Description: "cacheTTL enables caching of authentication results", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, }, @@ -3046,7 +3046,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Duration"}, + "v1.Duration"}, }, "componentconfig.KubeletWebhookAuthorization": { Schema: spec.Schema{ @@ -3055,13 +3055,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "cacheAuthorizedTTL": { SchemaProps: spec.SchemaProps{ Description: "cacheAuthorizedTTL is the duration to cache 'authorized' responses from the webhook authorizer.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "cacheUnauthorizedTTL": { SchemaProps: spec.SchemaProps{ Description: "cacheUnauthorizedTTL is the duration to cache 'unauthorized' responses from the webhook authorizer.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, }, @@ -3069,7 +3069,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Duration"}, + "v1.Duration"}, }, "componentconfig.KubeletX509Authentication": { Schema: spec.Schema{ @@ -3103,19 +3103,19 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "leaseDuration": { SchemaProps: spec.SchemaProps{ Description: "leaseDuration is the duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate. This is only applicable if leader election is enabled.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "renewDeadline": { SchemaProps: spec.SchemaProps{ Description: "renewDeadline is the interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than or equal to the lease duration. This is only applicable if leader election is enabled.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "retryPeriod": { SchemaProps: spec.SchemaProps{ Description: "retryPeriod is the duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, }, @@ -3123,7 +3123,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Duration"}, + "v1.Duration"}, }, "componentconfig.PersistentVolumeRecyclerConfiguration": { Schema: spec.Schema{ @@ -3388,7 +3388,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -3409,7 +3409,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "extensions.DaemonSet", "unversioned.ListMeta"}, + "extensions.DaemonSet", "v1.ListMeta"}, }, "extensions.DaemonSetSpec": { Schema: spec.Schema{ @@ -3419,7 +3419,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "template": { @@ -3433,7 +3433,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.PodTemplateSpec", "unversioned.LabelSelector"}, + "api.PodTemplateSpec", "v1.LabelSelector"}, }, "extensions.DaemonSetStatus": { Schema: spec.Schema{ @@ -3523,13 +3523,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastUpdateTime": { SchemaProps: spec.SchemaProps{ Description: "The last time this condition was updated.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition transitioned from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -3551,7 +3551,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "extensions.DeploymentList": { Schema: spec.Schema{ @@ -3559,7 +3559,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -3580,7 +3580,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "extensions.Deployment", "unversioned.ListMeta"}, + "extensions.Deployment", "v1.ListMeta"}, }, "extensions.DeploymentRollback": { Schema: spec.Schema{ @@ -3635,7 +3635,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "template": { @@ -3689,7 +3689,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.PodTemplateSpec", "extensions.DeploymentStrategy", "extensions.RollbackConfig", "unversioned.LabelSelector"}, + "api.PodTemplateSpec", "extensions.DeploymentStrategy", "extensions.RollbackConfig", "v1.LabelSelector"}, }, "extensions.DeploymentStatus": { Schema: spec.Schema{ @@ -3965,7 +3965,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -3986,7 +3986,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "extensions.Ingress", "unversioned.ListMeta"}, + "extensions.Ingress", "v1.ListMeta"}, }, "extensions.IngressRule": { Schema: spec.Schema{ @@ -4177,7 +4177,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -4197,7 +4197,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "extensions.NetworkPolicy", "unversioned.ListMeta"}, + "extensions.NetworkPolicy", "v1.ListMeta"}, }, "extensions.NetworkPolicyPeer": { Schema: spec.Schema{ @@ -4206,20 +4206,20 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "podSelector": { SchemaProps: spec.SchemaProps{ Description: "This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "namespaceSelector": { SchemaProps: spec.SchemaProps{ Description: "Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, }, }, }, Dependencies: []string{ - "unversioned.LabelSelector"}, + "v1.LabelSelector"}, }, "extensions.NetworkPolicyPort": { Schema: spec.Schema{ @@ -4251,7 +4251,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "podSelector": { SchemaProps: spec.SchemaProps{ Description: "Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "ingress": { @@ -4272,7 +4272,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "extensions.NetworkPolicyIngressRule", "unversioned.LabelSelector"}, + "extensions.NetworkPolicyIngressRule", "v1.LabelSelector"}, }, "extensions.PodSecurityPolicy": { Schema: spec.Schema{ @@ -4303,7 +4303,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -4323,7 +4323,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "extensions.PodSecurityPolicy", "unversioned.ListMeta"}, + "extensions.PodSecurityPolicy", "v1.ListMeta"}, }, "extensions.PodSecurityPolicySpec": { Schema: spec.Schema{ @@ -4515,7 +4515,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "The last time the condition transitioned from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -4537,7 +4537,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "extensions.ReplicaSetList": { Schema: spec.Schema{ @@ -4546,7 +4546,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -4566,7 +4566,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "extensions.ReplicaSet", "unversioned.ListMeta"}, + "extensions.ReplicaSet", "v1.ListMeta"}, }, "extensions.ReplicaSetSpec": { Schema: spec.Schema{ @@ -4590,7 +4590,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that should match the replica count. Must match in order to be controlled. If empty, defaulted to labels on pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "template": { @@ -4604,7 +4604,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.PodTemplateSpec", "unversioned.LabelSelector"}, + "api.PodTemplateSpec", "v1.LabelSelector"}, }, "extensions.ReplicaSetStatus": { Schema: spec.Schema{ @@ -4832,7 +4832,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "label query over pods that should match the replicas count. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, }, @@ -4840,7 +4840,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector"}, + "v1.LabelSelector"}, }, "extensions.SupplementalGroupsStrategyOptions": { Schema: spec.Schema{ @@ -4941,7 +4941,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -4962,7 +4962,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "extensions.ThirdPartyResourceData", "unversioned.ListMeta"}, + "extensions.ThirdPartyResourceData", "v1.ListMeta"}, }, "extensions.ThirdPartyResourceList": { Schema: spec.Schema{ @@ -4971,7 +4971,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -4992,7 +4992,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "extensions.ThirdPartyResource", "unversioned.ListMeta"}, + "extensions.ThirdPartyResource", "v1.ListMeta"}, }, "imagepolicy.ImageReview": { Schema: spec.Schema{ @@ -5001,7 +5001,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ObjectMeta": { @@ -5026,7 +5026,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.ObjectMeta", "imagepolicy.ImageReviewSpec", "imagepolicy.ImageReviewStatus", "unversioned.TypeMeta"}, + "api.ObjectMeta", "imagepolicy.ImageReviewSpec", "imagepolicy.ImageReviewStatus", "v1.TypeMeta"}, }, "imagepolicy.ImageReviewContainerSpec": { Schema: spec.Schema{ @@ -5175,7 +5175,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -5195,7 +5195,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "policy.PodDisruptionBudget", "unversioned.ListMeta"}, + "policy.PodDisruptionBudget", "v1.ListMeta"}, }, "policy.PodDisruptionBudgetSpec": { Schema: spec.Schema{ @@ -5211,14 +5211,14 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Label query over pods whose evictions are managed by the disruption budget.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, }, }, }, Dependencies: []string{ - "intstr.IntOrString", "unversioned.LabelSelector"}, + "intstr.IntOrString", "v1.LabelSelector"}, }, "policy.PodDisruptionBudgetStatus": { Schema: spec.Schema{ @@ -5239,7 +5239,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ AdditionalProperties: &spec.SchemaOrBool{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, }, @@ -5278,7 +5278,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "rbac.ClusterRole": { Schema: spec.Schema{ @@ -5287,7 +5287,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ObjectMeta": { @@ -5314,7 +5314,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.ObjectMeta", "rbac.PolicyRule", "unversioned.TypeMeta"}, + "api.ObjectMeta", "rbac.PolicyRule", "v1.TypeMeta"}, }, "rbac.ClusterRoleBinding": { Schema: spec.Schema{ @@ -5323,7 +5323,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ObjectMeta": { @@ -5356,7 +5356,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.ObjectMeta", "rbac.RoleRef", "rbac.Subject", "unversioned.TypeMeta"}, + "api.ObjectMeta", "rbac.RoleRef", "rbac.Subject", "v1.TypeMeta"}, }, "rbac.ClusterRoleBindingBuilder": { Schema: spec.Schema{ @@ -5382,13 +5382,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ListMeta": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "Items": { @@ -5409,7 +5409,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "rbac.ClusterRoleBinding", "unversioned.ListMeta", "unversioned.TypeMeta"}, + "rbac.ClusterRoleBinding", "v1.ListMeta", "v1.TypeMeta"}, }, "rbac.ClusterRoleList": { Schema: spec.Schema{ @@ -5418,13 +5418,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ListMeta": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "Items": { @@ -5445,7 +5445,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "rbac.ClusterRole", "unversioned.ListMeta", "unversioned.TypeMeta"}, + "rbac.ClusterRole", "v1.ListMeta", "v1.TypeMeta"}, }, "rbac.PolicyRule": { Schema: spec.Schema{ @@ -5558,7 +5558,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ObjectMeta": { @@ -5585,7 +5585,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.ObjectMeta", "rbac.PolicyRule", "unversioned.TypeMeta"}, + "api.ObjectMeta", "rbac.PolicyRule", "v1.TypeMeta"}, }, "rbac.RoleBinding": { Schema: spec.Schema{ @@ -5594,7 +5594,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ObjectMeta": { @@ -5626,7 +5626,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "api.ObjectMeta", "rbac.RoleRef", "rbac.Subject", "unversioned.TypeMeta"}, + "api.ObjectMeta", "rbac.RoleRef", "rbac.Subject", "v1.TypeMeta"}, }, "rbac.RoleBindingList": { Schema: spec.Schema{ @@ -5635,13 +5635,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ListMeta": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "Items": { @@ -5662,7 +5662,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "rbac.RoleBinding", "unversioned.ListMeta", "unversioned.TypeMeta"}, + "rbac.RoleBinding", "v1.ListMeta", "v1.TypeMeta"}, }, "rbac.RoleList": { Schema: spec.Schema{ @@ -5671,13 +5671,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "ListMeta": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "Items": { @@ -5698,7 +5698,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "rbac.Role", "unversioned.ListMeta", "unversioned.TypeMeta"}, + "rbac.Role", "v1.ListMeta", "v1.TypeMeta"}, }, "rbac.RoleRef": { Schema: spec.Schema{ @@ -5815,7 +5815,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "runtime.TypeMeta": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "TypeMeta is shared by all top level objects. The proper way to use it is to inline it in your type, like this: type MyAwesomeAPIObject struct {\n runtime.TypeMeta `json:\",inline\"`\n ... // other fields\n} func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *unversioned.GroupVersionKind) { unversioned.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind\n\nTypeMeta is provided here for convenience. You may use it directly from this package or define your own with the same fields.", + Description: "TypeMeta is shared by all top level objects. The proper way to use it is to inline it in your type, like this: type MyAwesomeAPIObject struct {\n runtime.TypeMeta `json:\",inline\"`\n ... // other fields\n} func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind\n\nTypeMeta is provided here for convenience. You may use it directly from this package or define your own with the same fields.", Properties: map[string]spec.Schema{ "apiVersion": { SchemaProps: spec.SchemaProps{ @@ -5866,7 +5866,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, Dependencies: []string{}, }, - "unversioned.APIGroup": { + "v1.APIGroup": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ Description: "APIGroup contains the name, the supported versions, and the preferred version of a group.", @@ -5885,7 +5885,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.GroupVersionForDiscovery"), + Ref: spec.MustCreateRef("#/definitions/v1.GroupVersionForDiscovery"), }, }, }, @@ -5894,7 +5894,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "preferredVersion": { SchemaProps: spec.SchemaProps{ Description: "preferredVersion is the version preferred by the API server, which probably is the storage version.", - Ref: spec.MustCreateRef("#/definitions/unversioned.GroupVersionForDiscovery"), + Ref: spec.MustCreateRef("#/definitions/v1.GroupVersionForDiscovery"), }, }, "serverAddressByClientCIDRs": { @@ -5904,7 +5904,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ServerAddressByClientCIDR"), + Ref: spec.MustCreateRef("#/definitions/v1.ServerAddressByClientCIDR"), }, }, }, @@ -5915,9 +5915,9 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.GroupVersionForDiscovery", "unversioned.ServerAddressByClientCIDR"}, + "v1.GroupVersionForDiscovery", "v1.ServerAddressByClientCIDR"}, }, - "unversioned.APIGroupList": { + "v1.APIGroupList": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ Description: "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.", @@ -5929,7 +5929,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.APIGroup"), + Ref: spec.MustCreateRef("#/definitions/v1.APIGroup"), }, }, }, @@ -5940,9 +5940,9 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.APIGroup"}, + "v1.APIGroup"}, }, - "unversioned.APIResource": { + "v1.APIResource": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ Description: "APIResource specifies the name of a resource and whether it is namespaced.", @@ -5974,7 +5974,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, Dependencies: []string{}, }, - "unversioned.APIResourceList": { + "v1.APIResourceList": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ Description: "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", @@ -5993,7 +5993,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.APIResource"), + Ref: spec.MustCreateRef("#/definitions/v1.APIResource"), }, }, }, @@ -6004,9 +6004,9 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.APIResource"}, + "v1.APIResource"}, }, - "unversioned.APIVersions": { + "v1.APIVersions": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ Description: "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.", @@ -6032,7 +6032,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ServerAddressByClientCIDR"), + Ref: spec.MustCreateRef("#/definitions/v1.ServerAddressByClientCIDR"), }, }, }, @@ -6043,544 +6043,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ServerAddressByClientCIDR"}, - }, - "unversioned.Duration": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "Duration is a wrapper around time.Duration which supports correct marshaling to YAML and JSON. In particular, it marshals into strings, which can be used as map keys in json.", - Properties: map[string]spec.Schema{ - "Duration": { - SchemaProps: spec.SchemaProps{ - Type: []string{"integer"}, - Format: "int64", - }, - }, - }, - Required: []string{"Duration"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.ExportOptions": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ExportOptions is the query options to the standard REST get call.", - Properties: map[string]spec.Schema{ - "export": { - SchemaProps: spec.SchemaProps{ - Description: "Should this value be exported. Export strips fields that a user can not specify.", - Type: []string{"boolean"}, - Format: "", - }, - }, - "exact": { - SchemaProps: spec.SchemaProps{ - Description: "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'.", - Type: []string{"boolean"}, - Format: "", - }, - }, - }, - Required: []string{"export", "exact"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.GroupKind": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying concepts during lookup stages without having partially valid types", - Properties: map[string]spec.Schema{ - "Group": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "Kind": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"Group", "Kind"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.GroupResource": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "GroupResource specifies a Group and a Resource, but does not force a version. This is useful for identifying concepts during lookup stages without having partially valid types", - Properties: map[string]spec.Schema{ - "Group": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "Resource": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"Group", "Resource"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.GroupVersion": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "GroupVersion contains the \"group\" and the \"version\", which uniquely identifies the API.", - Properties: map[string]spec.Schema{ - "Group": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "Version": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"Group", "Version"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.GroupVersionForDiscovery": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", - Properties: map[string]spec.Schema{ - "groupVersion": { - SchemaProps: spec.SchemaProps{ - Description: "groupVersion specifies the API group and version in the form \"group/version\"", - Type: []string{"string"}, - Format: "", - }, - }, - "version": { - SchemaProps: spec.SchemaProps{ - Description: "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"groupVersion", "version"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.GroupVersionKind": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "GroupVersionKind unambiguously identifies a kind. It doesn't anonymously include GroupVersion to avoid automatic coersion. It doesn't use a GroupVersion to avoid custom marshalling", - Properties: map[string]spec.Schema{ - "Group": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "Version": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "Kind": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"Group", "Version", "Kind"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.GroupVersionResource": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "GroupVersionResource unambiguously identifies a resource. It doesn't anonymously include GroupVersion to avoid automatic coersion. It doesn't use a GroupVersion to avoid custom marshalling", - Properties: map[string]spec.Schema{ - "Group": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "Version": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - "Resource": { - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"Group", "Version", "Resource"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.LabelSelector": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", - Properties: map[string]spec.Schema{ - "matchLabels": { - SchemaProps: spec.SchemaProps{ - Description: "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", - Type: []string{"object"}, - AdditionalProperties: &spec.SchemaOrBool{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - "matchExpressions": { - SchemaProps: spec.SchemaProps{ - Description: "matchExpressions is a list of label selector requirements. The requirements are ANDed.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelectorRequirement"), - }, - }, - }, - }, - }, - }, - }, - }, - Dependencies: []string{ - "unversioned.LabelSelectorRequirement"}, - }, - "unversioned.LabelSelectorRequirement": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", - Properties: map[string]spec.Schema{ - "key": { - SchemaProps: spec.SchemaProps{ - Description: "key is the label key that the selector applies to.", - Type: []string{"string"}, - Format: "", - }, - }, - "operator": { - SchemaProps: spec.SchemaProps{ - Description: "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", - Type: []string{"string"}, - Format: "", - }, - }, - "values": { - SchemaProps: spec.SchemaProps{ - Description: "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - }, - Required: []string{"key", "operator"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.ListMeta": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", - Properties: map[string]spec.Schema{ - "selfLink": { - SchemaProps: spec.SchemaProps{ - Description: "SelfLink is a URL representing this object. Populated by the system. Read-only.", - Type: []string{"string"}, - Format: "", - }, - }, - "resourceVersion": { - SchemaProps: spec.SchemaProps{ - Description: "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - Dependencies: []string{}, - }, - "unversioned.Patch": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", - Properties: map[string]spec.Schema{}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.RootPaths": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "RootPaths lists the paths available at root. For example: \"/healthz\", \"/apis\".", - Properties: map[string]spec.Schema{ - "paths": { - SchemaProps: spec.SchemaProps{ - Description: "paths are the paths available at root.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - }, - Required: []string{"paths"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.ServerAddressByClientCIDR": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", - Properties: map[string]spec.Schema{ - "clientCIDR": { - SchemaProps: spec.SchemaProps{ - Description: "The CIDR with which clients can match their IP to figure out the server address that they should use.", - Type: []string{"string"}, - Format: "", - }, - }, - "serverAddress": { - SchemaProps: spec.SchemaProps{ - Description: "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"clientCIDR", "serverAddress"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.Status": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "Status is a return value for calls that don't return other objects.", - Properties: map[string]spec.Schema{ - "metadata": { - SchemaProps: spec.SchemaProps{ - Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), - }, - }, - "status": { - SchemaProps: spec.SchemaProps{ - Description: "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", - Type: []string{"string"}, - Format: "", - }, - }, - "message": { - SchemaProps: spec.SchemaProps{ - Description: "A human-readable description of the status of this operation.", - Type: []string{"string"}, - Format: "", - }, - }, - "reason": { - SchemaProps: spec.SchemaProps{ - Description: "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", - Type: []string{"string"}, - Format: "", - }, - }, - "details": { - SchemaProps: spec.SchemaProps{ - Description: "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", - Ref: spec.MustCreateRef("#/definitions/unversioned.StatusDetails"), - }, - }, - "code": { - SchemaProps: spec.SchemaProps{ - Description: "Suggested HTTP return code for this status, 0 if not set.", - Type: []string{"integer"}, - Format: "int32", - }, - }, - }, - }, - }, - Dependencies: []string{ - "unversioned.ListMeta", "unversioned.StatusDetails"}, - }, - "unversioned.StatusCause": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", - Properties: map[string]spec.Schema{ - "reason": { - SchemaProps: spec.SchemaProps{ - Description: "A machine-readable description of the cause of the error. If this value is empty there is no information available.", - Type: []string{"string"}, - Format: "", - }, - }, - "message": { - SchemaProps: spec.SchemaProps{ - Description: "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", - Type: []string{"string"}, - Format: "", - }, - }, - "field": { - SchemaProps: spec.SchemaProps{ - Description: "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - Dependencies: []string{}, - }, - "unversioned.StatusDetails": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", - Properties: map[string]spec.Schema{ - "name": { - SchemaProps: spec.SchemaProps{ - Description: "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", - Type: []string{"string"}, - Format: "", - }, - }, - "group": { - SchemaProps: spec.SchemaProps{ - Description: "The group attribute of the resource associated with the status StatusReason.", - Type: []string{"string"}, - Format: "", - }, - }, - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "causes": { - SchemaProps: spec.SchemaProps{ - Description: "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.StatusCause"), - }, - }, - }, - }, - }, - "retryAfterSeconds": { - SchemaProps: spec.SchemaProps{ - Description: "If specified, the time in seconds before the operation should be retried.", - Type: []string{"integer"}, - Format: "int32", - }, - }, - }, - }, - }, - Dependencies: []string{ - "unversioned.StatusCause"}, - }, - "unversioned.Time": unversioned.Time{}.OpenAPIDefinition(), "unversioned.Timestamp": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "Timestamp is a struct that is equivalent to Time, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Time. Do not use in Go structs.", - Properties: map[string]spec.Schema{ - "seconds": { - SchemaProps: spec.SchemaProps{ - Description: "Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must be from from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive.", - Type: []string{"integer"}, - Format: "int64", - }, - }, - "nanos": { - SchemaProps: spec.SchemaProps{ - Description: "Non-negative fractions of a second at nanosecond resolution. Negative second values with fractions must still have non-negative nanos values that count forward in time. Must be from 0 to 999,999,999 inclusive. This field may be limited in precision depending on context.", - Type: []string{"integer"}, - Format: "int32", - }, - }, - }, - Required: []string{"seconds", "nanos"}, - }, - }, - Dependencies: []string{}, - }, - "unversioned.TypeMeta": { - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "TypeMeta describes an individual object in an API response or request with strings representing the type of the object and its API schema version. Structures that are versioned or persisted should inline TypeMeta.", - Properties: map[string]spec.Schema{ - "kind": { - SchemaProps: spec.SchemaProps{ - Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Type: []string{"string"}, - Format: "", - }, - }, - "apiVersion": { - SchemaProps: spec.SchemaProps{ - Description: "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - Dependencies: []string{}, + "v1.ServerAddressByClientCIDR"}, }, "v1.AWSElasticBlockStoreVolumeSource": { Schema: spec.Schema{ @@ -7008,7 +6471,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -7029,7 +6492,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.ComponentStatus"}, + "v1.ComponentStatus", "v1.ListMeta"}, }, "v1.ConfigMap": { Schema: spec.Schema{ @@ -7088,7 +6551,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -7109,7 +6572,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.ConfigMap"}, + "v1.ConfigMap", "v1.ListMeta"}, }, "v1.ConfigMapVolumeSource": { Schema: spec.Schema{ @@ -7422,14 +6885,14 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "startedAt": { SchemaProps: spec.SchemaProps{ Description: "Time at which the container was last (re-)started", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, }, }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1.ContainerStateTerminated": { Schema: spec.Schema{ @@ -7467,13 +6930,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "startedAt": { SchemaProps: spec.SchemaProps{ Description: "Time at which previous execution of the container started", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "finishedAt": { SchemaProps: spec.SchemaProps{ Description: "Time at which the container last terminated", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "containerID": { @@ -7488,7 +6951,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1.ContainerStateWaiting": { Schema: spec.Schema{ @@ -7730,6 +7193,23 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Dependencies: []string{ "v1.DownwardAPIVolumeFile"}, }, + "v1.Duration": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "Duration is a wrapper around time.Duration which supports correct marshaling to YAML and JSON. In particular, it marshals into strings, which can be used as map keys in json.", + Properties: map[string]spec.Schema{ + "Duration": { + SchemaProps: spec.SchemaProps{ + Type: []string{"integer"}, + Format: "int64", + }, + }, + }, + Required: []string{"Duration"}, + }, + }, + Dependencies: []string{}, + }, "v1.EmptyDirVolumeSource": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -7907,7 +7387,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -7928,7 +7408,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.Endpoints"}, + "v1.Endpoints", "v1.ListMeta"}, }, "v1.EnvVar": { Schema: spec.Schema{ @@ -8037,13 +7517,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "firstTimestamp": { SchemaProps: spec.SchemaProps{ Description: "The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTimestamp": { SchemaProps: spec.SchemaProps{ Description: "The time at which the most recent occurrence of this event was recorded.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "count": { @@ -8065,7 +7545,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time", "v1.EventSource", "v1.ObjectMeta", "v1.ObjectReference"}, + "v1.EventSource", "v1.ObjectMeta", "v1.ObjectReference", "v1.Time"}, }, "v1.EventList": { Schema: spec.Schema{ @@ -8075,7 +7555,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -8096,7 +7576,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.Event"}, + "v1.Event", "v1.ListMeta"}, }, "v1.EventSource": { Schema: spec.Schema{ @@ -8146,6 +7626,31 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, Dependencies: []string{}, }, + "v1.ExportOptions": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ExportOptions is the query options to the standard REST get call.", + Properties: map[string]spec.Schema{ + "export": { + SchemaProps: spec.SchemaProps{ + Description: "Should this value be exported. Export strips fields that a user can not specify.", + Type: []string{"boolean"}, + Format: "", + }, + }, + "exact": { + SchemaProps: spec.SchemaProps{ + Description: "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'.", + Type: []string{"boolean"}, + Format: "", + }, + }, + }, + Required: []string{"export", "exact"}, + }, + }, + Dependencies: []string{}, + }, "v1.FCVolumeSource": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -8372,6 +7877,158 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, Dependencies: []string{}, }, + "v1.GroupKind": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "GroupKind specifies a Group and a Kind, but does not force a version. This is useful for identifying concepts during lookup stages without having partially valid types", + Properties: map[string]spec.Schema{ + "Group": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "Kind": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"Group", "Kind"}, + }, + }, + Dependencies: []string{}, + }, + "v1.GroupResource": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "GroupResource specifies a Group and a Resource, but does not force a version. This is useful for identifying concepts during lookup stages without having partially valid types", + Properties: map[string]spec.Schema{ + "Group": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "Resource": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"Group", "Resource"}, + }, + }, + Dependencies: []string{}, + }, + "v1.GroupVersion": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "GroupVersion contains the \"group\" and the \"version\", which uniquely identifies the API.", + Properties: map[string]spec.Schema{ + "Group": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "Version": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"Group", "Version"}, + }, + }, + Dependencies: []string{}, + }, + "v1.GroupVersionForDiscovery": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", + Properties: map[string]spec.Schema{ + "groupVersion": { + SchemaProps: spec.SchemaProps{ + Description: "groupVersion specifies the API group and version in the form \"group/version\"", + Type: []string{"string"}, + Format: "", + }, + }, + "version": { + SchemaProps: spec.SchemaProps{ + Description: "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"groupVersion", "version"}, + }, + }, + Dependencies: []string{}, + }, + "v1.GroupVersionKind": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "GroupVersionKind unambiguously identifies a kind. It doesn't anonymously include GroupVersion to avoid automatic coersion. It doesn't use a GroupVersion to avoid custom marshalling", + Properties: map[string]spec.Schema{ + "Group": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "Version": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "Kind": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"Group", "Version", "Kind"}, + }, + }, + Dependencies: []string{}, + }, + "v1.GroupVersionResource": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "GroupVersionResource unambiguously identifies a resource. It doesn't anonymously include GroupVersion to avoid automatic coersion. It doesn't use a GroupVersion to avoid custom marshalling", + Properties: map[string]spec.Schema{ + "Group": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "Version": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "Resource": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"Group", "Version", "Resource"}, + }, + }, + Dependencies: []string{}, + }, "v1.HTTPGetAction": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -8515,7 +8172,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -8536,7 +8193,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.HorizontalPodAutoscaler"}, + "v1.HorizontalPodAutoscaler", "v1.ListMeta"}, }, "v1.HorizontalPodAutoscalerSpec": { Schema: spec.Schema{ @@ -8592,7 +8249,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastScaleTime": { SchemaProps: spec.SchemaProps{ Description: "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "currentReplicas": { @@ -8621,7 +8278,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1.HostPathVolumeSource": { Schema: spec.Schema{ @@ -8745,13 +8402,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastProbeTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition was checked.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition transit from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -8773,7 +8430,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1.JobList": { Schema: spec.Schema{ @@ -8783,7 +8440,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -8804,7 +8461,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.Job"}, + "v1.Job", "v1.ListMeta"}, }, "v1.JobSpec": { Schema: spec.Schema{ @@ -8835,7 +8492,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "manualSelector": { @@ -8856,7 +8513,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector", "v1.PodTemplateSpec"}, + "v1.LabelSelector", "v1.PodTemplateSpec"}, }, "v1.JobStatus": { Schema: spec.Schema{ @@ -8879,13 +8536,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "startTime": { SchemaProps: spec.SchemaProps{ Description: "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "completionTime": { SchemaProps: spec.SchemaProps{ Description: "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "active": { @@ -8913,7 +8570,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time", "v1.JobCondition"}, + "v1.JobCondition", "v1.Time"}, }, "v1.KeyToPath": { Schema: spec.Schema{ @@ -8947,6 +8604,83 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, Dependencies: []string{}, }, + "v1.LabelSelector": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", + Properties: map[string]spec.Schema{ + "matchLabels": { + SchemaProps: spec.SchemaProps{ + Description: "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", + Type: []string{"object"}, + AdditionalProperties: &spec.SchemaOrBool{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "matchExpressions": { + SchemaProps: spec.SchemaProps{ + Description: "matchExpressions is a list of label selector requirements. The requirements are ANDed.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelectorRequirement"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "v1.LabelSelectorRequirement"}, + }, + "v1.LabelSelectorRequirement": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", + Properties: map[string]spec.Schema{ + "key": { + SchemaProps: spec.SchemaProps{ + Description: "key is the label key that the selector applies to.", + Type: []string{"string"}, + Format: "", + }, + }, + "operator": { + SchemaProps: spec.SchemaProps{ + Description: "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", + Type: []string{"string"}, + Format: "", + }, + }, + "values": { + SchemaProps: spec.SchemaProps{ + Description: "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + }, + Required: []string{"key", "operator"}, + }, + }, + Dependencies: []string{}, + }, "v1.Lifecycle": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -9084,7 +8818,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -9105,7 +8839,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.LimitRange"}, + "v1.LimitRange", "v1.ListMeta"}, }, "v1.LimitRangeSpec": { Schema: spec.Schema{ @@ -9140,7 +8874,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -9161,7 +8895,31 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "runtime.RawExtension", "unversioned.ListMeta"}, + "runtime.RawExtension", "v1.ListMeta"}, + }, + "v1.ListMeta": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", + Properties: map[string]spec.Schema{ + "selfLink": { + SchemaProps: spec.SchemaProps{ + Description: "SelfLink is a URL representing this object. Populated by the system. Read-only.", + Type: []string{"string"}, + Format: "", + }, + }, + "resourceVersion": { + SchemaProps: spec.SchemaProps{ + Description: "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + Dependencies: []string{}, }, "v1.ListOptions": { Schema: spec.Schema{ @@ -9342,7 +9100,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -9363,7 +9121,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.Namespace"}, + "v1.ListMeta", "v1.Namespace"}, }, "v1.NamespaceSpec": { Schema: spec.Schema{ @@ -9512,13 +9270,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastHeartbeatTime": { SchemaProps: spec.SchemaProps{ Description: "Last time we got an update on a given condition.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition transit from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -9540,7 +9298,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1.NodeDaemonEndpoints": { Schema: spec.Schema{ @@ -9567,7 +9325,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -9588,7 +9346,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.Node"}, + "v1.ListMeta", "v1.Node"}, }, "v1.NodeProxyOptions": { Schema: spec.Schema{ @@ -10044,13 +9802,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "creationTimestamp": { SchemaProps: spec.SchemaProps{ Description: "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "deletionTimestamp": { SchemaProps: spec.SchemaProps{ Description: "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "deletionGracePeriodSeconds": { @@ -10126,7 +9884,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time", "v1.OwnerReference"}, + "v1.OwnerReference", "v1.Time"}, }, "v1.ObjectReference": { Schema: spec.Schema{ @@ -10233,6 +9991,15 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, Dependencies: []string{}, }, + "v1.Patch": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", + Properties: map[string]spec.Schema{}, + }, + }, + Dependencies: []string{}, + }, "v1.PersistentVolume": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -10299,7 +10066,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -10320,7 +10087,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.PersistentVolumeClaim"}, + "v1.ListMeta", "v1.PersistentVolumeClaim"}, }, "v1.PersistentVolumeClaimSpec": { Schema: spec.Schema{ @@ -10344,7 +10111,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "A label query over volumes to consider for binding.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "resources": { @@ -10364,7 +10131,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector", "v1.ResourceRequirements"}, + "v1.LabelSelector", "v1.ResourceRequirements"}, }, "v1.PersistentVolumeClaimStatus": { Schema: spec.Schema{ @@ -10444,7 +10211,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -10465,7 +10232,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.PersistentVolume"}, + "v1.ListMeta", "v1.PersistentVolume"}, }, "v1.PersistentVolumeSource": { Schema: spec.Schema{ @@ -10761,7 +10528,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "labelSelector": { SchemaProps: spec.SchemaProps{ Description: "A label query over a set of resources, in this case pods.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "namespaces": { @@ -10790,7 +10557,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector"}, + "v1.LabelSelector"}, }, "v1.PodAntiAffinity": { Schema: spec.Schema{ @@ -10896,13 +10663,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastProbeTime": { SchemaProps: spec.SchemaProps{ Description: "Last time we probed the condition.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition transitioned from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -10924,7 +10691,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1.PodExecOptions": { Schema: spec.Schema{ @@ -10994,7 +10761,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -11015,7 +10782,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.Pod"}, + "v1.ListMeta", "v1.Pod"}, }, "v1.PodLogOptions": { Schema: spec.Schema{ @@ -11053,7 +10820,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "sinceTime": { SchemaProps: spec.SchemaProps{ Description: "An RFC3339 timestamp from which to show logs. If this value precedes the time a pod was started, only logs since the pod start will be returned. If this value is in the future, no logs will be returned. Only one of sinceSeconds or sinceTime may be specified.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "timestamps": { @@ -11081,7 +10848,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1.PodProxyOptions": { Schema: spec.Schema{ @@ -11380,7 +11147,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "startTime": { SchemaProps: spec.SchemaProps{ Description: "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "containerStatuses": { @@ -11400,7 +11167,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time", "v1.ContainerStatus", "v1.PodCondition"}, + "v1.ContainerStatus", "v1.PodCondition", "v1.Time"}, }, "v1.PodStatusResult": { Schema: spec.Schema{ @@ -11456,7 +11223,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -11477,7 +11244,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.PodTemplate"}, + "v1.ListMeta", "v1.PodTemplate"}, }, "v1.PodTemplateSpec": { Schema: spec.Schema{ @@ -11533,7 +11300,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "evictionTime": { SchemaProps: spec.SchemaProps{ Description: "Time at which this entry was added to the list.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -11555,7 +11322,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time", "v1.PodSignature"}, + "v1.PodSignature", "v1.Time"}, }, "v1.PreferredSchedulingTerm": { Schema: spec.Schema{ @@ -11830,7 +11597,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "The last time the condition transitioned from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -11852,7 +11619,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1.ReplicationControllerList": { Schema: spec.Schema{ @@ -11862,7 +11629,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -11883,7 +11650,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.ReplicationController"}, + "v1.ListMeta", "v1.ReplicationController"}, }, "v1.ReplicationControllerSpec": { Schema: spec.Schema{ @@ -12059,7 +11826,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -12080,7 +11847,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.ResourceQuota"}, + "v1.ListMeta", "v1.ResourceQuota"}, }, "v1.ResourceQuotaSpec": { Schema: spec.Schema{ @@ -12194,6 +11961,31 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Dependencies: []string{ "resource.Quantity"}, }, + "v1.RootPaths": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "RootPaths lists the paths available at root. For example: \"/healthz\", \"/apis\".", + Properties: map[string]spec.Schema{ + "paths": { + SchemaProps: spec.SchemaProps{ + Description: "paths are the paths available at root.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + }, + Required: []string{"paths"}, + }, + }, + Dependencies: []string{}, + }, "v1.SELinuxOptions": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -12381,7 +12173,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -12402,7 +12194,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.Secret"}, + "v1.ListMeta", "v1.Secret"}, }, "v1.SecretVolumeSource": { Schema: spec.Schema{ @@ -12510,6 +12302,31 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Dependencies: []string{ "v1.ObjectReference"}, }, + "v1.ServerAddressByClientCIDR": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", + Properties: map[string]spec.Schema{ + "clientCIDR": { + SchemaProps: spec.SchemaProps{ + Description: "The CIDR with which clients can match their IP to figure out the server address that they should use.", + Type: []string{"string"}, + Format: "", + }, + }, + "serverAddress": { + SchemaProps: spec.SchemaProps{ + Description: "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"clientCIDR", "serverAddress"}, + }, + }, + Dependencies: []string{}, + }, "v1.Service": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -12590,7 +12407,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -12611,7 +12428,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.ServiceAccount"}, + "v1.ListMeta", "v1.ServiceAccount"}, }, "v1.ServiceList": { Schema: spec.Schema{ @@ -12621,7 +12438,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -12642,7 +12459,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.Service"}, + "v1.ListMeta", "v1.Service"}, }, "v1.ServicePort": { Schema: spec.Schema{ @@ -12840,6 +12657,140 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Dependencies: []string{ "v1.LoadBalancerStatus"}, }, + "v1.Status": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "Status is a return value for calls that don't return other objects.", + Properties: map[string]spec.Schema{ + "metadata": { + SchemaProps: spec.SchemaProps{ + Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), + }, + }, + "status": { + SchemaProps: spec.SchemaProps{ + Description: "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", + Type: []string{"string"}, + Format: "", + }, + }, + "message": { + SchemaProps: spec.SchemaProps{ + Description: "A human-readable description of the status of this operation.", + Type: []string{"string"}, + Format: "", + }, + }, + "reason": { + SchemaProps: spec.SchemaProps{ + Description: "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", + Type: []string{"string"}, + Format: "", + }, + }, + "details": { + SchemaProps: spec.SchemaProps{ + Description: "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", + Ref: spec.MustCreateRef("#/definitions/v1.StatusDetails"), + }, + }, + "code": { + SchemaProps: spec.SchemaProps{ + Description: "Suggested HTTP return code for this status, 0 if not set.", + Type: []string{"integer"}, + Format: "int32", + }, + }, + }, + }, + }, + Dependencies: []string{ + "v1.ListMeta", "v1.StatusDetails"}, + }, + "v1.StatusCause": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", + Properties: map[string]spec.Schema{ + "reason": { + SchemaProps: spec.SchemaProps{ + Description: "A machine-readable description of the cause of the error. If this value is empty there is no information available.", + Type: []string{"string"}, + Format: "", + }, + }, + "message": { + SchemaProps: spec.SchemaProps{ + Description: "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", + Type: []string{"string"}, + Format: "", + }, + }, + "field": { + SchemaProps: spec.SchemaProps{ + Description: "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + Dependencies: []string{}, + }, + "v1.StatusDetails": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", + Properties: map[string]spec.Schema{ + "name": { + SchemaProps: spec.SchemaProps{ + Description: "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", + Type: []string{"string"}, + Format: "", + }, + }, + "group": { + SchemaProps: spec.SchemaProps{ + Description: "The group attribute of the resource associated with the status StatusReason.", + Type: []string{"string"}, + Format: "", + }, + }, + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "causes": { + SchemaProps: spec.SchemaProps{ + Description: "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: spec.MustCreateRef("#/definitions/v1.StatusCause"), + }, + }, + }, + }, + }, + "retryAfterSeconds": { + SchemaProps: spec.SchemaProps{ + Description: "If specified, the time in seconds before the operation should be retried.", + Type: []string{"integer"}, + Format: "int32", + }, + }, + }, + }, + }, + Dependencies: []string{ + "v1.StatusCause"}, + }, "v1.Sysctl": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -12933,7 +12884,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -12953,7 +12904,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1.TestType"}, + "v1.ListMeta", "v1.TestType"}, }, "v1.TestTypeStatus": { Schema: spec.Schema{ @@ -12971,6 +12922,31 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, Dependencies: []string{}, }, + "v1.Time": v1.Time{}.OpenAPIDefinition(), "v1.Timestamp": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "Timestamp is a struct that is equivalent to Time, but intended for protobuf marshalling/unmarshalling. It is generated into a serialization that matches Time. Do not use in Go structs.", + Properties: map[string]spec.Schema{ + "seconds": { + SchemaProps: spec.SchemaProps{ + Description: "Represents seconds of UTC time since Unix epoch 1970-01-01T00:00:00Z. Must be from from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive.", + Type: []string{"integer"}, + Format: "int64", + }, + }, + "nanos": { + SchemaProps: spec.SchemaProps{ + Description: "Non-negative fractions of a second at nanosecond resolution. Negative second values with fractions must still have non-negative nanos values that count forward in time. Must be from 0 to 999,999,999 inclusive. This field may be limited in precision depending on context.", + Type: []string{"integer"}, + Format: "int32", + }, + }, + }, + Required: []string{"seconds", "nanos"}, + }, + }, + Dependencies: []string{}, + }, "v1.Toleration": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -13009,6 +12985,30 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, Dependencies: []string{}, }, + "v1.TypeMeta": { + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "TypeMeta describes an individual object in an API response or request with strings representing the type of the object and its API schema version. Structures that are versioned or persisted should inline TypeMeta.", + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + Dependencies: []string{}, + }, "v1.Volume": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -13330,7 +13330,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastUpdateTime": { SchemaProps: spec.SchemaProps{ Description: "timestamp for the last update to this condition", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, }, @@ -13338,7 +13338,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1alpha1.CertificateSigningRequestList": { Schema: spec.Schema{ @@ -13346,7 +13346,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -13366,7 +13366,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1alpha1.CertificateSigningRequest"}, + "v1.ListMeta", "v1alpha1.CertificateSigningRequest"}, }, "v1alpha1.CertificateSigningRequestSpec": { Schema: spec.Schema{ @@ -13535,7 +13535,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -13556,7 +13556,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1alpha1.ClusterRoleBinding"}, + "v1.ListMeta", "v1alpha1.ClusterRoleBinding"}, }, "v1alpha1.ClusterRoleList": { Schema: spec.Schema{ @@ -13566,7 +13566,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -13587,7 +13587,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1alpha1.ClusterRole"}, + "v1.ListMeta", "v1alpha1.ClusterRole"}, }, "v1alpha1.ImageReview": { Schema: spec.Schema{ @@ -13711,7 +13711,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "bindAddress": { @@ -13759,13 +13759,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "iptablesSyncPeriodSeconds": { SchemaProps: spec.SchemaProps{ Description: "iptablesSyncPeriod is the period that iptables rules are refreshed (e.g. '5s', '1m', '2h22m'). Must be greater than 0.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "iptablesMinSyncPeriodSeconds": { SchemaProps: spec.SchemaProps{ Description: "iptablesMinSyncPeriod is the minimum period that iptables rules are refreshed (e.g. '5s', '1m', '2h22m').", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "kubeconfigPath": { @@ -13820,7 +13820,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "udpTimeoutMilliseconds": { SchemaProps: spec.SchemaProps{ Description: "udpIdleTimeout is how long an idle UDP connection will be kept open (e.g. '250ms', '2s'). Must be greater than 0. Only applicable for proxyMode=userspace.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "conntrackMax": { @@ -13847,13 +13847,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "conntrackTCPEstablishedTimeout": { SchemaProps: spec.SchemaProps{ Description: "conntrackTCPEstablishedTimeout is how long an idle TCP connection will be kept open (e.g. '2s'). Must be greater than 0.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "conntrackTCPCloseWaitTimeout": { SchemaProps: spec.SchemaProps{ Description: "conntrackTCPCloseWaitTimeout is how long an idle conntrack entry in CLOSE_WAIT state will remain in the conntrack table. (e.g. '60s'). Must be greater than 0 to set.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, }, @@ -13861,7 +13861,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Duration", "unversioned.TypeMeta"}, + "v1.Duration", "v1.TypeMeta"}, }, "v1alpha1.KubeSchedulerConfiguration": { Schema: spec.Schema{ @@ -13869,7 +13869,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "port": { @@ -13967,7 +13967,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.TypeMeta", "v1alpha1.LeaderElectionConfiguration"}, + "v1.TypeMeta", "v1alpha1.LeaderElectionConfiguration"}, }, "v1alpha1.KubeletAnonymousAuthentication": { Schema: spec.Schema{ @@ -14045,7 +14045,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "TypeMeta": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.TypeMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.TypeMeta"), }, }, "podManifestPath": { @@ -14058,19 +14058,19 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "syncFrequency": { SchemaProps: spec.SchemaProps{ Description: "syncFrequency is the max period between synchronizing running containers and config", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "fileCheckFrequency": { SchemaProps: spec.SchemaProps{ Description: "fileCheckFrequency is the duration between checking config files for new data", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "httpCheckFrequency": { SchemaProps: spec.SchemaProps{ Description: "httpCheckFrequency is the duration between checking http for new data", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "manifestURL": { @@ -14270,7 +14270,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "minimumGCAge": { SchemaProps: spec.SchemaProps{ Description: "minimumGCAge is the minimum age for a finished container before it is garbage collected.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "maxPerPodContainerCount": { @@ -14346,19 +14346,19 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "streamingConnectionIdleTimeout": { SchemaProps: spec.SchemaProps{ Description: "streamingConnectionIdleTimeout is the maximum time a streaming connection can be idle before the connection is automatically closed.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "nodeStatusUpdateFrequency": { SchemaProps: spec.SchemaProps{ Description: "nodeStatusUpdateFrequency is the frequency that kubelet posts node status to master. Note: be cautious when changing the constant, it must work with nodeMonitorGracePeriod in nodecontroller.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "imageMinimumGCAge": { SchemaProps: spec.SchemaProps{ Description: "imageMinimumGCAge is the minimum age for an unused image before it is garbage collected.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "imageGCHighThresholdPercent": { @@ -14385,7 +14385,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "volumeStatsAggPeriod": { SchemaProps: spec.SchemaProps{ Description: "How frequently to calculate and cache volume disk usage for all pods", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "networkPluginName": { @@ -14510,7 +14510,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "runtimeRequestTimeout": { SchemaProps: spec.SchemaProps{ Description: "runtimeRequestTimeout is the timeout for all runtime requests except long running requests - pull, logs, exec and attach.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "rktPath": { @@ -14670,7 +14670,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "outOfDiskTransitionFrequency": { SchemaProps: spec.SchemaProps{ Description: "outOfDiskTransitionFrequency is duration for which the kubelet has to wait before transitioning out of out-of-disk node condition status.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "nodeIP": { @@ -14732,7 +14732,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "evictionPressureTransitionPeriod": { SchemaProps: spec.SchemaProps{ Description: "Duration for which the kubelet has to wait before transitioning out of an eviction pressure condition.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "evictionMaxPodGracePeriod": { @@ -14866,7 +14866,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Duration", "unversioned.TypeMeta", "v1alpha1.KubeletAuthentication", "v1alpha1.KubeletAuthorization"}, + "v1.Duration", "v1.TypeMeta", "v1alpha1.KubeletAuthentication", "v1alpha1.KubeletAuthorization"}, }, "v1alpha1.KubeletWebhookAuthentication": { Schema: spec.Schema{ @@ -14882,7 +14882,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "cacheTTL": { SchemaProps: spec.SchemaProps{ Description: "cacheTTL enables caching of authentication results", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, }, @@ -14890,7 +14890,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Duration"}, + "v1.Duration"}, }, "v1alpha1.KubeletWebhookAuthorization": { Schema: spec.Schema{ @@ -14899,13 +14899,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "cacheAuthorizedTTL": { SchemaProps: spec.SchemaProps{ Description: "cacheAuthorizedTTL is the duration to cache 'authorized' responses from the webhook authorizer.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "cacheUnauthorizedTTL": { SchemaProps: spec.SchemaProps{ Description: "cacheUnauthorizedTTL is the duration to cache 'unauthorized' responses from the webhook authorizer.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, }, @@ -14913,7 +14913,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Duration"}, + "v1.Duration"}, }, "v1alpha1.KubeletX509Authentication": { Schema: spec.Schema{ @@ -14947,19 +14947,19 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "leaseDuration": { SchemaProps: spec.SchemaProps{ Description: "leaseDuration is the duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate. This is only applicable if leader election is enabled.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "renewDeadline": { SchemaProps: spec.SchemaProps{ Description: "renewDeadline is the interval between attempts by the acting master to renew a leadership slot before it stops leading. This must be less than or equal to the lease duration. This is only applicable if leader election is enabled.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, "retryPeriod": { SchemaProps: spec.SchemaProps{ Description: "retryPeriod is the duration the clients should wait between attempting acquisition and renewal of a leadership. This is only applicable if leader election is enabled.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), + Ref: spec.MustCreateRef("#/definitions/v1.Duration"), }, }, }, @@ -14967,7 +14967,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Duration"}, + "v1.Duration"}, }, "v1alpha1.PolicyRule": { Schema: spec.Schema{ @@ -15150,7 +15150,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -15171,7 +15171,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1alpha1.RoleBinding"}, + "v1.ListMeta", "v1alpha1.RoleBinding"}, }, "v1alpha1.RoleList": { Schema: spec.Schema{ @@ -15181,7 +15181,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -15202,7 +15202,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1alpha1.Role"}, + "v1.ListMeta", "v1alpha1.Role"}, }, "v1alpha1.RoleRef": { Schema: spec.Schema{ @@ -15360,13 +15360,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastProbeTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition was checked.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition transit from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -15388,7 +15388,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1beta1.ClusterList": { Schema: spec.Schema{ @@ -15398,7 +15398,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -15419,7 +15419,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.Cluster"}, + "v1.ListMeta", "v1beta1.Cluster"}, }, "v1beta1.ClusterSpec": { Schema: spec.Schema{ @@ -15629,7 +15629,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -15650,7 +15650,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.DaemonSet"}, + "v1.ListMeta", "v1beta1.DaemonSet"}, }, "v1beta1.DaemonSetSpec": { Schema: spec.Schema{ @@ -15660,7 +15660,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "template": { @@ -15674,7 +15674,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector", "v1.PodTemplateSpec"}, + "v1.LabelSelector", "v1.PodTemplateSpec"}, }, "v1beta1.DaemonSetStatus": { Schema: spec.Schema{ @@ -15766,13 +15766,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastUpdateTime": { SchemaProps: spec.SchemaProps{ Description: "The last time this condition was updated.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition transitioned from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -15794,7 +15794,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1beta1.DeploymentList": { Schema: spec.Schema{ @@ -15804,7 +15804,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -15825,7 +15825,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.Deployment"}, + "v1.ListMeta", "v1beta1.Deployment"}, }, "v1beta1.DeploymentRollback": { Schema: spec.Schema{ @@ -15881,7 +15881,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "template": { @@ -15935,7 +15935,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector", "v1.PodTemplateSpec", "v1beta1.DeploymentStrategy", "v1beta1.RollbackConfig"}, + "v1.LabelSelector", "v1.PodTemplateSpec", "v1beta1.DeploymentStrategy", "v1beta1.RollbackConfig"}, }, "v1beta1.DeploymentStatus": { Schema: spec.Schema{ @@ -16161,7 +16161,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -16182,7 +16182,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.HorizontalPodAutoscaler"}, + "v1.ListMeta", "v1beta1.HorizontalPodAutoscaler"}, }, "v1beta1.HorizontalPodAutoscalerSpec": { Schema: spec.Schema{ @@ -16237,7 +16237,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastScaleTime": { SchemaProps: spec.SchemaProps{ Description: "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "currentReplicas": { @@ -16266,7 +16266,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1beta1.HostPortRange": { Schema: spec.Schema{ @@ -16380,7 +16380,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -16401,7 +16401,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.Ingress"}, + "v1.ListMeta", "v1beta1.Ingress"}, }, "v1beta1.IngressRule": { Schema: spec.Schema{ @@ -16578,13 +16578,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastProbeTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition was checked.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition transit from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -16606,7 +16606,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1beta1.JobList": { Schema: spec.Schema{ @@ -16616,7 +16616,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -16637,7 +16637,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.Job"}, + "v1.ListMeta", "v1beta1.Job"}, }, "v1beta1.JobSpec": { Schema: spec.Schema{ @@ -16668,7 +16668,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "autoSelector": { @@ -16689,7 +16689,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector", "v1.PodTemplateSpec"}, + "v1.LabelSelector", "v1.PodTemplateSpec"}, }, "v1beta1.JobStatus": { Schema: spec.Schema{ @@ -16712,13 +16712,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "startTime": { SchemaProps: spec.SchemaProps{ Description: "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "completionTime": { SchemaProps: spec.SchemaProps{ Description: "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "active": { @@ -16746,7 +16746,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time", "v1beta1.JobCondition"}, + "v1.Time", "v1beta1.JobCondition"}, }, "v1beta1.LocalSubjectAccessReview": { Schema: spec.Schema{ @@ -16844,7 +16844,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -16865,7 +16865,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.NetworkPolicy"}, + "v1.ListMeta", "v1beta1.NetworkPolicy"}, }, "v1beta1.NetworkPolicyPeer": { Schema: spec.Schema{ @@ -16874,20 +16874,20 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "podSelector": { SchemaProps: spec.SchemaProps{ Description: "This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "namespaceSelector": { SchemaProps: spec.SchemaProps{ Description: "Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, }, }, }, Dependencies: []string{ - "unversioned.LabelSelector"}, + "v1.LabelSelector"}, }, "v1beta1.NetworkPolicyPort": { Schema: spec.Schema{ @@ -16919,7 +16919,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "podSelector": { SchemaProps: spec.SchemaProps{ Description: "Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "ingress": { @@ -16940,7 +16940,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector", "v1beta1.NetworkPolicyIngressRule"}, + "v1.LabelSelector", "v1beta1.NetworkPolicyIngressRule"}, }, "v1beta1.NonResourceAttributes": { Schema: spec.Schema{ @@ -17001,7 +17001,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -17021,7 +17021,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.PodDisruptionBudget"}, + "v1.ListMeta", "v1beta1.PodDisruptionBudget"}, }, "v1beta1.PodDisruptionBudgetSpec": { Schema: spec.Schema{ @@ -17037,14 +17037,14 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Label query over pods whose evictions are managed by the disruption budget.", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, }, }, }, Dependencies: []string{ - "intstr.IntOrString", "unversioned.LabelSelector"}, + "intstr.IntOrString", "v1.LabelSelector"}, }, "v1beta1.PodDisruptionBudgetStatus": { Schema: spec.Schema{ @@ -17065,7 +17065,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ AdditionalProperties: &spec.SchemaOrBool{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, }, @@ -17104,7 +17104,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1beta1.PodSecurityPolicy": { Schema: spec.Schema{ @@ -17137,7 +17137,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -17158,7 +17158,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.PodSecurityPolicy"}, + "v1.ListMeta", "v1beta1.PodSecurityPolicy"}, }, "v1beta1.PodSecurityPolicySpec": { Schema: spec.Schema{ @@ -17351,7 +17351,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "The last time the condition transitioned from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -17373,7 +17373,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v1beta1.ReplicaSetList": { Schema: spec.Schema{ @@ -17383,7 +17383,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -17404,7 +17404,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.ReplicaSet"}, + "v1.ListMeta", "v1beta1.ReplicaSet"}, }, "v1beta1.ReplicaSetSpec": { Schema: spec.Schema{ @@ -17428,7 +17428,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "template": { @@ -17441,7 +17441,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector", "v1.PodTemplateSpec"}, + "v1.LabelSelector", "v1.PodTemplateSpec"}, }, "v1beta1.ReplicaSetStatus": { Schema: spec.Schema{ @@ -17864,7 +17864,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ Properties: map[string]spec.Schema{ "metadata": { SchemaProps: spec.SchemaProps{ - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -17884,7 +17884,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.StatefulSet"}, + "v1.ListMeta", "v1beta1.StatefulSet"}, }, "v1beta1.StatefulSetSpec": { Schema: spec.Schema{ @@ -17901,7 +17901,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that should match the replica count. If empty, defaulted to labels on the pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "template": { @@ -17935,7 +17935,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector", "v1.PersistentVolumeClaim", "v1.PodTemplateSpec"}, + "v1.LabelSelector", "v1.PersistentVolumeClaim", "v1.PodTemplateSpec"}, }, "v1beta1.StatefulSetStatus": { Schema: spec.Schema{ @@ -18009,7 +18009,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -18030,7 +18030,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.StorageClass"}, + "v1.ListMeta", "v1beta1.StorageClass"}, }, "v1beta1.SubjectAccessReview": { Schema: spec.Schema{ @@ -18296,7 +18296,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -18317,7 +18317,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.ThirdPartyResourceData"}, + "v1.ListMeta", "v1beta1.ThirdPartyResourceData"}, }, "v1beta1.ThirdPartyResourceList": { Schema: spec.Schema{ @@ -18327,7 +18327,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata.", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -18348,7 +18348,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v1beta1.ThirdPartyResource"}, + "v1.ListMeta", "v1beta1.ThirdPartyResource"}, }, "v1beta1.TokenReview": { Schema: spec.Schema{ @@ -18523,7 +18523,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -18544,7 +18544,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v2alpha1.CronJob"}, + "v1.ListMeta", "v2alpha1.CronJob"}, }, "v2alpha1.CronJobSpec": { Schema: spec.Schema{ @@ -18613,14 +18613,14 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastScheduleTime": { SchemaProps: spec.SchemaProps{ Description: "LastScheduleTime keeps information of when was the last time the job was successfully scheduled.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, }, }, }, Dependencies: []string{ - "unversioned.Time", "v1.ObjectReference"}, + "v1.ObjectReference", "v1.Time"}, }, "v2alpha1.Job": { Schema: spec.Schema{ @@ -18673,13 +18673,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "lastProbeTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition was checked.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ Description: "Last time the condition transit from one status to another.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "reason": { @@ -18701,7 +18701,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time"}, + "v1.Time"}, }, "v2alpha1.JobList": { Schema: spec.Schema{ @@ -18711,7 +18711,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "metadata": { SchemaProps: spec.SchemaProps{ Description: "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - Ref: spec.MustCreateRef("#/definitions/unversioned.ListMeta"), + Ref: spec.MustCreateRef("#/definitions/v1.ListMeta"), }, }, "items": { @@ -18732,7 +18732,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.ListMeta", "v2alpha1.Job"}, + "v1.ListMeta", "v2alpha1.Job"}, }, "v2alpha1.JobSpec": { Schema: spec.Schema{ @@ -18763,7 +18763,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "selector": { SchemaProps: spec.SchemaProps{ Description: "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - Ref: spec.MustCreateRef("#/definitions/unversioned.LabelSelector"), + Ref: spec.MustCreateRef("#/definitions/v1.LabelSelector"), }, }, "manualSelector": { @@ -18784,7 +18784,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.LabelSelector", "v1.PodTemplateSpec"}, + "v1.LabelSelector", "v1.PodTemplateSpec"}, }, "v2alpha1.JobStatus": { Schema: spec.Schema{ @@ -18807,13 +18807,13 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "startTime": { SchemaProps: spec.SchemaProps{ Description: "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "completionTime": { SchemaProps: spec.SchemaProps{ Description: "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - Ref: spec.MustCreateRef("#/definitions/unversioned.Time"), + Ref: spec.MustCreateRef("#/definitions/v1.Time"), }, }, "active": { @@ -18841,7 +18841,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ }, }, Dependencies: []string{ - "unversioned.Time", "v2alpha1.JobCondition"}, + "v1.Time", "v2alpha1.JobCondition"}, }, "v2alpha1.JobTemplate": { Schema: spec.Schema{ diff --git a/pkg/genericapiserver/BUILD b/pkg/genericapiserver/BUILD index cc6cc7b8954..607fd84e9b1 100644 --- a/pkg/genericapiserver/BUILD +++ b/pkg/genericapiserver/BUILD @@ -31,10 +31,10 @@ go_library( "//pkg/admission:go_default_library", "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apiserver:go_default_library", "//pkg/apiserver/authenticator:go_default_library", "//pkg/apiserver/filters:go_default_library", @@ -99,12 +99,12 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/auth/authorizer:go_default_library", "//pkg/auth/user:go_default_library", "//pkg/generated/openapi:go_default_library", diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index afdf8e942e8..864c8925ac1 100644 --- a/pkg/genericapiserver/config.go +++ b/pkg/genericapiserver/config.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apiserverauthenticator "k8s.io/kubernetes/pkg/apiserver/authenticator" apiserverfilters "k8s.io/kubernetes/pkg/apiserver/filters" @@ -435,7 +435,7 @@ func (c completedConfig) New() (*GenericAPIServer, error) { InsecureServingInfo: c.InsecureServingInfo, ExternalAddress: c.ExternalAddress, - apiGroupsForDiscovery: map[string]unversioned.APIGroup{}, + apiGroupsForDiscovery: map[string]metav1.APIGroup{}, enableOpenAPISupport: c.EnableOpenAPISupport, openAPIConfig: c.OpenAPIConfig, diff --git a/pkg/genericapiserver/discovery.go b/pkg/genericapiserver/discovery.go index 127f913e733..c2b28512680 100644 --- a/pkg/genericapiserver/discovery.go +++ b/pkg/genericapiserver/discovery.go @@ -19,11 +19,11 @@ package genericapiserver import ( "net" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) type DiscoveryAddresses interface { - ServerAddressByClientCIDRs(net.IP) []unversioned.ServerAddressByClientCIDR + ServerAddressByClientCIDRs(net.IP) []metav1.ServerAddressByClientCIDR } // DefaultDiscoveryAddresses is a default implementation of DiscoveryAddresses that will work in most cases @@ -45,8 +45,8 @@ type DiscoveryCIDRRule struct { Address string } -func (d DefaultDiscoveryAddresses) ServerAddressByClientCIDRs(clientIP net.IP) []unversioned.ServerAddressByClientCIDR { - addressCIDRMap := []unversioned.ServerAddressByClientCIDR{ +func (d DefaultDiscoveryAddresses) ServerAddressByClientCIDRs(clientIP net.IP) []metav1.ServerAddressByClientCIDR { + addressCIDRMap := []metav1.ServerAddressByClientCIDR{ { ClientCIDR: "0.0.0.0/0", ServerAddress: d.DefaultAddress, @@ -59,11 +59,11 @@ func (d DefaultDiscoveryAddresses) ServerAddressByClientCIDRs(clientIP net.IP) [ return addressCIDRMap } -func (d DiscoveryCIDRRule) ServerAddressByClientCIDRs(clientIP net.IP) []unversioned.ServerAddressByClientCIDR { - addressCIDRMap := []unversioned.ServerAddressByClientCIDR{} +func (d DiscoveryCIDRRule) ServerAddressByClientCIDRs(clientIP net.IP) []metav1.ServerAddressByClientCIDR { + addressCIDRMap := []metav1.ServerAddressByClientCIDR{} if d.IPRange.Contains(clientIP) { - addressCIDRMap = append(addressCIDRMap, unversioned.ServerAddressByClientCIDR{ + addressCIDRMap = append(addressCIDRMap, metav1.ServerAddressByClientCIDR{ ClientCIDR: d.IPRange.String(), ServerAddress: d.Address, }) diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index 3686e636d2a..84674e376f8 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apiserver" @@ -129,7 +129,7 @@ type GenericAPIServer struct { // Map storing information about all groups to be exposed in discovery response. // The map is from name to the group. apiGroupsForDiscoveryLock sync.RWMutex - apiGroupsForDiscovery map[string]unversioned.APIGroup + apiGroupsForDiscovery map[string]metav1.APIGroup // See Config.$name for documentation of these flags @@ -247,10 +247,10 @@ func (s *GenericAPIServer) InstallLegacyAPIGroup(apiPrefix string, apiGroupInfo } // Install the version handler. // Add a handler at / to enumerate the supported api versions. - apiserver.AddApiWebService(s.Serializer, s.HandlerContainer.Container, apiPrefix, func(req *restful.Request) *unversioned.APIVersions { + apiserver.AddApiWebService(s.Serializer, s.HandlerContainer.Container, apiPrefix, func(req *restful.Request) *metav1.APIVersions { clientIP := utilnet.GetClientIP(req.Request) - apiVersionsForDiscovery := unversioned.APIVersions{ + apiVersionsForDiscovery := metav1.APIVersions{ ServerAddressByClientCIDRs: s.discoveryAddresses.ServerAddressByClientCIDRs(clientIP), Versions: apiVersions, } @@ -277,22 +277,22 @@ func (s *GenericAPIServer) InstallAPIGroup(apiGroupInfo *APIGroupInfo) error { // setup discovery // Install the version handler. // Add a handler at /apis/ to enumerate all versions supported by this group. - apiVersionsForDiscovery := []unversioned.GroupVersionForDiscovery{} + apiVersionsForDiscovery := []metav1.GroupVersionForDiscovery{} for _, groupVersion := range apiGroupInfo.GroupMeta.GroupVersions { // Check the config to make sure that we elide versions that don't have any resources if len(apiGroupInfo.VersionedResourcesStorageMap[groupVersion.Version]) == 0 { continue } - apiVersionsForDiscovery = append(apiVersionsForDiscovery, unversioned.GroupVersionForDiscovery{ + apiVersionsForDiscovery = append(apiVersionsForDiscovery, metav1.GroupVersionForDiscovery{ GroupVersion: groupVersion.String(), Version: groupVersion.Version, }) } - preferedVersionForDiscovery := unversioned.GroupVersionForDiscovery{ + preferedVersionForDiscovery := metav1.GroupVersionForDiscovery{ GroupVersion: apiGroupInfo.GroupMeta.GroupVersion.String(), Version: apiGroupInfo.GroupMeta.GroupVersion.Version, } - apiGroup := unversioned.APIGroup{ + apiGroup := metav1.APIGroup{ Name: apiGroupInfo.GroupMeta.GroupVersion.Group, Versions: apiVersionsForDiscovery, PreferredVersion: preferedVersionForDiscovery, @@ -304,7 +304,7 @@ func (s *GenericAPIServer) InstallAPIGroup(apiGroupInfo *APIGroupInfo) error { return nil } -func (s *GenericAPIServer) AddAPIGroupForDiscovery(apiGroup unversioned.APIGroup) { +func (s *GenericAPIServer) AddAPIGroupForDiscovery(apiGroup metav1.APIGroup) { s.apiGroupsForDiscoveryLock.Lock() defer s.apiGroupsForDiscoveryLock.Unlock() @@ -352,12 +352,12 @@ func (s *GenericAPIServer) newAPIGroupVersion(apiGroupInfo *APIGroupInfo, groupV // DynamicApisDiscovery returns a webservice serving api group discovery. // Note: during the server runtime apiGroupsForDiscovery might change. func (s *GenericAPIServer) DynamicApisDiscovery() *restful.WebService { - return apiserver.NewApisWebService(s.Serializer, APIGroupPrefix, func(req *restful.Request) []unversioned.APIGroup { + return apiserver.NewApisWebService(s.Serializer, APIGroupPrefix, func(req *restful.Request) []metav1.APIGroup { s.apiGroupsForDiscoveryLock.RLock() defer s.apiGroupsForDiscoveryLock.RUnlock() // sort to have a deterministic order - sortedGroups := []unversioned.APIGroup{} + sortedGroups := []metav1.APIGroup{} groupNames := make([]string, 0, len(s.apiGroupsForDiscovery)) for groupName := range s.apiGroupsForDiscovery { groupNames = append(groupNames, groupName) @@ -369,7 +369,7 @@ func (s *GenericAPIServer) DynamicApisDiscovery() *restful.WebService { clientIP := utilnet.GetClientIP(req.Request) serverCIDR := s.discoveryAddresses.ServerAddressByClientCIDRs(clientIP) - groups := make([]unversioned.APIGroup, len(sortedGroups)) + groups := make([]metav1.APIGroup, len(sortedGroups)) for i := range sortedGroups { groups[i] = sortedGroups[i] groups[i].ServerAddressByClientCIDRs = serverCIDR diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go index c1920b0a466..924d52cbb67 100644 --- a/pkg/genericapiserver/genericapiserver_test.go +++ b/pkg/genericapiserver/genericapiserver_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/auth/authorizer" @@ -309,7 +309,7 @@ func decodeResponse(resp *http.Response, obj interface{}) error { return nil } -func getGroupList(server *httptest.Server) (*unversioned.APIGroupList, error) { +func getGroupList(server *httptest.Server) (*metav1.APIGroupList, error) { resp, err := http.Get(server.URL + "/apis") if err != nil { return nil, err @@ -319,7 +319,7 @@ func getGroupList(server *httptest.Server) (*unversioned.APIGroupList, error) { return nil, fmt.Errorf("unexpected server response, expected %d, actual: %d", http.StatusOK, resp.StatusCode) } - groupList := unversioned.APIGroupList{} + groupList := metav1.APIGroupList{} err = decodeResponse(resp, &groupList) return &groupList, err } @@ -336,17 +336,17 @@ func TestDiscoveryAtAPIS(t *testing.T) { assert.Equal(0, len(groupList.Groups)) // Add a Group. - extensionsVersions := []unversioned.GroupVersionForDiscovery{ + extensionsVersions := []metav1.GroupVersionForDiscovery{ { GroupVersion: testapi.Extensions.GroupVersion().String(), Version: testapi.Extensions.GroupVersion().Version, }, } - extensionsPreferredVersion := unversioned.GroupVersionForDiscovery{ + extensionsPreferredVersion := metav1.GroupVersionForDiscovery{ GroupVersion: extensions.GroupName + "/preferred", Version: "preferred", } - master.AddAPIGroupForDiscovery(unversioned.APIGroup{ + master.AddAPIGroupForDiscovery(metav1.APIGroup{ Name: extensions.GroupName, Versions: extensionsVersions, PreferredVersion: extensionsPreferredVersion, @@ -375,13 +375,13 @@ func TestDiscoveryAtAPIS(t *testing.T) { } func TestGetServerAddressByClientCIDRs(t *testing.T) { - publicAddressCIDRMap := []unversioned.ServerAddressByClientCIDR{ + publicAddressCIDRMap := []metav1.ServerAddressByClientCIDR{ { ClientCIDR: "0.0.0.0/0", ServerAddress: "ExternalAddress", }, } - internalAddressCIDRMap := []unversioned.ServerAddressByClientCIDR{ + internalAddressCIDRMap := []metav1.ServerAddressByClientCIDR{ publicAddressCIDRMap[0], { ClientCIDR: "10.0.0.0/24", @@ -392,7 +392,7 @@ func TestGetServerAddressByClientCIDRs(t *testing.T) { publicIP := "1.1.1.1" testCases := []struct { Request http.Request - ExpectedMap []unversioned.ServerAddressByClientCIDR + ExpectedMap []metav1.ServerAddressByClientCIDR }{ { Request: http.Request{}, diff --git a/pkg/genericapiserver/routes/BUILD b/pkg/genericapiserver/routes/BUILD index 4d753c19df2..8bf36162ac9 100644 --- a/pkg/genericapiserver/routes/BUILD +++ b/pkg/genericapiserver/routes/BUILD @@ -24,7 +24,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apiserver:go_default_library", "//pkg/apiserver/metrics:go_default_library", "//pkg/genericapiserver/mux:go_default_library", diff --git a/pkg/genericapiserver/routes/index.go b/pkg/genericapiserver/routes/index.go index f4ef7e58d10..79de4683c25 100644 --- a/pkg/genericapiserver/routes/index.go +++ b/pkg/genericapiserver/routes/index.go @@ -20,7 +20,7 @@ import ( "net/http" "sort" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/genericapiserver/mux" ) @@ -45,6 +45,6 @@ func (i Index) Install(c *mux.APIContainer) { // Extract the paths handled using mux handler. handledPaths = append(handledPaths, c.NonSwaggerRoutes.HandledPaths()...) sort.Strings(handledPaths) - apiserver.WriteRawJSON(status, unversioned.RootPaths{Paths: handledPaths}, w) + apiserver.WriteRawJSON(status, metav1.RootPaths{Paths: handledPaths}, w) }) } diff --git a/pkg/genericapiserver/routes/swagger.go b/pkg/genericapiserver/routes/swagger.go index 96568442ce8..194c5130bf4 100644 --- a/pkg/genericapiserver/routes/swagger.go +++ b/pkg/genericapiserver/routes/swagger.go @@ -40,7 +40,7 @@ func (s Swagger) Install(c *mux.APIContainer) { SwaggerFilePath: "/swagger-ui/", SchemaFormatHandler: func(typeName string) string { switch typeName { - case "unversioned.Time", "*unversioned.Time": + case "metav1.Time", "*metav1.Time": return "date-time" } return "" diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 7a7dc4f3f6e..4b85aefc711 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -61,7 +61,6 @@ go_library( "//pkg/api/events:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/util:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/apps:go_default_library", @@ -72,6 +71,7 @@ go_library( "//pkg/apis/certificates:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/storage:go_default_library", @@ -157,12 +157,12 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 132861b01ee..1bcc87ec783 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -67,13 +67,13 @@ go_library( "//pkg/api/annotations:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/batch/v1:go_default_library", "//pkg/apis/certificates:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", @@ -176,11 +176,11 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", diff --git a/pkg/kubectl/cmd/apiversions.go b/pkg/kubectl/cmd/apiversions.go index 9b86555e906..083e744ba08 100644 --- a/pkg/kubectl/cmd/apiversions.go +++ b/pkg/kubectl/cmd/apiversions.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) @@ -56,7 +56,7 @@ func RunApiVersions(f cmdutil.Factory, w io.Writer) error { if err != nil { return fmt.Errorf("Couldn't get available api versions from server: %v\n", err) } - apiVersions := unversioned.ExtractGroupVersions(groupList) + apiVersions := metav1.ExtractGroupVersions(groupList) sort.Strings(apiVersions) for _, v := range apiVersions { fmt.Fprintln(w, v) diff --git a/pkg/kubectl/cmd/certificates.go b/pkg/kubectl/cmd/certificates.go index 315bf952673..f87080863c8 100644 --- a/pkg/kubectl/cmd/certificates.go +++ b/pkg/kubectl/cmd/certificates.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" @@ -107,7 +107,7 @@ func (options *CertificateOptions) RunCertificateApprove(f cmdutil.Factory, out Type: certificates.CertificateApproved, Reason: "KubectlApprove", Message: "This CSR was approved by kubectl certificate approve.", - LastUpdateTime: unversioned.Now(), + LastUpdateTime: metav1.Now(), }) return csr, "approved" }) @@ -152,7 +152,7 @@ func (options *CertificateOptions) RunCertificateDeny(f cmdutil.Factory, out io. Type: certificates.CertificateDenied, Reason: "KubectlDeny", Message: "This CSR was approved by kubectl certificate deny.", - LastUpdateTime: unversioned.Now(), + LastUpdateTime: metav1.Now(), }) return csr, "denied" }) diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index 561b2eae7ea..7e63fe0b32a 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" @@ -161,7 +161,7 @@ func Example_printReplicationControllerWithNamespace() { Name: "foo", Namespace: "beep", Labels: map[string]string{"foo": "bar"}, - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: api.ReplicationControllerSpec{ Replicas: 1, @@ -210,7 +210,7 @@ func Example_printMultiContainersReplicationControllerWithWide() { ObjectMeta: api.ObjectMeta{ Name: "foo", Labels: map[string]string{"foo": "bar"}, - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: api.ReplicationControllerSpec{ Replicas: 1, @@ -261,7 +261,7 @@ func Example_printReplicationController() { ObjectMeta: api.ObjectMeta{ Name: "foo", Labels: map[string]string{"foo": "bar"}, - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: api.ReplicationControllerSpec{ Replicas: 1, @@ -313,7 +313,7 @@ func Example_printPodWithWideFormat() { pod := &api.Pod{ ObjectMeta: api.ObjectMeta{ Name: "test1", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: api.PodSpec{ Containers: make([]api.Container, 2), @@ -353,7 +353,7 @@ func Example_printPodWithShowLabels() { pod := &api.Pod{ ObjectMeta: api.ObjectMeta{ Name: "test1", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, Labels: map[string]string{ "l1": "key", "l2": "value", @@ -388,7 +388,7 @@ func newAllPhasePodList() *api.PodList { { ObjectMeta: api.ObjectMeta{ Name: "test1", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: api.PodSpec{ Containers: make([]api.Container, 2), @@ -405,7 +405,7 @@ func newAllPhasePodList() *api.PodList { { ObjectMeta: api.ObjectMeta{ Name: "test2", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: api.PodSpec{ Containers: make([]api.Container, 2), @@ -422,7 +422,7 @@ func newAllPhasePodList() *api.PodList { { ObjectMeta: api.ObjectMeta{ Name: "test3", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: api.PodSpec{ Containers: make([]api.Container, 2), @@ -439,7 +439,7 @@ func newAllPhasePodList() *api.PodList { { ObjectMeta: api.ObjectMeta{ Name: "test4", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: api.PodSpec{ Containers: make([]api.Container, 2), @@ -456,7 +456,7 @@ func newAllPhasePodList() *api.PodList { { ObjectMeta: api.ObjectMeta{ Name: "test5", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: api.PodSpec{ Containers: make([]api.Container, 2), @@ -548,7 +548,7 @@ func Example_printServiceWithNamespacesAndLabels() { ObjectMeta: api.ObjectMeta{ Name: "svc1", Namespace: "ns1", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, Labels: map[string]string{ "l1": "value", }, @@ -569,7 +569,7 @@ func Example_printServiceWithNamespacesAndLabels() { ObjectMeta: api.ObjectMeta{ Name: "svc2", Namespace: "ns2", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, Labels: map[string]string{ "l1": "dolla-bill-yall", }, diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete_test.go index 29663565e54..d6174c70a91 100644 --- a/pkg/kubectl/cmd/delete_test.go +++ b/pkg/kubectl/cmd/delete_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" @@ -176,7 +176,7 @@ func TestDeleteObjectGraceZero(t *testing.T) { case 1, 2, 3: return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, &pods.Items[0])}, nil default: - return &http.Response{StatusCode: 404, Header: defaultHeader(), Body: objBody(codec, &unversioned.Status{})}, nil + return &http.Response{StatusCode: 404, Header: defaultHeader(), Body: objBody(codec, &metav1.Status{})}, nil } case p == "/api/v1/namespaces/test" && m == "GET": return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, &api.Namespace{})}, nil @@ -498,12 +498,12 @@ func TestDeleteMultipleSelector(t *testing.T) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { switch p, m := req.URL.Path, req.Method; { case p == "/namespaces/test/pods" && m == "GET": - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, pods)}, nil case p == "/namespaces/test/services" && m == "GET": - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, svc)}, nil diff --git a/pkg/kubectl/cmd/drain.go b/pkg/kubectl/cmd/drain.go index 5bf9422c7e5..7e16ea62b27 100644 --- a/pkg/kubectl/cmd/drain.go +++ b/pkg/kubectl/cmd/drain.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" @@ -433,7 +433,7 @@ func (o *DrainOptions) evictPod(pod api.Pod, policyGroupVersion string) error { deleteOptions.GracePeriodSeconds = &gracePeriodSeconds } eviction := &policy.Eviction{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: policyGroupVersion, Kind: EvictionKind, }, diff --git a/pkg/kubectl/cmd/drain_test.go b/pkg/kubectl/cmd/drain_test.go index edd4da5e397..c8a023ebd69 100644 --- a/pkg/kubectl/cmd/drain_test.go +++ b/pkg/kubectl/cmd/drain_test.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/policy" @@ -63,7 +63,7 @@ func TestMain(m *testing.M) { node = &api.Node{ ObjectMeta: api.ObjectMeta{ Name: "node", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, }, Spec: api.NodeSpec{ ExternalID: "node", @@ -225,7 +225,7 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "rc", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, Labels: labels, SelfLink: testapi.Default.SelfLink("replicationcontrollers", "rc"), }, @@ -241,7 +241,7 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "bar", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, Labels: labels, Annotations: rc_anno, }, @@ -254,11 +254,11 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "ds", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, SelfLink: "/apis/extensions/v1beta1/namespaces/default/daemonsets/ds", }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: labels}, + Selector: &metav1.LabelSelector{MatchLabels: labels}, }, } @@ -269,7 +269,7 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "bar", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, Labels: labels, Annotations: ds_anno, }, @@ -282,11 +282,11 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "job", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, SelfLink: "/apis/extensions/v1beta1/namespaces/default/jobs/job", }, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: labels}, + Selector: &metav1.LabelSelector{MatchLabels: labels}, }, } @@ -294,7 +294,7 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "bar", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, Labels: labels, Annotations: map[string]string{api.CreatedByAnnotation: refJson(t, &job)}, }, @@ -304,12 +304,12 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "rs", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, Labels: labels, SelfLink: testapi.Default.SelfLink("replicasets", "rs"), }, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: labels}, + Selector: &metav1.LabelSelector{MatchLabels: labels}, }, } @@ -320,7 +320,7 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "bar", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, Labels: labels, Annotations: rs_anno, }, @@ -333,7 +333,7 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "bar", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, Labels: labels, }, Spec: api.PodSpec{ @@ -345,7 +345,7 @@ func TestDrain(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "bar", Namespace: "default", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, Labels: labels, }, Spec: api.PodSpec{ @@ -490,16 +490,16 @@ func TestDrain(t *testing.T) { m := &MyReq{req} switch { case req.Method == "GET" && req.URL.Path == "/api": - apiVersions := unversioned.APIVersions{ + apiVersions := metav1.APIVersions{ Versions: []string{"v1"}, } return genResponseWithJsonEncodedBody(apiVersions) case req.Method == "GET" && req.URL.Path == "/apis": - groupList := unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + groupList := metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "policy", - PreferredVersion: unversioned.GroupVersionForDiscovery{ + PreferredVersion: metav1.GroupVersionForDiscovery{ GroupVersion: "policy/v1beta1", }, }, @@ -507,11 +507,11 @@ func TestDrain(t *testing.T) { } return genResponseWithJsonEncodedBody(groupList) case req.Method == "GET" && req.URL.Path == "/api/v1": - resourceList := unversioned.APIResourceList{ + resourceList := metav1.APIResourceList{ GroupVersion: "v1", } if testEviction { - resourceList.APIResources = []unversioned.APIResource{ + resourceList.APIResources = []metav1.APIResource{ { Name: EvictionSubresource, Kind: EvictionKind, diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index 4216046860b..6a9fd75ae2c 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" @@ -45,7 +45,7 @@ import ( func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList) { pods := &api.PodList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "15", }, Items: []api.Pod{ @@ -60,7 +60,7 @@ func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList) }, } svc := &api.ServiceList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "16", }, Items: []api.Service{ @@ -74,7 +74,7 @@ func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList) }, } rc := &api.ReplicationControllerList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "17", }, Items: []api.ReplicationController{ @@ -209,7 +209,7 @@ func TestGetObjects(t *testing.T) { func TestGetSortedObjects(t *testing.T) { pods := &api.PodList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "15", }, Items: []api.Pod{ @@ -505,7 +505,7 @@ func TestGetMultipleTypeObjectsWithSelector(t *testing.T) { tf.Client = &fake.RESTClient{ NegotiatedSerializer: unstructuredSerializer, Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } switch req.URL.Path { @@ -684,14 +684,14 @@ func TestWatchSelector(t *testing.T) { tf.Printer = &testPrinter{} podList := &api.PodList{ Items: pods, - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "10", }, } tf.Client = &fake.RESTClient{ NegotiatedSerializer: unstructuredSerializer, Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } switch req.URL.Path { @@ -843,7 +843,7 @@ func TestWatchOnlyList(t *testing.T) { tf.Printer = &testPrinter{} podList := &api.PodList{ Items: pods, - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "10", }, } diff --git a/pkg/kubectl/cmd/logs.go b/pkg/kubectl/cmd/logs.go index bcb8fe4ea90..64660ef3c4b 100644 --- a/pkg/kubectl/cmd/logs.go +++ b/pkg/kubectl/cmd/logs.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" @@ -140,7 +140,7 @@ func (o *LogsOptions) Complete(f cmdutil.Factory, out io.Writer, cmd *cobra.Comm Timestamps: cmdutil.GetFlagBool(cmd, "timestamps"), } if sinceTime := cmdutil.GetFlagString(cmd, "since-time"); len(sinceTime) > 0 { - t, err := api.ParseRFC3339(sinceTime, unversioned.Now) + t, err := api.ParseRFC3339(sinceTime, metav1.Now) if err != nil { return err } diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index bb0da510c04..d66d36e473a 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" @@ -367,7 +367,7 @@ func Run(f cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *cobr } // TODO turn this into reusable method checking available resources -func contains(resourcesList map[string]*unversioned.APIResourceList, resource schema.GroupVersionResource) bool { +func contains(resourcesList map[string]*metav1.APIResourceList, resource schema.GroupVersionResource) bool { if resourcesList == nil { return false } diff --git a/pkg/kubectl/cmd/taint_test.go b/pkg/kubectl/cmd/taint_test.go index 32d693851fb..c56a405d485 100644 --- a/pkg/kubectl/cmd/taint_test.go +++ b/pkg/kubectl/cmd/taint_test.go @@ -26,7 +26,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/conversion" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" @@ -42,7 +42,7 @@ func generateNodeAndTaintedNode(oldTaints []api.Taint, newTaints []api.Taint) (* node := &api.Node{ ObjectMeta: api.ObjectMeta{ Name: "node-name", - CreationTimestamp: unversioned.Time{Time: time.Now()}, + CreationTimestamp: metav1.Time{Time: time.Now()}, Annotations: map[string]string{ api.TaintsAnnotationKey: string(oldTaintsData), }, diff --git a/pkg/kubectl/cmd/testing/BUILD b/pkg/kubectl/cmd/testing/BUILD index 999c3adaa3f..353d50ba502 100644 --- a/pkg/kubectl/cmd/testing/BUILD +++ b/pkg/kubectl/cmd/testing/BUILD @@ -18,9 +18,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", diff --git a/pkg/kubectl/cmd/testing/fake.go b/pkg/kubectl/cmd/testing/fake.go index 67ed237c4ad..c82c42b9f0e 100644 --- a/pkg/kubectl/cmd/testing/fake.go +++ b/pkg/kubectl/cmd/testing/fake.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" @@ -567,13 +567,13 @@ func NewAPIFactory() (cmdutil.Factory, *TestFactory, runtime.Codec, runtime.Nego func testDynamicResources() []*discovery.APIGroupResources { return []*discovery.APIGroupResources{ { - Group: unversioned.APIGroup{ - Versions: []unversioned.GroupVersionForDiscovery{ + Group: metav1.APIGroup{ + Versions: []metav1.GroupVersionForDiscovery{ {Version: "v1"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{Version: "v1"}, + PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1"}, }, - VersionedResources: map[string][]unversioned.APIResource{ + VersionedResources: map[string][]metav1.APIResource{ "v1": { {Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "services", Namespaced: true, Kind: "Service"}, diff --git a/pkg/kubectl/cmd/top_test.go b/pkg/kubectl/cmd/top_test.go index 9b97dae09f2..117c59804cf 100644 --- a/pkg/kubectl/cmd/top_test.go +++ b/pkg/kubectl/cmd/top_test.go @@ -28,7 +28,7 @@ import ( metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1 "k8s.io/kubernetes/pkg/api/v1" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" ) @@ -61,13 +61,13 @@ func marshallBody(metrics interface{}) (io.ReadCloser, error) { func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { metrics := &metricsapi.NodeMetricsList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "1", }, Items: []metricsapi.NodeMetrics{ { ObjectMeta: v1.ObjectMeta{Name: "node1", ResourceVersion: "10"}, - Window: unversioned.Duration{Duration: time.Minute}, + Window: metav1.Duration{Duration: time.Minute}, Usage: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), @@ -76,7 +76,7 @@ func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { }, { ObjectMeta: v1.ObjectMeta{Name: "node2", ResourceVersion: "11"}, - Window: unversioned.Duration{Duration: time.Minute}, + Window: metav1.Duration{Duration: time.Minute}, Usage: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI), v1.ResourceMemory: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), @@ -86,7 +86,7 @@ func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { }, } nodes := &api.NodeList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "15", }, Items: []api.Node{ @@ -117,13 +117,13 @@ func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { func testPodMetricsData() *metricsapi.PodMetricsList { return &metricsapi.PodMetricsList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "2", }, Items: []metricsapi.PodMetrics{ { ObjectMeta: v1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"}, - Window: unversioned.Duration{Duration: time.Minute}, + Window: metav1.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container1-1", @@ -145,7 +145,7 @@ func testPodMetricsData() *metricsapi.PodMetricsList { }, { ObjectMeta: v1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"}, - Window: unversioned.Duration{Duration: time.Minute}, + Window: metav1.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container2-1", @@ -175,7 +175,7 @@ func testPodMetricsData() *metricsapi.PodMetricsList { }, { ObjectMeta: v1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"}, - Window: unversioned.Duration{Duration: time.Minute}, + Window: metav1.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container3-1", diff --git a/pkg/kubectl/cmd/top_test.go.orig b/pkg/kubectl/cmd/top_test.go.orig new file mode 100644 index 00000000000..117c59804cf --- /dev/null +++ b/pkg/kubectl/cmd/top_test.go.orig @@ -0,0 +1,192 @@ +/* +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 cmd + +import ( + "bytes" + "encoding/json" + "io" + "io/ioutil" + "time" + + "testing" + + metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/api/resource" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + v1 "k8s.io/kubernetes/pkg/api/v1" + cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" +) + +const ( + baseHeapsterServiceAddress = "/api/v1/proxy/namespaces/kube-system/services/http:heapster:" + baseMetricsAddress = baseHeapsterServiceAddress + "/apis/metrics" + metricsApiVersion = "v1alpha1" +) + +func TestTopSubcommandsExist(t *testing.T) { + initTestErrorHandler(t) + + f, _, _, _ := cmdtesting.NewAPIFactory() + buf := bytes.NewBuffer([]byte{}) + + cmd := NewCmdTop(f, buf, buf) + if !cmd.HasSubCommands() { + t.Error("top command should have subcommands") + } +} + +func marshallBody(metrics interface{}) (io.ReadCloser, error) { + result, err := json.Marshal(metrics) + if err != nil { + return nil, err + } + return ioutil.NopCloser(bytes.NewReader(result)), nil +} + +func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { + metrics := &metricsapi.NodeMetricsList{ + ListMeta: metav1.ListMeta{ + ResourceVersion: "1", + }, + Items: []metricsapi.NodeMetrics{ + { + ObjectMeta: v1.ObjectMeta{Name: "node1", ResourceVersion: "10"}, + Window: metav1.Duration{Duration: time.Minute}, + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), + v1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI), + }, + }, + { + ObjectMeta: v1.ObjectMeta{Name: "node2", ResourceVersion: "11"}, + Window: metav1.Duration{Duration: time.Minute}, + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), + v1.ResourceStorage: *resource.NewQuantity(7*(1024*1024), resource.DecimalSI), + }, + }, + }, + } + nodes := &api.NodeList{ + ListMeta: metav1.ListMeta{ + ResourceVersion: "15", + }, + Items: []api.Node{ + { + ObjectMeta: api.ObjectMeta{Name: "node1", ResourceVersion: "10"}, + Status: api.NodeStatus{ + Allocatable: api.ResourceList{ + api.ResourceCPU: *resource.NewMilliQuantity(10, resource.DecimalSI), + api.ResourceMemory: *resource.NewQuantity(20*(1024*1024), resource.DecimalSI), + api.ResourceStorage: *resource.NewQuantity(30*(1024*1024), resource.DecimalSI), + }, + }, + }, + { + ObjectMeta: api.ObjectMeta{Name: "node2", ResourceVersion: "11"}, + Status: api.NodeStatus{ + Allocatable: api.ResourceList{ + api.ResourceCPU: *resource.NewMilliQuantity(50, resource.DecimalSI), + api.ResourceMemory: *resource.NewQuantity(60*(1024*1024), resource.DecimalSI), + api.ResourceStorage: *resource.NewQuantity(70*(1024*1024), resource.DecimalSI), + }, + }, + }, + }, + } + return metrics, nodes +} + +func testPodMetricsData() *metricsapi.PodMetricsList { + return &metricsapi.PodMetricsList{ + ListMeta: metav1.ListMeta{ + ResourceVersion: "2", + }, + Items: []metricsapi.PodMetrics{ + { + ObjectMeta: v1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"}, + Window: metav1.Duration{Duration: time.Minute}, + Containers: []metricsapi.ContainerMetrics{ + { + Name: "container1-1", + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), + v1.ResourceStorage: *resource.NewQuantity(3*(1024*1024), resource.DecimalSI), + }, + }, + { + Name: "container1-2", + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity(4, resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity(5*(1024*1024), resource.DecimalSI), + v1.ResourceStorage: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), + }, + }, + }, + }, + { + ObjectMeta: v1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"}, + Window: metav1.Duration{Duration: time.Minute}, + Containers: []metricsapi.ContainerMetrics{ + { + Name: "container2-1", + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI), + v1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI), + }, + }, + { + Name: "container2-2", + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity(10, resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity(11*(1024*1024), resource.DecimalSI), + v1.ResourceStorage: *resource.NewQuantity(12*(1024*1024), resource.DecimalSI), + }, + }, + { + Name: "container2-3", + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity(13, resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity(14*(1024*1024), resource.DecimalSI), + v1.ResourceStorage: *resource.NewQuantity(15*(1024*1024), resource.DecimalSI), + }, + }, + }, + }, + { + ObjectMeta: v1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"}, + Window: metav1.Duration{Duration: time.Minute}, + Containers: []metricsapi.ContainerMetrics{ + { + Name: "container3-1", + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity(7, resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity(8*(1024*1024), resource.DecimalSI), + v1.ResourceStorage: *resource.NewQuantity(9*(1024*1024), resource.DecimalSI), + }, + }, + }, + }, + }, + } +} diff --git a/pkg/kubectl/cmd/top_test.go.rej b/pkg/kubectl/cmd/top_test.go.rej new file mode 100644 index 00000000000..817df3d7cef --- /dev/null +++ b/pkg/kubectl/cmd/top_test.go.rej @@ -0,0 +1,52 @@ +--- pkg/kubectl/cmd/top_test.go ++++ pkg/kubectl/cmd/top_test.go +@@ -62,13 +63,13 @@ func marshallBody(metrics interface{}) (io.ReadCloser, error) { + + func testNodeMetricsData() (*metrics_api.NodeMetricsList, *api.NodeList) { + metrics := &metrics_api.NodeMetricsList{ +- ListMeta: metav1.ListMeta{ ++ ListMeta: unversioned.ListMeta{ + ResourceVersion: "1", + }, + Items: []metrics_api.NodeMetrics{ + { + ObjectMeta: v1.ObjectMeta{Name: "node1", ResourceVersion: "10"}, +- Window: metav1.Duration{Duration: time.Minute}, ++ Window: unversioned.Duration{Duration: time.Minute}, + Usage: v1.ResourceList{ + v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), + v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), +@@ -118,13 +119,13 @@ func testNodeMetricsData() (*metrics_api.NodeMetricsList, *api.NodeList) { + + func testPodMetricsData() *metrics_api.PodMetricsList { + return &metrics_api.PodMetricsList{ +- ListMeta: metav1.ListMeta{ ++ ListMeta: unversioned.ListMeta{ + ResourceVersion: "2", + }, + Items: []metrics_api.PodMetrics{ + { + ObjectMeta: v1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"}, +- Window: metav1.Duration{Duration: time.Minute}, ++ Window: unversioned.Duration{Duration: time.Minute}, + Containers: []metrics_api.ContainerMetrics{ + { + Name: "container1-1", +@@ -146,7 +147,7 @@ func testPodMetricsData() *metrics_api.PodMetricsList { + }, + { + ObjectMeta: v1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"}, +- Window: metav1.Duration{Duration: time.Minute}, ++ Window: unversioned.Duration{Duration: time.Minute}, + Containers: []metrics_api.ContainerMetrics{ + { + Name: "container2-1", +@@ -176,7 +177,7 @@ func testPodMetricsData() *metrics_api.PodMetricsList { + }, + { + ObjectMeta: v1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"}, +- Window: metav1.Duration{Duration: time.Minute}, ++ Window: unversioned.Duration{Duration: time.Minute}, + Containers: []metrics_api.ContainerMetrics{ + { + Name: "container3-1", diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 3b76eb51215..b9367059c2b 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -28,13 +28,13 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/service:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/apps:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", "//pkg/client/restclient:go_default_library", @@ -85,11 +85,11 @@ go_test( "//pkg/api/meta:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/restclient/fake:go_default_library", diff --git a/pkg/kubectl/cmd/util/cached_discovery.go b/pkg/kubectl/cmd/util/cached_discovery.go index 41c8ff21e22..b623fd0670a 100644 --- a/pkg/kubectl/cmd/util/cached_discovery.go +++ b/pkg/kubectl/cmd/util/cached_discovery.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/discovery" "k8s.io/kubernetes/pkg/runtime" @@ -61,12 +61,12 @@ type CachedDiscoveryClient struct { var _ discovery.CachedDiscoveryInterface = &CachedDiscoveryClient{} // ServerResourcesForGroupVersion returns the supported resources for a group and version. -func (d *CachedDiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { +func (d *CachedDiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { filename := filepath.Join(d.cacheDirectory, groupVersion, "serverresources.json") cachedBytes, err := d.getCachedFile(filename) // don't fail on errors, we either don't have a file or won't be able to run the cached check. Either way we can fallback. if err == nil { - cachedResources := &unversioned.APIResourceList{} + cachedResources := &metav1.APIResourceList{} if err := runtime.DecodeInto(api.Codecs.UniversalDecoder(), cachedBytes, cachedResources); err == nil { glog.V(6).Infof("returning cached discovery info from %v", filename) return cachedResources, nil @@ -86,13 +86,13 @@ func (d *CachedDiscoveryClient) ServerResourcesForGroupVersion(groupVersion stri } // ServerResources returns the supported resources for all groups and versions. -func (d *CachedDiscoveryClient) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (d *CachedDiscoveryClient) ServerResources() (map[string]*metav1.APIResourceList, error) { apiGroups, err := d.ServerGroups() if err != nil { return nil, err } - groupVersions := unversioned.ExtractGroupVersions(apiGroups) - result := map[string]*unversioned.APIResourceList{} + groupVersions := metav1.ExtractGroupVersions(apiGroups) + result := map[string]*metav1.APIResourceList{} for _, groupVersion := range groupVersions { resources, err := d.ServerResourcesForGroupVersion(groupVersion) if err != nil { @@ -103,12 +103,12 @@ func (d *CachedDiscoveryClient) ServerResources() (map[string]*unversioned.APIRe return result, nil } -func (d *CachedDiscoveryClient) ServerGroups() (*unversioned.APIGroupList, error) { +func (d *CachedDiscoveryClient) ServerGroups() (*metav1.APIGroupList, error) { filename := filepath.Join(d.cacheDirectory, "servergroups.json") cachedBytes, err := d.getCachedFile(filename) // don't fail on errors, we either don't have a file or won't be able to run the cached check. Either way we can fallback. if err == nil { - cachedGroups := &unversioned.APIGroupList{} + cachedGroups := &metav1.APIGroupList{} if err := runtime.DecodeInto(api.Codecs.UniversalDecoder(), cachedBytes, cachedGroups); err == nil { glog.V(6).Infof("returning cached discovery info from %v", filename) return cachedGroups, nil diff --git a/pkg/kubectl/cmd/util/cached_discovery_test.go b/pkg/kubectl/cmd/util/cached_discovery_test.go index aaa3e5e2ef4..9d7448679eb 100644 --- a/pkg/kubectl/cmd/util/cached_discovery_test.go +++ b/pkg/kubectl/cmd/util/cached_discovery_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/discovery" @@ -109,19 +109,19 @@ func (c *fakeDiscoveryClient) RESTClient() restclient.Interface { return &fake.RESTClient{} } -func (c *fakeDiscoveryClient) ServerGroups() (*unversioned.APIGroupList, error) { +func (c *fakeDiscoveryClient) ServerGroups() (*metav1.APIGroupList, error) { c.groupCalls = c.groupCalls + 1 - return &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + return &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "a", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ { GroupVersion: "a/v1", Version: "v1", }, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{ + PreferredVersion: metav1.GroupVersionForDiscovery{ GroupVersion: "a/v1", Version: "v1", }, @@ -130,18 +130,18 @@ func (c *fakeDiscoveryClient) ServerGroups() (*unversioned.APIGroupList, error) }, nil } -func (c *fakeDiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { +func (c *fakeDiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { c.resourceCalls = c.resourceCalls + 1 if groupVersion == "a/v1" { - return &unversioned.APIResourceList{}, nil + return &metav1.APIResourceList{}, nil } return nil, errors.NewNotFound(schema.GroupResource{}, "") } -func (c *fakeDiscoveryClient) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (c *fakeDiscoveryClient) ServerResources() (map[string]*metav1.APIResourceList, error) { c.resourceCalls = c.resourceCalls + 1 - return map[string]*unversioned.APIResourceList{}, nil + return map[string]*metav1.APIResourceList{}, nil } func (c *fakeDiscoveryClient) ServerPreferredResources() ([]schema.GroupVersionResource, error) { diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index d274aa5f072..cdb927c4d1c 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/service" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" @@ -617,7 +617,7 @@ func (f *factory) LogsForObject(object, options runtime.Object) (*restclient.Req if !ok { return nil, errors.New("provided options object is not a PodLogOptions") } - selector, err := unversioned.LabelSelectorAsSelector(t.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(t.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid label selector: %v", err) } @@ -806,7 +806,7 @@ func (f *factory) AttachablePodForObject(object runtime.Object) (*api.Pod, error pod, _, err := GetFirstPod(clientset.Core(), t.Namespace, selector, 1*time.Minute, sortBy) return pod, err case *extensions.Deployment: - selector, err := unversioned.LabelSelectorAsSelector(t.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(t.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid label selector: %v", err) } @@ -814,7 +814,7 @@ func (f *factory) AttachablePodForObject(object runtime.Object) (*api.Pod, error pod, _, err := GetFirstPod(clientset.Core(), t.Namespace, selector, 1*time.Minute, sortBy) return pod, err case *batch.Job: - selector, err := unversioned.LabelSelectorAsSelector(t.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(t.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid label selector: %v", err) } diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index 3ea1a49e901..a7ddfc7deb3 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" @@ -163,7 +163,7 @@ func TestLabelsForObject(t *testing.T) { name: "successful re-use of labels", object: &api.Service{ ObjectMeta: api.ObjectMeta{Name: "baz", Namespace: "test", Labels: map[string]string{"svc": "test"}}, - TypeMeta: unversioned.TypeMeta{Kind: "Service", APIVersion: "v1"}, + TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: "v1"}, }, expected: "svc=test", err: nil, @@ -172,7 +172,7 @@ func TestLabelsForObject(t *testing.T) { name: "empty labels", object: &api.Service{ ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "test", Labels: map[string]string{}}, - TypeMeta: unversioned.TypeMeta{Kind: "Service", APIVersion: "v1"}, + TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: "v1"}, }, expected: "", err: nil, @@ -181,7 +181,7 @@ func TestLabelsForObject(t *testing.T) { name: "nil labels", object: &api.Service{ ObjectMeta: api.ObjectMeta{Name: "zen", Namespace: "test", Labels: nil}, - TypeMeta: unversioned.TypeMeta{Kind: "Service", APIVersion: "v1"}, + TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: "v1"}, }, expected: "", err: nil, @@ -441,7 +441,7 @@ func newPodList(count, isUnready, isUnhealthy int, labels map[string]string) *ap ObjectMeta: api.ObjectMeta{ Name: fmt.Sprintf("pod-%d", i+1), Namespace: api.NamespaceDefault, - CreationTimestamp: unversioned.Date(2016, time.April, 1, 1, 0, i, 0, time.UTC), + CreationTimestamp: metav1.Date(2016, time.April, 1, 1, 0, i, 0, time.UTC), Labels: labels, }, Status: api.PodStatus{ @@ -487,7 +487,7 @@ func TestGetFirstPod(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "pod-1", Namespace: api.NamespaceDefault, - CreationTimestamp: unversioned.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC), Labels: map[string]string{"test": "selector"}, }, Status: api.PodStatus{ @@ -509,7 +509,7 @@ func TestGetFirstPod(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "pod-2", Namespace: api.NamespaceDefault, - CreationTimestamp: unversioned.Date(2016, time.April, 1, 1, 0, 1, 0, time.UTC), + CreationTimestamp: metav1.Date(2016, time.April, 1, 1, 0, 1, 0, time.UTC), Labels: map[string]string{"test": "selector"}, }, Status: api.PodStatus{ @@ -532,7 +532,7 @@ func TestGetFirstPod(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "pod-1", Namespace: api.NamespaceDefault, - CreationTimestamp: unversioned.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC), Labels: map[string]string{"test": "selector"}, }, Status: api.PodStatus{ @@ -556,7 +556,7 @@ func TestGetFirstPod(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "pod-1", Namespace: api.NamespaceDefault, - CreationTimestamp: unversioned.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC), Labels: map[string]string{"test": "selector"}, }, Status: api.PodStatus{ @@ -575,7 +575,7 @@ func TestGetFirstPod(t *testing.T) { ObjectMeta: api.ObjectMeta{ Name: "pod-1", Namespace: api.NamespaceDefault, - CreationTimestamp: unversioned.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC), + CreationTimestamp: metav1.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC), Labels: map[string]string{"test": "selector"}, }, Status: api.PodStatus{ diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go index 5d07e062e5f..c057f678f80 100644 --- a/pkg/kubectl/cmd/util/helpers.go +++ b/pkg/kubectl/cmd/util/helpers.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api" kerrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" @@ -178,7 +178,7 @@ func checkErr(prefix string, err error, handleErr func(string, int)) { } } -func statusCausesToAggrError(scs []unversioned.StatusCause) utilerrors.Aggregate { +func statusCausesToAggrError(scs []metav1.StatusCause) utilerrors.Aggregate { errs := make([]error, 0, len(scs)) errorMsgs := sets.NewString() for _, sc := range scs { @@ -207,7 +207,7 @@ func StandardErrorMessage(err error) (string, bool) { switch { case isStatus: switch s := status.Status(); { - case s.Reason == unversioned.StatusReasonUnauthorized: + case s.Reason == metav1.StatusReasonUnauthorized: return fmt.Sprintf("error: You must be logged in to the server (%s)", s.Message), true case len(s.Reason) > 0: return fmt.Sprintf("Error from server (%s): %s", s.Reason, err.Error()), true diff --git a/pkg/kubectl/cmd/util/helpers_test.go b/pkg/kubectl/cmd/util/helpers_test.go index 2fb9d97bdfd..8ca600b1179 100644 --- a/pkg/kubectl/cmd/util/helpers_test.go +++ b/pkg/kubectl/cmd/util/helpers_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" @@ -344,7 +344,7 @@ func TestMaybeConvert(t *testing.T) { }, gv: schema.GroupVersion{Group: "", Version: "v1"}, expected: &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: "v1", Kind: "Pod", }, diff --git a/pkg/kubectl/custom_column_printer_test.go b/pkg/kubectl/custom_column_printer_test.go index 9ba653dff4d..372906831a7 100644 --- a/pkg/kubectl/custom_column_printer_test.go +++ b/pkg/kubectl/custom_column_printer_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" ) @@ -271,7 +271,7 @@ bar FieldSpec: "{.apiVersion}", }, }, - obj: &v1.Pod{ObjectMeta: v1.ObjectMeta{Name: "foo"}, TypeMeta: unversioned.TypeMeta{APIVersion: "baz"}}, + obj: &v1.Pod{ObjectMeta: v1.ObjectMeta{Name: "foo"}, TypeMeta: metav1.TypeMeta{APIVersion: "baz"}}, expectedOutput: `NAME API_VERSION foo baz `, diff --git a/pkg/kubectl/deployment.go b/pkg/kubectl/deployment.go index 035366585cf..f5f709cd042 100644 --- a/pkg/kubectl/deployment.go +++ b/pkg/kubectl/deployment.go @@ -21,7 +21,7 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/runtime" ) @@ -75,7 +75,7 @@ func (s *DeploymentBasicGeneratorV1) StructuredGenerate() (runtime.Object, error // setup default label and selector labels := map[string]string{} labels["app"] = s.Name - selector := unversioned.LabelSelector{MatchLabels: labels} + selector := metav1.LabelSelector{MatchLabels: labels} deployment := extensions.Deployment{ ObjectMeta: api.ObjectMeta{ Name: s.Name, diff --git a/pkg/kubectl/deployment_test.go b/pkg/kubectl/deployment_test.go index f538028ee17..9a3875a0489 100644 --- a/pkg/kubectl/deployment_test.go +++ b/pkg/kubectl/deployment_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -43,7 +43,7 @@ func TestDeploymentGenerate(t *testing.T) { }, Spec: extensions.DeploymentSpec{ Replicas: 1, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"app": "foo"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "foo"}}, Template: api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: map[string]string{"app": "foo"}, @@ -68,7 +68,7 @@ func TestDeploymentGenerate(t *testing.T) { }, Spec: extensions.DeploymentSpec{ Replicas: 1, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"app": "foo"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": "foo"}}, Template: api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: map[string]string{"app": "foo"}, diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index e78ea49df9e..99e1fde3f24 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/events" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" @@ -1216,7 +1216,7 @@ func (d *ReplicaSetDescriber) Describe(namespace, name string, describerSettings return "", err } - selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector) if err != nil { return "", err } @@ -1237,7 +1237,7 @@ func describeReplicaSet(rs *extensions.ReplicaSet, events *api.EventList, runnin w.Write(LEVEL_0, "Name:\t%s\n", rs.Name) w.Write(LEVEL_0, "Namespace:\t%s\n", rs.Namespace) w.Write(LEVEL_0, "Image(s):\t%s\n", makeImageList(&rs.Spec.Template.Spec)) - w.Write(LEVEL_0, "Selector:\t%s\n", unversioned.FormatLabelSelector(rs.Spec.Selector)) + w.Write(LEVEL_0, "Selector:\t%s\n", metav1.FormatLabelSelector(rs.Spec.Selector)) printLabelsMultiline(w, "Labels", rs.Labels) w.Write(LEVEL_0, "Replicas:\t%d current / %d desired\n", rs.Status.Replicas, rs.Spec.Replicas) w.Write(LEVEL_0, "Pods Status:\t") @@ -1279,7 +1279,7 @@ func describeJob(job *batch.Job, events *api.EventList) (string, error) { w.Write(LEVEL_0, "Name:\t%s\n", job.Name) w.Write(LEVEL_0, "Namespace:\t%s\n", job.Namespace) w.Write(LEVEL_0, "Image(s):\t%s\n", makeImageList(&job.Spec.Template.Spec)) - selector, _ := unversioned.LabelSelectorAsSelector(job.Spec.Selector) + selector, _ := metav1.LabelSelectorAsSelector(job.Spec.Selector) w.Write(LEVEL_0, "Selector:\t%s\n", selector) w.Write(LEVEL_0, "Parallelism:\t%d\n", *job.Spec.Parallelism) if job.Spec.Completions != nil { @@ -1353,7 +1353,7 @@ func describeCronJob(scheduledJob *batch.CronJob, events *api.EventList) (string func describeJobTemplate(jobTemplate batch.JobTemplateSpec, w *PrefixWriter) { w.Write(LEVEL_0, "Image(s):\t%s\n", makeImageList(&jobTemplate.Spec.Template.Spec)) if jobTemplate.Spec.Selector != nil { - selector, _ := unversioned.LabelSelectorAsSelector(jobTemplate.Spec.Selector) + selector, _ := metav1.LabelSelectorAsSelector(jobTemplate.Spec.Selector) w.Write(LEVEL_0, "Selector:\t%s\n", selector) } else { w.Write(LEVEL_0, "Selector:\t\n") @@ -1404,7 +1404,7 @@ func (d *DaemonSetDescriber) Describe(namespace, name string, describerSettings return "", err } - selector, err := unversioned.LabelSelectorAsSelector(daemon.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(daemon.Spec.Selector) if err != nil { return "", err } @@ -1426,7 +1426,7 @@ func describeDaemonSet(daemon *extensions.DaemonSet, events *api.EventList, runn w := &PrefixWriter{out} w.Write(LEVEL_0, "Name:\t%s\n", daemon.Name) w.Write(LEVEL_0, "Image(s):\t%s\n", makeImageList(&daemon.Spec.Template.Spec)) - selector, err := unversioned.LabelSelectorAsSelector(daemon.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(daemon.Spec.Selector) if err != nil { // this shouldn't happen if LabelSelector passed validation return err @@ -1966,7 +1966,7 @@ func (p *StatefulSetDescriber) Describe(namespace, name string, describerSetting } pc := p.client.Core().Pods(namespace) - selector, err := unversioned.LabelSelectorAsSelector(ps.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(ps.Spec.Selector) if err != nil { return "", err } @@ -1981,7 +1981,7 @@ func (p *StatefulSetDescriber) Describe(namespace, name string, describerSetting w.Write(LEVEL_0, "Name:\t%s\n", ps.Name) w.Write(LEVEL_0, "Namespace:\t%s\n", ps.Namespace) w.Write(LEVEL_0, "Image(s):\t%s\n", makeImageList(&ps.Spec.Template.Spec)) - w.Write(LEVEL_0, "Selector:\t%s\n", unversioned.FormatLabelSelector(ps.Spec.Selector)) + w.Write(LEVEL_0, "Selector:\t%s\n", metav1.FormatLabelSelector(ps.Spec.Selector)) w.Write(LEVEL_0, "Labels:\t%s\n", labels.FormatLabels(ps.Labels)) w.Write(LEVEL_0, "Replicas:\t%d current / %d desired\n", ps.Status.Replicas, ps.Spec.Replicas) w.Write(LEVEL_0, "Annotations:\t%s\n", labels.FormatLabels(ps.Annotations)) @@ -2238,7 +2238,7 @@ func (dd *DeploymentDescriber) Describe(namespace, name string, describerSetting if err != nil { return "", err } - selector, err := unversioned.LabelSelectorAsSelector(d.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(d.Spec.Selector) if err != nil { return "", err } @@ -2302,7 +2302,7 @@ func getDaemonSetsForLabels(c extensionsclient.DaemonSetInterface, labelsToMatch // Find the ones that match labelsToMatch. var matchingDaemonSets []extensions.DaemonSet for _, ds := range dss.Items { - selector, err := unversioned.LabelSelectorAsSelector(ds.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(ds.Spec.Selector) if err != nil { // this should never happen if the DaemonSet passed validation return nil, err @@ -2508,7 +2508,7 @@ func (p *PodDisruptionBudgetDescriber) Describe(namespace, name string, describe w.Write(LEVEL_0, "Name:\t%s\n", pdb.Name) w.Write(LEVEL_0, "Min available:\t%s\n", pdb.Spec.MinAvailable.String()) if pdb.Spec.Selector != nil { - w.Write(LEVEL_0, "Selector:\t%s\n", unversioned.FormatLabelSelector(pdb.Spec.Selector)) + w.Write(LEVEL_0, "Selector:\t%s\n", metav1.FormatLabelSelector(pdb.Spec.Selector)) } else { w.Write(LEVEL_0, "Selector:\t\n") } diff --git a/pkg/kubectl/describe_test.go b/pkg/kubectl/describe_test.go index fdd1ab51c8f..70dc1fb01b2 100644 --- a/pkg/kubectl/describe_test.go +++ b/pkg/kubectl/describe_test.go @@ -29,7 +29,7 @@ import ( fedfake "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -135,8 +135,8 @@ func TestPodDescribeResultsSorted(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "one"}, Source: api.EventSource{Component: "kubelet"}, Message: "Item 1", - FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, @@ -144,8 +144,8 @@ func TestPodDescribeResultsSorted(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "two"}, Source: api.EventSource{Component: "scheduler"}, Message: "Item 2", - FirstTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, @@ -153,8 +153,8 @@ func TestPodDescribeResultsSorted(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "three"}, Source: api.EventSource{Component: "kubelet"}, Message: "Item 3", - FirstTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, @@ -212,7 +212,7 @@ func TestDescribeContainers(t *testing.T) { Name: "test", State: api.ContainerState{ Running: &api.ContainerStateRunning{ - StartedAt: unversioned.NewTime(time.Now()), + StartedAt: metav1.NewTime(time.Now()), }, }, Ready: true, @@ -242,8 +242,8 @@ func TestDescribeContainers(t *testing.T) { Name: "test", State: api.ContainerState{ Terminated: &api.ContainerStateTerminated{ - StartedAt: unversioned.NewTime(time.Now()), - FinishedAt: unversioned.NewTime(time.Now()), + StartedAt: metav1.NewTime(time.Now()), + FinishedAt: metav1.NewTime(time.Now()), Reason: "potato", ExitCode: 2, }, @@ -260,13 +260,13 @@ func TestDescribeContainers(t *testing.T) { Name: "test", State: api.ContainerState{ Running: &api.ContainerStateRunning{ - StartedAt: unversioned.NewTime(time.Now()), + StartedAt: metav1.NewTime(time.Now()), }, }, LastTerminationState: api.ContainerState{ Terminated: &api.ContainerStateTerminated{ - StartedAt: unversioned.NewTime(time.Now().Add(time.Second * 3)), - FinishedAt: unversioned.NewTime(time.Now()), + StartedAt: metav1.NewTime(time.Now().Add(time.Second * 3)), + FinishedAt: metav1.NewTime(time.Now()), Reason: "crashing", ExitCode: 3, }, @@ -629,7 +629,7 @@ func TestDescribeDeployment(t *testing.T) { Namespace: "foo", }, Spec: v1beta1.DeploymentSpec{ - Selector: &unversioned.LabelSelector{}, + Selector: &metav1.LabelSelector{}, Template: v1.PodTemplateSpec{}, }, }) @@ -707,7 +707,7 @@ func TestDescribePodDisruptionBudget(t *testing.T) { ObjectMeta: api.ObjectMeta{ Namespace: "ns1", Name: "pdb1", - CreationTimestamp: unversioned.Time{Time: time.Now().Add(1.9e9)}, + CreationTimestamp: metav1.Time{Time: time.Now().Add(1.9e9)}, }, Spec: policy.PodDisruptionBudgetSpec{ MinAvailable: intstr.FromInt(22), @@ -736,8 +736,8 @@ func TestDescribeEvents(t *testing.T) { }, Source: api.EventSource{Component: "kubelet"}, Message: "Item 1", - FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, @@ -761,7 +761,7 @@ func TestDescribeEvents(t *testing.T) { Namespace: "foo", }, Spec: v1beta1.DeploymentSpec{ - Selector: &unversioned.LabelSelector{}, + Selector: &metav1.LabelSelector{}, }, }), }, diff --git a/pkg/kubectl/pdb.go b/pkg/kubectl/pdb.go index ecc3b5b4846..8a30a7517f7 100644 --- a/pkg/kubectl/pdb.go +++ b/pkg/kubectl/pdb.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" @@ -71,7 +71,7 @@ func (s *PodDisruptionBudgetV1Generator) StructuredGenerate() (runtime.Object, e return nil, err } - selector, err := unversioned.ParseToLabelSelector(s.Selector) + selector, err := metav1.ParseToLabelSelector(s.Selector) if err != nil { return nil, err } diff --git a/pkg/kubectl/resource/BUILD b/pkg/kubectl/resource/BUILD index cb54ca65d86..806cdda5a69 100644 --- a/pkg/kubectl/resource/BUILD +++ b/pkg/kubectl/resource/BUILD @@ -27,10 +27,10 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/labels:go_default_library", "//pkg/runtime:go_default_library", @@ -64,9 +64,9 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient/fake:go_default_library", "//pkg/labels:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index 043140ca903..db84f5ff44c 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient/fake" @@ -95,7 +95,7 @@ func fakeClientWith(testName string, t *testing.T, data map[string]string) Clien func testData() (*api.PodList, *api.ServiceList) { pods := &api.PodList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "15", }, Items: []api.Pod{ @@ -110,7 +110,7 @@ func testData() (*api.PodList, *api.ServiceList) { }, } svc := &api.ServiceList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: "16", }, Items: []api.Service{ @@ -711,7 +711,7 @@ func TestResourceByNameAndEmptySelector(t *testing.T) { func TestSelector(t *testing.T) { pods, svc := testData() - labelKey := unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + labelKey := metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), "/namespaces/test/services?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), svc), @@ -1006,7 +1006,7 @@ func TestSingularRootScopedObject(t *testing.T) { func TestListObject(t *testing.T) { pods, _ := testData() - labelKey := unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + labelKey := metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), }), testapi.Default.Codec()). @@ -1039,7 +1039,7 @@ func TestListObject(t *testing.T) { func TestListObjectWithDifferentVersions(t *testing.T) { pods, svc := testData() - labelKey := unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + labelKey := metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) obj, err := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), "/namespaces/test/services?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), svc), diff --git a/pkg/kubectl/resource/helper_test.go b/pkg/kubectl/resource/helper_test.go index de119a11b65..117744edcb1 100644 --- a/pkg/kubectl/resource/helper_test.go +++ b/pkg/kubectl/resource/helper_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/labels" @@ -70,7 +70,7 @@ func TestHelperDelete(t *testing.T) { Resp: &http.Response{ StatusCode: http.StatusNotFound, Header: header(), - Body: objBody(&unversioned.Status{Status: unversioned.StatusFailure}), + Body: objBody(&metav1.Status{Status: metav1.StatusFailure}), }, Err: true, }, @@ -78,7 +78,7 @@ func TestHelperDelete(t *testing.T) { Resp: &http.Response{ StatusCode: http.StatusOK, Header: header(), - Body: objBody(&unversioned.Status{Status: unversioned.StatusSuccess}), + Body: objBody(&metav1.Status{Status: metav1.StatusSuccess}), }, Req: func(req *http.Request) bool { if req.Method != "DELETE" { @@ -157,7 +157,7 @@ func TestHelperCreate(t *testing.T) { Resp: &http.Response{ StatusCode: http.StatusNotFound, Header: header(), - Body: objBody(&unversioned.Status{Status: unversioned.StatusFailure}), + Body: objBody(&metav1.Status{Status: metav1.StatusFailure}), }, Err: true, }, @@ -165,7 +165,7 @@ func TestHelperCreate(t *testing.T) { Resp: &http.Response{ StatusCode: http.StatusOK, Header: header(), - Body: objBody(&unversioned.Status{Status: unversioned.StatusSuccess}), + Body: objBody(&metav1.Status{Status: metav1.StatusSuccess}), }, Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}, ExpectObject: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo"}}, @@ -175,7 +175,7 @@ func TestHelperCreate(t *testing.T) { Modify: false, Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}}, ExpectObject: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}}, - Resp: &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&unversioned.Status{Status: unversioned.StatusSuccess})}, + Resp: &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&metav1.Status{Status: metav1.StatusSuccess})}, Req: expectPost, }, { @@ -188,7 +188,7 @@ func TestHelperCreate(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "foo"}, Spec: apitesting.DeepEqualSafePodSpec(), }, - Resp: &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&unversioned.Status{Status: unversioned.StatusSuccess})}, + Resp: &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&metav1.Status{Status: metav1.StatusSuccess})}, Req: expectPost, }, } @@ -244,7 +244,7 @@ func TestHelperGet(t *testing.T) { Resp: &http.Response{ StatusCode: http.StatusNotFound, Header: header(), - Body: objBody(&unversioned.Status{Status: unversioned.StatusFailure}), + Body: objBody(&metav1.Status{Status: metav1.StatusFailure}), }, Err: true, }, @@ -313,7 +313,7 @@ func TestHelperList(t *testing.T) { Resp: &http.Response{ StatusCode: http.StatusNotFound, Header: header(), - Body: objBody(&unversioned.Status{Status: unversioned.StatusFailure}), + Body: objBody(&metav1.Status{Status: metav1.StatusFailure}), }, Err: true, }, @@ -337,7 +337,7 @@ func TestHelperList(t *testing.T) { t.Errorf("url doesn't contain name: %#v", req.URL) return false } - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != labels.SelectorFromSet(labels.Set{"foo": "baz"}).String() { + if req.URL.Query().Get(metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String())) != labels.SelectorFromSet(labels.Set{"foo": "baz"}).String() { t.Errorf("url doesn't contain query parameters: %#v", req.URL) return false } @@ -411,7 +411,7 @@ func TestHelperReplace(t *testing.T) { Resp: &http.Response{ StatusCode: http.StatusNotFound, Header: header(), - Body: objBody(&unversioned.Status{Status: unversioned.StatusFailure}), + Body: objBody(&metav1.Status{Status: metav1.StatusFailure}), }, Err: true, }, @@ -424,7 +424,7 @@ func TestHelperReplace(t *testing.T) { Resp: &http.Response{ StatusCode: http.StatusOK, Header: header(), - Body: objBody(&unversioned.Status{Status: unversioned.StatusSuccess}), + Body: objBody(&metav1.Status{Status: metav1.StatusSuccess}), }, Req: expectPut, }, @@ -444,7 +444,7 @@ func TestHelperReplace(t *testing.T) { Overwrite: true, HTTPClient: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { if req.Method == "PUT" { - return &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&unversioned.Status{Status: unversioned.StatusSuccess})}, nil + return &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&metav1.Status{Status: metav1.StatusSuccess})}, nil } return &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}})}, nil }), @@ -462,7 +462,7 @@ func TestHelperReplace(t *testing.T) { ExpectPath: "/foo", HTTPClient: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { if req.Method == "PUT" { - return &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&unversioned.Status{Status: unversioned.StatusSuccess})}, nil + return &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&metav1.Status{Status: metav1.StatusSuccess})}, nil } return &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&api.Node{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}})}, nil }), @@ -474,7 +474,7 @@ func TestHelperReplace(t *testing.T) { Object: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}}, ExpectPath: "/namespaces/bar/foo", ExpectObject: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10"}}, - Resp: &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&unversioned.Status{Status: unversioned.StatusSuccess})}, + Resp: &http.Response{StatusCode: http.StatusOK, Header: header(), Body: objBody(&metav1.Status{Status: metav1.StatusSuccess})}, Req: expectPut, }, } diff --git a/pkg/kubectl/resource/result.go b/pkg/kubectl/resource/result.go index 361d27e9227..2bc343b159d 100644 --- a/pkg/kubectl/resource/result.go +++ b/pkg/kubectl/resource/result.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/runtime" @@ -150,7 +150,7 @@ func (r *Result) Object() (runtime.Object, error) { version = versions.List()[0] } return &api.List{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: version, }, Items: objects, diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index b8d5804f0fc..63fafaade1e 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/events" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" @@ -677,7 +677,7 @@ func shortHumanDuration(d time.Duration) string { // translateTimestamp returns the elapsed time since timestamp in // human-readable approximation. -func translateTimestamp(timestamp unversioned.Time) string { +func translateTimestamp(timestamp metav1.Time) string { if timestamp.IsZero() { return "" } @@ -945,7 +945,7 @@ func printReplicaSet(rs *extensions.ReplicaSet, w io.Writer, options PrintOption if err := layoutContainers(containers, w); err != nil { return err } - if _, err := fmt.Fprintf(w, "\t%s", unversioned.FormatLabelSelector(rs.Spec.Selector)); err != nil { + if _, err := fmt.Fprintf(w, "\t%s", metav1.FormatLabelSelector(rs.Spec.Selector)); err != nil { return err } } @@ -1013,7 +1013,7 @@ func printJob(job *batch.Job, w io.Writer, options PrintOptions) error { } } - selector, err := unversioned.LabelSelectorAsSelector(job.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(job.Spec.Selector) if err != nil { // this shouldn't happen if LabelSelector passed validation return err @@ -1303,7 +1303,7 @@ func printStatefulSet(ps *apps.StatefulSet, w io.Writer, options PrintOptions) e if err := layoutContainers(containers, w); err != nil { return err } - if _, err := fmt.Fprintf(w, "\t%s", unversioned.FormatLabelSelector(ps.Spec.Selector)); err != nil { + if _, err := fmt.Fprintf(w, "\t%s", metav1.FormatLabelSelector(ps.Spec.Selector)); err != nil { return err } } @@ -1342,7 +1342,7 @@ func printDaemonSet(ds *extensions.DaemonSet, w io.Writer, options PrintOptions) desiredScheduled := ds.Status.DesiredNumberScheduled currentScheduled := ds.Status.CurrentNumberScheduled numberReady := ds.Status.NumberReady - selector, err := unversioned.LabelSelectorAsSelector(ds.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(ds.Spec.Selector) if err != nil { // this shouldn't happen if LabelSelector passed validation return err @@ -1566,10 +1566,10 @@ func getNodeExternalIP(node *api.Node) string { // * a kubeadm.alpha.kubernetes.io/role label // If no role is found, ("", nil) is returned func findNodeRole(node *api.Node) string { - if role := node.Labels[unversioned.NodeLabelRole]; role != "" { + if role := node.Labels[metav1.NodeLabelRole]; role != "" { return role } - if role := node.Labels[unversioned.NodeLabelKubeadmAlphaRole]; role != "" { + if role := node.Labels[metav1.NodeLabelKubeadmAlphaRole]; role != "" { return role } // No role found @@ -2205,7 +2205,7 @@ func printNetworkPolicy(networkPolicy *extensions.NetworkPolicy, w io.Writer, op return err } } - if _, err := fmt.Fprintf(w, "%s\t%v\t%s", name, unversioned.FormatLabelSelector(&networkPolicy.Spec.PodSelector), translateTimestamp(networkPolicy.CreationTimestamp)); err != nil { + if _, err := fmt.Fprintf(w, "%s\t%v\t%s", name, metav1.FormatLabelSelector(&networkPolicy.Spec.PodSelector), translateTimestamp(networkPolicy.CreationTimestamp)); err != nil { return err } if _, err := fmt.Fprint(w, AppendLabels(networkPolicy.Labels, options.ColumnLabels)); err != nil { @@ -2254,7 +2254,7 @@ func printStorageClassList(scList *storage.StorageClassList, w io.Writer, option return nil } -func printStatus(status *unversioned.Status, w io.Writer, options PrintOptions) error { +func printStatus(status *metav1.Status, w io.Writer, options PrintOptions) error { if _, err := fmt.Fprintf(w, "%s\t%s\t%s\n", status.Status, status.Reason, status.Message); err != nil { return err } diff --git a/pkg/kubectl/resource_printer_test.go b/pkg/kubectl/resource_printer_test.go index 82f7c80e96a..2f2426813a6 100644 --- a/pkg/kubectl/resource_printer_test.go +++ b/pkg/kubectl/resource_printer_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/batch" @@ -336,7 +336,7 @@ func TestNamePrinter(t *testing.T) { }{ "singleObject": { &api.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", }, ObjectMeta: api.ObjectMeta{ @@ -346,7 +346,7 @@ func TestNamePrinter(t *testing.T) { "pod/foo\n"}, "List": { &v1.List{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "List", }, Items: []runtime.RawExtension{ @@ -433,7 +433,7 @@ func TestTemplateStrings(t *testing.T) { Name: "bar", State: api.ContainerState{ Running: &api.ContainerStateRunning{ - StartedAt: unversioned.Time{}, + StartedAt: metav1.Time{}, }, }, }, @@ -450,7 +450,7 @@ func TestTemplateStrings(t *testing.T) { Name: "foo", State: api.ContainerState{ Running: &api.ContainerStateRunning{ - StartedAt: unversioned.Time{}, + StartedAt: metav1.Time{}, }, }, }, @@ -458,7 +458,7 @@ func TestTemplateStrings(t *testing.T) { Name: "bar", State: api.ContainerState{ Running: &api.ContainerStateRunning{ - StartedAt: unversioned.Time{}, + StartedAt: metav1.Time{}, }, }, }, @@ -567,24 +567,24 @@ func TestPrintEventsResultSorted(t *testing.T) { { Source: api.EventSource{Component: "kubelet"}, Message: "Item 1", - FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, { Source: api.EventSource{Component: "scheduler"}, Message: "Item 2", - FirstTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(1987, time.June, 17, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, { Source: api.EventSource{Component: "kubelet"}, Message: "Item 3", - FirstTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(2002, time.December, 25, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, @@ -786,7 +786,7 @@ func TestPrintHunmanReadableIngressWithColumnLabels(t *testing.T) { ingress := extensions.Ingress{ ObjectMeta: api.ObjectMeta{ Name: "test1", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, Labels: map[string]string{ "app_name": "kubectl_test_ingress", }, @@ -1086,8 +1086,8 @@ func TestPrintHumanReadableWithNamespace(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: name, Namespace: namespaceName}, Source: api.EventSource{Component: "kubelet"}, Message: "Item 1", - FirstTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), - LastTimestamp: unversioned.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + FirstTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), + LastTimestamp: metav1.NewTime(time.Date(2014, time.January, 15, 0, 0, 0, 0, time.UTC)), Count: 1, Type: api.EventTypeNormal, }, @@ -1402,16 +1402,16 @@ type stringTestList []struct { func TestTranslateTimestamp(t *testing.T) { tl := stringTestList{ - {"a while from now", translateTimestamp(unversioned.Time{Time: time.Now().Add(2.1e9)}), ""}, - {"almost now", translateTimestamp(unversioned.Time{Time: time.Now().Add(1.9e9)}), "0s"}, - {"now", translateTimestamp(unversioned.Time{Time: time.Now()}), "0s"}, - {"unknown", translateTimestamp(unversioned.Time{}), ""}, - {"30 seconds ago", translateTimestamp(unversioned.Time{Time: time.Now().Add(-3e10)}), "30s"}, - {"5 minutes ago", translateTimestamp(unversioned.Time{Time: time.Now().Add(-3e11)}), "5m"}, - {"an hour ago", translateTimestamp(unversioned.Time{Time: time.Now().Add(-6e12)}), "1h"}, - {"2 days ago", translateTimestamp(unversioned.Time{Time: time.Now().UTC().AddDate(0, 0, -2)}), "2d"}, - {"months ago", translateTimestamp(unversioned.Time{Time: time.Now().UTC().AddDate(0, 0, -90)}), "90d"}, - {"10 years ago", translateTimestamp(unversioned.Time{Time: time.Now().UTC().AddDate(-10, 0, 0)}), "10y"}, + {"a while from now", translateTimestamp(metav1.Time{Time: time.Now().Add(2.1e9)}), ""}, + {"almost now", translateTimestamp(metav1.Time{Time: time.Now().Add(1.9e9)}), "0s"}, + {"now", translateTimestamp(metav1.Time{Time: time.Now()}), "0s"}, + {"unknown", translateTimestamp(metav1.Time{}), ""}, + {"30 seconds ago", translateTimestamp(metav1.Time{Time: time.Now().Add(-3e10)}), "30s"}, + {"5 minutes ago", translateTimestamp(metav1.Time{Time: time.Now().Add(-3e11)}), "5m"}, + {"an hour ago", translateTimestamp(metav1.Time{Time: time.Now().Add(-6e12)}), "1h"}, + {"2 days ago", translateTimestamp(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -2)}), "2d"}, + {"months ago", translateTimestamp(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -90)}), "90d"}, + {"10 years ago", translateTimestamp(metav1.Time{Time: time.Now().UTC().AddDate(-10, 0, 0)}), "10y"}, } for _, test := range tl { if test.got != test.exp { @@ -1430,7 +1430,7 @@ func TestPrintDeployment(t *testing.T) { extensions.Deployment{ ObjectMeta: api.ObjectMeta{ Name: "test1", - CreationTimestamp: unversioned.Time{Time: time.Now().Add(1.9e9)}, + CreationTimestamp: metav1.Time{Time: time.Now().Add(1.9e9)}, }, Spec: extensions.DeploymentSpec{ Replicas: 5, @@ -1468,7 +1468,7 @@ func TestPrintDaemonSet(t *testing.T) { extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{ Name: "test1", - CreationTimestamp: unversioned.Time{Time: time.Now().Add(1.9e9)}, + CreationTimestamp: metav1.Time{Time: time.Now().Add(1.9e9)}, }, Spec: extensions.DaemonSetSpec{ Template: api.PodTemplateSpec{ @@ -1505,7 +1505,7 @@ func TestPrintJob(t *testing.T) { batch.Job{ ObjectMeta: api.ObjectMeta{ Name: "job1", - CreationTimestamp: unversioned.Time{Time: time.Now().Add(1.9e9)}, + CreationTimestamp: metav1.Time{Time: time.Now().Add(1.9e9)}, }, Spec: batch.JobSpec{ Completions: &completions, @@ -1520,7 +1520,7 @@ func TestPrintJob(t *testing.T) { batch.Job{ ObjectMeta: api.ObjectMeta{ Name: "job2", - CreationTimestamp: unversioned.Time{Time: time.Now().AddDate(-10, 0, 0)}, + CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, }, Spec: batch.JobSpec{ Completions: nil, @@ -1665,7 +1665,7 @@ func TestPrintPodDisruptionBudget(t *testing.T) { ObjectMeta: api.ObjectMeta{ Namespace: "ns1", Name: "pdb1", - CreationTimestamp: unversioned.Time{Time: time.Now().Add(1.9e9)}, + CreationTimestamp: metav1.Time{Time: time.Now().Add(1.9e9)}, }, Spec: policy.PodDisruptionBudgetSpec{ MinAvailable: intstr.FromInt(22), diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 67b60e2896c..5b44b6afe57 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/retry" @@ -126,7 +126,7 @@ type RollingUpdater struct { // getReadyPods returns the amount of old and new ready pods. getReadyPods func(oldRc, newRc *api.ReplicationController, minReadySeconds int32) (int32, int32, error) // nowFn returns the current time used to calculate the minReadySeconds - nowFn func() unversioned.Time + nowFn func() metav1.Time } // NewRollingUpdater creates a RollingUpdater from a client. @@ -141,7 +141,7 @@ func NewRollingUpdater(namespace string, rcClient coreclient.ReplicationControll updater.getOrCreateTargetController = updater.getOrCreateTargetControllerWithClient updater.getReadyPods = updater.readyPods updater.cleanup = updater.cleanupWithClients - updater.nowFn = func() unversioned.Time { return unversioned.Now() } + updater.nowFn = func() metav1.Time { return metav1.Now() } return updater } @@ -409,7 +409,7 @@ func (r *RollingUpdater) readyPods(oldRc, newRc *api.ReplicationController, minR oldReady := int32(0) newReady := int32(0) if r.nowFn == nil { - r.nowFn = func() unversioned.Time { return unversioned.Now() } + r.nowFn = func() metav1.Time { return metav1.Now() } } for i := range controllers { diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index 117f910686e..abb4332306c 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" @@ -1613,8 +1613,8 @@ func TestAddDeploymentHash(t *testing.T) { func TestRollingUpdater_readyPods(t *testing.T) { count := 0 - now := unversioned.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC) - mkpod := func(owner *api.ReplicationController, ready bool, readyTime unversioned.Time) *api.Pod { + now := metav1.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC) + mkpod := func(owner *api.ReplicationController, ready bool, readyTime metav1.Time) *api.Pod { count = count + 1 labels := map[string]string{} for k, v := range owner.Spec.Selector { @@ -1654,8 +1654,8 @@ func TestRollingUpdater_readyPods(t *testing.T) { // specify additional time to wait for deployment to wait on top of the // pod ready time minReadySeconds int32 - podReadyTimeFn func() unversioned.Time - nowFn func() unversioned.Time + podReadyTimeFn func() metav1.Time + nowFn func() metav1.Time }{ { oldRc: oldRc(4, 4), @@ -1711,7 +1711,7 @@ func TestRollingUpdater_readyPods(t *testing.T) { true, }, minReadySeconds: 5, - nowFn: func() unversioned.Time { return now }, + nowFn: func() metav1.Time { return now }, }, { oldRc: oldRc(4, 4), @@ -1725,15 +1725,15 @@ func TestRollingUpdater_readyPods(t *testing.T) { true, }, minReadySeconds: 5, - nowFn: func() unversioned.Time { return unversioned.Time{Time: now.Add(time.Duration(6 * time.Second))} }, - podReadyTimeFn: func() unversioned.Time { return now }, + nowFn: func() metav1.Time { return metav1.Time{Time: now.Add(time.Duration(6 * time.Second))} }, + podReadyTimeFn: func() metav1.Time { return now }, }, } for i, test := range tests { t.Logf("evaluating test %d", i) if test.nowFn == nil { - test.nowFn = func() unversioned.Time { return now } + test.nowFn = func() metav1.Time { return now } } if test.podReadyTimeFn == nil { test.podReadyTimeFn = test.nowFn diff --git a/pkg/kubectl/run.go b/pkg/kubectl/run.go index cc9284e3378..717f00a1854 100644 --- a/pkg/kubectl/run.go +++ b/pkg/kubectl/run.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/batch" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" @@ -109,7 +109,7 @@ func (DeploymentV1Beta1) Generate(genericParams map[string]interface{}) (runtime }, Spec: extensions.DeploymentSpec{ Replicas: int32(count), - Selector: &unversioned.LabelSelector{MatchLabels: labels}, + Selector: &metav1.LabelSelector{MatchLabels: labels}, Template: api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: labels, @@ -292,7 +292,7 @@ func (JobV1Beta1) Generate(genericParams map[string]interface{}) (runtime.Object Labels: labels, }, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: labels, }, ManualSelector: newBool(true), diff --git a/pkg/kubectl/run_test.go b/pkg/kubectl/run_test.go index 8bd7e1a06e3..b104ea54934 100644 --- a/pkg/kubectl/run_test.go +++ b/pkg/kubectl/run_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -667,7 +667,7 @@ func TestGenerateDeployment(t *testing.T) { }, Spec: extensions.DeploymentSpec{ Replicas: 3, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar", "baz": "blah"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar", "baz": "blah"}}, Template: api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: map[string]string{"foo": "bar", "baz": "blah"}, @@ -758,7 +758,7 @@ func TestGenerateJob(t *testing.T) { Labels: map[string]string{"foo": "bar", "baz": "blah"}, }, Spec: batch.JobSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar", "baz": "blah"}, }, ManualSelector: newBool(true), diff --git a/pkg/kubectl/sorting_printer.go b/pkg/kubectl/sorting_printer.go index d2fcb451f1d..606edb88d85 100644 --- a/pkg/kubectl/sorting_printer.go +++ b/pkg/kubectl/sorting_printer.go @@ -23,7 +23,7 @@ import ( "sort" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/integer" @@ -166,10 +166,10 @@ func isLess(i, j reflect.Value) (bool, error) { case reflect.Ptr: return isLess(i.Elem(), j.Elem()) case reflect.Struct: - // sort unversioned.Time + // sort metav1.Time in := i.Interface() - if t, ok := in.(unversioned.Time); ok { - return t.Before(j.Interface().(unversioned.Time)), nil + if t, ok := in.(metav1.Time); ok { + return t.Before(j.Interface().(metav1.Time)), nil } // fallback to the fields comparison for idx := 0; idx < i.NumField(); idx++ { diff --git a/pkg/kubectl/sorting_printer_test.go b/pkg/kubectl/sorting_printer_test.go index 70b0cdc6de4..07dd209c344 100644 --- a/pkg/kubectl/sorting_printer_test.go +++ b/pkg/kubectl/sorting_printer_test.go @@ -21,7 +21,7 @@ import ( "testing" internal "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/runtime" ) @@ -151,17 +151,17 @@ func TestSortingPrinter(t *testing.T) { Items: []api.Pod{ { ObjectMeta: api.ObjectMeta{ - CreationTimestamp: unversioned.Unix(300, 0), + CreationTimestamp: metav1.Unix(300, 0), }, }, { ObjectMeta: api.ObjectMeta{ - CreationTimestamp: unversioned.Unix(100, 0), + CreationTimestamp: metav1.Unix(100, 0), }, }, { ObjectMeta: api.ObjectMeta{ - CreationTimestamp: unversioned.Unix(200, 0), + CreationTimestamp: metav1.Unix(200, 0), }, }, }, @@ -170,17 +170,17 @@ func TestSortingPrinter(t *testing.T) { Items: []api.Pod{ { ObjectMeta: api.ObjectMeta{ - CreationTimestamp: unversioned.Unix(100, 0), + CreationTimestamp: metav1.Unix(100, 0), }, }, { ObjectMeta: api.ObjectMeta{ - CreationTimestamp: unversioned.Unix(200, 0), + CreationTimestamp: metav1.Unix(200, 0), }, }, { ObjectMeta: api.ObjectMeta{ - CreationTimestamp: unversioned.Unix(300, 0), + CreationTimestamp: metav1.Unix(300, 0), }, }, }, diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index 64b701cecfb..0e70ef07534 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" @@ -346,7 +346,7 @@ func (reaper *StatefulSetReaper) Stop(namespace, name string, timeout time.Durat // TODO: This shouldn't be needed, see corresponding TODO in StatefulSetHasDesiredPets. // StatefulSet should track generation number. pods := reaper.podClient.Pods(namespace) - selector, _ := unversioned.LabelSelectorAsSelector(ps.Spec.Selector) + selector, _ := metav1.LabelSelectorAsSelector(ps.Spec.Selector) options := api.ListOptions{LabelSelector: selector} podList, err := pods.List(options) if err != nil { @@ -391,7 +391,7 @@ func (reaper *JobReaper) Stop(namespace, name string, timeout time.Duration, gra return err } // at this point only dead pods are left, that should be removed - selector, _ := unversioned.LabelSelectorAsSelector(job.Spec.Selector) + selector, _ := metav1.LabelSelectorAsSelector(job.Spec.Selector) options := api.ListOptions{LabelSelector: selector} podList, err := pods.List(options) if err != nil { @@ -442,7 +442,7 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati } // Stop all replica sets. - selector, err := unversioned.LabelSelectorAsSelector(deployment.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(deployment.Spec.Selector) if err != nil { return err } diff --git a/pkg/kubectl/stop_test.go b/pkg/kubectl/stop_test.go index 718f5533546..dbef9d1a1bb 100644 --- a/pkg/kubectl/stop_test.go +++ b/pkg/kubectl/stop_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" @@ -257,7 +257,7 @@ func TestReplicaSetStop(t *testing.T) { }, Spec: extensions.ReplicaSetSpec{ Replicas: 0, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, }, }, }, @@ -278,7 +278,7 @@ func TestReplicaSetStop(t *testing.T) { }, Spec: extensions.ReplicaSetSpec{ Replicas: 0, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"k3": "v3"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"k3": "v3"}}, }, }, { @@ -288,7 +288,7 @@ func TestReplicaSetStop(t *testing.T) { }, Spec: extensions.ReplicaSetSpec{ Replicas: 0, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, }, }, }, @@ -348,7 +348,7 @@ func TestJobStop(t *testing.T) { }, Spec: batch.JobSpec{ Parallelism: &zero, - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"k1": "v1"}, }, }, @@ -372,7 +372,7 @@ func TestJobStop(t *testing.T) { }, Spec: batch.JobSpec{ Parallelism: &zero, - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"k1": "v1"}, }, }, @@ -433,7 +433,7 @@ func TestDeploymentStop(t *testing.T) { }, Spec: extensions.DeploymentSpec{ Replicas: 0, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, }, Status: extensions.DeploymentStatus{ Replicas: 0, @@ -456,7 +456,7 @@ func TestDeploymentStop(t *testing.T) { }, Spec: extensions.DeploymentSpec{ Replicas: 0, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, }, Status: extensions.DeploymentStatus{ Replicas: 0, @@ -670,7 +670,7 @@ func TestDeploymentNotFoundError(t *testing.T) { }, Spec: extensions.DeploymentSpec{ Replicas: 0, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"k1": "v1"}}, }, Status: extensions.DeploymentStatus{ Replicas: 0, diff --git a/pkg/kubectl/testing/BUILD b/pkg/kubectl/testing/BUILD index ac432f5e484..bbc2989068a 100644 --- a/pkg/kubectl/testing/BUILD +++ b/pkg/kubectl/testing/BUILD @@ -19,7 +19,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/types:go_default_library", "//vendor:github.com/ugorji/go/codec", diff --git a/pkg/kubectl/testing/types.generated.go b/pkg/kubectl/testing/types.generated.go index e26044c4c4e..d4c0db20f74 100644 --- a/pkg/kubectl/testing/types.generated.go +++ b/pkg/kubectl/testing/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/pkg/kubectl/testing/types.go b/pkg/kubectl/testing/types.go index d876a5d42e6..20be8f0967d 100644 --- a/pkg/kubectl/testing/types.go +++ b/pkg/kubectl/testing/types.go @@ -18,12 +18,12 @@ package testing import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) type TestStruct struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` Key string `json:"Key"` diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 766d7c2c830..ec875fd40ed 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -40,12 +40,12 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/api/v1/validation:go_default_library", "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/componentconfig/v1alpha1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", @@ -151,10 +151,10 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/componentconfig:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/record:go_default_library", diff --git a/pkg/kubelet/active_deadline_test.go b/pkg/kubelet/active_deadline_test.go index c3842f75072..2b676df058a 100644 --- a/pkg/kubelet/active_deadline_test.go +++ b/pkg/kubelet/active_deadline_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/types" @@ -53,8 +53,8 @@ func TestActiveDeadlineHandler(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - now := unversioned.Now() - startTime := unversioned.NewTime(now.Time.Add(-1 * time.Minute)) + now := metav1.Now() + startTime := metav1.NewTime(now.Time.Add(-1 * time.Minute)) // this pod has exceeded its active deadline exceededActiveDeadlineSeconds := int64(30) diff --git a/pkg/kubelet/api/v1alpha1/stats/BUILD b/pkg/kubelet/api/v1alpha1/stats/BUILD index 2f8ad6eaf81..aa07aa6acc4 100644 --- a/pkg/kubelet/api/v1alpha1/stats/BUILD +++ b/pkg/kubelet/api/v1alpha1/stats/BUILD @@ -14,5 +14,5 @@ go_library( name = "go_default_library", srcs = ["types.go"], tags = ["automanaged"], - deps = ["//pkg/api/unversioned:go_default_library"], + deps = ["//pkg/apis/meta/v1:go_default_library"], ) diff --git a/pkg/kubelet/api/v1alpha1/stats/types.go b/pkg/kubelet/api/v1alpha1/stats/types.go index 36a8e14962a..cc6ab35e1bd 100644 --- a/pkg/kubelet/api/v1alpha1/stats/types.go +++ b/pkg/kubelet/api/v1alpha1/stats/types.go @@ -17,7 +17,7 @@ limitations under the License. package stats import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // Summary is a top-level container for holding NodeStats and PodStats. @@ -37,7 +37,7 @@ type NodeStats struct { // +optional SystemContainers []ContainerStats `json:"systemContainers,omitempty" patchStrategy:"merge" patchMergeKey:"name"` // The time at which data collection for the node-scoped (i.e. aggregate) stats was (re)started. - StartTime unversioned.Time `json:"startTime"` + StartTime metav1.Time `json:"startTime"` // Stats pertaining to CPU resources. // +optional CPU *CPUStats `json:"cpu,omitempty"` @@ -79,7 +79,7 @@ type PodStats struct { // Reference to the measured Pod. PodRef PodReference `json:"podRef"` // The time at which data collection for the pod-scoped (e.g. network) stats was (re)started. - StartTime unversioned.Time `json:"startTime"` + StartTime metav1.Time `json:"startTime"` // Stats of containers in the measured pod. Containers []ContainerStats `json:"containers" patchStrategy:"merge" patchMergeKey:"name"` // Stats pertaining to network resources. @@ -96,7 +96,7 @@ type ContainerStats struct { // Reference to the measured container. Name string `json:"name"` // The time at which data collection for this container was (re)started. - StartTime unversioned.Time `json:"startTime"` + StartTime metav1.Time `json:"startTime"` // Stats pertaining to CPU resources. // +optional CPU *CPUStats `json:"cpu,omitempty"` @@ -125,7 +125,7 @@ type PodReference struct { // NetworkStats contains data about network resources. type NetworkStats struct { // The time at which these stats were updated. - Time unversioned.Time `json:"time"` + Time metav1.Time `json:"time"` // Cumulative count of bytes received. // +optional RxBytes *uint64 `json:"rxBytes,omitempty"` @@ -143,7 +143,7 @@ type NetworkStats struct { // CPUStats contains data about CPU usage. type CPUStats struct { // The time at which these stats were updated. - Time unversioned.Time `json:"time"` + Time metav1.Time `json:"time"` // Total CPU usage (sum of all cores) averaged over the sample window. // The "core" unit can be interpreted as CPU core-nanoseconds per second. // +optional @@ -156,7 +156,7 @@ type CPUStats struct { // MemoryStats contains data about memory usage. type MemoryStats struct { // The time at which these stats were updated. - Time unversioned.Time `json:"time"` + Time metav1.Time `json:"time"` // Available memory for use. This is defined as the memory limit - workingSetBytes. // If memory limit is undefined, the available bytes is omitted. // +optional @@ -248,7 +248,7 @@ type UserDefinedMetricDescriptor struct { type UserDefinedMetric struct { UserDefinedMetricDescriptor `json:",inline"` // The time at which these stats were updated. - Time unversioned.Time `json:"time"` + Time metav1.Time `json:"time"` // Value of the metric. Float64s have 53 bit precision. // We do not foresee any metrics exceeding that value. Value float64 `json:"value"` diff --git a/pkg/kubelet/config/BUILD b/pkg/kubelet/config/BUILD index bece9f47177..2d325ba08fa 100644 --- a/pkg/kubelet/config/BUILD +++ b/pkg/kubelet/config/BUILD @@ -64,10 +64,10 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/record:go_default_library", "//pkg/conversion:go_default_library", diff --git a/pkg/kubelet/config/common_test.go b/pkg/kubelet/config/common_test.go index f611cbec093..c714ffd208a 100644 --- a/pkg/kubelet/config/common_test.go +++ b/pkg/kubelet/config/common_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/runtime" @@ -34,7 +34,7 @@ func noDefault(*api.Pod) error { return nil } func TestDecodeSinglePod(t *testing.T) { grace := int64(30) pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: "", }, ObjectMeta: v1.ObjectMeta{ @@ -94,7 +94,7 @@ func TestDecodeSinglePod(t *testing.T) { func TestDecodePodList(t *testing.T) { grace := int64(30) pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: "", }, ObjectMeta: v1.ObjectMeta{ diff --git a/pkg/kubelet/config/config_test.go b/pkg/kubelet/config/config_test.go index 9fd305006ea..098cc156bca 100644 --- a/pkg/kubelet/config/config_test.go +++ b/pkg/kubelet/config/config_test.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/conversion" @@ -261,7 +261,7 @@ func TestNewPodAddedDelete(t *testing.T) { expectPodUpdate(t, ch, CreatePodUpdate(kubetypes.ADD, TestSource, addedPod)) // mark this pod as deleted - timestamp := unversioned.NewTime(time.Now()) + timestamp := metav1.NewTime(time.Now()) deletedPod := CreateValidPod("foo", "new") deletedPod.ObjectMeta.DeletionTimestamp = ×tamp podUpdate = CreatePodUpdate(kubetypes.DELETE, TestSource, deletedPod) diff --git a/pkg/kubelet/config/file_linux_test.go b/pkg/kubelet/config/file_linux_test.go index f2af6c5bcb8..044be0ccfeb 100644 --- a/pkg/kubelet/config/file_linux_test.go +++ b/pkg/kubelet/config/file_linux_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" @@ -176,7 +176,7 @@ func getTestCases(hostname types.NodeName) []*testCase { { desc: "Simple pod", pod: &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "", }, diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index 01b36862e95..3a42169edd0 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" @@ -61,16 +61,16 @@ func TestExtractInvalidPods(t *testing.T) { }{ { desc: "No version", - pod: &v1.Pod{TypeMeta: unversioned.TypeMeta{APIVersion: ""}}, + pod: &v1.Pod{TypeMeta: metav1.TypeMeta{APIVersion: ""}}, }, { desc: "Invalid version", - pod: &v1.Pod{TypeMeta: unversioned.TypeMeta{APIVersion: "v1betta2"}}, + pod: &v1.Pod{TypeMeta: metav1.TypeMeta{APIVersion: "v1betta2"}}, }, { desc: "Invalid volume name", pod: &v1.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, Spec: v1.PodSpec{ Volumes: []v1.Volume{{Name: "_INVALID_"}}, }, @@ -79,7 +79,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Duplicate volume names", pod: &v1.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, Spec: v1.PodSpec{ Volumes: []v1.Volume{{Name: "repeated"}, {Name: "repeated"}}, }, @@ -88,7 +88,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Unspecified container name", pod: &v1.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, Spec: v1.PodSpec{ Containers: []v1.Container{{Name: ""}}, }, @@ -97,7 +97,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Invalid container name", pod: &v1.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, + TypeMeta: metav1.TypeMeta{APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String()}, Spec: v1.PodSpec{ Containers: []v1.Container{{Name: "_INVALID_"}}, }, @@ -135,7 +135,7 @@ func TestExtractPodsFromHTTP(t *testing.T) { { desc: "Single pod", pods: &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "", }, @@ -185,7 +185,7 @@ func TestExtractPodsFromHTTP(t *testing.T) { { desc: "Multiple pods", pods: &v1.PodList{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "PodList", APIVersion: "", }, @@ -319,7 +319,7 @@ func TestExtractPodsFromHTTP(t *testing.T) { func TestURLWithHeader(t *testing.T) { pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), Kind: "Pod", }, diff --git a/pkg/kubelet/container/BUILD b/pkg/kubelet/container/BUILD index 23fdb3d7096..2df19bb3747 100644 --- a/pkg/kubelet/container/BUILD +++ b/pkg/kubelet/container/BUILD @@ -28,8 +28,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/record:go_default_library", "//pkg/kubelet/api/v1alpha1/runtime:go_default_library", "//pkg/kubelet/util/format:go_default_library", @@ -59,9 +59,9 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/types:go_default_library", "//vendor:github.com/stretchr/testify/assert", ], diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index 33a73c20432..33a5f2c8b8a 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" @@ -161,7 +161,7 @@ func (irecorder *innerEventRecorder) Eventf(object runtime.Object, eventtype, re } -func (irecorder *innerEventRecorder) PastEventf(object runtime.Object, timestamp unversioned.Time, eventtype, reason, messageFmt string, args ...interface{}) { +func (irecorder *innerEventRecorder) PastEventf(object runtime.Object, timestamp metav1.Time, eventtype, reason, messageFmt string, args ...interface{}) { if ref, ok := irecorder.shouldRecordEvent(object); ok { irecorder.recorder.PastEventf(ref, timestamp, eventtype, reason, messageFmt, args...) } diff --git a/pkg/kubelet/container/ref_test.go b/pkg/kubelet/container/ref_test.go index acb4fb6c855..14ef351c5f9 100644 --- a/pkg/kubelet/container/ref_test.go +++ b/pkg/kubelet/container/ref_test.go @@ -19,7 +19,7 @@ package container import ( "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" ) @@ -65,7 +65,7 @@ func TestFieldPath(t *testing.T) { func TestGenerateContainerRef(t *testing.T) { var ( okPod = v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, diff --git a/pkg/kubelet/dockertools/BUILD b/pkg/kubelet/dockertools/BUILD index ecc78cd8a13..1e453ce167f 100644 --- a/pkg/kubelet/dockertools/BUILD +++ b/pkg/kubelet/dockertools/BUILD @@ -29,8 +29,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/record:go_default_library", "//pkg/credentialprovider:go_default_library", "//pkg/kubelet/cm:go_default_library", diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go index 24f4bae699a..30ea7a108d7 100644 --- a/pkg/kubelet/dockertools/docker_manager.go +++ b/pkg/kubelet/dockertools/docker_manager.go @@ -44,7 +44,7 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cm" @@ -323,7 +323,7 @@ func (dm *DockerManager) GetContainerLogs(pod *v1.Pod, containerID kubecontainer func GetContainerLogs(client DockerInterface, pod *v1.Pod, containerID kubecontainer.ContainerID, logOptions *v1.PodLogOptions, stdout, stderr io.Writer, rawTerm bool) error { var since int64 if logOptions.SinceSeconds != nil { - t := unversioned.Now().Add(-time.Duration(*logOptions.SinceSeconds) * time.Second) + t := metav1.Now().Add(-time.Duration(*logOptions.SinceSeconds) * time.Second) since = t.Unix() } if logOptions.SinceTime != nil { @@ -1564,7 +1564,7 @@ func (dm *DockerManager) killContainer(containerID kubecontainer.ContainerID, co } } glog.V(2).Infof("Killing container %q with %d second grace period", name, gracePeriod) - start := unversioned.Now() + start := metav1.Now() if pod != nil && container != nil && container.Lifecycle != nil && container.Lifecycle.PreStop != nil { glog.V(4).Infof("Running preStop hook for container %q", name) @@ -1585,7 +1585,7 @@ func (dm *DockerManager) killContainer(containerID kubecontainer.ContainerID, co case <-done: glog.V(4).Infof("preStop hook for container %q completed", name) } - gracePeriod -= int64(unversioned.Now().Sub(start.Time).Seconds()) + gracePeriod -= int64(metav1.Now().Sub(start.Time).Seconds()) } // if the caller did not specify a grace period override, we ensure that the grace period @@ -1604,9 +1604,9 @@ func (dm *DockerManager) killContainer(containerID kubecontainer.ContainerID, co err := dm.client.StopContainer(ID, int(gracePeriod)) if err == nil { - glog.V(2).Infof("Container %q exited after %s", name, unversioned.Now().Sub(start.Time)) + glog.V(2).Infof("Container %q exited after %s", name, metav1.Now().Sub(start.Time)) } else { - glog.Warningf("Container %q termination failed after %s: %v", name, unversioned.Now().Sub(start.Time), err) + glog.Warningf("Container %q termination failed after %s: %v", name, metav1.Now().Sub(start.Time), err) } ref, ok := dm.containerRefManager.GetRef(containerID) if !ok { diff --git a/pkg/kubelet/eviction/BUILD b/pkg/kubelet/eviction/BUILD index 6fb42fae28f..e7d56707dd8 100644 --- a/pkg/kubelet/eviction/BUILD +++ b/pkg/kubelet/eviction/BUILD @@ -22,8 +22,8 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/record:go_default_library", "//pkg/kubelet/api/v1alpha1/stats:go_default_library", "//pkg/kubelet/cm:go_default_library", @@ -50,8 +50,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/record:go_default_library", "//pkg/kubelet/api/v1alpha1/stats:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", diff --git a/pkg/kubelet/eviction/helpers_test.go b/pkg/kubelet/eviction/helpers_test.go index bff42bcc903..fb710711d29 100644 --- a/pkg/kubelet/eviction/helpers_test.go +++ b/pkg/kubelet/eviction/helpers_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/pkg/quota" @@ -915,7 +915,7 @@ func TestThresholdsUpdatedStats(t *testing.T) { thresholds: []Threshold{updatedThreshold}, observations: signalObservations{ SignalMemoryAvailable: signalObservation{ - time: unversioned.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), + time: metav1.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), }, }, last: signalObservations{}, @@ -925,12 +925,12 @@ func TestThresholdsUpdatedStats(t *testing.T) { thresholds: []Threshold{updatedThreshold}, observations: signalObservations{ SignalMemoryAvailable: signalObservation{ - time: unversioned.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), + time: metav1.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), }, }, last: signalObservations{ SignalMemoryAvailable: signalObservation{ - time: unversioned.Date(2016, 1, 1, 0, 1, 0, 0, locationUTC), + time: metav1.Date(2016, 1, 1, 0, 1, 0, 0, locationUTC), }, }, result: []Threshold{}, @@ -939,12 +939,12 @@ func TestThresholdsUpdatedStats(t *testing.T) { thresholds: []Threshold{updatedThreshold}, observations: signalObservations{ SignalMemoryAvailable: signalObservation{ - time: unversioned.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), + time: metav1.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), }, }, last: signalObservations{ SignalMemoryAvailable: signalObservation{ - time: unversioned.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), + time: metav1.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), }, }, result: []Threshold{}, @@ -953,12 +953,12 @@ func TestThresholdsUpdatedStats(t *testing.T) { thresholds: []Threshold{updatedThreshold}, observations: signalObservations{ SignalMemoryAvailable: signalObservation{ - time: unversioned.Date(2016, 1, 1, 0, 1, 0, 0, locationUTC), + time: metav1.Date(2016, 1, 1, 0, 1, 0, 0, locationUTC), }, }, last: signalObservations{ SignalMemoryAvailable: signalObservation{ - time: unversioned.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), + time: metav1.Date(2016, 1, 1, 0, 0, 0, 0, locationUTC), }, }, result: []Threshold{updatedThreshold}, @@ -1098,8 +1098,8 @@ func TestThresholdsFirstObservedAt(t *testing.T) { Quantity: quantityMustParse("1Gi"), }, } - now := unversioned.Now() - oldTime := unversioned.NewTime(now.Time.Add(-1 * time.Minute)) + now := metav1.Now() + oldTime := metav1.NewTime(now.Time.Add(-1 * time.Minute)) testCases := map[string]struct { thresholds []Threshold lastObservedAt thresholdsObservedAt @@ -1140,7 +1140,7 @@ func TestThresholdsFirstObservedAt(t *testing.T) { } func TestThresholdsMetGracePeriod(t *testing.T) { - now := unversioned.Now() + now := metav1.Now() hardThreshold := Threshold{ Signal: SignalMemoryAvailable, Operator: OpLessThan, @@ -1156,7 +1156,7 @@ func TestThresholdsMetGracePeriod(t *testing.T) { }, GracePeriod: 1 * time.Minute, } - oldTime := unversioned.NewTime(now.Time.Add(-2 * time.Minute)) + oldTime := metav1.NewTime(now.Time.Add(-2 * time.Minute)) testCases := map[string]struct { observedAt thresholdsObservedAt now time.Time @@ -1222,8 +1222,8 @@ func TestNodeConditions(t *testing.T) { } func TestNodeConditionsLastObservedAt(t *testing.T) { - now := unversioned.Now() - oldTime := unversioned.NewTime(now.Time.Add(-1 * time.Minute)) + now := metav1.Now() + oldTime := metav1.NewTime(now.Time.Add(-1 * time.Minute)) testCases := map[string]struct { nodeConditions []v1.NodeConditionType lastObservedAt nodeConditionsObservedAt @@ -1268,8 +1268,8 @@ func TestNodeConditionsLastObservedAt(t *testing.T) { } func TestNodeConditionsObservedSince(t *testing.T) { - now := unversioned.Now() - observedTime := unversioned.NewTime(now.Time.Add(-1 * time.Minute)) + now := metav1.Now() + observedTime := metav1.NewTime(now.Time.Add(-1 * time.Minute)) testCases := map[string]struct { observedAt nodeConditionsObservedAt period time.Duration diff --git a/pkg/kubelet/eviction/types.go b/pkg/kubelet/eviction/types.go index e7e2a7d3b73..8a68663fc6c 100644 --- a/pkg/kubelet/eviction/types.go +++ b/pkg/kubelet/eviction/types.go @@ -20,7 +20,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" ) @@ -144,7 +144,7 @@ type signalObservation struct { // The available resource available *resource.Quantity // Time at which the observation was taken - time unversioned.Time + time metav1.Time } // signalObservations maps a signal to an observed quantity diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index af3415bb5e7..b5f202c5d6e 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/fields" @@ -176,9 +176,9 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) { ObjectMeta: v1.ObjectMeta{ Name: string(kl.nodeName), Labels: map[string]string{ - unversioned.LabelHostname: kl.hostname, - unversioned.LabelOS: goruntime.GOOS, - unversioned.LabelArch: goruntime.GOARCH, + metav1.LabelHostname: kl.hostname, + metav1.LabelOS: goruntime.GOOS, + metav1.LabelArch: goruntime.GOARCH, }, }, Spec: v1.NodeSpec{ @@ -192,7 +192,7 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) { Status: v1.ConditionTrue, Reason: "NoRouteCreated", Message: "Node created without a route", - LastTransitionTime: unversioned.NewTime(kl.clock.Now()), + LastTransitionTime: metav1.NewTime(kl.clock.Now()), }) } @@ -243,8 +243,8 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) { return nil, err } if instanceType != "" { - glog.Infof("Adding node label from cloud provider: %s=%s", unversioned.LabelInstanceType, instanceType) - node.ObjectMeta.Labels[unversioned.LabelInstanceType] = instanceType + glog.Infof("Adding node label from cloud provider: %s=%s", metav1.LabelInstanceType, instanceType) + node.ObjectMeta.Labels[metav1.LabelInstanceType] = instanceType } // If the cloud has zone information, label the node with the zone information zones, ok := kl.cloud.Zones() @@ -254,12 +254,12 @@ func (kl *Kubelet) initialNode() (*v1.Node, error) { return nil, fmt.Errorf("failed to get zone from cloud provider: %v", err) } if zone.FailureDomain != "" { - glog.Infof("Adding node label from cloud provider: %s=%s", unversioned.LabelZoneFailureDomain, zone.FailureDomain) - node.ObjectMeta.Labels[unversioned.LabelZoneFailureDomain] = zone.FailureDomain + glog.Infof("Adding node label from cloud provider: %s=%s", metav1.LabelZoneFailureDomain, zone.FailureDomain) + node.ObjectMeta.Labels[metav1.LabelZoneFailureDomain] = zone.FailureDomain } if zone.Region != "" { - glog.Infof("Adding node label from cloud provider: %s=%s", unversioned.LabelZoneRegion, zone.Region) - node.ObjectMeta.Labels[unversioned.LabelZoneRegion] = zone.Region + glog.Infof("Adding node label from cloud provider: %s=%s", metav1.LabelZoneRegion, zone.Region) + node.ObjectMeta.Labels[metav1.LabelZoneRegion] = zone.Region } } } else { @@ -593,7 +593,7 @@ func (kl *Kubelet) setNodeReadyCondition(node *v1.Node) { // NOTE(aaronlevy): NodeReady condition needs to be the last in the list of node conditions. // This is due to an issue with version skewed kubelet and master components. // ref: https://github.com/kubernetes/kubernetes/issues/16961 - currentTime := unversioned.NewTime(kl.clock.Now()) + currentTime := metav1.NewTime(kl.clock.Now()) var newNodeReadyCondition v1.NodeCondition rs := append(kl.runtimeState.runtimeErrors(), kl.runtimeState.networkErrors()...) if len(rs) == 0 { @@ -658,7 +658,7 @@ func (kl *Kubelet) setNodeReadyCondition(node *v1.Node) { // setNodeMemoryPressureCondition for the node. // TODO: this needs to move somewhere centralized... func (kl *Kubelet) setNodeMemoryPressureCondition(node *v1.Node) { - currentTime := unversioned.NewTime(kl.clock.Now()) + currentTime := metav1.NewTime(kl.clock.Now()) var condition *v1.NodeCondition // Check if NodeMemoryPressure condition already exists and if it does, just pick it up for update. @@ -716,7 +716,7 @@ func (kl *Kubelet) setNodeMemoryPressureCondition(node *v1.Node) { // setNodeDiskPressureCondition for the node. // TODO: this needs to move somewhere centralized... func (kl *Kubelet) setNodeDiskPressureCondition(node *v1.Node) { - currentTime := unversioned.NewTime(kl.clock.Now()) + currentTime := metav1.NewTime(kl.clock.Now()) var condition *v1.NodeCondition // Check if NodeDiskPressure condition already exists and if it does, just pick it up for update. @@ -773,7 +773,7 @@ func (kl *Kubelet) setNodeDiskPressureCondition(node *v1.Node) { // Set OODcondition for the node. func (kl *Kubelet) setNodeOODCondition(node *v1.Node) { - currentTime := unversioned.NewTime(kl.clock.Now()) + currentTime := metav1.NewTime(kl.clock.Now()) var nodeOODCondition *v1.NodeCondition // Check if NodeOutOfDisk condition already exists and if it does, just pick it up for update. diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index 5f862fc43d1..b741674a81c 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/testing/core" @@ -131,32 +131,32 @@ func TestUpdateNewNodeStatus(t *testing.T) { Status: v1.ConditionFalse, Reason: "KubeletHasSufficientDisk", Message: fmt.Sprintf("kubelet has sufficient disk space available"), - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, }, { Type: v1.NodeMemoryPressure, Status: v1.ConditionFalse, Reason: "KubeletHasSufficientMemory", Message: fmt.Sprintf("kubelet has sufficient memory available"), - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, }, { Type: v1.NodeDiskPressure, Status: v1.ConditionFalse, Reason: "KubeletHasNoDiskPressure", Message: fmt.Sprintf("kubelet has no disk pressure"), - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, }, { Type: v1.NodeReady, Status: v1.ConditionTrue, Reason: "KubeletReady", Message: fmt.Sprintf("kubelet is posting ready status"), - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, }, }, NodeInfo: v1.NodeSystemInfo{ @@ -214,8 +214,8 @@ func TestUpdateNewNodeStatus(t *testing.T) { if cond.LastTransitionTime.IsZero() { t.Errorf("unexpected zero last transition timestamp for %v condition", cond.Type) } - updatedNode.Status.Conditions[i].LastHeartbeatTime = unversioned.Time{} - updatedNode.Status.Conditions[i].LastTransitionTime = unversioned.Time{} + updatedNode.Status.Conditions[i].LastHeartbeatTime = metav1.Time{} + updatedNode.Status.Conditions[i].LastTransitionTime = metav1.Time{} } // Version skew workaround. See: https://github.com/kubernetes/kubernetes/issues/16961 @@ -268,8 +268,8 @@ func TestUpdateNewNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) { Status: v1.ConditionFalse, Reason: "KubeletHasSufficientDisk", Message: fmt.Sprintf("kubelet has sufficient disk space available"), - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, } kubelet.updateRuntimeUp() @@ -296,8 +296,8 @@ func TestUpdateNewNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) { if cond.LastTransitionTime.IsZero() { t.Errorf("unexpected zero last transition timestamp for %v condition", cond.Type) } - updatedNode.Status.Conditions[i].LastHeartbeatTime = unversioned.Time{} - updatedNode.Status.Conditions[i].LastTransitionTime = unversioned.Time{} + updatedNode.Status.Conditions[i].LastHeartbeatTime = metav1.Time{} + updatedNode.Status.Conditions[i].LastTransitionTime = metav1.Time{} if cond.Type == v1.NodeOutOfDisk { oodCondition = updatedNode.Status.Conditions[i] } @@ -323,32 +323,32 @@ func TestUpdateExistingNodeStatus(t *testing.T) { Status: v1.ConditionTrue, Reason: "KubeletOutOfDisk", Message: "out of disk space", - LastHeartbeatTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, { Type: v1.NodeMemoryPressure, Status: v1.ConditionFalse, Reason: "KubeletHasSufficientMemory", Message: fmt.Sprintf("kubelet has sufficient memory available"), - LastHeartbeatTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, { Type: v1.NodeDiskPressure, Status: v1.ConditionFalse, Reason: "KubeletHasSufficientDisk", Message: fmt.Sprintf("kubelet has sufficient disk space available"), - LastHeartbeatTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, { Type: v1.NodeReady, Status: v1.ConditionTrue, Reason: "KubeletReady", Message: fmt.Sprintf("kubelet is posting ready status"), - LastHeartbeatTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), - LastTransitionTime: unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastHeartbeatTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), + LastTransitionTime: metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC), }, }, Capacity: v1.ResourceList{ @@ -395,32 +395,32 @@ func TestUpdateExistingNodeStatus(t *testing.T) { Status: v1.ConditionTrue, Reason: "KubeletOutOfDisk", Message: "out of disk space", - LastHeartbeatTime: unversioned.Time{}, // placeholder - LastTransitionTime: unversioned.Time{}, // placeholder + LastHeartbeatTime: metav1.Time{}, // placeholder + LastTransitionTime: metav1.Time{}, // placeholder }, { Type: v1.NodeMemoryPressure, Status: v1.ConditionFalse, Reason: "KubeletHasSufficientMemory", Message: fmt.Sprintf("kubelet has sufficient memory available"), - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, }, { Type: v1.NodeDiskPressure, Status: v1.ConditionFalse, Reason: "KubeletHasSufficientDisk", Message: fmt.Sprintf("kubelet has sufficient disk space available"), - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, }, { Type: v1.NodeReady, Status: v1.ConditionTrue, Reason: "KubeletReady", Message: fmt.Sprintf("kubelet is posting ready status"), - LastHeartbeatTime: unversioned.Time{}, // placeholder - LastTransitionTime: unversioned.Time{}, // placeholder + LastHeartbeatTime: metav1.Time{}, // placeholder + LastTransitionTime: metav1.Time{}, // placeholder }, }, NodeInfo: v1.NodeSystemInfo{ @@ -484,14 +484,14 @@ func TestUpdateExistingNodeStatus(t *testing.T) { } for i, cond := range updatedNode.Status.Conditions { // Expect LastProbeTime to be updated to Now, while LastTransitionTime to be the same. - if old := unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC).Time; reflect.DeepEqual(cond.LastHeartbeatTime.Rfc3339Copy().UTC(), old) { - t.Errorf("Condition %v LastProbeTime: expected \n%v\n, got \n%v", cond.Type, unversioned.Now(), old) + if old := metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC).Time; reflect.DeepEqual(cond.LastHeartbeatTime.Rfc3339Copy().UTC(), old) { + t.Errorf("Condition %v LastProbeTime: expected \n%v\n, got \n%v", cond.Type, metav1.Now(), old) } - if got, want := cond.LastTransitionTime.Rfc3339Copy().UTC(), unversioned.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC).Time; !reflect.DeepEqual(got, want) { + if got, want := cond.LastTransitionTime.Rfc3339Copy().UTC(), metav1.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC).Time; !reflect.DeepEqual(got, want) { t.Errorf("Condition %v LastTransitionTime: expected \n%#v\n, got \n%#v", cond.Type, want, got) } - updatedNode.Status.Conditions[i].LastHeartbeatTime = unversioned.Time{} - updatedNode.Status.Conditions[i].LastTransitionTime = unversioned.Time{} + updatedNode.Status.Conditions[i].LastHeartbeatTime = metav1.Time{} + updatedNode.Status.Conditions[i].LastTransitionTime = metav1.Time{} } // Version skew workaround. See: https://github.com/kubernetes/kubernetes/issues/16961 @@ -520,16 +520,16 @@ func TestUpdateExistingNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) Status: v1.ConditionTrue, Reason: "KubeletReady", Message: fmt.Sprintf("kubelet is posting ready status"), - LastHeartbeatTime: unversioned.NewTime(clock.Now()), - LastTransitionTime: unversioned.NewTime(clock.Now()), + LastHeartbeatTime: metav1.NewTime(clock.Now()), + LastTransitionTime: metav1.NewTime(clock.Now()), }, { Type: v1.NodeOutOfDisk, Status: v1.ConditionTrue, Reason: "KubeletOutOfDisk", Message: "out of disk space", - LastHeartbeatTime: unversioned.NewTime(clock.Now()), - LastTransitionTime: unversioned.NewTime(clock.Now()), + LastHeartbeatTime: metav1.NewTime(clock.Now()), + LastTransitionTime: metav1.NewTime(clock.Now()), }, }, }, @@ -564,16 +564,16 @@ func TestUpdateExistingNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) Status: v1.ConditionTrue, Reason: "KubeletOutOfDisk", Message: "out of disk space", - LastHeartbeatTime: unversioned.NewTime(clock.Now()), // placeholder - LastTransitionTime: unversioned.NewTime(clock.Now()), // placeholder + LastHeartbeatTime: metav1.NewTime(clock.Now()), // placeholder + LastTransitionTime: metav1.NewTime(clock.Now()), // placeholder } noOod := v1.NodeCondition{ Type: v1.NodeOutOfDisk, Status: v1.ConditionFalse, Reason: "KubeletHasSufficientDisk", Message: fmt.Sprintf("kubelet has sufficient disk space available"), - LastHeartbeatTime: unversioned.NewTime(clock.Now()), // placeholder - LastTransitionTime: unversioned.NewTime(clock.Now()), // placeholder + LastHeartbeatTime: metav1.NewTime(clock.Now()), // placeholder + LastTransitionTime: metav1.NewTime(clock.Now()), // placeholder } testCases := []struct { @@ -619,10 +619,10 @@ func TestUpdateExistingNodeOutOfDiskStatusWithTransitionFrequency(t *testing.T) clock.Step(1 * time.Second) // Setup expected times. - tc.expected.LastHeartbeatTime = unversioned.NewTime(clock.Now()) + tc.expected.LastHeartbeatTime = metav1.NewTime(clock.Now()) // In the last case, there should be a status transition for NodeOutOfDisk if tcIdx == len(testCases)-1 { - tc.expected.LastTransitionTime = unversioned.NewTime(clock.Now()) + tc.expected.LastTransitionTime = metav1.NewTime(clock.Now()) } // Make kubelet report that it has sufficient disk space @@ -700,24 +700,24 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { Status: v1.ConditionFalse, Reason: "KubeletHasSufficientDisk", Message: "kubelet has sufficient disk space available", - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, }, { Type: v1.NodeMemoryPressure, Status: v1.ConditionFalse, Reason: "KubeletHasSufficientMemory", Message: fmt.Sprintf("kubelet has sufficient memory available"), - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, }, { Type: v1.NodeDiskPressure, Status: v1.ConditionFalse, Reason: "KubeletHasNoDiskPressure", Message: fmt.Sprintf("kubelet has no disk pressure"), - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, }, {}, //placeholder }, @@ -787,8 +787,8 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { if cond.LastTransitionTime.IsZero() { t.Errorf("unexpected zero last transition timestamp") } - updatedNode.Status.Conditions[i].LastHeartbeatTime = unversioned.Time{} - updatedNode.Status.Conditions[i].LastTransitionTime = unversioned.Time{} + updatedNode.Status.Conditions[i].LastHeartbeatTime = metav1.Time{} + updatedNode.Status.Conditions[i].LastTransitionTime = metav1.Time{} } // Version skew workaround. See: https://github.com/kubernetes/kubernetes/issues/16961 @@ -804,8 +804,8 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { Type: v1.NodeReady, Status: status, Reason: reason, - LastHeartbeatTime: unversioned.Time{}, - LastTransitionTime: unversioned.Time{}, + LastHeartbeatTime: metav1.Time{}, + LastTransitionTime: metav1.Time{}, } if !api.Semantic.DeepEqual(expectedNode, updatedNode) { t.Errorf("unexpected objects: %s", diff.ObjectDiff(expectedNode, updatedNode)) @@ -902,7 +902,7 @@ func TestRegisterWithApiServer(t *testing.T) { kubeClient.AddReactor("create", "nodes", func(action core.Action) (bool, runtime.Object, error) { // Return an error on create. return true, &v1.Node{}, &apierrors.StatusError{ - ErrStatus: unversioned.Status{Reason: unversioned.StatusReasonAlreadyExists}, + ErrStatus: metav1.Status{Reason: metav1.StatusReasonAlreadyExists}, } }) kubeClient.AddReactor("get", "nodes", func(action core.Action) (bool, runtime.Object, error) { @@ -955,11 +955,11 @@ func TestRegisterWithApiServer(t *testing.T) { func TestTryRegisterWithApiServer(t *testing.T) { alreadyExists := &apierrors.StatusError{ - ErrStatus: unversioned.Status{Reason: unversioned.StatusReasonAlreadyExists}, + ErrStatus: metav1.Status{Reason: metav1.StatusReasonAlreadyExists}, } conflict := &apierrors.StatusError{ - ErrStatus: unversioned.Status{Reason: unversioned.StatusReasonConflict}, + ErrStatus: metav1.Status{Reason: metav1.StatusReasonConflict}, } newNode := func(cmad bool, externalID string) *v1.Node { diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 9ee793fe2ae..28d597cf49b 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -33,7 +33,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" utilpod "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/api/v1/validation" @@ -1114,14 +1114,14 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon } switch cs.State { case kubecontainer.ContainerStateRunning: - status.State.Running = &v1.ContainerStateRunning{StartedAt: unversioned.NewTime(cs.StartedAt)} + status.State.Running = &v1.ContainerStateRunning{StartedAt: metav1.NewTime(cs.StartedAt)} case kubecontainer.ContainerStateExited: status.State.Terminated = &v1.ContainerStateTerminated{ ExitCode: int32(cs.ExitCode), Reason: cs.Reason, Message: cs.Message, - StartedAt: unversioned.NewTime(cs.StartedAt), - FinishedAt: unversioned.NewTime(cs.FinishedAt), + StartedAt: metav1.NewTime(cs.StartedAt), + FinishedAt: metav1.NewTime(cs.FinishedAt), ContainerID: cid, } default: diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index b62d718800b..86b5bb40467 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/capabilities" @@ -426,8 +426,8 @@ func TestHandlePortConflicts(t *testing.T) { podWithUidNameNsSpec("987654321", "oldpod", "foo", spec), } // Make sure the Pods are in the reverse order of creation time. - pods[1].CreationTimestamp = unversioned.NewTime(time.Now()) - pods[0].CreationTimestamp = unversioned.NewTime(time.Now().Add(1 * time.Second)) + pods[1].CreationTimestamp = metav1.NewTime(time.Now()) + pods[0].CreationTimestamp = metav1.NewTime(time.Now().Add(1 * time.Second)) // The newer pod should be rejected. notfittingPod := pods[0] fittingPod := pods[1] @@ -565,8 +565,8 @@ func TestHandleMemExceeded(t *testing.T) { podWithUidNameNsSpec("987654321", "oldpod", "foo", spec), } // Make sure the Pods are in the reverse order of creation time. - pods[1].CreationTimestamp = unversioned.NewTime(time.Now()) - pods[0].CreationTimestamp = unversioned.NewTime(time.Now().Add(1 * time.Second)) + pods[1].CreationTimestamp = metav1.NewTime(time.Now()) + pods[0].CreationTimestamp = metav1.NewTime(time.Now().Add(1 * time.Second)) // The newer pod should be rejected. notfittingPod := pods[0] fittingPod := pods[1] @@ -1162,8 +1162,8 @@ func TestSyncPodsSetStatusToFailedForPodsThatRunTooLong(t *testing.T) { testKubelet.fakeCadvisor.On("MachineInfo").Return(&cadvisorapi.MachineInfo{}, nil) kubelet := testKubelet.kubelet - now := unversioned.Now() - startTime := unversioned.NewTime(now.Time.Add(-1 * time.Minute)) + now := metav1.Now() + startTime := metav1.NewTime(now.Time.Add(-1 * time.Minute)) exceededActiveDeadlineSeconds := int64(30) pods := []*v1.Pod{ @@ -1214,8 +1214,8 @@ func TestSyncPodsDoesNotSetPodsThatDidNotRunTooLongToFailed(t *testing.T) { kubelet := testKubelet.kubelet - now := unversioned.Now() - startTime := unversioned.NewTime(now.Time.Add(-1 * time.Minute)) + now := metav1.Now() + startTime := metav1.NewTime(now.Time.Add(-1 * time.Minute)) exceededActiveDeadlineSeconds := int64(300) pods := []*v1.Pod{ @@ -1373,7 +1373,7 @@ func TestGetPodsToSync(t *testing.T) { exceededActiveDeadlineSeconds := int64(30) notYetActiveDeadlineSeconds := int64(120) - startTime := unversioned.NewTime(clock.Now()) + startTime := metav1.NewTime(clock.Now()) pods[0].Status.StartTime = &startTime pods[0].Spec.ActiveDeadlineSeconds = &exceededActiveDeadlineSeconds pods[1].Status.StartTime = &startTime @@ -1531,7 +1531,7 @@ func TestGenerateAPIPodStatusWithReasonCache(t *testing.T) { oldStatuses: []v1.ContainerStatus{}, expectedState: map[string]v1.ContainerState{ "running": {Running: &v1.ContainerStateRunning{ - StartedAt: unversioned.NewTime(testTimestamp), + StartedAt: metav1.NewTime(testTimestamp), }}, }, expectedLastTerminationState: map[string]v1.ContainerState{ diff --git a/pkg/kubelet/kuberuntime/BUILD b/pkg/kubelet/kuberuntime/BUILD index 391c2b41d79..ea137fe8171 100644 --- a/pkg/kubelet/kuberuntime/BUILD +++ b/pkg/kubelet/kuberuntime/BUILD @@ -29,8 +29,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/record:go_default_library", "//pkg/credentialprovider:go_default_library", "//pkg/kubelet/api:go_default_library", @@ -78,9 +78,9 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/componentconfig:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/kubelet/api/testing:go_default_library", "//pkg/kubelet/api/v1alpha1/runtime:go_default_library", "//pkg/kubelet/container:go_default_library", diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index c5ffec6548d..9118bff417d 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -29,7 +29,7 @@ import ( "time" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -419,7 +419,7 @@ func (m *kubeGenericRuntimeManager) generateContainerEvent(containerID kubeconta func (m *kubeGenericRuntimeManager) executePreStopHook(pod *v1.Pod, containerID kubecontainer.ContainerID, containerSpec *v1.Container, gracePeriod int64) int64 { glog.V(3).Infof("Running preStop hook for container %q", containerID.String()) - start := unversioned.Now() + start := metav1.Now() done := make(chan struct{}) go func() { defer close(done) @@ -437,7 +437,7 @@ func (m *kubeGenericRuntimeManager) executePreStopHook(pod *v1.Pod, containerID glog.V(3).Infof("preStop hook for container %q completed", containerID) } - return int64(unversioned.Now().Sub(start.Time).Seconds()) + return int64(metav1.Now().Sub(start.Time).Seconds()) } // restoreSpecsFromContainerLabels restores all information needed for killing a container. In some diff --git a/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go b/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go index be27ee9f0ab..3683bb6b90a 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -32,7 +32,7 @@ func TestLogOptions(t *testing.T) { var ( line = int64(8) bytes = int64(64) - timestamp = unversioned.Now() + timestamp = metav1.Now() sinceseconds = int64(10) ) for c, test := range []struct { diff --git a/pkg/kubelet/network/BUILD b/pkg/kubelet/network/BUILD index 9ea3ad4ec7d..94834a570c7 100644 --- a/pkg/kubelet/network/BUILD +++ b/pkg/kubelet/network/BUILD @@ -18,9 +18,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/componentconfig:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/util/errors:go_default_library", diff --git a/pkg/kubelet/network/exec/BUILD b/pkg/kubelet/network/exec/BUILD index 6f09240b616..cfc3b792d8a 100644 --- a/pkg/kubelet/network/exec/BUILD +++ b/pkg/kubelet/network/exec/BUILD @@ -18,8 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/apis/componentconfig:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/network:go_default_library", "//pkg/util/exec:go_default_library", diff --git a/pkg/kubelet/network/exec/exec.go b/pkg/kubelet/network/exec/exec.go index d3facf2fd70..0335872bdd7 100644 --- a/pkg/kubelet/network/exec/exec.go +++ b/pkg/kubelet/network/exec/exec.go @@ -65,7 +65,7 @@ import ( "strings" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/network" @@ -178,7 +178,7 @@ func (plugin *execNetworkPlugin) GetPodNetworkStatus(namespace string, name stri return nil, nil } findVersion := struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` }{} err = json.Unmarshal(out, &findVersion) if err != nil { diff --git a/pkg/kubelet/network/plugins.go b/pkg/kubelet/network/plugins.go index 651c9eceab2..4220f083fdf 100644 --- a/pkg/kubelet/network/plugins.go +++ b/pkg/kubelet/network/plugins.go @@ -24,7 +24,7 @@ import ( clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -86,7 +86,7 @@ type NetworkPlugin interface { // PodNetworkStatus stores the network status of a pod (currently just the primary IP address) // This struct represents version "v1beta1" type PodNetworkStatus struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // IP is the primary ipv4/ipv6 address of the pod. Among other things it is the address that - // - kube expects to be reachable across the cluster diff --git a/pkg/kubelet/oom_watcher.go b/pkg/kubelet/oom_watcher.go index be18463eda2..692ecbfd779 100644 --- a/pkg/kubelet/oom_watcher.go +++ b/pkg/kubelet/oom_watcher.go @@ -20,7 +20,7 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/events" cadvisorapi "github.com/google/cadvisor/info/v1" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" @@ -64,7 +64,7 @@ func (ow *realOOMWatcher) Start(ref *v1.ObjectReference) error { for event := range eventChannel.GetChannel() { glog.V(2).Infof("Got sys oom event from cadvisor: %v", event) - ow.recorder.PastEventf(ref, unversioned.Time{Time: event.Timestamp}, v1.EventTypeWarning, systemOOMEvent, "System OOM encountered") + ow.recorder.PastEventf(ref, metav1.Time{Time: event.Timestamp}, v1.EventTypeWarning, systemOOMEvent, "System OOM encountered") } glog.Errorf("Unexpectedly stopped receiving OOM notifications from cAdvisor") }() diff --git a/pkg/kubelet/prober/BUILD b/pkg/kubelet/prober/BUILD index dbd4e228bc2..55c94d9b81b 100644 --- a/pkg/kubelet/prober/BUILD +++ b/pkg/kubelet/prober/BUILD @@ -51,8 +51,8 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/record:go_default_library", "//pkg/kubelet/container:go_default_library", diff --git a/pkg/kubelet/prober/common_test.go b/pkg/kubelet/prober/common_test.go index b4ea6f0d45c..88e50633606 100644 --- a/pkg/kubelet/prober/common_test.go +++ b/pkg/kubelet/prober/common_test.go @@ -20,7 +20,7 @@ import ( "reflect" "sync" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" @@ -44,7 +44,7 @@ func getTestRunningStatus() v1.PodStatus { Name: testContainerName, ContainerID: testContainerID.String(), } - containerStatus.State.Running = &v1.ContainerStateRunning{StartedAt: unversioned.Now()} + containerStatus.State.Running = &v1.ContainerStateRunning{StartedAt: metav1.Now()} podStatus := v1.PodStatus{ Phase: v1.PodRunning, ContainerStatuses: []v1.ContainerStatus{containerStatus}, diff --git a/pkg/kubelet/prober/worker_test.go b/pkg/kubelet/prober/worker_test.go index 516a75dde4a..d786edaedb6 100644 --- a/pkg/kubelet/prober/worker_test.go +++ b/pkg/kubelet/prober/worker_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" @@ -49,7 +49,7 @@ func TestDoProbe(t *testing.T) { terminatedStatus := getTestRunningStatus() terminatedStatus.ContainerStatuses[0].State.Running = nil terminatedStatus.ContainerStatuses[0].State.Terminated = &v1.ContainerStateTerminated{ - StartedAt: unversioned.Now(), + StartedAt: metav1.Now(), } otherStatus := getTestRunningStatus() otherStatus.ContainerStatuses[0].Name = "otherContainer" diff --git a/pkg/kubelet/rkt/BUILD b/pkg/kubelet/rkt/BUILD index 13f49521a56..a2d50db1156 100644 --- a/pkg/kubelet/rkt/BUILD +++ b/pkg/kubelet/rkt/BUILD @@ -25,8 +25,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/record:go_default_library", "//pkg/credentialprovider:go_default_library", "//pkg/kubelet/container:go_default_library", diff --git a/pkg/kubelet/rkt/log.go b/pkg/kubelet/rkt/log.go index f6f1c059522..3ceee625f33 100644 --- a/pkg/kubelet/rkt/log.go +++ b/pkg/kubelet/rkt/log.go @@ -26,7 +26,7 @@ import ( "golang.org/x/net/context" rktapi "github.com/coreos/rkt/api/v1alpha" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/util/format" @@ -83,7 +83,7 @@ func (r *Runtime) GetContainerLogs(pod *v1.Pod, containerID kubecontainer.Contai var since int64 if logOptions.SinceSeconds != nil { - t := unversioned.Now().Add(-time.Duration(*logOptions.SinceSeconds) * time.Second) + t := metav1.Now().Add(-time.Duration(*logOptions.SinceSeconds) * time.Second) since = t.Unix() } if logOptions.SinceTime != nil { diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index d2b38274503..dcfdc722265 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -21,9 +21,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/auth/authenticator:go_default_library", "//pkg/auth/authorizer:go_default_library", "//pkg/auth/user:go_default_library", diff --git a/pkg/kubelet/server/remotecommand/BUILD b/pkg/kubelet/server/remotecommand/BUILD index cb90137e7fa..0761c02deaf 100644 --- a/pkg/kubelet/server/remotecommand/BUILD +++ b/pkg/kubelet/server/remotecommand/BUILD @@ -24,7 +24,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/httplog:go_default_library", "//pkg/types:go_default_library", "//pkg/util/exec:go_default_library", diff --git a/pkg/kubelet/server/remotecommand/attach.go b/pkg/kubelet/server/remotecommand/attach.go index 607f7338500..9cef7abc962 100644 --- a/pkg/kubelet/server/remotecommand/attach.go +++ b/pkg/kubelet/server/remotecommand/attach.go @@ -23,7 +23,7 @@ import ( "time" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/term" @@ -52,8 +52,8 @@ func ServeAttach(w http.ResponseWriter, req *http.Request, attacher Attacher, po runtime.HandleError(err) ctx.writeStatus(apierrors.NewInternalError(err)) } else { - ctx.writeStatus(&apierrors.StatusError{ErrStatus: unversioned.Status{ - Status: unversioned.StatusSuccess, + ctx.writeStatus(&apierrors.StatusError{ErrStatus: metav1.Status{ + Status: metav1.StatusSuccess, }}) } } diff --git a/pkg/kubelet/server/remotecommand/exec.go b/pkg/kubelet/server/remotecommand/exec.go index c8cfe01c8a5..d3319b1251e 100644 --- a/pkg/kubelet/server/remotecommand/exec.go +++ b/pkg/kubelet/server/remotecommand/exec.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/types" utilexec "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/runtime" @@ -32,8 +32,8 @@ import ( ) const ( - NonZeroExitCodeReason = unversioned.StatusReason("NonZeroExitCode") - ExitCodeCauseType = unversioned.CauseType("ExitCode") + NonZeroExitCodeReason = metav1.StatusReason("NonZeroExitCode") + ExitCodeCauseType = metav1.CauseType("ExitCode") ) // Executor knows how to execute a command in a container in a pod. @@ -60,11 +60,11 @@ func ServeExec(w http.ResponseWriter, req *http.Request, executor Executor, podN if err != nil { if exitErr, ok := err.(utilexec.ExitError); ok && exitErr.Exited() { rc := exitErr.ExitStatus() - ctx.writeStatus(&apierrors.StatusError{ErrStatus: unversioned.Status{ - Status: unversioned.StatusFailure, + ctx.writeStatus(&apierrors.StatusError{ErrStatus: metav1.Status{ + Status: metav1.StatusFailure, Reason: NonZeroExitCodeReason, - Details: &unversioned.StatusDetails{ - Causes: []unversioned.StatusCause{ + Details: &metav1.StatusDetails{ + Causes: []metav1.StatusCause{ { Type: ExitCodeCauseType, Message: fmt.Sprintf("%d", rc), @@ -79,8 +79,8 @@ func ServeExec(w http.ResponseWriter, req *http.Request, executor Executor, podN ctx.writeStatus(apierrors.NewInternalError(err)) } } else { - ctx.writeStatus(&apierrors.StatusError{ErrStatus: unversioned.Status{ - Status: unversioned.StatusSuccess, + ctx.writeStatus(&apierrors.StatusError{ErrStatus: metav1.Status{ + Status: metav1.StatusSuccess, }}) } } diff --git a/pkg/kubelet/server/remotecommand/httpstream.go b/pkg/kubelet/server/remotecommand/httpstream.go index 32e0ae82c75..4816e214462 100644 --- a/pkg/kubelet/server/remotecommand/httpstream.go +++ b/pkg/kubelet/server/remotecommand/httpstream.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream/spdy" "k8s.io/kubernetes/pkg/util/runtime" @@ -211,7 +211,7 @@ type protocolHandler interface { } // v4ProtocolHandler implements the V4 protocol version for streaming command execution. It only differs -// in from v3 in the error stream format using an json-marshaled unversioned.Status which carries +// in from v3 in the error stream format using an json-marshaled metav1.Status which carries // the process' exit code. type v4ProtocolHandler struct{} @@ -435,7 +435,7 @@ func handleResizeEvents(stream io.Reader, channel chan<- term.Size) { func v1WriteStatusFunc(stream io.WriteCloser) func(status *apierrors.StatusError) error { return func(status *apierrors.StatusError) error { - if status.Status().Status == unversioned.StatusSuccess { + if status.Status().Status == metav1.StatusSuccess { return nil // send error messages } _, err := stream.Write([]byte(status.Error())) diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index 28ebba6ef79..e8062da1db3 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/validation" "k8s.io/kubernetes/pkg/auth/authenticator" @@ -462,7 +462,7 @@ func (s *Server) getContainerLogs(request *restful.Request, response *restful.Re response.WriteError(http.StatusBadRequest, fmt.Errorf(`{"message": "Unable to decode query."}`)) return } - logOptions.TypeMeta = unversioned.TypeMeta{} + logOptions.TypeMeta = metav1.TypeMeta{} if errs := validation.ValidatePodLogOptions(logOptions); len(errs) > 0 { response.WriteError(apierrs.StatusUnprocessableEntity, fmt.Errorf(`{"message": "Invalid request."}`)) return diff --git a/pkg/kubelet/server/stats/BUILD b/pkg/kubelet/server/stats/BUILD index a2227c2d2d6..9baa3a37bb0 100644 --- a/pkg/kubelet/server/stats/BUILD +++ b/pkg/kubelet/server/stats/BUILD @@ -22,8 +22,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/kubelet/api/v1alpha1/stats:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", @@ -50,8 +50,8 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/kubelet/api/v1alpha1/stats:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", diff --git a/pkg/kubelet/server/stats/summary.go b/pkg/kubelet/server/stats/summary.go index 0ece3d2b9d9..43c10c5fbae 100644 --- a/pkg/kubelet/server/stats/summary.go +++ b/pkg/kubelet/server/stats/summary.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/pkg/kubelet/cm" @@ -266,7 +266,7 @@ func (sb *summaryBuilder) buildSummaryPods() []stats.PodStats { if containerName == leaky.PodInfraContainerName { // Special case for infrastructure container which is hidden from the user and has network stats podStats.Network = sb.containerInfoV2ToNetworkStats("pod:"+ref.Namespace+"_"+ref.Name, &cinfo) - podStats.StartTime = unversioned.NewTime(cinfo.Spec.CreationTime) + podStats.StartTime = metav1.NewTime(cinfo.Spec.CreationTime) } else { podStats.Containers = append(podStats.Containers, sb.containerInfoV2ToStats(containerName, &cinfo)) } @@ -310,7 +310,7 @@ func (sb *summaryBuilder) containerInfoV2ToStats( name string, info *cadvisorapiv2.ContainerInfo) stats.ContainerStats { cStats := stats.ContainerStats{ - StartTime: unversioned.NewTime(info.Spec.CreationTime), + StartTime: metav1.NewTime(info.Spec.CreationTime), Name: name, } cstat, found := sb.latestContainerStats(info) @@ -319,7 +319,7 @@ func (sb *summaryBuilder) containerInfoV2ToStats( } if info.Spec.HasCpu { cpuStats := stats.CPUStats{ - Time: unversioned.NewTime(cstat.Timestamp), + Time: metav1.NewTime(cstat.Timestamp), } if cstat.CpuInst != nil { cpuStats.UsageNanoCores = &cstat.CpuInst.Usage.Total @@ -333,7 +333,7 @@ func (sb *summaryBuilder) containerInfoV2ToStats( pageFaults := cstat.Memory.ContainerData.Pgfault majorPageFaults := cstat.Memory.ContainerData.Pgmajfault cStats.Memory = &stats.MemoryStats{ - Time: unversioned.NewTime(cstat.Timestamp), + Time: metav1.NewTime(cstat.Timestamp), UsageBytes: &cstat.Memory.Usage, WorkingSetBytes: &cstat.Memory.WorkingSet, RSSBytes: &cstat.Memory.RSS, @@ -372,7 +372,7 @@ func (sb *summaryBuilder) containerInfoV2ToNetworkStats(name string, info *cadvi for _, inter := range cstat.Network.Interfaces { if inter.Name == network.DefaultInterfaceName { return &stats.NetworkStats{ - Time: unversioned.NewTime(cstat.Timestamp), + Time: metav1.NewTime(cstat.Timestamp), RxBytes: &inter.RxBytes, RxErrors: &inter.RxErrors, TxBytes: &inter.TxBytes, @@ -426,7 +426,7 @@ func (sb *summaryBuilder) containerInfoV2ToUserDefinedMetrics(info *cadvisorapiv for _, specVal := range udmMap { udm = append(udm, stats.UserDefinedMetric{ UserDefinedMetricDescriptor: specVal.ref, - Time: unversioned.NewTime(specVal.time), + Time: metav1.NewTime(specVal.time), Value: specVal.value, }) } diff --git a/pkg/kubelet/server/stats/summary_test.go b/pkg/kubelet/server/stats/summary_test.go index 92c52c304bc..fa94b7d1e89 100644 --- a/pkg/kubelet/server/stats/summary_test.go +++ b/pkg/kubelet/server/stats/summary_test.go @@ -25,7 +25,7 @@ import ( fuzz "github.com/google/gofuzz" "github.com/stretchr/testify/assert" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" k8sv1 "k8s.io/kubernetes/pkg/api/v1" kubestats "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/pkg/kubelet/cm" @@ -440,7 +440,7 @@ func TestCustomMetrics(t *testing.T) { Type: kubestats.MetricGauge, Units: "per second", }, - Time: unversioned.NewTime(timestamp2), + Time: metav1.NewTime(timestamp2), Value: 100, }, kubestats.UserDefinedMetric{ @@ -449,7 +449,7 @@ func TestCustomMetrics(t *testing.T) { Type: kubestats.MetricCumulative, Units: "count", }, - Time: unversioned.NewTime(timestamp2), + Time: metav1.NewTime(timestamp2), Value: 2.1, }) } diff --git a/pkg/kubelet/status/BUILD b/pkg/kubelet/status/BUILD index eedb931fb9e..cd0e39b169e 100644 --- a/pkg/kubelet/status/BUILD +++ b/pkg/kubelet/status/BUILD @@ -20,9 +20,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/pod:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/pod:go_default_library", @@ -46,8 +46,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go index 8d0b9b4f23f..f7ccd51af48 100644 --- a/pkg/kubelet/status/status_manager.go +++ b/pkg/kubelet/status/status_manager.go @@ -26,7 +26,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" @@ -279,7 +279,7 @@ func (m *manager) updateStatusInternal(pod *v1.Pod, status v1.PodStatus, forceUp // Set ReadyCondition.LastTransitionTime. if _, readyCondition := v1.GetPodCondition(&status, v1.PodReady); readyCondition != nil { // Need to set LastTransitionTime. - lastTransitionTime := unversioned.Now() + lastTransitionTime := metav1.Now() _, oldReadyCondition := v1.GetPodCondition(&oldStatus, v1.PodReady) if oldReadyCondition != nil && readyCondition.Status == oldReadyCondition.Status { lastTransitionTime = oldReadyCondition.LastTransitionTime @@ -290,7 +290,7 @@ func (m *manager) updateStatusInternal(pod *v1.Pod, status v1.PodStatus, forceUp // Set InitializedCondition.LastTransitionTime. if _, initCondition := v1.GetPodCondition(&status, v1.PodInitialized); initCondition != nil { // Need to set LastTransitionTime. - lastTransitionTime := unversioned.Now() + lastTransitionTime := metav1.Now() _, oldInitCondition := v1.GetPodCondition(&oldStatus, v1.PodInitialized) if oldInitCondition != nil && initCondition.Status == oldInitCondition.Status { lastTransitionTime = oldInitCondition.LastTransitionTime @@ -303,7 +303,7 @@ func (m *manager) updateStatusInternal(pod *v1.Pod, status v1.PodStatus, forceUp status.StartTime = oldStatus.StartTime } else if status.StartTime.IsZero() { // if the status has no start time, we need to set an initial time - now := unversioned.Now() + now := metav1.Now() status.StartTime = &now } @@ -506,14 +506,14 @@ func (m *manager) needsReconcile(uid types.UID, status v1.PodStatus) bool { } // We add this function, because apiserver only supports *RFC3339* now, which means that the timestamp returned by -// apiserver has no nanosecond information. However, the timestamp returned by unversioned.Now() contains nanosecond, +// apiserver has no nanosecond information. However, the timestamp returned by metav1.Now() contains nanosecond, // so when we do comparison between status from apiserver and cached status, isStatusEqual() will always return false. // There is related issue #15262 and PR #15263 about this. // In fact, the best way to solve this is to do it on api side. However, for now, we normalize the status locally in // kubelet temporarily. // TODO(random-liu): Remove timestamp related logic after apiserver supports nanosecond or makes it consistent. func normalizeStatus(pod *v1.Pod, status *v1.PodStatus) *v1.PodStatus { - normalizeTimeStamp := func(t *unversioned.Time) { + normalizeTimeStamp := func(t *metav1.Time) { *t = t.Rfc3339Copy() } normalizeContainerState := func(c *v1.ContainerState) { diff --git a/pkg/kubelet/status/status_manager_test.go b/pkg/kubelet/status/status_manager_test.go index aaa8e90e93f..ccc3ad449ef 100644 --- a/pkg/kubelet/status/status_manager_test.go +++ b/pkg/kubelet/status/status_manager_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" @@ -145,8 +145,8 @@ func TestNewStatusPreservesPodStartTime(t *testing.T) { }, Status: v1.PodStatus{}, } - now := unversioned.Now() - startTime := unversioned.NewTime(now.Time.Add(-1 * time.Minute)) + now := metav1.Now() + startTime := metav1.NewTime(now.Time.Add(-1 * time.Minute)) pod.Status.StartTime = &startTime syncer.SetPodStatus(pod, getRandomPodStatus()) @@ -198,7 +198,7 @@ func TestChangedStatus(t *testing.T) { func TestChangedStatusKeepsStartTime(t *testing.T) { syncer := newTestManager(&fake.Clientset{}) testPod := getTestPod() - now := unversioned.Now() + now := metav1.Now() firstStatus := getRandomPodStatus() firstStatus.StartTime = &now syncer.SetPodStatus(testPod, firstStatus) @@ -375,7 +375,7 @@ func TestSyncBatchNoDeadlock(t *testing.T) { client.ClearActions() // Pod is terminated, but still running. - pod.DeletionTimestamp = new(unversioned.Time) + pod.DeletionTimestamp = new(metav1.Time) m.SetPodStatus(pod, getRandomPodStatus()) m.testSyncBatch() verifyActions(t, client, []core.Action{getAction, updateAction}) @@ -496,7 +496,7 @@ func TestStaticPod(t *testing.T) { assert.True(t, kubepod.IsStaticPod(staticPod), "SetUp error: staticPod") status := getRandomPodStatus() - now := unversioned.Now() + now := metav1.Now() status.StartTime = &now m.SetPodStatus(staticPod, status) @@ -740,13 +740,13 @@ func expectPodStatus(t *testing.T, m *manager, pod *v1.Pod) v1.PodStatus { func TestDeletePods(t *testing.T) { pod := getTestPod() // Set the deletion timestamp. - pod.DeletionTimestamp = new(unversioned.Time) + pod.DeletionTimestamp = new(metav1.Time) client := fake.NewSimpleClientset(pod) m := newTestManager(client) m.podManager.AddPod(pod) status := getRandomPodStatus() - now := unversioned.Now() + now := metav1.Now() status.StartTime = &now m.SetPodStatus(pod, status) @@ -769,7 +769,7 @@ func TestDoNotDeleteMirrorPods(t *testing.T) { kubetypes.ConfigMirrorAnnotationKey: "mirror", } // Set the deletion timestamp. - mirrorPod.DeletionTimestamp = new(unversioned.Time) + mirrorPod.DeletionTimestamp = new(metav1.Time) client := fake.NewSimpleClientset(mirrorPod) m := newTestManager(client) m.podManager.AddPod(staticPod) @@ -780,7 +780,7 @@ func TestDoNotDeleteMirrorPods(t *testing.T) { assert.Equal(t, m.podManager.TranslatePodUID(mirrorPod.UID), staticPod.UID) status := getRandomPodStatus() - now := unversioned.Now() + now := metav1.Now() status.StartTime = &now m.SetPodStatus(staticPod, status) diff --git a/pkg/kubelet/util/csr/BUILD b/pkg/kubelet/util/csr/BUILD index d9fdf72dc3f..e92b6cdc14c 100644 --- a/pkg/kubelet/util/csr/BUILD +++ b/pkg/kubelet/util/csr/BUILD @@ -15,9 +15,9 @@ go_library( srcs = ["csr.go"], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/certificates/v1alpha1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1:go_default_library", "//pkg/fields:go_default_library", "//pkg/types:go_default_library", diff --git a/pkg/kubelet/util/csr/csr.go b/pkg/kubelet/util/csr/csr.go index 1fc43ff4795..284a7ef4aee 100644 --- a/pkg/kubelet/util/csr/csr.go +++ b/pkg/kubelet/util/csr/csr.go @@ -20,7 +20,7 @@ import ( "crypto/x509/pkix" "fmt" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" unversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1" @@ -51,7 +51,7 @@ func RequestNodeCertificate(client unversionedcertificates.CertificateSigningReq req, err := client.Create(&certificates.CertificateSigningRequest{ // Username, UID, Groups will be injected by API server. - TypeMeta: unversioned.TypeMeta{Kind: "CertificateSigningRequest"}, + TypeMeta: metav1.TypeMeta{Kind: "CertificateSigningRequest"}, ObjectMeta: v1.ObjectMeta{GenerateName: "csr-"}, // TODO: For now, this is a request for a certificate with allowed usage of "TLS Web Client Authentication". diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 942e4fea5db..03941208ade 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -99,7 +99,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/apps:go_default_library", @@ -112,6 +111,7 @@ go_test( "//pkg/apis/certificates:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 2b58989dea5..29e532343ee 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/apps" @@ -246,7 +246,7 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - apiVersions := unversioned.APIVersions{} + apiVersions := metav1.APIVersions{} assert.NoError(decodeResponse(resp, &apiVersions)) assert.Equal(apiVersions.APIVersion, "") @@ -255,7 +255,7 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - resourceList := unversioned.APIResourceList{} + resourceList := metav1.APIResourceList{} assert.NoError(decodeResponse(resp, &resourceList)) assert.Equal(resourceList.APIVersion, "") @@ -264,7 +264,7 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - groupList := unversioned.APIGroupList{} + groupList := metav1.APIGroupList{} assert.NoError(decodeResponse(resp, &groupList)) assert.Equal(groupList.APIVersion, "") @@ -273,7 +273,7 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - group := unversioned.APIGroup{} + group := metav1.APIGroup{} assert.NoError(decodeResponse(resp, &group)) assert.Equal(group.APIVersion, "") @@ -282,7 +282,7 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - resourceList = unversioned.APIResourceList{} + resourceList = metav1.APIResourceList{} assert.NoError(decodeResponse(resp, &resourceList)) assert.Equal(resourceList.APIVersion, "") @@ -292,7 +292,7 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - group = unversioned.APIGroup{} + group = metav1.APIGroup{} assert.NoError(decodeResponse(resp, &group)) assert.Equal(group.APIVersion, "v1") @@ -303,7 +303,7 @@ func TestAPIVersionOfDiscoveryEndpoints(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - resourceList = unversioned.APIResourceList{} + resourceList = metav1.APIResourceList{} assert.NoError(decodeResponse(resp, &resourceList)) assert.Equal(resourceList.APIVersion, "v1") diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index acc78bfafa2..f746eae0e82 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -18,9 +18,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apiserver:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/registry/extensions/rest:go_default_library", diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 192f8ae12d0..402841bffd9 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apiserver" @@ -47,7 +47,7 @@ type dynamicLister struct { path string } -func (d dynamicLister) ListAPIResources() []unversioned.APIResource { +func (d dynamicLister) ListAPIResources() []metav1.APIResource { return d.m.getExistingThirdPartyResources(d.path) } @@ -89,7 +89,7 @@ func NewThirdPartyResourceServer(genericAPIServer *genericapiserver.GenericAPISe type thirdPartyEntry struct { // Map from plural resource name to entry storage map[string]*thirdpartyresourcedataetcd.REST - group unversioned.APIGroup + group metav1.APIGroup } // HasThirdPartyResource returns true if a particular third party resource currently installed. @@ -194,14 +194,14 @@ func (m *ThirdPartyResourceServer) ListThirdPartyResources() []string { return result } -func (m *ThirdPartyResourceServer) getExistingThirdPartyResources(path string) []unversioned.APIResource { - result := []unversioned.APIResource{} +func (m *ThirdPartyResourceServer) getExistingThirdPartyResources(path string) []metav1.APIResource { + result := []metav1.APIResource{} m.thirdPartyResourcesLock.Lock() defer m.thirdPartyResourcesLock.Unlock() entry := m.thirdPartyResources[path] if entry != nil { for key, obj := range entry.storage { - result = append(result, unversioned.APIResource{ + result = append(result, metav1.APIResource{ Name: key, Namespaced: true, Kind: obj.Kind(), @@ -218,7 +218,7 @@ func (m *ThirdPartyResourceServer) hasThirdPartyGroupStorage(path string) bool { return found } -func (m *ThirdPartyResourceServer) addThirdPartyResourceStorage(path, resource string, storage *thirdpartyresourcedataetcd.REST, apiGroup unversioned.APIGroup) { +func (m *ThirdPartyResourceServer) addThirdPartyResourceStorage(path, resource string, storage *thirdpartyresourcedataetcd.REST, apiGroup metav1.APIGroup) { m.thirdPartyResourcesLock.Lock() defer m.thirdPartyResourcesLock.Unlock() entry, found := m.thirdPartyResources[path] @@ -257,13 +257,13 @@ func (m *ThirdPartyResourceServer) InstallThirdPartyResource(rsrc *extensions.Th }) path := extensionsrest.MakeThirdPartyPath(group) - groupVersion := unversioned.GroupVersionForDiscovery{ + groupVersion := metav1.GroupVersionForDiscovery{ GroupVersion: group + "/" + rsrc.Versions[0].Name, Version: rsrc.Versions[0].Name, } - apiGroup := unversioned.APIGroup{ + apiGroup := metav1.APIGroup{ Name: group, - Versions: []unversioned.GroupVersionForDiscovery{groupVersion}, + Versions: []metav1.GroupVersionForDiscovery{groupVersion}, PreferredVersion: groupVersion, } diff --git a/pkg/quota/evaluator/core/BUILD b/pkg/quota/evaluator/core/BUILD index 513244fba42..12bf41d7da9 100644 --- a/pkg/quota/evaluator/core/BUILD +++ b/pkg/quota/evaluator/core/BUILD @@ -54,7 +54,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/quota:go_default_library", ], diff --git a/pkg/quota/evaluator/core/persistent_volume_claims_test.go b/pkg/quota/evaluator/core/persistent_volume_claims_test.go index 7d24ba38dd0..1f5aa64b3f0 100644 --- a/pkg/quota/evaluator/core/persistent_volume_claims_test.go +++ b/pkg/quota/evaluator/core/persistent_volume_claims_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/quota" ) @@ -35,8 +35,8 @@ func testVolumeClaim(name string, namespace string, spec api.PersistentVolumeCla func TestPersistentVolumeClaimsConstraintsFunc(t *testing.T) { validClaim := testVolumeClaim("foo", "ns", api.PersistentVolumeClaimSpec{ - Selector: &unversioned.LabelSelector{ - MatchExpressions: []unversioned.LabelSelectorRequirement{ + Selector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "key2", Operator: "Exists", @@ -54,8 +54,8 @@ func TestPersistentVolumeClaimsConstraintsFunc(t *testing.T) { }, }) missingStorage := testVolumeClaim("foo", "ns", api.PersistentVolumeClaimSpec{ - Selector: &unversioned.LabelSelector{ - MatchExpressions: []unversioned.LabelSelectorRequirement{ + Selector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "key2", Operator: "Exists", @@ -107,8 +107,8 @@ func TestPersistentVolumeClaimsConstraintsFunc(t *testing.T) { func TestPersistentVolumeClaimEvaluatorUsage(t *testing.T) { validClaim := testVolumeClaim("foo", "ns", api.PersistentVolumeClaimSpec{ - Selector: &unversioned.LabelSelector{ - MatchExpressions: []unversioned.LabelSelectorRequirement{ + Selector: &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "key2", Operator: "Exists", diff --git a/pkg/registry/apps/petset/BUILD b/pkg/registry/apps/petset/BUILD index 76d041d1744..832d13b497b 100644 --- a/pkg/registry/apps/petset/BUILD +++ b/pkg/registry/apps/petset/BUILD @@ -37,7 +37,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/apps:go_default_library", + "//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/pkg/registry/apps/petset/etcd/BUILD b/pkg/registry/apps/petset/etcd/BUILD index 1b48b204cb4..dae8c17d481 100644 --- a/pkg/registry/apps/petset/etcd/BUILD +++ b/pkg/registry/apps/petset/etcd/BUILD @@ -35,8 +35,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/apps:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/apps/petset/etcd/etcd_test.go b/pkg/registry/apps/petset/etcd/etcd_test.go index e09b22dcfa7..7af467a9632 100644 --- a/pkg/registry/apps/petset/etcd/etcd_test.go +++ b/pkg/registry/apps/petset/etcd/etcd_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -56,7 +56,7 @@ func validNewStatefulSet() *apps.StatefulSet { Labels: map[string]string{"a": "b"}, }, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, Template: api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: map[string]string{"a": "b"}, diff --git a/pkg/registry/apps/petset/strategy_test.go b/pkg/registry/apps/petset/strategy_test.go index ee981939adf..67c3a59ac6a 100644 --- a/pkg/registry/apps/petset/strategy_test.go +++ b/pkg/registry/apps/petset/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" ) @@ -49,7 +49,7 @@ func TestStatefulSetStrategy(t *testing.T) { ps := &apps.StatefulSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, Status: apps.StatefulSetStatus{Replicas: 3}, @@ -79,7 +79,7 @@ func TestStatefulSetStrategy(t *testing.T) { t.Errorf("Updating spec.Replicas is allowed on a statefulset: %v", errs) } - validPs.Spec.Selector = &unversioned.LabelSelector{MatchLabels: map[string]string{"a": "bar"}} + validPs.Spec.Selector = &metav1.LabelSelector{MatchLabels: map[string]string{"a": "bar"}} Strategy.PrepareForUpdate(ctx, validPs, ps) errs = Strategy.ValidateUpdate(ctx, validPs, ps) if len(errs) == 0 { @@ -112,7 +112,7 @@ func TestStatefulSetStatusStrategy(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault, ResourceVersion: "10"}, Spec: apps.StatefulSetSpec{ Replicas: 3, - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, Status: apps.StatefulSetStatus{ @@ -123,7 +123,7 @@ func TestStatefulSetStatusStrategy(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault, ResourceVersion: "9"}, Spec: apps.StatefulSetSpec{ Replicas: 1, - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, Status: apps.StatefulSetStatus{ diff --git a/pkg/registry/batch/cronjob/BUILD b/pkg/registry/batch/cronjob/BUILD index bacc33ad407..a81f52c287d 100644 --- a/pkg/registry/batch/cronjob/BUILD +++ b/pkg/registry/batch/cronjob/BUILD @@ -38,7 +38,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/pkg/registry/batch/cronjob/strategy_test.go b/pkg/registry/batch/cronjob/strategy_test.go index 98859096b54..d72147ffdbe 100644 --- a/pkg/registry/batch/cronjob/strategy_test.go +++ b/pkg/registry/batch/cronjob/strategy_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" ) @@ -71,7 +71,7 @@ func TestCronJobStrategy(t *testing.T) { if len(errs) != 0 { t.Errorf("Unexpected error validating %v", errs) } - now := unversioned.Now() + now := metav1.Now() updatedCronJob := &batch.CronJob{ ObjectMeta: api.ObjectMeta{Name: "bar", ResourceVersion: "4"}, Spec: batch.CronJobSpec{ @@ -125,7 +125,7 @@ func TestCronJobStatusStrategy(t *testing.T) { }, }, } - now := unversioned.Now() + now := metav1.Now() newCronJob := &batch.CronJob{ ObjectMeta: api.ObjectMeta{ Name: "mycronjob", diff --git a/pkg/registry/batch/job/BUILD b/pkg/registry/batch/job/BUILD index c21fad4f658..1bbdb2979ef 100644 --- a/pkg/registry/batch/job/BUILD +++ b/pkg/registry/batch/job/BUILD @@ -19,9 +19,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/batch/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", @@ -40,8 +40,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/batch:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/types:go_default_library", ], ) diff --git a/pkg/registry/batch/job/etcd/BUILD b/pkg/registry/batch/job/etcd/BUILD index 8701d94e44d..02c71d3342c 100644 --- a/pkg/registry/batch/job/etcd/BUILD +++ b/pkg/registry/batch/job/etcd/BUILD @@ -34,9 +34,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/batch/job/etcd/etcd_test.go b/pkg/registry/batch/job/etcd/etcd_test.go index fed6d91879a..25f0ca1a21d 100644 --- a/pkg/registry/batch/job/etcd/etcd_test.go +++ b/pkg/registry/batch/job/etcd/etcd_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" @@ -49,7 +49,7 @@ func validNewJob() *batch.Job { Spec: batch.JobSpec{ Completions: &completions, Parallelism: ¶llelism, - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, }, ManualSelector: newBool(true), @@ -87,7 +87,7 @@ func TestCreate(t *testing.T) { &batch.Job{ Spec: batch.JobSpec{ Completions: validJob.Spec.Completions, - Selector: &unversioned.LabelSelector{}, + Selector: &metav1.LabelSelector{}, Template: validJob.Spec.Template, }, }, @@ -112,7 +112,7 @@ func TestUpdate(t *testing.T) { // invalid updateFunc func(obj runtime.Object) runtime.Object { object := obj.(*batch.Job) - object.Spec.Selector = &unversioned.LabelSelector{} + object.Spec.Selector = &metav1.LabelSelector{} return object }, func(obj runtime.Object) runtime.Object { diff --git a/pkg/registry/batch/job/strategy.go b/pkg/registry/batch/job/strategy.go index fcd3e9fd7df..cbfebfa3f67 100644 --- a/pkg/registry/batch/job/strategy.go +++ b/pkg/registry/batch/job/strategy.go @@ -21,7 +21,7 @@ import ( "strconv" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/validation" "k8s.io/kubernetes/pkg/fields" @@ -99,7 +99,7 @@ func generateSelector(obj *batch.Job) { } // Select the controller-uid label. This is sufficient for uniqueness. if obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{} + obj.Spec.Selector = &metav1.LabelSelector{} } if obj.Spec.Selector.MatchLabels == nil { obj.Spec.Selector.MatchLabels = make(map[string]string) diff --git a/pkg/registry/batch/job/strategy_test.go b/pkg/registry/batch/job/strategy_test.go index 8d52c30c29c..b8e6a8ca555 100644 --- a/pkg/registry/batch/job/strategy_test.go +++ b/pkg/registry/batch/job/strategy_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/types" ) @@ -43,7 +43,7 @@ func TestJobStrategy(t *testing.T) { t.Errorf("Job should not allow create on update") } - validSelector := &unversioned.LabelSelector{ + validSelector := &metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, } validPodTemplateSpec := api.PodTemplateSpec{ @@ -159,7 +159,7 @@ func TestJobStatusStrategy(t *testing.T) { if StatusStrategy.AllowCreateOnUpdate() { t.Errorf("Job should not allow create on update") } - validSelector := &unversioned.LabelSelector{ + validSelector := &metav1.LabelSelector{ MatchLabels: map[string]string{"a": "b"}, } validPodTemplateSpec := api.PodTemplateSpec{ diff --git a/pkg/registry/core/namespace/BUILD b/pkg/registry/core/namespace/BUILD index 40b96df6ed5..e26ccbe096b 100644 --- a/pkg/registry/core/namespace/BUILD +++ b/pkg/registry/core/namespace/BUILD @@ -40,7 +40,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/pkg/registry/core/namespace/etcd/BUILD b/pkg/registry/core/namespace/etcd/BUILD index c8afe4cc61d..0dad8f97d42 100644 --- a/pkg/registry/core/namespace/etcd/BUILD +++ b/pkg/registry/core/namespace/etcd/BUILD @@ -19,7 +19,7 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/errors/storage:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/core/namespace:go_default_library", "//pkg/registry/generic:go_default_library", @@ -36,7 +36,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/core/namespace/etcd/etcd.go b/pkg/registry/core/namespace/etcd/etcd.go index 67ba3631a9f..b07d732d31a 100644 --- a/pkg/registry/core/namespace/etcd/etcd.go +++ b/pkg/registry/core/namespace/etcd/etcd.go @@ -23,7 +23,7 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" storageerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/core/namespace" "k8s.io/kubernetes/pkg/registry/generic" @@ -147,7 +147,7 @@ func (r *REST) Delete(ctx api.Context, name string, options *api.DeleteOptions) } // Set the deletion timestamp if needed if existingNamespace.DeletionTimestamp.IsZero() { - now := unversioned.Now() + now := metav1.Now() existingNamespace.DeletionTimestamp = &now } // Set the namespace phase to terminating, if needed diff --git a/pkg/registry/core/namespace/etcd/etcd_test.go b/pkg/registry/core/namespace/etcd/etcd_test.go index d588fa173d4..6f236aa1df6 100644 --- a/pkg/registry/core/namespace/etcd/etcd_test.go +++ b/pkg/registry/core/namespace/etcd/etcd_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" @@ -142,7 +142,7 @@ func TestDeleteNamespaceWithIncompleteFinalizers(t *testing.T) { defer storage.Store.DestroyFunc() key := "namespaces/foo" ctx := api.NewContext() - now := unversioned.Now() + now := metav1.Now() namespace := &api.Namespace{ ObjectMeta: api.ObjectMeta{ Name: "foo", @@ -167,7 +167,7 @@ func TestDeleteNamespaceWithCompleteFinalizers(t *testing.T) { defer storage.Store.DestroyFunc() key := "namespaces/foo" ctx := api.NewContext() - now := unversioned.Now() + now := metav1.Now() namespace := &api.Namespace{ ObjectMeta: api.ObjectMeta{ Name: "foo", diff --git a/pkg/registry/core/namespace/strategy_test.go b/pkg/registry/core/namespace/strategy_test.go index 674fc7bd7e7..aa0cb735db9 100644 --- a/pkg/registry/core/namespace/strategy_test.go +++ b/pkg/registry/core/namespace/strategy_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" ) @@ -73,7 +73,7 @@ func TestNamespaceStatusStrategy(t *testing.T) { if StatusStrategy.AllowCreateOnUpdate() { t.Errorf("Namespaces should not allow create on update") } - now := unversioned.Now() + now := metav1.Now() oldNamespace := &api.Namespace{ ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "10", DeletionTimestamp: &now}, Spec: api.NamespaceSpec{Finalizers: []api.FinalizerName{"kubernetes"}}, diff --git a/pkg/registry/core/pod/etcd/BUILD b/pkg/registry/core/pod/etcd/BUILD index 0920fe71d03..f2a1a8764df 100644 --- a/pkg/registry/core/pod/etcd/BUILD +++ b/pkg/registry/core/pod/etcd/BUILD @@ -22,8 +22,8 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/errors/storage:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/policy/internalversion:go_default_library", "//pkg/client/retry:go_default_library", diff --git a/pkg/registry/core/pod/etcd/etcd.go b/pkg/registry/core/pod/etcd/etcd.go index a6a198cea3f..0c94ab426d5 100644 --- a/pkg/registry/core/pod/etcd/etcd.go +++ b/pkg/registry/core/pod/etcd/etcd.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/kubelet/client" @@ -145,7 +145,7 @@ func (r *BindingREST) Create(ctx api.Context, obj runtime.Object) (out runtime.O } err = r.assignPod(ctx, binding.Name, binding.Target.Name, binding.Annotations) - out = &unversioned.Status{Status: unversioned.StatusSuccess} + out = &metav1.Status{Status: metav1.StatusSuccess} return } diff --git a/pkg/registry/core/pod/etcd/eviction.go b/pkg/registry/core/pod/etcd/eviction.go index b2839d3892b..6db49e81203 100644 --- a/pkg/registry/core/pod/etcd/eviction.go +++ b/pkg/registry/core/pod/etcd/eviction.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/client/retry" @@ -78,7 +78,7 @@ func (r *EvictionREST) Create(ctx api.Context, obj runtime.Object) (runtime.Obje return nil, err } pod := obj.(*api.Pod) - var rtStatus *unversioned.Status + var rtStatus *metav1.Status var pdbName string err = retry.RetryOnConflict(EvictionsRetry, func() error { pdbs, err := r.getPodDisruptionBudgets(ctx, pod) @@ -87,8 +87,8 @@ func (r *EvictionREST) Create(ctx api.Context, obj runtime.Object) (runtime.Obje } if len(pdbs) > 1 { - rtStatus = &unversioned.Status{ - Status: unversioned.StatusFailure, + rtStatus = &metav1.Status{ + Status: metav1.StatusFailure, Message: "This pod has more than one PodDisruptionBudget, which the eviction subresource does not support.", Code: 500, } @@ -106,8 +106,8 @@ func (r *EvictionREST) Create(ctx api.Context, obj runtime.Object) (runtime.Obje } if !ok { - rtStatus = &unversioned.Status{ - Status: unversioned.StatusFailure, + rtStatus = &metav1.Status{ + Status: metav1.StatusFailure, // TODO(mml): Include some more details about why the eviction is disallowed. // Ideally any such text is generated by the DisruptionController (offline). Message: "Cannot evict pod as it would violate the pod's disruption budget.", @@ -141,7 +141,7 @@ func (r *EvictionREST) Create(ctx api.Context, obj runtime.Object) (runtime.Obje } // Success! - return &unversioned.Status{Status: unversioned.StatusSuccess}, nil + return &metav1.Status{Status: metav1.StatusSuccess}, nil } // checkAndDecrement checks if the provided PodDisruptionBudget allows any disruption. @@ -160,13 +160,13 @@ func (r *EvictionREST) checkAndDecrement(namespace string, podName string, pdb p } pdb.Status.PodDisruptionsAllowed-- if pdb.Status.DisruptedPods == nil { - pdb.Status.DisruptedPods = make(map[string]unversioned.Time) + pdb.Status.DisruptedPods = make(map[string]metav1.Time) } // Eviction handler needs to inform the PDB controller that it is about to delete a pod // so it should not consider it as available in calculations when updating PodDisruptions allowed. // If the pod is not deleted within a reasonable time limit PDB controller will assume that it won't // be deleted at all and remove it from DisruptedPod map. - pdb.Status.DisruptedPods[podName] = unversioned.Time{Time: time.Now()} + pdb.Status.DisruptedPods[podName] = metav1.Time{Time: time.Now()} if _, err := r.podDisruptionBudgetClient.PodDisruptionBudgets(namespace).UpdateStatus(&pdb); err != nil { return false, err } @@ -190,7 +190,7 @@ func (r *EvictionREST) getPodDisruptionBudgets(ctx api.Context, pod *api.Pod) ([ if pdb.Namespace != pod.Namespace { continue } - selector, err := unversioned.LabelSelectorAsSelector(pdb.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(pdb.Spec.Selector) if err != nil { continue } diff --git a/pkg/registry/core/service/BUILD b/pkg/registry/core/service/BUILD index 31f1fb29f0b..6cf325cc9e3 100644 --- a/pkg/registry/core/service/BUILD +++ b/pkg/registry/core/service/BUILD @@ -25,8 +25,8 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/service:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/capabilities:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/registry/core/service/registry.go b/pkg/registry/core/service/registry.go index a90bc67aedb..1a0fa1df610 100644 --- a/pkg/registry/core/service/registry.go +++ b/pkg/registry/core/service/registry.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -33,7 +33,7 @@ type Registry interface { DeleteService(ctx api.Context, name string) error UpdateService(ctx api.Context, svc *api.Service) (*api.Service, error) WatchServices(ctx api.Context, options *api.ListOptions) (watch.Interface, error) - ExportService(ctx api.Context, name string, options unversioned.ExportOptions) (*api.Service, error) + ExportService(ctx api.Context, name string, options metav1.ExportOptions) (*api.Service, error) } // storage puts strong typing around storage calls @@ -90,7 +90,7 @@ func (s *storage) WatchServices(ctx api.Context, options *api.ListOptions) (watc // If StandardStorage implements rest.Exporter, returns exported service. // Otherwise export is not supported. -func (s *storage) ExportService(ctx api.Context, name string, options unversioned.ExportOptions) (*api.Service, error) { +func (s *storage) ExportService(ctx api.Context, name string, options metav1.ExportOptions) (*api.Service, error) { exporter, isExporter := s.StandardStorage.(rest.Exporter) if !isExporter { return nil, fmt.Errorf("export is not supported") diff --git a/pkg/registry/core/service/rest.go b/pkg/registry/core/service/rest.go index bcb14fa5584..68e69ed9c0f 100644 --- a/pkg/registry/core/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" apiservice "k8s.io/kubernetes/pkg/api/service" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/registry/core/endpoint" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" @@ -245,7 +245,7 @@ func (rs *REST) Delete(ctx api.Context, id string) (runtime.Object, error) { } } } - return &unversioned.Status{Status: unversioned.StatusSuccess}, nil + return &metav1.Status{Status: metav1.StatusSuccess}, nil } func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) { @@ -264,7 +264,7 @@ func (rs *REST) Watch(ctx api.Context, options *api.ListOptions) (watch.Interfac // Export returns Service stripped of cluster-specific information. // It implements rest.Exporter. -func (rs *REST) Export(ctx api.Context, name string, opts unversioned.ExportOptions) (runtime.Object, error) { +func (rs *REST) Export(ctx api.Context, name string, opts metav1.ExportOptions) (runtime.Object, error) { return rs.registry.ExportService(ctx, name, opts) } diff --git a/pkg/registry/extensions/controller/etcd/BUILD b/pkg/registry/extensions/controller/etcd/BUILD index b4223ddfef0..fb4a0f6db4f 100644 --- a/pkg/registry/extensions/controller/etcd/BUILD +++ b/pkg/registry/extensions/controller/etcd/BUILD @@ -18,9 +18,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/core/controller:go_default_library", "//pkg/registry/core/controller/etcd:go_default_library", "//pkg/registry/generic:go_default_library", @@ -36,8 +36,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", "//pkg/storage:go_default_library", diff --git a/pkg/registry/extensions/controller/etcd/etcd.go b/pkg/registry/extensions/controller/etcd/etcd.go index 0b9510e365a..5e27a08560e 100644 --- a/pkg/registry/extensions/controller/etcd/etcd.go +++ b/pkg/registry/extensions/controller/etcd/etcd.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/core/controller" "k8s.io/kubernetes/pkg/registry/core/controller/etcd" "k8s.io/kubernetes/pkg/registry/generic" @@ -115,7 +115,7 @@ func scaleFromRC(rc *api.ReplicationController) *extensions.Scale { }, Status: extensions.ScaleStatus{ Replicas: rc.Status.Replicas, - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: rc.Spec.Selector, }, }, diff --git a/pkg/registry/extensions/controller/etcd/etcd_test.go b/pkg/registry/extensions/controller/etcd/etcd_test.go index 5e4407c1cb5..82877e11815 100644 --- a/pkg/registry/extensions/controller/etcd/etcd_test.go +++ b/pkg/registry/extensions/controller/etcd/etcd_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" @@ -80,7 +80,7 @@ var validScale = extensions.Scale{ }, Status: extensions.ScaleStatus{ Replicas: 0, - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: validPodTemplate.Template.Labels, }, }, diff --git a/pkg/registry/extensions/daemonset/etcd/BUILD b/pkg/registry/extensions/daemonset/etcd/BUILD index e9da6da9084..6ffbf452e14 100644 --- a/pkg/registry/extensions/daemonset/etcd/BUILD +++ b/pkg/registry/extensions/daemonset/etcd/BUILD @@ -34,8 +34,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/extensions/daemonset/etcd/etcd_test.go b/pkg/registry/extensions/daemonset/etcd/etcd_test.go index 470763fd884..aa93f081454 100644 --- a/pkg/registry/extensions/daemonset/etcd/etcd_test.go +++ b/pkg/registry/extensions/daemonset/etcd/etcd_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -44,7 +44,7 @@ func newValidDaemonSet() *extensions.DaemonSet { Namespace: api.NamespaceDefault, }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, Template: api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: map[string]string{"a": "b"}, @@ -80,7 +80,7 @@ func TestCreate(t *testing.T) { // invalid (invalid selector) &extensions.DaemonSet{ Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{}}, Template: validDaemonSet.Spec.Template, }, }, diff --git a/pkg/registry/extensions/deployment/BUILD b/pkg/registry/extensions/deployment/BUILD index cfb8f86b663..e899a93c037 100644 --- a/pkg/registry/extensions/deployment/BUILD +++ b/pkg/registry/extensions/deployment/BUILD @@ -21,9 +21,9 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/registry/extensions/deployment/etcd/BUILD b/pkg/registry/extensions/deployment/etcd/BUILD index 756bbeb11a2..bd4772aba82 100644 --- a/pkg/registry/extensions/deployment/etcd/BUILD +++ b/pkg/registry/extensions/deployment/etcd/BUILD @@ -19,9 +19,9 @@ go_library( "//pkg/api/errors:go_default_library", "//pkg/api/errors/storage:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/registry/cachesize:go_default_library", "//pkg/registry/extensions/deployment:go_default_library", "//pkg/registry/generic:go_default_library", @@ -41,8 +41,8 @@ go_test( "//pkg/api/errors:go_default_library", "//pkg/api/errors/storage:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/extensions/deployment/etcd/etcd.go b/pkg/registry/extensions/deployment/etcd/etcd.go index 66e246000fd..464ee4f089a 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd.go +++ b/pkg/registry/extensions/deployment/etcd/etcd.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/registry/cachesize" @@ -160,7 +160,7 @@ func (r *RollbackREST) Create(ctx api.Context, obj runtime.Object) (runtime.Obje if err != nil { return nil, err } - return &unversioned.Status{ + return &metav1.Status{ Message: fmt.Sprintf("rollback request for deployment %q succeeded", rollback.Name), Code: http.StatusOK, }, nil diff --git a/pkg/registry/extensions/deployment/etcd/etcd_test.go b/pkg/registry/extensions/deployment/etcd/etcd_test.go index 319f723a67d..b98754301c8 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd_test.go +++ b/pkg/registry/extensions/deployment/etcd/etcd_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -55,7 +55,7 @@ func validNewDeployment() *extensions.Deployment { Namespace: namespace, }, Spec: extensions.DeploymentSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, Strategy: extensions.DeploymentStrategy{ Type: extensions.RollingUpdateDeploymentStrategyType, RollingUpdate: &extensions.RollingUpdateDeployment{ @@ -102,7 +102,7 @@ func TestCreate(t *testing.T) { // invalid (invalid selector) &extensions.Deployment{ Spec: extensions.DeploymentSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{}}, Template: validDeployment.Spec.Template, }, }, @@ -136,7 +136,7 @@ func TestUpdate(t *testing.T) { }, func(obj runtime.Object) runtime.Object { object := obj.(*extensions.Deployment) - object.Spec.Selector = &unversioned.LabelSelector{MatchLabels: map[string]string{}} + object.Spec.Selector = &metav1.LabelSelector{MatchLabels: map[string]string{}} return object }, ) diff --git a/pkg/registry/extensions/deployment/strategy.go b/pkg/registry/extensions/deployment/strategy.go index e2961748262..7dd958edbb6 100644 --- a/pkg/registry/extensions/deployment/strategy.go +++ b/pkg/registry/extensions/deployment/strategy.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/controller/deployment/util" @@ -90,7 +90,7 @@ func (deploymentStrategy) PrepareForUpdate(ctx api.Context, obj, old runtime.Obj if newDeployment.Annotations == nil { newDeployment.Annotations = make(map[string]string) } - now := unversioned.Now() + now := metav1.Now() newDeployment.Annotations[util.SelectorUpdateAnnotation] = now.Format(time.RFC3339) } } diff --git a/pkg/registry/extensions/networkpolicy/BUILD b/pkg/registry/extensions/networkpolicy/BUILD index 1b7c26c8be7..afe861fbce0 100644 --- a/pkg/registry/extensions/networkpolicy/BUILD +++ b/pkg/registry/extensions/networkpolicy/BUILD @@ -37,7 +37,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/pkg/registry/extensions/networkpolicy/etcd/BUILD b/pkg/registry/extensions/networkpolicy/etcd/BUILD index 250fce3c58c..1b372b18809 100644 --- a/pkg/registry/extensions/networkpolicy/etcd/BUILD +++ b/pkg/registry/extensions/networkpolicy/etcd/BUILD @@ -33,8 +33,8 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go b/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go index 1c16dd24647..b5dc11c5cfc 100644 --- a/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go +++ b/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -57,12 +57,12 @@ func validNewNetworkPolicy() *extensions.NetworkPolicy { Labels: map[string]string{"a": "b"}, }, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, + PodSelector: metav1.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, Ingress: []extensions.NetworkPolicyIngressRule{ { From: []extensions.NetworkPolicyPeer{ { - PodSelector: &unversioned.LabelSelector{MatchLabels: map[string]string{"c": "d"}}, + PodSelector: &metav1.LabelSelector{MatchLabels: map[string]string{"c": "d"}}, }, }, Ports: []extensions.NetworkPolicyPort{ @@ -93,7 +93,7 @@ func TestCreate(t *testing.T) { // invalid (invalid selector) &extensions.NetworkPolicy{ Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{MatchLabels: invalidSelector}, + PodSelector: metav1.LabelSelector{MatchLabels: invalidSelector}, Ingress: []extensions.NetworkPolicyIngressRule{}, }, }, @@ -121,7 +121,7 @@ func TestUpdate(t *testing.T) { }, func(obj runtime.Object) runtime.Object { object := obj.(*extensions.NetworkPolicy) - object.Spec.PodSelector = unversioned.LabelSelector{MatchLabels: map[string]string{}} + object.Spec.PodSelector = metav1.LabelSelector{MatchLabels: map[string]string{}} return object }, ) diff --git a/pkg/registry/extensions/networkpolicy/strategy_test.go b/pkg/registry/extensions/networkpolicy/strategy_test.go index 11b7045307e..b130fda0bc5 100644 --- a/pkg/registry/extensions/networkpolicy/strategy_test.go +++ b/pkg/registry/extensions/networkpolicy/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -37,7 +37,7 @@ func TestNetworkPolicyStrategy(t *testing.T) { np := &extensions.NetworkPolicy{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.NetworkPolicySpec{ - PodSelector: unversioned.LabelSelector{MatchLabels: validMatchLabels}, + PodSelector: metav1.LabelSelector{MatchLabels: validMatchLabels}, Ingress: []extensions.NetworkPolicyIngressRule{}, }, } diff --git a/pkg/registry/extensions/replicaset/BUILD b/pkg/registry/extensions/replicaset/BUILD index 7f4700b2b92..67953f656f4 100644 --- a/pkg/registry/extensions/replicaset/BUILD +++ b/pkg/registry/extensions/replicaset/BUILD @@ -40,7 +40,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/pkg/registry/extensions/replicaset/etcd/BUILD b/pkg/registry/extensions/replicaset/etcd/BUILD index 7352f24990f..a3ccd7d13b5 100644 --- a/pkg/registry/extensions/replicaset/etcd/BUILD +++ b/pkg/registry/extensions/replicaset/etcd/BUILD @@ -38,8 +38,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", diff --git a/pkg/registry/extensions/replicaset/etcd/etcd_test.go b/pkg/registry/extensions/replicaset/etcd/etcd_test.go index 4cd2bf362cd..aa8e249ef4e 100644 --- a/pkg/registry/extensions/replicaset/etcd/etcd_test.go +++ b/pkg/registry/extensions/replicaset/etcd/etcd_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -60,7 +60,7 @@ func validNewReplicaSet() *extensions.ReplicaSet { Namespace: api.NamespaceDefault, }, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, Template: api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: map[string]string{"a": "b"}, @@ -101,7 +101,7 @@ func TestCreate(t *testing.T) { &extensions.ReplicaSet{ Spec: extensions.ReplicaSetSpec{ Replicas: 2, - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{}}, Template: validReplicaSet.Spec.Template, }, }, @@ -130,7 +130,7 @@ func TestUpdate(t *testing.T) { }, func(obj runtime.Object) runtime.Object { object := obj.(*extensions.ReplicaSet) - object.Spec.Selector = &unversioned.LabelSelector{MatchLabels: map[string]string{}} + object.Spec.Selector = &metav1.LabelSelector{MatchLabels: map[string]string{}} return object }, ) diff --git a/pkg/registry/extensions/replicaset/strategy_test.go b/pkg/registry/extensions/replicaset/strategy_test.go index 30cc5acbc31..19187622557 100644 --- a/pkg/registry/extensions/replicaset/strategy_test.go +++ b/pkg/registry/extensions/replicaset/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" ) @@ -49,7 +49,7 @@ func TestReplicaSetStrategy(t *testing.T) { rs := &extensions.ReplicaSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, Status: extensions.ReplicaSetStatus{ @@ -108,7 +108,7 @@ func TestReplicaSetStatusStrategy(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault, ResourceVersion: "10"}, Spec: extensions.ReplicaSetSpec{ Replicas: 3, - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, Status: extensions.ReplicaSetStatus{ @@ -120,7 +120,7 @@ func TestReplicaSetStatusStrategy(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault, ResourceVersion: "9"}, Spec: extensions.ReplicaSetSpec{ Replicas: 1, - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, Template: validPodTemplate.Template, }, Status: extensions.ReplicaSetStatus{ diff --git a/pkg/registry/extensions/thirdpartyresourcedata/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/BUILD index 4af83bd9304..c7cf6b09a63 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/BUILD @@ -24,13 +24,13 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/util:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/extensions/validation:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/runtime:go_default_library", @@ -56,10 +56,10 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/watch/versioned:go_default_library", diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go index 936c45818ff..f1fc5307bdf 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiutil "k8s.io/kubernetes/pkg/api/util" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" @@ -259,7 +259,7 @@ func (t *thirdPartyResourceDataDecoder) populate(data []byte) (runtime.Object, * } func (t *thirdPartyResourceDataDecoder) populateFromObject(mapObj map[string]interface{}, data []byte) (runtime.Object, *schema.GroupVersionKind, error) { - typeMeta := unversioned.TypeMeta{} + typeMeta := metav1.TypeMeta{} if err := json.Unmarshal(data, &typeMeta); err != nil { return nil, nil, err } @@ -318,7 +318,7 @@ func IsThirdPartyObject(rawData []byte, gvk *schema.GroupVersionKind) (isThirdPa if err != nil { return false, nil, err } - metadata := unversioned.TypeMeta{} + metadata := metav1.TypeMeta{} if err = json.Unmarshal(data, &metadata); err != nil { return false, nil, err } @@ -507,7 +507,7 @@ func (t *thirdPartyResourceDataEncoder) Encode(obj runtime.Object, stream io.Wri Kind string `json:"kind,omitempty"` Items []json.RawMessage `json:"items"` // +optional - Metadata unversioned.ListMeta `json:"metadata,omitempty"` + Metadata metav1.ListMeta `json:"metadata,omitempty"` // +optional APIVersion string `json:"apiVersion,omitempty"` }{ @@ -538,7 +538,7 @@ func (t *thirdPartyResourceDataEncoder) Encode(obj runtime.Object, stream io.Wri } return nil - case *unversioned.Status, *unversioned.APIResourceList: + case *metav1.Status, *metav1.APIResourceList: return t.delegate.Encode(obj, stream) default: return fmt.Errorf("unexpected object to encode: %#v", obj) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go index b9a15dd4aba..9fca372a00e 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" @@ -35,7 +35,7 @@ import ( ) type Foo struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` api.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` SomeField string `json:"someField"` @@ -47,8 +47,8 @@ func (*Foo) GetObjectKind() schema.ObjectKind { } type FooList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"` Items []Foo `json:"items"` } @@ -64,7 +64,7 @@ func TestCodec(t *testing.T) { into: &runtime.VersionedObjects{}, obj: &Foo{ ObjectMeta: api.ObjectMeta{Name: "bar"}, - TypeMeta: unversioned.TypeMeta{APIVersion: "company.com/v1", Kind: "Foo"}, + TypeMeta: metav1.TypeMeta{APIVersion: "company.com/v1", Kind: "Foo"}, }, expectErr: false, name: "versioned objects list", @@ -77,7 +77,7 @@ func TestCodec(t *testing.T) { { obj: &Foo{ ObjectMeta: api.ObjectMeta{Name: "bar"}, - TypeMeta: unversioned.TypeMeta{APIVersion: "company.com/v1", Kind: "Foo"}, + TypeMeta: metav1.TypeMeta{APIVersion: "company.com/v1", Kind: "Foo"}, }, name: "basic", }, @@ -85,7 +85,7 @@ func TestCodec(t *testing.T) { into: &extensions.ThirdPartyResourceData{}, obj: &Foo{ ObjectMeta: api.ObjectMeta{Name: "bar"}, - TypeMeta: unversioned.TypeMeta{Kind: "ThirdPartyResourceData"}, + TypeMeta: metav1.TypeMeta{Kind: "ThirdPartyResourceData"}, }, expectErr: true, name: "broken kind", @@ -93,7 +93,7 @@ func TestCodec(t *testing.T) { { obj: &Foo{ ObjectMeta: api.ObjectMeta{Name: "bar", ResourceVersion: "baz"}, - TypeMeta: unversioned.TypeMeta{APIVersion: "company.com/v1", Kind: "Foo"}, + TypeMeta: metav1.TypeMeta{APIVersion: "company.com/v1", Kind: "Foo"}, }, name: "resource version", }, @@ -101,9 +101,9 @@ func TestCodec(t *testing.T) { obj: &Foo{ ObjectMeta: api.ObjectMeta{ Name: "bar", - CreationTimestamp: unversioned.Time{Time: time.Unix(100, 0)}, + CreationTimestamp: metav1.Time{Time: time.Unix(100, 0)}, }, - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: "company.com/v1", Kind: "Foo", }, @@ -117,7 +117,7 @@ func TestCodec(t *testing.T) { ResourceVersion: "baz", Labels: map[string]string{"foo": "bar", "baz": "blah"}, }, - TypeMeta: unversioned.TypeMeta{APIVersion: "company.com/v1", Kind: "Foo"}, + TypeMeta: metav1.TypeMeta{APIVersion: "company.com/v1", Kind: "Foo"}, }, name: "labels", }, @@ -272,7 +272,7 @@ func TestThirdPartyResourceDataListEncoding(t *testing.T) { targetOutput := struct { Kind string `json:"kind,omitempty"` Items []json.RawMessage `json:"items"` - Metadata unversioned.ListMeta `json:"metadata,omitempty"` + Metadata metav1.ListMeta `json:"metadata,omitempty"` APIVersion string `json:"apiVersion,omitempty"` }{} err = json.Unmarshal(buf.Bytes(), &targetOutput) diff --git a/pkg/registry/generic/registry/BUILD b/pkg/registry/generic/registry/BUILD index 94aec9dcede..e2dc9c689b4 100644 --- a/pkg/registry/generic/registry/BUILD +++ b/pkg/registry/generic/registry/BUILD @@ -25,8 +25,8 @@ go_library( "//pkg/api/errors/storage:go_default_library", "//pkg/api/meta:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/validation/path:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic:go_default_library", @@ -59,7 +59,7 @@ go_test( "//pkg/api/meta:go_default_library", "//pkg/api/rest:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/core/pod:go_default_library", diff --git a/pkg/registry/generic/registry/decorated_watcher.go b/pkg/registry/generic/registry/decorated_watcher.go index 2bf3049af5a..cdd320d5f4e 100644 --- a/pkg/registry/generic/registry/decorated_watcher.go +++ b/pkg/registry/generic/registry/decorated_watcher.go @@ -22,7 +22,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -85,11 +85,11 @@ func (d *decoratedWatcher) ResultChan() <-chan watch.Event { } func makeStatusErrorEvent(err error) watch.Event { - status := &unversioned.Status{ - Status: unversioned.StatusFailure, + status := &metav1.Status{ + Status: metav1.StatusFailure, Message: err.Error(), Code: http.StatusInternalServerError, - Reason: unversioned.StatusReasonInternalError, + Reason: metav1.StatusReasonInternalError, } return watch.Event{ Type: watch.Error, diff --git a/pkg/registry/generic/registry/store.go b/pkg/registry/generic/registry/store.go index 843ac4fa54a..98dd7522c4b 100644 --- a/pkg/registry/generic/registry/store.go +++ b/pkg/registry/generic/registry/store.go @@ -28,7 +28,7 @@ import ( storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation/path" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -329,7 +329,7 @@ func (e *Store) deleteForEmptyFinalizers(ctx api.Context, name, key string, obj if storage.IsNotFound(err) { _, err := e.finalizeDelete(obj, true) // clients are expecting an updated object if a PUT succeeded, - // but finalizeDelete returns a unversioned.Status, so return + // but finalizeDelete returns a metav1.Status, so return // the object in the request instead. return obj, false, err } @@ -337,7 +337,7 @@ func (e *Store) deleteForEmptyFinalizers(ctx api.Context, name, key string, obj } _, err := e.finalizeDelete(out, true) // clients are expecting an updated object if a PUT succeeded, but - // finalizeDelete returns a unversioned.Status, so return the object in + // finalizeDelete returns a metav1.Status, so return the object in // the request instead. return obj, false, err } @@ -556,7 +556,7 @@ func markAsDeleting(obj runtime.Object) (err error) { if kerr != nil { return kerr } - now := unversioned.NewTime(time.Now()) + now := metav1.NewTime(time.Now()) // This handles Generation bump for resources that don't support graceful deletion. For resources that support graceful deletion is handle in pkg/api/rest/delete.go if objectMeta.DeletionTimestamp == nil && objectMeta.Generation > 0 { objectMeta.Generation++ @@ -851,7 +851,7 @@ func (e *Store) finalizeDelete(obj runtime.Object, runHooks bool) (runtime.Objec } return obj, nil } - return &unversioned.Status{Status: unversioned.StatusSuccess}, nil + return &metav1.Status{Status: metav1.StatusSuccess}, nil } // Watch makes a matcher for the given label and field, and calls @@ -925,7 +925,7 @@ func exportObjectMeta(accessor meta.Object, exact bool) { if !exact { accessor.SetNamespace("") } - accessor.SetCreationTimestamp(unversioned.Time{}) + accessor.SetCreationTimestamp(metav1.Time{}) accessor.SetDeletionTimestamp(nil) accessor.SetResourceVersion("") accessor.SetSelfLink("") @@ -935,7 +935,7 @@ func exportObjectMeta(accessor meta.Object, exact bool) { } // Implements the rest.Exporter interface -func (e *Store) Export(ctx api.Context, name string, opts unversioned.ExportOptions) (runtime.Object, error) { +func (e *Store) Export(ctx api.Context, name string, opts metav1.ExportOptions) (runtime.Object, error) { obj, err := e.Get(ctx, name) if err != nil { return nil, err diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/registry/generic/registry/store_test.go index 3f0f05f5e58..567897c55db 100644 --- a/pkg/registry/generic/registry/store_test.go +++ b/pkg/registry/generic/registry/store_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/core/pod" @@ -502,7 +502,7 @@ func TestStoreCustomExport(t *testing.T) { t.Errorf("Unexpected error updating podA") } - obj, err := registry.Export(testContext, podA.Name, unversioned.ExportOptions{}) + obj, err := registry.Export(testContext, podA.Name, metav1.ExportOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -546,7 +546,7 @@ func TestStoreBasicExport(t *testing.T) { t.Errorf("Unexpected error updating podA") } - obj, err := registry.Export(testContext, podA.Name, unversioned.ExportOptions{}) + obj, err := registry.Export(testContext, podA.Name, metav1.ExportOptions{}) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -623,7 +623,7 @@ func TestStoreDelete(t *testing.T) { // in prior operation, but the pod remains with deletion timestamp // and grace period set to 0. func TestGracefulStoreCanDeleteIfExistingGracePeriodZero(t *testing.T) { - deletionTimestamp := unversioned.NewTime(time.Now()) + deletionTimestamp := metav1.NewTime(time.Now()) deletionGracePeriodSeconds := int64(0) initialGeneration := int64(1) pod := &api.Pod{ diff --git a/pkg/registry/policy/poddisruptionbudget/BUILD b/pkg/registry/policy/poddisruptionbudget/BUILD index aa1291ace1a..c613d336109 100644 --- a/pkg/registry/policy/poddisruptionbudget/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/BUILD @@ -37,7 +37,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/util/intstr:go_default_library", ], diff --git a/pkg/registry/policy/poddisruptionbudget/etcd/BUILD b/pkg/registry/policy/poddisruptionbudget/etcd/BUILD index 51a20ee966e..f39103e3fc4 100644 --- a/pkg/registry/policy/poddisruptionbudget/etcd/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/etcd/BUILD @@ -35,7 +35,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/rest:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/policy:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", diff --git a/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go b/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go index ab88ff987f4..345aeb87894 100644 --- a/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go +++ b/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" @@ -57,7 +57,7 @@ func validNewPodDisruptionBudget() *policy.PodDisruptionBudget { Labels: map[string]string{"a": "b"}, }, Spec: policy.PodDisruptionBudgetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"a": "b"}}, MinAvailable: intstr.FromInt(7), }, Status: policy.PodDisruptionBudgetStatus{}, diff --git a/pkg/registry/policy/poddisruptionbudget/strategy_test.go b/pkg/registry/policy/poddisruptionbudget/strategy_test.go index 84e8413e62d..15f4c97a8f1 100644 --- a/pkg/registry/policy/poddisruptionbudget/strategy_test.go +++ b/pkg/registry/policy/poddisruptionbudget/strategy_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -39,7 +39,7 @@ func TestPodDisruptionBudgetStrategy(t *testing.T) { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, Spec: policy.PodDisruptionBudgetSpec{ MinAvailable: intstr.FromInt(3), - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, }, } @@ -68,7 +68,7 @@ func TestPodDisruptionBudgetStrategy(t *testing.T) { } // Changing the selector? No. - newPdb.Spec.Selector = &unversioned.LabelSelector{MatchLabels: map[string]string{"a": "bar"}} + newPdb.Spec.Selector = &metav1.LabelSelector{MatchLabels: map[string]string{"a": "bar"}} Strategy.PrepareForUpdate(ctx, newPdb, pdb) errs = Strategy.ValidateUpdate(ctx, newPdb, pdb) if len(errs) == 0 { @@ -97,7 +97,7 @@ func TestPodDisruptionBudgetStatusStrategy(t *testing.T) { oldPdb := &policy.PodDisruptionBudget{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault, ResourceVersion: "10"}, Spec: policy.PodDisruptionBudgetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, MinAvailable: intstr.FromInt(3), }, Status: policy.PodDisruptionBudgetStatus{ @@ -110,7 +110,7 @@ func TestPodDisruptionBudgetStatusStrategy(t *testing.T) { newPdb := &policy.PodDisruptionBudget{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault, ResourceVersion: "9"}, Spec: policy.PodDisruptionBudgetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: validSelector}, + Selector: &metav1.LabelSelector{MatchLabels: validSelector}, MinAvailable: intstr.FromInt(2), }, Status: policy.PodDisruptionBudgetStatus{ diff --git a/pkg/registry/registrytest/BUILD b/pkg/registry/registrytest/BUILD index 45474d51492..eba8947f7b8 100644 --- a/pkg/registry/registrytest/BUILD +++ b/pkg/registry/registrytest/BUILD @@ -26,8 +26,8 @@ go_library( "//pkg/api/meta:go_default_library", "//pkg/api/rest/resttest:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/generic/registry:go_default_library", diff --git a/pkg/registry/registrytest/service.go b/pkg/registry/registrytest/service.go index 89ca649122b..e139f1fb76c 100644 --- a/pkg/registry/registrytest/service.go +++ b/pkg/registry/registrytest/service.go @@ -20,7 +20,7 @@ import ( "sync" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/watch" ) @@ -119,7 +119,7 @@ func (r *ServiceRegistry) WatchServices(ctx api.Context, options *api.ListOption return nil, r.Err } -func (r *ServiceRegistry) ExportService(ctx api.Context, name string, options unversioned.ExportOptions) (*api.Service, error) { +func (r *ServiceRegistry) ExportService(ctx api.Context, name string, options metav1.ExportOptions) (*api.Service, error) { r.mu.Lock() defer r.mu.Unlock() diff --git a/pkg/runtime/BUILD b/pkg/runtime/BUILD index 9df2361a4dc..925f9b37e99 100644 --- a/pkg/runtime/BUILD +++ b/pkg/runtime/BUILD @@ -35,7 +35,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/meta/metatypes:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/conversion/queryparams:go_default_library", "//pkg/runtime/schema:go_default_library", @@ -72,10 +72,10 @@ go_test( "//pkg/api/meta:go_default_library", "//pkg/api/meta/metatypes:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/runtime/serializer/BUILD b/pkg/runtime/serializer/BUILD index 68e721e55d8..19d2d41ebd3 100644 --- a/pkg/runtime/serializer/BUILD +++ b/pkg/runtime/serializer/BUILD @@ -34,7 +34,7 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/pkg/runtime/serializer/codec_test.go b/pkg/runtime/serializer/codec_test.go index bee1f9ebefe..c9ced5970db 100644 --- a/pkg/runtime/serializer/codec_test.go +++ b/pkg/runtime/serializer/codec_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" @@ -172,7 +172,7 @@ func GetTestScheme() (*runtime.Scheme, runtime.Codec) { s.AddKnownTypeWithName(externalGV.WithKind("TestType3"), &ExternalTestType1{}) s.AddKnownTypeWithName(externalGV2.WithKind("TestType1"), &ExternalTestType1{}) - s.AddUnversionedTypes(externalGV, &unversioned.Status{}) + s.AddUnversionedTypes(externalGV, &metav1.Status{}) cf := newCodecFactory(s, newSerializersForScheme(s, testMetaFactory{})) codec := cf.LegacyCodec(schema.GroupVersion{Version: "v1"}) @@ -390,7 +390,7 @@ func GetDirectCodecTestScheme() *runtime.Scheme { s.AddKnownTypes(internalGV, &TestType1{}) s.AddKnownTypes(externalGV, &ExternalTestType1{}) - s.AddUnversionedTypes(externalGV, &unversioned.Status{}) + s.AddUnversionedTypes(externalGV, &metav1.Status{}) return s } diff --git a/pkg/runtime/types.go b/pkg/runtime/types.go index ceffdd9f774..9a2a1b6bc92 100644 --- a/pkg/runtime/types.go +++ b/pkg/runtime/types.go @@ -25,7 +25,7 @@ package runtime // runtime.TypeMeta `json:",inline"` // ... // other fields // } -// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *unversioned.GroupVersionKind) { unversioned.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind +// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind // // TypeMeta is provided here for convenience. You may use it directly from this package or define // your own with the same fields. diff --git a/pkg/runtime/unstructured.go b/pkg/runtime/unstructured.go index ad692b182b9..b7076cde2c1 100644 --- a/pkg/runtime/unstructured.go +++ b/pkg/runtime/unstructured.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/meta/metatypes" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/json" @@ -287,19 +287,19 @@ func (u *Unstructured) SetSelfLink(selfLink string) { u.setNestedField(selfLink, "metadata", "selfLink") } -func (u *Unstructured) GetCreationTimestamp() unversioned.Time { - var timestamp unversioned.Time +func (u *Unstructured) GetCreationTimestamp() metav1.Time { + var timestamp metav1.Time timestamp.UnmarshalQueryParameter(getNestedString(u.Object, "metadata", "creationTimestamp")) return timestamp } -func (u *Unstructured) SetCreationTimestamp(timestamp unversioned.Time) { +func (u *Unstructured) SetCreationTimestamp(timestamp metav1.Time) { ts, _ := timestamp.MarshalQueryParameter() u.setNestedField(ts, "metadata", "creationTimestamp") } -func (u *Unstructured) GetDeletionTimestamp() *unversioned.Time { - var timestamp unversioned.Time +func (u *Unstructured) GetDeletionTimestamp() *metav1.Time { + var timestamp metav1.Time timestamp.UnmarshalQueryParameter(getNestedString(u.Object, "metadata", "deletionTimestamp")) if timestamp.IsZero() { return nil @@ -307,7 +307,7 @@ func (u *Unstructured) GetDeletionTimestamp() *unversioned.Time { return ×tamp } -func (u *Unstructured) SetDeletionTimestamp(timestamp *unversioned.Time) { +func (u *Unstructured) SetDeletionTimestamp(timestamp *metav1.Time) { ts, _ := timestamp.MarshalQueryParameter() u.setNestedField(ts, "metadata", "deletionTimestamp") } diff --git a/pkg/runtime/unstructured_test.go b/pkg/runtime/unstructured_test.go index d3297dcd267..261ff2c3bdc 100644 --- a/pkg/runtime/unstructured_test.go +++ b/pkg/runtime/unstructured_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta/metatypes" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/runtime" @@ -198,11 +198,11 @@ func TestUnstructuredGetters(t *testing.T) { t.Errorf("GetSelfLink() = %s, want %s", got, want) } - if got, want := unstruct.GetCreationTimestamp(), unversioned.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC); !got.Equal(want) { + if got, want := unstruct.GetCreationTimestamp(), metav1.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC); !got.Equal(want) { t.Errorf("GetCreationTimestamp() = %s, want %s", got, want) } - if got, want := unstruct.GetDeletionTimestamp(), unversioned.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC); got == nil || !got.Equal(want) { + if got, want := unstruct.GetDeletionTimestamp(), metav1.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC); got == nil || !got.Equal(want) { t.Errorf("GetDeletionTimestamp() = %s, want %s", got, want) } @@ -295,8 +295,8 @@ func TestUnstructuredSetters(t *testing.T) { unstruct.SetUID(types.UID("test_uid")) unstruct.SetResourceVersion("test_resourceVersion") unstruct.SetSelfLink("test_selfLink") - unstruct.SetCreationTimestamp(unversioned.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC)) - date := unversioned.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC) + unstruct.SetCreationTimestamp(metav1.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC)) + date := metav1.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC) unstruct.SetDeletionTimestamp(&date) unstruct.SetLabels(map[string]string{"test_label": "test_value"}) unstruct.SetAnnotations(map[string]string{"test_annotation": "test_value"}) diff --git a/pkg/runtime/unversioned_test.go b/pkg/runtime/unversioned_test.go index 7ffedfdb5a2..b39d530bdd5 100644 --- a/pkg/runtime/unversioned_test.go +++ b/pkg/runtime/unversioned_test.go @@ -25,16 +25,16 @@ import ( // pkg/conversion/test/... instead of importing pkg/api here. "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/runtime" ) func TestV1EncodeDecodeStatus(t *testing.T) { - status := &unversioned.Status{ - Status: unversioned.StatusFailure, + status := &metav1.Status{ + Status: metav1.StatusFailure, Code: 200, - Reason: unversioned.StatusReasonUnknown, + Reason: metav1.StatusReasonUnknown, Message: "", } @@ -44,7 +44,7 @@ func TestV1EncodeDecodeStatus(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - typeMeta := unversioned.TypeMeta{} + typeMeta := metav1.TypeMeta{} if err := json.Unmarshal(encoded, &typeMeta); err != nil { t.Errorf("unexpected error: %v", err) } @@ -64,10 +64,10 @@ func TestV1EncodeDecodeStatus(t *testing.T) { } func TestExperimentalEncodeDecodeStatus(t *testing.T) { - status := &unversioned.Status{ - Status: unversioned.StatusFailure, + status := &metav1.Status{ + Status: metav1.StatusFailure, Code: 200, - Reason: unversioned.StatusReasonUnknown, + Reason: metav1.StatusReasonUnknown, Message: "", } // TODO: caesarxuchao: use the testapi.Extensions.Codec() once the PR that @@ -77,7 +77,7 @@ func TestExperimentalEncodeDecodeStatus(t *testing.T) { if err != nil { t.Errorf("unexpected error: %v", err) } - typeMeta := unversioned.TypeMeta{} + typeMeta := metav1.TypeMeta{} if err := json.Unmarshal(encoded, &typeMeta); err != nil { t.Errorf("unexpected error: %v", err) } diff --git a/pkg/storage/BUILD b/pkg/storage/BUILD index 201a9449575..0358760bc12 100644 --- a/pkg/storage/BUILD +++ b/pkg/storage/BUILD @@ -26,9 +26,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation/path:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/conversion:go_default_library", "//pkg/fields:go_default_library", @@ -58,8 +58,8 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", @@ -82,7 +82,7 @@ go_test( "//pkg/api/meta:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/registry/core/pod:go_default_library", diff --git a/pkg/storage/cacher.go b/pkg/storage/cacher.go index 59c634748fb..54fce231aee 100644 --- a/pkg/storage/cacher.go +++ b/pkg/storage/cacher.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/conversion" @@ -720,10 +720,10 @@ func newErrWatcher(err error) *errWatcher { case *errors.StatusError: errEvent.Object = &err.ErrStatus default: - errEvent.Object = &unversioned.Status{ - Status: unversioned.StatusFailure, + errEvent.Object = &metav1.Status{ + Status: metav1.StatusFailure, Message: err.Error(), - Reason: unversioned.StatusReasonInternalError, + Reason: metav1.StatusReasonInternalError, Code: http.StatusInternalServerError, } } diff --git a/pkg/storage/cacher_test.go b/pkg/storage/cacher_test.go index 5fa6c15a099..9fae55ecd7a 100644 --- a/pkg/storage/cacher_test.go +++ b/pkg/storage/cacher_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" corepod "k8s.io/kubernetes/pkg/registry/core/pod" @@ -187,7 +187,7 @@ func TestList(t *testing.T) { for _, item := range result.Items { // unset fields that are set by the infrastructure item.ResourceVersion = "" - item.CreationTimestamp = unversioned.Time{} + item.CreationTimestamp = metav1.Time{} if item.Namespace != "ns" { t.Errorf("Unexpected namespace: %s", item.Namespace) diff --git a/pkg/storage/etcd/BUILD b/pkg/storage/etcd/BUILD index fe4e77e19a0..bb53f21869f 100644 --- a/pkg/storage/etcd/BUILD +++ b/pkg/storage/etcd/BUILD @@ -22,7 +22,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/storage:go_default_library", diff --git a/pkg/storage/etcd/etcd_watcher.go b/pkg/storage/etcd/etcd_watcher.go index f2fac3bf6ab..17dd3ea7602 100644 --- a/pkg/storage/etcd/etcd_watcher.go +++ b/pkg/storage/etcd/etcd_watcher.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" @@ -266,25 +266,25 @@ func (w *etcdWatcher) translate() { select { case err := <-w.etcdError: if err != nil { - var status *unversioned.Status + var status *metav1.Status switch { case etcdutil.IsEtcdWatchExpired(err): - status = &unversioned.Status{ - Status: unversioned.StatusFailure, + status = &metav1.Status{ + Status: metav1.StatusFailure, Message: err.Error(), Code: http.StatusGone, // Gone - Reason: unversioned.StatusReasonExpired, + Reason: metav1.StatusReasonExpired, } // TODO: need to generate errors using api/errors which has a circular dependency on this package // no other way to inject errors // case etcdutil.IsEtcdUnreachable(err): // status = errors.NewServerTimeout(...) default: - status = &unversioned.Status{ - Status: unversioned.StatusFailure, + status = &metav1.Status{ + Status: metav1.StatusFailure, Message: err.Error(), Code: http.StatusInternalServerError, - Reason: unversioned.StatusReasonInternalError, + Reason: metav1.StatusReasonInternalError, } } w.emit(watch.Event{ diff --git a/pkg/storage/etcd3/BUILD b/pkg/storage/etcd3/BUILD index 352393affcf..8aadec4a284 100644 --- a/pkg/storage/etcd3/BUILD +++ b/pkg/storage/etcd3/BUILD @@ -22,7 +22,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/conversion:go_default_library", "//pkg/runtime:go_default_library", "//pkg/storage:go_default_library", @@ -49,7 +49,7 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/fields:go_default_library", "//pkg/labels:go_default_library", "//pkg/runtime:go_default_library", diff --git a/pkg/storage/etcd3/watcher.go b/pkg/storage/etcd3/watcher.go index 1326ec7bff9..e6b5aedd26b 100644 --- a/pkg/storage/etcd3/watcher.go +++ b/pkg/storage/etcd3/watcher.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/watch" @@ -296,21 +296,21 @@ func (wc *watchChan) transform(e *event) (res *watch.Event) { } func parseError(err error) *watch.Event { - var status *unversioned.Status + var status *metav1.Status switch { case err == etcdrpc.ErrCompacted: - status = &unversioned.Status{ - Status: unversioned.StatusFailure, + status = &metav1.Status{ + Status: metav1.StatusFailure, Message: err.Error(), Code: http.StatusGone, - Reason: unversioned.StatusReasonExpired, + Reason: metav1.StatusReasonExpired, } default: - status = &unversioned.Status{ - Status: unversioned.StatusFailure, + status = &metav1.Status{ + Status: metav1.StatusFailure, Message: err.Error(), Code: http.StatusInternalServerError, - Reason: unversioned.StatusReasonInternalError, + Reason: metav1.StatusReasonInternalError, } } diff --git a/pkg/storage/etcd3/watcher_test.go b/pkg/storage/etcd3/watcher_test.go index bb78d1903e5..c35e7ba5255 100644 --- a/pkg/storage/etcd3/watcher_test.go +++ b/pkg/storage/etcd3/watcher_test.go @@ -30,7 +30,7 @@ import ( "golang.org/x/net/context" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" @@ -361,8 +361,8 @@ func testCheckStop(t *testing.T, i int, w watch.Interface) { switch e.Object.(type) { case *api.Pod: obj = e.Object.(*api.Pod).Name - case *unversioned.Status: - obj = e.Object.(*unversioned.Status).Message + case *metav1.Status: + obj = e.Object.(*metav1.Status).Message } t.Errorf("#%d: ResultChan should have been closed. Event: %s. Object: %s", i, e.Type, obj) } diff --git a/pkg/storage/testing/BUILD b/pkg/storage/testing/BUILD index 4c1b71d875a..f6f6f9c5003 100644 --- a/pkg/storage/testing/BUILD +++ b/pkg/storage/testing/BUILD @@ -21,7 +21,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/meta:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", "//pkg/storage:go_default_library", diff --git a/pkg/storage/testing/types.generated.go b/pkg/storage/testing/types.generated.go index c3cd8bf231d..9a81c068782 100644 --- a/pkg/storage/testing/types.generated.go +++ b/pkg/storage/testing/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/api/unversioned" + pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" diff --git a/pkg/storage/testing/types.go b/pkg/storage/testing/types.go index 52227b21d78..b938928383b 100644 --- a/pkg/storage/testing/types.go +++ b/pkg/storage/testing/types.go @@ -18,12 +18,12 @@ package testing import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) type TestResource struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` api.ObjectMeta `json:"metadata"` Value int `json:"value"` } diff --git a/pkg/storage/watch_cache_test.go b/pkg/storage/watch_cache_test.go index fb55f2460f3..0dbe006647d 100644 --- a/pkg/storage/watch_cache_test.go +++ b/pkg/storage/watch_cache_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/fields" @@ -349,7 +349,7 @@ func TestReflectorForWatchCache(t *testing.T) { return fw, nil }, ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return &api.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "10"}}, nil + return &api.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "10"}}, nil }, } r := cache.NewReflector(lw, &api.Pod{}, store, 0) diff --git a/pkg/util/httpstream/spdy/BUILD b/pkg/util/httpstream/spdy/BUILD index b229adbad2f..d2994f158b8 100644 --- a/pkg/util/httpstream/spdy/BUILD +++ b/pkg/util/httpstream/spdy/BUILD @@ -21,7 +21,7 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/util/httpstream:go_default_library", "//pkg/util/runtime:go_default_library", "//third_party/forked/golang/netutil:go_default_library", diff --git a/pkg/util/httpstream/spdy/roundtripper.go b/pkg/util/httpstream/spdy/roundtripper.go index 3de17598939..713bbf46a88 100644 --- a/pkg/util/httpstream/spdy/roundtripper.go +++ b/pkg/util/httpstream/spdy/roundtripper.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/third_party/forked/golang/netutil" ) @@ -251,8 +251,8 @@ func (s *SpdyRoundTripper) NewConnection(resp *http.Response) (httpstream.Connec responseError = "unable to read error from server response" } else { // TODO: I don't belong here, I should be abstracted from this class - if obj, _, err := api.Codecs.UniversalDecoder().Decode(responseErrorBytes, nil, &unversioned.Status{}); err == nil { - if status, ok := obj.(*unversioned.Status); ok { + if obj, _, err := api.Codecs.UniversalDecoder().Decode(responseErrorBytes, nil, &metav1.Status{}); err == nil { + if status, ok := obj.(*metav1.Status); ok { return nil, &apierrors.StatusError{ErrStatus: *status} } } diff --git a/pkg/util/labels/BUILD b/pkg/util/labels/BUILD index 5a8dae2791e..c3489de07f0 100644 --- a/pkg/util/labels/BUILD +++ b/pkg/util/labels/BUILD @@ -17,7 +17,7 @@ go_library( "labels.go", ], tags = ["automanaged"], - deps = ["//pkg/api/unversioned:go_default_library"], + deps = ["//pkg/apis/meta/v1:go_default_library"], ) go_test( @@ -25,5 +25,5 @@ go_test( srcs = ["labels_test.go"], library = "go_default_library", tags = ["automanaged"], - deps = ["//pkg/api/unversioned:go_default_library"], + deps = ["//pkg/apis/meta/v1:go_default_library"], ) diff --git a/pkg/util/labels/labels.go b/pkg/util/labels/labels.go index 262f66e6e9d..82a7c70a6ef 100644 --- a/pkg/util/labels/labels.go +++ b/pkg/util/labels/labels.go @@ -19,7 +19,7 @@ package labels import ( "fmt" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // Clones the given map and returns a new map with the given key and value added. @@ -69,14 +69,14 @@ func AddLabel(labels map[string]string, labelKey string, labelValue string) map[ // Clones the given selector and returns a new selector with the given key and value added. // Returns the given selector, if labelKey is empty. -func CloneSelectorAndAddLabel(selector *unversioned.LabelSelector, labelKey string, labelValue uint32) *unversioned.LabelSelector { +func CloneSelectorAndAddLabel(selector *metav1.LabelSelector, labelKey string, labelValue uint32) *metav1.LabelSelector { if labelKey == "" { // Don't need to add a label. return selector } // Clone. - newSelector := new(unversioned.LabelSelector) + newSelector := new(metav1.LabelSelector) // TODO(madhusudancs): Check if you can use deepCopy_extensions_LabelSelector here. newSelector.MatchLabels = make(map[string]string) @@ -88,7 +88,7 @@ func CloneSelectorAndAddLabel(selector *unversioned.LabelSelector, labelKey stri newSelector.MatchLabels[labelKey] = fmt.Sprintf("%d", labelValue) if selector.MatchExpressions != nil { - newMExps := make([]unversioned.LabelSelectorRequirement, len(selector.MatchExpressions)) + newMExps := make([]metav1.LabelSelectorRequirement, len(selector.MatchExpressions)) for i, me := range selector.MatchExpressions { newMExps[i].Key = me.Key newMExps[i].Operator = me.Operator @@ -108,7 +108,7 @@ func CloneSelectorAndAddLabel(selector *unversioned.LabelSelector, labelKey stri } // AddLabelToSelector returns a selector with the given key and value added to the given selector's MatchLabels. -func AddLabelToSelector(selector *unversioned.LabelSelector, labelKey string, labelValue string) *unversioned.LabelSelector { +func AddLabelToSelector(selector *metav1.LabelSelector, labelKey string, labelValue string) *metav1.LabelSelector { if labelKey == "" { // Don't need to add a label. return selector @@ -121,6 +121,6 @@ func AddLabelToSelector(selector *unversioned.LabelSelector, labelKey string, la } // SelectorHasLabel checks if the given selector contains the given label key in its MatchLabels -func SelectorHasLabel(selector *unversioned.LabelSelector, labelKey string) bool { +func SelectorHasLabel(selector *metav1.LabelSelector, labelKey string) bool { return len(selector.MatchLabels[labelKey]) > 0 } diff --git a/pkg/util/labels/labels_test.go b/pkg/util/labels/labels_test.go index de727dedca2..3bce2a002a4 100644 --- a/pkg/util/labels/labels_test.go +++ b/pkg/util/labels/labels_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestCloneAndAddLabel(t *testing.T) { @@ -151,8 +151,8 @@ func TestCloneSelectorAndAddLabel(t *testing.T) { } for _, tc := range cases { - ls_in := unversioned.LabelSelector{MatchLabels: tc.labels} - ls_out := unversioned.LabelSelector{MatchLabels: tc.want} + ls_in := metav1.LabelSelector{MatchLabels: tc.labels} + ls_out := metav1.LabelSelector{MatchLabels: tc.want} got := CloneSelectorAndAddLabel(&ls_in, tc.labelKey, tc.labelValue) if !reflect.DeepEqual(got, &ls_out) { @@ -200,8 +200,8 @@ func TestAddLabelToSelector(t *testing.T) { } for _, tc := range cases { - ls_in := unversioned.LabelSelector{MatchLabels: tc.labels} - ls_out := unversioned.LabelSelector{MatchLabels: tc.want} + ls_in := metav1.LabelSelector{MatchLabels: tc.labels} + ls_out := metav1.LabelSelector{MatchLabels: tc.want} got := AddLabelToSelector(&ls_in, tc.labelKey, tc.labelValue) if !reflect.DeepEqual(got, &ls_out) { diff --git a/pkg/util/node/BUILD b/pkg/util/node/BUILD index f8821c6794c..97e8b3817b7 100644 --- a/pkg/util/node/BUILD +++ b/pkg/util/node/BUILD @@ -16,8 +16,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/types:go_default_library", "//vendor:github.com/golang/glog", @@ -30,7 +30,7 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", ], ) diff --git a/pkg/util/node/node.go b/pkg/util/node/node.go index 47055f7197d..313a21a9d35 100644 --- a/pkg/util/node/node.go +++ b/pkg/util/node/node.go @@ -26,7 +26,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/types" @@ -63,7 +63,7 @@ func GetPreferredNodeAddress(node *v1.Node, preferredAddressTypes []v1.NodeAddre // If hostname was requested and no Hostname address was registered... if addressType == v1.NodeHostName { // ...fall back to the kubernetes.io/hostname label for compatibility with kubelets before 1.5 - if hostname, ok := node.Labels[unversioned.LabelHostname]; ok && len(hostname) > 0 { + if hostname, ok := node.Labels[metav1.LabelHostname]; ok && len(hostname) > 0 { return hostname, nil } } @@ -123,8 +123,8 @@ func GetZoneKey(node *v1.Node) string { return "" } - region, _ := labels[unversioned.LabelZoneRegion] - failureDomain, _ := labels[unversioned.LabelZoneFailureDomain] + region, _ := labels[metav1.LabelZoneRegion] + failureDomain, _ := labels[metav1.LabelZoneFailureDomain] if region == "" && failureDomain == "" { return "" @@ -145,7 +145,7 @@ func SetNodeCondition(c clientset.Interface, node types.NodeName, condition v1.N } return []byte(fmt.Sprintf(`{"status":{"conditions":%s}}`, raw)), nil } - condition.LastHeartbeatTime = unversioned.NewTime(time.Now()) + condition.LastHeartbeatTime = metav1.NewTime(time.Now()) patch, err := generatePatch(condition) if err != nil { return nil diff --git a/pkg/util/node/node_test.go b/pkg/util/node/node_test.go index 8629704b497..66ef5f65d7b 100644 --- a/pkg/util/node/node_test.go +++ b/pkg/util/node/node_test.go @@ -19,7 +19,7 @@ package node import ( "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -52,7 +52,7 @@ func TestGetPreferredAddress(t *testing.T) { ExpectAddress: "1.2.3.5", }, "found hostname address": { - Labels: map[string]string{unversioned.LabelHostname: "label-hostname"}, + Labels: map[string]string{metav1.LabelHostname: "label-hostname"}, Addresses: []v1.NodeAddress{ {Type: v1.NodeExternalIP, Address: "1.2.3.5"}, {Type: v1.NodeHostName, Address: "status-hostname"}, @@ -61,7 +61,7 @@ func TestGetPreferredAddress(t *testing.T) { ExpectAddress: "status-hostname", }, "found label address": { - Labels: map[string]string{unversioned.LabelHostname: "label-hostname"}, + Labels: map[string]string{metav1.LabelHostname: "label-hostname"}, Addresses: []v1.NodeAddress{ {Type: v1.NodeExternalIP, Address: "1.2.3.5"}, }, diff --git a/pkg/util/replicaset/BUILD b/pkg/util/replicaset/BUILD index 6f3266dc964..4df8a89ca3c 100644 --- a/pkg/util/replicaset/BUILD +++ b/pkg/util/replicaset/BUILD @@ -16,9 +16,9 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1:go_default_library", "//pkg/labels:go_default_library", "//pkg/util/errors:go_default_library", diff --git a/pkg/util/replicaset/replicaset.go b/pkg/util/replicaset/replicaset.go index c59bb121bb3..cc039162ce6 100644 --- a/pkg/util/replicaset/replicaset.go +++ b/pkg/util/replicaset/replicaset.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" @@ -99,7 +99,7 @@ func MatchingPodsFunc(rs *extensions.ReplicaSet) (func(v1.Pod) bool, error) { if rs == nil { return nil, nil } - selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid label selector: %v", err) } diff --git a/pkg/volume/flocker/BUILD b/pkg/volume/flocker/BUILD index 909d1996fbd..82cdb8d0863 100644 --- a/pkg/volume/flocker/BUILD +++ b/pkg/volume/flocker/BUILD @@ -43,8 +43,8 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/types:go_default_library", "//pkg/util/mount:go_default_library", "//pkg/util/testing:go_default_library", diff --git a/pkg/volume/flocker/flocker_volume_test.go b/pkg/volume/flocker/flocker_volume_test.go index 938ac8047b9..0fb933470d5 100644 --- a/pkg/volume/flocker/flocker_volume_test.go +++ b/pkg/volume/flocker/flocker_volume_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" utiltesting "k8s.io/kubernetes/pkg/util/testing" "k8s.io/kubernetes/pkg/volume" @@ -86,7 +86,7 @@ func TestProvision(t *testing.T) { assert.Error(err, "Provision() did not fail with Parameters specified") // selectors are not supported - pvc.Spec.Selector = &unversioned.LabelSelector{MatchLabels: map[string]string{"key": "value"}} + pvc.Spec.Selector = &metav1.LabelSelector{MatchLabels: map[string]string{"key": "value"}} options = volume.VolumeOptions{ PVC: pvc, PersistentVolumeReclaimPolicy: v1.PersistentVolumeReclaimDelete, diff --git a/plugin/pkg/admission/antiaffinity/BUILD b/plugin/pkg/admission/antiaffinity/BUILD index fd9affc461a..dba7d666885 100644 --- a/plugin/pkg/admission/antiaffinity/BUILD +++ b/plugin/pkg/admission/antiaffinity/BUILD @@ -21,7 +21,7 @@ go_library( "//pkg/admission:go_default_library", "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//vendor:github.com/golang/glog", ], @@ -35,7 +35,7 @@ go_test( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/runtime:go_default_library", ], ) diff --git a/plugin/pkg/admission/antiaffinity/admission.go b/plugin/pkg/admission/antiaffinity/admission.go index 7088126c1b2..5757c69a0bd 100644 --- a/plugin/pkg/admission/antiaffinity/admission.go +++ b/plugin/pkg/admission/antiaffinity/admission.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" ) @@ -48,7 +48,7 @@ func NewInterPodAntiAffinity(client clientset.Interface) admission.Interface { } } -// Admit will deny any pod that defines AntiAffinity topology key other than unversioned.LabelHostname i.e. "kubernetes.io/hostname" +// Admit will deny any pod that defines AntiAffinity topology key other than metav1.LabelHostname i.e. "kubernetes.io/hostname" // in requiredDuringSchedulingRequiredDuringExecution and requiredDuringSchedulingIgnoredDuringExecution. func (p *plugin) Admit(attributes admission.Attributes) (err error) { // Ignore all calls to subresources or resources other than pods. @@ -74,8 +74,8 @@ func (p *plugin) Admit(attributes admission.Attributes) (err error) { // podAntiAffinityTerms = append(podAntiAffinityTerms, affinity.PodAntiAffinity.RequiredDuringSchedulingRequiredDuringExecution...) //} for _, v := range podAntiAffinityTerms { - if v.TopologyKey != unversioned.LabelHostname { - return apierrors.NewForbidden(attributes.GetResource().GroupResource(), pod.Name, fmt.Errorf("affinity.PodAntiAffinity.RequiredDuringScheduling has TopologyKey %v but only key %v is allowed", v.TopologyKey, unversioned.LabelHostname)) + if v.TopologyKey != metav1.LabelHostname { + return apierrors.NewForbidden(attributes.GetResource().GroupResource(), pod.Name, fmt.Errorf("affinity.PodAntiAffinity.RequiredDuringScheduling has TopologyKey %v but only key %v is allowed", v.TopologyKey, metav1.LabelHostname)) } } } diff --git a/plugin/pkg/admission/antiaffinity/admission_test.go b/plugin/pkg/admission/antiaffinity/admission_test.go index 9624ebf1181..4fb05f2e3c3 100644 --- a/plugin/pkg/admission/antiaffinity/admission_test.go +++ b/plugin/pkg/admission/antiaffinity/admission_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) @@ -92,7 +92,7 @@ func TestInterPodAffinityAdmission(t *testing.T) { }] }, "namespaces": [], - "topologyKey": "` + unversioned.LabelHostname + `" + "topologyKey": "` + metav1.LabelHostname + `" }] }}`, }, @@ -112,7 +112,7 @@ func TestInterPodAffinityAdmission(t *testing.T) { }] }, "namespaces":[], - "topologyKey": "` + unversioned.LabelHostname + `" + "topologyKey": "` + metav1.LabelHostname + `" }] }}`, }, @@ -173,7 +173,7 @@ func TestInterPodAffinityAdmission(t *testing.T) { }] }, "namespaces":[], - "topologyKey": "` + unversioned.LabelHostname + `" + "topologyKey": "` + metav1.LabelHostname + `" }, { "labelSelector": { @@ -195,7 +195,7 @@ func TestInterPodAffinityAdmission(t *testing.T) { }] }, "namespaces": [], - "topologyKey": "` + unversioned.LabelHostname + `" + "topologyKey": "` + metav1.LabelHostname + `" }] }}`, }, diff --git a/plugin/pkg/admission/antiaffinity/doc.go b/plugin/pkg/admission/antiaffinity/doc.go index 145faa0d9e9..f165b235579 100644 --- a/plugin/pkg/admission/antiaffinity/doc.go +++ b/plugin/pkg/admission/antiaffinity/doc.go @@ -16,7 +16,7 @@ limitations under the License. // LimitPodHardAntiAffinityTopology admission controller rejects any pod // that specifies "hard" (RequiredDuringScheduling) anti-affinity -// with a TopologyKey other than unversioned.LabelHostname. +// with a TopologyKey other than metav1.LabelHostname. // Because anti-affinity is symmetric, without this admission controller, // a user could maliciously or accidentally specify that their pod (once it has scheduled) // should block other pods from scheduling into the same zone or some other large topology, diff --git a/plugin/pkg/admission/limitranger/BUILD b/plugin/pkg/admission/limitranger/BUILD index cf9e4c99f10..2106080cfae 100644 --- a/plugin/pkg/admission/limitranger/BUILD +++ b/plugin/pkg/admission/limitranger/BUILD @@ -41,7 +41,7 @@ go_test( "//pkg/admission:go_default_library", "//pkg/api:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/plugin/pkg/admission/limitranger/admission_test.go b/plugin/pkg/admission/limitranger/admission_test.go index e2adf26fb37..0af782fc895 100644 --- a/plugin/pkg/admission/limitranger/admission_test.go +++ b/plugin/pkg/admission/limitranger/admission_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/testing/core" @@ -573,7 +573,7 @@ func newMockClientForTest(limitRanges []api.LimitRange) *fake.Clientset { mockClient := &fake.Clientset{} mockClient.AddReactor("list", "limitranges", func(action core.Action) (bool, runtime.Object, error) { limitRangeList := &api.LimitRangeList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: fmt.Sprintf("%d", len(limitRanges)), }, } diff --git a/plugin/pkg/admission/namespace/autoprovision/BUILD b/plugin/pkg/admission/namespace/autoprovision/BUILD index ec724c9d710..fd2c8b2facd 100644 --- a/plugin/pkg/admission/namespace/autoprovision/BUILD +++ b/plugin/pkg/admission/namespace/autoprovision/BUILD @@ -33,7 +33,7 @@ go_test( "//pkg/admission:go_default_library", "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/plugin/pkg/admission/namespace/autoprovision/admission_test.go b/plugin/pkg/admission/namespace/autoprovision/admission_test.go index 63c1a3115a7..6459c5b79b5 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission_test.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/testing/core" @@ -49,7 +49,7 @@ func newMockClientForTest(namespaces []string) *fake.Clientset { mockClient := &fake.Clientset{} mockClient.AddReactor("list", "namespaces", func(action core.Action) (bool, runtime.Object, error) { namespaceList := &api.NamespaceList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: fmt.Sprintf("%d", len(namespaces)), }, } diff --git a/plugin/pkg/admission/namespace/exists/BUILD b/plugin/pkg/admission/namespace/exists/BUILD index be5438733ae..4c64dcc3677 100644 --- a/plugin/pkg/admission/namespace/exists/BUILD +++ b/plugin/pkg/admission/namespace/exists/BUILD @@ -32,7 +32,7 @@ go_test( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/plugin/pkg/admission/namespace/exists/admission_test.go b/plugin/pkg/admission/namespace/exists/admission_test.go index f75f690a03b..b29739e15e0 100644 --- a/plugin/pkg/admission/namespace/exists/admission_test.go +++ b/plugin/pkg/admission/namespace/exists/admission_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/testing/core" @@ -48,7 +48,7 @@ func newMockClientForTest(namespaces []string) *fake.Clientset { mockClient := &fake.Clientset{} mockClient.AddReactor("list", "namespaces", func(action core.Action) (bool, runtime.Object, error) { namespaceList := &api.NamespaceList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: fmt.Sprintf("%d", len(namespaces)), }, } diff --git a/plugin/pkg/admission/namespace/lifecycle/BUILD b/plugin/pkg/admission/namespace/lifecycle/BUILD index a1b5f4857ff..2b3cb118afe 100644 --- a/plugin/pkg/admission/namespace/lifecycle/BUILD +++ b/plugin/pkg/admission/namespace/lifecycle/BUILD @@ -36,7 +36,7 @@ go_test( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/plugin/pkg/admission/namespace/lifecycle/admission_test.go b/plugin/pkg/admission/namespace/lifecycle/admission_test.go index d3f11d0577f..aa09a5869cf 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission_test.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/testing/core" @@ -58,7 +58,7 @@ func newMockClientForTest(namespaces map[string]api.NamespacePhase) *fake.Client mockClient := &fake.Clientset{} mockClient.AddReactor("list", "namespaces", func(action core.Action) (bool, runtime.Object, error) { namespaceList := &api.NamespaceList{ - ListMeta: unversioned.ListMeta{ + ListMeta: metav1.ListMeta{ ResourceVersion: fmt.Sprintf("%d", len(namespaces)), }, } diff --git a/plugin/pkg/admission/persistentvolume/label/BUILD b/plugin/pkg/admission/persistentvolume/label/BUILD index 413cdba7e2c..2661ac6681d 100644 --- a/plugin/pkg/admission/persistentvolume/label/BUILD +++ b/plugin/pkg/admission/persistentvolume/label/BUILD @@ -20,7 +20,7 @@ go_library( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider/providers/aws:go_default_library", diff --git a/plugin/pkg/admission/persistentvolume/label/admission.go b/plugin/pkg/admission/persistentvolume/label/admission.go index e4fb246acb5..0942c466cb8 100644 --- a/plugin/pkg/admission/persistentvolume/label/admission.go +++ b/plugin/pkg/admission/persistentvolume/label/admission.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" @@ -162,7 +162,7 @@ func (l *persistentVolumeLabel) findGCEPDLabels(volume *api.PersistentVolume) (m } // If the zone is already labeled, honor the hint - zone := volume.Labels[unversioned.LabelZoneFailureDomain] + zone := volume.Labels[metav1.LabelZoneFailureDomain] labels, err := provider.GetAutoLabelsForPD(volume.Spec.GCEPersistentDisk.PDName, zone) if err != nil { diff --git a/plugin/pkg/admission/storageclass/default/BUILD b/plugin/pkg/admission/storageclass/default/BUILD index 61ba38f3f57..6a2f6ba1f74 100644 --- a/plugin/pkg/admission/storageclass/default/BUILD +++ b/plugin/pkg/admission/storageclass/default/BUILD @@ -37,7 +37,7 @@ go_test( deps = [ "//pkg/admission:go_default_library", "//pkg/api:go_default_library", - "//pkg/api/unversioned:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/storage:go_default_library", "//pkg/apis/storage/util:go_default_library", "//pkg/conversion:go_default_library", diff --git a/plugin/pkg/admission/storageclass/default/admission_test.go b/plugin/pkg/admission/storageclass/default/admission_test.go index 40786a4c12b..870e5ac0921 100644 --- a/plugin/pkg/admission/storageclass/default/admission_test.go +++ b/plugin/pkg/admission/storageclass/default/admission_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/storage" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/conversion" @@ -31,7 +31,7 @@ import ( func TestAdmission(t *testing.T) { defaultClass1 := &storage.StorageClass{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: api.ObjectMeta{ @@ -43,7 +43,7 @@ func TestAdmission(t *testing.T) { Provisioner: "default1", } defaultClass2 := &storage.StorageClass{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: api.ObjectMeta{ @@ -56,7 +56,7 @@ func TestAdmission(t *testing.T) { } // Class that has explicit default = false classWithFalseDefault := &storage.StorageClass{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: api.ObjectMeta{ @@ -69,7 +69,7 @@ func TestAdmission(t *testing.T) { } // Class with missing default annotation (=non-default) classWithNoDefault := &storage.StorageClass{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: api.ObjectMeta{ @@ -79,7 +79,7 @@ func TestAdmission(t *testing.T) { } // Class with empty default annotation (=non-default) classWithEmptyDefault := &storage.StorageClass{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: api.ObjectMeta{ @@ -92,7 +92,7 @@ func TestAdmission(t *testing.T) { } claimWithClass := &api.PersistentVolumeClaim{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "PersistentVolumeClaim", }, ObjectMeta: api.ObjectMeta{ @@ -104,7 +104,7 @@ func TestAdmission(t *testing.T) { }, } claimWithEmptyClass := &api.PersistentVolumeClaim{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "PersistentVolumeClaim", }, ObjectMeta: api.ObjectMeta{ @@ -116,7 +116,7 @@ func TestAdmission(t *testing.T) { }, } claimWithNoClass := &api.PersistentVolumeClaim{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "PersistentVolumeClaim", }, ObjectMeta: api.ObjectMeta{ diff --git a/plugin/pkg/auth/authenticator/token/webhook/BUILD b/plugin/pkg/auth/authenticator/token/webhook/BUILD index f12c2c33f20..e467b136bc0 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/BUILD +++ b/plugin/pkg/auth/authenticator/token/webhook/BUILD @@ -35,8 +35,8 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/apis/authentication/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/auth/user:go_default_library", "//pkg/client/unversioned/clientcmd/api/v1:go_default_library", ], diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go b/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go index 526382c21d3..9d7f2cf7dea 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" @@ -309,7 +309,7 @@ func TestWebhookTokenAuthenticator(t *testing.T) { t.Fatal(err) } - expTypeMeta := unversioned.TypeMeta{ + expTypeMeta := metav1.TypeMeta{ APIVersion: "authentication.k8s.io/v1beta1", Kind: "TokenReview", } diff --git a/plugin/pkg/auth/authorizer/webhook/BUILD b/plugin/pkg/auth/authorizer/webhook/BUILD index 3344b463038..bcaa3860f74 100644 --- a/plugin/pkg/auth/authorizer/webhook/BUILD +++ b/plugin/pkg/auth/authorizer/webhook/BUILD @@ -35,8 +35,8 @@ go_test( library = "go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/apis/authorization/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/auth/authorizer:go_default_library", "//pkg/auth/user:go_default_library", "//pkg/client/unversioned/clientcmd/api/v1:go_default_library", diff --git a/plugin/pkg/auth/authorizer/webhook/webhook_test.go b/plugin/pkg/auth/authorizer/webhook/webhook_test.go index 420eedbfe7d..703bace5005 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook_test.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook_test.go @@ -32,7 +32,7 @@ import ( "text/template" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/user" @@ -456,7 +456,7 @@ func TestWebhook(t *testing.T) { t.Fatal(err) } - expTypeMeta := unversioned.TypeMeta{ + expTypeMeta := metav1.TypeMeta{ APIVersion: "authorization.k8s.io/v1beta1", Kind: "SubjectAccessReview", } diff --git a/plugin/pkg/scheduler/algorithm/BUILD b/plugin/pkg/scheduler/algorithm/BUILD index 8eec95dc35c..bc8527a04e2 100644 --- a/plugin/pkg/scheduler/algorithm/BUILD +++ b/plugin/pkg/scheduler/algorithm/BUILD @@ -20,9 +20,9 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/labels:go_default_library", "//plugin/pkg/scheduler/api:go_default_library", "//plugin/pkg/scheduler/schedulercache:go_default_library", diff --git a/plugin/pkg/scheduler/algorithm/listers.go b/plugin/pkg/scheduler/algorithm/listers.go index 78c2c93d3df..041cbf3d28a 100644 --- a/plugin/pkg/scheduler/algorithm/listers.go +++ b/plugin/pkg/scheduler/algorithm/listers.go @@ -19,7 +19,7 @@ package algorithm import ( "fmt" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/labels" @@ -169,7 +169,7 @@ func (f FakeReplicaSetLister) GetPodReplicaSets(pod *v1.Pod) (rss []*extensions. if rs.Namespace != pod.Namespace { continue } - selector, err = unversioned.LabelSelectorAsSelector(rs.Spec.Selector) + selector, err = metav1.LabelSelectorAsSelector(rs.Spec.Selector) if err != nil { return } diff --git a/plugin/pkg/scheduler/algorithm/predicates/BUILD b/plugin/pkg/scheduler/algorithm/predicates/BUILD index a6d223eb230..b965e853210 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/BUILD +++ b/plugin/pkg/scheduler/algorithm/predicates/BUILD @@ -20,8 +20,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/labels:go_default_library", diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index e1816ce27e0..f880f823a87 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -24,7 +24,7 @@ import ( "time" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/kubelet/qos" @@ -366,7 +366,7 @@ func (c *VolumeZoneChecker) predicate(pod *v1.Pod, meta interface{}, nodeInfo *s nodeConstraints := make(map[string]string) for k, v := range node.ObjectMeta.Labels { - if k != unversioned.LabelZoneFailureDomain && k != unversioned.LabelZoneRegion { + if k != metav1.LabelZoneFailureDomain && k != metav1.LabelZoneRegion { continue } nodeConstraints[k] = v @@ -412,7 +412,7 @@ func (c *VolumeZoneChecker) predicate(pod *v1.Pod, meta interface{}, nodeInfo *s } for k, v := range pv.ObjectMeta.Labels { - if k != unversioned.LabelZoneFailureDomain && k != unversioned.LabelZoneRegion { + if k != metav1.LabelZoneFailureDomain && k != metav1.LabelZoneRegion { continue } nodeV, _ := nodeConstraints[k] diff --git a/plugin/pkg/scheduler/algorithm/priorities/BUILD b/plugin/pkg/scheduler/algorithm/priorities/BUILD index fb6f1cd2f1b..043a222d210 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/BUILD +++ b/plugin/pkg/scheduler/algorithm/priorities/BUILD @@ -29,8 +29,8 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/labels:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/workqueue:go_default_library", @@ -65,9 +65,9 @@ go_test( ], deps = [ "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/util/codeinspector:go_default_library", "//plugin/pkg/scheduler/algorithm:go_default_library", "//plugin/pkg/scheduler/algorithm/priorities/util:go_default_library", diff --git a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go b/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go index 1e4dd8586e0..de34802e579 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go +++ b/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" @@ -607,7 +607,7 @@ func TestSoftPodAntiAffinityWithFailureDomains(t *testing.T) { "az": "az1", } LabelZoneFailureDomainAZ1 := map[string]string{ - unversioned.LabelZoneFailureDomain: "az1", + metav1.LabelZoneFailureDomain: "az1", } podLabel1 := map[string]string{ "security": "S1", diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go index 20d5f4a9ee4..a50015ea79c 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go @@ -20,7 +20,7 @@ import ( "sync" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/labels" utilnode "k8s.io/kubernetes/pkg/util/node" @@ -71,7 +71,7 @@ func getSelectors(pod *v1.Pod, sl algorithm.ServiceLister, cl algorithm.Controll } if rss, err := rsl.GetPodReplicaSets(pod); err == nil { for _, rs := range rss { - if selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector); err == nil { + if selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector); err == nil { selectors = append(selectors, selector) } } diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go index 7d6ebe870ab..93726ece7f6 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go @@ -21,7 +21,7 @@ import ( "sort" "testing" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" @@ -197,7 +197,7 @@ func TestSelectorSpreadPriority(t *testing.T) { }, nodes: []string{"machine1", "machine2"}, services: []*v1.Service{{Spec: v1.ServiceSpec{Selector: map[string]string{"baz": "blah"}}}}, - rss: []*extensions.ReplicaSet{{Spec: extensions.ReplicaSetSpec{Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}}}}, + rss: []*extensions.ReplicaSet{{Spec: extensions.ReplicaSetSpec{Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}}}}, // We use ReplicaSet, instead of ReplicationController. The result should be exactly as above. expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 5}}, test: "service with partial pod label matches with service and replica set", @@ -225,7 +225,7 @@ func TestSelectorSpreadPriority(t *testing.T) { }, nodes: []string{"machine1", "machine2"}, services: []*v1.Service{{Spec: v1.ServiceSpec{Selector: map[string]string{"bar": "foo"}}}}, - rss: []*extensions.ReplicaSet{{Spec: extensions.ReplicaSetSpec{Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}}}}, + rss: []*extensions.ReplicaSet{{Spec: extensions.ReplicaSetSpec{Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}}}}, // We use ReplicaSet, instead of ReplicationController. The result should be exactly as above. expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 5}}, test: "disjoined service and replica set should be treated equally", @@ -251,7 +251,7 @@ func TestSelectorSpreadPriority(t *testing.T) { {Spec: zone2Spec, ObjectMeta: v1.ObjectMeta{Labels: labels1, OwnerReferences: controllerRef("ReplicaSet", "name", "abc123")}}, }, nodes: []string{"machine1", "machine2"}, - rss: []*extensions.ReplicaSet{{Spec: extensions.ReplicaSetSpec{Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}}}}, + rss: []*extensions.ReplicaSet{{Spec: extensions.ReplicaSetSpec{Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}}}}, // We use ReplicaSet, instead of ReplicationController. The result should be exactly as above. expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 0}}, test: "Replica set with partial pod label matches", @@ -276,7 +276,7 @@ func TestSelectorSpreadPriority(t *testing.T) { {Spec: zone2Spec, ObjectMeta: v1.ObjectMeta{Labels: labels1, OwnerReferences: controllerRef("ReplicaSet", "name", "abc123")}}, }, nodes: []string{"machine1", "machine2"}, - rss: []*extensions.ReplicaSet{{Spec: extensions.ReplicaSetSpec{Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"baz": "blah"}}}}}, + rss: []*extensions.ReplicaSet{{Spec: extensions.ReplicaSetSpec{Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"baz": "blah"}}}}}, // We use ReplicaSet, instead of ReplicationController. The result should be exactly as above. expectedList: []schedulerapi.HostPriority{{Host: "machine1", Score: 0}, {Host: "machine2", Score: 5}}, test: "Another replication set with partial pod label matches", @@ -326,7 +326,7 @@ func TestZoneSelectorSpreadPriority(t *testing.T) { buildNodeLabels := func(failureDomain string) map[string]string { labels := map[string]string{ - unversioned.LabelZoneFailureDomain: failureDomain, + metav1.LabelZoneFailureDomain: failureDomain, } return labels } diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/BUILD b/plugin/pkg/scheduler/algorithm/priorities/util/BUILD index af916ec858c..0fa0540859a 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/util/BUILD +++ b/plugin/pkg/scheduler/algorithm/priorities/util/BUILD @@ -19,8 +19,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/labels:go_default_library", "//pkg/util/sets:go_default_library", ], diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go b/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go index e5d091c27c1..9824222f52a 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go +++ b/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go @@ -17,7 +17,7 @@ limitations under the License. package util import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" @@ -45,7 +45,7 @@ func PodMatchesTermsNamespaceAndSelector(pod *v1.Pod, affinityPod *v1.Pod, term return false, nil } - selector, err := unversioned.LabelSelectorAsSelector(term.LabelSelector) + selector, err := metav1.LabelSelectorAsSelector(term.LabelSelector) if err != nil || !selector.Matches(labels.Set(pod.Labels)) { return false, err } diff --git a/plugin/pkg/scheduler/api/BUILD b/plugin/pkg/scheduler/api/BUILD index 2fb5f923d05..e8a1d734df2 100644 --- a/plugin/pkg/scheduler/api/BUILD +++ b/plugin/pkg/scheduler/api/BUILD @@ -18,8 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/plugin/pkg/scheduler/api/register.go b/plugin/pkg/scheduler/api/register.go index a21ad7c5885..53eacec84da 100644 --- a/plugin/pkg/scheduler/api/register.go +++ b/plugin/pkg/scheduler/api/register.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) @@ -43,7 +43,7 @@ func init() { } func addKnownTypes(scheme *runtime.Scheme) error { - if err := scheme.AddIgnoredConversionType(&unversioned.TypeMeta{}, &unversioned.TypeMeta{}); err != nil { + if err := scheme.AddIgnoredConversionType(&metav1.TypeMeta{}, &metav1.TypeMeta{}); err != nil { return err } scheme.AddKnownTypes(SchemeGroupVersion, diff --git a/plugin/pkg/scheduler/api/types.go b/plugin/pkg/scheduler/api/types.go index 7c506fa7b14..055c19f1870 100644 --- a/plugin/pkg/scheduler/api/types.go +++ b/plugin/pkg/scheduler/api/types.go @@ -19,13 +19,13 @@ package api import ( "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" ) type Policy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Holds the information to configure the fit predicate functions Predicates []PredicatePolicy `json:"predicates"` // Holds the information to configure the priority functions diff --git a/plugin/pkg/scheduler/api/v1/BUILD b/plugin/pkg/scheduler/api/v1/BUILD index 0ac827f3fd0..fea85640eac 100644 --- a/plugin/pkg/scheduler/api/v1/BUILD +++ b/plugin/pkg/scheduler/api/v1/BUILD @@ -18,8 +18,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/runtime:go_default_library", "//pkg/runtime/schema:go_default_library", diff --git a/plugin/pkg/scheduler/api/v1/types.go b/plugin/pkg/scheduler/api/v1/types.go index 03401070f89..ee0aa8a67ec 100644 --- a/plugin/pkg/scheduler/api/v1/types.go +++ b/plugin/pkg/scheduler/api/v1/types.go @@ -19,13 +19,13 @@ package v1 import ( "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/restclient" ) type Policy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Holds the information to configure the fit predicate functions Predicates []PredicatePolicy `json:"predicates"` // Holds the information to configure the priority functions diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/api/unversioned/zz_generated.deepcopy.go deleted file mode 100644 index d70b91c7fbe..00000000000 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/zz_generated.deepcopy.go +++ /dev/null @@ -1,390 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package unversioned - -import ( - conversion "k8s.io/client-go/pkg/conversion" - time "time" -) - -func DeepCopy_unversioned_APIGroup(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*APIGroup) - out := out.(*APIGroup) - out.TypeMeta = in.TypeMeta - out.Name = in.Name - if in.Versions != nil { - in, out := &in.Versions, &out.Versions - *out = make([]GroupVersionForDiscovery, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Versions = nil - } - out.PreferredVersion = in.PreferredVersion - if in.ServerAddressByClientCIDRs != nil { - in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs - *out = make([]ServerAddressByClientCIDR, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.ServerAddressByClientCIDRs = nil - } - return nil - } -} - -func DeepCopy_unversioned_APIGroupList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*APIGroupList) - out := out.(*APIGroupList) - out.TypeMeta = in.TypeMeta - if in.Groups != nil { - in, out := &in.Groups, &out.Groups - *out = make([]APIGroup, len(*in)) - for i := range *in { - if err := DeepCopy_unversioned_APIGroup(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Groups = nil - } - return nil - } -} - -func DeepCopy_unversioned_APIResource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*APIResource) - out := out.(*APIResource) - out.Name = in.Name - out.Namespaced = in.Namespaced - out.Kind = in.Kind - return nil - } -} - -func DeepCopy_unversioned_APIResourceList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*APIResourceList) - out := out.(*APIResourceList) - out.TypeMeta = in.TypeMeta - out.GroupVersion = in.GroupVersion - if in.APIResources != nil { - in, out := &in.APIResources, &out.APIResources - *out = make([]APIResource, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.APIResources = nil - } - return nil - } -} - -func DeepCopy_unversioned_APIVersions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*APIVersions) - out := out.(*APIVersions) - out.TypeMeta = in.TypeMeta - if in.Versions != nil { - in, out := &in.Versions, &out.Versions - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Versions = nil - } - if in.ServerAddressByClientCIDRs != nil { - in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs - *out = make([]ServerAddressByClientCIDR, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.ServerAddressByClientCIDRs = nil - } - return nil - } -} - -func DeepCopy_unversioned_Duration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Duration) - out := out.(*Duration) - out.Duration = in.Duration - return nil - } -} - -func DeepCopy_unversioned_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ExportOptions) - out := out.(*ExportOptions) - out.TypeMeta = in.TypeMeta - out.Export = in.Export - out.Exact = in.Exact - return nil - } -} - -func DeepCopy_unversioned_GroupKind(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GroupKind) - out := out.(*GroupKind) - out.Group = in.Group - out.Kind = in.Kind - return nil - } -} - -func DeepCopy_unversioned_GroupResource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GroupResource) - out := out.(*GroupResource) - out.Group = in.Group - out.Resource = in.Resource - return nil - } -} - -func DeepCopy_unversioned_GroupVersion(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GroupVersion) - out := out.(*GroupVersion) - out.Group = in.Group - out.Version = in.Version - return nil - } -} - -func DeepCopy_unversioned_GroupVersionForDiscovery(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GroupVersionForDiscovery) - out := out.(*GroupVersionForDiscovery) - out.GroupVersion = in.GroupVersion - out.Version = in.Version - return nil - } -} - -func DeepCopy_unversioned_GroupVersionKind(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GroupVersionKind) - out := out.(*GroupVersionKind) - out.Group = in.Group - out.Version = in.Version - out.Kind = in.Kind - return nil - } -} - -func DeepCopy_unversioned_GroupVersionResource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GroupVersionResource) - out := out.(*GroupVersionResource) - out.Group = in.Group - out.Version = in.Version - out.Resource = in.Resource - return nil - } -} - -func DeepCopy_unversioned_LabelSelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LabelSelector) - out := out.(*LabelSelector) - if in.MatchLabels != nil { - in, out := &in.MatchLabels, &out.MatchLabels - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.MatchLabels = nil - } - if in.MatchExpressions != nil { - in, out := &in.MatchExpressions, &out.MatchExpressions - *out = make([]LabelSelectorRequirement, len(*in)) - for i := range *in { - if err := DeepCopy_unversioned_LabelSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.MatchExpressions = nil - } - return nil - } -} - -func DeepCopy_unversioned_LabelSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LabelSelectorRequirement) - out := out.(*LabelSelectorRequirement) - out.Key = in.Key - out.Operator = in.Operator - if in.Values != nil { - in, out := &in.Values, &out.Values - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Values = nil - } - return nil - } -} - -func DeepCopy_unversioned_ListMeta(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ListMeta) - out := out.(*ListMeta) - out.SelfLink = in.SelfLink - out.ResourceVersion = in.ResourceVersion - return nil - } -} - -func DeepCopy_unversioned_Patch(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Patch) - out := out.(*Patch) - _ = in - _ = out - return nil - } -} - -func DeepCopy_unversioned_RootPaths(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RootPaths) - out := out.(*RootPaths) - if in.Paths != nil { - in, out := &in.Paths, &out.Paths - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Paths = nil - } - return nil - } -} - -func DeepCopy_unversioned_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServerAddressByClientCIDR) - out := out.(*ServerAddressByClientCIDR) - out.ClientCIDR = in.ClientCIDR - out.ServerAddress = in.ServerAddress - return nil - } -} - -func DeepCopy_unversioned_Status(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Status) - out := out.(*Status) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - out.Status = in.Status - out.Message = in.Message - out.Reason = in.Reason - if in.Details != nil { - in, out := &in.Details, &out.Details - *out = new(StatusDetails) - if err := DeepCopy_unversioned_StatusDetails(*in, *out, c); err != nil { - return err - } - } else { - out.Details = nil - } - out.Code = in.Code - return nil - } -} - -func DeepCopy_unversioned_StatusCause(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatusCause) - out := out.(*StatusCause) - out.Type = in.Type - out.Message = in.Message - out.Field = in.Field - return nil - } -} - -func DeepCopy_unversioned_StatusDetails(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatusDetails) - out := out.(*StatusDetails) - out.Name = in.Name - out.Group = in.Group - out.Kind = in.Kind - if in.Causes != nil { - in, out := &in.Causes, &out.Causes - *out = make([]StatusCause, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Causes = nil - } - out.RetryAfterSeconds = in.RetryAfterSeconds - return nil - } -} - -func DeepCopy_unversioned_Time(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Time) - out := out.(*Time) - if newVal, err := c.DeepCopy(&in.Time); err != nil { - return err - } else { - out.Time = *newVal.(*time.Time) - } - return nil - } -} - -func DeepCopy_unversioned_Timestamp(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Timestamp) - out := out.(*Timestamp) - out.Seconds = in.Seconds - out.Nanos = in.Nanos - return nil - } -} - -func DeepCopy_unversioned_TypeMeta(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TypeMeta) - out := out.(*TypeMeta) - out.Kind = in.Kind - out.APIVersion = in.APIVersion - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go deleted file mode 100644 index 0ece706a90d..00000000000 --- a/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go +++ /dev/null @@ -1,3787 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1 - -import ( - unversioned "k8s.io/client-go/pkg/api/unversioned" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - types "k8s.io/client-go/pkg/types" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AWSElasticBlockStoreVolumeSource, InType: reflect.TypeOf(&AWSElasticBlockStoreVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Affinity, InType: reflect.TypeOf(&Affinity{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AttachedVolume, InType: reflect.TypeOf(&AttachedVolume{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AvoidPods, InType: reflect.TypeOf(&AvoidPods{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AzureDiskVolumeSource, InType: reflect.TypeOf(&AzureDiskVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AzureFileVolumeSource, InType: reflect.TypeOf(&AzureFileVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Binding, InType: reflect.TypeOf(&Binding{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Capabilities, InType: reflect.TypeOf(&Capabilities{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_CephFSVolumeSource, InType: reflect.TypeOf(&CephFSVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_CinderVolumeSource, InType: reflect.TypeOf(&CinderVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ComponentCondition, InType: reflect.TypeOf(&ComponentCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ComponentStatus, InType: reflect.TypeOf(&ComponentStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ComponentStatusList, InType: reflect.TypeOf(&ComponentStatusList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ConfigMap, InType: reflect.TypeOf(&ConfigMap{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ConfigMapKeySelector, InType: reflect.TypeOf(&ConfigMapKeySelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ConfigMapList, InType: reflect.TypeOf(&ConfigMapList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ConfigMapVolumeSource, InType: reflect.TypeOf(&ConfigMapVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Container, InType: reflect.TypeOf(&Container{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerImage, InType: reflect.TypeOf(&ContainerImage{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerPort, InType: reflect.TypeOf(&ContainerPort{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerState, InType: reflect.TypeOf(&ContainerState{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerStateRunning, InType: reflect.TypeOf(&ContainerStateRunning{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerStateTerminated, InType: reflect.TypeOf(&ContainerStateTerminated{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerStateWaiting, InType: reflect.TypeOf(&ContainerStateWaiting{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerStatus, InType: reflect.TypeOf(&ContainerStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_DaemonEndpoint, InType: reflect.TypeOf(&DaemonEndpoint{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_DeleteOptions, InType: reflect.TypeOf(&DeleteOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_DownwardAPIVolumeFile, InType: reflect.TypeOf(&DownwardAPIVolumeFile{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_DownwardAPIVolumeSource, InType: reflect.TypeOf(&DownwardAPIVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EmptyDirVolumeSource, InType: reflect.TypeOf(&EmptyDirVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EndpointAddress, InType: reflect.TypeOf(&EndpointAddress{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EndpointPort, InType: reflect.TypeOf(&EndpointPort{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EndpointSubset, InType: reflect.TypeOf(&EndpointSubset{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Endpoints, InType: reflect.TypeOf(&Endpoints{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EndpointsList, InType: reflect.TypeOf(&EndpointsList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EnvVar, InType: reflect.TypeOf(&EnvVar{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EnvVarSource, InType: reflect.TypeOf(&EnvVarSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Event, InType: reflect.TypeOf(&Event{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EventList, InType: reflect.TypeOf(&EventList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EventSource, InType: reflect.TypeOf(&EventSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ExecAction, InType: reflect.TypeOf(&ExecAction{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ExportOptions, InType: reflect.TypeOf(&ExportOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FCVolumeSource, InType: reflect.TypeOf(&FCVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FlexVolumeSource, InType: reflect.TypeOf(&FlexVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FlockerVolumeSource, InType: reflect.TypeOf(&FlockerVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_GCEPersistentDiskVolumeSource, InType: reflect.TypeOf(&GCEPersistentDiskVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_GitRepoVolumeSource, InType: reflect.TypeOf(&GitRepoVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_GlusterfsVolumeSource, InType: reflect.TypeOf(&GlusterfsVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HTTPGetAction, InType: reflect.TypeOf(&HTTPGetAction{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HTTPHeader, InType: reflect.TypeOf(&HTTPHeader{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Handler, InType: reflect.TypeOf(&Handler{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HostPathVolumeSource, InType: reflect.TypeOf(&HostPathVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ISCSIVolumeSource, InType: reflect.TypeOf(&ISCSIVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_KeyToPath, InType: reflect.TypeOf(&KeyToPath{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Lifecycle, InType: reflect.TypeOf(&Lifecycle{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LimitRange, InType: reflect.TypeOf(&LimitRange{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LimitRangeItem, InType: reflect.TypeOf(&LimitRangeItem{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LimitRangeList, InType: reflect.TypeOf(&LimitRangeList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LimitRangeSpec, InType: reflect.TypeOf(&LimitRangeSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_List, InType: reflect.TypeOf(&List{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ListOptions, InType: reflect.TypeOf(&ListOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LoadBalancerIngress, InType: reflect.TypeOf(&LoadBalancerIngress{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LoadBalancerStatus, InType: reflect.TypeOf(&LoadBalancerStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LocalObjectReference, InType: reflect.TypeOf(&LocalObjectReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NFSVolumeSource, InType: reflect.TypeOf(&NFSVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Namespace, InType: reflect.TypeOf(&Namespace{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NamespaceList, InType: reflect.TypeOf(&NamespaceList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NamespaceSpec, InType: reflect.TypeOf(&NamespaceSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NamespaceStatus, InType: reflect.TypeOf(&NamespaceStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Node, InType: reflect.TypeOf(&Node{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeAddress, InType: reflect.TypeOf(&NodeAddress{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeAffinity, InType: reflect.TypeOf(&NodeAffinity{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeCondition, InType: reflect.TypeOf(&NodeCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeDaemonEndpoints, InType: reflect.TypeOf(&NodeDaemonEndpoints{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeList, InType: reflect.TypeOf(&NodeList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeProxyOptions, InType: reflect.TypeOf(&NodeProxyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeResources, InType: reflect.TypeOf(&NodeResources{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSelector, InType: reflect.TypeOf(&NodeSelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSelectorRequirement, InType: reflect.TypeOf(&NodeSelectorRequirement{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSelectorTerm, InType: reflect.TypeOf(&NodeSelectorTerm{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSpec, InType: reflect.TypeOf(&NodeSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeStatus, InType: reflect.TypeOf(&NodeStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSystemInfo, InType: reflect.TypeOf(&NodeSystemInfo{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ObjectFieldSelector, InType: reflect.TypeOf(&ObjectFieldSelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ObjectMeta, InType: reflect.TypeOf(&ObjectMeta{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ObjectReference, InType: reflect.TypeOf(&ObjectReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_OwnerReference, InType: reflect.TypeOf(&OwnerReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolume, InType: reflect.TypeOf(&PersistentVolume{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaim, InType: reflect.TypeOf(&PersistentVolumeClaim{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaimList, InType: reflect.TypeOf(&PersistentVolumeClaimList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaimSpec, InType: reflect.TypeOf(&PersistentVolumeClaimSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaimStatus, InType: reflect.TypeOf(&PersistentVolumeClaimStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaimVolumeSource, InType: reflect.TypeOf(&PersistentVolumeClaimVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeList, InType: reflect.TypeOf(&PersistentVolumeList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeSource, InType: reflect.TypeOf(&PersistentVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeSpec, InType: reflect.TypeOf(&PersistentVolumeSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeStatus, InType: reflect.TypeOf(&PersistentVolumeStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PhotonPersistentDiskVolumeSource, InType: reflect.TypeOf(&PhotonPersistentDiskVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Pod, InType: reflect.TypeOf(&Pod{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodAffinity, InType: reflect.TypeOf(&PodAffinity{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodAffinityTerm, InType: reflect.TypeOf(&PodAffinityTerm{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodAntiAffinity, InType: reflect.TypeOf(&PodAntiAffinity{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodAttachOptions, InType: reflect.TypeOf(&PodAttachOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodCondition, InType: reflect.TypeOf(&PodCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodExecOptions, InType: reflect.TypeOf(&PodExecOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodList, InType: reflect.TypeOf(&PodList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodLogOptions, InType: reflect.TypeOf(&PodLogOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodProxyOptions, InType: reflect.TypeOf(&PodProxyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodSecurityContext, InType: reflect.TypeOf(&PodSecurityContext{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodSignature, InType: reflect.TypeOf(&PodSignature{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodSpec, InType: reflect.TypeOf(&PodSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodStatus, InType: reflect.TypeOf(&PodStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodStatusResult, InType: reflect.TypeOf(&PodStatusResult{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodTemplate, InType: reflect.TypeOf(&PodTemplate{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodTemplateList, InType: reflect.TypeOf(&PodTemplateList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodTemplateSpec, InType: reflect.TypeOf(&PodTemplateSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Preconditions, InType: reflect.TypeOf(&Preconditions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PreferAvoidPodsEntry, InType: reflect.TypeOf(&PreferAvoidPodsEntry{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PreferredSchedulingTerm, InType: reflect.TypeOf(&PreferredSchedulingTerm{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Probe, InType: reflect.TypeOf(&Probe{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_QuobyteVolumeSource, InType: reflect.TypeOf(&QuobyteVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_RBDVolumeSource, InType: reflect.TypeOf(&RBDVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_RangeAllocation, InType: reflect.TypeOf(&RangeAllocation{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationController, InType: reflect.TypeOf(&ReplicationController{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationControllerCondition, InType: reflect.TypeOf(&ReplicationControllerCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationControllerList, InType: reflect.TypeOf(&ReplicationControllerList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationControllerSpec, InType: reflect.TypeOf(&ReplicationControllerSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationControllerStatus, InType: reflect.TypeOf(&ReplicationControllerStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceFieldSelector, InType: reflect.TypeOf(&ResourceFieldSelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceQuota, InType: reflect.TypeOf(&ResourceQuota{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceQuotaList, InType: reflect.TypeOf(&ResourceQuotaList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceQuotaSpec, InType: reflect.TypeOf(&ResourceQuotaSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceQuotaStatus, InType: reflect.TypeOf(&ResourceQuotaStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceRequirements, InType: reflect.TypeOf(&ResourceRequirements{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SELinuxOptions, InType: reflect.TypeOf(&SELinuxOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Secret, InType: reflect.TypeOf(&Secret{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SecretKeySelector, InType: reflect.TypeOf(&SecretKeySelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SecretList, InType: reflect.TypeOf(&SecretList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SecretVolumeSource, InType: reflect.TypeOf(&SecretVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SecurityContext, InType: reflect.TypeOf(&SecurityContext{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SerializedReference, InType: reflect.TypeOf(&SerializedReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Service, InType: reflect.TypeOf(&Service{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceAccount, InType: reflect.TypeOf(&ServiceAccount{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceAccountList, InType: reflect.TypeOf(&ServiceAccountList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceList, InType: reflect.TypeOf(&ServiceList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServicePort, InType: reflect.TypeOf(&ServicePort{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceProxyOptions, InType: reflect.TypeOf(&ServiceProxyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceSpec, InType: reflect.TypeOf(&ServiceSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceStatus, InType: reflect.TypeOf(&ServiceStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Sysctl, InType: reflect.TypeOf(&Sysctl{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_TCPSocketAction, InType: reflect.TypeOf(&TCPSocketAction{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Taint, InType: reflect.TypeOf(&Taint{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Toleration, InType: reflect.TypeOf(&Toleration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Volume, InType: reflect.TypeOf(&Volume{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_VolumeMount, InType: reflect.TypeOf(&VolumeMount{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_VolumeSource, InType: reflect.TypeOf(&VolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_VsphereVirtualDiskVolumeSource, InType: reflect.TypeOf(&VsphereVirtualDiskVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_WeightedPodAffinityTerm, InType: reflect.TypeOf(&WeightedPodAffinityTerm{})}, - ) -} - -func DeepCopy_v1_AWSElasticBlockStoreVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AWSElasticBlockStoreVolumeSource) - out := out.(*AWSElasticBlockStoreVolumeSource) - out.VolumeID = in.VolumeID - out.FSType = in.FSType - out.Partition = in.Partition - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_Affinity(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Affinity) - out := out.(*Affinity) - if in.NodeAffinity != nil { - in, out := &in.NodeAffinity, &out.NodeAffinity - *out = new(NodeAffinity) - if err := DeepCopy_v1_NodeAffinity(*in, *out, c); err != nil { - return err - } - } else { - out.NodeAffinity = nil - } - if in.PodAffinity != nil { - in, out := &in.PodAffinity, &out.PodAffinity - *out = new(PodAffinity) - if err := DeepCopy_v1_PodAffinity(*in, *out, c); err != nil { - return err - } - } else { - out.PodAffinity = nil - } - if in.PodAntiAffinity != nil { - in, out := &in.PodAntiAffinity, &out.PodAntiAffinity - *out = new(PodAntiAffinity) - if err := DeepCopy_v1_PodAntiAffinity(*in, *out, c); err != nil { - return err - } - } else { - out.PodAntiAffinity = nil - } - return nil - } -} - -func DeepCopy_v1_AttachedVolume(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AttachedVolume) - out := out.(*AttachedVolume) - out.Name = in.Name - out.DevicePath = in.DevicePath - return nil - } -} - -func DeepCopy_v1_AvoidPods(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AvoidPods) - out := out.(*AvoidPods) - if in.PreferAvoidPods != nil { - in, out := &in.PreferAvoidPods, &out.PreferAvoidPods - *out = make([]PreferAvoidPodsEntry, len(*in)) - for i := range *in { - if err := DeepCopy_v1_PreferAvoidPodsEntry(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.PreferAvoidPods = nil - } - return nil - } -} - -func DeepCopy_v1_AzureDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AzureDiskVolumeSource) - out := out.(*AzureDiskVolumeSource) - out.DiskName = in.DiskName - out.DataDiskURI = in.DataDiskURI - if in.CachingMode != nil { - in, out := &in.CachingMode, &out.CachingMode - *out = new(AzureDataDiskCachingMode) - **out = **in - } else { - out.CachingMode = nil - } - if in.FSType != nil { - in, out := &in.FSType, &out.FSType - *out = new(string) - **out = **in - } else { - out.FSType = nil - } - if in.ReadOnly != nil { - in, out := &in.ReadOnly, &out.ReadOnly - *out = new(bool) - **out = **in - } else { - out.ReadOnly = nil - } - return nil - } -} - -func DeepCopy_v1_AzureFileVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AzureFileVolumeSource) - out := out.(*AzureFileVolumeSource) - out.SecretName = in.SecretName - out.ShareName = in.ShareName - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_Binding(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Binding) - out := out.(*Binding) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Target = in.Target - return nil - } -} - -func DeepCopy_v1_Capabilities(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Capabilities) - out := out.(*Capabilities) - if in.Add != nil { - in, out := &in.Add, &out.Add - *out = make([]Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Add = nil - } - if in.Drop != nil { - in, out := &in.Drop, &out.Drop - *out = make([]Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Drop = nil - } - return nil - } -} - -func DeepCopy_v1_CephFSVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CephFSVolumeSource) - out := out.(*CephFSVolumeSource) - if in.Monitors != nil { - in, out := &in.Monitors, &out.Monitors - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Monitors = nil - } - out.Path = in.Path - out.User = in.User - out.SecretFile = in.SecretFile - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(LocalObjectReference) - **out = **in - } else { - out.SecretRef = nil - } - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_CinderVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CinderVolumeSource) - out := out.(*CinderVolumeSource) - out.VolumeID = in.VolumeID - out.FSType = in.FSType - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_ComponentCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ComponentCondition) - out := out.(*ComponentCondition) - out.Type = in.Type - out.Status = in.Status - out.Message = in.Message - out.Error = in.Error - return nil - } -} - -func DeepCopy_v1_ComponentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ComponentStatus) - out := out.(*ComponentStatus) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]ComponentCondition, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Conditions = nil - } - return nil - } -} - -func DeepCopy_v1_ComponentStatusList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ComponentStatusList) - out := out.(*ComponentStatusList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ComponentStatus, len(*in)) - for i := range *in { - if err := DeepCopy_v1_ComponentStatus(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_ConfigMap(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ConfigMap) - out := out.(*ConfigMap) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Data != nil { - in, out := &in.Data, &out.Data - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Data = nil - } - return nil - } -} - -func DeepCopy_v1_ConfigMapKeySelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ConfigMapKeySelector) - out := out.(*ConfigMapKeySelector) - out.LocalObjectReference = in.LocalObjectReference - out.Key = in.Key - return nil - } -} - -func DeepCopy_v1_ConfigMapList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ConfigMapList) - out := out.(*ConfigMapList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ConfigMap, len(*in)) - for i := range *in { - if err := DeepCopy_v1_ConfigMap(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_ConfigMapVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ConfigMapVolumeSource) - out := out.(*ConfigMapVolumeSource) - out.LocalObjectReference = in.LocalObjectReference - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]KeyToPath, len(*in)) - for i := range *in { - if err := DeepCopy_v1_KeyToPath(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - if in.DefaultMode != nil { - in, out := &in.DefaultMode, &out.DefaultMode - *out = new(int32) - **out = **in - } else { - out.DefaultMode = nil - } - return nil - } -} - -func DeepCopy_v1_Container(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Container) - out := out.(*Container) - out.Name = in.Name - out.Image = in.Image - if in.Command != nil { - in, out := &in.Command, &out.Command - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Command = nil - } - if in.Args != nil { - in, out := &in.Args, &out.Args - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Args = nil - } - out.WorkingDir = in.WorkingDir - if in.Ports != nil { - in, out := &in.Ports, &out.Ports - *out = make([]ContainerPort, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ports = nil - } - if in.Env != nil { - in, out := &in.Env, &out.Env - *out = make([]EnvVar, len(*in)) - for i := range *in { - if err := DeepCopy_v1_EnvVar(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Env = nil - } - if err := DeepCopy_v1_ResourceRequirements(&in.Resources, &out.Resources, c); err != nil { - return err - } - if in.VolumeMounts != nil { - in, out := &in.VolumeMounts, &out.VolumeMounts - *out = make([]VolumeMount, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.VolumeMounts = nil - } - if in.LivenessProbe != nil { - in, out := &in.LivenessProbe, &out.LivenessProbe - *out = new(Probe) - if err := DeepCopy_v1_Probe(*in, *out, c); err != nil { - return err - } - } else { - out.LivenessProbe = nil - } - if in.ReadinessProbe != nil { - in, out := &in.ReadinessProbe, &out.ReadinessProbe - *out = new(Probe) - if err := DeepCopy_v1_Probe(*in, *out, c); err != nil { - return err - } - } else { - out.ReadinessProbe = nil - } - if in.Lifecycle != nil { - in, out := &in.Lifecycle, &out.Lifecycle - *out = new(Lifecycle) - if err := DeepCopy_v1_Lifecycle(*in, *out, c); err != nil { - return err - } - } else { - out.Lifecycle = nil - } - out.TerminationMessagePath = in.TerminationMessagePath - out.ImagePullPolicy = in.ImagePullPolicy - if in.SecurityContext != nil { - in, out := &in.SecurityContext, &out.SecurityContext - *out = new(SecurityContext) - if err := DeepCopy_v1_SecurityContext(*in, *out, c); err != nil { - return err - } - } else { - out.SecurityContext = nil - } - out.Stdin = in.Stdin - out.StdinOnce = in.StdinOnce - out.TTY = in.TTY - return nil - } -} - -func DeepCopy_v1_ContainerImage(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerImage) - out := out.(*ContainerImage) - if in.Names != nil { - in, out := &in.Names, &out.Names - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Names = nil - } - out.SizeBytes = in.SizeBytes - return nil - } -} - -func DeepCopy_v1_ContainerPort(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerPort) - out := out.(*ContainerPort) - out.Name = in.Name - out.HostPort = in.HostPort - out.ContainerPort = in.ContainerPort - out.Protocol = in.Protocol - out.HostIP = in.HostIP - return nil - } -} - -func DeepCopy_v1_ContainerState(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerState) - out := out.(*ContainerState) - if in.Waiting != nil { - in, out := &in.Waiting, &out.Waiting - *out = new(ContainerStateWaiting) - **out = **in - } else { - out.Waiting = nil - } - if in.Running != nil { - in, out := &in.Running, &out.Running - *out = new(ContainerStateRunning) - if err := DeepCopy_v1_ContainerStateRunning(*in, *out, c); err != nil { - return err - } - } else { - out.Running = nil - } - if in.Terminated != nil { - in, out := &in.Terminated, &out.Terminated - *out = new(ContainerStateTerminated) - if err := DeepCopy_v1_ContainerStateTerminated(*in, *out, c); err != nil { - return err - } - } else { - out.Terminated = nil - } - return nil - } -} - -func DeepCopy_v1_ContainerStateRunning(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerStateRunning) - out := out.(*ContainerStateRunning) - out.StartedAt = in.StartedAt.DeepCopy() - return nil - } -} - -func DeepCopy_v1_ContainerStateTerminated(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerStateTerminated) - out := out.(*ContainerStateTerminated) - out.ExitCode = in.ExitCode - out.Signal = in.Signal - out.Reason = in.Reason - out.Message = in.Message - out.StartedAt = in.StartedAt.DeepCopy() - out.FinishedAt = in.FinishedAt.DeepCopy() - out.ContainerID = in.ContainerID - return nil - } -} - -func DeepCopy_v1_ContainerStateWaiting(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerStateWaiting) - out := out.(*ContainerStateWaiting) - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1_ContainerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerStatus) - out := out.(*ContainerStatus) - out.Name = in.Name - if err := DeepCopy_v1_ContainerState(&in.State, &out.State, c); err != nil { - return err - } - if err := DeepCopy_v1_ContainerState(&in.LastTerminationState, &out.LastTerminationState, c); err != nil { - return err - } - out.Ready = in.Ready - out.RestartCount = in.RestartCount - out.Image = in.Image - out.ImageID = in.ImageID - out.ContainerID = in.ContainerID - return nil - } -} - -func DeepCopy_v1_DaemonEndpoint(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonEndpoint) - out := out.(*DaemonEndpoint) - out.Port = in.Port - return nil - } -} - -func DeepCopy_v1_DeleteOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeleteOptions) - out := out.(*DeleteOptions) - out.TypeMeta = in.TypeMeta - if in.GracePeriodSeconds != nil { - in, out := &in.GracePeriodSeconds, &out.GracePeriodSeconds - *out = new(int64) - **out = **in - } else { - out.GracePeriodSeconds = nil - } - if in.Preconditions != nil { - in, out := &in.Preconditions, &out.Preconditions - *out = new(Preconditions) - if err := DeepCopy_v1_Preconditions(*in, *out, c); err != nil { - return err - } - } else { - out.Preconditions = nil - } - if in.OrphanDependents != nil { - in, out := &in.OrphanDependents, &out.OrphanDependents - *out = new(bool) - **out = **in - } else { - out.OrphanDependents = nil - } - return nil - } -} - -func DeepCopy_v1_DownwardAPIVolumeFile(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DownwardAPIVolumeFile) - out := out.(*DownwardAPIVolumeFile) - out.Path = in.Path - if in.FieldRef != nil { - in, out := &in.FieldRef, &out.FieldRef - *out = new(ObjectFieldSelector) - **out = **in - } else { - out.FieldRef = nil - } - if in.ResourceFieldRef != nil { - in, out := &in.ResourceFieldRef, &out.ResourceFieldRef - *out = new(ResourceFieldSelector) - if err := DeepCopy_v1_ResourceFieldSelector(*in, *out, c); err != nil { - return err - } - } else { - out.ResourceFieldRef = nil - } - if in.Mode != nil { - in, out := &in.Mode, &out.Mode - *out = new(int32) - **out = **in - } else { - out.Mode = nil - } - return nil - } -} - -func DeepCopy_v1_DownwardAPIVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DownwardAPIVolumeSource) - out := out.(*DownwardAPIVolumeSource) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DownwardAPIVolumeFile, len(*in)) - for i := range *in { - if err := DeepCopy_v1_DownwardAPIVolumeFile(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - if in.DefaultMode != nil { - in, out := &in.DefaultMode, &out.DefaultMode - *out = new(int32) - **out = **in - } else { - out.DefaultMode = nil - } - return nil - } -} - -func DeepCopy_v1_EmptyDirVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EmptyDirVolumeSource) - out := out.(*EmptyDirVolumeSource) - out.Medium = in.Medium - return nil - } -} - -func DeepCopy_v1_EndpointAddress(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EndpointAddress) - out := out.(*EndpointAddress) - out.IP = in.IP - out.Hostname = in.Hostname - if in.NodeName != nil { - in, out := &in.NodeName, &out.NodeName - *out = new(string) - **out = **in - } else { - out.NodeName = nil - } - if in.TargetRef != nil { - in, out := &in.TargetRef, &out.TargetRef - *out = new(ObjectReference) - **out = **in - } else { - out.TargetRef = nil - } - return nil - } -} - -func DeepCopy_v1_EndpointPort(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EndpointPort) - out := out.(*EndpointPort) - out.Name = in.Name - out.Port = in.Port - out.Protocol = in.Protocol - return nil - } -} - -func DeepCopy_v1_EndpointSubset(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EndpointSubset) - out := out.(*EndpointSubset) - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]EndpointAddress, len(*in)) - for i := range *in { - if err := DeepCopy_v1_EndpointAddress(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Addresses = nil - } - if in.NotReadyAddresses != nil { - in, out := &in.NotReadyAddresses, &out.NotReadyAddresses - *out = make([]EndpointAddress, len(*in)) - for i := range *in { - if err := DeepCopy_v1_EndpointAddress(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.NotReadyAddresses = nil - } - if in.Ports != nil { - in, out := &in.Ports, &out.Ports - *out = make([]EndpointPort, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ports = nil - } - return nil - } -} - -func DeepCopy_v1_Endpoints(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Endpoints) - out := out.(*Endpoints) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Subsets != nil { - in, out := &in.Subsets, &out.Subsets - *out = make([]EndpointSubset, len(*in)) - for i := range *in { - if err := DeepCopy_v1_EndpointSubset(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Subsets = nil - } - return nil - } -} - -func DeepCopy_v1_EndpointsList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EndpointsList) - out := out.(*EndpointsList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Endpoints, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Endpoints(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_EnvVar(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EnvVar) - out := out.(*EnvVar) - out.Name = in.Name - out.Value = in.Value - if in.ValueFrom != nil { - in, out := &in.ValueFrom, &out.ValueFrom - *out = new(EnvVarSource) - if err := DeepCopy_v1_EnvVarSource(*in, *out, c); err != nil { - return err - } - } else { - out.ValueFrom = nil - } - return nil - } -} - -func DeepCopy_v1_EnvVarSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EnvVarSource) - out := out.(*EnvVarSource) - if in.FieldRef != nil { - in, out := &in.FieldRef, &out.FieldRef - *out = new(ObjectFieldSelector) - **out = **in - } else { - out.FieldRef = nil - } - if in.ResourceFieldRef != nil { - in, out := &in.ResourceFieldRef, &out.ResourceFieldRef - *out = new(ResourceFieldSelector) - if err := DeepCopy_v1_ResourceFieldSelector(*in, *out, c); err != nil { - return err - } - } else { - out.ResourceFieldRef = nil - } - if in.ConfigMapKeyRef != nil { - in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef - *out = new(ConfigMapKeySelector) - **out = **in - } else { - out.ConfigMapKeyRef = nil - } - if in.SecretKeyRef != nil { - in, out := &in.SecretKeyRef, &out.SecretKeyRef - *out = new(SecretKeySelector) - **out = **in - } else { - out.SecretKeyRef = nil - } - return nil - } -} - -func DeepCopy_v1_Event(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Event) - out := out.(*Event) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.InvolvedObject = in.InvolvedObject - out.Reason = in.Reason - out.Message = in.Message - out.Source = in.Source - out.FirstTimestamp = in.FirstTimestamp.DeepCopy() - out.LastTimestamp = in.LastTimestamp.DeepCopy() - out.Count = in.Count - out.Type = in.Type - return nil - } -} - -func DeepCopy_v1_EventList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EventList) - out := out.(*EventList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Event, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Event(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_EventSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EventSource) - out := out.(*EventSource) - out.Component = in.Component - out.Host = in.Host - return nil - } -} - -func DeepCopy_v1_ExecAction(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ExecAction) - out := out.(*ExecAction) - if in.Command != nil { - in, out := &in.Command, &out.Command - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Command = nil - } - return nil - } -} - -func DeepCopy_v1_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ExportOptions) - out := out.(*ExportOptions) - out.TypeMeta = in.TypeMeta - out.Export = in.Export - out.Exact = in.Exact - return nil - } -} - -func DeepCopy_v1_FCVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*FCVolumeSource) - out := out.(*FCVolumeSource) - if in.TargetWWNs != nil { - in, out := &in.TargetWWNs, &out.TargetWWNs - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.TargetWWNs = nil - } - if in.Lun != nil { - in, out := &in.Lun, &out.Lun - *out = new(int32) - **out = **in - } else { - out.Lun = nil - } - out.FSType = in.FSType - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_FlexVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*FlexVolumeSource) - out := out.(*FlexVolumeSource) - out.Driver = in.Driver - out.FSType = in.FSType - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(LocalObjectReference) - **out = **in - } else { - out.SecretRef = nil - } - out.ReadOnly = in.ReadOnly - if in.Options != nil { - in, out := &in.Options, &out.Options - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Options = nil - } - return nil - } -} - -func DeepCopy_v1_FlockerVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*FlockerVolumeSource) - out := out.(*FlockerVolumeSource) - out.DatasetName = in.DatasetName - out.DatasetUUID = in.DatasetUUID - return nil - } -} - -func DeepCopy_v1_GCEPersistentDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GCEPersistentDiskVolumeSource) - out := out.(*GCEPersistentDiskVolumeSource) - out.PDName = in.PDName - out.FSType = in.FSType - out.Partition = in.Partition - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_GitRepoVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GitRepoVolumeSource) - out := out.(*GitRepoVolumeSource) - out.Repository = in.Repository - out.Revision = in.Revision - out.Directory = in.Directory - return nil - } -} - -func DeepCopy_v1_GlusterfsVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GlusterfsVolumeSource) - out := out.(*GlusterfsVolumeSource) - out.EndpointsName = in.EndpointsName - out.Path = in.Path - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_HTTPGetAction(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HTTPGetAction) - out := out.(*HTTPGetAction) - out.Path = in.Path - out.Port = in.Port - out.Host = in.Host - out.Scheme = in.Scheme - if in.HTTPHeaders != nil { - in, out := &in.HTTPHeaders, &out.HTTPHeaders - *out = make([]HTTPHeader, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.HTTPHeaders = nil - } - return nil - } -} - -func DeepCopy_v1_HTTPHeader(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HTTPHeader) - out := out.(*HTTPHeader) - out.Name = in.Name - out.Value = in.Value - return nil - } -} - -func DeepCopy_v1_Handler(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Handler) - out := out.(*Handler) - if in.Exec != nil { - in, out := &in.Exec, &out.Exec - *out = new(ExecAction) - if err := DeepCopy_v1_ExecAction(*in, *out, c); err != nil { - return err - } - } else { - out.Exec = nil - } - if in.HTTPGet != nil { - in, out := &in.HTTPGet, &out.HTTPGet - *out = new(HTTPGetAction) - if err := DeepCopy_v1_HTTPGetAction(*in, *out, c); err != nil { - return err - } - } else { - out.HTTPGet = nil - } - if in.TCPSocket != nil { - in, out := &in.TCPSocket, &out.TCPSocket - *out = new(TCPSocketAction) - **out = **in - } else { - out.TCPSocket = nil - } - return nil - } -} - -func DeepCopy_v1_HostPathVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HostPathVolumeSource) - out := out.(*HostPathVolumeSource) - out.Path = in.Path - return nil - } -} - -func DeepCopy_v1_ISCSIVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ISCSIVolumeSource) - out := out.(*ISCSIVolumeSource) - out.TargetPortal = in.TargetPortal - out.IQN = in.IQN - out.Lun = in.Lun - out.ISCSIInterface = in.ISCSIInterface - out.FSType = in.FSType - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_KeyToPath(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KeyToPath) - out := out.(*KeyToPath) - out.Key = in.Key - out.Path = in.Path - if in.Mode != nil { - in, out := &in.Mode, &out.Mode - *out = new(int32) - **out = **in - } else { - out.Mode = nil - } - return nil - } -} - -func DeepCopy_v1_Lifecycle(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Lifecycle) - out := out.(*Lifecycle) - if in.PostStart != nil { - in, out := &in.PostStart, &out.PostStart - *out = new(Handler) - if err := DeepCopy_v1_Handler(*in, *out, c); err != nil { - return err - } - } else { - out.PostStart = nil - } - if in.PreStop != nil { - in, out := &in.PreStop, &out.PreStop - *out = new(Handler) - if err := DeepCopy_v1_Handler(*in, *out, c); err != nil { - return err - } - } else { - out.PreStop = nil - } - return nil - } -} - -func DeepCopy_v1_LimitRange(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LimitRange) - out := out.(*LimitRange) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_LimitRangeSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_LimitRangeItem(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LimitRangeItem) - out := out.(*LimitRangeItem) - out.Type = in.Type - if in.Max != nil { - in, out := &in.Max, &out.Max - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Max = nil - } - if in.Min != nil { - in, out := &in.Min, &out.Min - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Min = nil - } - if in.Default != nil { - in, out := &in.Default, &out.Default - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Default = nil - } - if in.DefaultRequest != nil { - in, out := &in.DefaultRequest, &out.DefaultRequest - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.DefaultRequest = nil - } - if in.MaxLimitRequestRatio != nil { - in, out := &in.MaxLimitRequestRatio, &out.MaxLimitRequestRatio - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.MaxLimitRequestRatio = nil - } - return nil - } -} - -func DeepCopy_v1_LimitRangeList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LimitRangeList) - out := out.(*LimitRangeList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]LimitRange, len(*in)) - for i := range *in { - if err := DeepCopy_v1_LimitRange(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_LimitRangeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LimitRangeSpec) - out := out.(*LimitRangeSpec) - if in.Limits != nil { - in, out := &in.Limits, &out.Limits - *out = make([]LimitRangeItem, len(*in)) - for i := range *in { - if err := DeepCopy_v1_LimitRangeItem(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Limits = nil - } - return nil - } -} - -func DeepCopy_v1_List(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*List) - out := out.(*List) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]runtime.RawExtension, len(*in)) - for i := range *in { - if err := runtime.DeepCopy_runtime_RawExtension(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_ListOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ListOptions) - out := out.(*ListOptions) - out.TypeMeta = in.TypeMeta - out.LabelSelector = in.LabelSelector - out.FieldSelector = in.FieldSelector - out.Watch = in.Watch - out.ResourceVersion = in.ResourceVersion - if in.TimeoutSeconds != nil { - in, out := &in.TimeoutSeconds, &out.TimeoutSeconds - *out = new(int64) - **out = **in - } else { - out.TimeoutSeconds = nil - } - return nil - } -} - -func DeepCopy_v1_LoadBalancerIngress(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LoadBalancerIngress) - out := out.(*LoadBalancerIngress) - out.IP = in.IP - out.Hostname = in.Hostname - return nil - } -} - -func DeepCopy_v1_LoadBalancerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LoadBalancerStatus) - out := out.(*LoadBalancerStatus) - if in.Ingress != nil { - in, out := &in.Ingress, &out.Ingress - *out = make([]LoadBalancerIngress, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ingress = nil - } - return nil - } -} - -func DeepCopy_v1_LocalObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LocalObjectReference) - out := out.(*LocalObjectReference) - out.Name = in.Name - return nil - } -} - -func DeepCopy_v1_NFSVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NFSVolumeSource) - out := out.(*NFSVolumeSource) - out.Server = in.Server - out.Path = in.Path - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_Namespace(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Namespace) - out := out.(*Namespace) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_NamespaceSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_v1_NamespaceList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NamespaceList) - out := out.(*NamespaceList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Namespace, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Namespace(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_NamespaceSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NamespaceSpec) - out := out.(*NamespaceSpec) - if in.Finalizers != nil { - in, out := &in.Finalizers, &out.Finalizers - *out = make([]FinalizerName, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Finalizers = nil - } - return nil - } -} - -func DeepCopy_v1_NamespaceStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NamespaceStatus) - out := out.(*NamespaceStatus) - out.Phase = in.Phase - return nil - } -} - -func DeepCopy_v1_Node(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Node) - out := out.(*Node) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Spec = in.Spec - if err := DeepCopy_v1_NodeStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_NodeAddress(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeAddress) - out := out.(*NodeAddress) - out.Type = in.Type - out.Address = in.Address - return nil - } -} - -func DeepCopy_v1_NodeAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeAffinity) - out := out.(*NodeAffinity) - if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution - *out = new(NodeSelector) - if err := DeepCopy_v1_NodeSelector(*in, *out, c); err != nil { - return err - } - } else { - out.RequiredDuringSchedulingIgnoredDuringExecution = nil - } - if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution - *out = make([]PreferredSchedulingTerm, len(*in)) - for i := range *in { - if err := DeepCopy_v1_PreferredSchedulingTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.PreferredDuringSchedulingIgnoredDuringExecution = nil - } - return nil - } -} - -func DeepCopy_v1_NodeCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeCondition) - out := out.(*NodeCondition) - out.Type = in.Type - out.Status = in.Status - out.LastHeartbeatTime = in.LastHeartbeatTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1_NodeDaemonEndpoints(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeDaemonEndpoints) - out := out.(*NodeDaemonEndpoints) - out.KubeletEndpoint = in.KubeletEndpoint - return nil - } -} - -func DeepCopy_v1_NodeList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeList) - out := out.(*NodeList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Node, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Node(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_NodeProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeProxyOptions) - out := out.(*NodeProxyOptions) - out.TypeMeta = in.TypeMeta - out.Path = in.Path - return nil - } -} - -func DeepCopy_v1_NodeResources(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeResources) - out := out.(*NodeResources) - if in.Capacity != nil { - in, out := &in.Capacity, &out.Capacity - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Capacity = nil - } - return nil - } -} - -func DeepCopy_v1_NodeSelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSelector) - out := out.(*NodeSelector) - if in.NodeSelectorTerms != nil { - in, out := &in.NodeSelectorTerms, &out.NodeSelectorTerms - *out = make([]NodeSelectorTerm, len(*in)) - for i := range *in { - if err := DeepCopy_v1_NodeSelectorTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.NodeSelectorTerms = nil - } - return nil - } -} - -func DeepCopy_v1_NodeSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSelectorRequirement) - out := out.(*NodeSelectorRequirement) - out.Key = in.Key - out.Operator = in.Operator - if in.Values != nil { - in, out := &in.Values, &out.Values - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Values = nil - } - return nil - } -} - -func DeepCopy_v1_NodeSelectorTerm(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSelectorTerm) - out := out.(*NodeSelectorTerm) - if in.MatchExpressions != nil { - in, out := &in.MatchExpressions, &out.MatchExpressions - *out = make([]NodeSelectorRequirement, len(*in)) - for i := range *in { - if err := DeepCopy_v1_NodeSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.MatchExpressions = nil - } - return nil - } -} - -func DeepCopy_v1_NodeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSpec) - out := out.(*NodeSpec) - out.PodCIDR = in.PodCIDR - out.ExternalID = in.ExternalID - out.ProviderID = in.ProviderID - out.Unschedulable = in.Unschedulable - return nil - } -} - -func DeepCopy_v1_NodeStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeStatus) - out := out.(*NodeStatus) - if in.Capacity != nil { - in, out := &in.Capacity, &out.Capacity - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Capacity = nil - } - if in.Allocatable != nil { - in, out := &in.Allocatable, &out.Allocatable - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Allocatable = nil - } - out.Phase = in.Phase - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]NodeCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v1_NodeCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]NodeAddress, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Addresses = nil - } - out.DaemonEndpoints = in.DaemonEndpoints - out.NodeInfo = in.NodeInfo - if in.Images != nil { - in, out := &in.Images, &out.Images - *out = make([]ContainerImage, len(*in)) - for i := range *in { - if err := DeepCopy_v1_ContainerImage(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Images = nil - } - if in.VolumesInUse != nil { - in, out := &in.VolumesInUse, &out.VolumesInUse - *out = make([]UniqueVolumeName, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.VolumesInUse = nil - } - if in.VolumesAttached != nil { - in, out := &in.VolumesAttached, &out.VolumesAttached - *out = make([]AttachedVolume, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.VolumesAttached = nil - } - return nil - } -} - -func DeepCopy_v1_NodeSystemInfo(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSystemInfo) - out := out.(*NodeSystemInfo) - out.MachineID = in.MachineID - out.SystemUUID = in.SystemUUID - out.BootID = in.BootID - out.KernelVersion = in.KernelVersion - out.OSImage = in.OSImage - out.ContainerRuntimeVersion = in.ContainerRuntimeVersion - out.KubeletVersion = in.KubeletVersion - out.KubeProxyVersion = in.KubeProxyVersion - out.OperatingSystem = in.OperatingSystem - out.Architecture = in.Architecture - return nil - } -} - -func DeepCopy_v1_ObjectFieldSelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ObjectFieldSelector) - out := out.(*ObjectFieldSelector) - out.APIVersion = in.APIVersion - out.FieldPath = in.FieldPath - return nil - } -} - -func DeepCopy_v1_ObjectMeta(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ObjectMeta) - out := out.(*ObjectMeta) - out.Name = in.Name - out.GenerateName = in.GenerateName - out.Namespace = in.Namespace - out.SelfLink = in.SelfLink - out.UID = in.UID - out.ResourceVersion = in.ResourceVersion - out.Generation = in.Generation - out.CreationTimestamp = in.CreationTimestamp.DeepCopy() - if in.DeletionTimestamp != nil { - in, out := &in.DeletionTimestamp, &out.DeletionTimestamp - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.DeletionTimestamp = nil - } - if in.DeletionGracePeriodSeconds != nil { - in, out := &in.DeletionGracePeriodSeconds, &out.DeletionGracePeriodSeconds - *out = new(int64) - **out = **in - } else { - out.DeletionGracePeriodSeconds = nil - } - if in.Labels != nil { - in, out := &in.Labels, &out.Labels - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Labels = nil - } - if in.Annotations != nil { - in, out := &in.Annotations, &out.Annotations - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Annotations = nil - } - if in.OwnerReferences != nil { - in, out := &in.OwnerReferences, &out.OwnerReferences - *out = make([]OwnerReference, len(*in)) - for i := range *in { - if err := DeepCopy_v1_OwnerReference(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.OwnerReferences = nil - } - if in.Finalizers != nil { - in, out := &in.Finalizers, &out.Finalizers - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Finalizers = nil - } - out.ClusterName = in.ClusterName - return nil - } -} - -func DeepCopy_v1_ObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ObjectReference) - out := out.(*ObjectReference) - out.Kind = in.Kind - out.Namespace = in.Namespace - out.Name = in.Name - out.UID = in.UID - out.APIVersion = in.APIVersion - out.ResourceVersion = in.ResourceVersion - out.FieldPath = in.FieldPath - return nil - } -} - -func DeepCopy_v1_OwnerReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*OwnerReference) - out := out.(*OwnerReference) - out.APIVersion = in.APIVersion - out.Kind = in.Kind - out.Name = in.Name - out.UID = in.UID - if in.Controller != nil { - in, out := &in.Controller, &out.Controller - *out = new(bool) - **out = **in - } else { - out.Controller = nil - } - return nil - } -} - -func DeepCopy_v1_PersistentVolume(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolume) - out := out.(*PersistentVolume) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_PersistentVolumeSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_v1_PersistentVolumeClaim(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaim) - out := out.(*PersistentVolumeClaim) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_PersistentVolumeClaimSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1_PersistentVolumeClaimStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_PersistentVolumeClaimList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaimList) - out := out.(*PersistentVolumeClaimList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PersistentVolumeClaim, len(*in)) - for i := range *in { - if err := DeepCopy_v1_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_PersistentVolumeClaimSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaimSpec) - out := out.(*PersistentVolumeClaimSpec) - if in.AccessModes != nil { - in, out := &in.AccessModes, &out.AccessModes - *out = make([]PersistentVolumeAccessMode, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.AccessModes = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := DeepCopy_v1_ResourceRequirements(&in.Resources, &out.Resources, c); err != nil { - return err - } - out.VolumeName = in.VolumeName - return nil - } -} - -func DeepCopy_v1_PersistentVolumeClaimStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaimStatus) - out := out.(*PersistentVolumeClaimStatus) - out.Phase = in.Phase - if in.AccessModes != nil { - in, out := &in.AccessModes, &out.AccessModes - *out = make([]PersistentVolumeAccessMode, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.AccessModes = nil - } - if in.Capacity != nil { - in, out := &in.Capacity, &out.Capacity - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Capacity = nil - } - return nil - } -} - -func DeepCopy_v1_PersistentVolumeClaimVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaimVolumeSource) - out := out.(*PersistentVolumeClaimVolumeSource) - out.ClaimName = in.ClaimName - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_PersistentVolumeList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeList) - out := out.(*PersistentVolumeList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PersistentVolume, len(*in)) - for i := range *in { - if err := DeepCopy_v1_PersistentVolume(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_PersistentVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeSource) - out := out.(*PersistentVolumeSource) - if in.GCEPersistentDisk != nil { - in, out := &in.GCEPersistentDisk, &out.GCEPersistentDisk - *out = new(GCEPersistentDiskVolumeSource) - **out = **in - } else { - out.GCEPersistentDisk = nil - } - if in.AWSElasticBlockStore != nil { - in, out := &in.AWSElasticBlockStore, &out.AWSElasticBlockStore - *out = new(AWSElasticBlockStoreVolumeSource) - **out = **in - } else { - out.AWSElasticBlockStore = nil - } - if in.HostPath != nil { - in, out := &in.HostPath, &out.HostPath - *out = new(HostPathVolumeSource) - **out = **in - } else { - out.HostPath = nil - } - if in.Glusterfs != nil { - in, out := &in.Glusterfs, &out.Glusterfs - *out = new(GlusterfsVolumeSource) - **out = **in - } else { - out.Glusterfs = nil - } - if in.NFS != nil { - in, out := &in.NFS, &out.NFS - *out = new(NFSVolumeSource) - **out = **in - } else { - out.NFS = nil - } - if in.RBD != nil { - in, out := &in.RBD, &out.RBD - *out = new(RBDVolumeSource) - if err := DeepCopy_v1_RBDVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.RBD = nil - } - if in.ISCSI != nil { - in, out := &in.ISCSI, &out.ISCSI - *out = new(ISCSIVolumeSource) - **out = **in - } else { - out.ISCSI = nil - } - if in.Cinder != nil { - in, out := &in.Cinder, &out.Cinder - *out = new(CinderVolumeSource) - **out = **in - } else { - out.Cinder = nil - } - if in.CephFS != nil { - in, out := &in.CephFS, &out.CephFS - *out = new(CephFSVolumeSource) - if err := DeepCopy_v1_CephFSVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.CephFS = nil - } - if in.FC != nil { - in, out := &in.FC, &out.FC - *out = new(FCVolumeSource) - if err := DeepCopy_v1_FCVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.FC = nil - } - if in.Flocker != nil { - in, out := &in.Flocker, &out.Flocker - *out = new(FlockerVolumeSource) - **out = **in - } else { - out.Flocker = nil - } - if in.FlexVolume != nil { - in, out := &in.FlexVolume, &out.FlexVolume - *out = new(FlexVolumeSource) - if err := DeepCopy_v1_FlexVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.FlexVolume = nil - } - if in.AzureFile != nil { - in, out := &in.AzureFile, &out.AzureFile - *out = new(AzureFileVolumeSource) - **out = **in - } else { - out.AzureFile = nil - } - if in.VsphereVolume != nil { - in, out := &in.VsphereVolume, &out.VsphereVolume - *out = new(VsphereVirtualDiskVolumeSource) - **out = **in - } else { - out.VsphereVolume = nil - } - if in.Quobyte != nil { - in, out := &in.Quobyte, &out.Quobyte - *out = new(QuobyteVolumeSource) - **out = **in - } else { - out.Quobyte = nil - } - if in.AzureDisk != nil { - in, out := &in.AzureDisk, &out.AzureDisk - *out = new(AzureDiskVolumeSource) - if err := DeepCopy_v1_AzureDiskVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.AzureDisk = nil - } - if in.PhotonPersistentDisk != nil { - in, out := &in.PhotonPersistentDisk, &out.PhotonPersistentDisk - *out = new(PhotonPersistentDiskVolumeSource) - **out = **in - } else { - out.PhotonPersistentDisk = nil - } - return nil - } -} - -func DeepCopy_v1_PersistentVolumeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeSpec) - out := out.(*PersistentVolumeSpec) - if in.Capacity != nil { - in, out := &in.Capacity, &out.Capacity - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Capacity = nil - } - if err := DeepCopy_v1_PersistentVolumeSource(&in.PersistentVolumeSource, &out.PersistentVolumeSource, c); err != nil { - return err - } - if in.AccessModes != nil { - in, out := &in.AccessModes, &out.AccessModes - *out = make([]PersistentVolumeAccessMode, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.AccessModes = nil - } - if in.ClaimRef != nil { - in, out := &in.ClaimRef, &out.ClaimRef - *out = new(ObjectReference) - **out = **in - } else { - out.ClaimRef = nil - } - out.PersistentVolumeReclaimPolicy = in.PersistentVolumeReclaimPolicy - return nil - } -} - -func DeepCopy_v1_PersistentVolumeStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeStatus) - out := out.(*PersistentVolumeStatus) - out.Phase = in.Phase - out.Message = in.Message - out.Reason = in.Reason - return nil - } -} - -func DeepCopy_v1_PhotonPersistentDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PhotonPersistentDiskVolumeSource) - out := out.(*PhotonPersistentDiskVolumeSource) - out.PdID = in.PdID - out.FSType = in.FSType - return nil - } -} - -func DeepCopy_v1_Pod(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Pod) - out := out.(*Pod) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_PodSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1_PodStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_PodAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodAffinity) - out := out.(*PodAffinity) - if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution - *out = make([]PodAffinityTerm, len(*in)) - for i := range *in { - if err := DeepCopy_v1_PodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.RequiredDuringSchedulingIgnoredDuringExecution = nil - } - if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution - *out = make([]WeightedPodAffinityTerm, len(*in)) - for i := range *in { - if err := DeepCopy_v1_WeightedPodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.PreferredDuringSchedulingIgnoredDuringExecution = nil - } - return nil - } -} - -func DeepCopy_v1_PodAffinityTerm(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodAffinityTerm) - out := out.(*PodAffinityTerm) - if in.LabelSelector != nil { - in, out := &in.LabelSelector, &out.LabelSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.LabelSelector = nil - } - if in.Namespaces != nil { - in, out := &in.Namespaces, &out.Namespaces - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Namespaces = nil - } - out.TopologyKey = in.TopologyKey - return nil - } -} - -func DeepCopy_v1_PodAntiAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodAntiAffinity) - out := out.(*PodAntiAffinity) - if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution - *out = make([]PodAffinityTerm, len(*in)) - for i := range *in { - if err := DeepCopy_v1_PodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.RequiredDuringSchedulingIgnoredDuringExecution = nil - } - if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution - *out = make([]WeightedPodAffinityTerm, len(*in)) - for i := range *in { - if err := DeepCopy_v1_WeightedPodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.PreferredDuringSchedulingIgnoredDuringExecution = nil - } - return nil - } -} - -func DeepCopy_v1_PodAttachOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodAttachOptions) - out := out.(*PodAttachOptions) - out.TypeMeta = in.TypeMeta - out.Stdin = in.Stdin - out.Stdout = in.Stdout - out.Stderr = in.Stderr - out.TTY = in.TTY - out.Container = in.Container - return nil - } -} - -func DeepCopy_v1_PodCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodCondition) - out := out.(*PodCondition) - out.Type = in.Type - out.Status = in.Status - out.LastProbeTime = in.LastProbeTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1_PodExecOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodExecOptions) - out := out.(*PodExecOptions) - out.TypeMeta = in.TypeMeta - out.Stdin = in.Stdin - out.Stdout = in.Stdout - out.Stderr = in.Stderr - out.TTY = in.TTY - out.Container = in.Container - if in.Command != nil { - in, out := &in.Command, &out.Command - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Command = nil - } - return nil - } -} - -func DeepCopy_v1_PodList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodList) - out := out.(*PodList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Pod, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Pod(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_PodLogOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodLogOptions) - out := out.(*PodLogOptions) - out.TypeMeta = in.TypeMeta - out.Container = in.Container - out.Follow = in.Follow - out.Previous = in.Previous - if in.SinceSeconds != nil { - in, out := &in.SinceSeconds, &out.SinceSeconds - *out = new(int64) - **out = **in - } else { - out.SinceSeconds = nil - } - if in.SinceTime != nil { - in, out := &in.SinceTime, &out.SinceTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.SinceTime = nil - } - out.Timestamps = in.Timestamps - if in.TailLines != nil { - in, out := &in.TailLines, &out.TailLines - *out = new(int64) - **out = **in - } else { - out.TailLines = nil - } - if in.LimitBytes != nil { - in, out := &in.LimitBytes, &out.LimitBytes - *out = new(int64) - **out = **in - } else { - out.LimitBytes = nil - } - return nil - } -} - -func DeepCopy_v1_PodProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodProxyOptions) - out := out.(*PodProxyOptions) - out.TypeMeta = in.TypeMeta - out.Path = in.Path - return nil - } -} - -func DeepCopy_v1_PodSecurityContext(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSecurityContext) - out := out.(*PodSecurityContext) - if in.SELinuxOptions != nil { - in, out := &in.SELinuxOptions, &out.SELinuxOptions - *out = new(SELinuxOptions) - **out = **in - } else { - out.SELinuxOptions = nil - } - if in.RunAsUser != nil { - in, out := &in.RunAsUser, &out.RunAsUser - *out = new(int64) - **out = **in - } else { - out.RunAsUser = nil - } - if in.RunAsNonRoot != nil { - in, out := &in.RunAsNonRoot, &out.RunAsNonRoot - *out = new(bool) - **out = **in - } else { - out.RunAsNonRoot = nil - } - if in.SupplementalGroups != nil { - in, out := &in.SupplementalGroups, &out.SupplementalGroups - *out = make([]int64, len(*in)) - copy(*out, *in) - } else { - out.SupplementalGroups = nil - } - if in.FSGroup != nil { - in, out := &in.FSGroup, &out.FSGroup - *out = new(int64) - **out = **in - } else { - out.FSGroup = nil - } - return nil - } -} - -func DeepCopy_v1_PodSignature(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSignature) - out := out.(*PodSignature) - if in.PodController != nil { - in, out := &in.PodController, &out.PodController - *out = new(OwnerReference) - if err := DeepCopy_v1_OwnerReference(*in, *out, c); err != nil { - return err - } - } else { - out.PodController = nil - } - return nil - } -} - -func DeepCopy_v1_PodSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSpec) - out := out.(*PodSpec) - if in.Volumes != nil { - in, out := &in.Volumes, &out.Volumes - *out = make([]Volume, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Volume(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Volumes = nil - } - if in.InitContainers != nil { - in, out := &in.InitContainers, &out.InitContainers - *out = make([]Container, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Container(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.InitContainers = nil - } - if in.Containers != nil { - in, out := &in.Containers, &out.Containers - *out = make([]Container, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Container(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Containers = nil - } - out.RestartPolicy = in.RestartPolicy - if in.TerminationGracePeriodSeconds != nil { - in, out := &in.TerminationGracePeriodSeconds, &out.TerminationGracePeriodSeconds - *out = new(int64) - **out = **in - } else { - out.TerminationGracePeriodSeconds = nil - } - if in.ActiveDeadlineSeconds != nil { - in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds - *out = new(int64) - **out = **in - } else { - out.ActiveDeadlineSeconds = nil - } - out.DNSPolicy = in.DNSPolicy - if in.NodeSelector != nil { - in, out := &in.NodeSelector, &out.NodeSelector - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.NodeSelector = nil - } - out.ServiceAccountName = in.ServiceAccountName - out.DeprecatedServiceAccount = in.DeprecatedServiceAccount - out.NodeName = in.NodeName - out.HostNetwork = in.HostNetwork - out.HostPID = in.HostPID - out.HostIPC = in.HostIPC - if in.SecurityContext != nil { - in, out := &in.SecurityContext, &out.SecurityContext - *out = new(PodSecurityContext) - if err := DeepCopy_v1_PodSecurityContext(*in, *out, c); err != nil { - return err - } - } else { - out.SecurityContext = nil - } - if in.ImagePullSecrets != nil { - in, out := &in.ImagePullSecrets, &out.ImagePullSecrets - *out = make([]LocalObjectReference, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.ImagePullSecrets = nil - } - out.Hostname = in.Hostname - out.Subdomain = in.Subdomain - return nil - } -} - -func DeepCopy_v1_PodStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodStatus) - out := out.(*PodStatus) - out.Phase = in.Phase - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]PodCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v1_PodCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - out.Message = in.Message - out.Reason = in.Reason - out.HostIP = in.HostIP - out.PodIP = in.PodIP - if in.StartTime != nil { - in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.StartTime = nil - } - if in.InitContainerStatuses != nil { - in, out := &in.InitContainerStatuses, &out.InitContainerStatuses - *out = make([]ContainerStatus, len(*in)) - for i := range *in { - if err := DeepCopy_v1_ContainerStatus(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.InitContainerStatuses = nil - } - if in.ContainerStatuses != nil { - in, out := &in.ContainerStatuses, &out.ContainerStatuses - *out = make([]ContainerStatus, len(*in)) - for i := range *in { - if err := DeepCopy_v1_ContainerStatus(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.ContainerStatuses = nil - } - return nil - } -} - -func DeepCopy_v1_PodStatusResult(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodStatusResult) - out := out.(*PodStatusResult) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_PodStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_PodTemplate(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodTemplate) - out := out.(*PodTemplate) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_PodTemplateList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodTemplateList) - out := out.(*PodTemplateList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PodTemplate, len(*in)) - for i := range *in { - if err := DeepCopy_v1_PodTemplate(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_PodTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodTemplateSpec) - out := out.(*PodTemplateSpec) - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_PodSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_Preconditions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Preconditions) - out := out.(*Preconditions) - if in.UID != nil { - in, out := &in.UID, &out.UID - *out = new(types.UID) - **out = **in - } else { - out.UID = nil - } - return nil - } -} - -func DeepCopy_v1_PreferAvoidPodsEntry(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PreferAvoidPodsEntry) - out := out.(*PreferAvoidPodsEntry) - if err := DeepCopy_v1_PodSignature(&in.PodSignature, &out.PodSignature, c); err != nil { - return err - } - out.EvictionTime = in.EvictionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1_PreferredSchedulingTerm(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PreferredSchedulingTerm) - out := out.(*PreferredSchedulingTerm) - out.Weight = in.Weight - if err := DeepCopy_v1_NodeSelectorTerm(&in.Preference, &out.Preference, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_Probe(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Probe) - out := out.(*Probe) - if err := DeepCopy_v1_Handler(&in.Handler, &out.Handler, c); err != nil { - return err - } - out.InitialDelaySeconds = in.InitialDelaySeconds - out.TimeoutSeconds = in.TimeoutSeconds - out.PeriodSeconds = in.PeriodSeconds - out.SuccessThreshold = in.SuccessThreshold - out.FailureThreshold = in.FailureThreshold - return nil - } -} - -func DeepCopy_v1_QuobyteVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*QuobyteVolumeSource) - out := out.(*QuobyteVolumeSource) - out.Registry = in.Registry - out.Volume = in.Volume - out.ReadOnly = in.ReadOnly - out.User = in.User - out.Group = in.Group - return nil - } -} - -func DeepCopy_v1_RBDVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RBDVolumeSource) - out := out.(*RBDVolumeSource) - if in.CephMonitors != nil { - in, out := &in.CephMonitors, &out.CephMonitors - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.CephMonitors = nil - } - out.RBDImage = in.RBDImage - out.FSType = in.FSType - out.RBDPool = in.RBDPool - out.RadosUser = in.RadosUser - out.Keyring = in.Keyring - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(LocalObjectReference) - **out = **in - } else { - out.SecretRef = nil - } - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_v1_RangeAllocation(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RangeAllocation) - out := out.(*RangeAllocation) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Range = in.Range - if in.Data != nil { - in, out := &in.Data, &out.Data - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Data = nil - } - return nil - } -} - -func DeepCopy_v1_ReplicationController(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationController) - out := out.(*ReplicationController) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_ReplicationControllerSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1_ReplicationControllerStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_ReplicationControllerCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerCondition) - out := out.(*ReplicationControllerCondition) - out.Type = in.Type - out.Status = in.Status - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1_ReplicationControllerList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerList) - out := out.(*ReplicationControllerList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ReplicationController, len(*in)) - for i := range *in { - if err := DeepCopy_v1_ReplicationController(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_ReplicationControllerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerSpec) - out := out.(*ReplicationControllerSpec) - if in.Replicas != nil { - in, out := &in.Replicas, &out.Replicas - *out = new(int32) - **out = **in - } else { - out.Replicas = nil - } - out.MinReadySeconds = in.MinReadySeconds - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Selector = nil - } - if in.Template != nil { - in, out := &in.Template, &out.Template - *out = new(PodTemplateSpec) - if err := DeepCopy_v1_PodTemplateSpec(*in, *out, c); err != nil { - return err - } - } else { - out.Template = nil - } - return nil - } -} - -func DeepCopy_v1_ReplicationControllerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerStatus) - out := out.(*ReplicationControllerStatus) - out.Replicas = in.Replicas - out.FullyLabeledReplicas = in.FullyLabeledReplicas - out.ReadyReplicas = in.ReadyReplicas - out.AvailableReplicas = in.AvailableReplicas - out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]ReplicationControllerCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v1_ReplicationControllerCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - return nil - } -} - -func DeepCopy_v1_ResourceFieldSelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceFieldSelector) - out := out.(*ResourceFieldSelector) - out.ContainerName = in.ContainerName - out.Resource = in.Resource - out.Divisor = in.Divisor.DeepCopy() - return nil - } -} - -func DeepCopy_v1_ResourceQuota(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceQuota) - out := out.(*ResourceQuota) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_ResourceQuotaSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1_ResourceQuotaStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_ResourceQuotaList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceQuotaList) - out := out.(*ResourceQuotaList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ResourceQuota, len(*in)) - for i := range *in { - if err := DeepCopy_v1_ResourceQuota(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_ResourceQuotaSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceQuotaSpec) - out := out.(*ResourceQuotaSpec) - if in.Hard != nil { - in, out := &in.Hard, &out.Hard - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Hard = nil - } - if in.Scopes != nil { - in, out := &in.Scopes, &out.Scopes - *out = make([]ResourceQuotaScope, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Scopes = nil - } - return nil - } -} - -func DeepCopy_v1_ResourceQuotaStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceQuotaStatus) - out := out.(*ResourceQuotaStatus) - if in.Hard != nil { - in, out := &in.Hard, &out.Hard - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Hard = nil - } - if in.Used != nil { - in, out := &in.Used, &out.Used - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Used = nil - } - return nil - } -} - -func DeepCopy_v1_ResourceRequirements(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceRequirements) - out := out.(*ResourceRequirements) - if in.Limits != nil { - in, out := &in.Limits, &out.Limits - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Limits = nil - } - if in.Requests != nil { - in, out := &in.Requests, &out.Requests - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Requests = nil - } - return nil - } -} - -func DeepCopy_v1_SELinuxOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SELinuxOptions) - out := out.(*SELinuxOptions) - out.User = in.User - out.Role = in.Role - out.Type = in.Type - out.Level = in.Level - return nil - } -} - -func DeepCopy_v1_Secret(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Secret) - out := out.(*Secret) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Data != nil { - in, out := &in.Data, &out.Data - *out = make(map[string][]byte) - for key, val := range *in { - if newVal, err := c.DeepCopy(&val); err != nil { - return err - } else { - (*out)[key] = *newVal.(*[]byte) - } - } - } else { - out.Data = nil - } - if in.StringData != nil { - in, out := &in.StringData, &out.StringData - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.StringData = nil - } - out.Type = in.Type - return nil - } -} - -func DeepCopy_v1_SecretKeySelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SecretKeySelector) - out := out.(*SecretKeySelector) - out.LocalObjectReference = in.LocalObjectReference - out.Key = in.Key - return nil - } -} - -func DeepCopy_v1_SecretList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SecretList) - out := out.(*SecretList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Secret, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Secret(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_SecretVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SecretVolumeSource) - out := out.(*SecretVolumeSource) - out.SecretName = in.SecretName - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]KeyToPath, len(*in)) - for i := range *in { - if err := DeepCopy_v1_KeyToPath(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - if in.DefaultMode != nil { - in, out := &in.DefaultMode, &out.DefaultMode - *out = new(int32) - **out = **in - } else { - out.DefaultMode = nil - } - return nil - } -} - -func DeepCopy_v1_SecurityContext(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SecurityContext) - out := out.(*SecurityContext) - if in.Capabilities != nil { - in, out := &in.Capabilities, &out.Capabilities - *out = new(Capabilities) - if err := DeepCopy_v1_Capabilities(*in, *out, c); err != nil { - return err - } - } else { - out.Capabilities = nil - } - if in.Privileged != nil { - in, out := &in.Privileged, &out.Privileged - *out = new(bool) - **out = **in - } else { - out.Privileged = nil - } - if in.SELinuxOptions != nil { - in, out := &in.SELinuxOptions, &out.SELinuxOptions - *out = new(SELinuxOptions) - **out = **in - } else { - out.SELinuxOptions = nil - } - if in.RunAsUser != nil { - in, out := &in.RunAsUser, &out.RunAsUser - *out = new(int64) - **out = **in - } else { - out.RunAsUser = nil - } - if in.RunAsNonRoot != nil { - in, out := &in.RunAsNonRoot, &out.RunAsNonRoot - *out = new(bool) - **out = **in - } else { - out.RunAsNonRoot = nil - } - if in.ReadOnlyRootFilesystem != nil { - in, out := &in.ReadOnlyRootFilesystem, &out.ReadOnlyRootFilesystem - *out = new(bool) - **out = **in - } else { - out.ReadOnlyRootFilesystem = nil - } - return nil - } -} - -func DeepCopy_v1_SerializedReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SerializedReference) - out := out.(*SerializedReference) - out.TypeMeta = in.TypeMeta - out.Reference = in.Reference - return nil - } -} - -func DeepCopy_v1_Service(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Service) - out := out.(*Service) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_ServiceSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1_ServiceStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_ServiceAccount(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceAccount) - out := out.(*ServiceAccount) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Secrets != nil { - in, out := &in.Secrets, &out.Secrets - *out = make([]ObjectReference, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Secrets = nil - } - if in.ImagePullSecrets != nil { - in, out := &in.ImagePullSecrets, &out.ImagePullSecrets - *out = make([]LocalObjectReference, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.ImagePullSecrets = nil - } - return nil - } -} - -func DeepCopy_v1_ServiceAccountList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceAccountList) - out := out.(*ServiceAccountList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ServiceAccount, len(*in)) - for i := range *in { - if err := DeepCopy_v1_ServiceAccount(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_ServiceList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceList) - out := out.(*ServiceList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Service, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Service(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_ServicePort(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServicePort) - out := out.(*ServicePort) - out.Name = in.Name - out.Protocol = in.Protocol - out.Port = in.Port - out.TargetPort = in.TargetPort - out.NodePort = in.NodePort - return nil - } -} - -func DeepCopy_v1_ServiceProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceProxyOptions) - out := out.(*ServiceProxyOptions) - out.TypeMeta = in.TypeMeta - out.Path = in.Path - return nil - } -} - -func DeepCopy_v1_ServiceSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceSpec) - out := out.(*ServiceSpec) - if in.Ports != nil { - in, out := &in.Ports, &out.Ports - *out = make([]ServicePort, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ports = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Selector = nil - } - out.ClusterIP = in.ClusterIP - out.Type = in.Type - if in.ExternalIPs != nil { - in, out := &in.ExternalIPs, &out.ExternalIPs - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.ExternalIPs = nil - } - if in.DeprecatedPublicIPs != nil { - in, out := &in.DeprecatedPublicIPs, &out.DeprecatedPublicIPs - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.DeprecatedPublicIPs = nil - } - out.SessionAffinity = in.SessionAffinity - out.LoadBalancerIP = in.LoadBalancerIP - if in.LoadBalancerSourceRanges != nil { - in, out := &in.LoadBalancerSourceRanges, &out.LoadBalancerSourceRanges - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.LoadBalancerSourceRanges = nil - } - out.ExternalName = in.ExternalName - return nil - } -} - -func DeepCopy_v1_ServiceStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceStatus) - out := out.(*ServiceStatus) - if err := DeepCopy_v1_LoadBalancerStatus(&in.LoadBalancer, &out.LoadBalancer, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_Sysctl(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Sysctl) - out := out.(*Sysctl) - out.Name = in.Name - out.Value = in.Value - return nil - } -} - -func DeepCopy_v1_TCPSocketAction(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TCPSocketAction) - out := out.(*TCPSocketAction) - out.Port = in.Port - return nil - } -} - -func DeepCopy_v1_Taint(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Taint) - out := out.(*Taint) - out.Key = in.Key - out.Value = in.Value - out.Effect = in.Effect - return nil - } -} - -func DeepCopy_v1_Toleration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Toleration) - out := out.(*Toleration) - out.Key = in.Key - out.Operator = in.Operator - out.Value = in.Value - out.Effect = in.Effect - return nil - } -} - -func DeepCopy_v1_Volume(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Volume) - out := out.(*Volume) - out.Name = in.Name - if err := DeepCopy_v1_VolumeSource(&in.VolumeSource, &out.VolumeSource, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_VolumeMount(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*VolumeMount) - out := out.(*VolumeMount) - out.Name = in.Name - out.ReadOnly = in.ReadOnly - out.MountPath = in.MountPath - out.SubPath = in.SubPath - return nil - } -} - -func DeepCopy_v1_VolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*VolumeSource) - out := out.(*VolumeSource) - if in.HostPath != nil { - in, out := &in.HostPath, &out.HostPath - *out = new(HostPathVolumeSource) - **out = **in - } else { - out.HostPath = nil - } - if in.EmptyDir != nil { - in, out := &in.EmptyDir, &out.EmptyDir - *out = new(EmptyDirVolumeSource) - **out = **in - } else { - out.EmptyDir = nil - } - if in.GCEPersistentDisk != nil { - in, out := &in.GCEPersistentDisk, &out.GCEPersistentDisk - *out = new(GCEPersistentDiskVolumeSource) - **out = **in - } else { - out.GCEPersistentDisk = nil - } - if in.AWSElasticBlockStore != nil { - in, out := &in.AWSElasticBlockStore, &out.AWSElasticBlockStore - *out = new(AWSElasticBlockStoreVolumeSource) - **out = **in - } else { - out.AWSElasticBlockStore = nil - } - if in.GitRepo != nil { - in, out := &in.GitRepo, &out.GitRepo - *out = new(GitRepoVolumeSource) - **out = **in - } else { - out.GitRepo = nil - } - if in.Secret != nil { - in, out := &in.Secret, &out.Secret - *out = new(SecretVolumeSource) - if err := DeepCopy_v1_SecretVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.Secret = nil - } - if in.NFS != nil { - in, out := &in.NFS, &out.NFS - *out = new(NFSVolumeSource) - **out = **in - } else { - out.NFS = nil - } - if in.ISCSI != nil { - in, out := &in.ISCSI, &out.ISCSI - *out = new(ISCSIVolumeSource) - **out = **in - } else { - out.ISCSI = nil - } - if in.Glusterfs != nil { - in, out := &in.Glusterfs, &out.Glusterfs - *out = new(GlusterfsVolumeSource) - **out = **in - } else { - out.Glusterfs = nil - } - if in.PersistentVolumeClaim != nil { - in, out := &in.PersistentVolumeClaim, &out.PersistentVolumeClaim - *out = new(PersistentVolumeClaimVolumeSource) - **out = **in - } else { - out.PersistentVolumeClaim = nil - } - if in.RBD != nil { - in, out := &in.RBD, &out.RBD - *out = new(RBDVolumeSource) - if err := DeepCopy_v1_RBDVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.RBD = nil - } - if in.FlexVolume != nil { - in, out := &in.FlexVolume, &out.FlexVolume - *out = new(FlexVolumeSource) - if err := DeepCopy_v1_FlexVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.FlexVolume = nil - } - if in.Cinder != nil { - in, out := &in.Cinder, &out.Cinder - *out = new(CinderVolumeSource) - **out = **in - } else { - out.Cinder = nil - } - if in.CephFS != nil { - in, out := &in.CephFS, &out.CephFS - *out = new(CephFSVolumeSource) - if err := DeepCopy_v1_CephFSVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.CephFS = nil - } - if in.Flocker != nil { - in, out := &in.Flocker, &out.Flocker - *out = new(FlockerVolumeSource) - **out = **in - } else { - out.Flocker = nil - } - if in.DownwardAPI != nil { - in, out := &in.DownwardAPI, &out.DownwardAPI - *out = new(DownwardAPIVolumeSource) - if err := DeepCopy_v1_DownwardAPIVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.DownwardAPI = nil - } - if in.FC != nil { - in, out := &in.FC, &out.FC - *out = new(FCVolumeSource) - if err := DeepCopy_v1_FCVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.FC = nil - } - if in.AzureFile != nil { - in, out := &in.AzureFile, &out.AzureFile - *out = new(AzureFileVolumeSource) - **out = **in - } else { - out.AzureFile = nil - } - if in.ConfigMap != nil { - in, out := &in.ConfigMap, &out.ConfigMap - *out = new(ConfigMapVolumeSource) - if err := DeepCopy_v1_ConfigMapVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.ConfigMap = nil - } - if in.VsphereVolume != nil { - in, out := &in.VsphereVolume, &out.VsphereVolume - *out = new(VsphereVirtualDiskVolumeSource) - **out = **in - } else { - out.VsphereVolume = nil - } - if in.Quobyte != nil { - in, out := &in.Quobyte, &out.Quobyte - *out = new(QuobyteVolumeSource) - **out = **in - } else { - out.Quobyte = nil - } - if in.AzureDisk != nil { - in, out := &in.AzureDisk, &out.AzureDisk - *out = new(AzureDiskVolumeSource) - if err := DeepCopy_v1_AzureDiskVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.AzureDisk = nil - } - if in.PhotonPersistentDisk != nil { - in, out := &in.PhotonPersistentDisk, &out.PhotonPersistentDisk - *out = new(PhotonPersistentDiskVolumeSource) - **out = **in - } else { - out.PhotonPersistentDisk = nil - } - return nil - } -} - -func DeepCopy_v1_VsphereVirtualDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*VsphereVirtualDiskVolumeSource) - out := out.(*VsphereVirtualDiskVolumeSource) - out.VolumePath = in.VolumePath - out.FSType = in.FSType - return nil - } -} - -func DeepCopy_v1_WeightedPodAffinityTerm(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*WeightedPodAffinityTerm) - out := out.(*WeightedPodAffinityTerm) - out.Weight = in.Weight - if err := DeepCopy_v1_PodAffinityTerm(&in.PodAffinityTerm, &out.PodAffinityTerm, c); err != nil { - return err - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/api/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/api/zz_generated.deepcopy.go deleted file mode 100644 index 3731358095e..00000000000 --- a/staging/src/k8s.io/client-go/pkg/api/zz_generated.deepcopy.go +++ /dev/null @@ -1,3804 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package api - -import ( - unversioned "k8s.io/client-go/pkg/api/unversioned" - conversion "k8s.io/client-go/pkg/conversion" - fields "k8s.io/client-go/pkg/fields" - labels "k8s.io/client-go/pkg/labels" - runtime "k8s.io/client-go/pkg/runtime" - types "k8s.io/client-go/pkg/types" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AWSElasticBlockStoreVolumeSource, InType: reflect.TypeOf(&AWSElasticBlockStoreVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Affinity, InType: reflect.TypeOf(&Affinity{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AttachedVolume, InType: reflect.TypeOf(&AttachedVolume{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AvoidPods, InType: reflect.TypeOf(&AvoidPods{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AzureDiskVolumeSource, InType: reflect.TypeOf(&AzureDiskVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AzureFileVolumeSource, InType: reflect.TypeOf(&AzureFileVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Binding, InType: reflect.TypeOf(&Binding{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Capabilities, InType: reflect.TypeOf(&Capabilities{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_CephFSVolumeSource, InType: reflect.TypeOf(&CephFSVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_CinderVolumeSource, InType: reflect.TypeOf(&CinderVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ComponentCondition, InType: reflect.TypeOf(&ComponentCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ComponentStatus, InType: reflect.TypeOf(&ComponentStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ComponentStatusList, InType: reflect.TypeOf(&ComponentStatusList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConfigMap, InType: reflect.TypeOf(&ConfigMap{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConfigMapKeySelector, InType: reflect.TypeOf(&ConfigMapKeySelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConfigMapList, InType: reflect.TypeOf(&ConfigMapList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConfigMapVolumeSource, InType: reflect.TypeOf(&ConfigMapVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Container, InType: reflect.TypeOf(&Container{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerImage, InType: reflect.TypeOf(&ContainerImage{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerPort, InType: reflect.TypeOf(&ContainerPort{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerState, InType: reflect.TypeOf(&ContainerState{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerStateRunning, InType: reflect.TypeOf(&ContainerStateRunning{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerStateTerminated, InType: reflect.TypeOf(&ContainerStateTerminated{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerStateWaiting, InType: reflect.TypeOf(&ContainerStateWaiting{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerStatus, InType: reflect.TypeOf(&ContainerStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConversionError, InType: reflect.TypeOf(&ConversionError{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_DaemonEndpoint, InType: reflect.TypeOf(&DaemonEndpoint{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_DeleteOptions, InType: reflect.TypeOf(&DeleteOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_DownwardAPIVolumeFile, InType: reflect.TypeOf(&DownwardAPIVolumeFile{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_DownwardAPIVolumeSource, InType: reflect.TypeOf(&DownwardAPIVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EmptyDirVolumeSource, InType: reflect.TypeOf(&EmptyDirVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EndpointAddress, InType: reflect.TypeOf(&EndpointAddress{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EndpointPort, InType: reflect.TypeOf(&EndpointPort{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EndpointSubset, InType: reflect.TypeOf(&EndpointSubset{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Endpoints, InType: reflect.TypeOf(&Endpoints{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EndpointsList, InType: reflect.TypeOf(&EndpointsList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EnvVar, InType: reflect.TypeOf(&EnvVar{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EnvVarSource, InType: reflect.TypeOf(&EnvVarSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Event, InType: reflect.TypeOf(&Event{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EventList, InType: reflect.TypeOf(&EventList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EventSource, InType: reflect.TypeOf(&EventSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ExecAction, InType: reflect.TypeOf(&ExecAction{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ExportOptions, InType: reflect.TypeOf(&ExportOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FCVolumeSource, InType: reflect.TypeOf(&FCVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FlexVolumeSource, InType: reflect.TypeOf(&FlexVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FlockerVolumeSource, InType: reflect.TypeOf(&FlockerVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_GCEPersistentDiskVolumeSource, InType: reflect.TypeOf(&GCEPersistentDiskVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_GitRepoVolumeSource, InType: reflect.TypeOf(&GitRepoVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_GlusterfsVolumeSource, InType: reflect.TypeOf(&GlusterfsVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_HTTPGetAction, InType: reflect.TypeOf(&HTTPGetAction{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_HTTPHeader, InType: reflect.TypeOf(&HTTPHeader{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Handler, InType: reflect.TypeOf(&Handler{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_HostPathVolumeSource, InType: reflect.TypeOf(&HostPathVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ISCSIVolumeSource, InType: reflect.TypeOf(&ISCSIVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_KeyToPath, InType: reflect.TypeOf(&KeyToPath{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Lifecycle, InType: reflect.TypeOf(&Lifecycle{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LimitRange, InType: reflect.TypeOf(&LimitRange{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LimitRangeItem, InType: reflect.TypeOf(&LimitRangeItem{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LimitRangeList, InType: reflect.TypeOf(&LimitRangeList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LimitRangeSpec, InType: reflect.TypeOf(&LimitRangeSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_List, InType: reflect.TypeOf(&List{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ListOptions, InType: reflect.TypeOf(&ListOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LoadBalancerIngress, InType: reflect.TypeOf(&LoadBalancerIngress{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LoadBalancerStatus, InType: reflect.TypeOf(&LoadBalancerStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LocalObjectReference, InType: reflect.TypeOf(&LocalObjectReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NFSVolumeSource, InType: reflect.TypeOf(&NFSVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Namespace, InType: reflect.TypeOf(&Namespace{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NamespaceList, InType: reflect.TypeOf(&NamespaceList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NamespaceSpec, InType: reflect.TypeOf(&NamespaceSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NamespaceStatus, InType: reflect.TypeOf(&NamespaceStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Node, InType: reflect.TypeOf(&Node{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeAddress, InType: reflect.TypeOf(&NodeAddress{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeAffinity, InType: reflect.TypeOf(&NodeAffinity{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeCondition, InType: reflect.TypeOf(&NodeCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeDaemonEndpoints, InType: reflect.TypeOf(&NodeDaemonEndpoints{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeList, InType: reflect.TypeOf(&NodeList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeProxyOptions, InType: reflect.TypeOf(&NodeProxyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeResources, InType: reflect.TypeOf(&NodeResources{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSelector, InType: reflect.TypeOf(&NodeSelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSelectorRequirement, InType: reflect.TypeOf(&NodeSelectorRequirement{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSelectorTerm, InType: reflect.TypeOf(&NodeSelectorTerm{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSpec, InType: reflect.TypeOf(&NodeSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeStatus, InType: reflect.TypeOf(&NodeStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSystemInfo, InType: reflect.TypeOf(&NodeSystemInfo{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ObjectFieldSelector, InType: reflect.TypeOf(&ObjectFieldSelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ObjectMeta, InType: reflect.TypeOf(&ObjectMeta{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ObjectReference, InType: reflect.TypeOf(&ObjectReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OwnerReference, InType: reflect.TypeOf(&OwnerReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolume, InType: reflect.TypeOf(&PersistentVolume{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaim, InType: reflect.TypeOf(&PersistentVolumeClaim{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaimList, InType: reflect.TypeOf(&PersistentVolumeClaimList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaimSpec, InType: reflect.TypeOf(&PersistentVolumeClaimSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaimStatus, InType: reflect.TypeOf(&PersistentVolumeClaimStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaimVolumeSource, InType: reflect.TypeOf(&PersistentVolumeClaimVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeList, InType: reflect.TypeOf(&PersistentVolumeList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeSource, InType: reflect.TypeOf(&PersistentVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeSpec, InType: reflect.TypeOf(&PersistentVolumeSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeStatus, InType: reflect.TypeOf(&PersistentVolumeStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PhotonPersistentDiskVolumeSource, InType: reflect.TypeOf(&PhotonPersistentDiskVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Pod, InType: reflect.TypeOf(&Pod{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodAffinity, InType: reflect.TypeOf(&PodAffinity{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodAffinityTerm, InType: reflect.TypeOf(&PodAffinityTerm{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodAntiAffinity, InType: reflect.TypeOf(&PodAntiAffinity{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodAttachOptions, InType: reflect.TypeOf(&PodAttachOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodCondition, InType: reflect.TypeOf(&PodCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodExecOptions, InType: reflect.TypeOf(&PodExecOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodList, InType: reflect.TypeOf(&PodList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodLogOptions, InType: reflect.TypeOf(&PodLogOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodProxyOptions, InType: reflect.TypeOf(&PodProxyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSecurityContext, InType: reflect.TypeOf(&PodSecurityContext{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSignature, InType: reflect.TypeOf(&PodSignature{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSpec, InType: reflect.TypeOf(&PodSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodStatus, InType: reflect.TypeOf(&PodStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodStatusResult, InType: reflect.TypeOf(&PodStatusResult{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodTemplate, InType: reflect.TypeOf(&PodTemplate{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodTemplateList, InType: reflect.TypeOf(&PodTemplateList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodTemplateSpec, InType: reflect.TypeOf(&PodTemplateSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Preconditions, InType: reflect.TypeOf(&Preconditions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PreferAvoidPodsEntry, InType: reflect.TypeOf(&PreferAvoidPodsEntry{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PreferredSchedulingTerm, InType: reflect.TypeOf(&PreferredSchedulingTerm{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Probe, InType: reflect.TypeOf(&Probe{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_QuobyteVolumeSource, InType: reflect.TypeOf(&QuobyteVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RBDVolumeSource, InType: reflect.TypeOf(&RBDVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RangeAllocation, InType: reflect.TypeOf(&RangeAllocation{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationController, InType: reflect.TypeOf(&ReplicationController{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationControllerCondition, InType: reflect.TypeOf(&ReplicationControllerCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationControllerList, InType: reflect.TypeOf(&ReplicationControllerList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationControllerSpec, InType: reflect.TypeOf(&ReplicationControllerSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationControllerStatus, InType: reflect.TypeOf(&ReplicationControllerStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceFieldSelector, InType: reflect.TypeOf(&ResourceFieldSelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceQuota, InType: reflect.TypeOf(&ResourceQuota{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceQuotaList, InType: reflect.TypeOf(&ResourceQuotaList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceQuotaSpec, InType: reflect.TypeOf(&ResourceQuotaSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceQuotaStatus, InType: reflect.TypeOf(&ResourceQuotaStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceRequirements, InType: reflect.TypeOf(&ResourceRequirements{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SELinuxOptions, InType: reflect.TypeOf(&SELinuxOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Secret, InType: reflect.TypeOf(&Secret{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SecretKeySelector, InType: reflect.TypeOf(&SecretKeySelector{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SecretList, InType: reflect.TypeOf(&SecretList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SecretVolumeSource, InType: reflect.TypeOf(&SecretVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SecurityContext, InType: reflect.TypeOf(&SecurityContext{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SerializedReference, InType: reflect.TypeOf(&SerializedReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Service, InType: reflect.TypeOf(&Service{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceAccount, InType: reflect.TypeOf(&ServiceAccount{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceAccountList, InType: reflect.TypeOf(&ServiceAccountList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceList, InType: reflect.TypeOf(&ServiceList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServicePort, InType: reflect.TypeOf(&ServicePort{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceProxyOptions, InType: reflect.TypeOf(&ServiceProxyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceSpec, InType: reflect.TypeOf(&ServiceSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceStatus, InType: reflect.TypeOf(&ServiceStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Sysctl, InType: reflect.TypeOf(&Sysctl{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_TCPSocketAction, InType: reflect.TypeOf(&TCPSocketAction{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Taint, InType: reflect.TypeOf(&Taint{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Toleration, InType: reflect.TypeOf(&Toleration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Volume, InType: reflect.TypeOf(&Volume{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_VolumeMount, InType: reflect.TypeOf(&VolumeMount{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_VolumeSource, InType: reflect.TypeOf(&VolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_VsphereVirtualDiskVolumeSource, InType: reflect.TypeOf(&VsphereVirtualDiskVolumeSource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_WeightedPodAffinityTerm, InType: reflect.TypeOf(&WeightedPodAffinityTerm{})}, - ) -} - -func DeepCopy_api_AWSElasticBlockStoreVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AWSElasticBlockStoreVolumeSource) - out := out.(*AWSElasticBlockStoreVolumeSource) - out.VolumeID = in.VolumeID - out.FSType = in.FSType - out.Partition = in.Partition - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_Affinity(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Affinity) - out := out.(*Affinity) - if in.NodeAffinity != nil { - in, out := &in.NodeAffinity, &out.NodeAffinity - *out = new(NodeAffinity) - if err := DeepCopy_api_NodeAffinity(*in, *out, c); err != nil { - return err - } - } else { - out.NodeAffinity = nil - } - if in.PodAffinity != nil { - in, out := &in.PodAffinity, &out.PodAffinity - *out = new(PodAffinity) - if err := DeepCopy_api_PodAffinity(*in, *out, c); err != nil { - return err - } - } else { - out.PodAffinity = nil - } - if in.PodAntiAffinity != nil { - in, out := &in.PodAntiAffinity, &out.PodAntiAffinity - *out = new(PodAntiAffinity) - if err := DeepCopy_api_PodAntiAffinity(*in, *out, c); err != nil { - return err - } - } else { - out.PodAntiAffinity = nil - } - return nil - } -} - -func DeepCopy_api_AttachedVolume(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AttachedVolume) - out := out.(*AttachedVolume) - out.Name = in.Name - out.DevicePath = in.DevicePath - return nil - } -} - -func DeepCopy_api_AvoidPods(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AvoidPods) - out := out.(*AvoidPods) - if in.PreferAvoidPods != nil { - in, out := &in.PreferAvoidPods, &out.PreferAvoidPods - *out = make([]PreferAvoidPodsEntry, len(*in)) - for i := range *in { - if err := DeepCopy_api_PreferAvoidPodsEntry(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.PreferAvoidPods = nil - } - return nil - } -} - -func DeepCopy_api_AzureDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AzureDiskVolumeSource) - out := out.(*AzureDiskVolumeSource) - out.DiskName = in.DiskName - out.DataDiskURI = in.DataDiskURI - if in.CachingMode != nil { - in, out := &in.CachingMode, &out.CachingMode - *out = new(AzureDataDiskCachingMode) - **out = **in - } else { - out.CachingMode = nil - } - if in.FSType != nil { - in, out := &in.FSType, &out.FSType - *out = new(string) - **out = **in - } else { - out.FSType = nil - } - if in.ReadOnly != nil { - in, out := &in.ReadOnly, &out.ReadOnly - *out = new(bool) - **out = **in - } else { - out.ReadOnly = nil - } - return nil - } -} - -func DeepCopy_api_AzureFileVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*AzureFileVolumeSource) - out := out.(*AzureFileVolumeSource) - out.SecretName = in.SecretName - out.ShareName = in.ShareName - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_Binding(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Binding) - out := out.(*Binding) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Target = in.Target - return nil - } -} - -func DeepCopy_api_Capabilities(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Capabilities) - out := out.(*Capabilities) - if in.Add != nil { - in, out := &in.Add, &out.Add - *out = make([]Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Add = nil - } - if in.Drop != nil { - in, out := &in.Drop, &out.Drop - *out = make([]Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Drop = nil - } - return nil - } -} - -func DeepCopy_api_CephFSVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CephFSVolumeSource) - out := out.(*CephFSVolumeSource) - if in.Monitors != nil { - in, out := &in.Monitors, &out.Monitors - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Monitors = nil - } - out.Path = in.Path - out.User = in.User - out.SecretFile = in.SecretFile - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(LocalObjectReference) - **out = **in - } else { - out.SecretRef = nil - } - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_CinderVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CinderVolumeSource) - out := out.(*CinderVolumeSource) - out.VolumeID = in.VolumeID - out.FSType = in.FSType - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_ComponentCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ComponentCondition) - out := out.(*ComponentCondition) - out.Type = in.Type - out.Status = in.Status - out.Message = in.Message - out.Error = in.Error - return nil - } -} - -func DeepCopy_api_ComponentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ComponentStatus) - out := out.(*ComponentStatus) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]ComponentCondition, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Conditions = nil - } - return nil - } -} - -func DeepCopy_api_ComponentStatusList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ComponentStatusList) - out := out.(*ComponentStatusList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ComponentStatus, len(*in)) - for i := range *in { - if err := DeepCopy_api_ComponentStatus(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_ConfigMap(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ConfigMap) - out := out.(*ConfigMap) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Data != nil { - in, out := &in.Data, &out.Data - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Data = nil - } - return nil - } -} - -func DeepCopy_api_ConfigMapKeySelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ConfigMapKeySelector) - out := out.(*ConfigMapKeySelector) - out.LocalObjectReference = in.LocalObjectReference - out.Key = in.Key - return nil - } -} - -func DeepCopy_api_ConfigMapList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ConfigMapList) - out := out.(*ConfigMapList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ConfigMap, len(*in)) - for i := range *in { - if err := DeepCopy_api_ConfigMap(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_ConfigMapVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ConfigMapVolumeSource) - out := out.(*ConfigMapVolumeSource) - out.LocalObjectReference = in.LocalObjectReference - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]KeyToPath, len(*in)) - for i := range *in { - if err := DeepCopy_api_KeyToPath(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - if in.DefaultMode != nil { - in, out := &in.DefaultMode, &out.DefaultMode - *out = new(int32) - **out = **in - } else { - out.DefaultMode = nil - } - return nil - } -} - -func DeepCopy_api_Container(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Container) - out := out.(*Container) - out.Name = in.Name - out.Image = in.Image - if in.Command != nil { - in, out := &in.Command, &out.Command - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Command = nil - } - if in.Args != nil { - in, out := &in.Args, &out.Args - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Args = nil - } - out.WorkingDir = in.WorkingDir - if in.Ports != nil { - in, out := &in.Ports, &out.Ports - *out = make([]ContainerPort, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ports = nil - } - if in.Env != nil { - in, out := &in.Env, &out.Env - *out = make([]EnvVar, len(*in)) - for i := range *in { - if err := DeepCopy_api_EnvVar(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Env = nil - } - if err := DeepCopy_api_ResourceRequirements(&in.Resources, &out.Resources, c); err != nil { - return err - } - if in.VolumeMounts != nil { - in, out := &in.VolumeMounts, &out.VolumeMounts - *out = make([]VolumeMount, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.VolumeMounts = nil - } - if in.LivenessProbe != nil { - in, out := &in.LivenessProbe, &out.LivenessProbe - *out = new(Probe) - if err := DeepCopy_api_Probe(*in, *out, c); err != nil { - return err - } - } else { - out.LivenessProbe = nil - } - if in.ReadinessProbe != nil { - in, out := &in.ReadinessProbe, &out.ReadinessProbe - *out = new(Probe) - if err := DeepCopy_api_Probe(*in, *out, c); err != nil { - return err - } - } else { - out.ReadinessProbe = nil - } - if in.Lifecycle != nil { - in, out := &in.Lifecycle, &out.Lifecycle - *out = new(Lifecycle) - if err := DeepCopy_api_Lifecycle(*in, *out, c); err != nil { - return err - } - } else { - out.Lifecycle = nil - } - out.TerminationMessagePath = in.TerminationMessagePath - out.ImagePullPolicy = in.ImagePullPolicy - if in.SecurityContext != nil { - in, out := &in.SecurityContext, &out.SecurityContext - *out = new(SecurityContext) - if err := DeepCopy_api_SecurityContext(*in, *out, c); err != nil { - return err - } - } else { - out.SecurityContext = nil - } - out.Stdin = in.Stdin - out.StdinOnce = in.StdinOnce - out.TTY = in.TTY - return nil - } -} - -func DeepCopy_api_ContainerImage(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerImage) - out := out.(*ContainerImage) - if in.Names != nil { - in, out := &in.Names, &out.Names - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Names = nil - } - out.SizeBytes = in.SizeBytes - return nil - } -} - -func DeepCopy_api_ContainerPort(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerPort) - out := out.(*ContainerPort) - out.Name = in.Name - out.HostPort = in.HostPort - out.ContainerPort = in.ContainerPort - out.Protocol = in.Protocol - out.HostIP = in.HostIP - return nil - } -} - -func DeepCopy_api_ContainerState(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerState) - out := out.(*ContainerState) - if in.Waiting != nil { - in, out := &in.Waiting, &out.Waiting - *out = new(ContainerStateWaiting) - **out = **in - } else { - out.Waiting = nil - } - if in.Running != nil { - in, out := &in.Running, &out.Running - *out = new(ContainerStateRunning) - if err := DeepCopy_api_ContainerStateRunning(*in, *out, c); err != nil { - return err - } - } else { - out.Running = nil - } - if in.Terminated != nil { - in, out := &in.Terminated, &out.Terminated - *out = new(ContainerStateTerminated) - if err := DeepCopy_api_ContainerStateTerminated(*in, *out, c); err != nil { - return err - } - } else { - out.Terminated = nil - } - return nil - } -} - -func DeepCopy_api_ContainerStateRunning(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerStateRunning) - out := out.(*ContainerStateRunning) - out.StartedAt = in.StartedAt.DeepCopy() - return nil - } -} - -func DeepCopy_api_ContainerStateTerminated(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerStateTerminated) - out := out.(*ContainerStateTerminated) - out.ExitCode = in.ExitCode - out.Signal = in.Signal - out.Reason = in.Reason - out.Message = in.Message - out.StartedAt = in.StartedAt.DeepCopy() - out.FinishedAt = in.FinishedAt.DeepCopy() - out.ContainerID = in.ContainerID - return nil - } -} - -func DeepCopy_api_ContainerStateWaiting(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerStateWaiting) - out := out.(*ContainerStateWaiting) - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_api_ContainerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ContainerStatus) - out := out.(*ContainerStatus) - out.Name = in.Name - if err := DeepCopy_api_ContainerState(&in.State, &out.State, c); err != nil { - return err - } - if err := DeepCopy_api_ContainerState(&in.LastTerminationState, &out.LastTerminationState, c); err != nil { - return err - } - out.Ready = in.Ready - out.RestartCount = in.RestartCount - out.Image = in.Image - out.ImageID = in.ImageID - out.ContainerID = in.ContainerID - return nil - } -} - -func DeepCopy_api_ConversionError(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ConversionError) - out := out.(*ConversionError) - if in.In == nil { - out.In = nil - } else if newVal, err := c.DeepCopy(&in.In); err != nil { - return err - } else { - out.In = *newVal.(*interface{}) - } - if in.Out == nil { - out.Out = nil - } else if newVal, err := c.DeepCopy(&in.Out); err != nil { - return err - } else { - out.Out = *newVal.(*interface{}) - } - out.Message = in.Message - return nil - } -} - -func DeepCopy_api_DaemonEndpoint(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonEndpoint) - out := out.(*DaemonEndpoint) - out.Port = in.Port - return nil - } -} - -func DeepCopy_api_DeleteOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeleteOptions) - out := out.(*DeleteOptions) - out.TypeMeta = in.TypeMeta - if in.GracePeriodSeconds != nil { - in, out := &in.GracePeriodSeconds, &out.GracePeriodSeconds - *out = new(int64) - **out = **in - } else { - out.GracePeriodSeconds = nil - } - if in.Preconditions != nil { - in, out := &in.Preconditions, &out.Preconditions - *out = new(Preconditions) - if err := DeepCopy_api_Preconditions(*in, *out, c); err != nil { - return err - } - } else { - out.Preconditions = nil - } - if in.OrphanDependents != nil { - in, out := &in.OrphanDependents, &out.OrphanDependents - *out = new(bool) - **out = **in - } else { - out.OrphanDependents = nil - } - return nil - } -} - -func DeepCopy_api_DownwardAPIVolumeFile(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DownwardAPIVolumeFile) - out := out.(*DownwardAPIVolumeFile) - out.Path = in.Path - if in.FieldRef != nil { - in, out := &in.FieldRef, &out.FieldRef - *out = new(ObjectFieldSelector) - **out = **in - } else { - out.FieldRef = nil - } - if in.ResourceFieldRef != nil { - in, out := &in.ResourceFieldRef, &out.ResourceFieldRef - *out = new(ResourceFieldSelector) - if err := DeepCopy_api_ResourceFieldSelector(*in, *out, c); err != nil { - return err - } - } else { - out.ResourceFieldRef = nil - } - if in.Mode != nil { - in, out := &in.Mode, &out.Mode - *out = new(int32) - **out = **in - } else { - out.Mode = nil - } - return nil - } -} - -func DeepCopy_api_DownwardAPIVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DownwardAPIVolumeSource) - out := out.(*DownwardAPIVolumeSource) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DownwardAPIVolumeFile, len(*in)) - for i := range *in { - if err := DeepCopy_api_DownwardAPIVolumeFile(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - if in.DefaultMode != nil { - in, out := &in.DefaultMode, &out.DefaultMode - *out = new(int32) - **out = **in - } else { - out.DefaultMode = nil - } - return nil - } -} - -func DeepCopy_api_EmptyDirVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EmptyDirVolumeSource) - out := out.(*EmptyDirVolumeSource) - out.Medium = in.Medium - return nil - } -} - -func DeepCopy_api_EndpointAddress(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EndpointAddress) - out := out.(*EndpointAddress) - out.IP = in.IP - out.Hostname = in.Hostname - if in.NodeName != nil { - in, out := &in.NodeName, &out.NodeName - *out = new(string) - **out = **in - } else { - out.NodeName = nil - } - if in.TargetRef != nil { - in, out := &in.TargetRef, &out.TargetRef - *out = new(ObjectReference) - **out = **in - } else { - out.TargetRef = nil - } - return nil - } -} - -func DeepCopy_api_EndpointPort(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EndpointPort) - out := out.(*EndpointPort) - out.Name = in.Name - out.Port = in.Port - out.Protocol = in.Protocol - return nil - } -} - -func DeepCopy_api_EndpointSubset(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EndpointSubset) - out := out.(*EndpointSubset) - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]EndpointAddress, len(*in)) - for i := range *in { - if err := DeepCopy_api_EndpointAddress(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Addresses = nil - } - if in.NotReadyAddresses != nil { - in, out := &in.NotReadyAddresses, &out.NotReadyAddresses - *out = make([]EndpointAddress, len(*in)) - for i := range *in { - if err := DeepCopy_api_EndpointAddress(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.NotReadyAddresses = nil - } - if in.Ports != nil { - in, out := &in.Ports, &out.Ports - *out = make([]EndpointPort, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ports = nil - } - return nil - } -} - -func DeepCopy_api_Endpoints(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Endpoints) - out := out.(*Endpoints) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Subsets != nil { - in, out := &in.Subsets, &out.Subsets - *out = make([]EndpointSubset, len(*in)) - for i := range *in { - if err := DeepCopy_api_EndpointSubset(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Subsets = nil - } - return nil - } -} - -func DeepCopy_api_EndpointsList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EndpointsList) - out := out.(*EndpointsList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Endpoints, len(*in)) - for i := range *in { - if err := DeepCopy_api_Endpoints(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_EnvVar(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EnvVar) - out := out.(*EnvVar) - out.Name = in.Name - out.Value = in.Value - if in.ValueFrom != nil { - in, out := &in.ValueFrom, &out.ValueFrom - *out = new(EnvVarSource) - if err := DeepCopy_api_EnvVarSource(*in, *out, c); err != nil { - return err - } - } else { - out.ValueFrom = nil - } - return nil - } -} - -func DeepCopy_api_EnvVarSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EnvVarSource) - out := out.(*EnvVarSource) - if in.FieldRef != nil { - in, out := &in.FieldRef, &out.FieldRef - *out = new(ObjectFieldSelector) - **out = **in - } else { - out.FieldRef = nil - } - if in.ResourceFieldRef != nil { - in, out := &in.ResourceFieldRef, &out.ResourceFieldRef - *out = new(ResourceFieldSelector) - if err := DeepCopy_api_ResourceFieldSelector(*in, *out, c); err != nil { - return err - } - } else { - out.ResourceFieldRef = nil - } - if in.ConfigMapKeyRef != nil { - in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef - *out = new(ConfigMapKeySelector) - **out = **in - } else { - out.ConfigMapKeyRef = nil - } - if in.SecretKeyRef != nil { - in, out := &in.SecretKeyRef, &out.SecretKeyRef - *out = new(SecretKeySelector) - **out = **in - } else { - out.SecretKeyRef = nil - } - return nil - } -} - -func DeepCopy_api_Event(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Event) - out := out.(*Event) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.InvolvedObject = in.InvolvedObject - out.Reason = in.Reason - out.Message = in.Message - out.Source = in.Source - out.FirstTimestamp = in.FirstTimestamp.DeepCopy() - out.LastTimestamp = in.LastTimestamp.DeepCopy() - out.Count = in.Count - out.Type = in.Type - return nil - } -} - -func DeepCopy_api_EventList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EventList) - out := out.(*EventList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Event, len(*in)) - for i := range *in { - if err := DeepCopy_api_Event(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_EventSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*EventSource) - out := out.(*EventSource) - out.Component = in.Component - out.Host = in.Host - return nil - } -} - -func DeepCopy_api_ExecAction(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ExecAction) - out := out.(*ExecAction) - if in.Command != nil { - in, out := &in.Command, &out.Command - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Command = nil - } - return nil - } -} - -func DeepCopy_api_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ExportOptions) - out := out.(*ExportOptions) - out.TypeMeta = in.TypeMeta - out.Export = in.Export - out.Exact = in.Exact - return nil - } -} - -func DeepCopy_api_FCVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*FCVolumeSource) - out := out.(*FCVolumeSource) - if in.TargetWWNs != nil { - in, out := &in.TargetWWNs, &out.TargetWWNs - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.TargetWWNs = nil - } - if in.Lun != nil { - in, out := &in.Lun, &out.Lun - *out = new(int32) - **out = **in - } else { - out.Lun = nil - } - out.FSType = in.FSType - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_FlexVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*FlexVolumeSource) - out := out.(*FlexVolumeSource) - out.Driver = in.Driver - out.FSType = in.FSType - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(LocalObjectReference) - **out = **in - } else { - out.SecretRef = nil - } - out.ReadOnly = in.ReadOnly - if in.Options != nil { - in, out := &in.Options, &out.Options - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Options = nil - } - return nil - } -} - -func DeepCopy_api_FlockerVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*FlockerVolumeSource) - out := out.(*FlockerVolumeSource) - out.DatasetName = in.DatasetName - out.DatasetUUID = in.DatasetUUID - return nil - } -} - -func DeepCopy_api_GCEPersistentDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GCEPersistentDiskVolumeSource) - out := out.(*GCEPersistentDiskVolumeSource) - out.PDName = in.PDName - out.FSType = in.FSType - out.Partition = in.Partition - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_GitRepoVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GitRepoVolumeSource) - out := out.(*GitRepoVolumeSource) - out.Repository = in.Repository - out.Revision = in.Revision - out.Directory = in.Directory - return nil - } -} - -func DeepCopy_api_GlusterfsVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*GlusterfsVolumeSource) - out := out.(*GlusterfsVolumeSource) - out.EndpointsName = in.EndpointsName - out.Path = in.Path - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_HTTPGetAction(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HTTPGetAction) - out := out.(*HTTPGetAction) - out.Path = in.Path - out.Port = in.Port - out.Host = in.Host - out.Scheme = in.Scheme - if in.HTTPHeaders != nil { - in, out := &in.HTTPHeaders, &out.HTTPHeaders - *out = make([]HTTPHeader, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.HTTPHeaders = nil - } - return nil - } -} - -func DeepCopy_api_HTTPHeader(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HTTPHeader) - out := out.(*HTTPHeader) - out.Name = in.Name - out.Value = in.Value - return nil - } -} - -func DeepCopy_api_Handler(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Handler) - out := out.(*Handler) - if in.Exec != nil { - in, out := &in.Exec, &out.Exec - *out = new(ExecAction) - if err := DeepCopy_api_ExecAction(*in, *out, c); err != nil { - return err - } - } else { - out.Exec = nil - } - if in.HTTPGet != nil { - in, out := &in.HTTPGet, &out.HTTPGet - *out = new(HTTPGetAction) - if err := DeepCopy_api_HTTPGetAction(*in, *out, c); err != nil { - return err - } - } else { - out.HTTPGet = nil - } - if in.TCPSocket != nil { - in, out := &in.TCPSocket, &out.TCPSocket - *out = new(TCPSocketAction) - **out = **in - } else { - out.TCPSocket = nil - } - return nil - } -} - -func DeepCopy_api_HostPathVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HostPathVolumeSource) - out := out.(*HostPathVolumeSource) - out.Path = in.Path - return nil - } -} - -func DeepCopy_api_ISCSIVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ISCSIVolumeSource) - out := out.(*ISCSIVolumeSource) - out.TargetPortal = in.TargetPortal - out.IQN = in.IQN - out.Lun = in.Lun - out.ISCSIInterface = in.ISCSIInterface - out.FSType = in.FSType - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_KeyToPath(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KeyToPath) - out := out.(*KeyToPath) - out.Key = in.Key - out.Path = in.Path - if in.Mode != nil { - in, out := &in.Mode, &out.Mode - *out = new(int32) - **out = **in - } else { - out.Mode = nil - } - return nil - } -} - -func DeepCopy_api_Lifecycle(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Lifecycle) - out := out.(*Lifecycle) - if in.PostStart != nil { - in, out := &in.PostStart, &out.PostStart - *out = new(Handler) - if err := DeepCopy_api_Handler(*in, *out, c); err != nil { - return err - } - } else { - out.PostStart = nil - } - if in.PreStop != nil { - in, out := &in.PreStop, &out.PreStop - *out = new(Handler) - if err := DeepCopy_api_Handler(*in, *out, c); err != nil { - return err - } - } else { - out.PreStop = nil - } - return nil - } -} - -func DeepCopy_api_LimitRange(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LimitRange) - out := out.(*LimitRange) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_LimitRangeSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_LimitRangeItem(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LimitRangeItem) - out := out.(*LimitRangeItem) - out.Type = in.Type - if in.Max != nil { - in, out := &in.Max, &out.Max - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Max = nil - } - if in.Min != nil { - in, out := &in.Min, &out.Min - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Min = nil - } - if in.Default != nil { - in, out := &in.Default, &out.Default - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Default = nil - } - if in.DefaultRequest != nil { - in, out := &in.DefaultRequest, &out.DefaultRequest - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.DefaultRequest = nil - } - if in.MaxLimitRequestRatio != nil { - in, out := &in.MaxLimitRequestRatio, &out.MaxLimitRequestRatio - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.MaxLimitRequestRatio = nil - } - return nil - } -} - -func DeepCopy_api_LimitRangeList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LimitRangeList) - out := out.(*LimitRangeList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]LimitRange, len(*in)) - for i := range *in { - if err := DeepCopy_api_LimitRange(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_LimitRangeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LimitRangeSpec) - out := out.(*LimitRangeSpec) - if in.Limits != nil { - in, out := &in.Limits, &out.Limits - *out = make([]LimitRangeItem, len(*in)) - for i := range *in { - if err := DeepCopy_api_LimitRangeItem(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Limits = nil - } - return nil - } -} - -func DeepCopy_api_List(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*List) - out := out.(*List) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]runtime.Object, len(*in)) - for i := range *in { - if newVal, err := c.DeepCopy(&(*in)[i]); err != nil { - return err - } else { - (*out)[i] = *newVal.(*runtime.Object) - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_ListOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ListOptions) - out := out.(*ListOptions) - out.TypeMeta = in.TypeMeta - if in.LabelSelector == nil { - out.LabelSelector = nil - } else if newVal, err := c.DeepCopy(&in.LabelSelector); err != nil { - return err - } else { - out.LabelSelector = *newVal.(*labels.Selector) - } - if in.FieldSelector == nil { - out.FieldSelector = nil - } else if newVal, err := c.DeepCopy(&in.FieldSelector); err != nil { - return err - } else { - out.FieldSelector = *newVal.(*fields.Selector) - } - out.Watch = in.Watch - out.ResourceVersion = in.ResourceVersion - if in.TimeoutSeconds != nil { - in, out := &in.TimeoutSeconds, &out.TimeoutSeconds - *out = new(int64) - **out = **in - } else { - out.TimeoutSeconds = nil - } - return nil - } -} - -func DeepCopy_api_LoadBalancerIngress(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LoadBalancerIngress) - out := out.(*LoadBalancerIngress) - out.IP = in.IP - out.Hostname = in.Hostname - return nil - } -} - -func DeepCopy_api_LoadBalancerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LoadBalancerStatus) - out := out.(*LoadBalancerStatus) - if in.Ingress != nil { - in, out := &in.Ingress, &out.Ingress - *out = make([]LoadBalancerIngress, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ingress = nil - } - return nil - } -} - -func DeepCopy_api_LocalObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LocalObjectReference) - out := out.(*LocalObjectReference) - out.Name = in.Name - return nil - } -} - -func DeepCopy_api_NFSVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NFSVolumeSource) - out := out.(*NFSVolumeSource) - out.Server = in.Server - out.Path = in.Path - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_Namespace(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Namespace) - out := out.(*Namespace) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_NamespaceSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_api_NamespaceList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NamespaceList) - out := out.(*NamespaceList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Namespace, len(*in)) - for i := range *in { - if err := DeepCopy_api_Namespace(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_NamespaceSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NamespaceSpec) - out := out.(*NamespaceSpec) - if in.Finalizers != nil { - in, out := &in.Finalizers, &out.Finalizers - *out = make([]FinalizerName, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Finalizers = nil - } - return nil - } -} - -func DeepCopy_api_NamespaceStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NamespaceStatus) - out := out.(*NamespaceStatus) - out.Phase = in.Phase - return nil - } -} - -func DeepCopy_api_Node(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Node) - out := out.(*Node) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Spec = in.Spec - if err := DeepCopy_api_NodeStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_NodeAddress(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeAddress) - out := out.(*NodeAddress) - out.Type = in.Type - out.Address = in.Address - return nil - } -} - -func DeepCopy_api_NodeAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeAffinity) - out := out.(*NodeAffinity) - if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution - *out = new(NodeSelector) - if err := DeepCopy_api_NodeSelector(*in, *out, c); err != nil { - return err - } - } else { - out.RequiredDuringSchedulingIgnoredDuringExecution = nil - } - if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution - *out = make([]PreferredSchedulingTerm, len(*in)) - for i := range *in { - if err := DeepCopy_api_PreferredSchedulingTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.PreferredDuringSchedulingIgnoredDuringExecution = nil - } - return nil - } -} - -func DeepCopy_api_NodeCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeCondition) - out := out.(*NodeCondition) - out.Type = in.Type - out.Status = in.Status - out.LastHeartbeatTime = in.LastHeartbeatTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_api_NodeDaemonEndpoints(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeDaemonEndpoints) - out := out.(*NodeDaemonEndpoints) - out.KubeletEndpoint = in.KubeletEndpoint - return nil - } -} - -func DeepCopy_api_NodeList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeList) - out := out.(*NodeList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Node, len(*in)) - for i := range *in { - if err := DeepCopy_api_Node(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_NodeProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeProxyOptions) - out := out.(*NodeProxyOptions) - out.TypeMeta = in.TypeMeta - out.Path = in.Path - return nil - } -} - -func DeepCopy_api_NodeResources(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeResources) - out := out.(*NodeResources) - if in.Capacity != nil { - in, out := &in.Capacity, &out.Capacity - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Capacity = nil - } - return nil - } -} - -func DeepCopy_api_NodeSelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSelector) - out := out.(*NodeSelector) - if in.NodeSelectorTerms != nil { - in, out := &in.NodeSelectorTerms, &out.NodeSelectorTerms - *out = make([]NodeSelectorTerm, len(*in)) - for i := range *in { - if err := DeepCopy_api_NodeSelectorTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.NodeSelectorTerms = nil - } - return nil - } -} - -func DeepCopy_api_NodeSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSelectorRequirement) - out := out.(*NodeSelectorRequirement) - out.Key = in.Key - out.Operator = in.Operator - if in.Values != nil { - in, out := &in.Values, &out.Values - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Values = nil - } - return nil - } -} - -func DeepCopy_api_NodeSelectorTerm(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSelectorTerm) - out := out.(*NodeSelectorTerm) - if in.MatchExpressions != nil { - in, out := &in.MatchExpressions, &out.MatchExpressions - *out = make([]NodeSelectorRequirement, len(*in)) - for i := range *in { - if err := DeepCopy_api_NodeSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.MatchExpressions = nil - } - return nil - } -} - -func DeepCopy_api_NodeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSpec) - out := out.(*NodeSpec) - out.PodCIDR = in.PodCIDR - out.ExternalID = in.ExternalID - out.ProviderID = in.ProviderID - out.Unschedulable = in.Unschedulable - return nil - } -} - -func DeepCopy_api_NodeStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeStatus) - out := out.(*NodeStatus) - if in.Capacity != nil { - in, out := &in.Capacity, &out.Capacity - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Capacity = nil - } - if in.Allocatable != nil { - in, out := &in.Allocatable, &out.Allocatable - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Allocatable = nil - } - out.Phase = in.Phase - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]NodeCondition, len(*in)) - for i := range *in { - if err := DeepCopy_api_NodeCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.Addresses != nil { - in, out := &in.Addresses, &out.Addresses - *out = make([]NodeAddress, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Addresses = nil - } - out.DaemonEndpoints = in.DaemonEndpoints - out.NodeInfo = in.NodeInfo - if in.Images != nil { - in, out := &in.Images, &out.Images - *out = make([]ContainerImage, len(*in)) - for i := range *in { - if err := DeepCopy_api_ContainerImage(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Images = nil - } - if in.VolumesInUse != nil { - in, out := &in.VolumesInUse, &out.VolumesInUse - *out = make([]UniqueVolumeName, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.VolumesInUse = nil - } - if in.VolumesAttached != nil { - in, out := &in.VolumesAttached, &out.VolumesAttached - *out = make([]AttachedVolume, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.VolumesAttached = nil - } - return nil - } -} - -func DeepCopy_api_NodeSystemInfo(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NodeSystemInfo) - out := out.(*NodeSystemInfo) - out.MachineID = in.MachineID - out.SystemUUID = in.SystemUUID - out.BootID = in.BootID - out.KernelVersion = in.KernelVersion - out.OSImage = in.OSImage - out.ContainerRuntimeVersion = in.ContainerRuntimeVersion - out.KubeletVersion = in.KubeletVersion - out.KubeProxyVersion = in.KubeProxyVersion - out.OperatingSystem = in.OperatingSystem - out.Architecture = in.Architecture - return nil - } -} - -func DeepCopy_api_ObjectFieldSelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ObjectFieldSelector) - out := out.(*ObjectFieldSelector) - out.APIVersion = in.APIVersion - out.FieldPath = in.FieldPath - return nil - } -} - -func DeepCopy_api_ObjectMeta(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ObjectMeta) - out := out.(*ObjectMeta) - out.Name = in.Name - out.GenerateName = in.GenerateName - out.Namespace = in.Namespace - out.SelfLink = in.SelfLink - out.UID = in.UID - out.ResourceVersion = in.ResourceVersion - out.Generation = in.Generation - out.CreationTimestamp = in.CreationTimestamp.DeepCopy() - if in.DeletionTimestamp != nil { - in, out := &in.DeletionTimestamp, &out.DeletionTimestamp - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.DeletionTimestamp = nil - } - if in.DeletionGracePeriodSeconds != nil { - in, out := &in.DeletionGracePeriodSeconds, &out.DeletionGracePeriodSeconds - *out = new(int64) - **out = **in - } else { - out.DeletionGracePeriodSeconds = nil - } - if in.Labels != nil { - in, out := &in.Labels, &out.Labels - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Labels = nil - } - if in.Annotations != nil { - in, out := &in.Annotations, &out.Annotations - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Annotations = nil - } - if in.OwnerReferences != nil { - in, out := &in.OwnerReferences, &out.OwnerReferences - *out = make([]OwnerReference, len(*in)) - for i := range *in { - if err := DeepCopy_api_OwnerReference(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.OwnerReferences = nil - } - if in.Finalizers != nil { - in, out := &in.Finalizers, &out.Finalizers - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Finalizers = nil - } - out.ClusterName = in.ClusterName - return nil - } -} - -func DeepCopy_api_ObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ObjectReference) - out := out.(*ObjectReference) - out.Kind = in.Kind - out.Namespace = in.Namespace - out.Name = in.Name - out.UID = in.UID - out.APIVersion = in.APIVersion - out.ResourceVersion = in.ResourceVersion - out.FieldPath = in.FieldPath - return nil - } -} - -func DeepCopy_api_OwnerReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*OwnerReference) - out := out.(*OwnerReference) - out.APIVersion = in.APIVersion - out.Kind = in.Kind - out.Name = in.Name - out.UID = in.UID - if in.Controller != nil { - in, out := &in.Controller, &out.Controller - *out = new(bool) - **out = **in - } else { - out.Controller = nil - } - return nil - } -} - -func DeepCopy_api_PersistentVolume(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolume) - out := out.(*PersistentVolume) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_PersistentVolumeSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_api_PersistentVolumeClaim(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaim) - out := out.(*PersistentVolumeClaim) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_PersistentVolumeClaimSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_api_PersistentVolumeClaimStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_PersistentVolumeClaimList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaimList) - out := out.(*PersistentVolumeClaimList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PersistentVolumeClaim, len(*in)) - for i := range *in { - if err := DeepCopy_api_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_PersistentVolumeClaimSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaimSpec) - out := out.(*PersistentVolumeClaimSpec) - if in.AccessModes != nil { - in, out := &in.AccessModes, &out.AccessModes - *out = make([]PersistentVolumeAccessMode, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.AccessModes = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := DeepCopy_api_ResourceRequirements(&in.Resources, &out.Resources, c); err != nil { - return err - } - out.VolumeName = in.VolumeName - return nil - } -} - -func DeepCopy_api_PersistentVolumeClaimStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaimStatus) - out := out.(*PersistentVolumeClaimStatus) - out.Phase = in.Phase - if in.AccessModes != nil { - in, out := &in.AccessModes, &out.AccessModes - *out = make([]PersistentVolumeAccessMode, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.AccessModes = nil - } - if in.Capacity != nil { - in, out := &in.Capacity, &out.Capacity - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Capacity = nil - } - return nil - } -} - -func DeepCopy_api_PersistentVolumeClaimVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeClaimVolumeSource) - out := out.(*PersistentVolumeClaimVolumeSource) - out.ClaimName = in.ClaimName - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_PersistentVolumeList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeList) - out := out.(*PersistentVolumeList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PersistentVolume, len(*in)) - for i := range *in { - if err := DeepCopy_api_PersistentVolume(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_PersistentVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeSource) - out := out.(*PersistentVolumeSource) - if in.GCEPersistentDisk != nil { - in, out := &in.GCEPersistentDisk, &out.GCEPersistentDisk - *out = new(GCEPersistentDiskVolumeSource) - **out = **in - } else { - out.GCEPersistentDisk = nil - } - if in.AWSElasticBlockStore != nil { - in, out := &in.AWSElasticBlockStore, &out.AWSElasticBlockStore - *out = new(AWSElasticBlockStoreVolumeSource) - **out = **in - } else { - out.AWSElasticBlockStore = nil - } - if in.HostPath != nil { - in, out := &in.HostPath, &out.HostPath - *out = new(HostPathVolumeSource) - **out = **in - } else { - out.HostPath = nil - } - if in.Glusterfs != nil { - in, out := &in.Glusterfs, &out.Glusterfs - *out = new(GlusterfsVolumeSource) - **out = **in - } else { - out.Glusterfs = nil - } - if in.NFS != nil { - in, out := &in.NFS, &out.NFS - *out = new(NFSVolumeSource) - **out = **in - } else { - out.NFS = nil - } - if in.RBD != nil { - in, out := &in.RBD, &out.RBD - *out = new(RBDVolumeSource) - if err := DeepCopy_api_RBDVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.RBD = nil - } - if in.Quobyte != nil { - in, out := &in.Quobyte, &out.Quobyte - *out = new(QuobyteVolumeSource) - **out = **in - } else { - out.Quobyte = nil - } - if in.ISCSI != nil { - in, out := &in.ISCSI, &out.ISCSI - *out = new(ISCSIVolumeSource) - **out = **in - } else { - out.ISCSI = nil - } - if in.FlexVolume != nil { - in, out := &in.FlexVolume, &out.FlexVolume - *out = new(FlexVolumeSource) - if err := DeepCopy_api_FlexVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.FlexVolume = nil - } - if in.Cinder != nil { - in, out := &in.Cinder, &out.Cinder - *out = new(CinderVolumeSource) - **out = **in - } else { - out.Cinder = nil - } - if in.CephFS != nil { - in, out := &in.CephFS, &out.CephFS - *out = new(CephFSVolumeSource) - if err := DeepCopy_api_CephFSVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.CephFS = nil - } - if in.FC != nil { - in, out := &in.FC, &out.FC - *out = new(FCVolumeSource) - if err := DeepCopy_api_FCVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.FC = nil - } - if in.Flocker != nil { - in, out := &in.Flocker, &out.Flocker - *out = new(FlockerVolumeSource) - **out = **in - } else { - out.Flocker = nil - } - if in.AzureFile != nil { - in, out := &in.AzureFile, &out.AzureFile - *out = new(AzureFileVolumeSource) - **out = **in - } else { - out.AzureFile = nil - } - if in.VsphereVolume != nil { - in, out := &in.VsphereVolume, &out.VsphereVolume - *out = new(VsphereVirtualDiskVolumeSource) - **out = **in - } else { - out.VsphereVolume = nil - } - if in.AzureDisk != nil { - in, out := &in.AzureDisk, &out.AzureDisk - *out = new(AzureDiskVolumeSource) - if err := DeepCopy_api_AzureDiskVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.AzureDisk = nil - } - if in.PhotonPersistentDisk != nil { - in, out := &in.PhotonPersistentDisk, &out.PhotonPersistentDisk - *out = new(PhotonPersistentDiskVolumeSource) - **out = **in - } else { - out.PhotonPersistentDisk = nil - } - return nil - } -} - -func DeepCopy_api_PersistentVolumeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeSpec) - out := out.(*PersistentVolumeSpec) - if in.Capacity != nil { - in, out := &in.Capacity, &out.Capacity - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Capacity = nil - } - if err := DeepCopy_api_PersistentVolumeSource(&in.PersistentVolumeSource, &out.PersistentVolumeSource, c); err != nil { - return err - } - if in.AccessModes != nil { - in, out := &in.AccessModes, &out.AccessModes - *out = make([]PersistentVolumeAccessMode, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.AccessModes = nil - } - if in.ClaimRef != nil { - in, out := &in.ClaimRef, &out.ClaimRef - *out = new(ObjectReference) - **out = **in - } else { - out.ClaimRef = nil - } - out.PersistentVolumeReclaimPolicy = in.PersistentVolumeReclaimPolicy - return nil - } -} - -func DeepCopy_api_PersistentVolumeStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeStatus) - out := out.(*PersistentVolumeStatus) - out.Phase = in.Phase - out.Message = in.Message - out.Reason = in.Reason - return nil - } -} - -func DeepCopy_api_PhotonPersistentDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PhotonPersistentDiskVolumeSource) - out := out.(*PhotonPersistentDiskVolumeSource) - out.PdID = in.PdID - out.FSType = in.FSType - return nil - } -} - -func DeepCopy_api_Pod(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Pod) - out := out.(*Pod) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_PodSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_api_PodStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_PodAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodAffinity) - out := out.(*PodAffinity) - if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution - *out = make([]PodAffinityTerm, len(*in)) - for i := range *in { - if err := DeepCopy_api_PodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.RequiredDuringSchedulingIgnoredDuringExecution = nil - } - if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution - *out = make([]WeightedPodAffinityTerm, len(*in)) - for i := range *in { - if err := DeepCopy_api_WeightedPodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.PreferredDuringSchedulingIgnoredDuringExecution = nil - } - return nil - } -} - -func DeepCopy_api_PodAffinityTerm(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodAffinityTerm) - out := out.(*PodAffinityTerm) - if in.LabelSelector != nil { - in, out := &in.LabelSelector, &out.LabelSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.LabelSelector = nil - } - if in.Namespaces != nil { - in, out := &in.Namespaces, &out.Namespaces - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Namespaces = nil - } - out.TopologyKey = in.TopologyKey - return nil - } -} - -func DeepCopy_api_PodAntiAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodAntiAffinity) - out := out.(*PodAntiAffinity) - if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution - *out = make([]PodAffinityTerm, len(*in)) - for i := range *in { - if err := DeepCopy_api_PodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.RequiredDuringSchedulingIgnoredDuringExecution = nil - } - if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { - in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution - *out = make([]WeightedPodAffinityTerm, len(*in)) - for i := range *in { - if err := DeepCopy_api_WeightedPodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.PreferredDuringSchedulingIgnoredDuringExecution = nil - } - return nil - } -} - -func DeepCopy_api_PodAttachOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodAttachOptions) - out := out.(*PodAttachOptions) - out.TypeMeta = in.TypeMeta - out.Stdin = in.Stdin - out.Stdout = in.Stdout - out.Stderr = in.Stderr - out.TTY = in.TTY - out.Container = in.Container - return nil - } -} - -func DeepCopy_api_PodCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodCondition) - out := out.(*PodCondition) - out.Type = in.Type - out.Status = in.Status - out.LastProbeTime = in.LastProbeTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_api_PodExecOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodExecOptions) - out := out.(*PodExecOptions) - out.TypeMeta = in.TypeMeta - out.Stdin = in.Stdin - out.Stdout = in.Stdout - out.Stderr = in.Stderr - out.TTY = in.TTY - out.Container = in.Container - if in.Command != nil { - in, out := &in.Command, &out.Command - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Command = nil - } - return nil - } -} - -func DeepCopy_api_PodList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodList) - out := out.(*PodList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Pod, len(*in)) - for i := range *in { - if err := DeepCopy_api_Pod(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_PodLogOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodLogOptions) - out := out.(*PodLogOptions) - out.TypeMeta = in.TypeMeta - out.Container = in.Container - out.Follow = in.Follow - out.Previous = in.Previous - if in.SinceSeconds != nil { - in, out := &in.SinceSeconds, &out.SinceSeconds - *out = new(int64) - **out = **in - } else { - out.SinceSeconds = nil - } - if in.SinceTime != nil { - in, out := &in.SinceTime, &out.SinceTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.SinceTime = nil - } - out.Timestamps = in.Timestamps - if in.TailLines != nil { - in, out := &in.TailLines, &out.TailLines - *out = new(int64) - **out = **in - } else { - out.TailLines = nil - } - if in.LimitBytes != nil { - in, out := &in.LimitBytes, &out.LimitBytes - *out = new(int64) - **out = **in - } else { - out.LimitBytes = nil - } - return nil - } -} - -func DeepCopy_api_PodProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodProxyOptions) - out := out.(*PodProxyOptions) - out.TypeMeta = in.TypeMeta - out.Path = in.Path - return nil - } -} - -func DeepCopy_api_PodSecurityContext(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSecurityContext) - out := out.(*PodSecurityContext) - out.HostNetwork = in.HostNetwork - out.HostPID = in.HostPID - out.HostIPC = in.HostIPC - if in.SELinuxOptions != nil { - in, out := &in.SELinuxOptions, &out.SELinuxOptions - *out = new(SELinuxOptions) - **out = **in - } else { - out.SELinuxOptions = nil - } - if in.RunAsUser != nil { - in, out := &in.RunAsUser, &out.RunAsUser - *out = new(int64) - **out = **in - } else { - out.RunAsUser = nil - } - if in.RunAsNonRoot != nil { - in, out := &in.RunAsNonRoot, &out.RunAsNonRoot - *out = new(bool) - **out = **in - } else { - out.RunAsNonRoot = nil - } - if in.SupplementalGroups != nil { - in, out := &in.SupplementalGroups, &out.SupplementalGroups - *out = make([]int64, len(*in)) - copy(*out, *in) - } else { - out.SupplementalGroups = nil - } - if in.FSGroup != nil { - in, out := &in.FSGroup, &out.FSGroup - *out = new(int64) - **out = **in - } else { - out.FSGroup = nil - } - return nil - } -} - -func DeepCopy_api_PodSignature(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSignature) - out := out.(*PodSignature) - if in.PodController != nil { - in, out := &in.PodController, &out.PodController - *out = new(OwnerReference) - if err := DeepCopy_api_OwnerReference(*in, *out, c); err != nil { - return err - } - } else { - out.PodController = nil - } - return nil - } -} - -func DeepCopy_api_PodSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSpec) - out := out.(*PodSpec) - if in.Volumes != nil { - in, out := &in.Volumes, &out.Volumes - *out = make([]Volume, len(*in)) - for i := range *in { - if err := DeepCopy_api_Volume(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Volumes = nil - } - if in.InitContainers != nil { - in, out := &in.InitContainers, &out.InitContainers - *out = make([]Container, len(*in)) - for i := range *in { - if err := DeepCopy_api_Container(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.InitContainers = nil - } - if in.Containers != nil { - in, out := &in.Containers, &out.Containers - *out = make([]Container, len(*in)) - for i := range *in { - if err := DeepCopy_api_Container(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Containers = nil - } - out.RestartPolicy = in.RestartPolicy - if in.TerminationGracePeriodSeconds != nil { - in, out := &in.TerminationGracePeriodSeconds, &out.TerminationGracePeriodSeconds - *out = new(int64) - **out = **in - } else { - out.TerminationGracePeriodSeconds = nil - } - if in.ActiveDeadlineSeconds != nil { - in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds - *out = new(int64) - **out = **in - } else { - out.ActiveDeadlineSeconds = nil - } - out.DNSPolicy = in.DNSPolicy - if in.NodeSelector != nil { - in, out := &in.NodeSelector, &out.NodeSelector - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.NodeSelector = nil - } - out.ServiceAccountName = in.ServiceAccountName - out.NodeName = in.NodeName - if in.SecurityContext != nil { - in, out := &in.SecurityContext, &out.SecurityContext - *out = new(PodSecurityContext) - if err := DeepCopy_api_PodSecurityContext(*in, *out, c); err != nil { - return err - } - } else { - out.SecurityContext = nil - } - if in.ImagePullSecrets != nil { - in, out := &in.ImagePullSecrets, &out.ImagePullSecrets - *out = make([]LocalObjectReference, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.ImagePullSecrets = nil - } - out.Hostname = in.Hostname - out.Subdomain = in.Subdomain - return nil - } -} - -func DeepCopy_api_PodStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodStatus) - out := out.(*PodStatus) - out.Phase = in.Phase - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]PodCondition, len(*in)) - for i := range *in { - if err := DeepCopy_api_PodCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - out.Message = in.Message - out.Reason = in.Reason - out.HostIP = in.HostIP - out.PodIP = in.PodIP - if in.StartTime != nil { - in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.StartTime = nil - } - if in.InitContainerStatuses != nil { - in, out := &in.InitContainerStatuses, &out.InitContainerStatuses - *out = make([]ContainerStatus, len(*in)) - for i := range *in { - if err := DeepCopy_api_ContainerStatus(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.InitContainerStatuses = nil - } - if in.ContainerStatuses != nil { - in, out := &in.ContainerStatuses, &out.ContainerStatuses - *out = make([]ContainerStatus, len(*in)) - for i := range *in { - if err := DeepCopy_api_ContainerStatus(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.ContainerStatuses = nil - } - return nil - } -} - -func DeepCopy_api_PodStatusResult(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodStatusResult) - out := out.(*PodStatusResult) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_PodStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_PodTemplate(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodTemplate) - out := out.(*PodTemplate) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_PodTemplateList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodTemplateList) - out := out.(*PodTemplateList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PodTemplate, len(*in)) - for i := range *in { - if err := DeepCopy_api_PodTemplate(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_PodTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodTemplateSpec) - out := out.(*PodTemplateSpec) - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_PodSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_Preconditions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Preconditions) - out := out.(*Preconditions) - if in.UID != nil { - in, out := &in.UID, &out.UID - *out = new(types.UID) - **out = **in - } else { - out.UID = nil - } - return nil - } -} - -func DeepCopy_api_PreferAvoidPodsEntry(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PreferAvoidPodsEntry) - out := out.(*PreferAvoidPodsEntry) - if err := DeepCopy_api_PodSignature(&in.PodSignature, &out.PodSignature, c); err != nil { - return err - } - out.EvictionTime = in.EvictionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_api_PreferredSchedulingTerm(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PreferredSchedulingTerm) - out := out.(*PreferredSchedulingTerm) - out.Weight = in.Weight - if err := DeepCopy_api_NodeSelectorTerm(&in.Preference, &out.Preference, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_Probe(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Probe) - out := out.(*Probe) - if err := DeepCopy_api_Handler(&in.Handler, &out.Handler, c); err != nil { - return err - } - out.InitialDelaySeconds = in.InitialDelaySeconds - out.TimeoutSeconds = in.TimeoutSeconds - out.PeriodSeconds = in.PeriodSeconds - out.SuccessThreshold = in.SuccessThreshold - out.FailureThreshold = in.FailureThreshold - return nil - } -} - -func DeepCopy_api_QuobyteVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*QuobyteVolumeSource) - out := out.(*QuobyteVolumeSource) - out.Registry = in.Registry - out.Volume = in.Volume - out.ReadOnly = in.ReadOnly - out.User = in.User - out.Group = in.Group - return nil - } -} - -func DeepCopy_api_RBDVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RBDVolumeSource) - out := out.(*RBDVolumeSource) - if in.CephMonitors != nil { - in, out := &in.CephMonitors, &out.CephMonitors - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.CephMonitors = nil - } - out.RBDImage = in.RBDImage - out.FSType = in.FSType - out.RBDPool = in.RBDPool - out.RadosUser = in.RadosUser - out.Keyring = in.Keyring - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(LocalObjectReference) - **out = **in - } else { - out.SecretRef = nil - } - out.ReadOnly = in.ReadOnly - return nil - } -} - -func DeepCopy_api_RangeAllocation(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RangeAllocation) - out := out.(*RangeAllocation) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Range = in.Range - if in.Data != nil { - in, out := &in.Data, &out.Data - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Data = nil - } - return nil - } -} - -func DeepCopy_api_ReplicationController(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationController) - out := out.(*ReplicationController) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_ReplicationControllerSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_api_ReplicationControllerStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_ReplicationControllerCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerCondition) - out := out.(*ReplicationControllerCondition) - out.Type = in.Type - out.Status = in.Status - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_api_ReplicationControllerList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerList) - out := out.(*ReplicationControllerList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ReplicationController, len(*in)) - for i := range *in { - if err := DeepCopy_api_ReplicationController(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_ReplicationControllerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerSpec) - out := out.(*ReplicationControllerSpec) - out.Replicas = in.Replicas - out.MinReadySeconds = in.MinReadySeconds - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Selector = nil - } - if in.Template != nil { - in, out := &in.Template, &out.Template - *out = new(PodTemplateSpec) - if err := DeepCopy_api_PodTemplateSpec(*in, *out, c); err != nil { - return err - } - } else { - out.Template = nil - } - return nil - } -} - -func DeepCopy_api_ReplicationControllerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerStatus) - out := out.(*ReplicationControllerStatus) - out.Replicas = in.Replicas - out.FullyLabeledReplicas = in.FullyLabeledReplicas - out.ReadyReplicas = in.ReadyReplicas - out.AvailableReplicas = in.AvailableReplicas - out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]ReplicationControllerCondition, len(*in)) - for i := range *in { - if err := DeepCopy_api_ReplicationControllerCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - return nil - } -} - -func DeepCopy_api_ResourceFieldSelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceFieldSelector) - out := out.(*ResourceFieldSelector) - out.ContainerName = in.ContainerName - out.Resource = in.Resource - out.Divisor = in.Divisor.DeepCopy() - return nil - } -} - -func DeepCopy_api_ResourceQuota(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceQuota) - out := out.(*ResourceQuota) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_ResourceQuotaSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_api_ResourceQuotaStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_ResourceQuotaList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceQuotaList) - out := out.(*ResourceQuotaList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ResourceQuota, len(*in)) - for i := range *in { - if err := DeepCopy_api_ResourceQuota(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_ResourceQuotaSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceQuotaSpec) - out := out.(*ResourceQuotaSpec) - if in.Hard != nil { - in, out := &in.Hard, &out.Hard - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Hard = nil - } - if in.Scopes != nil { - in, out := &in.Scopes, &out.Scopes - *out = make([]ResourceQuotaScope, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Scopes = nil - } - return nil - } -} - -func DeepCopy_api_ResourceQuotaStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceQuotaStatus) - out := out.(*ResourceQuotaStatus) - if in.Hard != nil { - in, out := &in.Hard, &out.Hard - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Hard = nil - } - if in.Used != nil { - in, out := &in.Used, &out.Used - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Used = nil - } - return nil - } -} - -func DeepCopy_api_ResourceRequirements(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceRequirements) - out := out.(*ResourceRequirements) - if in.Limits != nil { - in, out := &in.Limits, &out.Limits - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Limits = nil - } - if in.Requests != nil { - in, out := &in.Requests, &out.Requests - *out = make(ResourceList) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.Requests = nil - } - return nil - } -} - -func DeepCopy_api_SELinuxOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SELinuxOptions) - out := out.(*SELinuxOptions) - out.User = in.User - out.Role = in.Role - out.Type = in.Type - out.Level = in.Level - return nil - } -} - -func DeepCopy_api_Secret(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Secret) - out := out.(*Secret) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Data != nil { - in, out := &in.Data, &out.Data - *out = make(map[string][]byte) - for key, val := range *in { - if newVal, err := c.DeepCopy(&val); err != nil { - return err - } else { - (*out)[key] = *newVal.(*[]byte) - } - } - } else { - out.Data = nil - } - out.Type = in.Type - return nil - } -} - -func DeepCopy_api_SecretKeySelector(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SecretKeySelector) - out := out.(*SecretKeySelector) - out.LocalObjectReference = in.LocalObjectReference - out.Key = in.Key - return nil - } -} - -func DeepCopy_api_SecretList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SecretList) - out := out.(*SecretList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Secret, len(*in)) - for i := range *in { - if err := DeepCopy_api_Secret(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_SecretVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SecretVolumeSource) - out := out.(*SecretVolumeSource) - out.SecretName = in.SecretName - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]KeyToPath, len(*in)) - for i := range *in { - if err := DeepCopy_api_KeyToPath(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - if in.DefaultMode != nil { - in, out := &in.DefaultMode, &out.DefaultMode - *out = new(int32) - **out = **in - } else { - out.DefaultMode = nil - } - return nil - } -} - -func DeepCopy_api_SecurityContext(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SecurityContext) - out := out.(*SecurityContext) - if in.Capabilities != nil { - in, out := &in.Capabilities, &out.Capabilities - *out = new(Capabilities) - if err := DeepCopy_api_Capabilities(*in, *out, c); err != nil { - return err - } - } else { - out.Capabilities = nil - } - if in.Privileged != nil { - in, out := &in.Privileged, &out.Privileged - *out = new(bool) - **out = **in - } else { - out.Privileged = nil - } - if in.SELinuxOptions != nil { - in, out := &in.SELinuxOptions, &out.SELinuxOptions - *out = new(SELinuxOptions) - **out = **in - } else { - out.SELinuxOptions = nil - } - if in.RunAsUser != nil { - in, out := &in.RunAsUser, &out.RunAsUser - *out = new(int64) - **out = **in - } else { - out.RunAsUser = nil - } - if in.RunAsNonRoot != nil { - in, out := &in.RunAsNonRoot, &out.RunAsNonRoot - *out = new(bool) - **out = **in - } else { - out.RunAsNonRoot = nil - } - if in.ReadOnlyRootFilesystem != nil { - in, out := &in.ReadOnlyRootFilesystem, &out.ReadOnlyRootFilesystem - *out = new(bool) - **out = **in - } else { - out.ReadOnlyRootFilesystem = nil - } - return nil - } -} - -func DeepCopy_api_SerializedReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SerializedReference) - out := out.(*SerializedReference) - out.TypeMeta = in.TypeMeta - out.Reference = in.Reference - return nil - } -} - -func DeepCopy_api_Service(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Service) - out := out.(*Service) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_api_ServiceSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_api_ServiceStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_ServiceAccount(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceAccount) - out := out.(*ServiceAccount) - out.TypeMeta = in.TypeMeta - if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Secrets != nil { - in, out := &in.Secrets, &out.Secrets - *out = make([]ObjectReference, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Secrets = nil - } - if in.ImagePullSecrets != nil { - in, out := &in.ImagePullSecrets, &out.ImagePullSecrets - *out = make([]LocalObjectReference, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.ImagePullSecrets = nil - } - return nil - } -} - -func DeepCopy_api_ServiceAccountList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceAccountList) - out := out.(*ServiceAccountList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ServiceAccount, len(*in)) - for i := range *in { - if err := DeepCopy_api_ServiceAccount(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_ServiceList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceList) - out := out.(*ServiceList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Service, len(*in)) - for i := range *in { - if err := DeepCopy_api_Service(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_api_ServicePort(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServicePort) - out := out.(*ServicePort) - out.Name = in.Name - out.Protocol = in.Protocol - out.Port = in.Port - out.TargetPort = in.TargetPort - out.NodePort = in.NodePort - return nil - } -} - -func DeepCopy_api_ServiceProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceProxyOptions) - out := out.(*ServiceProxyOptions) - out.TypeMeta = in.TypeMeta - out.Path = in.Path - return nil - } -} - -func DeepCopy_api_ServiceSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceSpec) - out := out.(*ServiceSpec) - out.Type = in.Type - if in.Ports != nil { - in, out := &in.Ports, &out.Ports - *out = make([]ServicePort, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ports = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Selector = nil - } - out.ClusterIP = in.ClusterIP - out.ExternalName = in.ExternalName - if in.ExternalIPs != nil { - in, out := &in.ExternalIPs, &out.ExternalIPs - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.ExternalIPs = nil - } - out.LoadBalancerIP = in.LoadBalancerIP - out.SessionAffinity = in.SessionAffinity - if in.LoadBalancerSourceRanges != nil { - in, out := &in.LoadBalancerSourceRanges, &out.LoadBalancerSourceRanges - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.LoadBalancerSourceRanges = nil - } - return nil - } -} - -func DeepCopy_api_ServiceStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServiceStatus) - out := out.(*ServiceStatus) - if err := DeepCopy_api_LoadBalancerStatus(&in.LoadBalancer, &out.LoadBalancer, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_Sysctl(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Sysctl) - out := out.(*Sysctl) - out.Name = in.Name - out.Value = in.Value - return nil - } -} - -func DeepCopy_api_TCPSocketAction(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TCPSocketAction) - out := out.(*TCPSocketAction) - out.Port = in.Port - return nil - } -} - -func DeepCopy_api_Taint(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Taint) - out := out.(*Taint) - out.Key = in.Key - out.Value = in.Value - out.Effect = in.Effect - return nil - } -} - -func DeepCopy_api_Toleration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Toleration) - out := out.(*Toleration) - out.Key = in.Key - out.Operator = in.Operator - out.Value = in.Value - out.Effect = in.Effect - return nil - } -} - -func DeepCopy_api_Volume(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Volume) - out := out.(*Volume) - out.Name = in.Name - if err := DeepCopy_api_VolumeSource(&in.VolumeSource, &out.VolumeSource, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_api_VolumeMount(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*VolumeMount) - out := out.(*VolumeMount) - out.Name = in.Name - out.ReadOnly = in.ReadOnly - out.MountPath = in.MountPath - out.SubPath = in.SubPath - return nil - } -} - -func DeepCopy_api_VolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*VolumeSource) - out := out.(*VolumeSource) - if in.HostPath != nil { - in, out := &in.HostPath, &out.HostPath - *out = new(HostPathVolumeSource) - **out = **in - } else { - out.HostPath = nil - } - if in.EmptyDir != nil { - in, out := &in.EmptyDir, &out.EmptyDir - *out = new(EmptyDirVolumeSource) - **out = **in - } else { - out.EmptyDir = nil - } - if in.GCEPersistentDisk != nil { - in, out := &in.GCEPersistentDisk, &out.GCEPersistentDisk - *out = new(GCEPersistentDiskVolumeSource) - **out = **in - } else { - out.GCEPersistentDisk = nil - } - if in.AWSElasticBlockStore != nil { - in, out := &in.AWSElasticBlockStore, &out.AWSElasticBlockStore - *out = new(AWSElasticBlockStoreVolumeSource) - **out = **in - } else { - out.AWSElasticBlockStore = nil - } - if in.GitRepo != nil { - in, out := &in.GitRepo, &out.GitRepo - *out = new(GitRepoVolumeSource) - **out = **in - } else { - out.GitRepo = nil - } - if in.Secret != nil { - in, out := &in.Secret, &out.Secret - *out = new(SecretVolumeSource) - if err := DeepCopy_api_SecretVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.Secret = nil - } - if in.NFS != nil { - in, out := &in.NFS, &out.NFS - *out = new(NFSVolumeSource) - **out = **in - } else { - out.NFS = nil - } - if in.ISCSI != nil { - in, out := &in.ISCSI, &out.ISCSI - *out = new(ISCSIVolumeSource) - **out = **in - } else { - out.ISCSI = nil - } - if in.Glusterfs != nil { - in, out := &in.Glusterfs, &out.Glusterfs - *out = new(GlusterfsVolumeSource) - **out = **in - } else { - out.Glusterfs = nil - } - if in.PersistentVolumeClaim != nil { - in, out := &in.PersistentVolumeClaim, &out.PersistentVolumeClaim - *out = new(PersistentVolumeClaimVolumeSource) - **out = **in - } else { - out.PersistentVolumeClaim = nil - } - if in.RBD != nil { - in, out := &in.RBD, &out.RBD - *out = new(RBDVolumeSource) - if err := DeepCopy_api_RBDVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.RBD = nil - } - if in.Quobyte != nil { - in, out := &in.Quobyte, &out.Quobyte - *out = new(QuobyteVolumeSource) - **out = **in - } else { - out.Quobyte = nil - } - if in.FlexVolume != nil { - in, out := &in.FlexVolume, &out.FlexVolume - *out = new(FlexVolumeSource) - if err := DeepCopy_api_FlexVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.FlexVolume = nil - } - if in.Cinder != nil { - in, out := &in.Cinder, &out.Cinder - *out = new(CinderVolumeSource) - **out = **in - } else { - out.Cinder = nil - } - if in.CephFS != nil { - in, out := &in.CephFS, &out.CephFS - *out = new(CephFSVolumeSource) - if err := DeepCopy_api_CephFSVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.CephFS = nil - } - if in.Flocker != nil { - in, out := &in.Flocker, &out.Flocker - *out = new(FlockerVolumeSource) - **out = **in - } else { - out.Flocker = nil - } - if in.DownwardAPI != nil { - in, out := &in.DownwardAPI, &out.DownwardAPI - *out = new(DownwardAPIVolumeSource) - if err := DeepCopy_api_DownwardAPIVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.DownwardAPI = nil - } - if in.FC != nil { - in, out := &in.FC, &out.FC - *out = new(FCVolumeSource) - if err := DeepCopy_api_FCVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.FC = nil - } - if in.AzureFile != nil { - in, out := &in.AzureFile, &out.AzureFile - *out = new(AzureFileVolumeSource) - **out = **in - } else { - out.AzureFile = nil - } - if in.ConfigMap != nil { - in, out := &in.ConfigMap, &out.ConfigMap - *out = new(ConfigMapVolumeSource) - if err := DeepCopy_api_ConfigMapVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.ConfigMap = nil - } - if in.VsphereVolume != nil { - in, out := &in.VsphereVolume, &out.VsphereVolume - *out = new(VsphereVirtualDiskVolumeSource) - **out = **in - } else { - out.VsphereVolume = nil - } - if in.AzureDisk != nil { - in, out := &in.AzureDisk, &out.AzureDisk - *out = new(AzureDiskVolumeSource) - if err := DeepCopy_api_AzureDiskVolumeSource(*in, *out, c); err != nil { - return err - } - } else { - out.AzureDisk = nil - } - if in.PhotonPersistentDisk != nil { - in, out := &in.PhotonPersistentDisk, &out.PhotonPersistentDisk - *out = new(PhotonPersistentDiskVolumeSource) - **out = **in - } else { - out.PhotonPersistentDisk = nil - } - return nil - } -} - -func DeepCopy_api_VsphereVirtualDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*VsphereVirtualDiskVolumeSource) - out := out.(*VsphereVirtualDiskVolumeSource) - out.VolumePath = in.VolumePath - out.FSType = in.FSType - return nil - } -} - -func DeepCopy_api_WeightedPodAffinityTerm(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*WeightedPodAffinityTerm) - out := out.(*WeightedPodAffinityTerm) - out.Weight = in.Weight - if err := DeepCopy_api_PodAffinityTerm(&in.PodAffinityTerm, &out.PodAffinityTerm, c); err != nil { - return err - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go deleted file mode 100644 index 83191c0f710..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go +++ /dev/null @@ -1,138 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1beta1 - -import ( - unversioned "k8s.io/client-go/pkg/api/unversioned" - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StatefulSet, InType: reflect.TypeOf(&StatefulSet{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StatefulSetList, InType: reflect.TypeOf(&StatefulSetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StatefulSetSpec, InType: reflect.TypeOf(&StatefulSetSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StatefulSetStatus, InType: reflect.TypeOf(&StatefulSetStatus{})}, - ) -} - -func DeepCopy_v1beta1_StatefulSet(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatefulSet) - out := out.(*StatefulSet) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_StatefulSetSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_StatefulSetStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_StatefulSetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatefulSetList) - out := out.(*StatefulSetList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]StatefulSet, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_StatefulSet(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_StatefulSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatefulSetSpec) - out := out.(*StatefulSetSpec) - if in.Replicas != nil { - in, out := &in.Replicas, &out.Replicas - *out = new(int32) - **out = **in - } else { - out.Replicas = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - if in.VolumeClaimTemplates != nil { - in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates - *out = make([]v1.PersistentVolumeClaim, len(*in)) - for i := range *in { - if err := v1.DeepCopy_v1_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.VolumeClaimTemplates = nil - } - out.ServiceName = in.ServiceName - return nil - } -} - -func DeepCopy_v1beta1_StatefulSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatefulSetStatus) - out := out.(*StatefulSetStatus) - if in.ObservedGeneration != nil { - in, out := &in.ObservedGeneration, &out.ObservedGeneration - *out = new(int64) - **out = **in - } else { - out.ObservedGeneration = nil - } - out.Replicas = in.Replicas - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go deleted file mode 100644 index 4452972dfd1..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go +++ /dev/null @@ -1,132 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package apps - -import ( - api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_StatefulSet, InType: reflect.TypeOf(&StatefulSet{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_StatefulSetList, InType: reflect.TypeOf(&StatefulSetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_StatefulSetSpec, InType: reflect.TypeOf(&StatefulSetSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_StatefulSetStatus, InType: reflect.TypeOf(&StatefulSetStatus{})}, - ) -} - -func DeepCopy_apps_StatefulSet(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatefulSet) - out := out.(*StatefulSet) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_apps_StatefulSetSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_apps_StatefulSetStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_apps_StatefulSetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatefulSetList) - out := out.(*StatefulSetList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]StatefulSet, len(*in)) - for i := range *in { - if err := DeepCopy_apps_StatefulSet(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_apps_StatefulSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatefulSetSpec) - out := out.(*StatefulSetSpec) - out.Replicas = in.Replicas - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - if in.VolumeClaimTemplates != nil { - in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates - *out = make([]api.PersistentVolumeClaim, len(*in)) - for i := range *in { - if err := api.DeepCopy_api_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.VolumeClaimTemplates = nil - } - out.ServiceName = in.ServiceName - return nil - } -} - -func DeepCopy_apps_StatefulSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StatefulSetStatus) - out := out.(*StatefulSetStatus) - if in.ObservedGeneration != nil { - in, out := &in.ObservedGeneration, &out.ObservedGeneration - *out = new(int64) - **out = **in - } else { - out.ObservedGeneration = nil - } - out.Replicas = in.Replicas - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go deleted file mode 100644 index 2d461d26035..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go +++ /dev/null @@ -1,111 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1beta1 - -import ( - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_TokenReview, InType: reflect.TypeOf(&TokenReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_TokenReviewSpec, InType: reflect.TypeOf(&TokenReviewSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_TokenReviewStatus, InType: reflect.TypeOf(&TokenReviewStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_UserInfo, InType: reflect.TypeOf(&UserInfo{})}, - ) -} - -func DeepCopy_v1beta1_TokenReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TokenReview) - out := out.(*TokenReview) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Spec = in.Spec - if err := DeepCopy_v1beta1_TokenReviewStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_TokenReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TokenReviewSpec) - out := out.(*TokenReviewSpec) - out.Token = in.Token - return nil - } -} - -func DeepCopy_v1beta1_TokenReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TokenReviewStatus) - out := out.(*TokenReviewStatus) - out.Authenticated = in.Authenticated - if err := DeepCopy_v1beta1_UserInfo(&in.User, &out.User, c); err != nil { - return err - } - out.Error = in.Error - return nil - } -} - -func DeepCopy_v1beta1_UserInfo(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*UserInfo) - out := out.(*UserInfo) - out.Username = in.Username - out.UID = in.UID - if in.Groups != nil { - in, out := &in.Groups, &out.Groups - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Groups = nil - } - if in.Extra != nil { - in, out := &in.Extra, &out.Extra - *out = make(map[string]ExtraValue) - for key, val := range *in { - if newVal, err := c.DeepCopy(&val); err != nil { - return err - } else { - (*out)[key] = *newVal.(*ExtraValue) - } - } - } else { - out.Extra = nil - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go deleted file mode 100644 index b86631cacf5..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go +++ /dev/null @@ -1,111 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package authentication - -import ( - api "k8s.io/client-go/pkg/api" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authentication_TokenReview, InType: reflect.TypeOf(&TokenReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authentication_TokenReviewSpec, InType: reflect.TypeOf(&TokenReviewSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authentication_TokenReviewStatus, InType: reflect.TypeOf(&TokenReviewStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authentication_UserInfo, InType: reflect.TypeOf(&UserInfo{})}, - ) -} - -func DeepCopy_authentication_TokenReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TokenReview) - out := out.(*TokenReview) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Spec = in.Spec - if err := DeepCopy_authentication_TokenReviewStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_authentication_TokenReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TokenReviewSpec) - out := out.(*TokenReviewSpec) - out.Token = in.Token - return nil - } -} - -func DeepCopy_authentication_TokenReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TokenReviewStatus) - out := out.(*TokenReviewStatus) - out.Authenticated = in.Authenticated - if err := DeepCopy_authentication_UserInfo(&in.User, &out.User, c); err != nil { - return err - } - out.Error = in.Error - return nil - } -} - -func DeepCopy_authentication_UserInfo(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*UserInfo) - out := out.(*UserInfo) - out.Username = in.Username - out.UID = in.UID - if in.Groups != nil { - in, out := &in.Groups, &out.Groups - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Groups = nil - } - if in.Extra != nil { - in, out := &in.Extra, &out.Extra - *out = make(map[string]ExtraValue) - for key, val := range *in { - if newVal, err := c.DeepCopy(&val); err != nil { - return err - } else { - (*out)[key] = *newVal.(*ExtraValue) - } - } - } else { - out.Extra = nil - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go deleted file mode 100644 index 373c279ec29..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go +++ /dev/null @@ -1,196 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1beta1 - -import ( - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_LocalSubjectAccessReview, InType: reflect.TypeOf(&LocalSubjectAccessReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NonResourceAttributes, InType: reflect.TypeOf(&NonResourceAttributes{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ResourceAttributes, InType: reflect.TypeOf(&ResourceAttributes{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SelfSubjectAccessReview, InType: reflect.TypeOf(&SelfSubjectAccessReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SelfSubjectAccessReviewSpec, InType: reflect.TypeOf(&SelfSubjectAccessReviewSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubjectAccessReview, InType: reflect.TypeOf(&SubjectAccessReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubjectAccessReviewSpec, InType: reflect.TypeOf(&SubjectAccessReviewSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubjectAccessReviewStatus, InType: reflect.TypeOf(&SubjectAccessReviewStatus{})}, - ) -} - -func DeepCopy_v1beta1_LocalSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LocalSubjectAccessReview) - out := out.(*LocalSubjectAccessReview) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_v1beta1_NonResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NonResourceAttributes) - out := out.(*NonResourceAttributes) - out.Path = in.Path - out.Verb = in.Verb - return nil - } -} - -func DeepCopy_v1beta1_ResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceAttributes) - out := out.(*ResourceAttributes) - out.Namespace = in.Namespace - out.Verb = in.Verb - out.Group = in.Group - out.Version = in.Version - out.Resource = in.Resource - out.Subresource = in.Subresource - out.Name = in.Name - return nil - } -} - -func DeepCopy_v1beta1_SelfSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SelfSubjectAccessReview) - out := out.(*SelfSubjectAccessReview) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SelfSubjectAccessReviewSpec) - out := out.(*SelfSubjectAccessReviewSpec) - if in.ResourceAttributes != nil { - in, out := &in.ResourceAttributes, &out.ResourceAttributes - *out = new(ResourceAttributes) - **out = **in - } else { - out.ResourceAttributes = nil - } - if in.NonResourceAttributes != nil { - in, out := &in.NonResourceAttributes, &out.NonResourceAttributes - *out = new(NonResourceAttributes) - **out = **in - } else { - out.NonResourceAttributes = nil - } - return nil - } -} - -func DeepCopy_v1beta1_SubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SubjectAccessReview) - out := out.(*SubjectAccessReview) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_v1beta1_SubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SubjectAccessReviewSpec) - out := out.(*SubjectAccessReviewSpec) - if in.ResourceAttributes != nil { - in, out := &in.ResourceAttributes, &out.ResourceAttributes - *out = new(ResourceAttributes) - **out = **in - } else { - out.ResourceAttributes = nil - } - if in.NonResourceAttributes != nil { - in, out := &in.NonResourceAttributes, &out.NonResourceAttributes - *out = new(NonResourceAttributes) - **out = **in - } else { - out.NonResourceAttributes = nil - } - out.User = in.User - if in.Groups != nil { - in, out := &in.Groups, &out.Groups - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Groups = nil - } - if in.Extra != nil { - in, out := &in.Extra, &out.Extra - *out = make(map[string]ExtraValue) - for key, val := range *in { - if newVal, err := c.DeepCopy(&val); err != nil { - return err - } else { - (*out)[key] = *newVal.(*ExtraValue) - } - } - } else { - out.Extra = nil - } - return nil - } -} - -func DeepCopy_v1beta1_SubjectAccessReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SubjectAccessReviewStatus) - out := out.(*SubjectAccessReviewStatus) - out.Allowed = in.Allowed - out.Reason = in.Reason - out.EvaluationError = in.EvaluationError - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go deleted file mode 100644 index ce703736f52..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go +++ /dev/null @@ -1,196 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package authorization - -import ( - api "k8s.io/client-go/pkg/api" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_LocalSubjectAccessReview, InType: reflect.TypeOf(&LocalSubjectAccessReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_NonResourceAttributes, InType: reflect.TypeOf(&NonResourceAttributes{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_ResourceAttributes, InType: reflect.TypeOf(&ResourceAttributes{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SelfSubjectAccessReview, InType: reflect.TypeOf(&SelfSubjectAccessReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SelfSubjectAccessReviewSpec, InType: reflect.TypeOf(&SelfSubjectAccessReviewSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SubjectAccessReview, InType: reflect.TypeOf(&SubjectAccessReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SubjectAccessReviewSpec, InType: reflect.TypeOf(&SubjectAccessReviewSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SubjectAccessReviewStatus, InType: reflect.TypeOf(&SubjectAccessReviewStatus{})}, - ) -} - -func DeepCopy_authorization_LocalSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LocalSubjectAccessReview) - out := out.(*LocalSubjectAccessReview) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_authorization_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_authorization_NonResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NonResourceAttributes) - out := out.(*NonResourceAttributes) - out.Path = in.Path - out.Verb = in.Verb - return nil - } -} - -func DeepCopy_authorization_ResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ResourceAttributes) - out := out.(*ResourceAttributes) - out.Namespace = in.Namespace - out.Verb = in.Verb - out.Group = in.Group - out.Version = in.Version - out.Resource = in.Resource - out.Subresource = in.Subresource - out.Name = in.Name - return nil - } -} - -func DeepCopy_authorization_SelfSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SelfSubjectAccessReview) - out := out.(*SelfSubjectAccessReview) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_authorization_SelfSubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_authorization_SelfSubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SelfSubjectAccessReviewSpec) - out := out.(*SelfSubjectAccessReviewSpec) - if in.ResourceAttributes != nil { - in, out := &in.ResourceAttributes, &out.ResourceAttributes - *out = new(ResourceAttributes) - **out = **in - } else { - out.ResourceAttributes = nil - } - if in.NonResourceAttributes != nil { - in, out := &in.NonResourceAttributes, &out.NonResourceAttributes - *out = new(NonResourceAttributes) - **out = **in - } else { - out.NonResourceAttributes = nil - } - return nil - } -} - -func DeepCopy_authorization_SubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SubjectAccessReview) - out := out.(*SubjectAccessReview) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_authorization_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_authorization_SubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SubjectAccessReviewSpec) - out := out.(*SubjectAccessReviewSpec) - if in.ResourceAttributes != nil { - in, out := &in.ResourceAttributes, &out.ResourceAttributes - *out = new(ResourceAttributes) - **out = **in - } else { - out.ResourceAttributes = nil - } - if in.NonResourceAttributes != nil { - in, out := &in.NonResourceAttributes, &out.NonResourceAttributes - *out = new(NonResourceAttributes) - **out = **in - } else { - out.NonResourceAttributes = nil - } - out.User = in.User - if in.Groups != nil { - in, out := &in.Groups, &out.Groups - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Groups = nil - } - if in.Extra != nil { - in, out := &in.Extra, &out.Extra - *out = make(map[string]ExtraValue) - for key, val := range *in { - if newVal, err := c.DeepCopy(&val); err != nil { - return err - } else { - (*out)[key] = *newVal.(*ExtraValue) - } - } - } else { - out.Extra = nil - } - return nil - } -} - -func DeepCopy_authorization_SubjectAccessReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SubjectAccessReviewStatus) - out := out.(*SubjectAccessReviewStatus) - out.Allowed = in.Allowed - out.Reason = in.Reason - out.EvaluationError = in.EvaluationError - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go deleted file mode 100644 index b4284f3deea..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go +++ /dev/null @@ -1,186 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1 - -import ( - unversioned "k8s.io/client-go/pkg/api/unversioned" - api_v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_CrossVersionObjectReference, InType: reflect.TypeOf(&CrossVersionObjectReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscaler, InType: reflect.TypeOf(&HorizontalPodAutoscaler{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscalerList, InType: reflect.TypeOf(&HorizontalPodAutoscalerList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscalerSpec, InType: reflect.TypeOf(&HorizontalPodAutoscalerSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscalerStatus, InType: reflect.TypeOf(&HorizontalPodAutoscalerStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Scale, InType: reflect.TypeOf(&Scale{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ScaleSpec, InType: reflect.TypeOf(&ScaleSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ScaleStatus, InType: reflect.TypeOf(&ScaleStatus{})}, - ) -} - -func DeepCopy_v1_CrossVersionObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CrossVersionObjectReference) - out := out.(*CrossVersionObjectReference) - out.Kind = in.Kind - out.Name = in.Name - out.APIVersion = in.APIVersion - return nil - } -} - -func DeepCopy_v1_HorizontalPodAutoscaler(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscaler) - out := out.(*HorizontalPodAutoscaler) - out.TypeMeta = in.TypeMeta - if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_HorizontalPodAutoscalerList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscalerList) - out := out.(*HorizontalPodAutoscalerList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]HorizontalPodAutoscaler, len(*in)) - for i := range *in { - if err := DeepCopy_v1_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_HorizontalPodAutoscalerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscalerSpec) - out := out.(*HorizontalPodAutoscalerSpec) - out.ScaleTargetRef = in.ScaleTargetRef - if in.MinReplicas != nil { - in, out := &in.MinReplicas, &out.MinReplicas - *out = new(int32) - **out = **in - } else { - out.MinReplicas = nil - } - out.MaxReplicas = in.MaxReplicas - if in.TargetCPUUtilizationPercentage != nil { - in, out := &in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage - *out = new(int32) - **out = **in - } else { - out.TargetCPUUtilizationPercentage = nil - } - return nil - } -} - -func DeepCopy_v1_HorizontalPodAutoscalerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscalerStatus) - out := out.(*HorizontalPodAutoscalerStatus) - if in.ObservedGeneration != nil { - in, out := &in.ObservedGeneration, &out.ObservedGeneration - *out = new(int64) - **out = **in - } else { - out.ObservedGeneration = nil - } - if in.LastScaleTime != nil { - in, out := &in.LastScaleTime, &out.LastScaleTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.LastScaleTime = nil - } - out.CurrentReplicas = in.CurrentReplicas - out.DesiredReplicas = in.DesiredReplicas - if in.CurrentCPUUtilizationPercentage != nil { - in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage - *out = new(int32) - **out = **in - } else { - out.CurrentCPUUtilizationPercentage = nil - } - return nil - } -} - -func DeepCopy_v1_Scale(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Scale) - out := out.(*Scale) - out.TypeMeta = in.TypeMeta - if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Spec = in.Spec - out.Status = in.Status - return nil - } -} - -func DeepCopy_v1_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ScaleSpec) - out := out.(*ScaleSpec) - out.Replicas = in.Replicas - return nil - } -} - -func DeepCopy_v1_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ScaleStatus) - out := out.(*ScaleStatus) - out.Replicas = in.Replicas - out.Selector = in.Selector - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go deleted file mode 100644 index fd3adc42d95..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go +++ /dev/null @@ -1,186 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package autoscaling - -import ( - api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_CrossVersionObjectReference, InType: reflect.TypeOf(&CrossVersionObjectReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscaler, InType: reflect.TypeOf(&HorizontalPodAutoscaler{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscalerList, InType: reflect.TypeOf(&HorizontalPodAutoscalerList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscalerSpec, InType: reflect.TypeOf(&HorizontalPodAutoscalerSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscalerStatus, InType: reflect.TypeOf(&HorizontalPodAutoscalerStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_Scale, InType: reflect.TypeOf(&Scale{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_ScaleSpec, InType: reflect.TypeOf(&ScaleSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_ScaleStatus, InType: reflect.TypeOf(&ScaleStatus{})}, - ) -} - -func DeepCopy_autoscaling_CrossVersionObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CrossVersionObjectReference) - out := out.(*CrossVersionObjectReference) - out.Kind = in.Kind - out.Name = in.Name - out.APIVersion = in.APIVersion - return nil - } -} - -func DeepCopy_autoscaling_HorizontalPodAutoscaler(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscaler) - out := out.(*HorizontalPodAutoscaler) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_autoscaling_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_autoscaling_HorizontalPodAutoscalerList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscalerList) - out := out.(*HorizontalPodAutoscalerList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]HorizontalPodAutoscaler, len(*in)) - for i := range *in { - if err := DeepCopy_autoscaling_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_autoscaling_HorizontalPodAutoscalerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscalerSpec) - out := out.(*HorizontalPodAutoscalerSpec) - out.ScaleTargetRef = in.ScaleTargetRef - if in.MinReplicas != nil { - in, out := &in.MinReplicas, &out.MinReplicas - *out = new(int32) - **out = **in - } else { - out.MinReplicas = nil - } - out.MaxReplicas = in.MaxReplicas - if in.TargetCPUUtilizationPercentage != nil { - in, out := &in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage - *out = new(int32) - **out = **in - } else { - out.TargetCPUUtilizationPercentage = nil - } - return nil - } -} - -func DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscalerStatus) - out := out.(*HorizontalPodAutoscalerStatus) - if in.ObservedGeneration != nil { - in, out := &in.ObservedGeneration, &out.ObservedGeneration - *out = new(int64) - **out = **in - } else { - out.ObservedGeneration = nil - } - if in.LastScaleTime != nil { - in, out := &in.LastScaleTime, &out.LastScaleTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.LastScaleTime = nil - } - out.CurrentReplicas = in.CurrentReplicas - out.DesiredReplicas = in.DesiredReplicas - if in.CurrentCPUUtilizationPercentage != nil { - in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage - *out = new(int32) - **out = **in - } else { - out.CurrentCPUUtilizationPercentage = nil - } - return nil - } -} - -func DeepCopy_autoscaling_Scale(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Scale) - out := out.(*Scale) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Spec = in.Spec - out.Status = in.Status - return nil - } -} - -func DeepCopy_autoscaling_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ScaleSpec) - out := out.(*ScaleSpec) - out.Replicas = in.Replicas - return nil - } -} - -func DeepCopy_autoscaling_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ScaleStatus) - out := out.(*ScaleStatus) - out.Replicas = in.Replicas - out.Selector = in.Selector - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go deleted file mode 100644 index 8a9e4e8593f..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go +++ /dev/null @@ -1,182 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1 - -import ( - unversioned "k8s.io/client-go/pkg/api/unversioned" - api_v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Job, InType: reflect.TypeOf(&Job{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobCondition, InType: reflect.TypeOf(&JobCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobList, InType: reflect.TypeOf(&JobList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobSpec, InType: reflect.TypeOf(&JobSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobStatus, InType: reflect.TypeOf(&JobStatus{})}, - ) -} - -func DeepCopy_v1_Job(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Job) - out := out.(*Job) - out.TypeMeta = in.TypeMeta - if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1_JobSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1_JobStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobCondition) - out := out.(*JobCondition) - out.Type = in.Type - out.Status = in.Status - out.LastProbeTime = in.LastProbeTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1_JobList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobList) - out := out.(*JobList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Job, len(*in)) - for i := range *in { - if err := DeepCopy_v1_Job(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobSpec) - out := out.(*JobSpec) - if in.Parallelism != nil { - in, out := &in.Parallelism, &out.Parallelism - *out = new(int32) - **out = **in - } else { - out.Parallelism = nil - } - if in.Completions != nil { - in, out := &in.Completions, &out.Completions - *out = new(int32) - **out = **in - } else { - out.Completions = nil - } - if in.ActiveDeadlineSeconds != nil { - in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds - *out = new(int64) - **out = **in - } else { - out.ActiveDeadlineSeconds = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if in.ManualSelector != nil { - in, out := &in.ManualSelector, &out.ManualSelector - *out = new(bool) - **out = **in - } else { - out.ManualSelector = nil - } - if err := api_v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobStatus) - out := out.(*JobStatus) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]JobCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v1_JobCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.StartTime != nil { - in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.StartTime = nil - } - if in.CompletionTime != nil { - in, out := &in.CompletionTime, &out.CompletionTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.CompletionTime = nil - } - out.Active = in.Active - out.Succeeded = in.Succeeded - out.Failed = in.Failed - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go deleted file mode 100644 index 572c2cd2600..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go +++ /dev/null @@ -1,307 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v2alpha1 - -import ( - unversioned "k8s.io/client-go/pkg/api/unversioned" - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_CronJob, InType: reflect.TypeOf(&CronJob{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_CronJobList, InType: reflect.TypeOf(&CronJobList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_CronJobSpec, InType: reflect.TypeOf(&CronJobSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_CronJobStatus, InType: reflect.TypeOf(&CronJobStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_Job, InType: reflect.TypeOf(&Job{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobCondition, InType: reflect.TypeOf(&JobCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobList, InType: reflect.TypeOf(&JobList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobSpec, InType: reflect.TypeOf(&JobSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobStatus, InType: reflect.TypeOf(&JobStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobTemplate, InType: reflect.TypeOf(&JobTemplate{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobTemplateSpec, InType: reflect.TypeOf(&JobTemplateSpec{})}, - ) -} - -func DeepCopy_v2alpha1_CronJob(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CronJob) - out := out.(*CronJob) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v2alpha1_CronJobSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v2alpha1_CronJobStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v2alpha1_CronJobList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CronJobList) - out := out.(*CronJobList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CronJob, len(*in)) - for i := range *in { - if err := DeepCopy_v2alpha1_CronJob(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v2alpha1_CronJobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CronJobSpec) - out := out.(*CronJobSpec) - out.Schedule = in.Schedule - if in.StartingDeadlineSeconds != nil { - in, out := &in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds - *out = new(int64) - **out = **in - } else { - out.StartingDeadlineSeconds = nil - } - out.ConcurrencyPolicy = in.ConcurrencyPolicy - if in.Suspend != nil { - in, out := &in.Suspend, &out.Suspend - *out = new(bool) - **out = **in - } else { - out.Suspend = nil - } - if err := DeepCopy_v2alpha1_JobTemplateSpec(&in.JobTemplate, &out.JobTemplate, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v2alpha1_CronJobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CronJobStatus) - out := out.(*CronJobStatus) - if in.Active != nil { - in, out := &in.Active, &out.Active - *out = make([]v1.ObjectReference, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Active = nil - } - if in.LastScheduleTime != nil { - in, out := &in.LastScheduleTime, &out.LastScheduleTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.LastScheduleTime = nil - } - return nil - } -} - -func DeepCopy_v2alpha1_Job(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Job) - out := out.(*Job) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v2alpha1_JobSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v2alpha1_JobStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v2alpha1_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobCondition) - out := out.(*JobCondition) - out.Type = in.Type - out.Status = in.Status - out.LastProbeTime = in.LastProbeTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v2alpha1_JobList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobList) - out := out.(*JobList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Job, len(*in)) - for i := range *in { - if err := DeepCopy_v2alpha1_Job(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v2alpha1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobSpec) - out := out.(*JobSpec) - if in.Parallelism != nil { - in, out := &in.Parallelism, &out.Parallelism - *out = new(int32) - **out = **in - } else { - out.Parallelism = nil - } - if in.Completions != nil { - in, out := &in.Completions, &out.Completions - *out = new(int32) - **out = **in - } else { - out.Completions = nil - } - if in.ActiveDeadlineSeconds != nil { - in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds - *out = new(int64) - **out = **in - } else { - out.ActiveDeadlineSeconds = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if in.ManualSelector != nil { - in, out := &in.ManualSelector, &out.ManualSelector - *out = new(bool) - **out = **in - } else { - out.ManualSelector = nil - } - if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v2alpha1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobStatus) - out := out.(*JobStatus) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]JobCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v2alpha1_JobCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.StartTime != nil { - in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.StartTime = nil - } - if in.CompletionTime != nil { - in, out := &in.CompletionTime, &out.CompletionTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.CompletionTime = nil - } - out.Active = in.Active - out.Succeeded = in.Succeeded - out.Failed = in.Failed - return nil - } -} - -func DeepCopy_v2alpha1_JobTemplate(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobTemplate) - out := out.(*JobTemplate) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v2alpha1_JobTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v2alpha1_JobTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobTemplateSpec) - out := out.(*JobTemplateSpec) - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v2alpha1_JobSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go deleted file mode 100644 index 73c89eb565c..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go +++ /dev/null @@ -1,307 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package batch - -import ( - api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_CronJob, InType: reflect.TypeOf(&CronJob{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_CronJobList, InType: reflect.TypeOf(&CronJobList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_CronJobSpec, InType: reflect.TypeOf(&CronJobSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_CronJobStatus, InType: reflect.TypeOf(&CronJobStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_Job, InType: reflect.TypeOf(&Job{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobCondition, InType: reflect.TypeOf(&JobCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobList, InType: reflect.TypeOf(&JobList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobSpec, InType: reflect.TypeOf(&JobSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobStatus, InType: reflect.TypeOf(&JobStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobTemplate, InType: reflect.TypeOf(&JobTemplate{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobTemplateSpec, InType: reflect.TypeOf(&JobTemplateSpec{})}, - ) -} - -func DeepCopy_batch_CronJob(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CronJob) - out := out.(*CronJob) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_batch_CronJobSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_batch_CronJobStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_batch_CronJobList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CronJobList) - out := out.(*CronJobList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CronJob, len(*in)) - for i := range *in { - if err := DeepCopy_batch_CronJob(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_batch_CronJobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CronJobSpec) - out := out.(*CronJobSpec) - out.Schedule = in.Schedule - if in.StartingDeadlineSeconds != nil { - in, out := &in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds - *out = new(int64) - **out = **in - } else { - out.StartingDeadlineSeconds = nil - } - out.ConcurrencyPolicy = in.ConcurrencyPolicy - if in.Suspend != nil { - in, out := &in.Suspend, &out.Suspend - *out = new(bool) - **out = **in - } else { - out.Suspend = nil - } - if err := DeepCopy_batch_JobTemplateSpec(&in.JobTemplate, &out.JobTemplate, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_batch_CronJobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CronJobStatus) - out := out.(*CronJobStatus) - if in.Active != nil { - in, out := &in.Active, &out.Active - *out = make([]api.ObjectReference, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Active = nil - } - if in.LastScheduleTime != nil { - in, out := &in.LastScheduleTime, &out.LastScheduleTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.LastScheduleTime = nil - } - return nil - } -} - -func DeepCopy_batch_Job(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Job) - out := out.(*Job) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_batch_JobSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_batch_JobStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_batch_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobCondition) - out := out.(*JobCondition) - out.Type = in.Type - out.Status = in.Status - out.LastProbeTime = in.LastProbeTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_batch_JobList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobList) - out := out.(*JobList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Job, len(*in)) - for i := range *in { - if err := DeepCopy_batch_Job(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_batch_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobSpec) - out := out.(*JobSpec) - if in.Parallelism != nil { - in, out := &in.Parallelism, &out.Parallelism - *out = new(int32) - **out = **in - } else { - out.Parallelism = nil - } - if in.Completions != nil { - in, out := &in.Completions, &out.Completions - *out = new(int32) - **out = **in - } else { - out.Completions = nil - } - if in.ActiveDeadlineSeconds != nil { - in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds - *out = new(int64) - **out = **in - } else { - out.ActiveDeadlineSeconds = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if in.ManualSelector != nil { - in, out := &in.ManualSelector, &out.ManualSelector - *out = new(bool) - **out = **in - } else { - out.ManualSelector = nil - } - if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_batch_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobStatus) - out := out.(*JobStatus) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]JobCondition, len(*in)) - for i := range *in { - if err := DeepCopy_batch_JobCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.StartTime != nil { - in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.StartTime = nil - } - if in.CompletionTime != nil { - in, out := &in.CompletionTime, &out.CompletionTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.CompletionTime = nil - } - out.Active = in.Active - out.Succeeded = in.Succeeded - out.Failed = in.Failed - return nil - } -} - -func DeepCopy_batch_JobTemplate(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobTemplate) - out := out.(*JobTemplate) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_batch_JobTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_batch_JobTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobTemplateSpec) - out := out.(*JobTemplateSpec) - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_batch_JobSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go deleted file mode 100644 index f6991dff34f..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go +++ /dev/null @@ -1,145 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1alpha1 - -import ( - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequest, InType: reflect.TypeOf(&CertificateSigningRequest{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestCondition, InType: reflect.TypeOf(&CertificateSigningRequestCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestList, InType: reflect.TypeOf(&CertificateSigningRequestList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestSpec, InType: reflect.TypeOf(&CertificateSigningRequestSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestStatus, InType: reflect.TypeOf(&CertificateSigningRequestStatus{})}, - ) -} - -func DeepCopy_v1alpha1_CertificateSigningRequest(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequest) - out := out.(*CertificateSigningRequest) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1alpha1_CertificateSigningRequestSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1alpha1_CertificateSigningRequestStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1alpha1_CertificateSigningRequestCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequestCondition) - out := out.(*CertificateSigningRequestCondition) - out.Type = in.Type - out.Reason = in.Reason - out.Message = in.Message - out.LastUpdateTime = in.LastUpdateTime.DeepCopy() - return nil - } -} - -func DeepCopy_v1alpha1_CertificateSigningRequestList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequestList) - out := out.(*CertificateSigningRequestList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CertificateSigningRequest, len(*in)) - for i := range *in { - if err := DeepCopy_v1alpha1_CertificateSigningRequest(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_CertificateSigningRequestSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequestSpec) - out := out.(*CertificateSigningRequestSpec) - if in.Request != nil { - in, out := &in.Request, &out.Request - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Request = nil - } - out.Username = in.Username - out.UID = in.UID - if in.Groups != nil { - in, out := &in.Groups, &out.Groups - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Groups = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_CertificateSigningRequestStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequestStatus) - out := out.(*CertificateSigningRequestStatus) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]CertificateSigningRequestCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v1alpha1_CertificateSigningRequestCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.Certificate != nil { - in, out := &in.Certificate, &out.Certificate - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Certificate = nil - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go deleted file mode 100644 index 6b4580c01cd..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go +++ /dev/null @@ -1,145 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package certificates - -import ( - api "k8s.io/client-go/pkg/api" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequest, InType: reflect.TypeOf(&CertificateSigningRequest{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestCondition, InType: reflect.TypeOf(&CertificateSigningRequestCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestList, InType: reflect.TypeOf(&CertificateSigningRequestList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestSpec, InType: reflect.TypeOf(&CertificateSigningRequestSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestStatus, InType: reflect.TypeOf(&CertificateSigningRequestStatus{})}, - ) -} - -func DeepCopy_certificates_CertificateSigningRequest(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequest) - out := out.(*CertificateSigningRequest) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_certificates_CertificateSigningRequestSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_certificates_CertificateSigningRequestStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_certificates_CertificateSigningRequestCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequestCondition) - out := out.(*CertificateSigningRequestCondition) - out.Type = in.Type - out.Reason = in.Reason - out.Message = in.Message - out.LastUpdateTime = in.LastUpdateTime.DeepCopy() - return nil - } -} - -func DeepCopy_certificates_CertificateSigningRequestList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequestList) - out := out.(*CertificateSigningRequestList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CertificateSigningRequest, len(*in)) - for i := range *in { - if err := DeepCopy_certificates_CertificateSigningRequest(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_certificates_CertificateSigningRequestSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequestSpec) - out := out.(*CertificateSigningRequestSpec) - if in.Request != nil { - in, out := &in.Request, &out.Request - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Request = nil - } - out.Username = in.Username - out.UID = in.UID - if in.Groups != nil { - in, out := &in.Groups, &out.Groups - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Groups = nil - } - return nil - } -} - -func DeepCopy_certificates_CertificateSigningRequestStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CertificateSigningRequestStatus) - out := out.(*CertificateSigningRequestStatus) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]CertificateSigningRequestCondition, len(*in)) - for i := range *in { - if err := DeepCopy_certificates_CertificateSigningRequestCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.Certificate != nil { - in, out := &in.Certificate, &out.Certificate - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Certificate = nil - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go deleted file mode 100644 index fd13c984931..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go +++ /dev/null @@ -1,521 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1alpha1 - -import ( - reflect "reflect" - - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeProxyConfiguration, InType: reflect.TypeOf(&KubeProxyConfiguration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeSchedulerConfiguration, InType: reflect.TypeOf(&KubeSchedulerConfiguration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletAnonymousAuthentication, InType: reflect.TypeOf(&KubeletAnonymousAuthentication{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletAuthentication, InType: reflect.TypeOf(&KubeletAuthentication{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletAuthorization, InType: reflect.TypeOf(&KubeletAuthorization{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletConfiguration, InType: reflect.TypeOf(&KubeletConfiguration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletWebhookAuthentication, InType: reflect.TypeOf(&KubeletWebhookAuthentication{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletWebhookAuthorization, InType: reflect.TypeOf(&KubeletWebhookAuthorization{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletX509Authentication, InType: reflect.TypeOf(&KubeletX509Authentication{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_LeaderElectionConfiguration, InType: reflect.TypeOf(&LeaderElectionConfiguration{})}, - ) -} - -func DeepCopy_v1alpha1_KubeProxyConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeProxyConfiguration) - out := out.(*KubeProxyConfiguration) - out.TypeMeta = in.TypeMeta - out.BindAddress = in.BindAddress - out.ClusterCIDR = in.ClusterCIDR - out.HealthzBindAddress = in.HealthzBindAddress - out.HealthzPort = in.HealthzPort - out.HostnameOverride = in.HostnameOverride - if in.IPTablesMasqueradeBit != nil { - in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit - *out = new(int32) - **out = **in - } else { - out.IPTablesMasqueradeBit = nil - } - out.IPTablesSyncPeriod = in.IPTablesSyncPeriod - out.IPTablesMinSyncPeriod = in.IPTablesMinSyncPeriod - out.KubeconfigPath = in.KubeconfigPath - out.MasqueradeAll = in.MasqueradeAll - out.Master = in.Master - if in.OOMScoreAdj != nil { - in, out := &in.OOMScoreAdj, &out.OOMScoreAdj - *out = new(int32) - **out = **in - } else { - out.OOMScoreAdj = nil - } - out.Mode = in.Mode - out.PortRange = in.PortRange - out.ResourceContainer = in.ResourceContainer - out.UDPIdleTimeout = in.UDPIdleTimeout - out.ConntrackMax = in.ConntrackMax - out.ConntrackMaxPerCore = in.ConntrackMaxPerCore - out.ConntrackMin = in.ConntrackMin - out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout - out.ConntrackTCPCloseWaitTimeout = in.ConntrackTCPCloseWaitTimeout - return nil - } -} - -func DeepCopy_v1alpha1_KubeSchedulerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeSchedulerConfiguration) - out := out.(*KubeSchedulerConfiguration) - out.TypeMeta = in.TypeMeta - out.Port = in.Port - out.Address = in.Address - out.AlgorithmProvider = in.AlgorithmProvider - out.PolicyConfigFile = in.PolicyConfigFile - if in.EnableProfiling != nil { - in, out := &in.EnableProfiling, &out.EnableProfiling - *out = new(bool) - **out = **in - } else { - out.EnableProfiling = nil - } - out.ContentType = in.ContentType - out.KubeAPIQPS = in.KubeAPIQPS - out.KubeAPIBurst = in.KubeAPIBurst - out.SchedulerName = in.SchedulerName - out.HardPodAffinitySymmetricWeight = in.HardPodAffinitySymmetricWeight - out.FailureDomains = in.FailureDomains - if err := DeepCopy_v1alpha1_LeaderElectionConfiguration(&in.LeaderElection, &out.LeaderElection, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1alpha1_KubeletAnonymousAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletAnonymousAuthentication) - out := out.(*KubeletAnonymousAuthentication) - if in.Enabled != nil { - in, out := &in.Enabled, &out.Enabled - *out = new(bool) - **out = **in - } else { - out.Enabled = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_KubeletAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletAuthentication) - out := out.(*KubeletAuthentication) - out.X509 = in.X509 - if err := DeepCopy_v1alpha1_KubeletWebhookAuthentication(&in.Webhook, &out.Webhook, c); err != nil { - return err - } - if err := DeepCopy_v1alpha1_KubeletAnonymousAuthentication(&in.Anonymous, &out.Anonymous, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1alpha1_KubeletAuthorization(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletAuthorization) - out := out.(*KubeletAuthorization) - out.Mode = in.Mode - out.Webhook = in.Webhook - return nil - } -} - -func DeepCopy_v1alpha1_KubeletConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletConfiguration) - out := out.(*KubeletConfiguration) - out.TypeMeta = in.TypeMeta - out.PodManifestPath = in.PodManifestPath - out.SyncFrequency = in.SyncFrequency - out.FileCheckFrequency = in.FileCheckFrequency - out.HTTPCheckFrequency = in.HTTPCheckFrequency - out.ManifestURL = in.ManifestURL - out.ManifestURLHeader = in.ManifestURLHeader - if in.EnableServer != nil { - in, out := &in.EnableServer, &out.EnableServer - *out = new(bool) - **out = **in - } else { - out.EnableServer = nil - } - out.Address = in.Address - out.Port = in.Port - out.ReadOnlyPort = in.ReadOnlyPort - out.TLSCertFile = in.TLSCertFile - out.TLSPrivateKeyFile = in.TLSPrivateKeyFile - out.CertDirectory = in.CertDirectory - if err := DeepCopy_v1alpha1_KubeletAuthentication(&in.Authentication, &out.Authentication, c); err != nil { - return err - } - out.Authorization = in.Authorization - out.HostnameOverride = in.HostnameOverride - out.PodInfraContainerImage = in.PodInfraContainerImage - out.DockerEndpoint = in.DockerEndpoint - out.RootDirectory = in.RootDirectory - out.SeccompProfileRoot = in.SeccompProfileRoot - if in.AllowPrivileged != nil { - in, out := &in.AllowPrivileged, &out.AllowPrivileged - *out = new(bool) - **out = **in - } else { - out.AllowPrivileged = nil - } - if in.HostNetworkSources != nil { - in, out := &in.HostNetworkSources, &out.HostNetworkSources - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.HostNetworkSources = nil - } - if in.HostPIDSources != nil { - in, out := &in.HostPIDSources, &out.HostPIDSources - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.HostPIDSources = nil - } - if in.HostIPCSources != nil { - in, out := &in.HostIPCSources, &out.HostIPCSources - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.HostIPCSources = nil - } - if in.RegistryPullQPS != nil { - in, out := &in.RegistryPullQPS, &out.RegistryPullQPS - *out = new(int32) - **out = **in - } else { - out.RegistryPullQPS = nil - } - out.RegistryBurst = in.RegistryBurst - if in.EventRecordQPS != nil { - in, out := &in.EventRecordQPS, &out.EventRecordQPS - *out = new(int32) - **out = **in - } else { - out.EventRecordQPS = nil - } - out.EventBurst = in.EventBurst - if in.EnableDebuggingHandlers != nil { - in, out := &in.EnableDebuggingHandlers, &out.EnableDebuggingHandlers - *out = new(bool) - **out = **in - } else { - out.EnableDebuggingHandlers = nil - } - out.MinimumGCAge = in.MinimumGCAge - out.MaxPerPodContainerCount = in.MaxPerPodContainerCount - if in.MaxContainerCount != nil { - in, out := &in.MaxContainerCount, &out.MaxContainerCount - *out = new(int32) - **out = **in - } else { - out.MaxContainerCount = nil - } - out.CAdvisorPort = in.CAdvisorPort - out.HealthzPort = in.HealthzPort - out.HealthzBindAddress = in.HealthzBindAddress - if in.OOMScoreAdj != nil { - in, out := &in.OOMScoreAdj, &out.OOMScoreAdj - *out = new(int32) - **out = **in - } else { - out.OOMScoreAdj = nil - } - if in.RegisterNode != nil { - in, out := &in.RegisterNode, &out.RegisterNode - *out = new(bool) - **out = **in - } else { - out.RegisterNode = nil - } - out.ClusterDomain = in.ClusterDomain - out.MasterServiceNamespace = in.MasterServiceNamespace - out.ClusterDNS = in.ClusterDNS - out.StreamingConnectionIdleTimeout = in.StreamingConnectionIdleTimeout - out.NodeStatusUpdateFrequency = in.NodeStatusUpdateFrequency - out.ImageMinimumGCAge = in.ImageMinimumGCAge - if in.ImageGCHighThresholdPercent != nil { - in, out := &in.ImageGCHighThresholdPercent, &out.ImageGCHighThresholdPercent - *out = new(int32) - **out = **in - } else { - out.ImageGCHighThresholdPercent = nil - } - if in.ImageGCLowThresholdPercent != nil { - in, out := &in.ImageGCLowThresholdPercent, &out.ImageGCLowThresholdPercent - *out = new(int32) - **out = **in - } else { - out.ImageGCLowThresholdPercent = nil - } - out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB - out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod - out.NetworkPluginName = in.NetworkPluginName - out.NetworkPluginDir = in.NetworkPluginDir - out.CNIConfDir = in.CNIConfDir - out.CNIBinDir = in.CNIBinDir - out.NetworkPluginMTU = in.NetworkPluginMTU - out.VolumePluginDir = in.VolumePluginDir - out.CloudProvider = in.CloudProvider - out.CloudConfigFile = in.CloudConfigFile - out.KubeletCgroups = in.KubeletCgroups - out.RuntimeCgroups = in.RuntimeCgroups - out.SystemCgroups = in.SystemCgroups - out.CgroupRoot = in.CgroupRoot - if in.ExperimentalCgroupsPerQOS != nil { - in, out := &in.ExperimentalCgroupsPerQOS, &out.ExperimentalCgroupsPerQOS - *out = new(bool) - **out = **in - } else { - out.ExperimentalCgroupsPerQOS = nil - } - out.CgroupDriver = in.CgroupDriver - out.ContainerRuntime = in.ContainerRuntime - out.RemoteRuntimeEndpoint = in.RemoteRuntimeEndpoint - out.RemoteImageEndpoint = in.RemoteImageEndpoint - out.RuntimeRequestTimeout = in.RuntimeRequestTimeout - out.RktPath = in.RktPath - out.ExperimentalMounterPath = in.ExperimentalMounterPath - out.RktAPIEndpoint = in.RktAPIEndpoint - out.RktStage1Image = in.RktStage1Image - if in.LockFilePath != nil { - in, out := &in.LockFilePath, &out.LockFilePath - *out = new(string) - **out = **in - } else { - out.LockFilePath = nil - } - out.ExitOnLockContention = in.ExitOnLockContention - out.HairpinMode = in.HairpinMode - out.BabysitDaemons = in.BabysitDaemons - out.MaxPods = in.MaxPods - out.NvidiaGPUs = in.NvidiaGPUs - out.DockerExecHandlerName = in.DockerExecHandlerName - out.PodCIDR = in.PodCIDR - out.ResolverConfig = in.ResolverConfig - if in.CPUCFSQuota != nil { - in, out := &in.CPUCFSQuota, &out.CPUCFSQuota - *out = new(bool) - **out = **in - } else { - out.CPUCFSQuota = nil - } - if in.Containerized != nil { - in, out := &in.Containerized, &out.Containerized - *out = new(bool) - **out = **in - } else { - out.Containerized = nil - } - out.MaxOpenFiles = in.MaxOpenFiles - if in.ReconcileCIDR != nil { - in, out := &in.ReconcileCIDR, &out.ReconcileCIDR - *out = new(bool) - **out = **in - } else { - out.ReconcileCIDR = nil - } - if in.RegisterSchedulable != nil { - in, out := &in.RegisterSchedulable, &out.RegisterSchedulable - *out = new(bool) - **out = **in - } else { - out.RegisterSchedulable = nil - } - out.ContentType = in.ContentType - if in.KubeAPIQPS != nil { - in, out := &in.KubeAPIQPS, &out.KubeAPIQPS - *out = new(int32) - **out = **in - } else { - out.KubeAPIQPS = nil - } - out.KubeAPIBurst = in.KubeAPIBurst - if in.SerializeImagePulls != nil { - in, out := &in.SerializeImagePulls, &out.SerializeImagePulls - *out = new(bool) - **out = **in - } else { - out.SerializeImagePulls = nil - } - out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency - out.NodeIP = in.NodeIP - if in.NodeLabels != nil { - in, out := &in.NodeLabels, &out.NodeLabels - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.NodeLabels = nil - } - out.NonMasqueradeCIDR = in.NonMasqueradeCIDR - out.EnableCustomMetrics = in.EnableCustomMetrics - if in.EvictionHard != nil { - in, out := &in.EvictionHard, &out.EvictionHard - *out = new(string) - **out = **in - } else { - out.EvictionHard = nil - } - out.EvictionSoft = in.EvictionSoft - out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod - out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod - out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod - out.EvictionMinimumReclaim = in.EvictionMinimumReclaim - out.PodsPerCore = in.PodsPerCore - if in.EnableControllerAttachDetach != nil { - in, out := &in.EnableControllerAttachDetach, &out.EnableControllerAttachDetach - *out = new(bool) - **out = **in - } else { - out.EnableControllerAttachDetach = nil - } - if in.SystemReserved != nil { - in, out := &in.SystemReserved, &out.SystemReserved - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.SystemReserved = nil - } - if in.KubeReserved != nil { - in, out := &in.KubeReserved, &out.KubeReserved - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.KubeReserved = nil - } - out.ProtectKernelDefaults = in.ProtectKernelDefaults - if in.MakeIPTablesUtilChains != nil { - in, out := &in.MakeIPTablesUtilChains, &out.MakeIPTablesUtilChains - *out = new(bool) - **out = **in - } else { - out.MakeIPTablesUtilChains = nil - } - if in.IPTablesMasqueradeBit != nil { - in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit - *out = new(int32) - **out = **in - } else { - out.IPTablesMasqueradeBit = nil - } - if in.IPTablesDropBit != nil { - in, out := &in.IPTablesDropBit, &out.IPTablesDropBit - *out = new(int32) - **out = **in - } else { - out.IPTablesDropBit = nil - } - if in.AllowedUnsafeSysctls != nil { - in, out := &in.AllowedUnsafeSysctls, &out.AllowedUnsafeSysctls - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.AllowedUnsafeSysctls = nil - } - out.FeatureGates = in.FeatureGates - out.EnableCRI = in.EnableCRI - out.ExperimentalFailSwapOn = in.ExperimentalFailSwapOn - out.ExperimentalCheckNodeCapabilitiesBeforeMount = in.ExperimentalCheckNodeCapabilitiesBeforeMount - return nil - } -} - -func DeepCopy_v1alpha1_KubeletWebhookAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletWebhookAuthentication) - out := out.(*KubeletWebhookAuthentication) - if in.Enabled != nil { - in, out := &in.Enabled, &out.Enabled - *out = new(bool) - **out = **in - } else { - out.Enabled = nil - } - out.CacheTTL = in.CacheTTL - return nil - } -} - -func DeepCopy_v1alpha1_KubeletWebhookAuthorization(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletWebhookAuthorization) - out := out.(*KubeletWebhookAuthorization) - out.CacheAuthorizedTTL = in.CacheAuthorizedTTL - out.CacheUnauthorizedTTL = in.CacheUnauthorizedTTL - return nil - } -} - -func DeepCopy_v1alpha1_KubeletX509Authentication(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletX509Authentication) - out := out.(*KubeletX509Authentication) - out.ClientCAFile = in.ClientCAFile - return nil - } -} - -func DeepCopy_v1alpha1_LeaderElectionConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LeaderElectionConfiguration) - out := out.(*LeaderElectionConfiguration) - if in.LeaderElect != nil { - in, out := &in.LeaderElect, &out.LeaderElect - *out = new(bool) - **out = **in - } else { - out.LeaderElect = nil - } - out.LeaseDuration = in.LeaseDuration - out.RenewDeadline = in.RenewDeadline - out.RetryPeriod = in.RetryPeriod - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go deleted file mode 100644 index f8a6404eed9..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go +++ /dev/null @@ -1,481 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package componentconfig - -import ( - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - config "k8s.io/client-go/pkg/util/config" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_IPVar, InType: reflect.TypeOf(&IPVar{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeControllerManagerConfiguration, InType: reflect.TypeOf(&KubeControllerManagerConfiguration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeProxyConfiguration, InType: reflect.TypeOf(&KubeProxyConfiguration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeSchedulerConfiguration, InType: reflect.TypeOf(&KubeSchedulerConfiguration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletAnonymousAuthentication, InType: reflect.TypeOf(&KubeletAnonymousAuthentication{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletAuthentication, InType: reflect.TypeOf(&KubeletAuthentication{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletAuthorization, InType: reflect.TypeOf(&KubeletAuthorization{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletConfiguration, InType: reflect.TypeOf(&KubeletConfiguration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletWebhookAuthentication, InType: reflect.TypeOf(&KubeletWebhookAuthentication{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletWebhookAuthorization, InType: reflect.TypeOf(&KubeletWebhookAuthorization{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletX509Authentication, InType: reflect.TypeOf(&KubeletX509Authentication{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_LeaderElectionConfiguration, InType: reflect.TypeOf(&LeaderElectionConfiguration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_PersistentVolumeRecyclerConfiguration, InType: reflect.TypeOf(&PersistentVolumeRecyclerConfiguration{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_PortRangeVar, InType: reflect.TypeOf(&PortRangeVar{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_VolumeConfiguration, InType: reflect.TypeOf(&VolumeConfiguration{})}, - ) -} - -func DeepCopy_componentconfig_IPVar(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IPVar) - out := out.(*IPVar) - if in.Val != nil { - in, out := &in.Val, &out.Val - *out = new(string) - **out = **in - } else { - out.Val = nil - } - return nil - } -} - -func DeepCopy_componentconfig_KubeControllerManagerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeControllerManagerConfiguration) - out := out.(*KubeControllerManagerConfiguration) - out.TypeMeta = in.TypeMeta - out.Port = in.Port - out.Address = in.Address - out.UseServiceAccountCredentials = in.UseServiceAccountCredentials - out.CloudProvider = in.CloudProvider - out.CloudConfigFile = in.CloudConfigFile - out.ConcurrentEndpointSyncs = in.ConcurrentEndpointSyncs - out.ConcurrentRSSyncs = in.ConcurrentRSSyncs - out.ConcurrentRCSyncs = in.ConcurrentRCSyncs - out.ConcurrentServiceSyncs = in.ConcurrentServiceSyncs - out.ConcurrentResourceQuotaSyncs = in.ConcurrentResourceQuotaSyncs - out.ConcurrentDeploymentSyncs = in.ConcurrentDeploymentSyncs - out.ConcurrentDaemonSetSyncs = in.ConcurrentDaemonSetSyncs - out.ConcurrentJobSyncs = in.ConcurrentJobSyncs - out.ConcurrentNamespaceSyncs = in.ConcurrentNamespaceSyncs - out.ConcurrentSATokenSyncs = in.ConcurrentSATokenSyncs - out.LookupCacheSizeForRC = in.LookupCacheSizeForRC - out.LookupCacheSizeForRS = in.LookupCacheSizeForRS - out.LookupCacheSizeForDaemonSet = in.LookupCacheSizeForDaemonSet - out.ServiceSyncPeriod = in.ServiceSyncPeriod - out.NodeSyncPeriod = in.NodeSyncPeriod - out.RouteReconciliationPeriod = in.RouteReconciliationPeriod - out.ResourceQuotaSyncPeriod = in.ResourceQuotaSyncPeriod - out.NamespaceSyncPeriod = in.NamespaceSyncPeriod - out.PVClaimBinderSyncPeriod = in.PVClaimBinderSyncPeriod - out.MinResyncPeriod = in.MinResyncPeriod - out.TerminatedPodGCThreshold = in.TerminatedPodGCThreshold - out.HorizontalPodAutoscalerSyncPeriod = in.HorizontalPodAutoscalerSyncPeriod - out.DeploymentControllerSyncPeriod = in.DeploymentControllerSyncPeriod - out.PodEvictionTimeout = in.PodEvictionTimeout - out.DeletingPodsQps = in.DeletingPodsQps - out.DeletingPodsBurst = in.DeletingPodsBurst - out.NodeMonitorGracePeriod = in.NodeMonitorGracePeriod - out.RegisterRetryCount = in.RegisterRetryCount - out.NodeStartupGracePeriod = in.NodeStartupGracePeriod - out.NodeMonitorPeriod = in.NodeMonitorPeriod - out.ServiceAccountKeyFile = in.ServiceAccountKeyFile - out.ClusterSigningCertFile = in.ClusterSigningCertFile - out.ClusterSigningKeyFile = in.ClusterSigningKeyFile - out.ApproveAllKubeletCSRsForGroup = in.ApproveAllKubeletCSRsForGroup - out.EnableProfiling = in.EnableProfiling - out.ClusterName = in.ClusterName - out.ClusterCIDR = in.ClusterCIDR - out.ServiceCIDR = in.ServiceCIDR - out.NodeCIDRMaskSize = in.NodeCIDRMaskSize - out.AllocateNodeCIDRs = in.AllocateNodeCIDRs - out.ConfigureCloudRoutes = in.ConfigureCloudRoutes - out.RootCAFile = in.RootCAFile - out.ContentType = in.ContentType - out.KubeAPIQPS = in.KubeAPIQPS - out.KubeAPIBurst = in.KubeAPIBurst - out.LeaderElection = in.LeaderElection - out.VolumeConfiguration = in.VolumeConfiguration - out.ControllerStartInterval = in.ControllerStartInterval - out.EnableGarbageCollector = in.EnableGarbageCollector - out.ConcurrentGCSyncs = in.ConcurrentGCSyncs - out.NodeEvictionRate = in.NodeEvictionRate - out.SecondaryNodeEvictionRate = in.SecondaryNodeEvictionRate - out.LargeClusterSizeThreshold = in.LargeClusterSizeThreshold - out.UnhealthyZoneThreshold = in.UnhealthyZoneThreshold - return nil - } -} - -func DeepCopy_componentconfig_KubeProxyConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeProxyConfiguration) - out := out.(*KubeProxyConfiguration) - out.TypeMeta = in.TypeMeta - out.BindAddress = in.BindAddress - out.ClusterCIDR = in.ClusterCIDR - out.HealthzBindAddress = in.HealthzBindAddress - out.HealthzPort = in.HealthzPort - out.HostnameOverride = in.HostnameOverride - if in.IPTablesMasqueradeBit != nil { - in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit - *out = new(int32) - **out = **in - } else { - out.IPTablesMasqueradeBit = nil - } - out.IPTablesSyncPeriod = in.IPTablesSyncPeriod - out.IPTablesMinSyncPeriod = in.IPTablesMinSyncPeriod - out.KubeconfigPath = in.KubeconfigPath - out.MasqueradeAll = in.MasqueradeAll - out.Master = in.Master - if in.OOMScoreAdj != nil { - in, out := &in.OOMScoreAdj, &out.OOMScoreAdj - *out = new(int32) - **out = **in - } else { - out.OOMScoreAdj = nil - } - out.Mode = in.Mode - out.PortRange = in.PortRange - out.ResourceContainer = in.ResourceContainer - out.UDPIdleTimeout = in.UDPIdleTimeout - out.ConntrackMax = in.ConntrackMax - out.ConntrackMaxPerCore = in.ConntrackMaxPerCore - out.ConntrackMin = in.ConntrackMin - out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout - out.ConntrackTCPCloseWaitTimeout = in.ConntrackTCPCloseWaitTimeout - return nil - } -} - -func DeepCopy_componentconfig_KubeSchedulerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeSchedulerConfiguration) - out := out.(*KubeSchedulerConfiguration) - out.TypeMeta = in.TypeMeta - out.Port = in.Port - out.Address = in.Address - out.AlgorithmProvider = in.AlgorithmProvider - out.PolicyConfigFile = in.PolicyConfigFile - out.EnableProfiling = in.EnableProfiling - out.ContentType = in.ContentType - out.KubeAPIQPS = in.KubeAPIQPS - out.KubeAPIBurst = in.KubeAPIBurst - out.SchedulerName = in.SchedulerName - out.HardPodAffinitySymmetricWeight = in.HardPodAffinitySymmetricWeight - out.FailureDomains = in.FailureDomains - out.LeaderElection = in.LeaderElection - return nil - } -} - -func DeepCopy_componentconfig_KubeletAnonymousAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletAnonymousAuthentication) - out := out.(*KubeletAnonymousAuthentication) - out.Enabled = in.Enabled - return nil - } -} - -func DeepCopy_componentconfig_KubeletAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletAuthentication) - out := out.(*KubeletAuthentication) - out.X509 = in.X509 - out.Webhook = in.Webhook - out.Anonymous = in.Anonymous - return nil - } -} - -func DeepCopy_componentconfig_KubeletAuthorization(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletAuthorization) - out := out.(*KubeletAuthorization) - out.Mode = in.Mode - out.Webhook = in.Webhook - return nil - } -} - -func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletConfiguration) - out := out.(*KubeletConfiguration) - out.TypeMeta = in.TypeMeta - out.PodManifestPath = in.PodManifestPath - out.SyncFrequency = in.SyncFrequency - out.FileCheckFrequency = in.FileCheckFrequency - out.HTTPCheckFrequency = in.HTTPCheckFrequency - out.ManifestURL = in.ManifestURL - out.ManifestURLHeader = in.ManifestURLHeader - out.EnableServer = in.EnableServer - out.Address = in.Address - out.Port = in.Port - out.ReadOnlyPort = in.ReadOnlyPort - out.TLSCertFile = in.TLSCertFile - out.TLSPrivateKeyFile = in.TLSPrivateKeyFile - out.CertDirectory = in.CertDirectory - out.Authentication = in.Authentication - out.Authorization = in.Authorization - out.HostnameOverride = in.HostnameOverride - out.PodInfraContainerImage = in.PodInfraContainerImage - out.DockerEndpoint = in.DockerEndpoint - out.RootDirectory = in.RootDirectory - out.SeccompProfileRoot = in.SeccompProfileRoot - out.AllowPrivileged = in.AllowPrivileged - if in.HostNetworkSources != nil { - in, out := &in.HostNetworkSources, &out.HostNetworkSources - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.HostNetworkSources = nil - } - if in.HostPIDSources != nil { - in, out := &in.HostPIDSources, &out.HostPIDSources - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.HostPIDSources = nil - } - if in.HostIPCSources != nil { - in, out := &in.HostIPCSources, &out.HostIPCSources - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.HostIPCSources = nil - } - out.RegistryPullQPS = in.RegistryPullQPS - out.RegistryBurst = in.RegistryBurst - out.EventRecordQPS = in.EventRecordQPS - out.EventBurst = in.EventBurst - out.EnableDebuggingHandlers = in.EnableDebuggingHandlers - out.MinimumGCAge = in.MinimumGCAge - out.MaxPerPodContainerCount = in.MaxPerPodContainerCount - out.MaxContainerCount = in.MaxContainerCount - out.CAdvisorPort = in.CAdvisorPort - out.HealthzPort = in.HealthzPort - out.HealthzBindAddress = in.HealthzBindAddress - out.OOMScoreAdj = in.OOMScoreAdj - out.RegisterNode = in.RegisterNode - out.ClusterDomain = in.ClusterDomain - out.MasterServiceNamespace = in.MasterServiceNamespace - out.ClusterDNS = in.ClusterDNS - out.StreamingConnectionIdleTimeout = in.StreamingConnectionIdleTimeout - out.NodeStatusUpdateFrequency = in.NodeStatusUpdateFrequency - out.ImageMinimumGCAge = in.ImageMinimumGCAge - out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent - out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent - out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB - out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod - out.NetworkPluginName = in.NetworkPluginName - out.NetworkPluginMTU = in.NetworkPluginMTU - out.NetworkPluginDir = in.NetworkPluginDir - out.CNIConfDir = in.CNIConfDir - out.CNIBinDir = in.CNIBinDir - out.VolumePluginDir = in.VolumePluginDir - out.CloudProvider = in.CloudProvider - out.CloudConfigFile = in.CloudConfigFile - out.KubeletCgroups = in.KubeletCgroups - out.ExperimentalCgroupsPerQOS = in.ExperimentalCgroupsPerQOS - out.CgroupDriver = in.CgroupDriver - out.RuntimeCgroups = in.RuntimeCgroups - out.SystemCgroups = in.SystemCgroups - out.CgroupRoot = in.CgroupRoot - out.ContainerRuntime = in.ContainerRuntime - out.RemoteRuntimeEndpoint = in.RemoteRuntimeEndpoint - out.RemoteImageEndpoint = in.RemoteImageEndpoint - out.RuntimeRequestTimeout = in.RuntimeRequestTimeout - out.RktPath = in.RktPath - out.ExperimentalMounterPath = in.ExperimentalMounterPath - out.RktAPIEndpoint = in.RktAPIEndpoint - out.RktStage1Image = in.RktStage1Image - out.LockFilePath = in.LockFilePath - out.ExitOnLockContention = in.ExitOnLockContention - out.HairpinMode = in.HairpinMode - out.BabysitDaemons = in.BabysitDaemons - out.MaxPods = in.MaxPods - out.NvidiaGPUs = in.NvidiaGPUs - out.DockerExecHandlerName = in.DockerExecHandlerName - out.PodCIDR = in.PodCIDR - out.ResolverConfig = in.ResolverConfig - out.CPUCFSQuota = in.CPUCFSQuota - out.Containerized = in.Containerized - out.MaxOpenFiles = in.MaxOpenFiles - out.ReconcileCIDR = in.ReconcileCIDR - out.RegisterSchedulable = in.RegisterSchedulable - out.ContentType = in.ContentType - out.KubeAPIQPS = in.KubeAPIQPS - out.KubeAPIBurst = in.KubeAPIBurst - out.SerializeImagePulls = in.SerializeImagePulls - out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency - out.NodeIP = in.NodeIP - if in.NodeLabels != nil { - in, out := &in.NodeLabels, &out.NodeLabels - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.NodeLabels = nil - } - out.NonMasqueradeCIDR = in.NonMasqueradeCIDR - out.EnableCustomMetrics = in.EnableCustomMetrics - out.EvictionHard = in.EvictionHard - out.EvictionSoft = in.EvictionSoft - out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod - out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod - out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod - out.EvictionMinimumReclaim = in.EvictionMinimumReclaim - out.PodsPerCore = in.PodsPerCore - out.EnableControllerAttachDetach = in.EnableControllerAttachDetach - if in.SystemReserved != nil { - in, out := &in.SystemReserved, &out.SystemReserved - *out = make(config.ConfigurationMap) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.SystemReserved = nil - } - if in.KubeReserved != nil { - in, out := &in.KubeReserved, &out.KubeReserved - *out = make(config.ConfigurationMap) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.KubeReserved = nil - } - out.ProtectKernelDefaults = in.ProtectKernelDefaults - out.MakeIPTablesUtilChains = in.MakeIPTablesUtilChains - out.IPTablesMasqueradeBit = in.IPTablesMasqueradeBit - out.IPTablesDropBit = in.IPTablesDropBit - if in.AllowedUnsafeSysctls != nil { - in, out := &in.AllowedUnsafeSysctls, &out.AllowedUnsafeSysctls - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.AllowedUnsafeSysctls = nil - } - out.FeatureGates = in.FeatureGates - out.EnableCRI = in.EnableCRI - out.ExperimentalFailSwapOn = in.ExperimentalFailSwapOn - out.ExperimentalCheckNodeCapabilitiesBeforeMount = in.ExperimentalCheckNodeCapabilitiesBeforeMount - return nil - } -} - -func DeepCopy_componentconfig_KubeletWebhookAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletWebhookAuthentication) - out := out.(*KubeletWebhookAuthentication) - out.Enabled = in.Enabled - out.CacheTTL = in.CacheTTL - return nil - } -} - -func DeepCopy_componentconfig_KubeletWebhookAuthorization(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletWebhookAuthorization) - out := out.(*KubeletWebhookAuthorization) - out.CacheAuthorizedTTL = in.CacheAuthorizedTTL - out.CacheUnauthorizedTTL = in.CacheUnauthorizedTTL - return nil - } -} - -func DeepCopy_componentconfig_KubeletX509Authentication(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*KubeletX509Authentication) - out := out.(*KubeletX509Authentication) - out.ClientCAFile = in.ClientCAFile - return nil - } -} - -func DeepCopy_componentconfig_LeaderElectionConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*LeaderElectionConfiguration) - out := out.(*LeaderElectionConfiguration) - out.LeaderElect = in.LeaderElect - out.LeaseDuration = in.LeaseDuration - out.RenewDeadline = in.RenewDeadline - out.RetryPeriod = in.RetryPeriod - return nil - } -} - -func DeepCopy_componentconfig_PersistentVolumeRecyclerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PersistentVolumeRecyclerConfiguration) - out := out.(*PersistentVolumeRecyclerConfiguration) - out.MaximumRetry = in.MaximumRetry - out.MinimumTimeoutNFS = in.MinimumTimeoutNFS - out.PodTemplateFilePathNFS = in.PodTemplateFilePathNFS - out.IncrementTimeoutNFS = in.IncrementTimeoutNFS - out.PodTemplateFilePathHostPath = in.PodTemplateFilePathHostPath - out.MinimumTimeoutHostPath = in.MinimumTimeoutHostPath - out.IncrementTimeoutHostPath = in.IncrementTimeoutHostPath - return nil - } -} - -func DeepCopy_componentconfig_PortRangeVar(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PortRangeVar) - out := out.(*PortRangeVar) - if in.Val != nil { - in, out := &in.Val, &out.Val - *out = new(string) - **out = **in - } else { - out.Val = nil - } - return nil - } -} - -func DeepCopy_componentconfig_VolumeConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*VolumeConfiguration) - out := out.(*VolumeConfiguration) - out.EnableHostPathProvisioning = in.EnableHostPathProvisioning - out.EnableDynamicProvisioning = in.EnableDynamicProvisioning - out.PersistentVolumeRecyclerConfiguration = in.PersistentVolumeRecyclerConfiguration - out.FlexVolumePluginDir = in.FlexVolumePluginDir - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go deleted file mode 100644 index c7f858fadbe..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go +++ /dev/null @@ -1,1448 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1beta1 - -import ( - unversioned "k8s.io/client-go/pkg/api/unversioned" - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - intstr "k8s.io/client-go/pkg/util/intstr" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_APIVersion, InType: reflect.TypeOf(&APIVersion{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CPUTargetUtilization, InType: reflect.TypeOf(&CPUTargetUtilization{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomMetricCurrentStatus, InType: reflect.TypeOf(&CustomMetricCurrentStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomMetricCurrentStatusList, InType: reflect.TypeOf(&CustomMetricCurrentStatusList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomMetricTarget, InType: reflect.TypeOf(&CustomMetricTarget{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomMetricTargetList, InType: reflect.TypeOf(&CustomMetricTargetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DaemonSet, InType: reflect.TypeOf(&DaemonSet{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DaemonSetList, InType: reflect.TypeOf(&DaemonSetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DaemonSetSpec, InType: reflect.TypeOf(&DaemonSetSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DaemonSetStatus, InType: reflect.TypeOf(&DaemonSetStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Deployment, InType: reflect.TypeOf(&Deployment{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentCondition, InType: reflect.TypeOf(&DeploymentCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentList, InType: reflect.TypeOf(&DeploymentList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentRollback, InType: reflect.TypeOf(&DeploymentRollback{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentSpec, InType: reflect.TypeOf(&DeploymentSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentStatus, InType: reflect.TypeOf(&DeploymentStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentStrategy, InType: reflect.TypeOf(&DeploymentStrategy{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ExportOptions, InType: reflect.TypeOf(&ExportOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_FSGroupStrategyOptions, InType: reflect.TypeOf(&FSGroupStrategyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HTTPIngressPath, InType: reflect.TypeOf(&HTTPIngressPath{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HTTPIngressRuleValue, InType: reflect.TypeOf(&HTTPIngressRuleValue{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HorizontalPodAutoscaler, InType: reflect.TypeOf(&HorizontalPodAutoscaler{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HorizontalPodAutoscalerList, InType: reflect.TypeOf(&HorizontalPodAutoscalerList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HorizontalPodAutoscalerSpec, InType: reflect.TypeOf(&HorizontalPodAutoscalerSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HorizontalPodAutoscalerStatus, InType: reflect.TypeOf(&HorizontalPodAutoscalerStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HostPortRange, InType: reflect.TypeOf(&HostPortRange{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IDRange, InType: reflect.TypeOf(&IDRange{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Ingress, InType: reflect.TypeOf(&Ingress{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressBackend, InType: reflect.TypeOf(&IngressBackend{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressList, InType: reflect.TypeOf(&IngressList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressRule, InType: reflect.TypeOf(&IngressRule{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressRuleValue, InType: reflect.TypeOf(&IngressRuleValue{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressSpec, InType: reflect.TypeOf(&IngressSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressStatus, InType: reflect.TypeOf(&IngressStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressTLS, InType: reflect.TypeOf(&IngressTLS{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Job, InType: reflect.TypeOf(&Job{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_JobCondition, InType: reflect.TypeOf(&JobCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_JobList, InType: reflect.TypeOf(&JobList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_JobSpec, InType: reflect.TypeOf(&JobSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_JobStatus, InType: reflect.TypeOf(&JobStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicy, InType: reflect.TypeOf(&NetworkPolicy{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicyIngressRule, InType: reflect.TypeOf(&NetworkPolicyIngressRule{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicyList, InType: reflect.TypeOf(&NetworkPolicyList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicyPeer, InType: reflect.TypeOf(&NetworkPolicyPeer{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicyPort, InType: reflect.TypeOf(&NetworkPolicyPort{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicySpec, InType: reflect.TypeOf(&NetworkPolicySpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodSecurityPolicy, InType: reflect.TypeOf(&PodSecurityPolicy{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodSecurityPolicyList, InType: reflect.TypeOf(&PodSecurityPolicyList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodSecurityPolicySpec, InType: reflect.TypeOf(&PodSecurityPolicySpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSet, InType: reflect.TypeOf(&ReplicaSet{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSetCondition, InType: reflect.TypeOf(&ReplicaSetCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSetList, InType: reflect.TypeOf(&ReplicaSetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSetSpec, InType: reflect.TypeOf(&ReplicaSetSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSetStatus, InType: reflect.TypeOf(&ReplicaSetStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicationControllerDummy, InType: reflect.TypeOf(&ReplicationControllerDummy{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_RollbackConfig, InType: reflect.TypeOf(&RollbackConfig{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_RollingUpdateDeployment, InType: reflect.TypeOf(&RollingUpdateDeployment{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_RunAsUserStrategyOptions, InType: reflect.TypeOf(&RunAsUserStrategyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SELinuxStrategyOptions, InType: reflect.TypeOf(&SELinuxStrategyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Scale, InType: reflect.TypeOf(&Scale{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ScaleSpec, InType: reflect.TypeOf(&ScaleSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ScaleStatus, InType: reflect.TypeOf(&ScaleStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubresourceReference, InType: reflect.TypeOf(&SubresourceReference{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SupplementalGroupsStrategyOptions, InType: reflect.TypeOf(&SupplementalGroupsStrategyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ThirdPartyResource, InType: reflect.TypeOf(&ThirdPartyResource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ThirdPartyResourceData, InType: reflect.TypeOf(&ThirdPartyResourceData{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ThirdPartyResourceDataList, InType: reflect.TypeOf(&ThirdPartyResourceDataList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ThirdPartyResourceList, InType: reflect.TypeOf(&ThirdPartyResourceList{})}, - ) -} - -func DeepCopy_v1beta1_APIVersion(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*APIVersion) - out := out.(*APIVersion) - out.Name = in.Name - return nil - } -} - -func DeepCopy_v1beta1_CPUTargetUtilization(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CPUTargetUtilization) - out := out.(*CPUTargetUtilization) - out.TargetPercentage = in.TargetPercentage - return nil - } -} - -func DeepCopy_v1beta1_CustomMetricCurrentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CustomMetricCurrentStatus) - out := out.(*CustomMetricCurrentStatus) - out.Name = in.Name - out.CurrentValue = in.CurrentValue.DeepCopy() - return nil - } -} - -func DeepCopy_v1beta1_CustomMetricCurrentStatusList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CustomMetricCurrentStatusList) - out := out.(*CustomMetricCurrentStatusList) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CustomMetricCurrentStatus, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_CustomMetricCurrentStatus(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_CustomMetricTarget(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CustomMetricTarget) - out := out.(*CustomMetricTarget) - out.Name = in.Name - out.TargetValue = in.TargetValue.DeepCopy() - return nil - } -} - -func DeepCopy_v1beta1_CustomMetricTargetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CustomMetricTargetList) - out := out.(*CustomMetricTargetList) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CustomMetricTarget, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_CustomMetricTarget(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_DaemonSet(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonSet) - out := out.(*DaemonSet) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_DaemonSetSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_v1beta1_DaemonSetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonSetList) - out := out.(*DaemonSetList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DaemonSet, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_DaemonSet(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_DaemonSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonSetSpec) - out := out.(*DaemonSetSpec) - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_DaemonSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonSetStatus) - out := out.(*DaemonSetStatus) - out.CurrentNumberScheduled = in.CurrentNumberScheduled - out.NumberMisscheduled = in.NumberMisscheduled - out.DesiredNumberScheduled = in.DesiredNumberScheduled - out.NumberReady = in.NumberReady - return nil - } -} - -func DeepCopy_v1beta1_Deployment(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Deployment) - out := out.(*Deployment) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_DeploymentSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_DeploymentStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_DeploymentCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentCondition) - out := out.(*DeploymentCondition) - out.Type = in.Type - out.Status = in.Status - out.LastUpdateTime = in.LastUpdateTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1beta1_DeploymentList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentList) - out := out.(*DeploymentList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Deployment, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_Deployment(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_DeploymentRollback(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentRollback) - out := out.(*DeploymentRollback) - out.TypeMeta = in.TypeMeta - out.Name = in.Name - if in.UpdatedAnnotations != nil { - in, out := &in.UpdatedAnnotations, &out.UpdatedAnnotations - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.UpdatedAnnotations = nil - } - out.RollbackTo = in.RollbackTo - return nil - } -} - -func DeepCopy_v1beta1_DeploymentSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentSpec) - out := out.(*DeploymentSpec) - if in.Replicas != nil { - in, out := &in.Replicas, &out.Replicas - *out = new(int32) - **out = **in - } else { - out.Replicas = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, c); err != nil { - return err - } - out.MinReadySeconds = in.MinReadySeconds - if in.RevisionHistoryLimit != nil { - in, out := &in.RevisionHistoryLimit, &out.RevisionHistoryLimit - *out = new(int32) - **out = **in - } else { - out.RevisionHistoryLimit = nil - } - out.Paused = in.Paused - if in.RollbackTo != nil { - in, out := &in.RollbackTo, &out.RollbackTo - *out = new(RollbackConfig) - **out = **in - } else { - out.RollbackTo = nil - } - if in.ProgressDeadlineSeconds != nil { - in, out := &in.ProgressDeadlineSeconds, &out.ProgressDeadlineSeconds - *out = new(int32) - **out = **in - } else { - out.ProgressDeadlineSeconds = nil - } - return nil - } -} - -func DeepCopy_v1beta1_DeploymentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentStatus) - out := out.(*DeploymentStatus) - out.ObservedGeneration = in.ObservedGeneration - out.Replicas = in.Replicas - out.UpdatedReplicas = in.UpdatedReplicas - out.AvailableReplicas = in.AvailableReplicas - out.UnavailableReplicas = in.UnavailableReplicas - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]DeploymentCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_DeploymentCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - return nil - } -} - -func DeepCopy_v1beta1_DeploymentStrategy(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentStrategy) - out := out.(*DeploymentStrategy) - out.Type = in.Type - if in.RollingUpdate != nil { - in, out := &in.RollingUpdate, &out.RollingUpdate - *out = new(RollingUpdateDeployment) - if err := DeepCopy_v1beta1_RollingUpdateDeployment(*in, *out, c); err != nil { - return err - } - } else { - out.RollingUpdate = nil - } - return nil - } -} - -func DeepCopy_v1beta1_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ExportOptions) - out := out.(*ExportOptions) - out.TypeMeta = in.TypeMeta - out.Export = in.Export - out.Exact = in.Exact - return nil - } -} - -func DeepCopy_v1beta1_FSGroupStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*FSGroupStrategyOptions) - out := out.(*FSGroupStrategyOptions) - out.Rule = in.Rule - if in.Ranges != nil { - in, out := &in.Ranges, &out.Ranges - *out = make([]IDRange, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ranges = nil - } - return nil - } -} - -func DeepCopy_v1beta1_HTTPIngressPath(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HTTPIngressPath) - out := out.(*HTTPIngressPath) - out.Path = in.Path - out.Backend = in.Backend - return nil - } -} - -func DeepCopy_v1beta1_HTTPIngressRuleValue(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HTTPIngressRuleValue) - out := out.(*HTTPIngressRuleValue) - if in.Paths != nil { - in, out := &in.Paths, &out.Paths - *out = make([]HTTPIngressPath, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Paths = nil - } - return nil - } -} - -func DeepCopy_v1beta1_HorizontalPodAutoscaler(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscaler) - out := out.(*HorizontalPodAutoscaler) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_HorizontalPodAutoscalerList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscalerList) - out := out.(*HorizontalPodAutoscalerList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]HorizontalPodAutoscaler, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_HorizontalPodAutoscalerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscalerSpec) - out := out.(*HorizontalPodAutoscalerSpec) - out.ScaleRef = in.ScaleRef - if in.MinReplicas != nil { - in, out := &in.MinReplicas, &out.MinReplicas - *out = new(int32) - **out = **in - } else { - out.MinReplicas = nil - } - out.MaxReplicas = in.MaxReplicas - if in.CPUUtilization != nil { - in, out := &in.CPUUtilization, &out.CPUUtilization - *out = new(CPUTargetUtilization) - **out = **in - } else { - out.CPUUtilization = nil - } - return nil - } -} - -func DeepCopy_v1beta1_HorizontalPodAutoscalerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HorizontalPodAutoscalerStatus) - out := out.(*HorizontalPodAutoscalerStatus) - if in.ObservedGeneration != nil { - in, out := &in.ObservedGeneration, &out.ObservedGeneration - *out = new(int64) - **out = **in - } else { - out.ObservedGeneration = nil - } - if in.LastScaleTime != nil { - in, out := &in.LastScaleTime, &out.LastScaleTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.LastScaleTime = nil - } - out.CurrentReplicas = in.CurrentReplicas - out.DesiredReplicas = in.DesiredReplicas - if in.CurrentCPUUtilizationPercentage != nil { - in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage - *out = new(int32) - **out = **in - } else { - out.CurrentCPUUtilizationPercentage = nil - } - return nil - } -} - -func DeepCopy_v1beta1_HostPortRange(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HostPortRange) - out := out.(*HostPortRange) - out.Min = in.Min - out.Max = in.Max - return nil - } -} - -func DeepCopy_v1beta1_IDRange(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IDRange) - out := out.(*IDRange) - out.Min = in.Min - out.Max = in.Max - return nil - } -} - -func DeepCopy_v1beta1_Ingress(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Ingress) - out := out.(*Ingress) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_IngressSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_IngressStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_IngressBackend(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressBackend) - out := out.(*IngressBackend) - out.ServiceName = in.ServiceName - out.ServicePort = in.ServicePort - return nil - } -} - -func DeepCopy_v1beta1_IngressList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressList) - out := out.(*IngressList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Ingress, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_Ingress(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_IngressRule(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressRule) - out := out.(*IngressRule) - out.Host = in.Host - if err := DeepCopy_v1beta1_IngressRuleValue(&in.IngressRuleValue, &out.IngressRuleValue, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_IngressRuleValue(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressRuleValue) - out := out.(*IngressRuleValue) - if in.HTTP != nil { - in, out := &in.HTTP, &out.HTTP - *out = new(HTTPIngressRuleValue) - if err := DeepCopy_v1beta1_HTTPIngressRuleValue(*in, *out, c); err != nil { - return err - } - } else { - out.HTTP = nil - } - return nil - } -} - -func DeepCopy_v1beta1_IngressSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressSpec) - out := out.(*IngressSpec) - if in.Backend != nil { - in, out := &in.Backend, &out.Backend - *out = new(IngressBackend) - **out = **in - } else { - out.Backend = nil - } - if in.TLS != nil { - in, out := &in.TLS, &out.TLS - *out = make([]IngressTLS, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_IngressTLS(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.TLS = nil - } - if in.Rules != nil { - in, out := &in.Rules, &out.Rules - *out = make([]IngressRule, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_IngressRule(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Rules = nil - } - return nil - } -} - -func DeepCopy_v1beta1_IngressStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressStatus) - out := out.(*IngressStatus) - if err := v1.DeepCopy_v1_LoadBalancerStatus(&in.LoadBalancer, &out.LoadBalancer, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_IngressTLS(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressTLS) - out := out.(*IngressTLS) - if in.Hosts != nil { - in, out := &in.Hosts, &out.Hosts - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Hosts = nil - } - out.SecretName = in.SecretName - return nil - } -} - -func DeepCopy_v1beta1_Job(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Job) - out := out.(*Job) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_JobSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_JobStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobCondition) - out := out.(*JobCondition) - out.Type = in.Type - out.Status = in.Status - out.LastProbeTime = in.LastProbeTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1beta1_JobList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobList) - out := out.(*JobList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Job, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_Job(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobSpec) - out := out.(*JobSpec) - if in.Parallelism != nil { - in, out := &in.Parallelism, &out.Parallelism - *out = new(int32) - **out = **in - } else { - out.Parallelism = nil - } - if in.Completions != nil { - in, out := &in.Completions, &out.Completions - *out = new(int32) - **out = **in - } else { - out.Completions = nil - } - if in.ActiveDeadlineSeconds != nil { - in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds - *out = new(int64) - **out = **in - } else { - out.ActiveDeadlineSeconds = nil - } - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if in.AutoSelector != nil { - in, out := &in.AutoSelector, &out.AutoSelector - *out = new(bool) - **out = **in - } else { - out.AutoSelector = nil - } - if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*JobStatus) - out := out.(*JobStatus) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]JobCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_JobCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.StartTime != nil { - in, out := &in.StartTime, &out.StartTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.StartTime = nil - } - if in.CompletionTime != nil { - in, out := &in.CompletionTime, &out.CompletionTime - *out = new(unversioned.Time) - **out = (*in).DeepCopy() - } else { - out.CompletionTime = nil - } - out.Active = in.Active - out.Succeeded = in.Succeeded - out.Failed = in.Failed - return nil - } -} - -func DeepCopy_v1beta1_NetworkPolicy(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicy) - out := out.(*NetworkPolicy) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_NetworkPolicySpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_NetworkPolicyIngressRule(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicyIngressRule) - out := out.(*NetworkPolicyIngressRule) - if in.Ports != nil { - in, out := &in.Ports, &out.Ports - *out = make([]NetworkPolicyPort, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_NetworkPolicyPort(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Ports = nil - } - if in.From != nil { - in, out := &in.From, &out.From - *out = make([]NetworkPolicyPeer, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_NetworkPolicyPeer(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.From = nil - } - return nil - } -} - -func DeepCopy_v1beta1_NetworkPolicyList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicyList) - out := out.(*NetworkPolicyList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]NetworkPolicy, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_NetworkPolicy(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_NetworkPolicyPeer(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicyPeer) - out := out.(*NetworkPolicyPeer) - if in.PodSelector != nil { - in, out := &in.PodSelector, &out.PodSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.PodSelector = nil - } - if in.NamespaceSelector != nil { - in, out := &in.NamespaceSelector, &out.NamespaceSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.NamespaceSelector = nil - } - return nil - } -} - -func DeepCopy_v1beta1_NetworkPolicyPort(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicyPort) - out := out.(*NetworkPolicyPort) - if in.Protocol != nil { - in, out := &in.Protocol, &out.Protocol - *out = new(v1.Protocol) - **out = **in - } else { - out.Protocol = nil - } - if in.Port != nil { - in, out := &in.Port, &out.Port - *out = new(intstr.IntOrString) - **out = **in - } else { - out.Port = nil - } - return nil - } -} - -func DeepCopy_v1beta1_NetworkPolicySpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicySpec) - out := out.(*NetworkPolicySpec) - if err := unversioned.DeepCopy_unversioned_LabelSelector(&in.PodSelector, &out.PodSelector, c); err != nil { - return err - } - if in.Ingress != nil { - in, out := &in.Ingress, &out.Ingress - *out = make([]NetworkPolicyIngressRule, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_NetworkPolicyIngressRule(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Ingress = nil - } - return nil - } -} - -func DeepCopy_v1beta1_PodSecurityPolicy(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSecurityPolicy) - out := out.(*PodSecurityPolicy) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_PodSecurityPolicySpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_PodSecurityPolicyList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSecurityPolicyList) - out := out.(*PodSecurityPolicyList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PodSecurityPolicy, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_PodSecurityPolicy(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_PodSecurityPolicySpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSecurityPolicySpec) - out := out.(*PodSecurityPolicySpec) - out.Privileged = in.Privileged - if in.DefaultAddCapabilities != nil { - in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities - *out = make([]v1.Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.DefaultAddCapabilities = nil - } - if in.RequiredDropCapabilities != nil { - in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities - *out = make([]v1.Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.RequiredDropCapabilities = nil - } - if in.AllowedCapabilities != nil { - in, out := &in.AllowedCapabilities, &out.AllowedCapabilities - *out = make([]v1.Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.AllowedCapabilities = nil - } - if in.Volumes != nil { - in, out := &in.Volumes, &out.Volumes - *out = make([]FSType, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Volumes = nil - } - out.HostNetwork = in.HostNetwork - if in.HostPorts != nil { - in, out := &in.HostPorts, &out.HostPorts - *out = make([]HostPortRange, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.HostPorts = nil - } - out.HostPID = in.HostPID - out.HostIPC = in.HostIPC - if err := DeepCopy_v1beta1_SELinuxStrategyOptions(&in.SELinux, &out.SELinux, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_RunAsUserStrategyOptions(&in.RunAsUser, &out.RunAsUser, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_SupplementalGroupsStrategyOptions(&in.SupplementalGroups, &out.SupplementalGroups, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_FSGroupStrategyOptions(&in.FSGroup, &out.FSGroup, c); err != nil { - return err - } - out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem - return nil - } -} - -func DeepCopy_v1beta1_ReplicaSet(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSet) - out := out.(*ReplicaSet) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_ReplicaSetSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_ReplicaSetStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_ReplicaSetCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSetCondition) - out := out.(*ReplicaSetCondition) - out.Type = in.Type - out.Status = in.Status - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1beta1_ReplicaSetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSetList) - out := out.(*ReplicaSetList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ReplicaSet, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_ReplicaSet(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_ReplicaSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSetSpec) - out := out.(*ReplicaSetSpec) - if in.Replicas != nil { - in, out := &in.Replicas, &out.Replicas - *out = new(int32) - **out = **in - } else { - out.Replicas = nil - } - out.MinReadySeconds = in.MinReadySeconds - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_ReplicaSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSetStatus) - out := out.(*ReplicaSetStatus) - out.Replicas = in.Replicas - out.FullyLabeledReplicas = in.FullyLabeledReplicas - out.ReadyReplicas = in.ReadyReplicas - out.AvailableReplicas = in.AvailableReplicas - out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]ReplicaSetCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_ReplicaSetCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - return nil - } -} - -func DeepCopy_v1beta1_ReplicationControllerDummy(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerDummy) - out := out.(*ReplicationControllerDummy) - out.TypeMeta = in.TypeMeta - return nil - } -} - -func DeepCopy_v1beta1_RollbackConfig(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RollbackConfig) - out := out.(*RollbackConfig) - out.Revision = in.Revision - return nil - } -} - -func DeepCopy_v1beta1_RollingUpdateDeployment(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RollingUpdateDeployment) - out := out.(*RollingUpdateDeployment) - if in.MaxUnavailable != nil { - in, out := &in.MaxUnavailable, &out.MaxUnavailable - *out = new(intstr.IntOrString) - **out = **in - } else { - out.MaxUnavailable = nil - } - if in.MaxSurge != nil { - in, out := &in.MaxSurge, &out.MaxSurge - *out = new(intstr.IntOrString) - **out = **in - } else { - out.MaxSurge = nil - } - return nil - } -} - -func DeepCopy_v1beta1_RunAsUserStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RunAsUserStrategyOptions) - out := out.(*RunAsUserStrategyOptions) - out.Rule = in.Rule - if in.Ranges != nil { - in, out := &in.Ranges, &out.Ranges - *out = make([]IDRange, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ranges = nil - } - return nil - } -} - -func DeepCopy_v1beta1_SELinuxStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SELinuxStrategyOptions) - out := out.(*SELinuxStrategyOptions) - out.Rule = in.Rule - if in.SELinuxOptions != nil { - in, out := &in.SELinuxOptions, &out.SELinuxOptions - *out = new(v1.SELinuxOptions) - **out = **in - } else { - out.SELinuxOptions = nil - } - return nil - } -} - -func DeepCopy_v1beta1_Scale(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Scale) - out := out.(*Scale) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Spec = in.Spec - if err := DeepCopy_v1beta1_ScaleStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ScaleSpec) - out := out.(*ScaleSpec) - out.Replicas = in.Replicas - return nil - } -} - -func DeepCopy_v1beta1_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ScaleStatus) - out := out.(*ScaleStatus) - out.Replicas = in.Replicas - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Selector = nil - } - out.TargetSelector = in.TargetSelector - return nil - } -} - -func DeepCopy_v1beta1_SubresourceReference(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SubresourceReference) - out := out.(*SubresourceReference) - out.Kind = in.Kind - out.Name = in.Name - out.APIVersion = in.APIVersion - out.Subresource = in.Subresource - return nil - } -} - -func DeepCopy_v1beta1_SupplementalGroupsStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SupplementalGroupsStrategyOptions) - out := out.(*SupplementalGroupsStrategyOptions) - out.Rule = in.Rule - if in.Ranges != nil { - in, out := &in.Ranges, &out.Ranges - *out = make([]IDRange, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ranges = nil - } - return nil - } -} - -func DeepCopy_v1beta1_ThirdPartyResource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ThirdPartyResource) - out := out.(*ThirdPartyResource) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Description = in.Description - if in.Versions != nil { - in, out := &in.Versions, &out.Versions - *out = make([]APIVersion, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Versions = nil - } - return nil - } -} - -func DeepCopy_v1beta1_ThirdPartyResourceData(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ThirdPartyResourceData) - out := out.(*ThirdPartyResourceData) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Data != nil { - in, out := &in.Data, &out.Data - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Data = nil - } - return nil - } -} - -func DeepCopy_v1beta1_ThirdPartyResourceDataList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ThirdPartyResourceDataList) - out := out.(*ThirdPartyResourceDataList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ThirdPartyResourceData, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_ThirdPartyResourceData(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_ThirdPartyResourceList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ThirdPartyResourceList) - out := out.(*ThirdPartyResourceList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ThirdPartyResource, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_ThirdPartyResource(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go deleted file mode 100644 index 19003a9ea1e..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go +++ /dev/null @@ -1,1146 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package extensions - -import ( - api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - intstr "k8s.io/client-go/pkg/util/intstr" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_APIVersion, InType: reflect.TypeOf(&APIVersion{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_CustomMetricCurrentStatus, InType: reflect.TypeOf(&CustomMetricCurrentStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_CustomMetricCurrentStatusList, InType: reflect.TypeOf(&CustomMetricCurrentStatusList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_CustomMetricTarget, InType: reflect.TypeOf(&CustomMetricTarget{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_CustomMetricTargetList, InType: reflect.TypeOf(&CustomMetricTargetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DaemonSet, InType: reflect.TypeOf(&DaemonSet{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DaemonSetList, InType: reflect.TypeOf(&DaemonSetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DaemonSetSpec, InType: reflect.TypeOf(&DaemonSetSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DaemonSetStatus, InType: reflect.TypeOf(&DaemonSetStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_Deployment, InType: reflect.TypeOf(&Deployment{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentCondition, InType: reflect.TypeOf(&DeploymentCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentList, InType: reflect.TypeOf(&DeploymentList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentRollback, InType: reflect.TypeOf(&DeploymentRollback{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentSpec, InType: reflect.TypeOf(&DeploymentSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentStatus, InType: reflect.TypeOf(&DeploymentStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentStrategy, InType: reflect.TypeOf(&DeploymentStrategy{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_FSGroupStrategyOptions, InType: reflect.TypeOf(&FSGroupStrategyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_HTTPIngressPath, InType: reflect.TypeOf(&HTTPIngressPath{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_HTTPIngressRuleValue, InType: reflect.TypeOf(&HTTPIngressRuleValue{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_HostPortRange, InType: reflect.TypeOf(&HostPortRange{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IDRange, InType: reflect.TypeOf(&IDRange{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_Ingress, InType: reflect.TypeOf(&Ingress{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressBackend, InType: reflect.TypeOf(&IngressBackend{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressList, InType: reflect.TypeOf(&IngressList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressRule, InType: reflect.TypeOf(&IngressRule{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressRuleValue, InType: reflect.TypeOf(&IngressRuleValue{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressSpec, InType: reflect.TypeOf(&IngressSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressStatus, InType: reflect.TypeOf(&IngressStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressTLS, InType: reflect.TypeOf(&IngressTLS{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicy, InType: reflect.TypeOf(&NetworkPolicy{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicyIngressRule, InType: reflect.TypeOf(&NetworkPolicyIngressRule{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicyList, InType: reflect.TypeOf(&NetworkPolicyList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicyPeer, InType: reflect.TypeOf(&NetworkPolicyPeer{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicyPort, InType: reflect.TypeOf(&NetworkPolicyPort{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicySpec, InType: reflect.TypeOf(&NetworkPolicySpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_PodSecurityPolicy, InType: reflect.TypeOf(&PodSecurityPolicy{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_PodSecurityPolicyList, InType: reflect.TypeOf(&PodSecurityPolicyList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_PodSecurityPolicySpec, InType: reflect.TypeOf(&PodSecurityPolicySpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSet, InType: reflect.TypeOf(&ReplicaSet{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSetCondition, InType: reflect.TypeOf(&ReplicaSetCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSetList, InType: reflect.TypeOf(&ReplicaSetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSetSpec, InType: reflect.TypeOf(&ReplicaSetSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSetStatus, InType: reflect.TypeOf(&ReplicaSetStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicationControllerDummy, InType: reflect.TypeOf(&ReplicationControllerDummy{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_RollbackConfig, InType: reflect.TypeOf(&RollbackConfig{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_RollingUpdateDeployment, InType: reflect.TypeOf(&RollingUpdateDeployment{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_RunAsUserStrategyOptions, InType: reflect.TypeOf(&RunAsUserStrategyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_SELinuxStrategyOptions, InType: reflect.TypeOf(&SELinuxStrategyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_Scale, InType: reflect.TypeOf(&Scale{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ScaleSpec, InType: reflect.TypeOf(&ScaleSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ScaleStatus, InType: reflect.TypeOf(&ScaleStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_SupplementalGroupsStrategyOptions, InType: reflect.TypeOf(&SupplementalGroupsStrategyOptions{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ThirdPartyResource, InType: reflect.TypeOf(&ThirdPartyResource{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ThirdPartyResourceData, InType: reflect.TypeOf(&ThirdPartyResourceData{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ThirdPartyResourceDataList, InType: reflect.TypeOf(&ThirdPartyResourceDataList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ThirdPartyResourceList, InType: reflect.TypeOf(&ThirdPartyResourceList{})}, - ) -} - -func DeepCopy_extensions_APIVersion(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*APIVersion) - out := out.(*APIVersion) - out.Name = in.Name - return nil - } -} - -func DeepCopy_extensions_CustomMetricCurrentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CustomMetricCurrentStatus) - out := out.(*CustomMetricCurrentStatus) - out.Name = in.Name - out.CurrentValue = in.CurrentValue.DeepCopy() - return nil - } -} - -func DeepCopy_extensions_CustomMetricCurrentStatusList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CustomMetricCurrentStatusList) - out := out.(*CustomMetricCurrentStatusList) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CustomMetricCurrentStatus, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_CustomMetricCurrentStatus(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_extensions_CustomMetricTarget(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CustomMetricTarget) - out := out.(*CustomMetricTarget) - out.Name = in.Name - out.TargetValue = in.TargetValue.DeepCopy() - return nil - } -} - -func DeepCopy_extensions_CustomMetricTargetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*CustomMetricTargetList) - out := out.(*CustomMetricTargetList) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]CustomMetricTarget, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_CustomMetricTarget(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_extensions_DaemonSet(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonSet) - out := out.(*DaemonSet) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_extensions_DaemonSetSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_extensions_DaemonSetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonSetList) - out := out.(*DaemonSetList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]DaemonSet, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_DaemonSet(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_extensions_DaemonSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonSetSpec) - out := out.(*DaemonSetSpec) - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_DaemonSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DaemonSetStatus) - out := out.(*DaemonSetStatus) - out.CurrentNumberScheduled = in.CurrentNumberScheduled - out.NumberMisscheduled = in.NumberMisscheduled - out.DesiredNumberScheduled = in.DesiredNumberScheduled - out.NumberReady = in.NumberReady - return nil - } -} - -func DeepCopy_extensions_Deployment(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Deployment) - out := out.(*Deployment) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_extensions_DeploymentSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_extensions_DeploymentStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_DeploymentCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentCondition) - out := out.(*DeploymentCondition) - out.Type = in.Type - out.Status = in.Status - out.LastUpdateTime = in.LastUpdateTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_extensions_DeploymentList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentList) - out := out.(*DeploymentList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Deployment, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_Deployment(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_extensions_DeploymentRollback(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentRollback) - out := out.(*DeploymentRollback) - out.TypeMeta = in.TypeMeta - out.Name = in.Name - if in.UpdatedAnnotations != nil { - in, out := &in.UpdatedAnnotations, &out.UpdatedAnnotations - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.UpdatedAnnotations = nil - } - out.RollbackTo = in.RollbackTo - return nil - } -} - -func DeepCopy_extensions_DeploymentSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentSpec) - out := out.(*DeploymentSpec) - out.Replicas = in.Replicas - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - if err := DeepCopy_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, c); err != nil { - return err - } - out.MinReadySeconds = in.MinReadySeconds - if in.RevisionHistoryLimit != nil { - in, out := &in.RevisionHistoryLimit, &out.RevisionHistoryLimit - *out = new(int32) - **out = **in - } else { - out.RevisionHistoryLimit = nil - } - out.Paused = in.Paused - if in.RollbackTo != nil { - in, out := &in.RollbackTo, &out.RollbackTo - *out = new(RollbackConfig) - **out = **in - } else { - out.RollbackTo = nil - } - if in.ProgressDeadlineSeconds != nil { - in, out := &in.ProgressDeadlineSeconds, &out.ProgressDeadlineSeconds - *out = new(int32) - **out = **in - } else { - out.ProgressDeadlineSeconds = nil - } - return nil - } -} - -func DeepCopy_extensions_DeploymentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentStatus) - out := out.(*DeploymentStatus) - out.ObservedGeneration = in.ObservedGeneration - out.Replicas = in.Replicas - out.UpdatedReplicas = in.UpdatedReplicas - out.AvailableReplicas = in.AvailableReplicas - out.UnavailableReplicas = in.UnavailableReplicas - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]DeploymentCondition, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_DeploymentCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - return nil - } -} - -func DeepCopy_extensions_DeploymentStrategy(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*DeploymentStrategy) - out := out.(*DeploymentStrategy) - out.Type = in.Type - if in.RollingUpdate != nil { - in, out := &in.RollingUpdate, &out.RollingUpdate - *out = new(RollingUpdateDeployment) - **out = **in - } else { - out.RollingUpdate = nil - } - return nil - } -} - -func DeepCopy_extensions_FSGroupStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*FSGroupStrategyOptions) - out := out.(*FSGroupStrategyOptions) - out.Rule = in.Rule - if in.Ranges != nil { - in, out := &in.Ranges, &out.Ranges - *out = make([]IDRange, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ranges = nil - } - return nil - } -} - -func DeepCopy_extensions_HTTPIngressPath(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HTTPIngressPath) - out := out.(*HTTPIngressPath) - out.Path = in.Path - out.Backend = in.Backend - return nil - } -} - -func DeepCopy_extensions_HTTPIngressRuleValue(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HTTPIngressRuleValue) - out := out.(*HTTPIngressRuleValue) - if in.Paths != nil { - in, out := &in.Paths, &out.Paths - *out = make([]HTTPIngressPath, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Paths = nil - } - return nil - } -} - -func DeepCopy_extensions_HostPortRange(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*HostPortRange) - out := out.(*HostPortRange) - out.Min = in.Min - out.Max = in.Max - return nil - } -} - -func DeepCopy_extensions_IDRange(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IDRange) - out := out.(*IDRange) - out.Min = in.Min - out.Max = in.Max - return nil - } -} - -func DeepCopy_extensions_Ingress(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Ingress) - out := out.(*Ingress) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_extensions_IngressSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_extensions_IngressStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_IngressBackend(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressBackend) - out := out.(*IngressBackend) - out.ServiceName = in.ServiceName - out.ServicePort = in.ServicePort - return nil - } -} - -func DeepCopy_extensions_IngressList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressList) - out := out.(*IngressList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Ingress, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_Ingress(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_extensions_IngressRule(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressRule) - out := out.(*IngressRule) - out.Host = in.Host - if err := DeepCopy_extensions_IngressRuleValue(&in.IngressRuleValue, &out.IngressRuleValue, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_IngressRuleValue(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressRuleValue) - out := out.(*IngressRuleValue) - if in.HTTP != nil { - in, out := &in.HTTP, &out.HTTP - *out = new(HTTPIngressRuleValue) - if err := DeepCopy_extensions_HTTPIngressRuleValue(*in, *out, c); err != nil { - return err - } - } else { - out.HTTP = nil - } - return nil - } -} - -func DeepCopy_extensions_IngressSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressSpec) - out := out.(*IngressSpec) - if in.Backend != nil { - in, out := &in.Backend, &out.Backend - *out = new(IngressBackend) - **out = **in - } else { - out.Backend = nil - } - if in.TLS != nil { - in, out := &in.TLS, &out.TLS - *out = make([]IngressTLS, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_IngressTLS(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.TLS = nil - } - if in.Rules != nil { - in, out := &in.Rules, &out.Rules - *out = make([]IngressRule, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_IngressRule(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Rules = nil - } - return nil - } -} - -func DeepCopy_extensions_IngressStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressStatus) - out := out.(*IngressStatus) - if err := api.DeepCopy_api_LoadBalancerStatus(&in.LoadBalancer, &out.LoadBalancer, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_IngressTLS(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*IngressTLS) - out := out.(*IngressTLS) - if in.Hosts != nil { - in, out := &in.Hosts, &out.Hosts - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Hosts = nil - } - out.SecretName = in.SecretName - return nil - } -} - -func DeepCopy_extensions_NetworkPolicy(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicy) - out := out.(*NetworkPolicy) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_extensions_NetworkPolicySpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_NetworkPolicyIngressRule(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicyIngressRule) - out := out.(*NetworkPolicyIngressRule) - if in.Ports != nil { - in, out := &in.Ports, &out.Ports - *out = make([]NetworkPolicyPort, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_NetworkPolicyPort(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Ports = nil - } - if in.From != nil { - in, out := &in.From, &out.From - *out = make([]NetworkPolicyPeer, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_NetworkPolicyPeer(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.From = nil - } - return nil - } -} - -func DeepCopy_extensions_NetworkPolicyList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicyList) - out := out.(*NetworkPolicyList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]NetworkPolicy, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_NetworkPolicy(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_extensions_NetworkPolicyPeer(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicyPeer) - out := out.(*NetworkPolicyPeer) - if in.PodSelector != nil { - in, out := &in.PodSelector, &out.PodSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.PodSelector = nil - } - if in.NamespaceSelector != nil { - in, out := &in.NamespaceSelector, &out.NamespaceSelector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.NamespaceSelector = nil - } - return nil - } -} - -func DeepCopy_extensions_NetworkPolicyPort(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicyPort) - out := out.(*NetworkPolicyPort) - if in.Protocol != nil { - in, out := &in.Protocol, &out.Protocol - *out = new(api.Protocol) - **out = **in - } else { - out.Protocol = nil - } - if in.Port != nil { - in, out := &in.Port, &out.Port - *out = new(intstr.IntOrString) - **out = **in - } else { - out.Port = nil - } - return nil - } -} - -func DeepCopy_extensions_NetworkPolicySpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*NetworkPolicySpec) - out := out.(*NetworkPolicySpec) - if err := unversioned.DeepCopy_unversioned_LabelSelector(&in.PodSelector, &out.PodSelector, c); err != nil { - return err - } - if in.Ingress != nil { - in, out := &in.Ingress, &out.Ingress - *out = make([]NetworkPolicyIngressRule, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_NetworkPolicyIngressRule(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Ingress = nil - } - return nil - } -} - -func DeepCopy_extensions_PodSecurityPolicy(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSecurityPolicy) - out := out.(*PodSecurityPolicy) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_extensions_PodSecurityPolicySpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_PodSecurityPolicyList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSecurityPolicyList) - out := out.(*PodSecurityPolicyList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PodSecurityPolicy, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_PodSecurityPolicy(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_extensions_PodSecurityPolicySpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodSecurityPolicySpec) - out := out.(*PodSecurityPolicySpec) - out.Privileged = in.Privileged - if in.DefaultAddCapabilities != nil { - in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities - *out = make([]api.Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.DefaultAddCapabilities = nil - } - if in.RequiredDropCapabilities != nil { - in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities - *out = make([]api.Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.RequiredDropCapabilities = nil - } - if in.AllowedCapabilities != nil { - in, out := &in.AllowedCapabilities, &out.AllowedCapabilities - *out = make([]api.Capability, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.AllowedCapabilities = nil - } - if in.Volumes != nil { - in, out := &in.Volumes, &out.Volumes - *out = make([]FSType, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Volumes = nil - } - out.HostNetwork = in.HostNetwork - if in.HostPorts != nil { - in, out := &in.HostPorts, &out.HostPorts - *out = make([]HostPortRange, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.HostPorts = nil - } - out.HostPID = in.HostPID - out.HostIPC = in.HostIPC - if err := DeepCopy_extensions_SELinuxStrategyOptions(&in.SELinux, &out.SELinux, c); err != nil { - return err - } - if err := DeepCopy_extensions_RunAsUserStrategyOptions(&in.RunAsUser, &out.RunAsUser, c); err != nil { - return err - } - if err := DeepCopy_extensions_SupplementalGroupsStrategyOptions(&in.SupplementalGroups, &out.SupplementalGroups, c); err != nil { - return err - } - if err := DeepCopy_extensions_FSGroupStrategyOptions(&in.FSGroup, &out.FSGroup, c); err != nil { - return err - } - out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem - return nil - } -} - -func DeepCopy_extensions_ReplicaSet(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSet) - out := out.(*ReplicaSet) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_extensions_ReplicaSetSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_extensions_ReplicaSetStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_ReplicaSetCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSetCondition) - out := out.(*ReplicaSetCondition) - out.Type = in.Type - out.Status = in.Status - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_extensions_ReplicaSetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSetList) - out := out.(*ReplicaSetList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ReplicaSet, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_ReplicaSet(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_extensions_ReplicaSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSetSpec) - out := out.(*ReplicaSetSpec) - out.Replicas = in.Replicas - out.MinReadySeconds = in.MinReadySeconds - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_ReplicaSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicaSetStatus) - out := out.(*ReplicaSetStatus) - out.Replicas = in.Replicas - out.FullyLabeledReplicas = in.FullyLabeledReplicas - out.ReadyReplicas = in.ReadyReplicas - out.AvailableReplicas = in.AvailableReplicas - out.ObservedGeneration = in.ObservedGeneration - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]ReplicaSetCondition, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_ReplicaSetCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - return nil - } -} - -func DeepCopy_extensions_ReplicationControllerDummy(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ReplicationControllerDummy) - out := out.(*ReplicationControllerDummy) - out.TypeMeta = in.TypeMeta - return nil - } -} - -func DeepCopy_extensions_RollbackConfig(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RollbackConfig) - out := out.(*RollbackConfig) - out.Revision = in.Revision - return nil - } -} - -func DeepCopy_extensions_RollingUpdateDeployment(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RollingUpdateDeployment) - out := out.(*RollingUpdateDeployment) - out.MaxUnavailable = in.MaxUnavailable - out.MaxSurge = in.MaxSurge - return nil - } -} - -func DeepCopy_extensions_RunAsUserStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RunAsUserStrategyOptions) - out := out.(*RunAsUserStrategyOptions) - out.Rule = in.Rule - if in.Ranges != nil { - in, out := &in.Ranges, &out.Ranges - *out = make([]IDRange, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ranges = nil - } - return nil - } -} - -func DeepCopy_extensions_SELinuxStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SELinuxStrategyOptions) - out := out.(*SELinuxStrategyOptions) - out.Rule = in.Rule - if in.SELinuxOptions != nil { - in, out := &in.SELinuxOptions, &out.SELinuxOptions - *out = new(api.SELinuxOptions) - **out = **in - } else { - out.SELinuxOptions = nil - } - return nil - } -} - -func DeepCopy_extensions_Scale(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Scale) - out := out.(*Scale) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Spec = in.Spec - if err := DeepCopy_extensions_ScaleStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_extensions_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ScaleSpec) - out := out.(*ScaleSpec) - out.Replicas = in.Replicas - return nil - } -} - -func DeepCopy_extensions_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ScaleStatus) - out := out.(*ScaleStatus) - out.Replicas = in.Replicas - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - return nil - } -} - -func DeepCopy_extensions_SupplementalGroupsStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*SupplementalGroupsStrategyOptions) - out := out.(*SupplementalGroupsStrategyOptions) - out.Rule = in.Rule - if in.Ranges != nil { - in, out := &in.Ranges, &out.Ranges - *out = make([]IDRange, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Ranges = nil - } - return nil - } -} - -func DeepCopy_extensions_ThirdPartyResource(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ThirdPartyResource) - out := out.(*ThirdPartyResource) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Description = in.Description - if in.Versions != nil { - in, out := &in.Versions, &out.Versions - *out = make([]APIVersion, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Versions = nil - } - return nil - } -} - -func DeepCopy_extensions_ThirdPartyResourceData(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ThirdPartyResourceData) - out := out.(*ThirdPartyResourceData) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Data != nil { - in, out := &in.Data, &out.Data - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Data = nil - } - return nil - } -} - -func DeepCopy_extensions_ThirdPartyResourceDataList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ThirdPartyResourceDataList) - out := out.(*ThirdPartyResourceDataList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ThirdPartyResourceData, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_ThirdPartyResourceData(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_extensions_ThirdPartyResourceList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ThirdPartyResourceList) - out := out.(*ThirdPartyResourceList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ThirdPartyResource, len(*in)) - for i := range *in { - if err := DeepCopy_extensions_ThirdPartyResource(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go deleted file mode 100644 index ba5c19d2aeb..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go +++ /dev/null @@ -1,105 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1alpha1 - -import ( - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ImageReview, InType: reflect.TypeOf(&ImageReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ImageReviewContainerSpec, InType: reflect.TypeOf(&ImageReviewContainerSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ImageReviewSpec, InType: reflect.TypeOf(&ImageReviewSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ImageReviewStatus, InType: reflect.TypeOf(&ImageReviewStatus{})}, - ) -} - -func DeepCopy_v1alpha1_ImageReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ImageReview) - out := out.(*ImageReview) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1alpha1_ImageReviewSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_v1alpha1_ImageReviewContainerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ImageReviewContainerSpec) - out := out.(*ImageReviewContainerSpec) - out.Image = in.Image - return nil - } -} - -func DeepCopy_v1alpha1_ImageReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ImageReviewSpec) - out := out.(*ImageReviewSpec) - if in.Containers != nil { - in, out := &in.Containers, &out.Containers - *out = make([]ImageReviewContainerSpec, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Containers = nil - } - if in.Annotations != nil { - in, out := &in.Annotations, &out.Annotations - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Annotations = nil - } - out.Namespace = in.Namespace - return nil - } -} - -func DeepCopy_v1alpha1_ImageReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ImageReviewStatus) - out := out.(*ImageReviewStatus) - out.Allowed = in.Allowed - out.Reason = in.Reason - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go deleted file mode 100644 index abe64ed78ad..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go +++ /dev/null @@ -1,105 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package imagepolicy - -import ( - api "k8s.io/client-go/pkg/api" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_imagepolicy_ImageReview, InType: reflect.TypeOf(&ImageReview{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_imagepolicy_ImageReviewContainerSpec, InType: reflect.TypeOf(&ImageReviewContainerSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_imagepolicy_ImageReviewSpec, InType: reflect.TypeOf(&ImageReviewSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_imagepolicy_ImageReviewStatus, InType: reflect.TypeOf(&ImageReviewStatus{})}, - ) -} - -func DeepCopy_imagepolicy_ImageReview(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ImageReview) - out := out.(*ImageReview) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_imagepolicy_ImageReviewSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - out.Status = in.Status - return nil - } -} - -func DeepCopy_imagepolicy_ImageReviewContainerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ImageReviewContainerSpec) - out := out.(*ImageReviewContainerSpec) - out.Image = in.Image - return nil - } -} - -func DeepCopy_imagepolicy_ImageReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ImageReviewSpec) - out := out.(*ImageReviewSpec) - if in.Containers != nil { - in, out := &in.Containers, &out.Containers - *out = make([]ImageReviewContainerSpec, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Containers = nil - } - if in.Annotations != nil { - in, out := &in.Annotations, &out.Annotations - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Annotations = nil - } - out.Namespace = in.Namespace - return nil - } -} - -func DeepCopy_imagepolicy_ImageReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ImageReviewStatus) - out := out.(*ImageReviewStatus) - out.Allowed = in.Allowed - out.Reason = in.Reason - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go deleted file mode 100644 index 08f58fde52e..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go +++ /dev/null @@ -1,145 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1beta1 - -import ( - unversioned "k8s.io/client-go/pkg/api/unversioned" - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Eviction, InType: reflect.TypeOf(&Eviction{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodDisruptionBudget, InType: reflect.TypeOf(&PodDisruptionBudget{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodDisruptionBudgetList, InType: reflect.TypeOf(&PodDisruptionBudgetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodDisruptionBudgetSpec, InType: reflect.TypeOf(&PodDisruptionBudgetSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodDisruptionBudgetStatus, InType: reflect.TypeOf(&PodDisruptionBudgetStatus{})}, - ) -} - -func DeepCopy_v1beta1_Eviction(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Eviction) - out := out.(*Eviction) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.DeleteOptions != nil { - in, out := &in.DeleteOptions, &out.DeleteOptions - *out = new(v1.DeleteOptions) - if err := v1.DeepCopy_v1_DeleteOptions(*in, *out, c); err != nil { - return err - } - } else { - out.DeleteOptions = nil - } - return nil - } -} - -func DeepCopy_v1beta1_PodDisruptionBudget(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodDisruptionBudget) - out := out.(*PodDisruptionBudget) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_PodDisruptionBudgetSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_PodDisruptionBudgetStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_PodDisruptionBudgetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodDisruptionBudgetList) - out := out.(*PodDisruptionBudgetList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PodDisruptionBudget, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_PodDisruptionBudget(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodDisruptionBudgetSpec) - out := out.(*PodDisruptionBudgetSpec) - out.MinAvailable = in.MinAvailable - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - return nil - } -} - -func DeepCopy_v1beta1_PodDisruptionBudgetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodDisruptionBudgetStatus) - out := out.(*PodDisruptionBudgetStatus) - out.ObservedGeneration = in.ObservedGeneration - if in.DisruptedPods != nil { - in, out := &in.DisruptedPods, &out.DisruptedPods - *out = make(map[string]unversioned.Time) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.DisruptedPods = nil - } - out.PodDisruptionsAllowed = in.PodDisruptionsAllowed - out.CurrentHealthy = in.CurrentHealthy - out.DesiredHealthy = in.DesiredHealthy - out.ExpectedPods = in.ExpectedPods - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go deleted file mode 100644 index 6d9dd0e9c14..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go +++ /dev/null @@ -1,145 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package policy - -import ( - api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_Eviction, InType: reflect.TypeOf(&Eviction{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudget, InType: reflect.TypeOf(&PodDisruptionBudget{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudgetList, InType: reflect.TypeOf(&PodDisruptionBudgetList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudgetSpec, InType: reflect.TypeOf(&PodDisruptionBudgetSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudgetStatus, InType: reflect.TypeOf(&PodDisruptionBudgetStatus{})}, - ) -} - -func DeepCopy_policy_Eviction(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Eviction) - out := out.(*Eviction) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.DeleteOptions != nil { - in, out := &in.DeleteOptions, &out.DeleteOptions - *out = new(api.DeleteOptions) - if err := api.DeepCopy_api_DeleteOptions(*in, *out, c); err != nil { - return err - } - } else { - out.DeleteOptions = nil - } - return nil - } -} - -func DeepCopy_policy_PodDisruptionBudget(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodDisruptionBudget) - out := out.(*PodDisruptionBudget) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_policy_PodDisruptionBudgetSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_policy_PodDisruptionBudgetStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_policy_PodDisruptionBudgetList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodDisruptionBudgetList) - out := out.(*PodDisruptionBudgetList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]PodDisruptionBudget, len(*in)) - for i := range *in { - if err := DeepCopy_policy_PodDisruptionBudget(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_policy_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodDisruptionBudgetSpec) - out := out.(*PodDisruptionBudgetSpec) - out.MinAvailable = in.MinAvailable - if in.Selector != nil { - in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) - if err := unversioned.DeepCopy_unversioned_LabelSelector(*in, *out, c); err != nil { - return err - } - } else { - out.Selector = nil - } - return nil - } -} - -func DeepCopy_policy_PodDisruptionBudgetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PodDisruptionBudgetStatus) - out := out.(*PodDisruptionBudgetStatus) - out.ObservedGeneration = in.ObservedGeneration - if in.DisruptedPods != nil { - in, out := &in.DisruptedPods, &out.DisruptedPods - *out = make(map[string]unversioned.Time) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } else { - out.DisruptedPods = nil - } - out.PodDisruptionsAllowed = in.PodDisruptionsAllowed - out.CurrentHealthy = in.CurrentHealthy - out.DesiredHealthy = in.DesiredHealthy - out.ExpectedPods = in.ExpectedPods - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go deleted file mode 100644 index 0631bb7cc29..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go +++ /dev/null @@ -1,293 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1alpha1 - -import ( - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRole, InType: reflect.TypeOf(&ClusterRole{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRoleBinding, InType: reflect.TypeOf(&ClusterRoleBinding{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRoleBindingList, InType: reflect.TypeOf(&ClusterRoleBindingList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRoleList, InType: reflect.TypeOf(&ClusterRoleList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PolicyRule, InType: reflect.TypeOf(&PolicyRule{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_Role, InType: reflect.TypeOf(&Role{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleBinding, InType: reflect.TypeOf(&RoleBinding{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleBindingList, InType: reflect.TypeOf(&RoleBindingList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleList, InType: reflect.TypeOf(&RoleList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleRef, InType: reflect.TypeOf(&RoleRef{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_Subject, InType: reflect.TypeOf(&Subject{})}, - ) -} - -func DeepCopy_v1alpha1_ClusterRole(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterRole) - out := out.(*ClusterRole) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Rules != nil { - in, out := &in.Rules, &out.Rules - *out = make([]PolicyRule, len(*in)) - for i := range *in { - if err := DeepCopy_v1alpha1_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Rules = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_ClusterRoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterRoleBinding) - out := out.(*ClusterRoleBinding) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Subjects != nil { - in, out := &in.Subjects, &out.Subjects - *out = make([]Subject, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Subjects = nil - } - out.RoleRef = in.RoleRef - return nil - } -} - -func DeepCopy_v1alpha1_ClusterRoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterRoleBindingList) - out := out.(*ClusterRoleBindingList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterRoleBinding, len(*in)) - for i := range *in { - if err := DeepCopy_v1alpha1_ClusterRoleBinding(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_ClusterRoleList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterRoleList) - out := out.(*ClusterRoleList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterRole, len(*in)) - for i := range *in { - if err := DeepCopy_v1alpha1_ClusterRole(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_PolicyRule(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PolicyRule) - out := out.(*PolicyRule) - if in.Verbs != nil { - in, out := &in.Verbs, &out.Verbs - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Verbs = nil - } - if err := runtime.DeepCopy_runtime_RawExtension(&in.AttributeRestrictions, &out.AttributeRestrictions, c); err != nil { - return err - } - if in.APIGroups != nil { - in, out := &in.APIGroups, &out.APIGroups - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.APIGroups = nil - } - if in.Resources != nil { - in, out := &in.Resources, &out.Resources - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Resources = nil - } - if in.ResourceNames != nil { - in, out := &in.ResourceNames, &out.ResourceNames - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.ResourceNames = nil - } - if in.NonResourceURLs != nil { - in, out := &in.NonResourceURLs, &out.NonResourceURLs - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.NonResourceURLs = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_Role(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Role) - out := out.(*Role) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Rules != nil { - in, out := &in.Rules, &out.Rules - *out = make([]PolicyRule, len(*in)) - for i := range *in { - if err := DeepCopy_v1alpha1_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Rules = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_RoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RoleBinding) - out := out.(*RoleBinding) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Subjects != nil { - in, out := &in.Subjects, &out.Subjects - *out = make([]Subject, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Subjects = nil - } - out.RoleRef = in.RoleRef - return nil - } -} - -func DeepCopy_v1alpha1_RoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RoleBindingList) - out := out.(*RoleBindingList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]RoleBinding, len(*in)) - for i := range *in { - if err := DeepCopy_v1alpha1_RoleBinding(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_RoleList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RoleList) - out := out.(*RoleList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Role, len(*in)) - for i := range *in { - if err := DeepCopy_v1alpha1_Role(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1alpha1_RoleRef(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RoleRef) - out := out.(*RoleRef) - out.APIGroup = in.APIGroup - out.Kind = in.Kind - out.Name = in.Name - return nil - } -} - -func DeepCopy_v1alpha1_Subject(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Subject) - out := out.(*Subject) - out.Kind = in.Kind - out.APIVersion = in.APIVersion - out.Name = in.Name - out.Namespace = in.Namespace - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go deleted file mode 100644 index bd340bf4b6f..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go +++ /dev/null @@ -1,298 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package rbac - -import ( - reflect "reflect" - - api "k8s.io/client-go/pkg/api" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRole, InType: reflect.TypeOf(&ClusterRole{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRoleBinding, InType: reflect.TypeOf(&ClusterRoleBinding{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRoleBindingList, InType: reflect.TypeOf(&ClusterRoleBindingList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRoleList, InType: reflect.TypeOf(&ClusterRoleList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_PolicyRule, InType: reflect.TypeOf(&PolicyRule{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_Role, InType: reflect.TypeOf(&Role{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleBinding, InType: reflect.TypeOf(&RoleBinding{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleBindingList, InType: reflect.TypeOf(&RoleBindingList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleList, InType: reflect.TypeOf(&RoleList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleRef, InType: reflect.TypeOf(&RoleRef{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_Subject, InType: reflect.TypeOf(&Subject{})}, - ) -} - -func DeepCopy_rbac_ClusterRole(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterRole) - out := out.(*ClusterRole) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Rules != nil { - in, out := &in.Rules, &out.Rules - *out = make([]PolicyRule, len(*in)) - for i := range *in { - if err := DeepCopy_rbac_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Rules = nil - } - return nil - } -} - -func DeepCopy_rbac_ClusterRoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterRoleBinding) - out := out.(*ClusterRoleBinding) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Subjects != nil { - in, out := &in.Subjects, &out.Subjects - *out = make([]Subject, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Subjects = nil - } - out.RoleRef = in.RoleRef - return nil - } -} - -func DeepCopy_rbac_ClusterRoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterRoleBindingList) - out := out.(*ClusterRoleBindingList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterRoleBinding, len(*in)) - for i := range *in { - if err := DeepCopy_rbac_ClusterRoleBinding(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_rbac_ClusterRoleList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterRoleList) - out := out.(*ClusterRoleList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]ClusterRole, len(*in)) - for i := range *in { - if err := DeepCopy_rbac_ClusterRole(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_rbac_PolicyRule(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*PolicyRule) - out := out.(*PolicyRule) - if in.Verbs != nil { - in, out := &in.Verbs, &out.Verbs - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Verbs = nil - } - if in.AttributeRestrictions == nil { - out.AttributeRestrictions = nil - } else if newVal, err := c.DeepCopy(&in.AttributeRestrictions); err != nil { - return err - } else { - out.AttributeRestrictions = *newVal.(*runtime.Object) - } - if in.APIGroups != nil { - in, out := &in.APIGroups, &out.APIGroups - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.APIGroups = nil - } - if in.Resources != nil { - in, out := &in.Resources, &out.Resources - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Resources = nil - } - if in.ResourceNames != nil { - in, out := &in.ResourceNames, &out.ResourceNames - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.ResourceNames = nil - } - if in.NonResourceURLs != nil { - in, out := &in.NonResourceURLs, &out.NonResourceURLs - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.NonResourceURLs = nil - } - return nil - } -} - -func DeepCopy_rbac_Role(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Role) - out := out.(*Role) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Rules != nil { - in, out := &in.Rules, &out.Rules - *out = make([]PolicyRule, len(*in)) - for i := range *in { - if err := DeepCopy_rbac_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Rules = nil - } - return nil - } -} - -func DeepCopy_rbac_RoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RoleBinding) - out := out.(*RoleBinding) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if in.Subjects != nil { - in, out := &in.Subjects, &out.Subjects - *out = make([]Subject, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.Subjects = nil - } - out.RoleRef = in.RoleRef - return nil - } -} - -func DeepCopy_rbac_RoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RoleBindingList) - out := out.(*RoleBindingList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]RoleBinding, len(*in)) - for i := range *in { - if err := DeepCopy_rbac_RoleBinding(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_rbac_RoleList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RoleList) - out := out.(*RoleList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Role, len(*in)) - for i := range *in { - if err := DeepCopy_rbac_Role(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_rbac_RoleRef(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RoleRef) - out := out.(*RoleRef) - out.APIGroup = in.APIGroup - out.Kind = in.Kind - out.Name = in.Name - return nil - } -} - -func DeepCopy_rbac_Subject(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Subject) - out := out.(*Subject) - out.Kind = in.Kind - out.APIVersion = in.APIVersion - out.Name = in.Name - out.Namespace = in.Namespace - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go deleted file mode 100644 index 05b9feca812..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go +++ /dev/null @@ -1,84 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1beta1 - -import ( - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StorageClass, InType: reflect.TypeOf(&StorageClass{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StorageClassList, InType: reflect.TypeOf(&StorageClassList{})}, - ) -} - -func DeepCopy_v1beta1_StorageClass(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StorageClass) - out := out.(*StorageClass) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Provisioner = in.Provisioner - if in.Parameters != nil { - in, out := &in.Parameters, &out.Parameters - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Parameters = nil - } - return nil - } -} - -func DeepCopy_v1beta1_StorageClassList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StorageClassList) - out := out.(*StorageClassList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]StorageClass, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_StorageClass(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go deleted file mode 100644 index a1c1817537e..00000000000 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go +++ /dev/null @@ -1,84 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package storage - -import ( - api "k8s.io/client-go/pkg/api" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_storage_StorageClass, InType: reflect.TypeOf(&StorageClass{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_storage_StorageClassList, InType: reflect.TypeOf(&StorageClassList{})}, - ) -} - -func DeepCopy_storage_StorageClass(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StorageClass) - out := out.(*StorageClass) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - out.Provisioner = in.Provisioner - if in.Parameters != nil { - in, out := &in.Parameters, &out.Parameters - *out = make(map[string]string) - for key, val := range *in { - (*out)[key] = val - } - } else { - out.Parameters = nil - } - return nil - } -} - -func DeepCopy_storage_StorageClassList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*StorageClassList) - out := out.(*StorageClassList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]StorageClass, len(*in)) - for i := range *in { - if err := DeepCopy_storage_StorageClass(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go deleted file mode 100644 index 16b06a16211..00000000000 --- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go +++ /dev/null @@ -1,159 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package v1beta1 - -import ( - v1 "k8s.io/client-go/pkg/api/v1" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Cluster, InType: reflect.TypeOf(&Cluster{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterCondition, InType: reflect.TypeOf(&ClusterCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterList, InType: reflect.TypeOf(&ClusterList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterSpec, InType: reflect.TypeOf(&ClusterSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterStatus, InType: reflect.TypeOf(&ClusterStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ServerAddressByClientCIDR, InType: reflect.TypeOf(&ServerAddressByClientCIDR{})}, - ) -} - -func DeepCopy_v1beta1_Cluster(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Cluster) - out := out.(*Cluster) - out.TypeMeta = in.TypeMeta - if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_ClusterSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_v1beta1_ClusterStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_v1beta1_ClusterCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterCondition) - out := out.(*ClusterCondition) - out.Type = in.Type - out.Status = in.Status - out.LastProbeTime = in.LastProbeTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_v1beta1_ClusterList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterList) - out := out.(*ClusterList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Cluster, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_Cluster(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_v1beta1_ClusterSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterSpec) - out := out.(*ClusterSpec) - if in.ServerAddressByClientCIDRs != nil { - in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs - *out = make([]ServerAddressByClientCIDR, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.ServerAddressByClientCIDRs = nil - } - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(v1.LocalObjectReference) - **out = **in - } else { - out.SecretRef = nil - } - return nil - } -} - -func DeepCopy_v1beta1_ClusterStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterStatus) - out := out.(*ClusterStatus) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]ClusterCondition, len(*in)) - for i := range *in { - if err := DeepCopy_v1beta1_ClusterCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.Zones != nil { - in, out := &in.Zones, &out.Zones - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Zones = nil - } - out.Region = in.Region - return nil - } -} - -func DeepCopy_v1beta1_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServerAddressByClientCIDR) - out := out.(*ServerAddressByClientCIDR) - out.ClientCIDR = in.ClientCIDR - out.ServerAddress = in.ServerAddress - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go deleted file mode 100644 index 32e8bc360af..00000000000 --- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go +++ /dev/null @@ -1,200 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package federation - -import ( - api "k8s.io/client-go/pkg/api" - conversion "k8s.io/client-go/pkg/conversion" - runtime "k8s.io/client-go/pkg/runtime" - reflect "reflect" -) - -func init() { - SchemeBuilder.Register(RegisterDeepCopies) -} - -// RegisterDeepCopies adds deep-copy functions to the given scheme. Public -// to allow building arbitrary schemes. -func RegisterDeepCopies(scheme *runtime.Scheme) error { - return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_Cluster, InType: reflect.TypeOf(&Cluster{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterCondition, InType: reflect.TypeOf(&ClusterCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterList, InType: reflect.TypeOf(&ClusterList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterReplicaSetPreferences, InType: reflect.TypeOf(&ClusterReplicaSetPreferences{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterSpec, InType: reflect.TypeOf(&ClusterSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterStatus, InType: reflect.TypeOf(&ClusterStatus{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_FederatedReplicaSetPreferences, InType: reflect.TypeOf(&FederatedReplicaSetPreferences{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ServerAddressByClientCIDR, InType: reflect.TypeOf(&ServerAddressByClientCIDR{})}, - ) -} - -func DeepCopy_federation_Cluster(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Cluster) - out := out.(*Cluster) - out.TypeMeta = in.TypeMeta - if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { - return err - } - if err := DeepCopy_federation_ClusterSpec(&in.Spec, &out.Spec, c); err != nil { - return err - } - if err := DeepCopy_federation_ClusterStatus(&in.Status, &out.Status, c); err != nil { - return err - } - return nil - } -} - -func DeepCopy_federation_ClusterCondition(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterCondition) - out := out.(*ClusterCondition) - out.Type = in.Type - out.Status = in.Status - out.LastProbeTime = in.LastProbeTime.DeepCopy() - out.LastTransitionTime = in.LastTransitionTime.DeepCopy() - out.Reason = in.Reason - out.Message = in.Message - return nil - } -} - -func DeepCopy_federation_ClusterList(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterList) - out := out.(*ClusterList) - out.TypeMeta = in.TypeMeta - out.ListMeta = in.ListMeta - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Cluster, len(*in)) - for i := range *in { - if err := DeepCopy_federation_Cluster(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Items = nil - } - return nil - } -} - -func DeepCopy_federation_ClusterReplicaSetPreferences(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterReplicaSetPreferences) - out := out.(*ClusterReplicaSetPreferences) - out.MinReplicas = in.MinReplicas - if in.MaxReplicas != nil { - in, out := &in.MaxReplicas, &out.MaxReplicas - *out = new(int64) - **out = **in - } else { - out.MaxReplicas = nil - } - out.Weight = in.Weight - return nil - } -} - -func DeepCopy_federation_ClusterSpec(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterSpec) - out := out.(*ClusterSpec) - if in.ServerAddressByClientCIDRs != nil { - in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs - *out = make([]ServerAddressByClientCIDR, len(*in)) - for i := range *in { - (*out)[i] = (*in)[i] - } - } else { - out.ServerAddressByClientCIDRs = nil - } - if in.SecretRef != nil { - in, out := &in.SecretRef, &out.SecretRef - *out = new(api.LocalObjectReference) - **out = **in - } else { - out.SecretRef = nil - } - return nil - } -} - -func DeepCopy_federation_ClusterStatus(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ClusterStatus) - out := out.(*ClusterStatus) - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]ClusterCondition, len(*in)) - for i := range *in { - if err := DeepCopy_federation_ClusterCondition(&(*in)[i], &(*out)[i], c); err != nil { - return err - } - } - } else { - out.Conditions = nil - } - if in.Zones != nil { - in, out := &in.Zones, &out.Zones - *out = make([]string, len(*in)) - copy(*out, *in) - } else { - out.Zones = nil - } - out.Region = in.Region - return nil - } -} - -func DeepCopy_federation_FederatedReplicaSetPreferences(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*FederatedReplicaSetPreferences) - out := out.(*FederatedReplicaSetPreferences) - out.Rebalance = in.Rebalance - if in.Clusters != nil { - in, out := &in.Clusters, &out.Clusters - *out = make(map[string]ClusterReplicaSetPreferences) - for key, val := range *in { - newVal := new(ClusterReplicaSetPreferences) - if err := DeepCopy_federation_ClusterReplicaSetPreferences(&val, newVal, c); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.Clusters = nil - } - return nil - } -} - -func DeepCopy_federation_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*ServerAddressByClientCIDR) - out := out.(*ServerAddressByClientCIDR) - out.ClientCIDR = in.ClientCIDR - out.ServerAddress = in.ServerAddress - return nil - } -} diff --git a/staging/src/k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go deleted file mode 100644 index 09bf660025b..00000000000 --- a/staging/src/k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go +++ /dev/null @@ -1,75 +0,0 @@ -// +build !ignore_autogenerated - -/* -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. -*/ - -// This file was autogenerated by deepcopy-gen. Do not edit it manually! - -package runtime - -import ( - conversion "k8s.io/client-go/pkg/conversion" -) - -func DeepCopy_runtime_RawExtension(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*RawExtension) - out := out.(*RawExtension) - if in.Raw != nil { - in, out := &in.Raw, &out.Raw - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Raw = nil - } - if in.Object == nil { - out.Object = nil - } else if newVal, err := c.DeepCopy(&in.Object); err != nil { - return err - } else { - out.Object = *newVal.(*Object) - } - return nil - } -} - -func DeepCopy_runtime_TypeMeta(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*TypeMeta) - out := out.(*TypeMeta) - out.APIVersion = in.APIVersion - out.Kind = in.Kind - return nil - } -} - -func DeepCopy_runtime_Unknown(in interface{}, out interface{}, c *conversion.Cloner) error { - { - in := in.(*Unknown) - out := out.(*Unknown) - out.TypeMeta = in.TypeMeta - if in.Raw != nil { - in, out := &in.Raw, &out.Raw - *out = make([]byte, len(*in)) - copy(*out, *in) - } else { - out.Raw = nil - } - out.ContentEncoding = in.ContentEncoding - out.ContentType = in.ContentType - return nil - } -} diff --git a/test/e2e/BUILD b/test/e2e/BUILD index e4e796f67ac..64a09569b7b 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -119,7 +119,6 @@ go_library( "//pkg/api/annotations:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/api/v1/service:go_default_library", @@ -131,6 +130,7 @@ go_library( "//pkg/apis/batch/v2alpha1:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/apis/storage/v1beta1/util:go_default_library", "//pkg/client/cache:go_default_library", @@ -209,7 +209,6 @@ go_library( "//vendor:google.golang.org/api/googleapi", "//vendor:gopkg.in/inf.v0", "//vendor:k8s.io/client-go/kubernetes", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/extensions/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1", diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index 29e86bad36c..dc06e03f96d 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -35,10 +35,10 @@ go_library( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/pod:go_default_library", "//pkg/apimachinery/registered:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/conditions:go_default_library", "//pkg/kubelet:go_default_library", diff --git a/test/e2e/common/empty_dir.go b/test/e2e/common/empty_dir.go index 456e7a3a2a3..12b22ecb8e9 100644 --- a/test/e2e/common/empty_dir.go +++ b/test/e2e/common/empty_dir.go @@ -20,7 +20,7 @@ import ( "fmt" "path" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/util/uuid" @@ -313,7 +313,7 @@ func formatMedium(medium v1.StorageMedium) string { func testPodWithVolume(image, path string, source *v1.EmptyDirVolumeSource) *v1.Pod { podName := "pod-" + string(uuid.NewUUID()) return &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, diff --git a/test/e2e/common/host_path.go b/test/e2e/common/host_path.go index 2ee90614c33..08f57e90500 100644 --- a/test/e2e/common/host_path.go +++ b/test/e2e/common/host_path.go @@ -21,7 +21,7 @@ import ( "os" "path" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/test/e2e/framework" @@ -134,7 +134,7 @@ func testPodWithHostVol(path string, source *v1.HostPathVolumeSource) *v1.Pod { podName := "pod-host-path-test" return &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, diff --git a/test/e2e/common/volumes.go b/test/e2e/common/volumes.go index 532d363a587..9ffbbd3df6f 100644 --- a/test/e2e/common/volumes.go +++ b/test/e2e/common/volumes.go @@ -48,7 +48,7 @@ import ( "time" apierrs "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/test/e2e/framework" @@ -118,7 +118,7 @@ func startVolumeServer(f *framework.Framework, config VolumeTestConfig) *v1.Pod privileged := new(bool) *privileged = true serverPod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, @@ -194,7 +194,7 @@ func volumeTestCleanup(f *framework.Framework, config VolumeTestConfig) { func testVolumeClient(f *framework.Framework, config VolumeTestConfig, volume v1.VolumeSource, fsGroup *int64, expectedContent string) { By(fmt.Sprint("starting ", config.prefix, " client")) clientPod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, @@ -270,7 +270,7 @@ func injectHtml(client clientset.Interface, config VolumeTestConfig, volume v1.V podClient := client.Core().Pods(config.namespace) injectPod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, @@ -417,7 +417,7 @@ var _ = framework.KubeDescribe("GCP Volumes", func() { // create Endpoints for the server endpoints := v1.Endpoints{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Endpoints", APIVersion: "v1", }, diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index 7b73001a2df..ca14d6eca02 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" @@ -158,7 +158,7 @@ var _ = framework.KubeDescribe("Daemon set [Serial]", func() { Name: dsName, }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: complexLabel}, + Selector: &metav1.LabelSelector{MatchLabels: complexLabel}, Template: v1.PodTemplateSpec{ ObjectMeta: v1.ObjectMeta{ Labels: complexLabel, @@ -226,7 +226,7 @@ var _ = framework.KubeDescribe("Daemon set [Serial]", func() { Name: dsName, }, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: complexLabel}, + Selector: &metav1.LabelSelector{MatchLabels: complexLabel}, Template: v1.PodTemplateSpec{ ObjectMeta: v1.ObjectMeta{ Labels: complexLabel, @@ -323,7 +323,7 @@ func setDaemonSetNodeLabels(c clientset.Interface, nodeName string, labels map[s newLabels, _ = separateDaemonSetNodeLabels(newNode.Labels) return true, err } - if se, ok := err.(*apierrs.StatusError); ok && se.ErrStatus.Reason == unversioned.StatusReasonConflict { + if se, ok := err.(*apierrs.StatusError); ok && se.ErrStatus.Reason == metav1.StatusReasonConflict { framework.Logf("failed to update node due to resource version conflict") return false, nil } diff --git a/test/e2e/density.go b/test/e2e/density.go index 3e0aa558e26..34c3c30ff32 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" @@ -435,11 +435,11 @@ var _ = framework.KubeDescribe("Density", func() { if itArg.runLatencyTest { By("Scheduling additional Pods to measure startup latencies") - createTimes := make(map[string]unversioned.Time, 0) + createTimes := make(map[string]metav1.Time, 0) nodeNames := make(map[string]string, 0) - scheduleTimes := make(map[string]unversioned.Time, 0) - runTimes := make(map[string]unversioned.Time, 0) - watchTimes := make(map[string]unversioned.Time, 0) + scheduleTimes := make(map[string]metav1.Time, 0) + runTimes := make(map[string]metav1.Time, 0) + watchTimes := make(map[string]metav1.Time, 0) var mutex sync.Mutex checkPod := func(p *v1.Pod) { @@ -449,10 +449,10 @@ var _ = framework.KubeDescribe("Density", func() { if p.Status.Phase == v1.PodRunning { if _, found := watchTimes[p.Name]; !found { - watchTimes[p.Name] = unversioned.Now() + watchTimes[p.Name] = metav1.Now() createTimes[p.Name] = p.CreationTimestamp nodeNames[p.Name] = p.Spec.NodeName - var startTime unversioned.Time + var startTime metav1.Time for _, cs := range p.Status.ContainerStatuses { if cs.State.Running != nil { if startTime.Before(cs.State.Running.StartedAt) { @@ -460,7 +460,7 @@ var _ = framework.KubeDescribe("Density", func() { } } } - if startTime != unversioned.NewTime(time.Time{}) { + if startTime != metav1.NewTime(time.Time{}) { runTimes[p.Name] = startTime } else { framework.Failf("Pod %v is reported to be running, but none of its containers is", p.Name) diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 91783a39c89..2b09f4f884a 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/annotations" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -117,7 +117,7 @@ func newDeployment(deploymentName string, replicas int32, podLabels map[string]s }, Spec: extensions.DeploymentSpec{ Replicas: func(i int32) *int32 { return &i }(replicas), - Selector: &unversioned.LabelSelector{MatchLabels: podLabels}, + Selector: &metav1.LabelSelector{MatchLabels: podLabels}, Strategy: extensions.DeploymentStrategy{ Type: strategyType, }, @@ -195,7 +195,7 @@ func stopDeploymentMaybeOverlap(c clientset.Interface, internalClient internalcl Expect(err).To(HaveOccurred()) Expect(errors.IsNotFound(err)).To(BeTrue()) framework.Logf("Ensuring deployment %s's RSes were deleted", deploymentName) - selector, err := unversioned.LabelSelectorAsSelector(deployment.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(deployment.Spec.Selector) Expect(err).NotTo(HaveOccurred()) options := v1.ListOptions{LabelSelector: selector.String()} rss, err := c.Extensions().ReplicaSets(ns).List(options) @@ -629,7 +629,7 @@ func testPausedDeployment(f *framework.Framework) { err = framework.WaitForObservedDeployment(c, ns, deploymentName, deployment.Generation) Expect(err).NotTo(HaveOccurred()) - selector, err := unversioned.LabelSelectorAsSelector(deployment.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(deployment.Spec.Selector) if err != nil { Expect(err).NotTo(HaveOccurred()) } @@ -975,7 +975,7 @@ func testDeploymentLabelAdopted(f *framework.Framework) { err = framework.CheckRSHashLabel(newRS) Expect(err).NotTo(HaveOccurred()) // All pods targeted by the deployment should contain pod-template-hash in their labels, and there should be only 3 pods - selector, err := unversioned.LabelSelectorAsSelector(deployment.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(deployment.Spec.Selector) Expect(err).NotTo(HaveOccurred()) options := v1.ListOptions{LabelSelector: selector.String()} pods, err := c.Core().Pods(ns).List(options) @@ -1424,7 +1424,7 @@ func testIterativeDeployments(f *framework.Framework) { default: // arbitrarily delete deployment pods framework.Logf("%02d: arbitrarily deleting one or more deployment pods for deployment %q", i, deployment.Name) - selector, err := unversioned.LabelSelectorAsSelector(deployment.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(deployment.Spec.Selector) Expect(err).NotTo(HaveOccurred()) opts := v1.ListOptions{LabelSelector: selector.String()} podList, err := c.Core().Pods(ns).List(opts) diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go index 61b9898e93b..15c6c55ad38 100644 --- a/test/e2e/disruption.go +++ b/test/e2e/disruption.go @@ -23,7 +23,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/api/v1" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" policy "k8s.io/client-go/pkg/apis/policy/v1beta1" @@ -193,7 +193,7 @@ func createPodDisruptionBudgetOrDie(cs *kubernetes.Clientset, ns string, minAvai Namespace: ns, }, Spec: policy.PodDisruptionBudgetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, MinAvailable: minAvailable, }, } @@ -272,7 +272,7 @@ func createReplicaSetOrDie(cs *kubernetes.Clientset, ns string, size int32, excl }, Spec: extensions.ReplicaSetSpec{ Replicas: &size, - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"foo": "bar"}, }, Template: v1.PodTemplateSpec{ diff --git a/test/e2e/dns.go b/test/e2e/dns.go index 3bafd1f256d..43aef508389 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/apimachinery/registered" @@ -45,7 +45,7 @@ var dnsServiceLabelSelector = labels.Set{ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string, useAnnotation bool) *v1.Pod { dnsPod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, diff --git a/test/e2e/dns_configmap.go b/test/e2e/dns_configmap.go index e7162639b51..31ec4e10012 100644 --- a/test/e2e/dns_configmap.go +++ b/test/e2e/dns_configmap.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" fed "k8s.io/kubernetes/pkg/dns/federation" @@ -254,7 +254,7 @@ func (t *dnsConfigMapTest) createUtilPod() { const servicePort = 10101 t.utilPod = &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", }, ObjectMeta: v1.ObjectMeta{ @@ -283,7 +283,7 @@ func (t *dnsConfigMapTest) createUtilPod() { Expect(t.f.WaitForPodRunning(t.utilPod.Name)).NotTo(HaveOccurred()) t.utilService = &v1.Service{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Service", }, ObjectMeta: v1.ObjectMeta{ diff --git a/test/e2e/federation-deployment.go b/test/e2e/federation-deployment.go index df7dc2ebfc1..3c7d1a84567 100644 --- a/test/e2e/federation-deployment.go +++ b/test/e2e/federation-deployment.go @@ -24,7 +24,7 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/util/wait" @@ -284,7 +284,7 @@ func newDeploymentForFed(namespace string, name string, replicas int32) *v1beta1 }, Spec: v1beta1.DeploymentSpec{ Replicas: &replicas, - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"name": "myrs"}, }, Template: v1.PodTemplateSpec{ diff --git a/test/e2e/federation-replicaset.go b/test/e2e/federation-replicaset.go index c7473a4d75e..5bdca8d0876 100644 --- a/test/e2e/federation-replicaset.go +++ b/test/e2e/federation-replicaset.go @@ -24,7 +24,7 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/util/wait" @@ -285,7 +285,7 @@ func newReplicaSet(namespace string, name string, replicas int32) *v1beta1.Repli }, Spec: v1beta1.ReplicaSetSpec{ Replicas: &replicas, - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{"name": "myrs"}, }, Template: v1.PodTemplateSpec{ diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index fd808a7d16d..19801c35cf6 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -33,7 +33,6 @@ go_library( "//federation/client/clientset_generated/federation_release_1_5:go_default_library", "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/validation:go_default_library", "//pkg/apimachinery/registered:go_default_library", @@ -42,6 +41,7 @@ go_library( "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/clientset_generated/release_1_5/typed/core/v1:go_default_library", diff --git a/test/e2e/framework/networking_utils.go b/test/e2e/framework/networking_utils.go index de74eceef9a..b8a2bcd2b1c 100644 --- a/test/e2e/framework/networking_utils.go +++ b/test/e2e/framework/networking_utils.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" @@ -313,7 +313,7 @@ func (config *NetworkingTestConfig) createNetShellPodSpec(podName string, node s }, } pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, @@ -357,7 +357,7 @@ func (config *NetworkingTestConfig) createNetShellPodSpec(podName string, node s func (config *NetworkingTestConfig) createTestPodSpec() *v1.Pod { pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index d5d3bd9c244..a2ff5b2801c 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -44,7 +44,7 @@ import ( "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" @@ -381,7 +381,7 @@ func SkipIfMissingResource(clientPool dynamic.ClientPool, gvr schema.GroupVersio if err != nil { Failf("Unexpected error getting dynamic client for %v: %v", gvr.GroupVersion(), err) } - apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true} + apiResource := metav1.APIResource{Name: gvr.Resource, Namespaced: true} _, err = dynamicClient.Resource(&apiResource, namespace).List(&v1.ListOptions{}) if err != nil { // not all resources support list, so we ignore those @@ -1104,7 +1104,7 @@ func hasRemainingContent(c clientset.Interface, clientPool dynamic.ClientPool, n continue } // get the api resource - apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true} + apiResource := metav1.APIResource{Name: gvr.Resource, Namespaced: true} // TODO: temporary hack for https://github.com/kubernetes/kubernetes/issues/31798 if ignoredResources.Has(apiResource.Name) { Logf("namespace: %s, resource: %s, ignored listing per whitelist", namespace, apiResource.Name) @@ -2376,7 +2376,7 @@ func isNodeSchedulable(node *v1.Node) bool { // Test whether a fake pod can be scheduled on "node", given its current taints. func isNodeUntainted(node *v1.Node) bool { fakePod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, @@ -2917,7 +2917,7 @@ func DeleteReplicaSet(clientset clientset.Interface, internalClientset internalc // ReplicaSet selector (because the pods have completed termination). func waitForReplicaSetPodsGone(c clientset.Interface, rs *extensions.ReplicaSet) error { return wait.PollImmediate(Poll, 2*time.Minute, func() (bool, error) { - selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector) ExpectNoError(err) options := v1.ListOptions{LabelSelector: selector.String()} if pods, err := c.Core().Pods(rs.Namespace).List(options); err == nil && len(pods.Items) == 0 { diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index 2fc849d83a2..14a33d5a05b 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/metrics" @@ -44,7 +44,7 @@ func newOwnerRC(f *framework.Framework, name string) *v1.ReplicationController { var replicas int32 replicas = 2 return &v1.ReplicationController{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "ReplicationController", APIVersion: "v1", }, diff --git a/test/e2e/gke_local_ssd.go b/test/e2e/gke_local_ssd.go index cfa4ef56b72..79ae9f9c73a 100644 --- a/test/e2e/gke_local_ssd.go +++ b/test/e2e/gke_local_ssd.go @@ -20,7 +20,7 @@ import ( "fmt" "os/exec" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/util/uuid" @@ -72,7 +72,7 @@ func testPodWithSsd(command string) *v1.Pod { podName := "pod-" + string(uuid.NewUUID()) image := "ubuntu:14.04" return &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index ce53bf15618..422f14a0422 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -44,7 +44,7 @@ import ( "k8s.io/kubernetes/pkg/api/annotations" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/controller" @@ -1507,12 +1507,12 @@ func checkOutput(output string, required [][]string) { } } -func getAPIVersions(apiEndpoint string) (*unversioned.APIVersions, error) { +func getAPIVersions(apiEndpoint string) (*metav1.APIVersions, error) { body, err := curl(apiEndpoint) if err != nil { return nil, fmt.Errorf("Failed http.Get of %s: %v", apiEndpoint, err) } - var apiVersions unversioned.APIVersions + var apiVersions metav1.APIVersions if err := json.Unmarshal([]byte(body), &apiVersions); err != nil { return nil, fmt.Errorf("Failed to parse /api output %s: %v", body, err) } diff --git a/test/e2e/mesos.go b/test/e2e/mesos.go index bb65d1597d3..dd0381aea80 100644 --- a/test/e2e/mesos.go +++ b/test/e2e/mesos.go @@ -19,7 +19,7 @@ package e2e import ( "fmt" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/labels" @@ -80,7 +80,7 @@ var _ = framework.KubeDescribe("Mesos", func() { By("Trying to launch a pod with a label to get a node which can launch it.") podName := "with-label" _, err := c.Core().Pods(ns).Create(&v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", }, ObjectMeta: v1.ObjectMeta{ diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 5173612fa8f..5e661298d1d 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -31,7 +31,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" @@ -614,7 +614,7 @@ func testPDPod(diskNames []string, targetNode types.NodeName, readOnly bool, num } pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 9f65df8ec1b..07cf961873a 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/gomega" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -703,7 +703,7 @@ func makeWritePod(ns string, pvcName string) *v1.Pod { var isPrivileged bool = true return &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, diff --git a/test/e2e/petset.go b/test/e2e/petset.go index 9e291a3547f..6ada2f1a992 100644 --- a/test/e2e/petset.go +++ b/test/e2e/petset.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -720,7 +720,7 @@ func statefulSetFromManifest(fileName, ns string) *apps.StatefulSet { Expect(runtime.DecodeInto(api.Codecs.UniversalDecoder(), json, &ps)).NotTo(HaveOccurred()) ps.Namespace = ns if ps.Spec.Selector == nil { - ps.Spec.Selector = &unversioned.LabelSelector{ + ps.Spec.Selector = &metav1.LabelSelector{ MatchLabels: ps.Spec.Template.Labels, } } @@ -878,7 +878,7 @@ func (p *statefulSetTester) update(ns, name string, update func(ps *apps.Statefu } func (p *statefulSetTester) getPodList(ps *apps.StatefulSet) *v1.PodList { - selector, err := unversioned.LabelSelectorAsSelector(ps.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(ps.Spec.Selector) ExpectNoError(err) podList, err := p.c.Core().Pods(ps.Namespace).List(v1.ListOptions{LabelSelector: selector.String()}) ExpectNoError(err) @@ -1141,7 +1141,7 @@ func newStatefulSet(name, ns, governingSvcName string, replicas int32, petMounts } return &apps.StatefulSet{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StatefulSet", APIVersion: "apps/v1beta1", }, @@ -1150,7 +1150,7 @@ func newStatefulSet(name, ns, governingSvcName string, replicas int32, petMounts Namespace: ns, }, Spec: apps.StatefulSetSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: labels, }, Replicas: func(i int32) *int32 { return &i }(replicas), diff --git a/test/e2e/replica_set.go b/test/e2e/replica_set.go index c0678a7bd76..683b2c3ec82 100644 --- a/test/e2e/replica_set.go +++ b/test/e2e/replica_set.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller/replicaset" @@ -108,7 +108,7 @@ func ReplicaSetServeImageOrFail(f *framework.Framework, test string, image strin }, Spec: extensions.ReplicaSetSpec{ Replicas: func(i int32) *int32 { return &i }(replicas), - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{ + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{ "name": name, }}, Template: v1.PodTemplateSpec{ diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 65e54c9d9ef..5119a9c36bc 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -181,7 +181,7 @@ func rcByNameContainer(name string, replicas int32, image string, labels map[str gracePeriod = &zeroGracePeriod } return &v1.ReplicationController{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "ReplicationController", APIVersion: registered.GroupOrDie(v1.GroupName).GroupVersion.String(), }, diff --git a/test/e2e/third-party.go b/test/e2e/third-party.go index caa52c71c58..1a852ba167f 100644 --- a/test/e2e/third-party.go +++ b/test/e2e/third-party.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" @@ -45,7 +45,7 @@ var data = `{ }` type Foo struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` SomeField string `json:"someField"` @@ -53,8 +53,8 @@ type Foo struct { } type FooList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"` Items []Foo `json:"items"` } @@ -89,14 +89,14 @@ var _ = Describe("ThirdParty resources [Flaky] [Disruptive]", func() { if err != nil { return false, err } - meta := unversioned.TypeMeta{} + meta := metav1.TypeMeta{} if err := json.Unmarshal(data, &meta); err != nil { return false, err } if meta.Kind == "FooList" { return true, nil } - status := unversioned.Status{} + status := metav1.Status{} if err := runtime.DecodeInto(api.Codecs.LegacyCodec(registered.EnabledVersions()...), data, &status); err != nil { return false, err } @@ -118,7 +118,7 @@ var _ = Describe("ThirdParty resources [Flaky] [Disruptive]", func() { framework.Failf("unexpected object before create: %v", list) } foo := &Foo{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Foo", }, ObjectMeta: v1.ObjectMeta{ diff --git a/test/e2e/ubernetes_lite.go b/test/e2e/ubernetes_lite.go index 504bae4f3f5..3b4589228c7 100644 --- a/test/e2e/ubernetes_lite.go +++ b/test/e2e/ubernetes_lite.go @@ -22,7 +22,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/labels" @@ -115,12 +115,12 @@ func SpreadServiceOrFail(f *framework.Framework, replicaCount int, image string) // Find the name of the zone in which a Node is running func getZoneNameForNode(node v1.Node) (string, error) { for key, value := range node.Labels { - if key == unversioned.LabelZoneFailureDomain { + if key == metav1.LabelZoneFailureDomain { return value, nil } } return "", fmt.Errorf("Zone name for node %s not found. No label with key %s", - node.Name, unversioned.LabelZoneFailureDomain) + node.Name, metav1.LabelZoneFailureDomain) } // Find the names of all zones in which we have nodes in this cluster. diff --git a/test/e2e/volume_provisioning.go b/test/e2e/volume_provisioning.go index dc5606b7f33..7a21da2004f 100644 --- a/test/e2e/volume_provisioning.go +++ b/test/e2e/volume_provisioning.go @@ -20,7 +20,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" @@ -188,7 +188,7 @@ func newClaim(ns string, alpha bool) *v1.PersistentVolumeClaim { // runInPodWithVolume runs a command in a pod with given claim mounted to /mnt directory. func runInPodWithVolume(c clientset.Interface, ns, claimName, command string) { pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, @@ -245,7 +245,7 @@ func newStorageClass() *storage.StorageClass { } return &storage.StorageClass{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: v1.ObjectMeta{ diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index 14634aaf220..c138fe8f272 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -47,7 +47,7 @@ import ( "time" apierrs "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/test/e2e/framework" @@ -117,7 +117,7 @@ func startVolumeServer(client clientset.Interface, config VolumeTestConfig) *v1. privileged := new(bool) *privileged = true serverPod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, @@ -197,7 +197,7 @@ func volumeTestCleanup(f *framework.Framework, config VolumeTestConfig) { func testVolumeClient(client clientset.Interface, config VolumeTestConfig, volume v1.VolumeSource, fsGroup *int64, expectedContent string) { By(fmt.Sprint("starting ", config.prefix, " client")) clientPod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, @@ -273,7 +273,7 @@ func injectHtml(client clientset.Interface, config VolumeTestConfig, volume v1.V podClient := client.Core().Pods(config.namespace) injectPod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, @@ -419,7 +419,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { // create Endpoints for the server endpoints := v1.Endpoints{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Endpoints", APIVersion: "v1", }, @@ -545,7 +545,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { // create secrets for the server secret := v1.Secret{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: "v1", }, @@ -616,7 +616,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { // create ceph secret secret := &v1.Secret{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Secret", APIVersion: "v1", }, diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index f21a6592692..9570e0ef81b 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -25,10 +25,10 @@ go_library( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/componentconfig:go_default_library", "//pkg/apis/componentconfig/v1alpha1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/kubelet/api/v1alpha1/stats:go_default_library", "//pkg/labels:go_default_library", "//pkg/util/procfs:go_default_library", @@ -77,8 +77,8 @@ go_test( deps = [ "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/kubelet:go_default_library", diff --git a/test/e2e_node/benchmark_util.go b/test/e2e_node/benchmark_util.go index 6debb765859..7bc5af60ded 100644 --- a/test/e2e_node/benchmark_util.go +++ b/test/e2e_node/benchmark_util.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/perftype" @@ -46,7 +46,7 @@ type NodeTimeSeries struct { } // logDensityTimeSeries logs the time series data of operation and resource usage -func logDensityTimeSeries(rc *ResourceCollector, create, watch map[string]unversioned.Time, testInfo map[string]string) { +func logDensityTimeSeries(rc *ResourceCollector, create, watch map[string]metav1.Time, testInfo map[string]string) { timeSeries := &NodeTimeSeries{ Labels: testInfo, Version: currentDataVersion, @@ -69,7 +69,7 @@ func (a int64arr) Swap(i, j int) { a[i], a[j] = a[j], a[i] } func (a int64arr) Less(i, j int) bool { return a[i] < a[j] } // getCumulatedPodTimeSeries gets the cumulative pod number time series. -func getCumulatedPodTimeSeries(timePerPod map[string]unversioned.Time) []int64 { +func getCumulatedPodTimeSeries(timePerPod map[string]metav1.Time) []int64 { timeSeries := make(int64arr, 0) for _, ts := range timePerPod { timeSeries = append(timeSeries, ts.Time.UnixNano()) diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index ccb06252b5e..8f49e316880 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" @@ -319,7 +319,7 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg ) var ( mutex = &sync.Mutex{} - watchTimes = make(map[string]unversioned.Time, 0) + watchTimes = make(map[string]metav1.Time, 0) stopCh = make(chan struct{}) ) @@ -358,8 +358,8 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg // Analyze results var ( - firstCreate unversioned.Time - lastRunning unversioned.Time + firstCreate metav1.Time + lastRunning metav1.Time init = true e2eLags = make([]framework.PodLatencyData, 0) ) @@ -429,10 +429,10 @@ func runDensitySeqTest(f *framework.Framework, rc *ResourceCollector, testArg de // createBatchPodWithRateControl creates a batch of pods concurrently, uses one goroutine for each creation. // between creations there is an interval for throughput control -func createBatchPodWithRateControl(f *framework.Framework, pods []*v1.Pod, interval time.Duration) map[string]unversioned.Time { - createTimes := make(map[string]unversioned.Time) +func createBatchPodWithRateControl(f *framework.Framework, pods []*v1.Pod, interval time.Duration) map[string]metav1.Time { + createTimes := make(map[string]metav1.Time) for _, pod := range pods { - createTimes[pod.ObjectMeta.Name] = unversioned.Now() + createTimes[pod.ObjectMeta.Name] = metav1.Now() go f.PodClient().Create(pod) time.Sleep(interval) } @@ -476,7 +476,7 @@ func verifyPodStartupLatency(expect, actual framework.LatencyMetric) error { } // newInformerWatchPod creates an informer to check whether all pods are running. -func newInformerWatchPod(f *framework.Framework, mutex *sync.Mutex, watchTimes map[string]unversioned.Time, +func newInformerWatchPod(f *framework.Framework, mutex *sync.Mutex, watchTimes map[string]metav1.Time, podType string) *cache.Controller { ns := f.Namespace.Name checkPodRunning := func(p *v1.Pod) { @@ -486,7 +486,7 @@ func newInformerWatchPod(f *framework.Framework, mutex *sync.Mutex, watchTimes m if p.Status.Phase == v1.PodRunning { if _, found := watchTimes[p.Name]; !found { - watchTimes[p.Name] = unversioned.Now() + watchTimes[p.Name] = metav1.Now() } } } @@ -523,15 +523,15 @@ func newInformerWatchPod(f *framework.Framework, mutex *sync.Mutex, watchTimes m // createBatchPodSequential creats pods back-to-back in sequence. func createBatchPodSequential(f *framework.Framework, pods []*v1.Pod) (time.Duration, []framework.PodLatencyData) { - batchStartTime := unversioned.Now() + batchStartTime := metav1.Now() e2eLags := make([]framework.PodLatencyData, 0) for _, pod := range pods { - create := unversioned.Now() + create := metav1.Now() f.PodClient().CreateSync(pod) e2eLags = append(e2eLags, - framework.PodLatencyData{Name: pod.Name, Latency: unversioned.Now().Time.Sub(create.Time)}) + framework.PodLatencyData{Name: pod.Name, Latency: metav1.Now().Time.Sub(create.Time)}) } - batchLag := unversioned.Now().Time.Sub(batchStartTime.Time) + batchLag := metav1.Now().Time.Sub(batchStartTime.Time) sort.Sort(framework.LatencySlice(e2eLags)) return batchLag, e2eLags } diff --git a/test/e2e_node/kubelet_test.go b/test/e2e_node/kubelet_test.go index 9ec93195940..68594a0be24 100644 --- a/test/e2e_node/kubelet_test.go +++ b/test/e2e_node/kubelet_test.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - apiunversioned "k8s.io/kubernetes/pkg/api/unversioned" + apiunversioned "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_node/simple_mount.go b/test/e2e_node/simple_mount.go index 2d052099f88..1e7f512a270 100644 --- a/test/e2e_node/simple_mount.go +++ b/test/e2e_node/simple_mount.go @@ -17,7 +17,7 @@ limitations under the License. package e2e_node import ( - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/test/e2e/framework" @@ -31,7 +31,7 @@ var _ = framework.KubeDescribe("SimpleMount", func() { // If the mount fails, the pod will not be able to run, and CreateSync will timeout. It("should be able to mount an emptydir on a container", func() { pod := &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go index c4d328fca48..3a9480761ba 100644 --- a/test/e2e_node/summary_test.go +++ b/test/e2e_node/summary_test.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/test/e2e/framework" @@ -287,7 +287,7 @@ func bounded(lower, upper interface{}) types.GomegaMatcher { } func recent(d time.Duration) types.GomegaMatcher { - return WithTransform(func(t unversioned.Time) time.Time { + return WithTransform(func(t metav1.Time) time.Time { return t.Time }, And( BeTemporally(">=", time.Now().Add(-d)), diff --git a/test/integration/client/client_test.go b/test/integration/client/client_test.go index 286312fbfb4..9619b17d8d9 100644 --- a/test/integration/client/client_test.go +++ b/test/integration/client/client_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -126,7 +126,7 @@ func TestAtomicPut(t *testing.T) { defer framework.DeleteTestingNamespace(ns, s, t) rcBody := v1.ReplicationController{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: c.Core().RESTClient().APIVersion().String(), }, ObjectMeta: v1.ObjectMeta{ @@ -220,7 +220,7 @@ func TestPatch(t *testing.T) { name := "patchpod" resource := "pods" podBody := v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ APIVersion: c.Core().RESTClient().APIVersion().String(), }, ObjectMeta: v1.ObjectMeta{ @@ -439,7 +439,7 @@ func TestAPIVersions(t *testing.T) { if err != nil { t.Fatalf("Failed to get api versions: %v", err) } - versions := unversioned.ExtractGroupVersions(g) + versions := metav1.ExtractGroupVersions(g) // Verify that the server supports the API version used by the client. for _, version := range versions { diff --git a/test/integration/client/dynamic_client_test.go b/test/integration/client/dynamic_client_test.go index 5d0a22f9fb2..61f5ede9f0f 100644 --- a/test/integration/client/dynamic_client_test.go +++ b/test/integration/client/dynamic_client_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -59,7 +59,7 @@ func TestDynamicClient(t *testing.T) { t.Fatalf("unexpected error listing resources: %v", err) } - var resource unversioned.APIResource + var resource metav1.APIResource for _, r := range resources.APIResources { if r.Kind == "Pod" { resource = r diff --git a/test/integration/examples/apiserver_test.go b/test/integration/examples/apiserver_test.go index 4ffce261bcd..fdb61a7d5bc 100644 --- a/test/integration/examples/apiserver_test.go +++ b/test/integration/examples/apiserver_test.go @@ -30,12 +30,12 @@ import ( "github.com/golang/glog" "github.com/stretchr/testify/assert" "k8s.io/kubernetes/examples/apiserver" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) var groupVersion = v1.SchemeGroupVersion -var groupVersionForDiscovery = unversioned.GroupVersionForDiscovery{ +var groupVersionForDiscovery = metav1.GroupVersionForDiscovery{ GroupVersion: groupVersion.String(), Version: groupVersion.Version, } @@ -130,7 +130,7 @@ func testAPIGroupList(t *testing.T, serverIP string) { if err != nil { t.Fatalf("%v", err) } - var apiGroupList unversioned.APIGroupList + var apiGroupList metav1.APIGroupList err = json.Unmarshal(contents, &apiGroupList) if err != nil { t.Fatalf("Error in unmarshalling response from server %s: %v", serverURL, err) @@ -148,7 +148,7 @@ func testAPIGroup(t *testing.T, serverIP string) { if err != nil { t.Fatalf("%v", err) } - var apiGroup unversioned.APIGroup + var apiGroup metav1.APIGroup err = json.Unmarshal(contents, &apiGroup) if err != nil { t.Fatalf("Error in unmarshalling response from server %s: %v", serverURL, err) @@ -167,7 +167,7 @@ func testAPIResourceList(t *testing.T, serverIP string) { if err != nil { t.Fatalf("%v", err) } - var apiResourceList unversioned.APIResourceList + var apiResourceList metav1.APIResourceList err = json.Unmarshal(contents, &apiResourceList) if err != nil { t.Fatalf("Error in unmarshalling response from server %s: %v", serverURL, err) diff --git a/test/integration/federation/server_test.go b/test/integration/federation/server_test.go index d1bfa722587..b153730178f 100644 --- a/test/integration/federation/server_test.go +++ b/test/integration/federation/server_test.go @@ -31,7 +31,7 @@ import ( fed_v1b1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ext_v1b1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/runtime/schema" @@ -150,7 +150,7 @@ func testSupport(t *testing.T) { } } -func findGroup(groups []unversioned.APIGroup, groupName string) *unversioned.APIGroup { +func findGroup(groups []metav1.APIGroup, groupName string) *metav1.APIGroup { for _, group := range groups { if group.Name == groupName { return &group @@ -160,9 +160,9 @@ func findGroup(groups []unversioned.APIGroup, groupName string) *unversioned.API } func testAPIGroupList(t *testing.T) { - groupVersionForDiscoveryMap := make(map[string]unversioned.GroupVersionForDiscovery) + groupVersionForDiscoveryMap := make(map[string]metav1.GroupVersionForDiscovery) for _, groupVersion := range groupVersions { - groupVersionForDiscoveryMap[groupVersion.Group] = unversioned.GroupVersionForDiscovery{ + groupVersionForDiscoveryMap[groupVersion.Group] = metav1.GroupVersionForDiscovery{ GroupVersion: groupVersion.String(), Version: groupVersion.Version, } @@ -173,7 +173,7 @@ func testAPIGroupList(t *testing.T) { if err != nil { t.Fatalf("%v", err) } - var apiGroupList unversioned.APIGroupList + var apiGroupList metav1.APIGroupList err = json.Unmarshal(contents, &apiGroupList) if err != nil { t.Fatalf("Error in unmarshalling response from server %s: %v", serverURL, err) @@ -197,7 +197,7 @@ func testAPIGroup(t *testing.T) { if err != nil { t.Fatalf("%v", err) } - var apiGroup unversioned.APIGroup + var apiGroup metav1.APIGroup err = json.Unmarshal(contents, &apiGroup) if err != nil { t.Fatalf("Error in unmarshalling response from server %s: %v", serverURL, err) @@ -224,7 +224,7 @@ func testCoreAPIGroup(t *testing.T) { if err != nil { t.Fatalf("%v", err) } - var apiVersions unversioned.APIVersions + var apiVersions metav1.APIVersions err = json.Unmarshal(contents, &apiVersions) if err != nil { t.Fatalf("Error in unmarshalling response from server %s: %v", serverURL, err) @@ -234,7 +234,7 @@ func testCoreAPIGroup(t *testing.T) { assert.NotEmpty(t, apiVersions.ServerAddressByClientCIDRs) } -func findResource(resources []unversioned.APIResource, resourceName string) *unversioned.APIResource { +func findResource(resources []metav1.APIResource, resourceName string) *metav1.APIResource { for _, resource := range resources { if resource.Name == resourceName { return &resource @@ -255,7 +255,7 @@ func testFederationResourceList(t *testing.T) { if err != nil { t.Fatalf("%v", err) } - var apiResourceList unversioned.APIResourceList + var apiResourceList metav1.APIResourceList err = json.Unmarshal(contents, &apiResourceList) if err != nil { t.Fatalf("Error in unmarshalling response from server %s: %v", serverURL, err) @@ -279,7 +279,7 @@ func testCoreResourceList(t *testing.T) { if err != nil { t.Fatalf("%v", err) } - var apiResourceList unversioned.APIResourceList + var apiResourceList metav1.APIResourceList err = json.Unmarshal(contents, &apiResourceList) if err != nil { t.Fatalf("Error in unmarshalling response from server %s: %v", serverURL, err) @@ -330,7 +330,7 @@ func testExtensionsResourceList(t *testing.T) { if err != nil { t.Fatalf("%v", err) } - var apiResourceList unversioned.APIResourceList + var apiResourceList metav1.APIResourceList err = json.Unmarshal(contents, &apiResourceList) if err != nil { t.Fatalf("Error in unmarshalling response from server %s: %v", serverURL, err) diff --git a/test/integration/garbagecollector/garbage_collector_test.go b/test/integration/garbagecollector/garbage_collector_test.go index 4d6c1344c4d..564a879251e 100644 --- a/test/integration/garbagecollector/garbage_collector_test.go +++ b/test/integration/garbagecollector/garbage_collector_test.go @@ -30,7 +30,7 @@ import ( "github.com/golang/glog" dto "github.com/prometheus/client_model/go" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -69,7 +69,7 @@ func newPod(podName, podNamespace string, ownerReferences []v1.OwnerReference) * ownerReferences[i].APIVersion = "v1" } return &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, @@ -91,7 +91,7 @@ func newPod(podName, podNamespace string, ownerReferences []v1.OwnerReference) * func newOwnerRC(name, namespace string) *v1.ReplicationController { return &v1.ReplicationController{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "ReplicationController", APIVersion: "v1", }, diff --git a/test/integration/persistentvolumes/persistent_volumes_test.go b/test/integration/persistentvolumes/persistent_volumes_test.go index 081c5913e00..41ee3c9b0c9 100644 --- a/test/integration/persistentvolumes/persistent_volumes_test.go +++ b/test/integration/persistentvolumes/persistent_volumes_test.go @@ -28,7 +28,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" @@ -330,7 +330,7 @@ func TestPersistentVolumeClaimLabelSelector(t *testing.T) { } t.Log("volumes created") - pvc.Spec.Selector = &unversioned.LabelSelector{ + pvc.Spec.Selector = &metav1.LabelSelector{ MatchLabels: map[string]string{ "foo": "true", }, @@ -410,26 +410,26 @@ func TestPersistentVolumeClaimLabelSelectorMatchExpressions(t *testing.T) { } t.Log("volumes created") - pvc.Spec.Selector = &unversioned.LabelSelector{ - MatchExpressions: []unversioned.LabelSelectorRequirement{ + pvc.Spec.Selector = &metav1.LabelSelector{ + MatchExpressions: []metav1.LabelSelectorRequirement{ { Key: "foo", - Operator: unversioned.LabelSelectorOpIn, + Operator: metav1.LabelSelectorOpIn, Values: []string{"valA"}, }, { Key: "foo", - Operator: unversioned.LabelSelectorOpNotIn, + Operator: metav1.LabelSelectorOpNotIn, Values: []string{"valB"}, }, { Key: "bar", - Operator: unversioned.LabelSelectorOpExists, + Operator: metav1.LabelSelectorOpExists, Values: []string{}, }, { Key: "baz", - Operator: unversioned.LabelSelectorOpDoesNotExist, + Operator: metav1.LabelSelectorOpDoesNotExist, Values: []string{}, }, }, @@ -861,7 +861,7 @@ func TestPersistentVolumeProvisionMultiPVCs(t *testing.T) { defer testClient.Storage().StorageClasses().DeleteCollection(nil, v1.ListOptions{}) storageClass := storage.StorageClass{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: v1.ObjectMeta{ diff --git a/test/integration/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go index 0cdbd351a0b..37b21e17693 100644 --- a/test/integration/replicaset/replicaset_test.go +++ b/test/integration/replicaset/replicaset_test.go @@ -26,7 +26,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/cache" @@ -45,7 +45,7 @@ func testLabels() map[string]string { func newRS(name, namespace string, replicas int) *v1beta1.ReplicaSet { replicasCopy := int32(replicas) return &v1beta1.ReplicaSet{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "ReplicaSet", APIVersion: "extensions/v1beta1", }, @@ -54,7 +54,7 @@ func newRS(name, namespace string, replicas int) *v1beta1.ReplicaSet { Name: name, }, Spec: v1beta1.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: testLabels(), }, Replicas: &replicasCopy, @@ -77,7 +77,7 @@ func newRS(name, namespace string, replicas int) *v1beta1.ReplicaSet { func newMatchingPod(podName, namespace string) *v1.Pod { return &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, diff --git a/test/integration/replicationcontroller/replicationcontroller_test.go b/test/integration/replicationcontroller/replicationcontroller_test.go index d746e6bb5f9..9679b38d083 100644 --- a/test/integration/replicationcontroller/replicationcontroller_test.go +++ b/test/integration/replicationcontroller/replicationcontroller_test.go @@ -26,7 +26,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -44,7 +44,7 @@ func testLabels() map[string]string { func newRC(name, namespace string, replicas int) *v1.ReplicationController { replicasCopy := int32(replicas) return &v1.ReplicationController{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "ReplicationController", APIVersion: "v1", }, @@ -74,7 +74,7 @@ func newRC(name, namespace string, replicas int) *v1.ReplicationController { func newMatchingPod(podName, namespace string) *v1.Pod { return &v1.Pod{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Pod", APIVersion: "v1", }, diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go index b916b8a1c32..3c49466fbcc 100644 --- a/test/integration/scheduler/extender_test.go +++ b/test/integration/scheduler/extender_test.go @@ -30,7 +30,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -262,7 +262,7 @@ func DoTestPodScheduling(ns *v1.Namespace, t *testing.T, cs clientset.Interface) Type: v1.NodeReady, Status: v1.ConditionTrue, Reason: fmt.Sprintf("schedulable condition"), - LastHeartbeatTime: unversioned.Time{time.Now()}, + LastHeartbeatTime: metav1.Time{time.Now()}, } node := &v1.Node{ Spec: v1.NodeSpec{Unschedulable: false}, diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index b041c4140bf..fcb552ad9a3 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/cache" @@ -129,13 +129,13 @@ func DoTestUnschedulableNodes(t *testing.T, cs clientset.Interface, ns *v1.Names Type: v1.NodeReady, Status: v1.ConditionTrue, Reason: fmt.Sprintf("schedulable condition"), - LastHeartbeatTime: unversioned.Time{time.Now()}, + LastHeartbeatTime: metav1.Time{time.Now()}, } badCondition := v1.NodeCondition{ Type: v1.NodeReady, Status: v1.ConditionUnknown, Reason: fmt.Sprintf("unschedulable condition"), - LastHeartbeatTime: unversioned.Time{time.Now()}, + LastHeartbeatTime: metav1.Time{time.Now()}, } // Create a new schedulable node, since we're first going to apply // the unschedulable condition and verify that pods aren't scheduled. diff --git a/test/integration/storageclasses/storage_classes_test.go b/test/integration/storageclasses/storage_classes_test.go index c006ddbad8e..d132e4e3fea 100644 --- a/test/integration/storageclasses/storage_classes_test.go +++ b/test/integration/storageclasses/storage_classes_test.go @@ -24,7 +24,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" @@ -53,7 +53,7 @@ func TestStorageClasses(t *testing.T) { func DoTestStorageClasses(t *testing.T, client clientset.Interface, ns *v1.Namespace) { // Make a storage class object. s := storage.StorageClass{ - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "StorageClass", }, ObjectMeta: v1.ObjectMeta{ diff --git a/test/integration/thirdparty/thirdparty_test.go b/test/integration/thirdparty/thirdparty_test.go index 5c2e90f60c7..392f05b893e 100644 --- a/test/integration/thirdparty/thirdparty_test.go +++ b/test/integration/thirdparty/thirdparty_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" @@ -64,7 +64,7 @@ func TestThirdPartyMultiple(t *testing.T) { var versionsToTest = []string{"v1"} type Foo struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` SomeField string `json:"someField"` @@ -72,8 +72,8 @@ type Foo struct { } type FooList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"` Items []Foo `json:"items"` } @@ -174,7 +174,7 @@ func testInstallThirdPartyAPIDeleteVersion(t *testing.T, client clientset.Interf Name: "test", Namespace: "default", }, - TypeMeta: unversioned.TypeMeta{ + TypeMeta: metav1.TypeMeta{ Kind: "Foo", }, SomeField: "test field", diff --git a/test/soak/serve_hostnames/BUILD b/test/soak/serve_hostnames/BUILD index 51328dce83d..4cc537f2a5a 100644 --- a/test/soak/serve_hostnames/BUILD +++ b/test/soak/serve_hostnames/BUILD @@ -17,8 +17,8 @@ go_binary( deps = [ "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/unversioned/clientcmd:go_default_library", diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index 068ef36128f..22c39da042f 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -32,7 +32,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" @@ -276,11 +276,11 @@ func main() { glog.Infof("After %v while making a proxy call got error %v", time.Since(start), err) continue } - var r unversioned.Status + var r metav1.Status if err := runtime.DecodeInto(api.Codecs.UniversalDecoder(), hostname, &r); err != nil { break } - if r.Status == unversioned.StatusFailure { + if r.Status == metav1.StatusFailure { glog.Infof("After %v got status %v", time.Since(start), string(hostname)) continue } diff --git a/test/utils/BUILD b/test/utils/BUILD index df784dc1027..e862d8835a8 100644 --- a/test/utils/BUILD +++ b/test/utils/BUILD @@ -24,9 +24,9 @@ go_library( "//pkg/api:go_default_library", "//pkg/api/errors:go_default_library", "//pkg/api/resource:go_default_library", - "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", + "//pkg/apis/meta/v1:go_default_library", "//pkg/client/cache:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/client/clientset_generated/release_1_5:go_default_library", diff --git a/test/utils/runners.go b/test/utils/runners.go index 8547b1a9c87..9fef997b5c3 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/api/unversioned" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" @@ -200,7 +200,7 @@ func (config *DeploymentConfig) create() error { }, Spec: extensions.DeploymentSpec{ Replicas: func(i int) *int32 { x := int32(i); return &x }(config.Replicas), - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "name": config.Name, }, @@ -252,7 +252,7 @@ func (config *ReplicaSetConfig) create() error { }, Spec: extensions.ReplicaSetSpec{ Replicas: func(i int) *int32 { x := int32(i); return &x }(config.Replicas), - Selector: &unversioned.LabelSelector{ + Selector: &metav1.LabelSelector{ MatchLabels: map[string]string{ "name": config.Name, }, diff --git a/vendor/BUILD b/vendor/BUILD index e46216fb78d..723e6509941 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -9218,7 +9218,6 @@ go_library( "k8s.io/client-go/pkg/api/resource_helpers.go", "k8s.io/client-go/pkg/api/types.generated.go", "k8s.io/client-go/pkg/api/types.go", - "k8s.io/client-go/pkg/api/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9392,7 +9391,6 @@ go_library( "k8s.io/client-go/pkg/api/unversioned/types.go", "k8s.io/client-go/pkg/api/unversioned/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/api/unversioned/well_known_labels.go", - "k8s.io/client-go/pkg/api/unversioned/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9400,7 +9398,6 @@ go_library( "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/google/gofuzz", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/genericapiserver/openapi/common", "//vendor:k8s.io/client-go/pkg/labels", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9425,7 +9422,6 @@ go_library( "k8s.io/client-go/pkg/api/v1/types.go", "k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/api/v1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/api/v1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9515,7 +9511,6 @@ go_library( "k8s.io/client-go/pkg/apis/apps/register.go", "k8s.io/client-go/pkg/apis/apps/types.generated.go", "k8s.io/client-go/pkg/apis/apps/types.go", - "k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9523,7 +9518,6 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9549,14 +9543,12 @@ go_library( "k8s.io/client-go/pkg/apis/authentication/register.go", "k8s.io/client-go/pkg/apis/authentication/types.generated.go", "k8s.io/client-go/pkg/apis/authentication/types.go", - "k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9587,7 +9579,6 @@ go_library( "k8s.io/client-go/pkg/apis/authentication/v1beta1/types.go", "k8s.io/client-go/pkg/apis/authentication/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9611,14 +9602,12 @@ go_library( "k8s.io/client-go/pkg/apis/authorization/register.go", "k8s.io/client-go/pkg/apis/authorization/types.generated.go", "k8s.io/client-go/pkg/apis/authorization/types.go", - "k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9649,7 +9638,6 @@ go_library( "k8s.io/client-go/pkg/apis/authorization/v1beta1/types.go", "k8s.io/client-go/pkg/apis/authorization/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9674,14 +9662,12 @@ go_library( "k8s.io/client-go/pkg/apis/autoscaling/register.go", "k8s.io/client-go/pkg/apis/autoscaling/types.generated.go", "k8s.io/client-go/pkg/apis/autoscaling/types.go", - "k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9710,7 +9696,6 @@ go_library( "k8s.io/client-go/pkg/apis/autoscaling/v1/types.go", "k8s.io/client-go/pkg/apis/autoscaling/v1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9735,7 +9720,6 @@ go_library( "k8s.io/client-go/pkg/apis/batch/register.go", "k8s.io/client-go/pkg/apis/batch/types.generated.go", "k8s.io/client-go/pkg/apis/batch/types.go", - "k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9743,7 +9727,6 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9775,7 +9758,6 @@ go_library( "k8s.io/client-go/pkg/apis/batch/v1/types.go", "k8s.io/client-go/pkg/apis/batch/v1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/batch/v1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9808,7 +9790,6 @@ go_library( "k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go", "k8s.io/client-go/pkg/apis/batch/v2alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9836,14 +9817,12 @@ go_library( "k8s.io/client-go/pkg/apis/certificates/register.go", "k8s.io/client-go/pkg/apis/certificates/types.generated.go", "k8s.io/client-go/pkg/apis/certificates/types.go", - "k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9873,7 +9852,6 @@ go_library( "k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/certificates/v1alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9899,13 +9877,11 @@ go_library( "k8s.io/client-go/pkg/apis/componentconfig/register.go", "k8s.io/client-go/pkg/apis/componentconfig/types.generated.go", "k8s.io/client-go/pkg/apis/componentconfig/types.go", - "k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/util/config", @@ -9932,7 +9908,6 @@ go_library( "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/register.go", "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9958,7 +9933,6 @@ go_library( "k8s.io/client-go/pkg/apis/extensions/register.go", "k8s.io/client-go/pkg/apis/extensions/types.generated.go", "k8s.io/client-go/pkg/apis/extensions/types.go", - "k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9968,7 +9942,6 @@ go_library( "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/apis/autoscaling", "//vendor:k8s.io/client-go/pkg/apis/batch", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10000,7 +9973,6 @@ go_library( "k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go", "k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -10031,14 +10003,12 @@ go_library( "k8s.io/client-go/pkg/apis/imagepolicy/register.go", "k8s.io/client-go/pkg/apis/imagepolicy/types.generated.go", "k8s.io/client-go/pkg/apis/imagepolicy/types.go", - "k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10067,7 +10037,6 @@ go_library( "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -10140,14 +10109,12 @@ go_library( "k8s.io/client-go/pkg/apis/policy/register.go", "k8s.io/client-go/pkg/apis/policy/types.generated.go", "k8s.io/client-go/pkg/apis/policy/types.go", - "k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10191,13 +10158,11 @@ go_library( "k8s.io/client-go/pkg/apis/rbac/helpers.go", "k8s.io/client-go/pkg/apis/rbac/register.go", "k8s.io/client-go/pkg/apis/rbac/types.go", - "k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/watch/versioned", @@ -10228,7 +10193,6 @@ go_library( "k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/rbac/v1alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -10253,14 +10217,12 @@ go_library( "k8s.io/client-go/pkg/apis/storage/register.go", "k8s.io/client-go/pkg/apis/storage/types.generated.go", "k8s.io/client-go/pkg/apis/storage/types.go", - "k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10289,7 +10251,6 @@ go_library( "k8s.io/client-go/pkg/apis/storage/v1beta1/types.go", "k8s.io/client-go/pkg/apis/storage/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -10345,14 +10306,12 @@ go_library( "k8s.io/client-go/pkg/federation/apis/federation/register.go", "k8s.io/client-go/pkg/federation/apis/federation/types.generated.go", "k8s.io/client-go/pkg/federation/apis/federation/types.go", - "k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/unversioned", - "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10389,7 +10348,6 @@ go_library( "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.go", "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -10524,7 +10482,6 @@ go_library( "k8s.io/client-go/pkg/runtime/types.go", "k8s.io/client-go/pkg/runtime/types_proto.go", "k8s.io/client-go/pkg/runtime/unstructured.go", - "k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -11698,7 +11655,6 @@ go_library( "k8s.io/client-go/pkg/apis/apps/v1beta1/types.go", "k8s.io/client-go/pkg/apis/apps/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -11729,7 +11685,6 @@ go_library( "k8s.io/client-go/pkg/apis/policy/v1beta1/types.go", "k8s.io/client-go/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go", - "k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ From 3454a8d52cc684dcbae9b4a924105fd3e869a8d6 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 3 Dec 2016 14:06:03 -0500 Subject: [PATCH 6/7] refactor: update bazel, codec, and gofmt --- api/openapi-spec/swagger.json | 849 ++++++----- api/swagger-spec/api.json | 12 +- api/swagger-spec/apis.json | 26 +- api/swagger-spec/apps.json | 20 +- api/swagger-spec/apps_v1beta1.json | 68 +- api/swagger-spec/authentication.k8s.io.json | 20 +- .../authentication.k8s.io_v1beta1.json | 14 +- api/swagger-spec/authorization.k8s.io.json | 20 +- .../authorization.k8s.io_v1beta1.json | 14 +- api/swagger-spec/autoscaling.json | 20 +- api/swagger-spec/autoscaling_v1.json | 55 +- api/swagger-spec/batch.json | 20 +- api/swagger-spec/batch_v1.json | 70 +- api/swagger-spec/batch_v2alpha1.json | 12 +- api/swagger-spec/certificates.k8s.io.json | 20 +- .../certificates.k8s.io_v1alpha1.json | 53 +- api/swagger-spec/extensions.json | 20 +- api/swagger-spec/extensions_v1beta1.json | 186 ++- api/swagger-spec/policy.json | 20 +- api/swagger-spec/policy_v1beta1.json | 66 +- .../rbac.authorization.k8s.io.json | 20 +- .../rbac.authorization.k8s.io_v1alpha1.json | 88 +- api/swagger-spec/storage.k8s.io.json | 20 +- api/swagger-spec/storage.k8s.io_v1beta1.json | 52 +- api/swagger-spec/v1.json | 267 ++-- .../app/options/options.go | 2 +- cmd/kubeadm/app/apis/kubeadm/types.go | 4 +- .../app/apis/kubeadm/v1alpha1/register.go | 2 +- .../app/apis/kubeadm/v1alpha1/types.go | 4 +- cmd/kubeadm/app/master/apiclient.go | 2 +- cmd/kubeadm/app/master/manifests.go | 2 +- .../test_apis/testgroup/types.generated.go | 8 +- .../client-gen/test_apis/testgroup/types.go | 4 +- .../test_apis/testgroup/v1/register.go | 2 +- .../test_apis/testgroup/v1/types.generated.go | 8 +- .../apps/v1beta1/definitions.html | 884 +++++------ .../apps/v1beta1/operations.html | 12 +- .../v1beta1/definitions.html | 118 +- .../v1beta1/operations.html | 4 +- .../v1beta1/definitions.html | 212 +-- .../v1beta1/operations.html | 4 +- .../autoscaling/v1/definitions.html | 456 +++--- .../autoscaling/v1/operations.html | 12 +- docs/api-reference/batch/v1/definitions.html | 890 +++++------ docs/api-reference/batch/v1/operations.html | 12 +- .../batch/v2alpha1/definitions.html | 8 +- .../batch/v2alpha1/operations.html | 4 +- .../v1alpha1/definitions.html | 466 +++--- .../v1alpha1/operations.html | 10 +- .../extensions/v1beta1/definitions.html | 924 ++++++------ .../extensions/v1beta1/operations.html | 70 +- .../policy/v1beta1/definitions.html | 568 +++---- .../policy/v1beta1/operations.html | 12 +- .../v1alpha1/definitions.html | 562 +++---- .../v1alpha1/operations.html | 28 +- .../storage.k8s.io/v1beta1/definitions.html | 456 +++--- .../storage.k8s.io/v1beta1/operations.html | 10 +- docs/api-reference/v1/definitions.html | 934 ++++++------ docs/api-reference/v1/operations.html | 118 +- federation/apis/core/v1/register.go | 2 +- .../apis/federation/install/install_test.go | 2 +- federation/apis/federation/types.generated.go | 16 +- .../apis/federation/v1beta1/generated.pb.go | 108 +- .../apis/federation/v1beta1/generated.proto | 8 +- .../apis/federation/v1beta1/register.go | 2 +- .../federation/v1beta1/types.generated.go | 18 +- federation/apis/federation/v1beta1/types.go | 2 +- federation/apis/openapi-spec/swagger.json | 502 +++---- federation/apis/swagger-spec/api.json | 12 +- federation/apis/swagger-spec/apis.json | 26 +- federation/apis/swagger-spec/extensions.json | 20 +- .../apis/swagger-spec/extensions_v1beta1.json | 121 +- federation/apis/swagger-spec/federation.json | 20 +- .../apis/swagger-spec/federation_v1beta1.json | 54 +- federation/apis/swagger-spec/v1.json | 106 +- .../app/options/options.go | 2 +- .../extensions/v1beta1/definitions.html | 900 +++++------ .../extensions/v1beta1/operations.html | 40 +- .../federation/v1beta1/definitions.html | 458 +++--- .../federation/v1beta1/operations.html | 10 +- .../docs/api-reference/v1/definitions.html | 586 ++++---- .../docs/api-reference/v1/operations.html | 38 +- .../cluster/cluster_client.go | 2 +- .../cluster/clustercontroller_test.go | 2 +- .../daemonset/daemonset_controller_test.go | 2 +- .../namespace/namespace_controller_test.go | 2 +- .../util/podanalyzer/pod_helper.go | 2 +- .../util/podanalyzer/pod_helper_test.go | 2 +- federation/pkg/kubefed/init/init_test.go | 2 +- federation/pkg/kubefed/join_test.go | 2 +- pkg/api/defaulting_test.go | 2 +- pkg/api/install/install_test.go | 2 +- pkg/api/meta.go | 26 +- pkg/api/meta/meta_test.go | 6 +- pkg/api/meta/scheme_test.go | 4 +- pkg/api/meta_test.go | 2 +- pkg/api/rest/resttest/resttest.go | 2 +- pkg/api/serialization_test.go | 2 +- pkg/api/testing/fuzzer.go | 2 +- pkg/api/types.generated.go | 140 +- pkg/api/types.go | 4 +- pkg/api/v1/conversion_test.go | 2 +- pkg/api/v1/generated.pb.go | 1336 ++++++++--------- pkg/api/v1/generated.proto | 70 +- pkg/api/v1/meta.go | 26 +- pkg/api/v1/types.generated.go | 140 +- pkg/api/validation/validation.go | 2 +- pkg/api/validation/validation_test.go | 2 +- pkg/apis/abac/types.go | 4 +- pkg/apis/abac/v0/types.go | 4 +- pkg/apis/abac/v1beta1/types.go | 4 +- pkg/apis/apps/types.generated.go | 12 +- pkg/apis/apps/types.go | 2 +- pkg/apis/apps/v1beta1/conversion.go | 2 +- pkg/apis/apps/v1beta1/generated.pb.go | 90 +- pkg/apis/apps/v1beta1/generated.proto | 6 +- pkg/apis/apps/v1beta1/register.go | 2 +- pkg/apis/apps/v1beta1/types.generated.go | 14 +- pkg/apis/apps/v1beta1/types.go | 4 +- pkg/apis/apps/validation/validation.go | 4 +- pkg/apis/apps/validation/validation_test.go | 2 +- pkg/apis/authentication/types.generated.go | 16 +- .../authentication/v1beta1/generated.pb.go | 84 +- .../authentication/v1beta1/generated.proto | 2 +- pkg/apis/authentication/v1beta1/register.go | 2 +- .../authentication/v1beta1/types.generated.go | 6 +- pkg/apis/authentication/v1beta1/types.go | 2 +- pkg/apis/authorization/types.generated.go | 40 +- .../authorization/v1beta1/generated.pb.go | 113 +- .../authorization/v1beta1/generated.proto | 2 +- pkg/apis/authorization/v1beta1/register.go | 2 +- .../authorization/v1beta1/types.generated.go | 6 +- pkg/apis/authorization/v1beta1/types.go | 2 +- pkg/apis/autoscaling/types.generated.go | 12 +- pkg/apis/autoscaling/v1/generated.pb.go | 116 +- pkg/apis/autoscaling/v1/generated.proto | 6 +- pkg/apis/autoscaling/v1/register.go | 2 +- pkg/apis/autoscaling/v1/types.generated.go | 14 +- pkg/apis/autoscaling/v1/types.go | 2 +- pkg/apis/batch/types.generated.go | 36 +- pkg/apis/batch/v1/generated.pb.go | 131 +- pkg/apis/batch/v1/generated.proto | 14 +- pkg/apis/batch/v1/register.go | 2 +- pkg/apis/batch/v1/types.generated.go | 30 +- pkg/apis/batch/v1/types.go | 2 +- pkg/apis/batch/v2alpha1/generated.pb.go | 172 +-- pkg/apis/batch/v2alpha1/generated.proto | 18 +- pkg/apis/batch/v2alpha1/types.generated.go | 38 +- pkg/apis/batch/v2alpha1/types.go | 2 +- pkg/apis/batch/validation/validation.go | 4 +- pkg/apis/batch/validation/validation_test.go | 2 +- pkg/apis/certificates/types.generated.go | 12 +- .../certificates/v1alpha1/generated.pb.go | 94 +- .../certificates/v1alpha1/generated.proto | 6 +- pkg/apis/certificates/v1alpha1/register.go | 2 +- .../certificates/v1alpha1/types.generated.go | 14 +- pkg/apis/certificates/v1alpha1/types.go | 2 +- pkg/apis/componentconfig/types.generated.go | 148 +- pkg/apis/componentconfig/v1alpha1/types.go | 4 +- pkg/apis/extensions/register.go | 2 +- pkg/apis/extensions/types.generated.go | 76 +- pkg/apis/extensions/v1beta1/conversion.go | 2 +- pkg/apis/extensions/v1beta1/defaults.go | 2 +- pkg/apis/extensions/v1beta1/defaults_test.go | 2 +- pkg/apis/extensions/v1beta1/generated.pb.go | 557 ++++--- pkg/apis/extensions/v1beta1/generated.proto | 52 +- pkg/apis/extensions/v1beta1/register.go | 2 +- .../extensions/v1beta1/types.generated.go | 106 +- pkg/apis/extensions/v1beta1/types.go | 2 +- pkg/apis/extensions/validation/validation.go | 4 +- .../extensions/validation/validation_test.go | 2 +- pkg/apis/imagepolicy/types.generated.go | 16 +- pkg/apis/imagepolicy/v1alpha1/generated.pb.go | 76 +- pkg/apis/imagepolicy/v1alpha1/generated.proto | 2 +- pkg/apis/imagepolicy/v1alpha1/register.go | 2 +- .../imagepolicy/v1alpha1/types.generated.go | 6 +- pkg/apis/imagepolicy/v1alpha1/types.go | 2 +- pkg/apis/meta/v1/generated.pb.go | 232 +-- pkg/apis/meta/v1/generated.proto | 4 +- pkg/apis/policy/types.generated.go | 36 +- pkg/apis/policy/types.go | 2 +- pkg/apis/policy/v1alpha1/register.go | 2 +- pkg/apis/policy/v1alpha1/types.go | 4 +- pkg/apis/policy/v1beta1/generated.pb.go | 112 +- pkg/apis/policy/v1beta1/generated.proto | 8 +- pkg/apis/policy/v1beta1/register.go | 2 +- pkg/apis/policy/v1beta1/types.generated.go | 38 +- pkg/apis/policy/v1beta1/types.go | 6 +- pkg/apis/policy/validation/validation.go | 2 +- pkg/apis/rbac/v1alpha1/generated.pb.go | 121 +- pkg/apis/rbac/v1alpha1/generated.proto | 10 +- pkg/apis/rbac/v1alpha1/register.go | 2 +- pkg/apis/rbac/v1alpha1/types.generated.go | 22 +- pkg/apis/rbac/v1alpha1/types.go | 2 +- pkg/apis/storage/types.generated.go | 8 +- pkg/apis/storage/v1beta1/generated.pb.go | 64 +- pkg/apis/storage/v1beta1/generated.proto | 4 +- pkg/apis/storage/v1beta1/register.go | 2 +- pkg/apis/storage/v1beta1/types.generated.go | 10 +- pkg/apis/storage/v1beta1/types.go | 2 +- pkg/apiserver/api_installer.go | 2 +- pkg/apiserver/apiserver_test.go | 44 +- pkg/apiserver/resthandler_test.go | 2 +- pkg/apiserver/testing/types.generated.go | 8 +- pkg/apiserver/testing/types.go | 10 +- pkg/client/cache/listers.go | 2 +- pkg/client/cache/listers_extensions.go | 2 +- pkg/client/cache/listers_test.go | 2 +- pkg/client/cache/listwatch_test.go | 2 +- pkg/client/cache/reflector_test.go | 2 +- pkg/client/leaderelection/leaderelection.go | 2 +- .../leaderelection/leaderelection_test.go | 2 +- .../leaderelection/resourcelock/interface.go | 6 +- .../batch/internalversion/job_expansion.go | 2 +- .../listers/batch/internalversion/job_test.go | 2 +- pkg/client/listers/batch/v1/job_expansion.go | 2 +- pkg/client/record/event.go | 2 +- pkg/client/record/event_test.go | 2 +- pkg/client/record/events_cache.go | 2 +- pkg/client/record/events_cache_test.go | 2 +- pkg/client/restclient/client_test.go | 2 +- pkg/client/restclient/request.go | 2 +- pkg/client/restclient/request_test.go | 2 +- pkg/client/testing/core/fixture.go | 2 +- .../typed/discovery/discovery_client.go | 2 +- .../typed/discovery/discovery_client_test.go | 2 +- pkg/client/typed/discovery/fake/discovery.go | 2 +- .../typed/discovery/helper_blackbox_test.go | 2 +- pkg/client/typed/discovery/restmapper_test.go | 2 +- pkg/client/typed/dynamic/client.go | 2 +- pkg/client/typed/dynamic/client_test.go | 2 +- pkg/client/unversioned/helper_test.go | 2 +- .../testclient/simple/simple_testclient.go | 2 +- pkg/cloudprovider/providers/aws/aws.go | 2 +- pkg/cloudprovider/providers/aws/aws_test.go | 2 +- pkg/cloudprovider/providers/gce/gce.go | 2 +- pkg/controller/controller_utils.go | 2 +- pkg/controller/controller_utils_test.go | 2 +- pkg/controller/cronjob/controller.go | 2 +- pkg/controller/cronjob/controller_test.go | 2 +- pkg/controller/cronjob/utils_test.go | 2 +- pkg/controller/daemon/daemoncontroller.go | 2 +- .../daemon/daemoncontroller_test.go | 2 +- .../deployment/deployment_controller.go | 2 +- .../deployment/deployment_controller_test.go | 2 +- pkg/controller/deployment/sync.go | 2 +- pkg/controller/deployment/sync_test.go | 2 +- .../deployment/util/deployment_util.go | 2 +- .../deployment/util/deployment_util_test.go | 2 +- pkg/controller/disruption/disruption.go | 2 +- pkg/controller/disruption/disruption_test.go | 2 +- .../endpoint/endpoints_controller_test.go | 2 +- .../garbagecollector/garbagecollector.go | 2 +- .../garbagecollector/garbagecollector_test.go | 2 +- .../metaonly/metaonly_test.go | 2 +- .../metaonly/types.generated.go | 10 +- .../garbagecollector/metaonly/types.go | 2 +- pkg/controller/job/jobcontroller.go | 2 +- pkg/controller/job/jobcontroller_test.go | 2 +- .../namespace/namespace_controller_test.go | 2 +- .../namespace/namespace_controller_utils.go | 2 +- pkg/controller/node/nodecontroller.go | 2 +- pkg/controller/node/nodecontroller_test.go | 2 +- pkg/controller/node/test_utils.go | 2 +- pkg/controller/petset/fakes.go | 2 +- pkg/controller/petset/pet_set.go | 2 +- pkg/controller/podautoscaler/BUILD | 1 + pkg/controller/podautoscaler/horizontal.go | 2 +- .../podautoscaler/horizontal_test.go | 5 +- pkg/controller/podautoscaler/metrics/BUILD | 2 +- .../metrics/metrics_client_test.go | 4 +- .../podautoscaler/replica_calculator_test.go | 5 +- pkg/controller/podgc/gc_controller_test.go | 2 +- pkg/controller/replicaset/replica_set.go | 2 +- pkg/controller/replicaset/replica_set_test.go | 2 +- .../replicaset/replica_set_utils.go | 2 +- .../replication_controller_test.go | 2 +- .../replication_controller_utils.go | 2 +- pkg/controller/route/routecontroller.go | 2 +- .../volume/persistentvolume/framework_test.go | 2 +- .../volume/persistentvolume/index.go | 2 +- .../volume/persistentvolume/index_test.go | 2 +- .../volume/persistentvolume/provision_test.go | 2 +- .../volume/persistentvolume/pv_controller.go | 2 +- pkg/conversion/queryparams/convert_test.go | 8 +- pkg/dns/dns.go | 2 +- pkg/dns/dns_test.go | 2 +- pkg/genericapiserver/config.go | 2 +- pkg/genericapiserver/genericapiserver.go | 2 +- pkg/genericapiserver/genericapiserver_test.go | 2 +- pkg/kubectl/cmd/BUILD | 1 + pkg/kubectl/cmd/certificates.go | 2 +- pkg/kubectl/cmd/cmd_test.go | 2 +- pkg/kubectl/cmd/delete_test.go | 2 +- pkg/kubectl/cmd/drain_test.go | 2 +- pkg/kubectl/cmd/get_test.go | 2 +- pkg/kubectl/cmd/logs.go | 2 +- pkg/kubectl/cmd/run.go | 2 +- pkg/kubectl/cmd/testing/fake.go | 2 +- pkg/kubectl/cmd/top_test.go | 17 +- pkg/kubectl/cmd/util/factory.go | 2 +- pkg/kubectl/cmd/util/factory_test.go | 2 +- pkg/kubectl/cmd/util/helpers.go | 2 +- pkg/kubectl/cmd/util/helpers_test.go | 2 +- pkg/kubectl/custom_column_printer_test.go | 2 +- pkg/kubectl/deployment.go | 2 +- pkg/kubectl/deployment_test.go | 2 +- pkg/kubectl/describe.go | 2 +- pkg/kubectl/describe_test.go | 2 +- pkg/kubectl/resource/builder_test.go | 2 +- pkg/kubectl/resource/helper_test.go | 2 +- pkg/kubectl/resource/result.go | 2 +- pkg/kubectl/resource_printer.go | 2 +- pkg/kubectl/resource_printer_test.go | 2 +- pkg/kubectl/rolling_updater.go | 2 +- pkg/kubectl/rolling_updater_test.go | 2 +- pkg/kubectl/run.go | 2 +- pkg/kubectl/run_test.go | 2 +- pkg/kubectl/sorting_printer.go | 2 +- pkg/kubectl/sorting_printer_test.go | 2 +- pkg/kubectl/stop.go | 2 +- pkg/kubectl/stop_test.go | 2 +- pkg/kubectl/testing/types.generated.go | 4 +- pkg/kubelet/active_deadline_test.go | 2 +- pkg/kubelet/config/common_test.go | 2 +- pkg/kubelet/config/config_test.go | 2 +- pkg/kubelet/config/file_linux_test.go | 2 +- pkg/kubelet/config/http_test.go | 2 +- pkg/kubelet/container/helpers.go | 2 +- pkg/kubelet/container/ref_test.go | 2 +- pkg/kubelet/dockertools/docker_manager.go | 2 +- pkg/kubelet/eviction/helpers_test.go | 2 +- pkg/kubelet/eviction/types.go | 2 +- pkg/kubelet/kubelet_node_status.go | 2 +- pkg/kubelet/kubelet_node_status_test.go | 2 +- pkg/kubelet/kubelet_pods.go | 2 +- pkg/kubelet/kubelet_test.go | 2 +- .../kuberuntime/kuberuntime_container.go | 2 +- .../kuberuntime/kuberuntime_logs_test.go | 2 +- pkg/kubelet/network/exec/exec.go | 2 +- pkg/kubelet/network/plugins.go | 2 +- pkg/kubelet/oom_watcher.go | 2 +- pkg/kubelet/prober/common_test.go | 2 +- pkg/kubelet/prober/worker_test.go | 2 +- pkg/kubelet/rkt/log.go | 2 +- pkg/kubelet/server/server.go | 2 +- pkg/kubelet/server/stats/summary.go | 2 +- pkg/kubelet/server/stats/summary_test.go | 2 +- pkg/kubelet/status/status_manager.go | 2 +- pkg/kubelet/status/status_manager_test.go | 2 +- pkg/kubelet/util/csr/csr.go | 2 +- pkg/master/master_test.go | 2 +- pkg/master/thirdparty/thirdparty.go | 2 +- pkg/registry/apps/petset/etcd/etcd_test.go | 2 +- pkg/registry/apps/petset/strategy_test.go | 2 +- pkg/registry/batch/cronjob/strategy_test.go | 2 +- pkg/registry/batch/job/etcd/etcd_test.go | 2 +- pkg/registry/batch/job/strategy.go | 2 +- pkg/registry/batch/job/strategy_test.go | 2 +- pkg/registry/core/namespace/strategy_test.go | 2 +- pkg/registry/core/pod/etcd/etcd.go | 2 +- pkg/registry/core/service/rest.go | 2 +- .../extensions/controller/etcd/etcd_test.go | 2 +- .../extensions/daemonset/etcd/etcd_test.go | 2 +- .../extensions/deployment/etcd/etcd.go | 2 +- .../extensions/deployment/etcd/etcd_test.go | 2 +- .../extensions/deployment/strategy.go | 2 +- .../networkpolicy/etcd/etcd_test.go | 2 +- .../extensions/networkpolicy/strategy_test.go | 2 +- .../extensions/replicaset/etcd/etcd_test.go | 2 +- .../extensions/replicaset/strategy_test.go | 2 +- .../thirdpartyresourcedata/codec.go | 2 +- .../thirdpartyresourcedata/codec_test.go | 12 +- pkg/registry/generic/registry/store.go | 2 +- pkg/runtime/generated.proto | 2 +- pkg/runtime/unstructured_test.go | 2 +- pkg/runtime/unversioned_test.go | 2 +- pkg/storage/cacher.go | 2 +- pkg/storage/testing/types.generated.go | 4 +- pkg/storage/testing/types.go | 4 +- pkg/storage/watch_cache_test.go | 2 +- pkg/util/node/node.go | 2 +- pkg/util/node/node_test.go | 2 +- pkg/util/replicaset/replicaset.go | 2 +- pkg/volume/flocker/flocker_volume_test.go | 2 +- .../token/webhook/webhook_test.go | 2 +- .../auth/authorizer/webhook/webhook_test.go | 2 +- plugin/pkg/scheduler/algorithm/listers.go | 2 +- .../algorithm/predicates/predicates.go | 2 +- .../priorities/interpod_affinity_test.go | 2 +- .../priorities/selector_spreading.go | 2 +- .../priorities/selector_spreading_test.go | 2 +- .../algorithm/priorities/util/topologies.go | 2 +- plugin/pkg/scheduler/api/types.go | 2 +- plugin/pkg/scheduler/api/v1/types.go | 2 +- test/e2e/BUILD | 1 + test/e2e/common/empty_dir.go | 2 +- test/e2e/common/host_path.go | 2 +- test/e2e/common/volumes.go | 2 +- test/e2e/daemon_set.go | 2 +- test/e2e/density.go | 2 +- test/e2e/deployment.go | 2 +- test/e2e/disruption.go | 2 +- test/e2e/dns.go | 2 +- test/e2e/dns_configmap.go | 2 +- test/e2e/federation-deployment.go | 2 +- test/e2e/federation-replicaset.go | 2 +- test/e2e/framework/networking_utils.go | 2 +- test/e2e/framework/util.go | 2 +- test/e2e/garbage_collector.go | 2 +- test/e2e/gke_local_ssd.go | 2 +- test/e2e/kubectl.go | 2 +- test/e2e/mesos.go | 2 +- test/e2e/pd.go | 2 +- test/e2e/persistent_volumes.go | 2 +- test/e2e/petset.go | 2 +- test/e2e/replica_set.go | 2 +- test/e2e/resize_nodes.go | 2 +- test/e2e/third-party.go | 4 +- test/e2e/ubernetes_lite.go | 2 +- test/e2e/volume_provisioning.go | 2 +- test/e2e/volumes.go | 2 +- test/e2e_node/density_test.go | 2 +- test/e2e_node/kubelet_test.go | 2 +- test/e2e_node/simple_mount.go | 2 +- test/e2e_node/summary_test.go | 2 +- test/integration/client/client_test.go | 2 +- .../integration/client/dynamic_client_test.go | 2 +- test/integration/federation/server_test.go | 2 +- .../garbage_collector_test.go | 2 +- .../persistent_volumes_test.go | 2 +- .../integration/replicaset/replicaset_test.go | 2 +- .../replicationcontroller_test.go | 2 +- test/integration/scheduler/extender_test.go | 2 +- test/integration/scheduler/scheduler_test.go | 2 +- .../storageclasses/storage_classes_test.go | 2 +- .../integration/thirdparty/thirdparty_test.go | 4 +- test/soak/serve_hostnames/serve_hostnames.go | 2 +- test/utils/runners.go | 2 +- vendor/BUILD | 193 ++- 440 files changed, 8682 insertions(+), 8706 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 3059c2e1960..2478b5983f0 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -29,7 +29,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIVersions" + "$ref": "#/definitions/v1.APIVersions" } }, "401": { @@ -62,7 +62,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -670,7 +670,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -910,7 +910,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1066,7 +1066,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1099,7 +1099,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -1307,7 +1307,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1463,7 +1463,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1496,7 +1496,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -1704,7 +1704,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1860,7 +1860,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1893,7 +1893,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2101,7 +2101,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2257,7 +2257,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2290,7 +2290,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2498,7 +2498,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2654,7 +2654,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2687,7 +2687,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2823,7 +2823,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -3031,7 +3031,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -3187,7 +3187,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -3220,7 +3220,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -3705,13 +3705,6 @@ "name": "sinceSeconds", "in": "query" }, - { - "uniqueItems": true, - "type": "string", - "description": "An RFC3339 timestamp from which to show logs. If this value precedes the time a pod was started, only logs since the pod start will be returned. If this value is in the future, no logs will be returned. Only one of sinceSeconds or sinceTime may be specified.", - "name": "sinceTime", - "in": "query" - }, { "uniqueItems": true, "type": "integer", @@ -4282,7 +4275,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -4490,7 +4483,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -4646,7 +4639,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -4679,7 +4672,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -4887,7 +4880,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5043,7 +5036,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5076,7 +5069,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5212,7 +5205,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5348,7 +5341,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5556,7 +5549,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5712,7 +5705,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5745,7 +5738,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5881,7 +5874,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6089,7 +6082,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6245,7 +6238,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6278,7 +6271,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6486,7 +6479,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6642,7 +6635,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6675,7 +6668,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6949,7 +6942,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6982,7 +6975,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -7504,7 +7497,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -7676,7 +7669,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -7709,7 +7702,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -7893,7 +7886,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -8093,7 +8086,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -8241,7 +8234,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -8274,7 +8267,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -8772,7 +8765,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -9049,7 +9042,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -9197,7 +9190,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -9230,7 +9223,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -9358,7 +9351,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -14601,7 +14594,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroupList" + "$ref": "#/definitions/v1.APIGroupList" } }, "401": { @@ -14634,7 +14627,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -14667,7 +14660,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -14842,7 +14835,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -14998,7 +14991,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -15031,7 +15024,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -15167,7 +15160,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -15565,7 +15558,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -15598,7 +15591,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -15679,7 +15672,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -15712,7 +15705,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -15897,7 +15890,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -15930,7 +15923,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -16182,7 +16175,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -16338,7 +16331,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -16371,7 +16364,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -16507,7 +16500,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -16828,7 +16821,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -16861,7 +16854,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -17113,7 +17106,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -17269,7 +17262,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -17302,7 +17295,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -17438,7 +17431,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -17759,7 +17752,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -18088,7 +18081,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -18244,7 +18237,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -18277,7 +18270,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -18413,7 +18406,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -18621,7 +18614,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -18777,7 +18770,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -18810,7 +18803,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -18946,7 +18939,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -19154,7 +19147,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -19310,7 +19303,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -19343,7 +19336,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -19479,7 +19472,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -20387,7 +20380,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -20420,7 +20413,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -20595,7 +20588,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -20743,7 +20736,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -20776,7 +20769,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -21108,7 +21101,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -21141,7 +21134,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -21701,7 +21694,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -21857,7 +21850,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -21890,7 +21883,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22026,7 +22019,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22234,7 +22227,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -22390,7 +22383,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -22423,7 +22416,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22623,7 +22616,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22759,7 +22752,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -22967,7 +22960,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -23123,7 +23116,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -23156,7 +23149,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -23292,7 +23285,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -23500,7 +23493,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -23656,7 +23649,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -23689,7 +23682,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -23825,7 +23818,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -24033,7 +24026,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -24189,7 +24182,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -24222,7 +24215,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -24358,7 +24351,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -24566,7 +24559,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -24722,7 +24715,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -24755,7 +24748,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -24963,7 +24956,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -25119,7 +25112,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -25152,7 +25145,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -25288,7 +25281,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -25424,7 +25417,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -25560,7 +25553,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -25922,7 +25915,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -26070,7 +26063,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -26103,7 +26096,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -28108,7 +28101,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -28141,7 +28134,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -28316,7 +28309,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -28472,7 +28465,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -28505,7 +28498,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -28641,7 +28634,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -29039,7 +29032,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -29072,7 +29065,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -29247,7 +29240,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -29379,7 +29372,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -29412,7 +29405,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -29612,7 +29605,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -29744,7 +29737,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -29777,7 +29770,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -29977,7 +29970,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -30117,7 +30110,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -30150,7 +30143,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -30358,7 +30351,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -30498,7 +30491,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -30531,7 +30524,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -31585,7 +31578,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -31618,7 +31611,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -31793,7 +31786,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -31941,7 +31934,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -31974,7 +31967,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -32263,7 +32256,7 @@ } } }, - "unversioned.APIGroup": { + "v1.APIGroup": { "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -32277,25 +32270,25 @@ }, "preferredVersion": { "description": "preferredVersion is the version preferred by the API server, which probably is the storage version.", - "$ref": "#/definitions/unversioned.GroupVersionForDiscovery" + "$ref": "#/definitions/v1.GroupVersionForDiscovery" }, "serverAddressByClientCIDRs": { "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.ServerAddressByClientCIDR" + "$ref": "#/definitions/v1.ServerAddressByClientCIDR" } }, "versions": { "description": "versions are the versions supported in this group.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.GroupVersionForDiscovery" + "$ref": "#/definitions/v1.GroupVersionForDiscovery" } } } }, - "unversioned.APIGroupList": { + "v1.APIGroupList": { "description": "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.", "required": [ "groups" @@ -32305,12 +32298,12 @@ "description": "groups is a list of APIGroup.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } } } }, - "unversioned.APIResource": { + "v1.APIResource": { "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", @@ -32332,7 +32325,7 @@ } } }, - "unversioned.APIResourceList": { + "v1.APIResourceList": { "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -32347,12 +32340,12 @@ "description": "resources contains the name of the resources and if they are namespaced.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.APIResource" + "$ref": "#/definitions/v1.APIResource" } } } }, - "unversioned.APIVersions": { + "v1.APIVersions": { "description": "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.", "required": [ "versions", @@ -32363,7 +32356,7 @@ "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.ServerAddressByClientCIDR" + "$ref": "#/definitions/v1.ServerAddressByClientCIDR" } }, "versions": { @@ -32375,179 +32368,6 @@ } } }, - "unversioned.GroupVersionForDiscovery": { - "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", - "required": [ - "groupVersion", - "version" - ], - "properties": { - "groupVersion": { - "description": "groupVersion specifies the API group and version in the form \"group/version\"", - "type": "string" - }, - "version": { - "description": "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", - "type": "string" - } - } - }, - "unversioned.LabelSelector": { - "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", - "properties": { - "matchExpressions": { - "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", - "type": "array", - "items": { - "$ref": "#/definitions/unversioned.LabelSelectorRequirement" - } - }, - "matchLabels": { - "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, - "unversioned.LabelSelectorRequirement": { - "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", - "required": [ - "key", - "operator" - ], - "properties": { - "key": { - "description": "key is the label key that the selector applies to.", - "type": "string" - }, - "operator": { - "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", - "type": "string" - }, - "values": { - "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", - "type": "array", - "items": { - "type": "string" - } - } - } - }, - "unversioned.ListMeta": { - "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", - "properties": { - "resourceVersion": { - "description": "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", - "type": "string" - }, - "selfLink": { - "description": "SelfLink is a URL representing this object. Populated by the system. Read-only.", - "type": "string" - } - } - }, - "unversioned.Patch": { - "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body." - }, - "unversioned.ServerAddressByClientCIDR": { - "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", - "required": [ - "clientCIDR", - "serverAddress" - ], - "properties": { - "clientCIDR": { - "description": "The CIDR with which clients can match their IP to figure out the server address that they should use.", - "type": "string" - }, - "serverAddress": { - "description": "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", - "type": "string" - } - } - }, - "unversioned.Status": { - "description": "Status is a return value for calls that don't return other objects.", - "properties": { - "code": { - "description": "Suggested HTTP return code for this status, 0 if not set.", - "type": "integer", - "format": "int32" - }, - "details": { - "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", - "$ref": "#/definitions/unversioned.StatusDetails" - }, - "message": { - "description": "A human-readable description of the status of this operation.", - "type": "string" - }, - "metadata": { - "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" - }, - "reason": { - "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", - "type": "string" - }, - "status": { - "description": "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", - "type": "string" - } - } - }, - "unversioned.StatusCause": { - "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", - "properties": { - "field": { - "description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", - "type": "string" - }, - "message": { - "description": "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", - "type": "string" - }, - "reason": { - "description": "A machine-readable description of the cause of the error. If this value is empty there is no information available.", - "type": "string" - } - } - }, - "unversioned.StatusDetails": { - "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", - "properties": { - "causes": { - "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", - "type": "array", - "items": { - "$ref": "#/definitions/unversioned.StatusCause" - } - }, - "group": { - "description": "The group attribute of the resource associated with the status StatusReason.", - "type": "string" - }, - "kind": { - "description": "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "type": "string" - }, - "name": { - "description": "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", - "type": "string" - }, - "retryAfterSeconds": { - "description": "If specified, the time in seconds before the operation should be retried.", - "type": "integer", - "format": "int32" - } - } - }, - "unversioned.Time": { - "type": "string", - "format": "date-time" - }, "v1.AttachedVolume": { "description": "AttachedVolume describes a volume attached to a node", "required": [ @@ -32656,7 +32476,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -32703,7 +32523,7 @@ }, "metadata": { "description": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -32874,7 +32694,7 @@ "properties": { "startedAt": { "description": "Time at which the container was last (re-)started", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } } }, @@ -32895,7 +32715,7 @@ }, "finishedAt": { "description": "Time at which the container last terminated", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Message regarding the last termination of the container", @@ -32912,7 +32732,7 @@ }, "startedAt": { "description": "Time at which previous execution of the container started", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } } }, @@ -33131,7 +32951,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33190,7 +33010,7 @@ }, "firstTimestamp": { "description": "The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "involvedObject": { "description": "The object that this event is about.", @@ -33198,7 +33018,7 @@ }, "lastTimestamp": { "description": "The time at which the most recent occurrence of this event was recorded.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human-readable description of the status of this operation.", @@ -33237,7 +33057,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33266,6 +33086,23 @@ } } }, + "v1.GroupVersionForDiscovery": { + "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", + "required": [ + "groupVersion", + "version" + ], + "properties": { + "groupVersion": { + "description": "groupVersion specifies the API group and version in the form \"group/version\"", + "type": "string" + }, + "version": { + "description": "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", + "type": "string" + } + } + }, "v1.HTTPGetAction": { "description": "HTTPGetAction describes an action based on HTTP Get requests.", "required": [ @@ -33363,7 +33200,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33419,7 +33256,7 @@ }, "lastScaleTime": { "description": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "observedGeneration": { "description": "most recent generation observed by this autoscaler.", @@ -33454,11 +33291,11 @@ "properties": { "lastProbeTime": { "description": "Last time the condition was checked.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -33493,7 +33330,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33524,7 +33361,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created when executing a job. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -33542,7 +33379,7 @@ }, "completionTime": { "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "conditions": { "description": "Conditions represent the latest available observations of an object's current state. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -33558,7 +33395,7 @@ }, "startTime": { "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "succeeded": { "description": "Succeeded is the number of pods which reached Phase Succeeded.", @@ -33567,6 +33404,49 @@ } } }, + "v1.LabelSelector": { + "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", + "properties": { + "matchExpressions": { + "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", + "type": "array", + "items": { + "$ref": "#/definitions/v1.LabelSelectorRequirement" + } + }, + "matchLabels": { + "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + }, + "v1.LabelSelectorRequirement": { + "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", + "required": [ + "key", + "operator" + ], + "properties": { + "key": { + "description": "key is the label key that the selector applies to.", + "type": "string" + }, + "operator": { + "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", + "type": "string" + }, + "values": { + "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", + "type": "array", + "items": { + "type": "string" + } + } + } + }, "v1.Lifecycle": { "description": "Lifecycle describes actions that the management system should take in response to container lifecycle events. For the PostStart and PreStop lifecycle handlers, management of the container blocks until the action is complete, unless the container process fails, in which case the handler is aborted.", "properties": { @@ -33652,7 +33532,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33671,6 +33551,19 @@ } } }, + "v1.ListMeta": { + "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", + "properties": { + "resourceVersion": { + "description": "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", + "type": "string" + }, + "selfLink": { + "description": "SelfLink is a URL representing this object. Populated by the system. Read-only.", + "type": "string" + } + } + }, "v1.LoadBalancerIngress": { "description": "LoadBalancerIngress represents the status of a load-balancer ingress point: traffic intended for the service should be sent to an ingress point.", "properties": { @@ -33737,7 +33630,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -33805,11 +33698,11 @@ "properties": { "lastHeartbeatTime": { "description": "Last time we got an update on a given condition.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -33853,7 +33746,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34033,7 +33926,7 @@ }, "creationTimestamp": { "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "deletionGracePeriodSeconds": { "description": "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only.", @@ -34042,7 +33935,7 @@ }, "deletionTimestamp": { "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "finalizers": { "description": "Must be empty before the object is deleted from the registry. Each entry 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.", @@ -34160,6 +34053,9 @@ } } }, + "v1.Patch": { + "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body." + }, "v1.PersistentVolume": { "description": "PersistentVolume (PV) is a storage resource provisioned by an administrator. It is analogous to a node. More info: http://kubernetes.io/docs/user-guide/persistent-volumes", "properties": { @@ -34209,7 +34105,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34229,7 +34125,7 @@ }, "selector": { "description": "A label query over volumes to consider for binding.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "volumeName": { "description": "VolumeName is the binding reference to the PersistentVolume backing this claim.", @@ -34275,7 +34171,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34349,11 +34245,11 @@ "properties": { "lastProbeTime": { "description": "Last time we probed the condition.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human-readable message indicating details about last transition.", @@ -34388,7 +34284,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34552,7 +34448,7 @@ }, "startTime": { "description": "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } } }, @@ -34584,7 +34480,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34666,7 +34562,7 @@ "properties": { "lastTransitionTime": { "description": "The last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -34701,7 +34597,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -34823,7 +34719,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35004,7 +34900,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35038,6 +34934,23 @@ } } }, + "v1.ServerAddressByClientCIDR": { + "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", + "required": [ + "clientCIDR", + "serverAddress" + ], + "properties": { + "clientCIDR": { + "description": "The CIDR with which clients can match their IP to figure out the server address that they should use.", + "type": "string" + }, + "serverAddress": { + "description": "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", + "type": "string" + } + } + }, "v1.Service": { "description": "Service is a named abstraction of software service (for example, mysql) consisting of local port (for example 3306) that the proxy listens on, and the selector that determines which pods will answer requests sent through the proxy.", "properties": { @@ -35093,7 +35006,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35112,7 +35025,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35218,6 +35131,82 @@ } } }, + "v1.Status": { + "description": "Status is a return value for calls that don't return other objects.", + "properties": { + "code": { + "description": "Suggested HTTP return code for this status, 0 if not set.", + "type": "integer", + "format": "int32" + }, + "details": { + "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", + "$ref": "#/definitions/v1.StatusDetails" + }, + "message": { + "description": "A human-readable description of the status of this operation.", + "type": "string" + }, + "metadata": { + "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + "$ref": "#/definitions/v1.ListMeta" + }, + "reason": { + "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", + "type": "string" + }, + "status": { + "description": "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", + "type": "string" + } + } + }, + "v1.StatusCause": { + "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", + "properties": { + "field": { + "description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", + "type": "string" + }, + "message": { + "description": "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", + "type": "string" + }, + "reason": { + "description": "A machine-readable description of the cause of the error. If this value is empty there is no information available.", + "type": "string" + } + } + }, + "v1.StatusDetails": { + "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", + "properties": { + "causes": { + "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", + "type": "array", + "items": { + "$ref": "#/definitions/v1.StatusCause" + } + }, + "group": { + "description": "The group attribute of the resource associated with the status StatusReason.", + "type": "string" + }, + "kind": { + "description": "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + "type": "string" + }, + "name": { + "description": "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", + "type": "string" + }, + "retryAfterSeconds": { + "description": "If specified, the time in seconds before the operation should be retried.", + "type": "integer", + "format": "int32" + } + } + }, "v1.TCPSocketAction": { "description": "TCPSocketAction describes an action based on opening a socket", "required": [ @@ -35230,6 +35219,10 @@ } } }, + "v1.Time": { + "type": "string", + "format": "date-time" + }, "v1.Volume": { "description": "Volume represents a named volume in a pod that may be accessed by any container in the pod.", "required": [ @@ -35290,7 +35283,7 @@ "properties": { "lastUpdateTime": { "description": "timestamp for the last update to this condition", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "human readable message with details about the request state", @@ -35318,7 +35311,7 @@ } }, "metadata": { - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35422,7 +35415,7 @@ }, "metadata": { "description": "Standard object's metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35441,7 +35434,7 @@ }, "metadata": { "description": "Standard object's metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35550,7 +35543,7 @@ }, "metadata": { "description": "Standard object's metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35569,7 +35562,7 @@ }, "metadata": { "description": "Standard object's metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35673,7 +35666,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35685,7 +35678,7 @@ "properties": { "selector": { "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created. The DaemonSet will create exactly one copy of this pod on every node that matches the template's node selector (or on every node if no node selector is specified). More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template", @@ -35750,11 +35743,11 @@ "properties": { "lastTransitionTime": { "description": "Last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastUpdateTime": { "description": "The last time this condition was updated.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -35789,7 +35782,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -35853,7 +35846,7 @@ }, "selector": { "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "strategy": { "description": "The deployment strategy to use to replace existing pods with new ones.", @@ -35960,7 +35953,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36015,7 +36008,7 @@ }, "lastScaleTime": { "description": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "observedGeneration": { "description": "most recent generation observed by this autoscaler.", @@ -36073,7 +36066,7 @@ }, "metadata": { "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36160,11 +36153,11 @@ "properties": { "lastProbeTime": { "description": "Last time the condition was checked.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -36199,7 +36192,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36230,7 +36223,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created when executing a job. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -36248,7 +36241,7 @@ }, "completionTime": { "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "conditions": { "description": "Conditions represent the latest available observations of an object's current state. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -36264,7 +36257,7 @@ }, "startTime": { "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "succeeded": { "description": "Succeeded is the number of pods which reached Phase Succeeded.", @@ -36338,7 +36331,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36346,11 +36339,11 @@ "properties": { "namespaceSelector": { "description": "Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "podSelector": { "description": "This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" } } }, @@ -36380,7 +36373,7 @@ }, "podSelector": { "description": "Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" } } }, @@ -36426,7 +36419,7 @@ } }, "metadata": { - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36439,7 +36432,7 @@ }, "selector": { "description": "Label query over pods whose evictions are managed by the disruption budget.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" } } }, @@ -36467,7 +36460,7 @@ "description": "DisruptedPods contains information about pods whose eviction was processed by the API server eviction subresource handler but has not yet been observed by the PodDisruptionBudget controller. A pod will be in this map from the time when the API server processed the eviction request to the time when the pod is seen by PDB controller as having been marked for deletion (or after a timeout). The key in the map is the name of the pod and the value is the time when the API server processed the eviction request. If the deletion didn't occur and a pod is still there it will be removed from the list automatically by PodDisruptionBudget controller after some time. If everything goes smooth this map should be empty for the most of the time. Large number of entries in the map may indicate problems with pod deletions.", "type": "object", "additionalProperties": { - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } }, "disruptionsAllowed": { @@ -36513,7 +36506,7 @@ "properties": { "lastTransitionTime": { "description": "The last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -36548,7 +36541,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36567,7 +36560,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template", @@ -36782,7 +36775,7 @@ } }, "metadata": { - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -36800,7 +36793,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the replica count. If empty, defaulted to labels on the pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "serviceName": { "description": "ServiceName is the name of the service that governs this StatefulSet. This service must exist before the StatefulSet, and is responsible for the network identity of the set. Pods get DNS/hostnames that follow the pattern: pod-specific-string.serviceName.default.svc.cluster.local where \"pod-specific-string\" is managed by the StatefulSet controller.", @@ -36875,7 +36868,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -37008,7 +37001,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -37119,7 +37112,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -37165,7 +37158,7 @@ }, "lastScheduleTime": { "description": "LastScheduleTime keeps information of when was the last time the job was successfully scheduled.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" } } }, @@ -37195,11 +37188,11 @@ "properties": { "lastProbeTime": { "description": "Last time the condition was checked.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -37234,7 +37227,7 @@ }, "metadata": { "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -37265,7 +37258,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created when executing a job. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -37283,7 +37276,7 @@ }, "completionTime": { "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "conditions": { "description": "Conditions represent the latest available observations of an object's current state. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -37299,7 +37292,7 @@ }, "startTime": { "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "succeeded": { "description": "Succeeded is the number of pods which reached Phase Succeeded.", diff --git a/api/swagger-spec/api.json b/api/swagger-spec/api.json index 6ec7dba9c8e..1147033c40b 100644 --- a/api/swagger-spec/api.json +++ b/api/swagger-spec/api.json @@ -13,7 +13,7 @@ "description": "get available API versions", "operations": [ { - "type": "unversioned.APIVersions", + "type": "v1.APIVersions", "method": "GET", "summary": "get available API versions", "nickname": "getAPIVersions", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIVersions": { - "id": "unversioned.APIVersions", + "v1.APIVersions": { + "id": "v1.APIVersions", "description": "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.", "required": [ "versions", @@ -59,14 +59,14 @@ "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/apis.json b/api/swagger-spec/apis.json index dea7ec02cf7..df729ba5160 100644 --- a/api/swagger-spec/apis.json +++ b/api/swagger-spec/apis.json @@ -13,7 +13,7 @@ "description": "get available API versions", "operations": [ { - "type": "unversioned.APIGroupList", + "type": "v1.APIGroupList", "method": "GET", "summary": "get available API versions", "nickname": "getAPIVersions", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroupList": { - "id": "unversioned.APIGroupList", + "v1.APIGroupList": { + "id": "v1.APIGroupList", "description": "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.", "required": [ "groups" @@ -51,14 +51,14 @@ "groups": { "type": "array", "items": { - "$ref": "unversioned.APIGroup" + "$ref": "v1.APIGroup" }, "description": "groups is a list of APIGroup." } } }, - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -81,25 +81,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -116,8 +116,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/apps.json b/api/swagger-spec/apps.json index 695f3160cef..5349f3ec8d1 100644 --- a/api/swagger-spec/apps.json +++ b/api/swagger-spec/apps.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json index df7018463a6..c0c4a1715da 100644 --- a/api/swagger-spec/apps_v1beta1.json +++ b/api/swagger-spec/apps_v1beta1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of StatefulSet", "nickname": "deletecollectionNamespacedStatefulSet", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a StatefulSet", "nickname": "deleteNamespacedStatefulSet", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -983,7 +983,7 @@ "description": "API at /apis/apps/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -1019,7 +1019,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta" + "$ref": "v1.ListMeta" }, "items": { "type": "array", @@ -1029,8 +1029,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -1103,12 +1103,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -1190,7 +1188,7 @@ "description": "Replicas is the desired number of replicas of the given Template. These are replicas in the sense that they are instantiations of the same Template, but individual replicas also have a consistent identity. If unspecified, defaults to 1." }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the replica count. If empty, defaulted to labels on the pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -1210,8 +1208,8 @@ } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -1221,14 +1219,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -2647,7 +2645,7 @@ "description": "AccessModes contains the desired access modes the volume should have. More info: http://kubernetes.io/docs/user-guide/persistent-volumes#access-modes-1" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "A label query over volumes to consider for binding." }, "resources": { @@ -2704,8 +2702,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -2717,7 +2715,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -2733,7 +2731,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -2743,8 +2741,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -2762,7 +2760,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -2773,8 +2771,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -2806,8 +2804,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -2852,8 +2850,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -2875,14 +2873,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/authentication.k8s.io.json b/api/swagger-spec/authentication.k8s.io.json index 7135929d552..aa9df744333 100644 --- a/api/swagger-spec/authentication.k8s.io.json +++ b/api/swagger-spec/authentication.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/authentication.k8s.io_v1beta1.json b/api/swagger-spec/authentication.k8s.io_v1beta1.json index 33ce006615a..7279f5ee7b2 100644 --- a/api/swagger-spec/authentication.k8s.io_v1beta1.json +++ b/api/swagger-spec/authentication.k8s.io_v1beta1.json @@ -58,7 +58,7 @@ "description": "API at /apis/authentication.k8s.io/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -141,12 +141,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -267,8 +265,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -290,14 +288,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/authorization.k8s.io.json b/api/swagger-spec/authorization.k8s.io.json index aedd67cd8ea..8a71a1a8951 100644 --- a/api/swagger-spec/authorization.k8s.io.json +++ b/api/swagger-spec/authorization.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/authorization.k8s.io_v1beta1.json b/api/swagger-spec/authorization.k8s.io_v1beta1.json index 9f9462b0d3a..0ebefafecae 100644 --- a/api/swagger-spec/authorization.k8s.io_v1beta1.json +++ b/api/swagger-spec/authorization.k8s.io_v1beta1.json @@ -156,7 +156,7 @@ "description": "API at /apis/authorization.k8s.io/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -239,12 +239,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -480,8 +478,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -503,14 +501,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/autoscaling.json b/api/swagger-spec/autoscaling.json index 4de1765949b..3d227e0087c 100644 --- a/api/swagger-spec/autoscaling.json +++ b/api/swagger-spec/autoscaling.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/autoscaling_v1.json b/api/swagger-spec/autoscaling_v1.json index dadcb070ebe..2cfe8d78d0f 100644 --- a/api/swagger-spec/autoscaling_v1.json +++ b/api/swagger-spec/autoscaling_v1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of HorizontalPodAutoscaler", "nickname": "deletecollectionNamespacedHorizontalPodAutoscaler", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a HorizontalPodAutoscaler", "nickname": "deleteNamespacedHorizontalPodAutoscaler", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -983,7 +983,7 @@ "description": "API at /apis/autoscaling/v1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -1019,7 +1019,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -1031,8 +1031,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -1106,12 +1106,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -1245,7 +1243,6 @@ }, "lastScaleTime": { "type": "string", - "format": "date-time", "description": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed." }, "currentReplicas": { @@ -1265,8 +1262,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -1278,7 +1275,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -1294,7 +1291,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -1304,8 +1301,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -1323,7 +1320,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -1334,8 +1331,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -1367,8 +1364,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -1413,8 +1410,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -1436,14 +1433,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/batch.json b/api/swagger-spec/batch.json index 1fe54f7ca9a..fc83312861b 100644 --- a/api/swagger-spec/batch.json +++ b/api/swagger-spec/batch.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index 24505ec3d66..38e9743c5e7 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Job", "nickname": "deletecollectionNamespacedJob", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Job", "nickname": "deleteNamespacedJob", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -983,7 +983,7 @@ "description": "API at /apis/batch/v1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -1019,7 +1019,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -1031,8 +1031,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -1106,12 +1106,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -1202,7 +1200,7 @@ "description": "Optional duration in seconds relative to the startTime that the job may be active before the system tries to terminate it; value must be positive integer" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "manualSelector": { @@ -1215,8 +1213,8 @@ } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -1226,14 +1224,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -2627,12 +2625,10 @@ }, "startTime": { "type": "string", - "format": "date-time", "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC." }, "completionTime": { "type": "string", - "format": "date-time", "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC." }, "active": { @@ -2670,12 +2666,10 @@ }, "lastProbeTime": { "type": "string", - "format": "date-time", "description": "Last time the condition was checked." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transit from one status to another." }, "reason": { @@ -2688,8 +2682,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -2701,7 +2695,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -2717,7 +2711,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -2727,8 +2721,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -2746,7 +2740,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -2757,8 +2751,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -2790,8 +2784,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -2836,8 +2830,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -2859,14 +2853,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json index c805a3b4c26..dc54a48a072 100644 --- a/api/swagger-spec/batch_v2alpha1.json +++ b/api/swagger-spec/batch_v2alpha1.json @@ -13,7 +13,7 @@ "description": "API at /apis/batch/v2alpha1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -56,14 +56,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/certificates.k8s.io.json b/api/swagger-spec/certificates.k8s.io.json index 42855f420e3..55811b8adc7 100644 --- a/api/swagger-spec/certificates.k8s.io.json +++ b/api/swagger-spec/certificates.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/certificates.k8s.io_v1alpha1.json b/api/swagger-spec/certificates.k8s.io_v1alpha1.json index 60db9515378..bd511c13ed5 100644 --- a/api/swagger-spec/certificates.k8s.io_v1alpha1.json +++ b/api/swagger-spec/certificates.k8s.io_v1alpha1.json @@ -125,7 +125,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of CertificateSigningRequest", "nickname": "deletecollectionCertificateSigningRequest", @@ -183,7 +183,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -397,7 +397,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -432,7 +432,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a CertificateSigningRequest", "nickname": "deleteCertificateSigningRequest", @@ -482,7 +482,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -694,7 +694,7 @@ "description": "API at /apis/certificates.k8s.io/v1alpha1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -729,7 +729,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta" + "$ref": "v1.ListMeta" }, "items": { "type": "array", @@ -739,8 +739,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -813,12 +813,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -948,13 +946,12 @@ }, "lastUpdateTime": { "type": "string", - "format": "date-time", "description": "timestamp for the last update to this condition" } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -966,7 +963,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -982,7 +979,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -992,8 +989,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -1011,7 +1008,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -1022,8 +1019,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -1055,8 +1052,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -1101,8 +1098,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -1124,14 +1121,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/extensions.json b/api/swagger-spec/extensions.json index 6d2375f1a61..9ee75d6eb7e 100644 --- a/api/swagger-spec/extensions.json +++ b/api/swagger-spec/extensions.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index f9ed720cdb0..11aebb3180e 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of DaemonSet", "nickname": "deletecollectionNamespacedDaemonSet", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a DaemonSet", "nickname": "deleteNamespacedDaemonSet", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1111,7 +1111,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Deployment", "nickname": "deletecollectionNamespacedDeployment", @@ -1177,7 +1177,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1415,7 +1415,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1458,7 +1458,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Deployment", "nickname": "deleteNamespacedDeployment", @@ -1516,7 +1516,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1965,7 +1965,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2130,7 +2130,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2307,7 +2307,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of HorizontalPodAutoscaler", "nickname": "deletecollectionNamespacedHorizontalPodAutoscaler", @@ -2373,7 +2373,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2611,7 +2611,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2654,7 +2654,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a HorizontalPodAutoscaler", "nickname": "deleteNamespacedHorizontalPodAutoscaler", @@ -2712,7 +2712,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3100,7 +3100,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3277,7 +3277,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Ingress", "nickname": "deletecollectionNamespacedIngress", @@ -3343,7 +3343,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3581,7 +3581,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3624,7 +3624,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete an Ingress", "nickname": "deleteNamespacedIngress", @@ -3682,7 +3682,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4070,7 +4070,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4247,7 +4247,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Job", "nickname": "deletecollectionNamespacedJob", @@ -4313,7 +4313,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4551,7 +4551,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4594,7 +4594,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Job", "nickname": "deleteNamespacedJob", @@ -4652,7 +4652,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -5040,7 +5040,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -5217,7 +5217,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of NetworkPolicy", "nickname": "deletecollectionNamespacedNetworkPolicy", @@ -5283,7 +5283,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -5521,7 +5521,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -5564,7 +5564,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a NetworkPolicy", "nickname": "deleteNamespacedNetworkPolicy", @@ -5622,7 +5622,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6022,7 +6022,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ReplicaSet", "nickname": "deletecollectionNamespacedReplicaSet", @@ -6088,7 +6088,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6326,7 +6326,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -6369,7 +6369,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ReplicaSet", "nickname": "deleteNamespacedReplicaSet", @@ -6427,7 +6427,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6815,7 +6815,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -6980,7 +6980,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7145,7 +7145,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7306,7 +7306,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ThirdPartyResource", "nickname": "deletecollectionThirdPartyResource", @@ -7364,7 +7364,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -7578,7 +7578,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7613,7 +7613,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ThirdPartyResource", "nickname": "deleteThirdPartyResource", @@ -7663,7 +7663,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -7769,7 +7769,7 @@ "description": "API at /apis/extensions/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -7805,7 +7805,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -7817,8 +7817,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -7892,12 +7892,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -7973,7 +7971,7 @@ ], "properties": { "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -7982,8 +7980,8 @@ } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -7993,14 +7991,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -9413,8 +9411,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -9426,7 +9424,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -9442,7 +9440,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -9452,8 +9450,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -9471,7 +9469,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -9482,8 +9480,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -9515,8 +9513,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -9577,7 +9575,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -9628,7 +9626,7 @@ "description": "Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1." }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment." }, "template": { @@ -9758,12 +9756,10 @@ }, "lastUpdateTime": { "type": "string", - "format": "date-time", "description": "The last time this condition was updated." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transitioned from one status to another." }, "reason": { @@ -9881,7 +9877,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -9997,7 +9993,6 @@ }, "lastScaleTime": { "type": "string", - "format": "date-time", "description": "last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed." }, "currentReplicas": { @@ -10033,7 +10028,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -10229,7 +10224,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -10290,7 +10285,7 @@ "description": "Optional duration in seconds relative to the startTime that the job may be active before the system tries to terminate it; value must be positive integer" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "autoSelector": { @@ -10316,12 +10311,10 @@ }, "startTime": { "type": "string", - "format": "date-time", "description": "StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC." }, "completionTime": { "type": "string", - "format": "date-time", "description": "CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC." }, "active": { @@ -10359,12 +10352,10 @@ }, "lastProbeTime": { "type": "string", - "format": "date-time", "description": "Last time the condition was checked." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transit from one status to another." }, "reason": { @@ -10393,7 +10384,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -10433,7 +10424,7 @@ ], "properties": { "podSelector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace." }, "ingress": { @@ -10486,11 +10477,11 @@ "id": "v1beta1.NetworkPolicyPeer", "properties": { "podSelector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace." }, "namespaceSelector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces." } } @@ -10511,7 +10502,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -10564,7 +10555,7 @@ "description": "Minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -10632,7 +10623,6 @@ }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "The last time the condition transitioned from one status to another." }, "reason": { @@ -10661,7 +10651,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -10712,8 +10702,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -10735,14 +10725,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/policy.json b/api/swagger-spec/policy.json index 208c1079930..d3ccf618a5e 100644 --- a/api/swagger-spec/policy.json +++ b/api/swagger-spec/policy.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/policy_v1beta1.json b/api/swagger-spec/policy_v1beta1.json index b79449f2adb..7d5695ecc00 100644 --- a/api/swagger-spec/policy_v1beta1.json +++ b/api/swagger-spec/policy_v1beta1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of PodDisruptionBudget", "nickname": "deletecollectionNamespacedPodDisruptionBudget", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a PodDisruptionBudget", "nickname": "deleteNamespacedPodDisruptionBudget", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -983,7 +983,7 @@ "description": "API at /apis/policy/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -1019,7 +1019,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta" + "$ref": "v1.ListMeta" }, "items": { "type": "array", @@ -1029,8 +1029,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -1103,12 +1103,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -1185,13 +1183,13 @@ "description": "An eviction is allowed if at least \"minAvailable\" pods selected by \"selector\" will still be available after the eviction, i.e. even in the absence of the evicted pod. So for example you can prevent all voluntary evictions by specifying \"100%\"." }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Label query over pods whose evictions are managed by the disruption budget." } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -1201,14 +1199,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -1274,8 +1272,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -1287,7 +1285,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -1303,7 +1301,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -1313,8 +1311,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -1332,7 +1330,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -1343,8 +1341,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -1376,8 +1374,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -1422,8 +1420,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -1445,14 +1443,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/rbac.authorization.k8s.io.json b/api/swagger-spec/rbac.authorization.k8s.io.json index 8df6f779780..be3255dbaa7 100644 --- a/api/swagger-spec/rbac.authorization.k8s.io.json +++ b/api/swagger-spec/rbac.authorization.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json index 6380ec43d83..37f53bc409d 100644 --- a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json +++ b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json @@ -125,7 +125,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ClusterRoleBinding", "nickname": "deletecollectionClusterRoleBinding", @@ -183,7 +183,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -381,7 +381,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -416,7 +416,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ClusterRoleBinding", "nickname": "deleteClusterRoleBinding", @@ -466,7 +466,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -684,7 +684,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ClusterRole", "nickname": "deletecollectionClusterRole", @@ -742,7 +742,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -940,7 +940,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -975,7 +975,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ClusterRole", "nickname": "deleteClusterRole", @@ -1025,7 +1025,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1259,7 +1259,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of RoleBinding", "nickname": "deletecollectionNamespacedRoleBinding", @@ -1325,7 +1325,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1547,7 +1547,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1590,7 +1590,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a RoleBinding", "nickname": "deleteNamespacedRoleBinding", @@ -1648,7 +1648,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2048,7 +2048,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Role", "nickname": "deletecollectionNamespacedRole", @@ -2114,7 +2114,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2336,7 +2336,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2379,7 +2379,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Role", "nickname": "deleteNamespacedRole", @@ -2437,7 +2437,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2709,7 +2709,7 @@ "description": "API at /apis/rbac.authorization.k8s.io/v1alpha1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -2745,7 +2745,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata." }, "items": { @@ -2757,8 +2757,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -2839,12 +2839,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -2961,8 +2959,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -2974,7 +2972,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -2990,7 +2988,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -3000,8 +2998,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -3019,7 +3017,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -3030,8 +3028,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -3063,8 +3061,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -3125,7 +3123,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata." }, "items": { @@ -3229,7 +3227,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata." }, "items": { @@ -3290,7 +3288,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata." }, "items": { @@ -3330,8 +3328,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -3353,14 +3351,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/storage.k8s.io.json b/api/swagger-spec/storage.k8s.io.json index 526db1aecd3..b94c2feabf0 100644 --- a/api/swagger-spec/storage.k8s.io.json +++ b/api/swagger-spec/storage.k8s.io.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/api/swagger-spec/storage.k8s.io_v1beta1.json b/api/swagger-spec/storage.k8s.io_v1beta1.json index 35b339ebd7e..6b2befbfad2 100644 --- a/api/swagger-spec/storage.k8s.io_v1beta1.json +++ b/api/swagger-spec/storage.k8s.io_v1beta1.json @@ -125,7 +125,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of StorageClass", "nickname": "deletecollectionStorageClass", @@ -183,7 +183,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -397,7 +397,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -432,7 +432,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a StorageClass", "nickname": "deleteStorageClass", @@ -482,7 +482,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -588,7 +588,7 @@ "description": "API at /apis/storage.k8s.io/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -624,7 +624,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -636,8 +636,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -714,12 +714,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -787,8 +785,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -800,7 +798,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -816,7 +814,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -826,8 +824,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -845,7 +843,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -856,8 +854,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -889,8 +887,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -935,8 +933,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -958,14 +956,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 0328c31704d..dfd66f4aaf1 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -318,7 +318,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ConfigMap", "nickname": "deletecollectionNamespacedConfigMap", @@ -384,7 +384,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -622,7 +622,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -665,7 +665,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ConfigMap", "nickname": "deleteNamespacedConfigMap", @@ -723,7 +723,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1123,7 +1123,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Endpoints", "nickname": "deletecollectionNamespacedEndpoints", @@ -1189,7 +1189,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1427,7 +1427,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1470,7 +1470,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete Endpoints", "nickname": "deleteNamespacedEndpoints", @@ -1528,7 +1528,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1928,7 +1928,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Event", "nickname": "deletecollectionNamespacedEvent", @@ -1994,7 +1994,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2232,7 +2232,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2275,7 +2275,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete an Event", "nickname": "deleteNamespacedEvent", @@ -2333,7 +2333,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2733,7 +2733,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of LimitRange", "nickname": "deletecollectionNamespacedLimitRange", @@ -2799,7 +2799,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3037,7 +3037,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3080,7 +3080,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a LimitRange", "nickname": "deleteNamespacedLimitRange", @@ -3138,7 +3138,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3522,7 +3522,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Namespace", "nickname": "deletecollectionNamespace", @@ -3580,7 +3580,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3794,7 +3794,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3829,7 +3829,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Namespace", "nickname": "deleteNamespace", @@ -3879,7 +3879,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4138,7 +4138,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4291,7 +4291,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Node", "nickname": "deletecollectionNode", @@ -4349,7 +4349,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4563,7 +4563,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4598,7 +4598,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Node", "nickname": "deleteNode", @@ -4648,7 +4648,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -5598,7 +5598,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -5767,7 +5767,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of PersistentVolumeClaim", "nickname": "deletecollectionNamespacedPersistentVolumeClaim", @@ -5833,7 +5833,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6071,7 +6071,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -6114,7 +6114,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a PersistentVolumeClaim", "nickname": "deleteNamespacedPersistentVolumeClaim", @@ -6172,7 +6172,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6560,7 +6560,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -6721,7 +6721,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of PersistentVolume", "nickname": "deletecollectionPersistentVolume", @@ -6779,7 +6779,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -6993,7 +6993,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7028,7 +7028,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a PersistentVolume", "nickname": "deletePersistentVolume", @@ -7078,7 +7078,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -7284,7 +7284,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7453,7 +7453,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Pod", "nickname": "deletecollectionNamespacedPod", @@ -7519,7 +7519,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -7757,7 +7757,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -7800,7 +7800,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Pod", "nickname": "deleteNamespacedPod", @@ -7858,7 +7858,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -9025,14 +9025,6 @@ "required": false, "allowMultiple": false }, - { - "type": "string", - "paramType": "query", - "name": "sinceTime", - "description": "An RFC3339 timestamp from which to show logs. If this value precedes the time a pod was started, only logs since the pod start will be returned. If this value is in the future, no logs will be returned. Only one of sinceSeconds or sinceTime may be specified.", - "required": false, - "allowMultiple": false - }, { "type": "boolean", "paramType": "query", @@ -9796,7 +9788,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -9973,7 +9965,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of PodTemplate", "nickname": "deletecollectionNamespacedPodTemplate", @@ -10039,7 +10031,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -10277,7 +10269,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -10320,7 +10312,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a PodTemplate", "nickname": "deleteNamespacedPodTemplate", @@ -10378,7 +10370,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -10778,7 +10770,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ReplicationController", "nickname": "deletecollectionNamespacedReplicationController", @@ -10844,7 +10836,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -11082,7 +11074,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -11125,7 +11117,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ReplicationController", "nickname": "deleteNamespacedReplicationController", @@ -11183,7 +11175,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -11571,7 +11563,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -11736,7 +11728,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -11913,7 +11905,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ResourceQuota", "nickname": "deletecollectionNamespacedResourceQuota", @@ -11979,7 +11971,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -12217,7 +12209,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -12260,7 +12252,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ResourceQuota", "nickname": "deleteNamespacedResourceQuota", @@ -12318,7 +12310,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -12706,7 +12698,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -12883,7 +12875,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Secret", "nickname": "deletecollectionNamespacedSecret", @@ -12949,7 +12941,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -13187,7 +13179,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -13230,7 +13222,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Secret", "nickname": "deleteNamespacedSecret", @@ -13288,7 +13280,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -13688,7 +13680,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ServiceAccount", "nickname": "deletecollectionNamespacedServiceAccount", @@ -13754,7 +13746,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -13992,7 +13984,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -14035,7 +14027,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ServiceAccount", "nickname": "deleteNamespacedServiceAccount", @@ -14093,7 +14085,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -14718,7 +14710,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -14761,7 +14753,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Service", "nickname": "deleteNamespacedService", @@ -14795,7 +14787,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -16119,7 +16111,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -16168,7 +16160,7 @@ "description": "API at /api/v1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -16248,12 +16240,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -16371,7 +16361,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -16383,8 +16373,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -16464,7 +16454,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -16498,8 +16488,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -16511,7 +16501,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -16527,7 +16517,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -16537,8 +16527,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -16556,7 +16546,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -16567,8 +16557,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -16600,8 +16590,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -16662,7 +16652,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -16792,7 +16782,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -16842,12 +16832,10 @@ }, "firstTimestamp": { "type": "string", - "format": "date-time", "description": "The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)" }, "lastTimestamp": { "type": "string", - "format": "date-time", "description": "The time at which the most recent occurrence of this event was recorded." }, "count": { @@ -16891,7 +16879,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -16987,7 +16975,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -17068,7 +17056,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -17207,12 +17195,10 @@ }, "lastHeartbeatTime": { "type": "string", - "format": "date-time", "description": "Last time we got an update on a given condition." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transit from one status to another." }, "reason": { @@ -17384,7 +17370,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -17434,7 +17420,7 @@ "description": "AccessModes contains the desired access modes the volume should have. More info: http://kubernetes.io/docs/user-guide/persistent-volumes#access-modes-1" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "A label query over volumes to consider for binding." }, "resources": { @@ -17451,8 +17437,8 @@ "id": "v1.PersistentVolumeAccessMode", "properties": {} }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -17462,14 +17448,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -17544,7 +17530,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -18159,7 +18145,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19109,7 +19095,6 @@ }, "startTime": { "type": "string", - "format": "date-time", "description": "RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod." }, "containerStatuses": { @@ -19139,12 +19124,10 @@ }, "lastProbeTime": { "type": "string", - "format": "date-time", "description": "Last time we probed the condition." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transitioned from one status to another." }, "reason": { @@ -19241,7 +19224,6 @@ "properties": { "startedAt": { "type": "string", - "format": "date-time", "description": "Time at which the container was last (re-)started" } } @@ -19273,12 +19255,10 @@ }, "startedAt": { "type": "string", - "format": "date-time", "description": "Time at which previous execution of the container started" }, "finishedAt": { "type": "string", - "format": "date-time", "description": "Time at which the container last terminated" }, "containerID": { @@ -19325,7 +19305,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19389,7 +19369,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19510,7 +19490,6 @@ }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "The last time the condition transitioned from one status to another." }, "reason": { @@ -19594,7 +19573,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19683,7 +19662,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19741,7 +19720,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19801,7 +19780,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -19968,8 +19947,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -19991,14 +19970,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index 0c48a5cd2fc..3609c3abd31 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -21,8 +21,8 @@ package options import ( "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/leaderelection" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/util/config" diff --git a/cmd/kubeadm/app/apis/kubeadm/types.go b/cmd/kubeadm/app/apis/kubeadm/types.go index ec7e361cf35..eeef3a4e625 100644 --- a/cmd/kubeadm/app/apis/kubeadm/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/types.go @@ -16,7 +16,9 @@ limitations under the License. package kubeadm -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) type EnvParams struct { KubernetesDir string diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go index 0eb7c88afbf..a6f49f66551 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go index 892262137d6..08e1627f65b 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/types.go @@ -16,7 +16,9 @@ limitations under the License. package v1alpha1 -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) type MasterConfiguration struct { metav1.TypeMeta `json:",inline"` diff --git a/cmd/kubeadm/app/master/apiclient.go b/cmd/kubeadm/app/master/apiclient.go index adde4835132..f6b5fbf466e 100644 --- a/cmd/kubeadm/app/master/apiclient.go +++ b/cmd/kubeadm/app/master/apiclient.go @@ -25,9 +25,9 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/images" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go index 3167cbe9f27..71f96f4c176 100644 --- a/cmd/kubeadm/app/master/manifests.go +++ b/cmd/kubeadm/app/master/manifests.go @@ -27,8 +27,8 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/images" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go index 88ccebfde67..a282dc5704f 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -586,7 +586,7 @@ func (x *TestTypeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv48 := &x.ListMeta yym49 := z.DecBinary() @@ -667,7 +667,7 @@ func (x *TestTypeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go index 616b279d9b2..9b1fe41b7c6 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go @@ -25,8 +25,8 @@ import ( type TestType struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata,omitempty"` - Status TestTypeStatus `json:"status,omitempty"` + api.ObjectMeta `json:"metadata,omitempty"` + Status TestTypeStatus `json:"status,omitempty"` } type TestTypeList struct { diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go index 20664385c99..68772a91db4 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go index 16582411031..4a41e0ff0fc 100644 --- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go +++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -586,7 +586,7 @@ func (x *TestTypeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv48 := &x.ListMeta yym49 := z.DecBinary() @@ -667,7 +667,7 @@ func (x *TestTypeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html index 7c46f957e5d..c8a0391d89b 100755 --- a/docs/api-reference/apps/v1beta1/definitions.html +++ b/docs/api-reference/apps/v1beta1/definitions.html @@ -383,6 +383,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+

v1.PhotonPersistentDiskVolumeSource

Represents a Photon Controller persistent disk resource.

@@ -494,6 +549,89 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1.SELinuxOptions

@@ -693,6 +831,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1.PersistentVolumeClaimSpec

@@ -728,7 +907,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

selector

A label query over volumes to consider for binding.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -954,58 +1133,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1beta1.StatefulSetStatus

@@ -1190,68 +1317,6 @@ Examples:
-
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

-

v1.GitRepoVolumeSource

@@ -1362,6 +1427,68 @@ Examples:
+
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.Capabilities

@@ -1723,7 +1850,7 @@ Examples:

selector

Selector is a label query over pods that should match the replica count. If empty, defaulted to labels on the pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1839,7 +1966,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1848,7 +1975,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1958,6 +2085,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

@@ -2147,12 +2322,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.CinderVolumeSource

@@ -2431,6 +2600,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.FlockerVolumeSource

@@ -2472,47 +2682,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.PersistentVolumeClaimStatus

@@ -2623,47 +2792,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1.SecretVolumeSource

@@ -2715,6 +2843,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.EnvVar

@@ -3117,6 +3293,12 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.DeleteOptions

@@ -3570,109 +3752,6 @@ The StatefulSet guarantees that a given network identity will always map to the -
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -3714,141 +3793,10 @@ The StatefulSet guarantees that a given network identity will always map to the -
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.DownwardAPIVolumeFile

@@ -4332,7 +4280,7 @@ The StatefulSet guarantees that a given network identity will always map to the

metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -4345,6 +4293,58 @@ The StatefulSet guarantees that a given network identity will always map to the +
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1.AzureDataDiskCachingMode

@@ -4444,7 +4444,7 @@ The StatefulSet guarantees that a given network identity will always map to the
diff --git a/docs/api-reference/apps/v1beta1/operations.html b/docs/api-reference/apps/v1beta1/operations.html index c0d7c17bc68..e3baa96f2b8 100755 --- a/docs/api-reference/apps/v1beta1/operations.html +++ b/docs/api-reference/apps/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -707,7 +707,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1231,7 +1231,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1316,7 +1316,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1695,7 +1695,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2411,7 +2411,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html index 0a4d08f2a6c..b173f628379 100755 --- a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html @@ -584,7 +584,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -593,7 +593,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -641,6 +641,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.TokenReviewStatus

@@ -787,62 +842,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

- -
-
-

unversioned.APIResource

+

v1.APIResource

APIResource specifies the name of a resource and whether it is namespaced.

@@ -900,7 +900,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/docs/api-reference/authentication.k8s.io/v1beta1/operations.html b/docs/api-reference/authentication.k8s.io/v1beta1/operations.html index 8763985dbf9..9f17e6af5d2 100755 --- a/docs/api-reference/authentication.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/authentication.k8s.io/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -558,7 +558,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html index 54ed5d87986..3ee15f75d2f 100755 --- a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html @@ -535,7 +535,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -544,7 +544,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -592,6 +592,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i + +
+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.SelfSubjectAccessReview

@@ -654,6 +709,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1beta1.SubjectAccessReview

@@ -778,61 +881,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1beta1.ResourceAttributes

@@ -1053,54 +1101,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1beta1.SubjectAccessReviewStatus

@@ -1161,7 +1161,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/docs/api-reference/authorization.k8s.io/v1beta1/operations.html b/docs/api-reference/authorization.k8s.io/v1beta1/operations.html index f611104f793..94570a3f76e 100755 --- a/docs/api-reference/authorization.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/authorization.k8s.io/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -788,7 +788,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/autoscaling/v1/definitions.html b/docs/api-reference/autoscaling/v1/definitions.html index 04763fc3580..52df174dcdb 100755 --- a/docs/api-reference/autoscaling/v1/definitions.html +++ b/docs/api-reference/autoscaling/v1/definitions.html @@ -383,7 +383,62 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+
+

v1.Patch

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

@@ -491,7 +546,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -506,7 +561,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -553,7 +687,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -566,85 +700,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.Preconditions

@@ -729,9 +784,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

+

v1.Status

-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -766,17 +821,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -844,137 +927,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)
-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.HorizontalPodAutoscalerStatus

@@ -1010,7 +962,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

lastScaleTime

last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.

false

-

string (date-time)

+

string

@@ -1181,7 +1133,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1190,7 +1142,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1300,13 +1252,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1368,7 +1368,7 @@ Examples:
diff --git a/docs/api-reference/autoscaling/v1/operations.html b/docs/api-reference/autoscaling/v1/operations.html index ba756d808c7..ca0032769ae 100755 --- a/docs/api-reference/autoscaling/v1/operations.html +++ b/docs/api-reference/autoscaling/v1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -856,7 +856,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1380,7 +1380,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1465,7 +1465,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1844,7 +1844,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2411,7 +2411,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index 16562781ee2..eeb0cda9a2b 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -383,6 +383,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+

v1.PhotonPersistentDiskVolumeSource

Represents a Photon Controller persistent disk resource.

@@ -494,6 +549,89 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1.SELinuxOptions

@@ -693,6 +831,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1.CephFSVolumeSource

@@ -899,58 +1078,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1.GCEPersistentDiskVolumeSource

@@ -1094,68 +1221,6 @@ Examples:
-
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

-

v1.GitRepoVolumeSource

@@ -1266,6 +1331,68 @@ Examples:
+
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.Capabilities

@@ -1627,14 +1754,14 @@ Examples:

startTime

StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.

false

-

string (date-time)

+

string

completionTime

CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.

false

-

string (date-time)

+

string

@@ -1750,7 +1877,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1759,7 +1886,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1869,6 +1996,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

@@ -2058,12 +2233,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.CinderVolumeSource

@@ -2280,6 +2449,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.FlockerVolumeSource

@@ -2321,47 +2531,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.QuobyteVolumeSource

@@ -2486,47 +2655,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1.JobCondition

@@ -2569,14 +2697,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

lastProbeTime

Last time the condition was checked.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transit from one status to another.

false

-

string (date-time)

+

string

@@ -2638,7 +2766,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2702,6 +2830,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.EnvVar

@@ -3149,7 +3325,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -3169,6 +3345,12 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.DeleteOptions

@@ -3557,109 +3739,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -3701,141 +3780,10 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.DownwardAPIVolumeFile

@@ -4277,6 +4225,58 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1.AzureDataDiskCachingMode

@@ -4376,7 +4376,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/docs/api-reference/batch/v1/operations.html b/docs/api-reference/batch/v1/operations.html index 4196b896b1c..24ebec2558a 100755 --- a/docs/api-reference/batch/v1/operations.html +++ b/docs/api-reference/batch/v1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -856,7 +856,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1380,7 +1380,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1465,7 +1465,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1844,7 +1844,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2411,7 +2411,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html index 620dc0d7d47..ec5cff00ad9 100755 --- a/docs/api-reference/batch/v2alpha1/definitions.html +++ b/docs/api-reference/batch/v2alpha1/definitions.html @@ -374,7 +374,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.APIResourceList

+

v1.APIResourceList

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

@@ -421,7 +421,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

resources

resources contains the name of the resources and if they are namespaced.

true

-

unversioned.APIResource array

+

v1.APIResource array

@@ -429,7 +429,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResource

+

v1.APIResource

APIResource specifies the name of a resource and whether it is namespaced.

@@ -487,7 +487,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/batch/v2alpha1/operations.html b/docs/api-reference/batch/v2alpha1/operations.html index fb67623ee69..7e4b877bc15 100755 --- a/docs/api-reference/batch/v2alpha1/operations.html +++ b/docs/api-reference/batch/v2alpha1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -447,7 +447,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html b/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html index c1b772a68b2..972bc2c5751 100755 --- a/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/certificates.k8s.io/v1alpha1/definitions.html @@ -383,10 +383,59 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1alpha1.CertificateSigningRequestList

@@ -426,7 +475,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -439,6 +488,12 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.DeleteOptions

@@ -558,7 +613,124 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1alpha1.CertificateSigningRequestStatus

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

conditions

Conditions applied to the request, such as approval or denial.

false

v1alpha1.CertificateSigningRequestCondition array

certificate

If request was approved, the controller will place the issued certificate here.

false

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -605,7 +777,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -618,123 +790,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

- -
-
-

v1alpha1.CertificateSigningRequestStatus

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

conditions

Conditions applied to the request, such as approval or denial.

false

v1alpha1.CertificateSigningRequestCondition array

certificate

If request was approved, the controller will place the issued certificate here.

false

string

-

v1alpha1.CertificateSigningRequestCondition

@@ -781,7 +836,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

lastUpdateTime

timestamp for the last update to this condition

false

-

string (date-time)

+

string

@@ -885,62 +940,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

- -
-
-

unversioned.Status

+

v1.Status

Status is a return value for calls that don’t return other objects.

@@ -980,7 +980,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1008,7 +1008,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

-

unversioned.StatusDetails

+

v1.StatusDetails

@@ -1021,54 +1021,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.ObjectMeta

@@ -1158,7 +1110,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1167,7 +1119,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1277,13 +1229,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1345,7 +1345,7 @@ Examples:
diff --git a/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html b/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html index 5fa4cad5355..3d5744e83e3 100755 --- a/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html +++ b/docs/api-reference/certificates.k8s.io/v1alpha1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -691,7 +691,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1183,7 +1183,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1268,7 +1268,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1900,7 +1900,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index ab8301f79a4..16eac5aaa5f 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -498,6 +498,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.DaemonSetStatus

@@ -848,6 +903,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1beta1.IngressBackend

@@ -931,7 +1027,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1088,58 +1184,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1beta1.ReplicaSetCondition

@@ -1182,7 +1226,7 @@ Examples:

lastTransitionTime

The last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -1244,7 +1288,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1524,14 +1568,14 @@ Examples:

startTime

StartTime represents time when the job was acknowledged by the Job Manager. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.

false

-

string (date-time)

+

string

completionTime

CompletionTime represents time when the job was completed. It is not guaranteed to be set in happens-before order across separate operations. It is represented in RFC3339 form and is in UTC.

false

-

string (date-time)

+

string

@@ -1756,7 +1800,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1765,7 +1809,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1855,7 +1899,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1896,7 +1940,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -2168,7 +2212,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard object’s metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2215,12 +2259,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.FlockerVolumeSource

@@ -2262,6 +2300,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.PersistentVolumeClaimVolumeSource

@@ -2303,47 +2382,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1beta1.HorizontalPodAutoscaler

@@ -2406,47 +2444,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1beta1.RollbackConfig

@@ -2688,14 +2685,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

lastProbeTime

Last time the condition was checked.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transit from one status to another.

false

-

string (date-time)

+

string

@@ -3240,7 +3237,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -3419,7 +3416,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -3474,61 +3471,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -3574,54 +3516,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.DownwardAPIVolumeFile

@@ -4118,6 +4012,58 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1beta1.Scale

@@ -4394,6 +4340,89 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1beta1.ScaleStatus

@@ -4467,7 +4496,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

podSelector

Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace.

true

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -4570,7 +4599,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -4721,7 +4750,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

lastScaleTime

last time the HorizontalPodAutoscaler scaled the number of pods; used by the autoscaler to control how often the number of pods is changed.

false

-

string (date-time)

+

string

@@ -5028,7 +5057,7 @@ Both these may change in the future. Incoming requests are matched against the h

metadata

Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -5066,76 +5095,14 @@ Both these may change in the future. Incoming requests are matched against the h

podSelector

This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

namespaceSelector

Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces.

false

-

unversioned.LabelSelector

- - - - - -
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -5203,6 +5170,68 @@ Both these may change in the future. Incoming requests are matched against the h
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

v1.LabelSelector
+
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.LoadBalancerStatus

@@ -5657,6 +5686,54 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1beta1.ReplicaSet

@@ -6159,6 +6236,54 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.ResourceRequirements

@@ -6279,6 +6404,12 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1beta1.DeploymentCondition

@@ -6321,14 +6452,14 @@ Both these may change in the future. Incoming requests are matched against the h

lastUpdateTime

The last time this condition was updated.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -6397,7 +6528,7 @@ Both these may change in the future. Incoming requests are matched against the h

selector

Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -6417,137 +6548,6 @@ Both these may change in the future. Incoming requests are matched against the h -
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1beta1.HorizontalPodAutoscalerList

@@ -6590,7 +6590,7 @@ Both these may change in the future. Incoming requests are matched against the h

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -6789,7 +6789,7 @@ Both these may change in the future. Incoming requests are matched against the h

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -6818,7 +6818,7 @@ Both these may change in the future. Incoming requests are matched against the h
diff --git a/docs/api-reference/extensions/v1beta1/operations.html b/docs/api-reference/extensions/v1beta1/operations.html index 6e2c8b52d3d..7475b124921 100755 --- a/docs/api-reference/extensions/v1beta1/operations.html +++ b/docs/api-reference/extensions/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -1452,7 +1452,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1976,7 +1976,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2061,7 +2061,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2440,7 +2440,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2796,7 +2796,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3320,7 +3320,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3405,7 +3405,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3911,7 +3911,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4290,7 +4290,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4646,7 +4646,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5170,7 +5170,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5255,7 +5255,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5634,7 +5634,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5990,7 +5990,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6514,7 +6514,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6599,7 +6599,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -6978,7 +6978,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -7334,7 +7334,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -7858,7 +7858,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -7943,7 +7943,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -8322,7 +8322,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -8678,7 +8678,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -9202,7 +9202,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -9287,7 +9287,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -9643,7 +9643,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -10167,7 +10167,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -10252,7 +10252,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -10631,7 +10631,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -11010,7 +11010,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -11389,7 +11389,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -12027,7 +12027,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -12519,7 +12519,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -12604,7 +12604,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -16295,7 +16295,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/policy/v1beta1/definitions.html b/docs/api-reference/policy/v1beta1/definitions.html index 8aeceddcef4..20843d9ea97 100755 --- a/docs/api-reference/policy/v1beta1/definitions.html +++ b/docs/api-reference/policy/v1beta1/definitions.html @@ -445,7 +445,62 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.Patch

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+
+

v1.Patch

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

@@ -513,7 +568,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -560,7 +694,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -573,85 +707,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.Preconditions

@@ -688,57 +743,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.LabelSelectorRequirement

+

v1.Status

-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -773,17 +780,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -858,47 +893,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)
-
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1beta1.PodDisruptionBudgetList

@@ -941,7 +935,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -956,9 +950,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.Status

+

v1.LabelSelector

-

Status is a return value for calls that don’t return other objects.

+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

@@ -979,107 +973,17 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

string

object

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1174,7 +1078,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

- + @@ -1183,7 +1087,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

- + @@ -1293,13 +1197,109 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

v1.LabelSelectorRequirement array

false

string (date-time)

string

false

string (date-time)

string
+
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+ +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1384,7 +1384,7 @@ Examples:

selector

Label query over pods whose evictions are managed by the disruption budget.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1402,7 +1402,7 @@ Examples:
diff --git a/docs/api-reference/policy/v1beta1/operations.html b/docs/api-reference/policy/v1beta1/operations.html index 3594854d2cb..df1d5936acd 100755 --- a/docs/api-reference/policy/v1beta1/operations.html +++ b/docs/api-reference/policy/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -707,7 +707,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1231,7 +1231,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1316,7 +1316,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1695,7 +1695,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2411,7 +2411,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html index ebe4deee586..fea6fb209c5 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html @@ -401,7 +401,62 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+
+

v1.Patch

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

@@ -469,7 +524,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -516,7 +650,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -529,85 +663,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1alpha1.RoleBindingList

@@ -650,7 +705,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard object’s metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -739,7 +794,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard object’s metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -809,9 +864,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

+

v1.Status

-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -846,17 +901,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -904,7 +987,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - + @@ -972,137 +1055,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

metadata

Standard object’s metadata.

false

unversioned.ListMeta

v1.ListMeta
-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1alpha1.ClusterRoleList

@@ -1145,7 +1097,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard object’s metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1247,7 +1199,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1256,7 +1208,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1490,6 +1442,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1alpha1.PolicyRule

@@ -1611,58 +1611,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

types.UID

-
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1alpha1.Role

@@ -1718,6 +1666,58 @@ Examples:
+
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

any

@@ -1730,7 +1730,7 @@ Examples:
diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html index a95a294a5f0..15c12065186 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -691,7 +691,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1167,7 +1167,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1252,7 +1252,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1584,7 +1584,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2060,7 +2060,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2145,7 +2145,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2493,7 +2493,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3001,7 +3001,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3086,7 +3086,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3442,7 +3442,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3950,7 +3950,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4035,7 +4035,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5983,7 +5983,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html index 63897ff75b1..c7b48f5b1cd 100755 --- a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html @@ -383,10 +383,59 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.StorageClassList

@@ -429,7 +478,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -442,6 +491,12 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.DeleteOptions

@@ -506,7 +561,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -553,7 +687,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -566,85 +700,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.Preconditions

@@ -681,9 +736,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

+

v1.Status

-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -718,17 +773,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -799,137 +882,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)
-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.ObjectMeta

@@ -1019,7 +971,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1028,7 +980,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1138,13 +1090,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1206,7 +1206,7 @@ Examples:
diff --git a/docs/api-reference/storage.k8s.io/v1beta1/operations.html b/docs/api-reference/storage.k8s.io/v1beta1/operations.html index edbe25f7c8d..d40510eae69 100755 --- a/docs/api-reference/storage.k8s.io/v1beta1/operations.html +++ b/docs/api-reference/storage.k8s.io/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -691,7 +691,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1183,7 +1183,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1268,7 +1268,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1662,7 +1662,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index baaf0b064b4..01b06e39d41 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -479,6 +479,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+

v1.Node

Node is a worker node in Kubernetes. Each node will have a unique identifier in the cache (i.e. in etcd).

@@ -581,7 +636,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -752,7 +807,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

startedAt

Time at which the container was last (re-)started

false

-

string (date-time)

+

string

@@ -813,6 +868,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1.PersistentVolumeClaimSpec

@@ -848,7 +944,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

selector

A label query over volumes to consider for binding.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -978,58 +1074,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1.GCEPersistentDiskVolumeSource

@@ -1301,7 +1345,7 @@ Examples:

metadata

More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1455,7 +1499,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1558,7 +1602,7 @@ Examples:

lastTransitionTime

The last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -1757,7 +1801,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1812,14 +1856,14 @@ Examples:

lastHeartbeatTime

Last time we got an update on a given condition.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transit from one status to another.

false

-

string (date-time)

+

string

@@ -2037,7 +2081,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -2046,7 +2090,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -2325,7 +2369,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2338,12 +2382,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.NamespaceList

@@ -2386,7 +2424,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2681,6 +2719,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.FlockerVolumeSource

@@ -2763,47 +2842,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.ResourceQuotaList

@@ -2846,7 +2884,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2911,47 +2949,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

v1.UniqueVolumeName

-
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1.EndpointSubset

@@ -3533,7 +3530,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -3588,7 +3585,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -4055,61 +4052,6 @@ The resulting set of endpoints can be viewed as:
-
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -4217,54 +4159,6 @@ The resulting set of endpoints can be viewed as:

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.PodStatus

@@ -4335,7 +4229,7 @@ The resulting set of endpoints can be viewed as:

startTime

RFC 3339 date and time at which the object was acknowledged by the Kubelet. This is before the Kubelet pulled the container image(s) for the pod.

false

-

string (date-time)

+

string

@@ -4770,7 +4664,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -5154,6 +5048,58 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1.PodCondition

@@ -5196,14 +5142,14 @@ The resulting set of endpoints can be viewed as:

lastProbeTime

Last time we probed the condition.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -5385,6 +5331,89 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1.PodTemplate

@@ -5700,68 +5729,6 @@ The resulting set of endpoints can be viewed as:
-
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

-

v1.HTTPGetAction

@@ -5824,6 +5791,68 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.LoadBalancerStatus

@@ -5900,7 +5929,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -6632,7 +6661,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -6645,6 +6674,54 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1.HostPathVolumeSource

@@ -6735,14 +6812,14 @@ The resulting set of endpoints can be viewed as:

startedAt

Time at which previous execution of the container started

false

-

string (date-time)

+

string

finishedAt

Time at which the container last terminated

false

-

string (date-time)

+

string

@@ -7265,7 +7342,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -7458,14 +7535,14 @@ The resulting set of endpoints can be viewed as:

firstTimestamp

The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)

false

-

string (date-time)

+

string

lastTimestamp

The time at which the most recent occurrence of this event was recorded.

false

-

string (date-time)

+

string

@@ -7485,6 +7562,54 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.EnvVar

@@ -7785,7 +7910,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -7840,7 +7965,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -7895,7 +8020,7 @@ The resulting set of endpoints can be viewed as:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -7908,6 +8033,12 @@ The resulting set of endpoints can be viewed as:
+
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.ObjectReference

@@ -7984,54 +8115,6 @@ The resulting set of endpoints can be viewed as:
-
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

-

v1.ContainerStateWaiting

@@ -8073,89 +8156,6 @@ The resulting set of endpoints can be viewed as:
-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1.ConfigMapKeySelector

@@ -8613,7 +8613,7 @@ The resulting set of endpoints can be viewed as:
diff --git a/docs/api-reference/v1/operations.html b/docs/api-reference/v1/operations.html index bc611b1fa50..ff900ba180c 100755 --- a/docs/api-reference/v1/operations.html +++ b/docs/api-reference/v1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -1547,7 +1547,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2085,7 +2085,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2609,7 +2609,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2694,7 +2694,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3050,7 +3050,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3574,7 +3574,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3659,7 +3659,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4015,7 +4015,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4539,7 +4539,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4624,7 +4624,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4980,7 +4980,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5504,7 +5504,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5589,7 +5589,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5945,7 +5945,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6469,7 +6469,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6554,7 +6554,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -6933,7 +6933,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -7289,7 +7289,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -7813,7 +7813,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -7898,7 +7898,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -8910,14 +8910,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

-

sinceTime

-

An RFC3339 timestamp from which to show logs. If this value precedes the time a pod was started, only logs since the pod start will be returned. If this value is in the future, no logs will be returned. Only one of sinceSeconds or sinceTime may be specified.

-

false

-

string

- - - -

QueryParameter

timestamps

If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line of log output. Defaults to false.

false

@@ -10459,7 +10451,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -10815,7 +10807,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -11339,7 +11331,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -11424,7 +11416,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -11780,7 +11772,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -12304,7 +12296,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -12389,7 +12381,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -12768,7 +12760,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -13147,7 +13139,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -13503,7 +13495,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -14027,7 +14019,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -14112,7 +14104,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -14491,7 +14483,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -14847,7 +14839,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -15371,7 +15363,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -15456,7 +15448,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -15812,7 +15804,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -16336,7 +16328,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -16421,7 +16413,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -17126,7 +17118,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -17211,7 +17203,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -18526,7 +18518,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -18955,7 +18947,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -19040,7 +19032,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -19514,7 +19506,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -19846,7 +19838,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -20338,7 +20330,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -20423,7 +20415,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -21650,7 +21642,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -22131,7 +22123,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -22623,7 +22615,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -22708,7 +22700,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -23063,7 +23055,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -33316,7 +33308,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/federation/apis/core/v1/register.go b/federation/apis/core/v1/register.go index bdeec38a704..2d416ae013b 100644 --- a/federation/apis/core/v1/register.go +++ b/federation/apis/core/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/federation/apis/federation/install/install_test.go b/federation/apis/federation/install/install_test.go index a6d01065118..f9121406e50 100644 --- a/federation/apis/federation/install/install_test.go +++ b/federation/apis/federation/install/install_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/federation/apis/federation/types.generated.go b/federation/apis/federation/types.generated.go index 16f29d623a4..3006f2195f1 100644 --- a/federation/apis/federation/types.generated.go +++ b/federation/apis/federation/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg1_api "k8s.io/kubernetes/pkg/api" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg1_api.LocalObjectReference - var v1 pkg2_unversioned.Time + var v1 pkg2_v1.Time var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -801,7 +801,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv62 := &x.LastProbeTime yym63 := z.DecBinary() @@ -818,7 +818,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv64 := &x.LastTransitionTime yym65 := z.DecBinary() @@ -903,7 +903,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv71 := &x.LastProbeTime yym72 := z.DecBinary() @@ -930,7 +930,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv73 := &x.LastTransitionTime yym74 := z.DecBinary() @@ -1855,7 +1855,7 @@ func (x *ClusterList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv154 := &x.ListMeta yym155 := z.DecBinary() @@ -1936,7 +1936,7 @@ func (x *ClusterList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv161 := &x.ListMeta yym162 := z.DecBinary() diff --git a/federation/apis/federation/v1beta1/generated.pb.go b/federation/apis/federation/v1beta1/generated.pb.go index d4039fff179..b1ea26f4a5f 100644 --- a/federation/apis/federation/v1beta1/generated.pb.go +++ b/federation/apis/federation/v1beta1/generated.pb.go @@ -482,8 +482,8 @@ func (this *ClusterCondition) String() string { s := strings.Join([]string{`&ClusterCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -495,7 +495,7 @@ func (this *ClusterList) String() string { return "nil" } s := strings.Join([]string{`&ClusterList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Cluster", "Cluster", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1487,55 +1487,55 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 793 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xdd, 0x6a, 0x03, 0x45, - 0x14, 0xce, 0xe6, 0xb7, 0x99, 0x1a, 0x2d, 0x83, 0x42, 0xcc, 0xc5, 0xa6, 0x04, 0x91, 0x14, 0xed, - 0x2e, 0x09, 0x15, 0x0a, 0xa2, 0xd0, 0x4d, 0x11, 0x0a, 0x29, 0x95, 0x69, 0x11, 0x29, 0x88, 0x6c, - 0x36, 0x27, 0xdb, 0x35, 0xc9, 0xee, 0x32, 0x33, 0x1b, 0x69, 0xaf, 0x7c, 0x00, 0x2f, 0x7c, 0x08, - 0xdf, 0x40, 0x7c, 0x87, 0x5e, 0xf6, 0xc2, 0x0b, 0xf1, 0x22, 0xd8, 0xf8, 0x16, 0xbd, 0x92, 0x99, - 0x9d, 0x6c, 0xb2, 0xdd, 0x26, 0x68, 0x7b, 0xb7, 0xe7, 0xec, 0x39, 0xdf, 0xf7, 0xcd, 0xf9, 0x43, - 0xa7, 0xe3, 0x63, 0x66, 0x78, 0x81, 0x39, 0x8e, 0x06, 0x40, 0x7d, 0xe0, 0xc0, 0xcc, 0x11, 0x0c, - 0x81, 0xda, 0xdc, 0x0b, 0x7c, 0xd3, 0x0e, 0xbd, 0x94, 0x3d, 0xeb, 0x0c, 0x80, 0xdb, 0x1d, 0xd3, - 0x05, 0x5f, 0xb8, 0x60, 0x68, 0x84, 0x34, 0xe0, 0x01, 0x3e, 0x8a, 0x51, 0x8c, 0x15, 0x8a, 0xb1, - 0xca, 0x32, 0x04, 0xca, 0xba, 0xad, 0x50, 0x1a, 0x87, 0xae, 0xc7, 0x6f, 0xa2, 0x81, 0xe1, 0x04, - 0x53, 0xd3, 0x0d, 0xdc, 0xc0, 0x94, 0x60, 0x83, 0x68, 0x24, 0x2d, 0x69, 0xc8, 0xaf, 0x98, 0xa4, - 0xd1, 0xcd, 0x4a, 0x0d, 0xc7, 0xae, 0xd0, 0x68, 0x52, 0x60, 0x41, 0x44, 0x1d, 0x78, 0x2e, 0xac, - 0xf1, 0xd9, 0xe6, 0x9c, 0xc8, 0x9f, 0x01, 0x65, 0x5e, 0xe0, 0xc3, 0x30, 0x93, 0xf6, 0xe9, 0xe6, - 0xb4, 0x59, 0xe6, 0xf5, 0x8d, 0xc3, 0x97, 0xa3, 0x69, 0xe4, 0x73, 0x6f, 0x9a, 0xd5, 0x74, 0xb4, - 0x3d, 0x9c, 0x39, 0x37, 0x30, 0xb5, 0x33, 0x59, 0x9d, 0x97, 0xb3, 0x22, 0xee, 0x4d, 0x4c, 0xcf, - 0xe7, 0x8c, 0xd3, 0xe7, 0x29, 0xad, 0xdf, 0xf3, 0xa8, 0xd2, 0x9b, 0x44, 0x8c, 0x03, 0xc5, 0xdf, - 0xa2, 0x9d, 0x29, 0x70, 0x7b, 0x68, 0x73, 0xbb, 0xae, 0xed, 0x6b, 0xed, 0xdd, 0x6e, 0xdb, 0xc8, - 0x36, 0x2d, 0x1c, 0xbb, 0xa2, 0x5b, 0xc6, 0xac, 0x63, 0x5c, 0x0c, 0x7e, 0x00, 0x87, 0x9f, 0x03, - 0xb7, 0x2d, 0x7c, 0x3f, 0x6f, 0xe6, 0x16, 0xf3, 0x26, 0x5a, 0xf9, 0x48, 0x82, 0x86, 0x1d, 0x54, - 0x64, 0x21, 0x38, 0xf5, 0xbc, 0x44, 0x3d, 0x31, 0x5e, 0x33, 0x0a, 0x86, 0x92, 0x79, 0x19, 0x82, - 0x63, 0xbd, 0xa3, 0xe8, 0x8a, 0xc2, 0x22, 0x12, 0x1c, 0x8f, 0x51, 0x99, 0x71, 0x9b, 0x47, 0xac, - 0x5e, 0x90, 0x34, 0xbd, 0xb7, 0xd1, 0x48, 0x28, 0xeb, 0x5d, 0x45, 0x54, 0x8e, 0x6d, 0xa2, 0x28, - 0x5a, 0x7f, 0x15, 0xd0, 0x9e, 0x8a, 0xec, 0x05, 0xfe, 0xd0, 0x13, 0x10, 0xf8, 0x18, 0x15, 0xf9, - 0x6d, 0x08, 0xb2, 0x78, 0x55, 0xeb, 0xa3, 0xa5, 0xc6, 0xab, 0xdb, 0x10, 0x9e, 0xe6, 0xcd, 0xf7, - 0x9f, 0xc7, 0x0b, 0x3f, 0x91, 0x19, 0xf8, 0x9b, 0x44, 0x7b, 0x5e, 0xe6, 0x7e, 0x99, 0xa6, 0x7d, - 0x9a, 0x37, 0xb7, 0x8e, 0x9b, 0x91, 0x60, 0xa6, 0x65, 0xe2, 0x1b, 0x54, 0x9b, 0xd8, 0x8c, 0x7f, - 0x4d, 0x83, 0x01, 0x5c, 0x79, 0x53, 0x50, 0xa5, 0xf9, 0x64, 0x4b, 0x5f, 0xd7, 0x66, 0xde, 0x10, - 0x29, 0xd6, 0x07, 0x4a, 0x4b, 0xad, 0xbf, 0x8e, 0x44, 0xd2, 0xc0, 0xf8, 0x47, 0x84, 0x85, 0xe3, - 0x8a, 0xda, 0x3e, 0x8b, 0x5f, 0x27, 0xe8, 0x8a, 0xff, 0x9f, 0xae, 0xa1, 0xe8, 0x70, 0x3f, 0x03, - 0x47, 0x5e, 0xa0, 0xc0, 0x1f, 0xa3, 0x32, 0x05, 0x9b, 0x05, 0x7e, 0xbd, 0x24, 0x4b, 0x97, 0x74, - 0x8c, 0x48, 0x2f, 0x51, 0x7f, 0xf1, 0x01, 0xaa, 0x4c, 0x81, 0x31, 0xdb, 0x85, 0x7a, 0x59, 0x06, - 0xbe, 0xa7, 0x02, 0x2b, 0xe7, 0xb1, 0x9b, 0x2c, 0xff, 0xb7, 0x1e, 0x34, 0xb4, 0xab, 0x9a, 0xd5, - 0xf7, 0x18, 0xc7, 0xdf, 0x65, 0x16, 0xc3, 0xfc, 0x8f, 0x2f, 0x12, 0xe9, 0x72, 0x3f, 0xf6, 0x14, - 0xd9, 0xce, 0xd2, 0xb3, 0xb6, 0x1d, 0x03, 0x54, 0xf2, 0x38, 0x4c, 0x45, 0xef, 0x0b, 0xed, 0xdd, - 0xee, 0x17, 0x6f, 0x9a, 0x5b, 0xab, 0xa6, 0x98, 0x4a, 0x67, 0x02, 0x93, 0xc4, 0xd0, 0xad, 0x5f, - 0xf3, 0xc9, 0x93, 0xc4, 0xca, 0xe0, 0xdf, 0x34, 0xd4, 0x60, 0x40, 0x67, 0x40, 0x4f, 0x86, 0x43, - 0x0a, 0x8c, 0x59, 0xb7, 0xbd, 0x89, 0x07, 0x3e, 0xef, 0x9d, 0x9d, 0x12, 0x56, 0xd7, 0xa4, 0x92, - 0x8b, 0xd7, 0x29, 0xb9, 0xdc, 0x84, 0x6b, 0xb5, 0x94, 0xb6, 0xc6, 0xc6, 0x10, 0x46, 0xb6, 0xc8, - 0xc2, 0xdf, 0xa3, 0x2a, 0x03, 0x87, 0x02, 0x27, 0x30, 0x52, 0xc7, 0xa4, 0xbb, 0xfd, 0x44, 0xf5, - 0x03, 0xc7, 0x9e, 0xc4, 0x37, 0x89, 0xc0, 0x08, 0x28, 0xf8, 0x0e, 0x58, 0xb5, 0xc5, 0xbc, 0x59, - 0xbd, 0x5c, 0x02, 0x91, 0x15, 0x66, 0xeb, 0x0f, 0x0d, 0xd5, 0x52, 0x07, 0x00, 0xdf, 0x21, 0xe4, - 0x2c, 0x97, 0x6b, 0x59, 0x97, 0xaf, 0xde, 0xd4, 0xa1, 0x64, 0x57, 0x57, 0x47, 0x33, 0x71, 0x31, - 0xb2, 0xc6, 0x86, 0x9b, 0xa8, 0x74, 0x17, 0xf8, 0xc0, 0xea, 0xa5, 0xfd, 0x42, 0xbb, 0x6a, 0x55, - 0x45, 0x57, 0xaf, 0x85, 0x83, 0xc4, 0xfe, 0x78, 0xf6, 0x5d, 0x2f, 0xf0, 0xd5, 0x48, 0xaf, 0xcd, - 0xbe, 0xf0, 0x12, 0xf5, 0xb7, 0xf5, 0xb3, 0x86, 0x3e, 0xdc, 0x58, 0x72, 0xdc, 0x45, 0xc8, 0x49, - 0x2c, 0x75, 0xbc, 0x56, 0xd2, 0x92, 0x3f, 0x64, 0x2d, 0x0a, 0x7f, 0x8e, 0x6a, 0xa9, 0x3e, 0xa9, - 0xbb, 0x95, 0xdc, 0x8a, 0x14, 0x1b, 0x49, 0xc7, 0x5a, 0x07, 0xf7, 0x8f, 0x7a, 0xee, 0xe1, 0x51, - 0xcf, 0xfd, 0xf9, 0xa8, 0xe7, 0x7e, 0x5a, 0xe8, 0xda, 0xfd, 0x42, 0xd7, 0x1e, 0x16, 0xba, 0xf6, - 0xf7, 0x42, 0xd7, 0x7e, 0xf9, 0x47, 0xcf, 0x5d, 0x57, 0x54, 0xcd, 0xfe, 0x0d, 0x00, 0x00, 0xff, - 0xff, 0x4b, 0x32, 0xe4, 0xec, 0x7c, 0x08, 0x00, 0x00, + // 787 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcb, 0x6a, 0xf3, 0x46, + 0x14, 0xb6, 0x7c, 0x8d, 0x27, 0x75, 0x1b, 0x86, 0x16, 0x5c, 0x2f, 0xe4, 0x60, 0x4a, 0x71, 0x20, + 0x91, 0xb0, 0xc9, 0x22, 0x50, 0x5a, 0x88, 0x1c, 0x0a, 0x01, 0x87, 0x94, 0x49, 0x28, 0x25, 0x9b, + 0x22, 0xcb, 0xc7, 0x8a, 0x6a, 0x5b, 0x12, 0x33, 0x23, 0x43, 0xb2, 0xea, 0x03, 0x74, 0xd1, 0x87, + 0xe8, 0x1b, 0x94, 0xbe, 0x43, 0x36, 0x85, 0x2c, 0xb2, 0xe8, 0xca, 0x34, 0xee, 0x5b, 0x64, 0x55, + 0x66, 0x34, 0x96, 0xad, 0xf8, 0xc2, 0xff, 0x27, 0x3b, 0x9d, 0xa3, 0x73, 0xbe, 0xef, 0x9b, 0x73, + 0x43, 0x67, 0xc3, 0x13, 0x66, 0x78, 0x81, 0x39, 0x8c, 0x7a, 0x40, 0x7d, 0xe0, 0xc0, 0xcc, 0x01, + 0xf4, 0x81, 0xda, 0xdc, 0x0b, 0x7c, 0xd3, 0x0e, 0xbd, 0x94, 0x3d, 0x69, 0xf5, 0x80, 0xdb, 0x2d, + 0xd3, 0x05, 0x5f, 0xb8, 0xa0, 0x6f, 0x84, 0x34, 0xe0, 0x01, 0x3e, 0x8e, 0x51, 0x8c, 0x05, 0x8a, + 0xb1, 0xc8, 0x32, 0x04, 0xca, 0xb2, 0xad, 0x50, 0x6a, 0x47, 0xae, 0xc7, 0x6f, 0xa3, 0x9e, 0xe1, + 0x04, 0x63, 0xd3, 0x0d, 0xdc, 0xc0, 0x94, 0x60, 0xbd, 0x68, 0x20, 0x2d, 0x69, 0xc8, 0xaf, 0x98, + 0xa4, 0xd6, 0x5e, 0x95, 0x1a, 0x0e, 0x5d, 0xa1, 0xd1, 0xa4, 0xc0, 0x82, 0x88, 0x3a, 0xf0, 0x5a, + 0x58, 0xed, 0x70, 0x73, 0xce, 0x64, 0xe5, 0x19, 0x5b, 0x18, 0x98, 0x39, 0x06, 0x6e, 0xaf, 0xcb, + 0x39, 0x5a, 0x9f, 0x43, 0x23, 0x9f, 0x7b, 0xe3, 0x55, 0x41, 0xc7, 0xdb, 0xc3, 0x99, 0x73, 0x0b, + 0x63, 0x7b, 0x25, 0xab, 0xb5, 0x3e, 0x2b, 0xe2, 0xde, 0xc8, 0xf4, 0x7c, 0xce, 0x38, 0x7d, 0x9d, + 0xd2, 0xf8, 0x2b, 0x8b, 0x4a, 0x9d, 0x51, 0xc4, 0x38, 0x50, 0xfc, 0x13, 0xda, 0x11, 0xf2, 0xfb, + 0x36, 0xb7, 0xab, 0xda, 0xbe, 0xd6, 0xdc, 0x6d, 0x37, 0x8d, 0xd5, 0x8e, 0x85, 0x43, 0x57, 0xb4, + 0xca, 0x98, 0xb4, 0x8c, 0xcb, 0xde, 0x2f, 0xe0, 0xf0, 0x0b, 0xe0, 0xb6, 0x85, 0x1f, 0xa6, 0xf5, + 0xcc, 0x6c, 0x5a, 0x47, 0x0b, 0x1f, 0x49, 0xd0, 0xb0, 0x83, 0xf2, 0x2c, 0x04, 0xa7, 0x9a, 0x95, + 0xa8, 0xa7, 0xc6, 0x5b, 0xe6, 0xc0, 0x50, 0x32, 0xaf, 0x42, 0x70, 0xac, 0x4f, 0x14, 0x5d, 0x5e, + 0x58, 0x44, 0x82, 0xe3, 0x21, 0x2a, 0x32, 0x6e, 0xf3, 0x88, 0x55, 0x73, 0x92, 0xa6, 0xf3, 0x3e, + 0x1a, 0x09, 0x65, 0x7d, 0xaa, 0x88, 0x8a, 0xb1, 0x4d, 0x14, 0x45, 0xe3, 0x29, 0x87, 0xf6, 0x54, + 0x64, 0x27, 0xf0, 0xfb, 0x9e, 0x80, 0xc0, 0x27, 0x28, 0xcf, 0xef, 0x42, 0x90, 0xc5, 0x2b, 0x5b, + 0x5f, 0xcd, 0x35, 0x5e, 0xdf, 0x85, 0xf0, 0x32, 0xad, 0x7f, 0xfe, 0x3a, 0x5e, 0xf8, 0x89, 0xcc, + 0xc0, 0x3f, 0x26, 0xda, 0xb3, 0x32, 0xf7, 0xbb, 0x34, 0xed, 0xcb, 0xb4, 0xbe, 0x75, 0x44, 0x8d, + 0x04, 0x33, 0x2d, 0x13, 0x03, 0xaa, 0x8c, 0x6c, 0xc6, 0x7f, 0xa0, 0x41, 0x0f, 0xae, 0xbd, 0x31, + 0xa8, 0xd2, 0x6c, 0xe9, 0x2b, 0x33, 0x44, 0xd7, 0x44, 0x77, 0x45, 0xbc, 0xf5, 0x85, 0x12, 0x52, + 0xe9, 0x2e, 0xc3, 0x90, 0x34, 0x2a, 0xe6, 0x08, 0x0b, 0xc7, 0x35, 0xb5, 0x7d, 0x16, 0x3f, 0x4d, + 0x70, 0xe5, 0x3f, 0x92, 0xab, 0xa6, 0xb8, 0x70, 0x77, 0x05, 0x8b, 0xac, 0xc1, 0xc7, 0x5f, 0xa3, + 0x22, 0x05, 0x9b, 0x05, 0x7e, 0xb5, 0x20, 0x8b, 0x96, 0xf4, 0x8a, 0x48, 0x2f, 0x51, 0x7f, 0xf1, + 0x01, 0x2a, 0x8d, 0x81, 0x31, 0xdb, 0x85, 0x6a, 0x51, 0x06, 0x7e, 0xa6, 0x02, 0x4b, 0x17, 0xb1, + 0x9b, 0xcc, 0xff, 0x37, 0xfe, 0xd6, 0xd0, 0xae, 0x6a, 0x53, 0xd7, 0x63, 0x1c, 0xdf, 0xac, 0xac, + 0xc4, 0xe1, 0x87, 0x3c, 0x47, 0xe4, 0xca, 0xb5, 0xd8, 0x53, 0x4c, 0x3b, 0x73, 0xcf, 0xd2, 0x52, + 0xf4, 0x50, 0xc1, 0xe3, 0x30, 0x16, 0x2d, 0xcf, 0x35, 0x77, 0xdb, 0xdf, 0xbe, 0x6b, 0x5c, 0xad, + 0x8a, 0x62, 0x2a, 0x9c, 0x0b, 0x4c, 0x12, 0x43, 0x37, 0xfe, 0xc8, 0x26, 0xef, 0x11, 0x9b, 0x82, + 0xff, 0xd4, 0x50, 0x8d, 0x01, 0x9d, 0x00, 0x3d, 0xed, 0xf7, 0x29, 0x30, 0x66, 0xdd, 0x75, 0x46, + 0x1e, 0xf8, 0xbc, 0x73, 0x7e, 0x46, 0x58, 0x55, 0x93, 0x4a, 0x2e, 0xdf, 0xa6, 0xe4, 0x6a, 0x13, + 0xae, 0xd5, 0x50, 0xda, 0x6a, 0x1b, 0x43, 0x18, 0xd9, 0x22, 0x0b, 0xff, 0x8c, 0xca, 0x0c, 0x1c, + 0x0a, 0x9c, 0xc0, 0x40, 0xdd, 0x90, 0xf6, 0xf6, 0xcb, 0xd4, 0x0d, 0x1c, 0x7b, 0x14, 0x9f, 0x22, + 0x02, 0x03, 0xa0, 0xe0, 0x3b, 0x60, 0x55, 0x66, 0xd3, 0x7a, 0xf9, 0x6a, 0x0e, 0x44, 0x16, 0x98, + 0x8d, 0x27, 0x0d, 0x55, 0x52, 0x7b, 0x8f, 0xef, 0x11, 0x72, 0xe6, 0x3b, 0x35, 0xaf, 0xcb, 0xf7, + 0xef, 0xea, 0x50, 0xb2, 0xa2, 0x8b, 0x5b, 0x99, 0xb8, 0x18, 0x59, 0x62, 0xc3, 0x75, 0x54, 0xb8, + 0x0f, 0x7c, 0x60, 0xd5, 0xc2, 0x7e, 0xae, 0x59, 0xb6, 0xca, 0xa2, 0xab, 0x37, 0xc2, 0x41, 0x62, + 0x7f, 0x3c, 0xf8, 0xae, 0x17, 0xf8, 0x6a, 0x9e, 0x97, 0x06, 0x5f, 0x78, 0x89, 0xfa, 0xdb, 0xf8, + 0x4d, 0x43, 0x5f, 0x6e, 0x2c, 0x39, 0x6e, 0x23, 0xe4, 0x24, 0x96, 0xba, 0x59, 0x0b, 0x69, 0xc9, + 0x1f, 0xb2, 0x14, 0x85, 0xbf, 0x41, 0x95, 0x54, 0x9f, 0xd4, 0xb9, 0x4a, 0xae, 0x44, 0x8a, 0x8d, + 0xa4, 0x63, 0xad, 0x83, 0x87, 0x67, 0x3d, 0xf3, 0xf8, 0xac, 0x67, 0xfe, 0x79, 0xd6, 0x33, 0xbf, + 0xce, 0x74, 0xed, 0x61, 0xa6, 0x6b, 0x8f, 0x33, 0x5d, 0xfb, 0x77, 0xa6, 0x6b, 0xbf, 0xff, 0xa7, + 0x67, 0x6e, 0x4a, 0xaa, 0x66, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x63, 0x94, 0x8a, 0xdf, 0x70, + 0x08, 0x00, 0x00, } diff --git a/federation/apis/federation/v1beta1/generated.proto b/federation/apis/federation/v1beta1/generated.proto index db890906c5f..21738c5e7eb 100644 --- a/federation/apis/federation/v1beta1/generated.proto +++ b/federation/apis/federation/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.federation.apis.federation.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -57,11 +57,11 @@ message ClusterCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -77,7 +77,7 @@ message ClusterList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of Cluster objects. repeated Cluster items = 2; diff --git a/federation/apis/federation/v1beta1/register.go b/federation/apis/federation/v1beta1/register.go index 0eaa3288c84..44be085c38d 100644 --- a/federation/apis/federation/v1beta1/register.go +++ b/federation/apis/federation/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/federation/apis/federation/v1beta1/types.generated.go b/federation/apis/federation/v1beta1/types.generated.go index 4069793a023..693b588c94e 100644 --- a/federation/apis/federation/v1beta1/types.generated.go +++ b/federation/apis/federation/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg1_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_unversioned.Time - var v1 pkg1_v1.LocalObjectReference + var v0 pkg1_v1.LocalObjectReference + var v1 pkg2_v1.Time var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -801,7 +801,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv62 := &x.LastProbeTime yym63 := z.DecBinary() @@ -818,7 +818,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv64 := &x.LastTransitionTime yym65 := z.DecBinary() @@ -903,7 +903,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv71 := &x.LastProbeTime yym72 := z.DecBinary() @@ -930,7 +930,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv73 := &x.LastTransitionTime yym74 := z.DecBinary() @@ -1855,7 +1855,7 @@ func (x *ClusterList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv154 := &x.ListMeta yym155 := z.DecBinary() @@ -1936,7 +1936,7 @@ func (x *ClusterList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv161 := &x.ListMeta yym162 := z.DecBinary() diff --git a/federation/apis/federation/v1beta1/types.go b/federation/apis/federation/v1beta1/types.go index ffcd5495961..6dc3d3c7f73 100644 --- a/federation/apis/federation/v1beta1/types.go +++ b/federation/apis/federation/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match. diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json index a5636a4e43f..ef316d282c7 100644 --- a/federation/apis/openapi-spec/swagger.json +++ b/federation/apis/openapi-spec/swagger.json @@ -29,7 +29,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIVersions" + "$ref": "#/definitions/v1.APIVersions" } }, "401": { @@ -62,7 +62,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -391,7 +391,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -575,7 +575,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -731,7 +731,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -764,7 +764,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -972,7 +972,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1128,7 +1128,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1161,7 +1161,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -1369,7 +1369,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1525,7 +1525,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1558,7 +1558,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -1766,7 +1766,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1922,7 +1922,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -1955,7 +1955,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2091,7 +2091,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2263,7 +2263,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -2296,7 +2296,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -2480,7 +2480,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -3874,7 +3874,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroupList" + "$ref": "#/definitions/v1.APIGroupList" } }, "401": { @@ -3907,7 +3907,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -3940,7 +3940,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -4346,7 +4346,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -4502,7 +4502,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -4535,7 +4535,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -4671,7 +4671,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -4879,7 +4879,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5035,7 +5035,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5068,7 +5068,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5268,7 +5268,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5404,7 +5404,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5612,7 +5612,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5768,7 +5768,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -5801,7 +5801,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -5937,7 +5937,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6145,7 +6145,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6301,7 +6301,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -6334,7 +6334,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6470,7 +6470,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -6606,7 +6606,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -7769,7 +7769,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } }, "401": { @@ -7802,7 +7802,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.APIResourceList" + "$ref": "#/definitions/v1.APIResourceList" } }, "401": { @@ -7977,7 +7977,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -8125,7 +8125,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/unversioned.Status" + "$ref": "#/definitions/v1.Status" } }, "401": { @@ -8158,7 +8158,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/unversioned.Patch" + "$ref": "#/definitions/v1.Patch" } } ], @@ -8503,7 +8503,7 @@ } } }, - "unversioned.APIGroup": { + "v1.APIGroup": { "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -8517,25 +8517,25 @@ }, "preferredVersion": { "description": "preferredVersion is the version preferred by the API server, which probably is the storage version.", - "$ref": "#/definitions/unversioned.GroupVersionForDiscovery" + "$ref": "#/definitions/v1.GroupVersionForDiscovery" }, "serverAddressByClientCIDRs": { "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.ServerAddressByClientCIDR" + "$ref": "#/definitions/v1.ServerAddressByClientCIDR" } }, "versions": { "description": "versions are the versions supported in this group.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.GroupVersionForDiscovery" + "$ref": "#/definitions/v1.GroupVersionForDiscovery" } } } }, - "unversioned.APIGroupList": { + "v1.APIGroupList": { "description": "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.", "required": [ "groups" @@ -8545,12 +8545,12 @@ "description": "groups is a list of APIGroup.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.APIGroup" + "$ref": "#/definitions/v1.APIGroup" } } } }, - "unversioned.APIResource": { + "v1.APIResource": { "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", @@ -8572,7 +8572,7 @@ } } }, - "unversioned.APIResourceList": { + "v1.APIResourceList": { "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -8587,12 +8587,12 @@ "description": "resources contains the name of the resources and if they are namespaced.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.APIResource" + "$ref": "#/definitions/v1.APIResource" } } } }, - "unversioned.APIVersions": { + "v1.APIVersions": { "description": "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.", "required": [ "versions", @@ -8603,7 +8603,7 @@ "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP.", "type": "array", "items": { - "$ref": "#/definitions/unversioned.ServerAddressByClientCIDR" + "$ref": "#/definitions/v1.ServerAddressByClientCIDR" } }, "versions": { @@ -8615,179 +8615,6 @@ } } }, - "unversioned.GroupVersionForDiscovery": { - "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", - "required": [ - "groupVersion", - "version" - ], - "properties": { - "groupVersion": { - "description": "groupVersion specifies the API group and version in the form \"group/version\"", - "type": "string" - }, - "version": { - "description": "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", - "type": "string" - } - } - }, - "unversioned.LabelSelector": { - "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", - "properties": { - "matchExpressions": { - "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", - "type": "array", - "items": { - "$ref": "#/definitions/unversioned.LabelSelectorRequirement" - } - }, - "matchLabels": { - "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, - "unversioned.LabelSelectorRequirement": { - "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", - "required": [ - "key", - "operator" - ], - "properties": { - "key": { - "description": "key is the label key that the selector applies to.", - "type": "string" - }, - "operator": { - "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", - "type": "string" - }, - "values": { - "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", - "type": "array", - "items": { - "type": "string" - } - } - } - }, - "unversioned.ListMeta": { - "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", - "properties": { - "resourceVersion": { - "description": "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", - "type": "string" - }, - "selfLink": { - "description": "SelfLink is a URL representing this object. Populated by the system. Read-only.", - "type": "string" - } - } - }, - "unversioned.Patch": { - "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body." - }, - "unversioned.ServerAddressByClientCIDR": { - "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", - "required": [ - "clientCIDR", - "serverAddress" - ], - "properties": { - "clientCIDR": { - "description": "The CIDR with which clients can match their IP to figure out the server address that they should use.", - "type": "string" - }, - "serverAddress": { - "description": "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", - "type": "string" - } - } - }, - "unversioned.Status": { - "description": "Status is a return value for calls that don't return other objects.", - "properties": { - "code": { - "description": "Suggested HTTP return code for this status, 0 if not set.", - "type": "integer", - "format": "int32" - }, - "details": { - "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", - "$ref": "#/definitions/unversioned.StatusDetails" - }, - "message": { - "description": "A human-readable description of the status of this operation.", - "type": "string" - }, - "metadata": { - "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" - }, - "reason": { - "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", - "type": "string" - }, - "status": { - "description": "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", - "type": "string" - } - } - }, - "unversioned.StatusCause": { - "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", - "properties": { - "field": { - "description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", - "type": "string" - }, - "message": { - "description": "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", - "type": "string" - }, - "reason": { - "description": "A machine-readable description of the cause of the error. If this value is empty there is no information available.", - "type": "string" - } - } - }, - "unversioned.StatusDetails": { - "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", - "properties": { - "causes": { - "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", - "type": "array", - "items": { - "$ref": "#/definitions/unversioned.StatusCause" - } - }, - "group": { - "description": "The group attribute of the resource associated with the status StatusReason.", - "type": "string" - }, - "kind": { - "description": "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "type": "string" - }, - "name": { - "description": "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", - "type": "string" - }, - "retryAfterSeconds": { - "description": "If specified, the time in seconds before the operation should be retried.", - "type": "integer", - "format": "int32" - } - } - }, - "unversioned.Time": { - "type": "string", - "format": "date-time" - }, "v1.Capabilities": { "description": "Adds and removes POSIX capabilities from running containers.", "properties": { @@ -8850,7 +8677,7 @@ }, "metadata": { "description": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9052,7 +8879,7 @@ }, "firstTimestamp": { "description": "The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "involvedObject": { "description": "The object that this event is about.", @@ -9060,7 +8887,7 @@ }, "lastTimestamp": { "description": "The time at which the most recent occurrence of this event was recorded.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human-readable description of the status of this operation.", @@ -9099,7 +8926,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9128,6 +8955,23 @@ } } }, + "v1.GroupVersionForDiscovery": { + "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", + "required": [ + "groupVersion", + "version" + ], + "properties": { + "groupVersion": { + "description": "groupVersion specifies the API group and version in the form \"group/version\"", + "type": "string" + }, + "version": { + "description": "version specifies the version in the form of \"version\". This is to save the clients the trouble of splitting the GroupVersion.", + "type": "string" + } + } + }, "v1.HTTPGetAction": { "description": "HTTPGetAction describes an action based on HTTP Get requests.", "required": [ @@ -9193,6 +9037,49 @@ } } }, + "v1.LabelSelector": { + "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", + "properties": { + "matchExpressions": { + "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", + "type": "array", + "items": { + "$ref": "#/definitions/v1.LabelSelectorRequirement" + } + }, + "matchLabels": { + "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", + "type": "object", + "additionalProperties": { + "type": "string" + } + } + } + }, + "v1.LabelSelectorRequirement": { + "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", + "required": [ + "key", + "operator" + ], + "properties": { + "key": { + "description": "key is the label key that the selector applies to.", + "type": "string" + }, + "operator": { + "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", + "type": "string" + }, + "values": { + "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", + "type": "array", + "items": { + "type": "string" + } + } + } + }, "v1.Lifecycle": { "description": "Lifecycle describes actions that the management system should take in response to container lifecycle events. For the PostStart and PreStop lifecycle handlers, management of the container blocks until the action is complete, unless the container process fails, in which case the handler is aborted.", "properties": { @@ -9206,6 +9093,19 @@ } } }, + "v1.ListMeta": { + "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", + "properties": { + "resourceVersion": { + "description": "String that identifies the server's internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency", + "type": "string" + }, + "selfLink": { + "description": "SelfLink is a URL representing this object. Populated by the system. Read-only.", + "type": "string" + } + } + }, "v1.LoadBalancerIngress": { "description": "LoadBalancerIngress represents the status of a load-balancer ingress point: traffic intended for the service should be sent to an ingress point.", "properties": { @@ -9272,7 +9172,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9329,7 +9229,7 @@ }, "creationTimestamp": { "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "deletionGracePeriodSeconds": { "description": "Number of seconds allowed for this object to gracefully terminate before it will be removed from the system. Only set when deletionTimestamp is also set. May only be shortened. Read-only.", @@ -9338,7 +9238,7 @@ }, "deletionTimestamp": { "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "finalizers": { "description": "Must be empty before the object is deleted from the registry. Each entry 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.", @@ -9456,6 +9356,9 @@ } } }, + "v1.Patch": { + "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body." + }, "v1.PodSecurityContext": { "description": "PodSecurityContext holds pod-level security attributes and common container settings. Some fields are also present in container.securityContext. Field values of container.securityContext take precedence over field values of PodSecurityContext.", "properties": { @@ -9744,7 +9647,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9778,6 +9681,23 @@ } } }, + "v1.ServerAddressByClientCIDR": { + "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", + "required": [ + "clientCIDR", + "serverAddress" + ], + "properties": { + "clientCIDR": { + "description": "The CIDR with which clients can match their IP to figure out the server address that they should use.", + "type": "string" + }, + "serverAddress": { + "description": "Address of this server, suitable for a client that matches the above CIDR. This can be a hostname, hostname:port, IP or IP:port.", + "type": "string" + } + } + }, "v1.Service": { "description": "Service is a named abstraction of software service (for example, mysql) consisting of local port (for example 3306) that the proxy listens on, and the selector that determines which pods will answer requests sent through the proxy.", "properties": { @@ -9810,7 +9730,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -9916,6 +9836,82 @@ } } }, + "v1.Status": { + "description": "Status is a return value for calls that don't return other objects.", + "properties": { + "code": { + "description": "Suggested HTTP return code for this status, 0 if not set.", + "type": "integer", + "format": "int32" + }, + "details": { + "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.", + "$ref": "#/definitions/v1.StatusDetails" + }, + "message": { + "description": "A human-readable description of the status of this operation.", + "type": "string" + }, + "metadata": { + "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + "$ref": "#/definitions/v1.ListMeta" + }, + "reason": { + "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.", + "type": "string" + }, + "status": { + "description": "Status of the operation. One of: \"Success\" or \"Failure\". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status", + "type": "string" + } + } + }, + "v1.StatusCause": { + "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", + "properties": { + "field": { + "description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"", + "type": "string" + }, + "message": { + "description": "A human-readable description of the cause of the error. This field may be presented as-is to a reader.", + "type": "string" + }, + "reason": { + "description": "A machine-readable description of the cause of the error. If this value is empty there is no information available.", + "type": "string" + } + } + }, + "v1.StatusDetails": { + "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", + "properties": { + "causes": { + "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.", + "type": "array", + "items": { + "$ref": "#/definitions/v1.StatusCause" + } + }, + "group": { + "description": "The group attribute of the resource associated with the status StatusReason.", + "type": "string" + }, + "kind": { + "description": "The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", + "type": "string" + }, + "name": { + "description": "The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).", + "type": "string" + }, + "retryAfterSeconds": { + "description": "If specified, the time in seconds before the operation should be retried.", + "type": "integer", + "format": "int32" + } + } + }, "v1.TCPSocketAction": { "description": "TCPSocketAction describes an action based on opening a socket", "required": [ @@ -9928,6 +9924,10 @@ } } }, + "v1.Time": { + "type": "string", + "format": "date-time" + }, "v1.Volume": { "description": "Volume represents a named volume in a pod that may be accessed by any container in the pod.", "required": [ @@ -9991,11 +9991,11 @@ "properties": { "lastProbeTime": { "description": "Last time the condition was checked.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastTransitionTime": { "description": "Last time the condition transit from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "Human readable message indicating details about last transition.", @@ -10030,7 +10030,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10108,7 +10108,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10120,7 +10120,7 @@ "properties": { "selector": { "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created. The DaemonSet will create exactly one copy of this pod on every node that matches the template's node selector (or on every node if no node selector is specified). More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template", @@ -10185,11 +10185,11 @@ "properties": { "lastTransitionTime": { "description": "Last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "lastUpdateTime": { "description": "The last time this condition was updated.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -10224,7 +10224,7 @@ }, "metadata": { "description": "Standard list metadata.", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10288,7 +10288,7 @@ }, "selector": { "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "strategy": { "description": "The deployment strategy to use to replace existing pods with new ones.", @@ -10399,7 +10399,7 @@ }, "metadata": { "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10486,7 +10486,7 @@ "properties": { "lastTransitionTime": { "description": "The last time the condition transitioned from one status to another.", - "$ref": "#/definitions/unversioned.Time" + "$ref": "#/definitions/v1.Time" }, "message": { "description": "A human readable message indicating details about the transition.", @@ -10521,7 +10521,7 @@ }, "metadata": { "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds", - "$ref": "#/definitions/unversioned.ListMeta" + "$ref": "#/definitions/v1.ListMeta" } } }, @@ -10540,7 +10540,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/unversioned.LabelSelector" + "$ref": "#/definitions/v1.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template", diff --git a/federation/apis/swagger-spec/api.json b/federation/apis/swagger-spec/api.json index 6ec7dba9c8e..1147033c40b 100644 --- a/federation/apis/swagger-spec/api.json +++ b/federation/apis/swagger-spec/api.json @@ -13,7 +13,7 @@ "description": "get available API versions", "operations": [ { - "type": "unversioned.APIVersions", + "type": "v1.APIVersions", "method": "GET", "summary": "get available API versions", "nickname": "getAPIVersions", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIVersions": { - "id": "unversioned.APIVersions", + "v1.APIVersions": { + "id": "v1.APIVersions", "description": "APIVersions lists the versions that are available, to allow clients to discover the API at /api, which is the root path of the legacy v1 API.", "required": [ "versions", @@ -59,14 +59,14 @@ "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/federation/apis/swagger-spec/apis.json b/federation/apis/swagger-spec/apis.json index dea7ec02cf7..df729ba5160 100644 --- a/federation/apis/swagger-spec/apis.json +++ b/federation/apis/swagger-spec/apis.json @@ -13,7 +13,7 @@ "description": "get available API versions", "operations": [ { - "type": "unversioned.APIGroupList", + "type": "v1.APIGroupList", "method": "GET", "summary": "get available API versions", "nickname": "getAPIVersions", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroupList": { - "id": "unversioned.APIGroupList", + "v1.APIGroupList": { + "id": "v1.APIGroupList", "description": "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.", "required": [ "groups" @@ -51,14 +51,14 @@ "groups": { "type": "array", "items": { - "$ref": "unversioned.APIGroup" + "$ref": "v1.APIGroup" }, "description": "groups is a list of APIGroup." } } }, - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -81,25 +81,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -116,8 +116,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/federation/apis/swagger-spec/extensions.json b/federation/apis/swagger-spec/extensions.json index 6d2375f1a61..9ee75d6eb7e 100644 --- a/federation/apis/swagger-spec/extensions.json +++ b/federation/apis/swagger-spec/extensions.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/federation/apis/swagger-spec/extensions_v1beta1.json b/federation/apis/swagger-spec/extensions_v1beta1.json index ed2569f5c21..c4234ca145d 100644 --- a/federation/apis/swagger-spec/extensions_v1beta1.json +++ b/federation/apis/swagger-spec/extensions_v1beta1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of DaemonSet", "nickname": "deletecollectionNamespacedDaemonSet", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a DaemonSet", "nickname": "deleteNamespacedDaemonSet", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -934,7 +934,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1111,7 +1111,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Deployment", "nickname": "deletecollectionNamespacedDeployment", @@ -1177,7 +1177,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1415,7 +1415,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1458,7 +1458,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Deployment", "nickname": "deleteNamespacedDeployment", @@ -1516,7 +1516,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1965,7 +1965,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2130,7 +2130,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2307,7 +2307,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Ingress", "nickname": "deletecollectionNamespacedIngress", @@ -2373,7 +2373,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2611,7 +2611,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2654,7 +2654,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete an Ingress", "nickname": "deleteNamespacedIngress", @@ -2712,7 +2712,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3100,7 +3100,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3277,7 +3277,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ReplicaSet", "nickname": "deletecollectionNamespacedReplicaSet", @@ -3343,7 +3343,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3581,7 +3581,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3624,7 +3624,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ReplicaSet", "nickname": "deleteNamespacedReplicaSet", @@ -3682,7 +3682,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4070,7 +4070,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4235,7 +4235,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4284,7 +4284,7 @@ "description": "API at /apis/extensions/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -4320,7 +4320,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -4332,8 +4332,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -4407,12 +4407,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -4488,7 +4486,7 @@ ], "properties": { "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -4497,8 +4495,8 @@ } } }, - "unversioned.LabelSelector": { - "id": "unversioned.LabelSelector", + "v1.LabelSelector": { + "id": "v1.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -4508,14 +4506,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "unversioned.LabelSelectorRequirement" + "$ref": "v1.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "unversioned.LabelSelectorRequirement": { - "id": "unversioned.LabelSelectorRequirement", + "v1.LabelSelectorRequirement": { + "id": "v1.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -5928,8 +5926,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -5941,7 +5939,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -5957,7 +5955,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -5967,8 +5965,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -5986,7 +5984,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -5997,8 +5995,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -6030,8 +6028,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -6092,7 +6090,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata." }, "items": { @@ -6143,7 +6141,7 @@ "description": "Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1." }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment." }, "template": { @@ -6199,7 +6197,7 @@ "properties": { "maxUnavailable": { "type": "string", - "description": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding up. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods." + "description": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding down. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods." }, "maxSurge": { "type": "string", @@ -6273,12 +6271,10 @@ }, "lastUpdateTime": { "type": "string", - "format": "date-time", "description": "The last time this condition was updated." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transitioned from one status to another." }, "reason": { @@ -6396,7 +6392,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard object's metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -6592,7 +6588,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -6645,7 +6641,7 @@ "description": "Minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)" }, "selector": { - "$ref": "unversioned.LabelSelector", + "$ref": "v1.LabelSelector", "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { @@ -6713,7 +6709,6 @@ }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "The last time the condition transitioned from one status to another." }, "reason": { @@ -6726,8 +6721,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -6749,14 +6744,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/federation/apis/swagger-spec/federation.json b/federation/apis/swagger-spec/federation.json index 2c133632ffd..0480d406c21 100644 --- a/federation/apis/swagger-spec/federation.json +++ b/federation/apis/swagger-spec/federation.json @@ -13,7 +13,7 @@ "description": "get information of a group", "operations": [ { - "type": "unversioned.APIGroup", + "type": "v1.APIGroup", "method": "GET", "summary": "get information of a group", "nickname": "getAPIGroup", @@ -33,8 +33,8 @@ } ], "models": { - "unversioned.APIGroup": { - "id": "unversioned.APIGroup", + "v1.APIGroup": { + "id": "v1.APIGroup", "description": "APIGroup contains the name, the supported versions, and the preferred version of a group.", "required": [ "name", @@ -57,25 +57,25 @@ "versions": { "type": "array", "items": { - "$ref": "unversioned.GroupVersionForDiscovery" + "$ref": "v1.GroupVersionForDiscovery" }, "description": "versions are the versions supported in this group." }, "preferredVersion": { - "$ref": "unversioned.GroupVersionForDiscovery", + "$ref": "v1.GroupVersionForDiscovery", "description": "preferredVersion is the version preferred by the API server, which probably is the storage version." }, "serverAddressByClientCIDRs": { "type": "array", "items": { - "$ref": "unversioned.ServerAddressByClientCIDR" + "$ref": "v1.ServerAddressByClientCIDR" }, "description": "a map of client CIDR to server address that is serving this group. This is to help clients reach servers in the most network-efficient way possible. Clients can use the appropriate server address as per the CIDR that they match. In case of multiple matches, clients should use the longest matching CIDR. The server returns only those CIDRs that it thinks that the client can match. For example: the master will return an internal IP CIDR only, if the client reaches the server using an internal IP. Server looks at X-Forwarded-For header or X-Real-Ip header or request.RemoteAddr (in that order) to get the client IP." } } }, - "unversioned.GroupVersionForDiscovery": { - "id": "unversioned.GroupVersionForDiscovery", + "v1.GroupVersionForDiscovery": { + "id": "v1.GroupVersionForDiscovery", "description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.", "required": [ "groupVersion", @@ -92,8 +92,8 @@ } } }, - "unversioned.ServerAddressByClientCIDR": { - "id": "unversioned.ServerAddressByClientCIDR", + "v1.ServerAddressByClientCIDR": { + "id": "v1.ServerAddressByClientCIDR", "description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.", "required": [ "clientCIDR", diff --git a/federation/apis/swagger-spec/federation_v1beta1.json b/federation/apis/swagger-spec/federation_v1beta1.json index 931eb19eb44..a568dddfdef 100644 --- a/federation/apis/swagger-spec/federation_v1beta1.json +++ b/federation/apis/swagger-spec/federation_v1beta1.json @@ -125,7 +125,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Cluster", "nickname": "deletecollectionCluster", @@ -183,7 +183,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -397,7 +397,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -432,7 +432,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Cluster", "nickname": "deleteCluster", @@ -482,7 +482,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -641,7 +641,7 @@ "description": "API at /apis/federation/v1beta1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -677,7 +677,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -689,8 +689,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -764,12 +764,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -927,12 +925,10 @@ }, "lastProbeTime": { "type": "string", - "format": "date-time", "description": "Last time the condition was checked." }, "lastTransitionTime": { "type": "string", - "format": "date-time", "description": "Last time the condition transit from one status to another." }, "reason": { @@ -945,8 +941,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -958,7 +954,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -974,7 +970,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -984,8 +980,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -1003,7 +999,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -1014,8 +1010,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -1047,8 +1043,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -1093,8 +1089,8 @@ "id": "types.UID", "properties": {} }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -1116,14 +1112,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/federation/apis/swagger-spec/v1.json b/federation/apis/swagger-spec/v1.json index f5448fdf2a6..5c1e09fd4da 100644 --- a/federation/apis/swagger-spec/v1.json +++ b/federation/apis/swagger-spec/v1.json @@ -141,7 +141,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of ConfigMap", "nickname": "deletecollectionNamespacedConfigMap", @@ -207,7 +207,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -445,7 +445,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -488,7 +488,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a ConfigMap", "nickname": "deleteNamespacedConfigMap", @@ -546,7 +546,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -946,7 +946,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Event", "nickname": "deletecollectionNamespacedEvent", @@ -1012,7 +1012,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1250,7 +1250,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -1293,7 +1293,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete an Event", "nickname": "deleteNamespacedEvent", @@ -1351,7 +1351,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -1735,7 +1735,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Namespace", "nickname": "deletecollectionNamespace", @@ -1793,7 +1793,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2007,7 +2007,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2042,7 +2042,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Namespace", "nickname": "deleteNamespace", @@ -2092,7 +2092,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2351,7 +2351,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2520,7 +2520,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Secret", "nickname": "deletecollectionNamespacedSecret", @@ -2586,7 +2586,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -2824,7 +2824,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -2867,7 +2867,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Secret", "nickname": "deleteNamespacedSecret", @@ -2925,7 +2925,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3325,7 +3325,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete collection of Service", "nickname": "deletecollectionNamespacedService", @@ -3391,7 +3391,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -3629,7 +3629,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -3672,7 +3672,7 @@ ] }, { - "type": "unversioned.Status", + "type": "v1.Status", "method": "DELETE", "summary": "delete a Service", "nickname": "deleteNamespacedService", @@ -3730,7 +3730,7 @@ { "code": 200, "message": "OK", - "responseModel": "unversioned.Status" + "responseModel": "v1.Status" } ], "produces": [ @@ -4118,7 +4118,7 @@ "allowMultiple": false }, { - "type": "unversioned.Patch", + "type": "v1.Patch", "paramType": "body", "name": "body", "description": "", @@ -4167,7 +4167,7 @@ "description": "API at /api/v1", "operations": [ { - "type": "unversioned.APIResourceList", + "type": "v1.APIResourceList", "method": "GET", "summary": "get available resources", "nickname": "getAPIResources", @@ -4203,7 +4203,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "items": { @@ -4215,8 +4215,8 @@ } } }, - "unversioned.ListMeta": { - "id": "unversioned.ListMeta", + "v1.ListMeta": { + "id": "v1.ListMeta", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { "selfLink": { @@ -4286,12 +4286,10 @@ }, "creationTimestamp": { "type": "string", - "format": "date-time", "description": "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionTimestamp": { "type": "string", - "format": "date-time", "description": "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field. Once set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata" }, "deletionGracePeriodSeconds": { @@ -4359,8 +4357,8 @@ } } }, - "unversioned.Status": { - "id": "unversioned.Status", + "v1.Status": { + "id": "v1.Status", "description": "Status is a return value for calls that don't return other objects.", "properties": { "kind": { @@ -4372,7 +4370,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "status": { @@ -4388,7 +4386,7 @@ "description": "A machine-readable description of why this operation is in the \"Failure\" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it." }, "details": { - "$ref": "unversioned.StatusDetails", + "$ref": "v1.StatusDetails", "description": "Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type." }, "code": { @@ -4398,8 +4396,8 @@ } } }, - "unversioned.StatusDetails": { - "id": "unversioned.StatusDetails", + "v1.StatusDetails": { + "id": "v1.StatusDetails", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { "name": { @@ -4417,7 +4415,7 @@ "causes": { "type": "array", "items": { - "$ref": "unversioned.StatusCause" + "$ref": "v1.StatusCause" }, "description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes." }, @@ -4428,8 +4426,8 @@ } } }, - "unversioned.StatusCause": { - "id": "unversioned.StatusCause", + "v1.StatusCause": { + "id": "v1.StatusCause", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { "reason": { @@ -4461,8 +4459,8 @@ } } }, - "unversioned.Patch": { - "id": "unversioned.Patch", + "v1.Patch": { + "id": "v1.Patch", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.", "properties": {} }, @@ -4523,7 +4521,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -4573,12 +4571,10 @@ }, "firstTimestamp": { "type": "string", - "format": "date-time", "description": "The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)" }, "lastTimestamp": { "type": "string", - "format": "date-time", "description": "The time at which the most recent occurrence of this event was recorded." }, "count": { @@ -4656,7 +4652,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -4737,7 +4733,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -4795,7 +4791,7 @@ "description": "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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources" }, "metadata": { - "$ref": "unversioned.ListMeta", + "$ref": "v1.ListMeta", "description": "Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds" }, "items": { @@ -4962,8 +4958,8 @@ } } }, - "unversioned.APIResourceList": { - "id": "unversioned.APIResourceList", + "v1.APIResourceList": { + "id": "v1.APIResourceList", "description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.", "required": [ "groupVersion", @@ -4985,14 +4981,14 @@ "resources": { "type": "array", "items": { - "$ref": "unversioned.APIResource" + "$ref": "v1.APIResource" }, "description": "resources contains the name of the resources and if they are namespaced." } } }, - "unversioned.APIResource": { - "id": "unversioned.APIResource", + "v1.APIResource": { + "id": "v1.APIResource", "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", diff --git a/federation/cmd/federation-controller-manager/app/options/options.go b/federation/cmd/federation-controller-manager/app/options/options.go index 96cf227b105..77612bf9390 100644 --- a/federation/cmd/federation-controller-manager/app/options/options.go +++ b/federation/cmd/federation-controller-manager/app/options/options.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/pflag" "k8s.io/kubernetes/federation/pkg/dnsprovider" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/leaderelection" ) diff --git a/federation/docs/api-reference/extensions/v1beta1/definitions.html b/federation/docs/api-reference/extensions/v1beta1/definitions.html index ed8cf8c8dca..5347365f3e4 100755 --- a/federation/docs/api-reference/extensions/v1beta1/definitions.html +++ b/federation/docs/api-reference/extensions/v1beta1/definitions.html @@ -474,6 +474,61 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1beta1.DaemonSetStatus

@@ -762,6 +817,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.LabelSelector

+
+

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

v1.LabelSelectorRequirement array

+

v1beta1.IngressBackend

@@ -914,7 +1010,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1002,58 +1098,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1beta1.ReplicaSetCondition

@@ -1096,7 +1140,7 @@ Examples:

lastTransitionTime

The last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -1200,7 +1244,7 @@ Examples:

maxUnavailable

-

The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding up. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.

+

The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding down. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.

false

string

@@ -1546,7 +1590,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1555,7 +1599,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1645,7 +1689,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1686,7 +1730,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -1958,7 +2002,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard object’s metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2005,12 +2049,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.Patch

-
-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

-

v1.FlockerVolumeSource

@@ -2052,6 +2090,47 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.PersistentVolumeClaimVolumeSource

@@ -2093,88 +2172,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

- -
-
-

unversioned.LabelSelector

-
-

A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

matchLabels

matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.

false

object

matchExpressions

matchExpressions is a list of label selector requirements. The requirements are ANDed.

false

unversioned.LabelSelectorRequirement array

-

v1beta1.RollbackConfig

@@ -2865,7 +2862,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -3044,7 +3041,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.

false

-

unversioned.LabelSelector

+

v1.LabelSelector

@@ -3099,61 +3096,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i -
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.SecretKeySelector

@@ -3199,54 +3141,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

v1.Capability

-
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.DownwardAPIVolumeFile

@@ -3688,6 +3582,58 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

v1beta1.Scale

@@ -3912,6 +3858,89 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1beta1.ScaleStatus

@@ -4050,7 +4079,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata.

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -4342,68 +4371,6 @@ Both these may change in the future. Incoming requests are matched against the h -
-
-

unversioned.StatusDetails

-
-

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

unversioned.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

-

v1.HTTPGetAction

@@ -4466,6 +4433,68 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.StatusDetails

+
+

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

The name attribute of the resource associated with the status StatusReason (when there is a single name which can be described).

false

string

group

The group attribute of the resource associated with the status StatusReason.

false

string

kind

The kind attribute of the resource associated with the status StatusReason. On some operations may differ from the requested resource Kind. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

v1.StatusCause array

retryAfterSeconds

If specified, the time in seconds before the operation should be retried.

false

integer (int32)

+

v1.LoadBalancerStatus

@@ -4848,6 +4877,54 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1.HostPathVolumeSource

@@ -5291,6 +5368,54 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.LabelSelectorRequirement

+
+

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

+

v1.ResourceRequirements

@@ -5373,6 +5498,12 @@ Both these may change in the future. Incoming requests are matched against the h +
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1beta1.DeploymentCondition

@@ -5415,14 +5546,14 @@ Both these may change in the future. Incoming requests are matched against the h

lastUpdateTime

The last time this condition was updated.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transitioned from one status to another.

false

-

string (date-time)

+

string

@@ -5442,137 +5573,6 @@ Both these may change in the future. Incoming requests are matched against the h -
-
-

unversioned.LabelSelectorRequirement

-
-

A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

key

key is the label key that the selector applies to.

true

string

operator

operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.

true

string

values

values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.

false

string array

- -
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

-

v1.ConfigMapKeySelector

@@ -5733,7 +5733,7 @@ Both these may change in the future. Incoming requests are matched against the h
diff --git a/federation/docs/api-reference/extensions/v1beta1/operations.html b/federation/docs/api-reference/extensions/v1beta1/operations.html index 02079d04779..bf2d662c743 100755 --- a/federation/docs/api-reference/extensions/v1beta1/operations.html +++ b/federation/docs/api-reference/extensions/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -1154,7 +1154,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1678,7 +1678,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1763,7 +1763,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2142,7 +2142,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2498,7 +2498,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3022,7 +3022,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3107,7 +3107,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3613,7 +3613,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3992,7 +3992,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4348,7 +4348,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4872,7 +4872,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4957,7 +4957,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5336,7 +5336,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5692,7 +5692,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6216,7 +6216,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -6301,7 +6301,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -6680,7 +6680,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -7059,7 +7059,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -9188,7 +9188,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/federation/docs/api-reference/federation/v1beta1/definitions.html b/federation/docs/api-reference/federation/v1beta1/definitions.html index 5a0fec7fd2a..119dc8939c5 100755 --- a/federation/docs/api-reference/federation/v1beta1/definitions.html +++ b/federation/docs/api-reference/federation/v1beta1/definitions.html @@ -383,7 +383,62 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

+
+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+ +
+
+

v1.Patch

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

@@ -532,7 +587,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -547,7 +602,86 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.StatusDetails

+

versioned.Event

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

+ +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+ +
+
+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -594,7 +728,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -607,85 +741,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

versioned.Event

- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

type

true

string

object

true

string

- -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1beta1.ClusterStatus

@@ -804,9 +859,9 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
-

unversioned.APIResourceList

+

v1.Status

-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+

Status is a return value for calls that don’t return other objects.

@@ -841,17 +896,45 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -898,137 +981,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)
-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.ObjectMeta

@@ -1118,7 +1070,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1127,7 +1079,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1279,14 +1231,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

lastProbeTime

Last time the condition was checked.

false

-

string (date-time)

+

string

lastTransitionTime

Last time the condition transit from one status to another.

false

-

string (date-time)

+

string

@@ -1306,13 +1258,61 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

types.UID

-

unversioned.StatusCause

+

v1.StatusCause

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

@@ -1436,7 +1436,7 @@ Examples:
diff --git a/federation/docs/api-reference/federation/v1beta1/operations.html b/federation/docs/api-reference/federation/v1beta1/operations.html index 54d5c3e7c60..3193418bded 100755 --- a/federation/docs/api-reference/federation/v1beta1/operations.html +++ b/federation/docs/api-reference/federation/v1beta1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -691,7 +691,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1183,7 +1183,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1268,7 +1268,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -1781,7 +1781,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/federation/docs/api-reference/v1/definitions.html b/federation/docs/api-reference/v1/definitions.html index ebd4b0a3f98..3fe9479bbb9 100755 --- a/federation/docs/api-reference/v1/definitions.html +++ b/federation/docs/api-reference/v1/definitions.html @@ -410,10 +410,59 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

Definitions

-

unversioned.Patch

+

v1.APIResourceList

-

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

v1.APIResource array

+

v1.NamespaceList

@@ -456,7 +505,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -507,6 +556,47 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.ListMeta

+
+

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

+

v1.Namespace

@@ -569,47 +659,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.ListMeta

-
-

ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

selfLink

SelfLink is a URL representing this object. Populated by the system. Read-only.

false

string

resourceVersion

String that identifies the server’s internal version of this object that can be used by clients to determine when objects have changed. Value must be treated as opaque by clients and passed unmodified back to the server. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#concurrency-control-and-consistency

false

string

-

v1.Preconditions

@@ -644,6 +693,89 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +
+
+

v1.Status

+
+

Status is a return value for calls that don’t return other objects.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

v1.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

v1.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

+

v1.ServiceStatus

@@ -824,14 +956,14 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

firstTimestamp

The time at which the event was first recorded. (Time of server receipt is in TypeMeta.)

false

-

string (date-time)

+

string

lastTimestamp

The time at which the most recent occurrence of this event was recorded.

false

-

string (date-time)

+

string

@@ -851,58 +983,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } -
-
-

unversioned.StatusCause

-
-

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
-
-Examples:
- "name" - the field "name" on the current resource
- "items[0].name" - the field "name" on the first array entry in "items"

false

string

-

v1.LoadBalancerIngress

@@ -1020,7 +1100,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1129,6 +1209,12 @@ Examples:
+
+
+

v1.Patch

+
+

Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.

+

v1.ConfigMapList

@@ -1171,7 +1257,7 @@ Examples:

metadata

More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1248,7 +1334,7 @@ Examples:
-

unversioned.StatusDetails

+

v1.StatusDetails

StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.

@@ -1295,7 +1381,7 @@ Examples:

causes

The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.

false

-

unversioned.StatusCause array

+

v1.StatusCause array

@@ -1439,61 +1525,6 @@ Examples:
-
-
-

unversioned.APIResourceList

-
-

APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

groupVersion

groupVersion is the group and version this APIResourceList is for.

true

string

resources

resources contains the name of the resources and if they are namespaced.

true

unversioned.APIResource array

-

v1.LoadBalancerStatus

@@ -1570,7 +1601,7 @@ Examples:

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -1583,137 +1614,6 @@ Examples:
-
-
-

unversioned.Status

-
-

Status is a return value for calls that don’t return other objects.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

kind

Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

string

apiVersion

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: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources

false

string

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

unversioned.ListMeta

status

Status of the operation. One of: "Success" or "Failure". More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

string

message

A human-readable description of the status of this operation.

false

string

reason

A machine-readable description of why this operation is in the "Failure" status. If this value is empty there is no information available. A Reason clarifies an HTTP status code but does not override it.

false

string

details

Extended data associated with the reason. Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.

false

unversioned.StatusDetails

code

Suggested HTTP return code for this status, 0 if not set.

false

integer (int32)

- -
-
-

unversioned.APIResource

-
-

APIResource specifies the name of a resource and whether it is namespaced.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

-

v1.FinalizerName

@@ -1931,7 +1831,7 @@ Populated by the system. Read-only. Value must be treated as opaque by clients a
Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -1940,7 +1840,7 @@ Populated by the system. Read-only. Null for lists. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata

false

-

string (date-time)

+

string

@@ -2030,7 +1930,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

metadata

Standard list metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds

false

-

unversioned.ListMeta

+

v1.ListMeta

@@ -2043,6 +1943,54 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.APIResource

+
+

APIResource specifies the name of a resource and whether it is namespaced.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

name is the name of the resource.

true

string

namespaced

namespaced indicates if a resource is namespaced or not.

true

boolean

false

kind

kind is the kind for the resource (e.g. Foo is the kind for a resource foo)

true

string

+

v1.ServiceSpec

@@ -2185,6 +2133,58 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

types.UID

+
+
+

v1.StatusCause

+
+

StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

reason

A machine-readable description of the cause of the error. If this value is empty there is no information available.

false

string

message

A human-readable description of the cause of the error. This field may be presented as-is to a reader.

false

string

field

The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.
+
+Examples:
+ "name" - the field "name" on the current resource
+ "items[0].name" - the field "name" on the first array entry in "items"

false

string

+

any

@@ -2197,7 +2197,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
diff --git a/federation/docs/api-reference/v1/operations.html b/federation/docs/api-reference/v1/operations.html index 0bc75c3bb3b..506933ba18d 100755 --- a/federation/docs/api-reference/v1/operations.html +++ b/federation/docs/api-reference/v1/operations.html @@ -393,7 +393,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

default

success

-

unversioned.APIResourceList

+

v1.APIResourceList

@@ -989,7 +989,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1408,7 +1408,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -1932,7 +1932,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2017,7 +2017,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -2373,7 +2373,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2897,7 +2897,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -2982,7 +2982,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -3338,7 +3338,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3862,7 +3862,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -3947,7 +3947,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -4303,7 +4303,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4827,7 +4827,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -4912,7 +4912,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5291,7 +5291,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -5720,7 +5720,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

200

success

-

unversioned.Status

+

v1.Status

@@ -5805,7 +5805,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -6279,7 +6279,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

body

true

-

unversioned.Patch

+

v1.Patch

@@ -8855,7 +8855,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/federation/pkg/federation-controller/cluster/cluster_client.go b/federation/pkg/federation-controller/cluster/cluster_client.go index 00e0b00da6a..88ae73f185a 100644 --- a/federation/pkg/federation-controller/cluster/cluster_client.go +++ b/federation/pkg/federation-controller/cluster/cluster_client.go @@ -24,8 +24,8 @@ import ( federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/discovery" diff --git a/federation/pkg/federation-controller/cluster/clustercontroller_test.go b/federation/pkg/federation-controller/cluster/clustercontroller_test.go index 67912636e4b..de1217ec2b9 100644 --- a/federation/pkg/federation-controller/cluster/clustercontroller_test.go +++ b/federation/pkg/federation-controller/cluster/clustercontroller_test.go @@ -27,8 +27,8 @@ import ( federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" controllerutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" diff --git a/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go b/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go index 5e8a95068c5..1c1ef85c32f 100644 --- a/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go +++ b/federation/pkg/federation-controller/daemonset/daemonset_controller_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/runtime" diff --git a/federation/pkg/federation-controller/namespace/namespace_controller_test.go b/federation/pkg/federation-controller/namespace/namespace_controller_test.go index a779f39b963..c32b7881f23 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller_test.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/kubernetes/federation/pkg/federation-controller/util/deletionhelper" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go b/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go index a9e88c37576..21670899657 100644 --- a/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go +++ b/federation/pkg/federation-controller/util/podanalyzer/pod_helper.go @@ -21,8 +21,8 @@ import ( "time" "k8s.io/kubernetes/federation/pkg/federation-controller/util" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api_v1 "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go b/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go index 6874e465721..543350cbda6 100644 --- a/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go +++ b/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go @@ -21,9 +21,9 @@ import ( "time" "k8s.io/kubernetes/federation/pkg/federation-controller/util" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "github.com/stretchr/testify/assert" ) diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index a407a2d3651..14371807d11 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/federation/pkg/kubefed/init/init_test.go @@ -37,9 +37,9 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" diff --git a/federation/pkg/kubefed/join_test.go b/federation/pkg/kubefed/join_test.go index f9f02419c9c..f01ee2bb82c 100644 --- a/federation/pkg/kubefed/join_test.go +++ b/federation/pkg/kubefed/join_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/kubernetes/federation/pkg/kubefed/util" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" diff --git a/pkg/api/defaulting_test.go b/pkg/api/defaulting_test.go index 4cc34613834..4423e8c5685 100644 --- a/pkg/api/defaulting_test.go +++ b/pkg/api/defaulting_test.go @@ -25,10 +25,10 @@ import ( "github.com/google/gofuzz" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/diff" diff --git a/pkg/api/install/install_test.go b/pkg/api/install/install_test.go index 7fdd05d4d92..58013033481 100644 --- a/pkg/api/install/install_test.go +++ b/pkg/api/install/install_test.go @@ -22,8 +22,8 @@ import ( "testing" internal "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/api/meta.go b/pkg/api/meta.go index a0c33030068..851e536c37f 100644 --- a/pkg/api/meta.go +++ b/pkg/api/meta.go @@ -75,19 +75,19 @@ func (obj *ObjectMeta) GetObjectMeta() meta.Object { return obj } // Namespace implements meta.Object for any object with an ObjectMeta typed field. Allows // fast, direct access to metadata fields for API objects. -func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } -func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } -func (meta *ObjectMeta) GetName() string { return meta.Name } -func (meta *ObjectMeta) SetName(name string) { meta.Name = name } -func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } -func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } -func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } -func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } -func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } -func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } -func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } -func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } -func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } +func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } +func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } +func (meta *ObjectMeta) GetName() string { return meta.Name } +func (meta *ObjectMeta) SetName(name string) { meta.Name = name } +func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } +func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } +func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } +func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } +func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } +func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } +func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } +func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } +func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) { meta.CreationTimestamp = creationTimestamp } diff --git a/pkg/api/meta/meta_test.go b/pkg/api/meta/meta_test.go index 5a847235078..7e920a0a1f7 100644 --- a/pkg/api/meta/meta_test.go +++ b/pkg/api/meta/meta_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/types" @@ -148,7 +148,7 @@ func TestGenericTypeMeta(t *testing.T) { Name string `json:"name,omitempty"` GenerateName string `json:"generateName,omitempty"` UID string `json:"uid,omitempty"` - CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` SelfLink string `json:"selfLink,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` APIVersion string `json:"apiVersion,omitempty"` @@ -198,7 +198,7 @@ type InternalTypeMeta struct { Name string `json:"name,omitempty"` GenerateName string `json:"generateName,omitempty"` UID string `json:"uid,omitempty"` - CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` SelfLink string `json:"selfLink,omitempty"` ResourceVersion string `json:"resourceVersion,omitempty"` APIVersion string `json:"apiVersion,omitempty"` diff --git a/pkg/api/meta/scheme_test.go b/pkg/api/meta/scheme_test.go index 12f07f941cc..85813d4f25f 100644 --- a/pkg/api/meta/scheme_test.go +++ b/pkg/api/meta/scheme_test.go @@ -93,14 +93,14 @@ type WithoutItemsList struct { type WrongItemsJSONTagList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` - Items []interface{} `json:"items,omitempty"` + Items []interface{} `json:"items,omitempty"` } // If a type has Items, its name should end with "List" type ListWithWrongName struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` - Items []interface{} `json:"items"` + Items []interface{} `json:"items"` } // TestValidateListType verifies the validateListType function reports error on diff --git a/pkg/api/meta_test.go b/pkg/api/meta_test.go index fcf84a235bc..66053fef2c3 100644 --- a/pkg/api/meta_test.go +++ b/pkg/api/meta_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/uuid" diff --git a/pkg/api/rest/resttest/resttest.go b/pkg/api/rest/resttest/resttest.go index b237251ab13..45a18ce1037 100644 --- a/pkg/api/rest/resttest/resttest.go +++ b/pkg/api/rest/resttest/resttest.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation/path" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index f7cb5a770f0..6f002645b73 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -36,10 +36,10 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index d3675e50aa2..f9024d47076 100644 --- a/pkg/api/testing/fuzzer.go +++ b/pkg/api/testing/fuzzer.go @@ -27,10 +27,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/api/types.generated.go b/pkg/api/types.generated.go index 82f4890488d..697cda6a02a 100644 --- a/pkg/api/types.generated.go +++ b/pkg/api/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg6_fields "k8s.io/kubernetes/pkg/fields" pkg5_labels "k8s.io/kubernetes/pkg/labels" pkg7_runtime "k8s.io/kubernetes/pkg/runtime" @@ -68,7 +68,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg3_resource.Quantity - var v1 pkg2_unversioned.Time + var v1 pkg2_v1.Time var v2 pkg6_fields.Selector var v3 pkg5_labels.Selector var v4 pkg7_runtime.Object @@ -678,7 +678,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv62 := &x.CreationTimestamp yym63 := z.DecBinary() @@ -700,7 +700,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym65 := z.DecBinary() _ = yym65 @@ -922,7 +922,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv85 := &x.CreationTimestamp yym86 := z.DecBinary() @@ -954,7 +954,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym88 := z.DecBinary() _ = yym88 @@ -8170,7 +8170,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv474 := &x.ListMeta yym475 := z.DecBinary() @@ -8251,7 +8251,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv481 := &x.ListMeta yym482 := z.DecBinary() @@ -8857,7 +8857,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv537 := &x.ListMeta yym538 := z.DecBinary() @@ -8938,7 +8938,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv544 := &x.ListMeta yym545 := z.DecBinary() @@ -9211,7 +9211,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromMap(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym568 := z.DecBinary() _ = yym568 @@ -9287,7 +9287,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromArray(l int, d *codec1978 } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym575 := z.DecBinary() _ = yym575 @@ -23240,7 +23240,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromMap(l int, d *codec1978.Decod switch yys1684 { case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1685 := &x.StartedAt yym1686 := z.DecBinary() @@ -23281,7 +23281,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1688 := &x.StartedAt yym1689 := z.DecBinary() @@ -23628,7 +23628,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1724 := &x.StartedAt yym1725 := z.DecBinary() @@ -23645,7 +23645,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "finishedAt": if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1726 := &x.FinishedAt yym1727 := z.DecBinary() @@ -23756,7 +23756,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1734 := &x.StartedAt yym1735 := z.DecBinary() @@ -23783,7 +23783,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1736 := &x.FinishedAt yym1737 := z.DecBinary() @@ -24880,7 +24880,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1829 := &x.LastProbeTime yym1830 := z.DecBinary() @@ -24897,7 +24897,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1831 := &x.LastTransitionTime yym1832 := z.DecBinary() @@ -24982,7 +24982,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1838 := &x.LastProbeTime yym1839 := z.DecBinary() @@ -25009,7 +25009,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1840 := &x.LastTransitionTime yym1841 := z.DecBinary() @@ -25312,7 +25312,7 @@ func (x *PodList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv1867 := &x.ListMeta yym1868 := z.DecBinary() @@ -25393,7 +25393,7 @@ func (x *PodList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv1874 := &x.ListMeta yym1875 := z.DecBinary() @@ -27306,7 +27306,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym2015 := z.DecBinary() _ = yym2015 @@ -27365,7 +27365,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym2021 := z.DecBinary() _ = yym2021 @@ -30507,7 +30507,7 @@ func (x *PodStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2292 := z.DecBinary() _ = yym2292 @@ -30666,7 +30666,7 @@ func (x *PodStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2304 := z.DecBinary() _ = yym2304 @@ -32082,7 +32082,7 @@ func (x *PodTemplateList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2427 := &x.ListMeta yym2428 := z.DecBinary() @@ -32163,7 +32163,7 @@ func (x *PodTemplateList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2434 := &x.ListMeta yym2435 := z.DecBinary() @@ -33200,7 +33200,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromMap(l int, d *codec1 } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2524 := &x.LastTransitionTime yym2525 := z.DecBinary() @@ -33285,7 +33285,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromArray(l int, d *code } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2531 := &x.LastTransitionTime yym2532 := z.DecBinary() @@ -33905,7 +33905,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2587 := &x.ListMeta yym2588 := z.DecBinary() @@ -33986,7 +33986,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2594 := &x.ListMeta yym2595 := z.DecBinary() @@ -34249,7 +34249,7 @@ func (x *ServiceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2619 := &x.ListMeta yym2620 := z.DecBinary() @@ -34330,7 +34330,7 @@ func (x *ServiceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2626 := &x.ListMeta yym2627 := z.DecBinary() @@ -36879,7 +36879,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2849 := &x.ListMeta yym2850 := z.DecBinary() @@ -36960,7 +36960,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromArray(l int, d *codec1978.Decode } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2856 := &x.ListMeta yym2857 := z.DecBinary() @@ -38418,7 +38418,7 @@ func (x *EndpointsList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2983 := &x.ListMeta yym2984 := z.DecBinary() @@ -38499,7 +38499,7 @@ func (x *EndpointsList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2990 := &x.ListMeta yym2991 := z.DecBinary() @@ -41005,7 +41005,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "evictionTime": if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3207 := &x.EvictionTime yym3208 := z.DecBinary() @@ -41075,7 +41075,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3213 := &x.EvictionTime yym3214 := z.DecBinary() @@ -41848,7 +41848,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastHeartbeatTime": if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3273 := &x.LastHeartbeatTime yym3274 := z.DecBinary() @@ -41865,7 +41865,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3275 := &x.LastTransitionTime yym3276 := z.DecBinary() @@ -41950,7 +41950,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3282 := &x.LastHeartbeatTime yym3283 := z.DecBinary() @@ -41977,7 +41977,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3284 := &x.LastTransitionTime yym3285 := z.DecBinary() @@ -43041,7 +43041,7 @@ func (x *NodeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3369 := &x.ListMeta yym3370 := z.DecBinary() @@ -43122,7 +43122,7 @@ func (x *NodeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3376 := &x.ListMeta yym3377 := z.DecBinary() @@ -44121,7 +44121,7 @@ func (x *NamespaceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3458 := &x.ListMeta yym3459 := z.DecBinary() @@ -44202,7 +44202,7 @@ func (x *NamespaceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3465 := &x.ListMeta yym3466 := z.DecBinary() @@ -46073,7 +46073,7 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } yym3645 := z.DecBinary() _ = yym3645 @@ -46262,7 +46262,7 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } yym3660 := z.DecBinary() _ = yym3660 @@ -49960,7 +49960,7 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "firstTimestamp": if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { yyv3991 := &x.FirstTimestamp yym3992 := z.DecBinary() @@ -49977,7 +49977,7 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTimestamp": if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { yyv3993 := &x.LastTimestamp yym3994 := z.DecBinary() @@ -50145,7 +50145,7 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { yyv4005 := &x.FirstTimestamp yym4006 := z.DecBinary() @@ -50172,7 +50172,7 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { yyv4007 := &x.LastTimestamp yym4008 := z.DecBinary() @@ -50449,7 +50449,7 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4032 := &x.ListMeta yym4033 := z.DecBinary() @@ -50530,7 +50530,7 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4039 := &x.ListMeta yym4040 := z.DecBinary() @@ -50793,7 +50793,7 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4064 := &x.ListMeta yym4065 := z.DecBinary() @@ -50874,7 +50874,7 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4071 := &x.ListMeta yym4072 := z.DecBinary() @@ -52045,7 +52045,7 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4161 := &x.ListMeta yym4162 := z.DecBinary() @@ -52126,7 +52126,7 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4168 := &x.ListMeta yym4169 := z.DecBinary() @@ -53212,7 +53212,7 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4254 := &x.ListMeta yym4255 := z.DecBinary() @@ -53293,7 +53293,7 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4261 := &x.ListMeta yym4262 := z.DecBinary() @@ -53947,7 +53947,7 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4319 := &x.ListMeta yym4320 := z.DecBinary() @@ -54028,7 +54028,7 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4326 := &x.ListMeta yym4327 := z.DecBinary() @@ -54618,7 +54618,7 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4379 := &x.ListMeta yym4380 := z.DecBinary() @@ -54699,7 +54699,7 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4386 := &x.ListMeta yym4387 := z.DecBinary() @@ -55620,7 +55620,7 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4465 := &x.ListMeta yym4466 := z.DecBinary() @@ -55701,7 +55701,7 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4472 := &x.ListMeta yym4473 := z.DecBinary() diff --git a/pkg/api/types.go b/pkg/api/types.go index 8c1122b8aab..502e7af6938 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -432,7 +432,7 @@ type PersistentVolumeList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty"` - Items []PersistentVolume `json:"items"` + Items []PersistentVolume `json:"items"` } // +genclient=true @@ -456,7 +456,7 @@ type PersistentVolumeClaimList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty"` - Items []PersistentVolumeClaim `json:"items"` + Items []PersistentVolumeClaim `json:"items"` } // PersistentVolumeClaimSpec describes the common attributes of storage devices diff --git a/pkg/api/v1/conversion_test.go b/pkg/api/v1/conversion_test.go index 6ea9da848d6..1060ac55411 100644 --- a/pkg/api/v1/conversion_test.go +++ b/pkg/api/v1/conversion_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" versioned "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/diff" ) diff --git a/pkg/api/v1/generated.pb.go b/pkg/api/v1/generated.pb.go index e8b52d3b09b..23220136a93 100644 --- a/pkg/api/v1/generated.pb.go +++ b/pkg/api/v1/generated.pb.go @@ -190,7 +190,7 @@ import fmt "fmt" import math "math" import k8s_io_kubernetes_pkg_api_resource "k8s.io/kubernetes/pkg/api/resource" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_runtime "k8s.io/kubernetes/pkg/runtime" import k8s_io_kubernetes_pkg_types "k8s.io/kubernetes/pkg/types" @@ -11118,7 +11118,7 @@ func (this *ComponentStatusList) String() string { return "nil" } s := strings.Join([]string{`&ComponentStatusList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ComponentStatus", "ComponentStatus", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11161,7 +11161,7 @@ func (this *ConfigMapList) String() string { return "nil" } s := strings.Join([]string{`&ConfigMapList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ConfigMap", "ConfigMap", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11248,7 +11248,7 @@ func (this *ContainerStateRunning) String() string { return "nil" } s := strings.Join([]string{`&ContainerStateRunning{`, - `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -11262,8 +11262,8 @@ func (this *ContainerStateTerminated) String() string { `Signal:` + fmt.Sprintf("%v", this.Signal) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `FinishedAt:` + strings.Replace(strings.Replace(this.FinishedAt.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `FinishedAt:` + strings.Replace(strings.Replace(this.FinishedAt.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, `}`, }, "") @@ -11406,7 +11406,7 @@ func (this *EndpointsList) String() string { return "nil" } s := strings.Join([]string{`&EndpointsList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Endpoints", "Endpoints", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11447,8 +11447,8 @@ func (this *Event) String() string { `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `Source:` + strings.Replace(strings.Replace(this.Source.String(), "EventSource", "EventSource", 1), `&`, ``, 1) + `,`, - `FirstTimestamp:` + strings.Replace(strings.Replace(this.FirstTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTimestamp:` + strings.Replace(strings.Replace(this.LastTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `FirstTimestamp:` + strings.Replace(strings.Replace(this.FirstTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTimestamp:` + strings.Replace(strings.Replace(this.LastTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Count:` + fmt.Sprintf("%v", this.Count) + `,`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `}`, @@ -11460,7 +11460,7 @@ func (this *EventList) String() string { return "nil" } s := strings.Join([]string{`&EventList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Event", "Event", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11738,7 +11738,7 @@ func (this *LimitRangeList) String() string { return "nil" } s := strings.Join([]string{`&LimitRangeList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "LimitRange", "LimitRange", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11759,7 +11759,7 @@ func (this *List) String() string { return "nil" } s := strings.Join([]string{`&List{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "RawExtension", "k8s_io_kubernetes_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11839,7 +11839,7 @@ func (this *NamespaceList) String() string { return "nil" } s := strings.Join([]string{`&NamespaceList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Namespace", "Namespace", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11906,8 +11906,8 @@ func (this *NodeCondition) String() string { s := strings.Join([]string{`&NodeCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastHeartbeatTime:` + strings.Replace(strings.Replace(this.LastHeartbeatTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastHeartbeatTime:` + strings.Replace(strings.Replace(this.LastHeartbeatTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -11929,7 +11929,7 @@ func (this *NodeList) String() string { return "nil" } s := strings.Join([]string{`&NodeList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Node", "Node", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12111,8 +12111,8 @@ func (this *ObjectMeta) String() string { `UID:` + fmt.Sprintf("%v", this.UID) + `,`, `ResourceVersion:` + fmt.Sprintf("%v", this.ResourceVersion) + `,`, `Generation:` + fmt.Sprintf("%v", this.Generation) + `,`, - `CreationTimestamp:` + strings.Replace(strings.Replace(this.CreationTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `DeletionTimestamp:` + strings.Replace(fmt.Sprintf("%v", this.DeletionTimestamp), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `CreationTimestamp:` + strings.Replace(strings.Replace(this.CreationTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `DeletionTimestamp:` + strings.Replace(fmt.Sprintf("%v", this.DeletionTimestamp), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `DeletionGracePeriodSeconds:` + valueToStringGenerated(this.DeletionGracePeriodSeconds) + `,`, `Labels:` + mapStringForLabels + `,`, `Annotations:` + mapStringForAnnotations + `,`, @@ -12182,7 +12182,7 @@ func (this *PersistentVolumeClaimList) String() string { return "nil" } s := strings.Join([]string{`&PersistentVolumeClaimList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PersistentVolumeClaim", "PersistentVolumeClaim", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12196,7 +12196,7 @@ func (this *PersistentVolumeClaimSpec) String() string { `AccessModes:` + fmt.Sprintf("%v", this.AccessModes) + `,`, `Resources:` + strings.Replace(strings.Replace(this.Resources.String(), "ResourceRequirements", "ResourceRequirements", 1), `&`, ``, 1) + `,`, `VolumeName:` + fmt.Sprintf("%v", this.VolumeName) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") return s @@ -12239,7 +12239,7 @@ func (this *PersistentVolumeList) String() string { return "nil" } s := strings.Join([]string{`&PersistentVolumeList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PersistentVolume", "PersistentVolume", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12346,7 +12346,7 @@ func (this *PodAffinityTerm) String() string { return "nil" } s := strings.Join([]string{`&PodAffinityTerm{`, - `LabelSelector:` + strings.Replace(fmt.Sprintf("%v", this.LabelSelector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `LabelSelector:` + strings.Replace(fmt.Sprintf("%v", this.LabelSelector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Namespaces:` + fmt.Sprintf("%v", this.Namespaces) + `,`, `TopologyKey:` + fmt.Sprintf("%v", this.TopologyKey) + `,`, `}`, @@ -12385,8 +12385,8 @@ func (this *PodCondition) String() string { s := strings.Join([]string{`&PodCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -12413,7 +12413,7 @@ func (this *PodList) String() string { return "nil" } s := strings.Join([]string{`&PodList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Pod", "Pod", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12428,7 +12428,7 @@ func (this *PodLogOptions) String() string { `Follow:` + fmt.Sprintf("%v", this.Follow) + `,`, `Previous:` + fmt.Sprintf("%v", this.Previous) + `,`, `SinceSeconds:` + valueToStringGenerated(this.SinceSeconds) + `,`, - `SinceTime:` + strings.Replace(fmt.Sprintf("%v", this.SinceTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `SinceTime:` + strings.Replace(fmt.Sprintf("%v", this.SinceTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Timestamps:` + fmt.Sprintf("%v", this.Timestamps) + `,`, `TailLines:` + valueToStringGenerated(this.TailLines) + `,`, `LimitBytes:` + valueToStringGenerated(this.LimitBytes) + `,`, @@ -12517,7 +12517,7 @@ func (this *PodStatus) String() string { `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `HostIP:` + fmt.Sprintf("%v", this.HostIP) + `,`, `PodIP:` + fmt.Sprintf("%v", this.PodIP) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `ContainerStatuses:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ContainerStatuses), "ContainerStatus", "ContainerStatus", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12550,7 +12550,7 @@ func (this *PodTemplateList) String() string { return "nil" } s := strings.Join([]string{`&PodTemplateList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodTemplate", "PodTemplate", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12583,7 +12583,7 @@ func (this *PreferAvoidPodsEntry) String() string { } s := strings.Join([]string{`&PreferAvoidPodsEntry{`, `PodSignature:` + strings.Replace(strings.Replace(this.PodSignature.String(), "PodSignature", "PodSignature", 1), `&`, ``, 1) + `,`, - `EvictionTime:` + strings.Replace(strings.Replace(this.EvictionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `EvictionTime:` + strings.Replace(strings.Replace(this.EvictionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -12678,7 +12678,7 @@ func (this *ReplicationControllerCondition) String() string { s := strings.Join([]string{`&ReplicationControllerCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -12690,7 +12690,7 @@ func (this *ReplicationControllerList) String() string { return "nil" } s := strings.Join([]string{`&ReplicationControllerList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ReplicationController", "ReplicationController", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12763,7 +12763,7 @@ func (this *ResourceQuotaList) String() string { return "nil" } s := strings.Join([]string{`&ResourceQuotaList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ResourceQuota", "ResourceQuota", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12914,7 +12914,7 @@ func (this *SecretList) String() string { return "nil" } s := strings.Join([]string{`&SecretList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Secret", "Secret", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12986,7 +12986,7 @@ func (this *ServiceAccountList) String() string { return "nil" } s := strings.Join([]string{`&ServiceAccountList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ServiceAccount", "ServiceAccount", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12997,7 +12997,7 @@ func (this *ServiceList) String() string { return "nil" } s := strings.Join([]string{`&ServiceList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Service", "Service", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -26009,7 +26009,7 @@ func (m *ObjectMeta) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.DeletionTimestamp == nil { - m.DeletionTimestamp = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.DeletionTimestamp = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.DeletionTimestamp.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -27342,7 +27342,7 @@ func (m *PersistentVolumeClaimSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -29254,7 +29254,7 @@ func (m *PodAffinityTerm) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LabelSelector == nil { - m.LabelSelector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.LabelSelector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.LabelSelector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -30280,7 +30280,7 @@ func (m *PodLogOptions) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.SinceTime == nil { - m.SinceTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.SinceTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.SinceTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -31515,7 +31515,7 @@ func (m *PodStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -39412,632 +39412,632 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 10023 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x6c, 0x25, 0xd7, - 0x75, 0x98, 0xe7, 0x3d, 0x7e, 0xbd, 0xc3, 0xcf, 0xbd, 0xfb, 0x21, 0x8a, 0x96, 0x96, 0xeb, 0x91, - 0x25, 0xaf, 0xa4, 0x15, 0xd7, 0xbb, 0x92, 0x2c, 0xd9, 0x52, 0x65, 0x93, 0x7c, 0xe4, 0x2e, 0xbd, - 0xcb, 0xdd, 0xa7, 0xfb, 0xb8, 0x5a, 0xd9, 0x56, 0x25, 0x0f, 0xdf, 0x5c, 0x92, 0xe3, 0x1d, 0xce, - 0x3c, 0xcd, 0xcc, 0xe3, 0x2e, 0xed, 0x06, 0x48, 0x1d, 0x35, 0x41, 0x11, 0x23, 0x75, 0xd1, 0x1a, - 0x2d, 0xd0, 0x16, 0x75, 0x0b, 0xb4, 0x48, 0x1b, 0x34, 0x8d, 0x53, 0x37, 0xb1, 0x5b, 0xc3, 0x28, - 0xd0, 0xd4, 0x70, 0x3f, 0x52, 0x38, 0x40, 0xd0, 0x04, 0x09, 0xc0, 0x46, 0x0c, 0x8a, 0xfe, 0xe8, - 0x8f, 0x16, 0xe8, 0xaf, 0x12, 0x41, 0x5b, 0xdc, 0xcf, 0xb9, 0x77, 0xde, 0x3c, 0xce, 0x3c, 0x6a, - 0xc9, 0xc8, 0x41, 0xfe, 0xbd, 0x77, 0xce, 0xb9, 0xe7, 0x7e, 0xcc, 0xb9, 0xe7, 0x9e, 0x7b, 0xee, - 0xb9, 0xe7, 0xc2, 0xa5, 0x7b, 0x2f, 0xc7, 0x73, 0x5e, 0x78, 0xf9, 0x5e, 0x67, 0x9d, 0x44, 0x01, - 0x49, 0x48, 0x7c, 0xb9, 0x7d, 0x6f, 0xf3, 0xb2, 0xd3, 0xf6, 0x2e, 0xef, 0x5c, 0xb9, 0xbc, 0x49, - 0x02, 0x12, 0x39, 0x09, 0x71, 0xe7, 0xda, 0x51, 0x98, 0x84, 0xe8, 0x31, 0x4e, 0x3d, 0x97, 0x52, - 0xcf, 0xb5, 0xef, 0x6d, 0xce, 0x39, 0x6d, 0x6f, 0x6e, 0xe7, 0xca, 0xcc, 0x73, 0x9b, 0x5e, 0xb2, - 0xd5, 0x59, 0x9f, 0x6b, 0x85, 0xdb, 0x97, 0x37, 0xc3, 0xcd, 0xf0, 0x32, 0x2b, 0xb4, 0xde, 0xd9, - 0x60, 0xff, 0xd8, 0x1f, 0xf6, 0x8b, 0x33, 0x9b, 0xb9, 0xda, 0xbb, 0xea, 0x88, 0xc4, 0x61, 0x27, - 0x6a, 0x91, 0x6c, 0x03, 0x66, 0x5e, 0xec, 0x5d, 0xa6, 0x13, 0xec, 0x90, 0x28, 0xf6, 0xc2, 0x80, - 0xb8, 0x5d, 0xc5, 0x9e, 0xcb, 0x2f, 0x16, 0x75, 0x82, 0xc4, 0xdb, 0xee, 0xae, 0xe5, 0x85, 0xc3, - 0xc9, 0xe3, 0xd6, 0x16, 0xd9, 0x76, 0xba, 0x4a, 0x5d, 0xc9, 0x2f, 0xd5, 0x49, 0x3c, 0xff, 0xb2, - 0x17, 0x24, 0x71, 0x12, 0x65, 0x8b, 0xd8, 0xbf, 0x67, 0xc1, 0x85, 0xf9, 0xbb, 0xcd, 0x25, 0xdf, - 0x89, 0x13, 0xaf, 0xb5, 0xe0, 0x87, 0xad, 0x7b, 0xcd, 0x24, 0x8c, 0xc8, 0x1b, 0xa1, 0xdf, 0xd9, - 0x26, 0x4d, 0x36, 0x06, 0xe8, 0x12, 0x8c, 0xec, 0xb0, 0xff, 0x2b, 0xf5, 0x69, 0xeb, 0x82, 0x75, - 0xb1, 0xb6, 0x30, 0xf5, 0xe3, 0xbd, 0xd9, 0x8f, 0xec, 0xef, 0xcd, 0x8e, 0xbc, 0x21, 0xe0, 0x58, - 0x51, 0xa0, 0xa7, 0x60, 0x68, 0x23, 0x5e, 0xdb, 0x6d, 0x93, 0xe9, 0x0a, 0xa3, 0x9d, 0x10, 0xb4, - 0x43, 0xcb, 0x4d, 0x0a, 0xc5, 0x02, 0x8b, 0x2e, 0x43, 0xad, 0xed, 0x44, 0x89, 0x97, 0x78, 0x61, - 0x30, 0x5d, 0xbd, 0x60, 0x5d, 0x1c, 0x5c, 0x38, 0x25, 0x48, 0x6b, 0x0d, 0x89, 0xc0, 0x29, 0x0d, - 0x6d, 0x46, 0x44, 0x1c, 0xf7, 0x76, 0xe0, 0xef, 0x4e, 0x0f, 0x5c, 0xb0, 0x2e, 0x8e, 0xa4, 0xcd, - 0xc0, 0x02, 0x8e, 0x15, 0x85, 0xfd, 0xbd, 0x0a, 0x8c, 0xcc, 0x6f, 0x6c, 0x78, 0x81, 0x97, 0xec, - 0xa2, 0x2f, 0xc3, 0x58, 0x10, 0xba, 0x44, 0xfe, 0x67, 0xbd, 0x18, 0xbd, 0xfa, 0xcc, 0xdc, 0x61, - 0xd2, 0x34, 0x77, 0x4b, 0x2b, 0xb1, 0x30, 0xb5, 0xbf, 0x37, 0x3b, 0xa6, 0x43, 0xb0, 0xc1, 0x11, - 0xbd, 0x05, 0xa3, 0xed, 0xd0, 0x55, 0x15, 0x54, 0x58, 0x05, 0x4f, 0x1f, 0x5e, 0x41, 0x23, 0x2d, - 0xb0, 0x30, 0xb9, 0xbf, 0x37, 0x3b, 0xaa, 0x01, 0xb0, 0xce, 0x0e, 0xf9, 0x30, 0x49, 0xff, 0x06, - 0x89, 0xa7, 0x6a, 0xa8, 0xb2, 0x1a, 0x9e, 0x2b, 0xae, 0x41, 0x2b, 0xb4, 0x70, 0x7a, 0x7f, 0x6f, - 0x76, 0x32, 0x03, 0xc4, 0x59, 0xd6, 0xf6, 0x57, 0x61, 0x62, 0x3e, 0x49, 0x9c, 0xd6, 0x16, 0x71, - 0xf9, 0xf7, 0x45, 0x2f, 0xc0, 0x40, 0xe0, 0x6c, 0x13, 0xf1, 0xf5, 0x2f, 0x88, 0x61, 0x1f, 0xb8, - 0xe5, 0x6c, 0x93, 0x83, 0xbd, 0xd9, 0xa9, 0x3b, 0x81, 0xf7, 0x6e, 0x47, 0xc8, 0x0c, 0x85, 0x61, - 0x46, 0x8d, 0xae, 0x02, 0xb8, 0x64, 0xc7, 0x6b, 0x91, 0x86, 0x93, 0x6c, 0x09, 0x69, 0x40, 0xa2, - 0x2c, 0xd4, 0x15, 0x06, 0x6b, 0x54, 0xf6, 0xd7, 0x2d, 0xa8, 0xcd, 0xef, 0x84, 0x9e, 0xdb, 0x08, - 0xdd, 0x18, 0x75, 0x60, 0xb2, 0x1d, 0x91, 0x0d, 0x12, 0x29, 0xd0, 0xb4, 0x75, 0xa1, 0x7a, 0x71, - 0xf4, 0xea, 0xd5, 0x82, 0x7e, 0x9b, 0x85, 0x96, 0x82, 0x24, 0xda, 0x5d, 0x78, 0x44, 0x54, 0x3d, - 0x99, 0xc1, 0xe2, 0x6c, 0x1d, 0xf6, 0x5f, 0xaf, 0xc0, 0xd9, 0xf9, 0xaf, 0x76, 0x22, 0x52, 0xf7, - 0xe2, 0x7b, 0xd9, 0xa9, 0xe0, 0x7a, 0xf1, 0xbd, 0x5b, 0xe9, 0x60, 0x28, 0x19, 0xac, 0x0b, 0x38, - 0x56, 0x14, 0xe8, 0x39, 0x18, 0xa6, 0xbf, 0xef, 0xe0, 0x15, 0xd1, 0xfb, 0xd3, 0x82, 0x78, 0xb4, - 0xee, 0x24, 0x4e, 0x9d, 0xa3, 0xb0, 0xa4, 0x41, 0xab, 0x30, 0xda, 0x72, 0x5a, 0x5b, 0x5e, 0xb0, - 0xb9, 0x1a, 0xba, 0x84, 0x7d, 0xe1, 0xda, 0xc2, 0xb3, 0x94, 0x7c, 0x31, 0x05, 0x1f, 0xec, 0xcd, - 0x4e, 0xf3, 0xb6, 0x09, 0x16, 0x1a, 0x0e, 0xeb, 0xe5, 0x91, 0xad, 0x26, 0xe2, 0x00, 0xe3, 0x04, - 0x39, 0x93, 0xf0, 0xa2, 0x36, 0xa7, 0x06, 0xd9, 0x9c, 0x1a, 0xeb, 0x31, 0x9f, 0xfe, 0xa9, 0x25, - 0xc6, 0x64, 0xd9, 0xf3, 0x4d, 0xf5, 0x70, 0x15, 0x20, 0x26, 0xad, 0x88, 0x24, 0xda, 0xa8, 0xa8, - 0xcf, 0xdc, 0x54, 0x18, 0xac, 0x51, 0xd1, 0xc9, 0x1f, 0x6f, 0x39, 0x11, 0x93, 0x16, 0x31, 0x36, - 0x6a, 0xf2, 0x37, 0x25, 0x02, 0xa7, 0x34, 0xc6, 0xe4, 0xaf, 0x16, 0x4e, 0xfe, 0x7f, 0x65, 0xc1, - 0xf0, 0x82, 0x17, 0xb8, 0x5e, 0xb0, 0x89, 0xde, 0x84, 0x91, 0x6d, 0x92, 0x38, 0xae, 0x93, 0x38, - 0x62, 0xde, 0x5f, 0x3c, 0x5c, 0x78, 0x6e, 0xaf, 0x7f, 0x85, 0xb4, 0x92, 0x55, 0x92, 0x38, 0x69, - 0x37, 0x52, 0x18, 0x56, 0xdc, 0xd0, 0x1d, 0x18, 0x4a, 0x9c, 0x68, 0x93, 0x24, 0x62, 0xba, 0x3f, - 0x57, 0x86, 0x2f, 0xa6, 0xa2, 0x46, 0x82, 0x16, 0x49, 0x15, 0xe3, 0x1a, 0x63, 0x82, 0x05, 0x33, - 0xbb, 0x05, 0x63, 0x8b, 0x4e, 0xdb, 0x59, 0xf7, 0x7c, 0x2f, 0xf1, 0x48, 0x8c, 0x3e, 0x01, 0x55, - 0xc7, 0x75, 0x99, 0xe0, 0xd7, 0x16, 0xce, 0xee, 0xef, 0xcd, 0x56, 0xe7, 0x5d, 0xf7, 0x60, 0x6f, - 0x16, 0x14, 0xd5, 0x2e, 0xa6, 0x14, 0xe8, 0x19, 0x18, 0x70, 0xa3, 0xb0, 0x3d, 0x5d, 0x61, 0x94, - 0xe7, 0xe8, 0x0c, 0xad, 0x47, 0x61, 0x3b, 0x43, 0xca, 0x68, 0xec, 0x7f, 0x57, 0x01, 0xb4, 0x48, - 0xda, 0x5b, 0xcb, 0x4d, 0xe3, 0x5b, 0x5e, 0x84, 0x91, 0xed, 0x30, 0xf0, 0x92, 0x30, 0x8a, 0x45, - 0x85, 0x4c, 0x1e, 0x56, 0x05, 0x0c, 0x2b, 0x2c, 0xba, 0x00, 0x03, 0xed, 0x74, 0x5a, 0x8f, 0x49, - 0x95, 0xc0, 0x26, 0x34, 0xc3, 0x50, 0x8a, 0x4e, 0x4c, 0x22, 0x21, 0xc7, 0x8a, 0xe2, 0x4e, 0x4c, - 0x22, 0xcc, 0x30, 0xa9, 0xe4, 0x50, 0x99, 0x12, 0x52, 0x9a, 0x91, 0x1c, 0x8a, 0xc1, 0x1a, 0x15, - 0x7a, 0x07, 0x6a, 0xfc, 0x1f, 0x26, 0x1b, 0x4c, 0x64, 0x0b, 0x95, 0xc1, 0xcd, 0xb0, 0xe5, 0xf8, - 0xd9, 0xc1, 0x1f, 0x67, 0x92, 0x26, 0x19, 0xe1, 0x94, 0xa7, 0x21, 0x69, 0x43, 0x85, 0x92, 0xf6, - 0xb7, 0x2d, 0x40, 0x8b, 0x5e, 0xe0, 0x92, 0xe8, 0x04, 0x96, 0xcc, 0xfe, 0x26, 0xc1, 0x1f, 0xd2, - 0xa6, 0x85, 0xdb, 0xed, 0x30, 0x20, 0x41, 0xb2, 0x18, 0x06, 0x2e, 0x5f, 0x46, 0x3f, 0x03, 0x03, - 0x09, 0xad, 0x8a, 0x37, 0xeb, 0x29, 0xf9, 0x59, 0x68, 0x05, 0x07, 0x7b, 0xb3, 0xe7, 0xba, 0x4b, - 0xb0, 0x26, 0xb0, 0x32, 0xe8, 0xd3, 0x30, 0x14, 0x27, 0x4e, 0xd2, 0x89, 0x45, 0x43, 0x3f, 0x26, - 0x1b, 0xda, 0x64, 0xd0, 0x83, 0xbd, 0xd9, 0x49, 0x55, 0x8c, 0x83, 0xb0, 0x28, 0x80, 0x9e, 0x86, - 0xe1, 0x6d, 0x12, 0xc7, 0xce, 0xa6, 0x54, 0x6c, 0x93, 0xa2, 0xec, 0xf0, 0x2a, 0x07, 0x63, 0x89, - 0x47, 0x4f, 0xc0, 0x20, 0x89, 0xa2, 0x30, 0x12, 0x12, 0x31, 0x2e, 0x08, 0x07, 0x97, 0x28, 0x10, - 0x73, 0x9c, 0xfd, 0x3b, 0x16, 0x4c, 0xaa, 0xb6, 0xf2, 0xba, 0x8e, 0x71, 0xaa, 0xbb, 0x00, 0x2d, - 0xd9, 0xb1, 0x98, 0x4d, 0xb0, 0xd1, 0xab, 0x9f, 0x3c, 0x9c, 0x77, 0xf7, 0x40, 0xa6, 0x75, 0x28, - 0x50, 0x8c, 0x35, 0xbe, 0xf6, 0x8f, 0x2d, 0x38, 0x9d, 0xe9, 0xd3, 0x4d, 0x2f, 0x4e, 0xd0, 0x5f, - 0xec, 0xea, 0xd7, 0xe5, 0x43, 0xea, 0xd6, 0xec, 0xd0, 0x39, 0x5a, 0x9c, 0x75, 0x4f, 0x09, 0x8a, - 0x84, 0x68, 0x9d, 0xc3, 0x30, 0xe8, 0x25, 0x64, 0x5b, 0xf6, 0xeb, 0xb9, 0x92, 0xfd, 0xe2, 0x0d, - 0x4c, 0x3f, 0xcf, 0x0a, 0xe5, 0x81, 0x39, 0x2b, 0xfb, 0x7f, 0x5b, 0x50, 0x5b, 0x0c, 0x83, 0x0d, - 0x6f, 0x73, 0xd5, 0x69, 0x1f, 0xe3, 0x87, 0x69, 0xc2, 0x00, 0xe3, 0xca, 0x9b, 0x7e, 0xa5, 0xa8, - 0xe9, 0xa2, 0x41, 0x73, 0x74, 0xf1, 0xe4, 0x56, 0x81, 0xd2, 0x4b, 0x14, 0x84, 0x19, 0xb3, 0x99, - 0x97, 0xa0, 0xa6, 0x08, 0xd0, 0x14, 0x54, 0xef, 0x11, 0x6e, 0x32, 0xd6, 0x30, 0xfd, 0x89, 0xce, - 0xc0, 0xe0, 0x8e, 0xe3, 0x77, 0xc4, 0x6c, 0xc5, 0xfc, 0xcf, 0x67, 0x2a, 0x2f, 0x5b, 0xf6, 0x0f, - 0x2c, 0x38, 0xa3, 0x2a, 0xb9, 0x41, 0x76, 0x9b, 0xc4, 0x27, 0xad, 0x24, 0x8c, 0xd0, 0x7b, 0x16, - 0x9c, 0xf1, 0x73, 0xf4, 0x90, 0x18, 0x8d, 0xa3, 0x68, 0xb0, 0xc7, 0x44, 0xc3, 0xcf, 0xe4, 0x61, - 0x71, 0x6e, 0x6d, 0xe8, 0x71, 0xde, 0x17, 0x3e, 0x79, 0x47, 0x05, 0x83, 0xea, 0x0d, 0xb2, 0xcb, - 0x3a, 0x46, 0x9b, 0x3f, 0xae, 0x9a, 0x7f, 0x12, 0x92, 0x77, 0xd3, 0x94, 0xbc, 0x4f, 0x94, 0xfc, - 0x7c, 0x3d, 0x64, 0xee, 0xef, 0x57, 0xe0, 0xac, 0xa2, 0x31, 0xd4, 0xf1, 0x87, 0x64, 0xf8, 0xfb, - 0xeb, 0xee, 0x0d, 0xb2, 0xbb, 0x16, 0xd2, 0xf5, 0x34, 0xbf, 0xbb, 0xe8, 0x0a, 0x8c, 0xba, 0x64, - 0xc3, 0xe9, 0xf8, 0x89, 0x32, 0x17, 0x07, 0xf9, 0x3e, 0xa2, 0x9e, 0x82, 0xb1, 0x4e, 0x63, 0xff, - 0x76, 0x8d, 0xcd, 0xca, 0xc4, 0xf1, 0x02, 0x12, 0xd1, 0x05, 0x5a, 0xb3, 0xea, 0xc7, 0x74, 0xab, - 0x5e, 0x58, 0xf0, 0x4f, 0xc0, 0xa0, 0xb7, 0x4d, 0x55, 0x76, 0xc5, 0xd4, 0xc4, 0x2b, 0x14, 0x88, - 0x39, 0x0e, 0x3d, 0x09, 0xc3, 0xad, 0x70, 0x7b, 0xdb, 0x09, 0xdc, 0xe9, 0x2a, 0x33, 0x19, 0x46, - 0xa9, 0x56, 0x5f, 0xe4, 0x20, 0x2c, 0x71, 0xe8, 0x31, 0x18, 0x70, 0xa2, 0xcd, 0x78, 0x7a, 0x80, - 0xd1, 0x8c, 0xd0, 0x9a, 0xe6, 0xa3, 0xcd, 0x18, 0x33, 0x28, 0x35, 0x05, 0xee, 0x87, 0xd1, 0x3d, - 0x2f, 0xd8, 0xac, 0x7b, 0x11, 0x5b, 0xd7, 0x35, 0x53, 0xe0, 0xae, 0xc2, 0x60, 0x8d, 0x0a, 0x35, - 0x60, 0xb0, 0x1d, 0x46, 0x49, 0x3c, 0x3d, 0xc4, 0x86, 0xf3, 0xd9, 0x42, 0xe9, 0xe1, 0xfd, 0x6e, - 0x84, 0x51, 0x92, 0x76, 0x85, 0xfe, 0x8b, 0x31, 0x67, 0x84, 0x16, 0xa1, 0x4a, 0x82, 0x9d, 0xe9, - 0x61, 0xc6, 0xef, 0xe3, 0x87, 0xf3, 0x5b, 0x0a, 0x76, 0xde, 0x70, 0xa2, 0x74, 0x16, 0x2d, 0x05, - 0x3b, 0x98, 0x96, 0x46, 0x2d, 0xa8, 0x49, 0xf7, 0x41, 0x3c, 0x3d, 0x52, 0x46, 0xc0, 0xb0, 0x20, - 0xc7, 0xe4, 0xdd, 0x8e, 0x17, 0x91, 0x6d, 0x12, 0x24, 0x71, 0x6a, 0x0f, 0x4b, 0x6c, 0x8c, 0x53, - 0xbe, 0xa8, 0x05, 0x63, 0xdc, 0x7c, 0x58, 0x0d, 0x3b, 0x41, 0x12, 0x4f, 0xd7, 0x58, 0x93, 0x0b, - 0x36, 0x9c, 0x6f, 0xa4, 0x25, 0x16, 0xce, 0x08, 0xf6, 0x63, 0x1a, 0x30, 0xc6, 0x06, 0x53, 0xf4, - 0x16, 0x8c, 0xfb, 0xde, 0x0e, 0x09, 0x48, 0x1c, 0x37, 0xa2, 0x70, 0x9d, 0x4c, 0x03, 0xeb, 0xcd, - 0x13, 0x45, 0x9b, 0xaf, 0x70, 0x9d, 0x2c, 0x9c, 0xda, 0xdf, 0x9b, 0x1d, 0xbf, 0xa9, 0x97, 0xc6, - 0x26, 0x33, 0xf4, 0x0e, 0x4c, 0x50, 0x5b, 0xc5, 0x4b, 0xd9, 0x8f, 0x96, 0x67, 0x8f, 0xf6, 0xf7, - 0x66, 0x27, 0xb0, 0x51, 0x1c, 0x67, 0xd8, 0xa1, 0x35, 0xa8, 0xf9, 0xde, 0x06, 0x69, 0xed, 0xb6, - 0x7c, 0x32, 0x3d, 0xc6, 0x78, 0x17, 0x4c, 0xb9, 0x9b, 0x92, 0x9c, 0xdb, 0x87, 0xea, 0x2f, 0x4e, - 0x19, 0xa1, 0x37, 0xe0, 0x5c, 0x42, 0xa2, 0x6d, 0x2f, 0x70, 0xe8, 0xa2, 0x2d, 0x8c, 0x17, 0xb6, - 0xc3, 0x1d, 0x67, 0x52, 0x7b, 0x5e, 0x0c, 0xec, 0xb9, 0xb5, 0x5c, 0x2a, 0xdc, 0xa3, 0x34, 0xba, - 0x0d, 0x93, 0x6c, 0x3e, 0x35, 0x3a, 0xbe, 0xdf, 0x08, 0x7d, 0xaf, 0xb5, 0x3b, 0x3d, 0xc1, 0x18, - 0x3e, 0x29, 0xf7, 0xad, 0x2b, 0x26, 0x9a, 0xda, 0xf5, 0xe9, 0x3f, 0x9c, 0x2d, 0x8d, 0x7c, 0x98, - 0x8c, 0x49, 0xab, 0x13, 0x79, 0xc9, 0x2e, 0x95, 0x7d, 0xf2, 0x20, 0x99, 0x9e, 0x2c, 0xb3, 0x4f, - 0x69, 0x9a, 0x85, 0xb8, 0xd3, 0x20, 0x03, 0xc4, 0x59, 0xd6, 0x54, 0x55, 0xc4, 0x89, 0xeb, 0x05, - 0xd3, 0x53, 0xcc, 0x30, 0x55, 0xf3, 0xab, 0x49, 0x81, 0x98, 0xe3, 0xd8, 0xb6, 0x8f, 0xfe, 0xb8, - 0x4d, 0x75, 0xef, 0x29, 0x46, 0x98, 0x6e, 0xfb, 0x24, 0x02, 0xa7, 0x34, 0x74, 0xc1, 0x4a, 0x92, - 0xdd, 0x69, 0xc4, 0x48, 0xd5, 0x54, 0x5b, 0x5b, 0xfb, 0x02, 0xa6, 0x70, 0x7b, 0x1d, 0x26, 0xd4, - 0xb4, 0x66, 0xa3, 0x83, 0x66, 0x61, 0x90, 0x6a, 0x2e, 0xb9, 0x7b, 0xa9, 0xd1, 0x26, 0x50, 0x85, - 0x16, 0x63, 0x0e, 0x67, 0x4d, 0xf0, 0xbe, 0x4a, 0x16, 0x76, 0x13, 0xc2, 0xad, 0xd8, 0xaa, 0xd6, - 0x04, 0x89, 0xc0, 0x29, 0x8d, 0xfd, 0x7f, 0xf9, 0xa2, 0x98, 0xea, 0x8e, 0x12, 0x7a, 0xf3, 0x12, - 0x8c, 0x6c, 0x85, 0x71, 0x42, 0xa9, 0x59, 0x1d, 0x83, 0xe9, 0x2a, 0x78, 0x5d, 0xc0, 0xb1, 0xa2, - 0x40, 0xaf, 0xc0, 0x78, 0x4b, 0xaf, 0x40, 0xa8, 0xf2, 0xb3, 0xa2, 0x88, 0x59, 0x3b, 0x36, 0x69, - 0xd1, 0xcb, 0x30, 0xc2, 0x5c, 0x79, 0xad, 0xd0, 0x17, 0xf6, 0xb2, 0x5c, 0x99, 0x46, 0x1a, 0x02, - 0x7e, 0xa0, 0xfd, 0xc6, 0x8a, 0x9a, 0xee, 0x3a, 0x68, 0x13, 0x56, 0x1a, 0x42, 0xdd, 0xaa, 0x5d, - 0xc7, 0x75, 0x06, 0xc5, 0x02, 0x6b, 0xff, 0x5a, 0x45, 0x1b, 0x65, 0x6a, 0xf4, 0x11, 0xf4, 0x45, - 0x18, 0xbe, 0xef, 0x78, 0x89, 0x17, 0x6c, 0x8a, 0x15, 0xf4, 0xf9, 0x92, 0xba, 0x97, 0x15, 0xbf, - 0xcb, 0x8b, 0xf2, 0x75, 0x42, 0xfc, 0xc1, 0x92, 0x21, 0xe5, 0x1d, 0x75, 0x82, 0x80, 0xf2, 0xae, - 0xf4, 0xcf, 0x1b, 0xf3, 0xa2, 0x9c, 0xb7, 0xf8, 0x83, 0x25, 0x43, 0xb4, 0x01, 0x20, 0x67, 0x1f, - 0x71, 0x85, 0x0b, 0xed, 0x53, 0xfd, 0xb0, 0x5f, 0x53, 0xa5, 0x17, 0x26, 0xe8, 0xca, 0x94, 0xfe, - 0xc7, 0x1a, 0x67, 0xbb, 0xc3, 0x0c, 0x91, 0xee, 0x66, 0xa1, 0xb7, 0xe8, 0x04, 0x70, 0xa2, 0x84, - 0xb8, 0xf3, 0x89, 0x18, 0xba, 0x67, 0x4b, 0x1a, 0x54, 0x6b, 0xde, 0x36, 0xd1, 0x67, 0x8b, 0xe0, - 0x82, 0x53, 0x86, 0xf6, 0xf7, 0xab, 0x30, 0xdd, 0xab, 0xbd, 0x54, 0x26, 0xc9, 0x03, 0x2f, 0x59, - 0xa4, 0xb6, 0x82, 0x65, 0xca, 0xe4, 0x92, 0x80, 0x63, 0x45, 0x41, 0x85, 0x23, 0xf6, 0x36, 0x03, - 0xc7, 0x17, 0xf2, 0xab, 0x84, 0xa3, 0xc9, 0xa0, 0x58, 0x60, 0x29, 0x5d, 0x44, 0x9c, 0x58, 0xb8, - 0x70, 0x35, 0x21, 0xc2, 0x0c, 0x8a, 0x05, 0x56, 0xdf, 0xfe, 0x0d, 0x14, 0x6c, 0xff, 0x8c, 0x31, - 0x1a, 0x7c, 0xc8, 0x63, 0x84, 0xde, 0x01, 0xd8, 0xf0, 0x02, 0x2f, 0xde, 0x62, 0xec, 0x87, 0xfa, - 0x67, 0xaf, 0xac, 0x92, 0x65, 0xc5, 0x06, 0x6b, 0x2c, 0xd1, 0x8b, 0x30, 0xaa, 0x66, 0xe8, 0x4a, - 0x7d, 0x7a, 0xd8, 0x74, 0xfc, 0xa5, 0xea, 0xaa, 0x8e, 0x75, 0x3a, 0xfb, 0x2b, 0x59, 0x91, 0x11, - 0x13, 0x43, 0x1b, 0x61, 0xab, 0xec, 0x08, 0x57, 0x0e, 0x1f, 0x61, 0xfb, 0xbf, 0x54, 0xe9, 0xde, - 0x59, 0xab, 0xac, 0x13, 0x97, 0x50, 0x6a, 0xaf, 0x53, 0x0d, 0xef, 0x24, 0x44, 0x4c, 0xcb, 0x4b, - 0xfd, 0xcc, 0x1b, 0x7d, 0x3d, 0xa0, 0xd3, 0x81, 0x73, 0x42, 0x5b, 0x50, 0xf3, 0x9d, 0x98, 0xed, - 0x24, 0x89, 0x98, 0x8e, 0xfd, 0xb1, 0x4d, 0xad, 0x70, 0x27, 0x4e, 0xb4, 0x05, 0x97, 0xd7, 0x92, - 0x32, 0xa7, 0xcb, 0x13, 0xb5, 0x0e, 0xe4, 0xc9, 0x81, 0x6a, 0x0e, 0x35, 0x21, 0x76, 0x31, 0xc7, - 0xa1, 0x97, 0x61, 0x2c, 0x22, 0x4c, 0x54, 0x16, 0xa9, 0x01, 0xc4, 0x84, 0x6f, 0x30, 0xb5, 0x94, - 0xb0, 0x86, 0xc3, 0x06, 0x65, 0x6a, 0x28, 0x0f, 0x1d, 0x62, 0x28, 0x3f, 0x0d, 0xc3, 0xec, 0x87, - 0x92, 0x0a, 0xf5, 0x85, 0x56, 0x38, 0x18, 0x4b, 0x7c, 0x56, 0x88, 0x46, 0x4a, 0x0a, 0xd1, 0x33, - 0x30, 0x51, 0x77, 0xc8, 0x76, 0x18, 0x2c, 0x05, 0x6e, 0x3b, 0xf4, 0x82, 0x04, 0x4d, 0xc3, 0x00, - 0x5b, 0x52, 0xf8, 0x8c, 0x1f, 0xa0, 0x1c, 0xf0, 0x00, 0x35, 0x76, 0xed, 0xff, 0x67, 0xc1, 0x78, - 0x9d, 0xf8, 0x24, 0x21, 0xb7, 0xdb, 0xcc, 0xfd, 0x80, 0x96, 0x01, 0x6d, 0x46, 0x4e, 0x8b, 0x34, - 0x48, 0xe4, 0x85, 0x6e, 0x93, 0xb4, 0xc2, 0x80, 0x39, 0xdc, 0xe9, 0x1a, 0x79, 0x6e, 0x7f, 0x6f, - 0x16, 0x5d, 0xeb, 0xc2, 0xe2, 0x9c, 0x12, 0xc8, 0x85, 0xf1, 0x76, 0x44, 0x0c, 0x7f, 0x89, 0x55, - 0x6c, 0x9f, 0x37, 0xf4, 0x22, 0xdc, 0x7c, 0x34, 0x40, 0xd8, 0x64, 0x8a, 0x3e, 0x07, 0x53, 0x61, - 0xd4, 0xde, 0x72, 0x82, 0x3a, 0x69, 0x93, 0xc0, 0xa5, 0x36, 0xb3, 0x70, 0x8a, 0x9d, 0xd9, 0xdf, - 0x9b, 0x9d, 0xba, 0x9d, 0xc1, 0xe1, 0x2e, 0x6a, 0xfb, 0x57, 0x2a, 0x70, 0xb6, 0x1e, 0xde, 0x0f, - 0xee, 0x3b, 0x91, 0x3b, 0xdf, 0x58, 0xe1, 0x86, 0x30, 0x73, 0x32, 0x4a, 0xe7, 0xa6, 0xd5, 0xd3, - 0xb9, 0xf9, 0x25, 0x18, 0xd9, 0xf0, 0x88, 0xef, 0x62, 0xb2, 0x21, 0xba, 0x77, 0xa5, 0x8c, 0x47, - 0x63, 0x99, 0x96, 0x91, 0x5e, 0x01, 0xee, 0x5b, 0x5d, 0x16, 0x6c, 0xb0, 0x62, 0x88, 0x3a, 0x30, - 0x25, 0x2d, 0x7d, 0x89, 0x15, 0xb3, 0xe3, 0xf9, 0x72, 0x1b, 0x09, 0xb3, 0x1a, 0x36, 0x1e, 0x38, - 0xc3, 0x10, 0x77, 0x55, 0x41, 0x77, 0x68, 0xdb, 0x74, 0x75, 0x18, 0x60, 0xb2, 0xc2, 0x76, 0x68, - 0x6c, 0x0b, 0xc9, 0xa0, 0xf6, 0x3f, 0xb6, 0xe0, 0x91, 0xae, 0xd1, 0x12, 0xfb, 0xeb, 0x37, 0xe5, - 0xc6, 0x96, 0x9f, 0xce, 0x14, 0xb4, 0x32, 0x77, 0xcc, 0xcb, 0x6d, 0x72, 0x2b, 0x25, 0x36, 0xb9, - 0xb7, 0xe1, 0xcc, 0xd2, 0x76, 0x3b, 0xd9, 0xad, 0x7b, 0xa6, 0x4f, 0xf6, 0x25, 0x18, 0xda, 0x26, - 0xae, 0xd7, 0xd9, 0x16, 0x9f, 0x75, 0x56, 0x2a, 0xd2, 0x55, 0x06, 0x3d, 0xd8, 0x9b, 0x1d, 0x6f, - 0x26, 0x61, 0xe4, 0x6c, 0x12, 0x0e, 0xc0, 0x82, 0xdc, 0x7e, 0xdf, 0x82, 0x49, 0x39, 0xa1, 0xe6, - 0x5d, 0x37, 0x22, 0x71, 0x8c, 0x66, 0xa0, 0xe2, 0xb5, 0x05, 0x23, 0x10, 0x8c, 0x2a, 0x2b, 0x0d, - 0x5c, 0xf1, 0xda, 0xe8, 0x8b, 0x50, 0xe3, 0xae, 0xfc, 0x54, 0x38, 0xfa, 0x3c, 0x1a, 0x60, 0xbb, - 0x8f, 0x35, 0xc9, 0x03, 0xa7, 0xec, 0xa4, 0x65, 0xc9, 0x54, 0x75, 0xd5, 0x74, 0x2c, 0x5f, 0x17, - 0x70, 0xac, 0x28, 0xd0, 0x45, 0x18, 0x09, 0x42, 0x97, 0x9f, 0xb2, 0xf0, 0x65, 0x97, 0x89, 0xdc, - 0x2d, 0x01, 0xc3, 0x0a, 0x6b, 0x7f, 0xc3, 0x82, 0x31, 0xd9, 0xc7, 0x92, 0x46, 0x2e, 0x9d, 0x24, - 0xa9, 0x81, 0x9b, 0x4e, 0x12, 0x6a, 0xa4, 0x32, 0x8c, 0x61, 0x9b, 0x56, 0xfb, 0xb1, 0x4d, 0xed, - 0xef, 0x57, 0x60, 0x42, 0x36, 0xa7, 0xd9, 0x59, 0x8f, 0x49, 0x82, 0xde, 0x86, 0x9a, 0xc3, 0x07, - 0x9f, 0x48, 0x39, 0x7b, 0xae, 0x68, 0x87, 0x6e, 0x7c, 0xb3, 0xd4, 0x30, 0x98, 0x97, 0x7c, 0x70, - 0xca, 0x12, 0xed, 0xc0, 0xa9, 0x20, 0x4c, 0xd8, 0x7a, 0xa0, 0xf0, 0xe5, 0x3c, 0xa2, 0xd9, 0x7a, - 0x1e, 0x15, 0xf5, 0x9c, 0xba, 0x95, 0xe5, 0x87, 0xbb, 0xab, 0x40, 0xb7, 0xa5, 0x17, 0xa3, 0xca, - 0xea, 0x7a, 0xa6, 0x5c, 0x5d, 0xbd, 0x9d, 0x18, 0xf6, 0x0f, 0x2d, 0xa8, 0x49, 0xb2, 0xe3, 0xf4, - 0x89, 0xdf, 0x85, 0xe1, 0x98, 0x7d, 0x1a, 0x39, 0x4c, 0x97, 0xca, 0x35, 0x9d, 0x7f, 0xcf, 0x74, - 0xf1, 0xe3, 0xff, 0x63, 0x2c, 0xb9, 0x31, 0x37, 0xa4, 0xea, 0xc0, 0x87, 0xcf, 0x0d, 0xa9, 0x9a, - 0xd6, 0xc3, 0x0d, 0xf9, 0xcb, 0x16, 0x0c, 0x71, 0xe7, 0x50, 0x39, 0x0f, 0x9b, 0xe6, 0x4b, 0x4e, - 0x39, 0xbe, 0x41, 0x81, 0xc2, 0xb5, 0x8c, 0xee, 0x42, 0x8d, 0xfd, 0x58, 0x8e, 0xc2, 0x6d, 0xb1, - 0x10, 0x3c, 0x53, 0xc6, 0x39, 0xc5, 0x15, 0x1f, 0xd7, 0x26, 0x6f, 0x48, 0x06, 0x38, 0xe5, 0x65, - 0xff, 0xa0, 0x4a, 0x67, 0x7d, 0x4a, 0x6a, 0x2c, 0x6b, 0xd6, 0x49, 0x2c, 0x6b, 0x95, 0xe3, 0x5f, - 0xd6, 0xde, 0x85, 0xc9, 0x96, 0xe6, 0x93, 0x4f, 0x17, 0xd3, 0xab, 0x25, 0xdd, 0xcd, 0x9a, 0x23, - 0x9f, 0x3b, 0x43, 0x16, 0x4d, 0x76, 0x38, 0xcb, 0x1f, 0x11, 0x18, 0xe3, 0x07, 0x8a, 0xa2, 0xbe, - 0x81, 0x42, 0x99, 0xe5, 0x7e, 0x17, 0x5e, 0x42, 0x55, 0xc6, 0x82, 0x4e, 0x9a, 0x1a, 0x23, 0x6c, - 0xb0, 0xb5, 0xff, 0xe6, 0x20, 0x0c, 0x2e, 0xed, 0x90, 0x20, 0x39, 0xc6, 0x59, 0xbe, 0x0d, 0x13, - 0x5e, 0xb0, 0x13, 0xfa, 0x3b, 0xc4, 0xe5, 0xf8, 0xa3, 0xad, 0x68, 0xe7, 0x44, 0x25, 0x13, 0x2b, - 0x06, 0x33, 0x9c, 0x61, 0x7e, 0x1c, 0xfb, 0xc9, 0xd7, 0x61, 0x88, 0x4b, 0x84, 0xd8, 0x4c, 0x16, - 0x38, 0x49, 0xd9, 0x80, 0x8a, 0x99, 0x93, 0xee, 0x7a, 0xb9, 0x7f, 0x56, 0x30, 0x42, 0xf7, 0x60, - 0x62, 0xc3, 0x8b, 0xe2, 0x84, 0x6e, 0x08, 0xe3, 0xc4, 0xd9, 0x6e, 0x1f, 0x65, 0x23, 0xa9, 0x86, - 0x64, 0xd9, 0x60, 0x85, 0x33, 0xac, 0xd1, 0x16, 0x8c, 0xd3, 0x7d, 0x4c, 0x5a, 0xd7, 0x70, 0xff, - 0x75, 0x29, 0x5f, 0xd2, 0x4d, 0x9d, 0x13, 0x36, 0x19, 0x53, 0x65, 0xd4, 0x62, 0x1b, 0x9f, 0x11, - 0xb6, 0xa4, 0x2b, 0x65, 0xc4, 0x77, 0x3c, 0x1c, 0x47, 0x75, 0x1a, 0x3b, 0x3f, 0xae, 0x99, 0x3a, - 0x2d, 0x3d, 0x25, 0xb6, 0xbf, 0x4b, 0x17, 0x20, 0x3a, 0x8a, 0x27, 0xa1, 0xbb, 0xaf, 0x9b, 0xba, - 0xfb, 0x89, 0x12, 0x1f, 0xb7, 0x87, 0xde, 0xfe, 0x32, 0x8c, 0x6a, 0xdf, 0x1e, 0x5d, 0x86, 0x5a, - 0x4b, 0x1e, 0x75, 0x0a, 0x05, 0xae, 0x0c, 0x08, 0x75, 0x06, 0x8a, 0x53, 0x1a, 0x3a, 0x30, 0xd4, - 0xf0, 0xca, 0x46, 0x44, 0x50, 0xb3, 0x0c, 0x33, 0x8c, 0xfd, 0x3c, 0xc0, 0xd2, 0x03, 0xd2, 0x9a, - 0x6f, 0xb1, 0x83, 0x78, 0xed, 0xdc, 0xc4, 0xea, 0x7d, 0x6e, 0x62, 0x7f, 0xc7, 0x82, 0x89, 0xe5, - 0x45, 0xc3, 0x92, 0x9d, 0x03, 0xe0, 0x16, 0xe1, 0xdd, 0xbb, 0xb7, 0xa4, 0xa7, 0x93, 0xbb, 0xa3, - 0x14, 0x14, 0x6b, 0x14, 0xe8, 0x51, 0xa8, 0xfa, 0x9d, 0x40, 0x18, 0x6a, 0xc3, 0xfb, 0x7b, 0xb3, - 0xd5, 0x9b, 0x9d, 0x00, 0x53, 0x98, 0x16, 0x7a, 0x50, 0x2d, 0x1d, 0x7a, 0x50, 0x1c, 0x7c, 0xf7, - 0xad, 0x2a, 0x4c, 0x2d, 0xfb, 0xe4, 0x81, 0xd1, 0xea, 0xa7, 0x60, 0xc8, 0x8d, 0xbc, 0x1d, 0x12, - 0x65, 0x1d, 0x19, 0x75, 0x06, 0xc5, 0x02, 0x5b, 0x3a, 0x1a, 0xc2, 0x88, 0x04, 0xa9, 0x1e, 0x73, - 0x24, 0x48, 0x61, 0x9f, 0xd1, 0x06, 0x0c, 0x87, 0x7c, 0x23, 0x3d, 0x3d, 0xc8, 0x44, 0xf1, 0x95, - 0xc3, 0x1b, 0x93, 0x1d, 0x9f, 0x39, 0xb1, 0x0d, 0xe7, 0xc7, 0xd2, 0x4a, 0x9d, 0x09, 0x28, 0x96, - 0xcc, 0x67, 0x3e, 0x03, 0x63, 0x3a, 0x65, 0x5f, 0xe7, 0xd3, 0x3f, 0x67, 0xc1, 0xe9, 0x65, 0x3f, - 0x6c, 0xdd, 0xcb, 0x84, 0xab, 0xbc, 0x08, 0xa3, 0x74, 0x32, 0xc5, 0x46, 0x0c, 0x97, 0x11, 0xac, - 0x26, 0x50, 0x58, 0xa7, 0xd3, 0x8a, 0xdd, 0xb9, 0xb3, 0x52, 0xcf, 0x8b, 0x71, 0x13, 0x28, 0xac, - 0xd3, 0xd9, 0xff, 0xd9, 0x82, 0xc7, 0xaf, 0x2d, 0x2e, 0x35, 0xe8, 0x44, 0x8f, 0x13, 0x12, 0x24, - 0x5d, 0x61, 0x76, 0x4f, 0xc1, 0x50, 0xdb, 0xd5, 0x9a, 0xa2, 0x44, 0xa0, 0x51, 0x67, 0xad, 0x10, - 0xd8, 0x0f, 0x4b, 0xac, 0xe9, 0x2f, 0x5b, 0x70, 0xfa, 0x9a, 0x97, 0x60, 0xd2, 0x0e, 0xb3, 0x91, - 0x71, 0x11, 0x69, 0x87, 0xb1, 0x97, 0x84, 0xd1, 0x6e, 0x36, 0x32, 0x0e, 0x2b, 0x0c, 0xd6, 0xa8, - 0x78, 0xcd, 0x3b, 0x1e, 0x55, 0x81, 0xa2, 0x53, 0x5a, 0xcd, 0x1c, 0x8e, 0x15, 0x05, 0xed, 0x98, - 0xeb, 0x45, 0xcc, 0x5a, 0xd8, 0x15, 0x33, 0x58, 0x75, 0xac, 0x2e, 0x11, 0x38, 0xa5, 0xb1, 0xff, - 0xae, 0x05, 0x67, 0xaf, 0xf9, 0x9d, 0x38, 0x21, 0xd1, 0x46, 0x6c, 0x34, 0xf6, 0x79, 0xa8, 0x11, - 0x69, 0xd9, 0x8a, 0xb6, 0xaa, 0x55, 0x43, 0x99, 0xbc, 0x3c, 0x2c, 0x4f, 0xd1, 0x95, 0x88, 0x02, - 0xeb, 0x2f, 0x66, 0xe9, 0x5f, 0x57, 0x60, 0xfc, 0xfa, 0xda, 0x5a, 0xe3, 0x1a, 0x49, 0x84, 0x96, - 0x2c, 0x76, 0xc5, 0x34, 0xb4, 0x7d, 0xe8, 0xe8, 0xd5, 0xb9, 0x1e, 0xb3, 0xae, 0x93, 0x78, 0xfe, - 0x1c, 0x8f, 0x82, 0x9e, 0x5b, 0x09, 0x92, 0xdb, 0x51, 0x33, 0x89, 0xbc, 0x60, 0x33, 0x77, 0xdf, - 0x2a, 0x35, 0x79, 0xb5, 0x97, 0x26, 0x47, 0xcf, 0xc3, 0x10, 0x0b, 0xc2, 0x96, 0xd6, 0xc7, 0x47, - 0x95, 0xa1, 0xc0, 0xa0, 0x07, 0x7b, 0xb3, 0xb5, 0x3b, 0x78, 0x85, 0xff, 0xc1, 0x82, 0x14, 0xbd, - 0x03, 0xa3, 0x5b, 0x49, 0xd2, 0xbe, 0x4e, 0x1c, 0x97, 0x44, 0x52, 0x4b, 0x14, 0xd8, 0x69, 0x74, - 0x30, 0x78, 0x81, 0x74, 0x62, 0xa5, 0xb0, 0x18, 0xeb, 0x1c, 0xed, 0x26, 0x40, 0x8a, 0x7b, 0x48, - 0x9b, 0x0f, 0xfb, 0x2f, 0x57, 0x60, 0xf8, 0xba, 0x13, 0xb8, 0x3e, 0x89, 0xd0, 0x32, 0x0c, 0x90, - 0x07, 0xa4, 0x55, 0xce, 0xc4, 0x4c, 0x97, 0x3a, 0xee, 0x4b, 0xa2, 0xff, 0x31, 0x2b, 0x8f, 0x30, - 0x0c, 0xd3, 0x76, 0x5f, 0x53, 0xa1, 0x93, 0xcf, 0x16, 0x8f, 0x82, 0x12, 0x09, 0xbe, 0x4e, 0x0a, - 0x10, 0x96, 0x8c, 0x98, 0xd7, 0xa5, 0xd5, 0x6e, 0x52, 0xe5, 0x96, 0x94, 0x8b, 0x8e, 0x5e, 0x5b, - 0x6c, 0x70, 0x72, 0xc1, 0x97, 0x7b, 0x5d, 0x24, 0x10, 0xa7, 0xec, 0xec, 0x97, 0xe1, 0x0c, 0x3b, - 0xb7, 0x73, 0x92, 0x2d, 0x63, 0xce, 0x14, 0x0a, 0xa7, 0xfd, 0x0f, 0x2a, 0x70, 0x6a, 0xa5, 0xb9, - 0xd8, 0x34, 0xfd, 0x65, 0x2f, 0xc3, 0x18, 0x5f, 0x9e, 0xa9, 0xd0, 0x39, 0xbe, 0x28, 0xaf, 0x1c, - 0xcd, 0x6b, 0x1a, 0x0e, 0x1b, 0x94, 0xe8, 0x71, 0xa8, 0x7a, 0xef, 0x06, 0xd9, 0x08, 0x9e, 0x95, - 0xd7, 0x6f, 0x61, 0x0a, 0xa7, 0x68, 0xba, 0xd2, 0x73, 0x15, 0xa7, 0xd0, 0x6a, 0xb5, 0x7f, 0x0d, - 0x26, 0xbc, 0xb8, 0x15, 0x7b, 0x2b, 0x01, 0x9d, 0xff, 0x4e, 0x4b, 0x8a, 0x6f, 0x6a, 0x9d, 0xd3, - 0xa6, 0x2a, 0x2c, 0xce, 0x50, 0x6b, 0xfa, 0x76, 0xb0, 0xb4, 0xb5, 0x50, 0x1c, 0x43, 0xf9, 0x15, - 0xa8, 0xa9, 0x58, 0x17, 0x19, 0xa2, 0x64, 0xe5, 0x87, 0x28, 0x95, 0x50, 0x38, 0xd2, 0x8b, 0x59, - 0xcd, 0xf5, 0x62, 0xfe, 0x33, 0x0b, 0xd2, 0x63, 0x7d, 0x84, 0xa1, 0xd6, 0x0e, 0xd9, 0x11, 0x41, - 0x24, 0x8f, 0xe3, 0x9e, 0x2c, 0x90, 0x44, 0x3e, 0x13, 0xb8, 0xac, 0x34, 0x64, 0x59, 0x9c, 0xb2, - 0x41, 0x37, 0x61, 0xb8, 0x1d, 0x91, 0x66, 0xc2, 0x02, 0x71, 0xfb, 0xe0, 0xc8, 0xa4, 0xba, 0xc1, - 0x4b, 0x62, 0xc9, 0xc2, 0xfe, 0x0d, 0x0b, 0xe0, 0xa6, 0xb7, 0xed, 0x25, 0xd8, 0x09, 0x36, 0xc9, - 0x31, 0xee, 0xf3, 0x6e, 0xc1, 0x40, 0xdc, 0x26, 0xad, 0x72, 0x87, 0x3b, 0x69, 0x8b, 0x9a, 0x6d, - 0xd2, 0x4a, 0x3f, 0x03, 0xfd, 0x87, 0x19, 0x1f, 0xfb, 0x57, 0x01, 0x26, 0x52, 0x32, 0x6a, 0x68, - 0xa3, 0xe7, 0x8c, 0xc8, 0xd3, 0x47, 0x33, 0x91, 0xa7, 0x35, 0x46, 0xad, 0x05, 0x9b, 0x26, 0x50, - 0xdd, 0x76, 0x1e, 0x08, 0xbb, 0xfe, 0xc5, 0xb2, 0x0d, 0xa2, 0x35, 0xcd, 0xad, 0x3a, 0x0f, 0xb8, - 0x19, 0xf5, 0xac, 0x14, 0xa0, 0x55, 0xe7, 0xc1, 0x01, 0x3f, 0xc2, 0x61, 0x33, 0x90, 0x6e, 0x24, - 0xbe, 0xfe, 0x5f, 0xd3, 0xff, 0x4c, 0x29, 0xd2, 0xea, 0x58, 0xad, 0x5e, 0x20, 0x9c, 0x71, 0x7d, - 0xd6, 0xea, 0x05, 0xd9, 0x5a, 0xbd, 0xa0, 0x44, 0xad, 0x5e, 0x80, 0xde, 0xb3, 0x60, 0x58, 0xf8, - 0xb0, 0x59, 0x80, 0xd4, 0xe8, 0xd5, 0x4f, 0xf7, 0x55, 0xb5, 0x70, 0x86, 0xf3, 0xea, 0x2f, 0x4b, - 0xdb, 0x51, 0x40, 0x0b, 0x9b, 0x20, 0xab, 0x46, 0xdf, 0xb6, 0x60, 0x42, 0xfc, 0xc6, 0xe4, 0xdd, - 0x0e, 0x89, 0x13, 0xb1, 0x4a, 0x7d, 0xee, 0x28, 0xad, 0x11, 0x2c, 0x78, 0xa3, 0x3e, 0x25, 0x55, - 0x8c, 0x89, 0x2c, 0x6c, 0x5b, 0xa6, 0x3d, 0xe8, 0x7b, 0x16, 0x9c, 0xd9, 0x76, 0x1e, 0xf0, 0x1a, - 0x39, 0x0c, 0x3b, 0x89, 0x17, 0x8a, 0x20, 0xb0, 0xe5, 0x7e, 0xe5, 0xa4, 0x8b, 0x11, 0x6f, 0xee, - 0xab, 0xf2, 0x60, 0x31, 0x8f, 0xa4, 0xb0, 0xd1, 0xb9, 0x2d, 0x9c, 0x71, 0x61, 0x44, 0x0a, 0x66, - 0x8e, 0xd5, 0xbe, 0xa0, 0x2f, 0xc6, 0x87, 0xcf, 0x40, 0xe9, 0xe2, 0x9a, 0x7b, 0xbd, 0xe3, 0x04, - 0x89, 0x97, 0xec, 0x6a, 0x36, 0x3e, 0xab, 0x45, 0x08, 0xe2, 0x31, 0xd6, 0xb2, 0x05, 0x63, 0xba, - 0xcc, 0x1d, 0x63, 0x4d, 0x21, 0x9c, 0xce, 0x91, 0xa7, 0x63, 0xac, 0xb0, 0x03, 0x8f, 0xf6, 0x94, - 0x8b, 0xe3, 0xab, 0xd6, 0xfe, 0xa1, 0xa5, 0x2b, 0xcc, 0x93, 0x70, 0x9d, 0xac, 0x9a, 0xae, 0x93, - 0x8b, 0x65, 0xa7, 0x4e, 0x0f, 0xff, 0xc9, 0x86, 0xde, 0x7e, 0xba, 0x12, 0xa0, 0x35, 0x18, 0xf2, - 0x29, 0x44, 0x9e, 0xd7, 0x5c, 0xea, 0x67, 0x72, 0xa6, 0xc6, 0x05, 0x83, 0xc7, 0x58, 0xf0, 0xb2, - 0x7f, 0xd3, 0x82, 0x81, 0x93, 0x18, 0x9e, 0x86, 0x39, 0x3c, 0xbd, 0x4c, 0x54, 0x71, 0x29, 0x73, - 0x0e, 0x3b, 0xf7, 0x97, 0x1e, 0x24, 0x24, 0x88, 0x99, 0x29, 0x99, 0x3b, 0x42, 0xbf, 0x52, 0x81, - 0x51, 0x5a, 0x91, 0x3c, 0x70, 0x7f, 0x05, 0xc6, 0x7d, 0x67, 0x9d, 0xf8, 0xd2, 0xe1, 0x9b, 0xdd, - 0x76, 0xdd, 0xd4, 0x91, 0xd8, 0xa4, 0xa5, 0x85, 0x37, 0x74, 0x7f, 0xb8, 0x30, 0x89, 0x54, 0x61, - 0xc3, 0x59, 0x8e, 0x4d, 0x5a, 0x6a, 0xf9, 0xdf, 0x77, 0x92, 0xd6, 0x96, 0xd8, 0x92, 0xa9, 0xe6, - 0xde, 0xa5, 0x40, 0xcc, 0x71, 0x68, 0x1e, 0x26, 0xa5, 0xc4, 0xbe, 0xc1, 0x87, 0x4e, 0x98, 0x8b, - 0xea, 0x26, 0x1d, 0x36, 0xd1, 0x38, 0x4b, 0x8f, 0x3e, 0x03, 0x13, 0x74, 0x70, 0xc2, 0x4e, 0x22, - 0xc3, 0x09, 0x06, 0x59, 0x38, 0x01, 0x0b, 0xdf, 0x5c, 0x33, 0x30, 0x38, 0x43, 0x69, 0xbf, 0x03, - 0xa7, 0x6f, 0x86, 0x8e, 0xbb, 0xe0, 0xf8, 0x4e, 0xd0, 0x22, 0xd1, 0x4a, 0xb0, 0x59, 0x78, 0xf2, - 0xaa, 0x9f, 0x8e, 0x56, 0x8a, 0x4e, 0x47, 0xed, 0x08, 0x90, 0x5e, 0x81, 0x08, 0x84, 0x79, 0x0b, - 0x86, 0x3d, 0x5e, 0x95, 0x90, 0xda, 0x2b, 0x45, 0x4e, 0xa5, 0xae, 0x36, 0x6a, 0x81, 0x1d, 0x1c, - 0x80, 0x25, 0x4b, 0xba, 0x93, 0xc8, 0xf3, 0x42, 0x15, 0x6f, 0xd6, 0xec, 0xbf, 0x6a, 0xc1, 0xe4, - 0xad, 0xcc, 0x75, 0xad, 0xa7, 0x60, 0x28, 0x26, 0x51, 0x8e, 0x4b, 0xad, 0xc9, 0xa0, 0x58, 0x60, - 0x1f, 0xfa, 0x36, 0xfd, 0x17, 0x2b, 0x50, 0x63, 0x51, 0x95, 0x6d, 0xa7, 0x75, 0x9c, 0x46, 0xe9, - 0xaa, 0x61, 0x94, 0x16, 0x6c, 0x12, 0x55, 0x83, 0x7a, 0xd9, 0xa4, 0xe8, 0x8e, 0xba, 0xbe, 0x54, - 0x6a, 0x7f, 0x98, 0x32, 0xe4, 0x37, 0x5d, 0x26, 0xcc, 0xdb, 0x4e, 0xf2, 0x6a, 0x13, 0x3b, 0xaf, - 0x54, 0xb4, 0x1f, 0xbe, 0xf3, 0x4a, 0xd5, 0xb4, 0x1e, 0x5a, 0xa9, 0xa1, 0xb5, 0x9e, 0xa9, 0xed, - 0xcf, 0xb2, 0x10, 0x39, 0xc7, 0xf7, 0xbe, 0x4a, 0xd4, 0x35, 0xc0, 0x59, 0x11, 0xf1, 0x26, 0xa0, - 0x07, 0x4c, 0xc1, 0x88, 0x7f, 0xfc, 0x76, 0x67, 0x5a, 0xc4, 0xbe, 0x0e, 0x93, 0x99, 0xb1, 0x43, - 0x2f, 0xc2, 0x60, 0x7b, 0xcb, 0x89, 0x49, 0x26, 0xf6, 0x62, 0xb0, 0x41, 0x81, 0x07, 0x7b, 0xb3, - 0x13, 0xaa, 0x00, 0x83, 0x60, 0x4e, 0x6d, 0xff, 0x89, 0x05, 0x03, 0xb7, 0x42, 0xf7, 0x38, 0x65, - 0xec, 0xba, 0x21, 0x63, 0x4f, 0x15, 0xdf, 0x09, 0xef, 0x29, 0x5e, 0x8d, 0x8c, 0x78, 0x5d, 0x2c, - 0xc1, 0xeb, 0x70, 0xc9, 0xda, 0x86, 0x51, 0x76, 0xe7, 0x5c, 0x04, 0x9d, 0x3c, 0x6f, 0x6c, 0xa0, - 0x66, 0x33, 0x1b, 0xa8, 0x49, 0x8d, 0x54, 0xdb, 0x46, 0x3d, 0x0d, 0xc3, 0x22, 0xc8, 0x21, 0x1b, - 0x17, 0x28, 0x68, 0xb1, 0xc4, 0xdb, 0xbf, 0x5e, 0x05, 0xe3, 0x8e, 0x3b, 0xfa, 0x91, 0x05, 0x73, - 0x11, 0xbf, 0x94, 0xe0, 0xd6, 0x3b, 0x91, 0x17, 0x6c, 0x36, 0x5b, 0x5b, 0xc4, 0xed, 0xf8, 0x5e, - 0xb0, 0xb9, 0xb2, 0x19, 0x84, 0x0a, 0xbc, 0xf4, 0x80, 0xb4, 0x3a, 0xcc, 0xbb, 0x5a, 0xfa, 0x6a, - 0xbd, 0x3a, 0xe5, 0xbc, 0xba, 0xbf, 0x37, 0x3b, 0x87, 0xfb, 0xaa, 0x05, 0xf7, 0xd9, 0x2a, 0xf4, - 0xfb, 0x16, 0x5c, 0xe6, 0xb7, 0xbc, 0xcb, 0xf7, 0xa4, 0xd4, 0xc6, 0xb3, 0x21, 0x99, 0xa6, 0xec, - 0xd6, 0x48, 0xb4, 0xbd, 0xf0, 0x92, 0x18, 0xe4, 0xcb, 0x8d, 0xfe, 0x6a, 0xc5, 0xfd, 0x36, 0xd3, - 0xfe, 0xb7, 0x55, 0x18, 0xa7, 0xe3, 0x99, 0xde, 0xf0, 0x7c, 0xd1, 0x10, 0x93, 0x8f, 0x65, 0xc4, - 0xe4, 0x94, 0x41, 0xfc, 0x70, 0x2e, 0x77, 0x26, 0x70, 0xca, 0x77, 0xe2, 0xe4, 0x3a, 0x71, 0xa2, - 0x64, 0x9d, 0x38, 0xec, 0x48, 0x51, 0x4c, 0x82, 0xbe, 0x8e, 0x29, 0x55, 0xe4, 0xcc, 0xcd, 0x2c, - 0x37, 0xdc, 0x5d, 0x01, 0xba, 0x0f, 0x88, 0x9d, 0x5f, 0x46, 0x4e, 0x10, 0xf3, 0xce, 0x78, 0xc2, - 0x21, 0xdb, 0x67, 0xb5, 0x33, 0xa2, 0x5a, 0x74, 0xb3, 0x8b, 0x1d, 0xce, 0xa9, 0x42, 0x3b, 0xa4, - 0x1e, 0x2c, 0x7b, 0x48, 0x3d, 0x54, 0x10, 0x92, 0xfb, 0xf3, 0x16, 0x9c, 0xa6, 0x1f, 0xc6, 0x0c, - 0xdf, 0x8c, 0x51, 0x08, 0x93, 0xb4, 0x07, 0x3e, 0x49, 0x24, 0x4c, 0xcc, 0xb0, 0x02, 0x5b, 0xda, - 0xe4, 0x93, 0x5a, 0x6c, 0x37, 0x4c, 0x66, 0x38, 0xcb, 0xdd, 0xfe, 0x75, 0x0b, 0x58, 0x7c, 0xd8, - 0x49, 0xac, 0x63, 0xd7, 0xcc, 0x75, 0xcc, 0x2e, 0x56, 0x1a, 0x3d, 0x96, 0xb0, 0x17, 0x60, 0x8a, - 0x62, 0x1b, 0x51, 0xf8, 0x60, 0x57, 0x1a, 0xd7, 0xc5, 0xbe, 0xd9, 0xf7, 0x2a, 0x7c, 0xe6, 0xa8, - 0x0b, 0x56, 0xe8, 0x17, 0x2c, 0x18, 0x69, 0x39, 0x6d, 0xa7, 0xc5, 0x93, 0x84, 0x94, 0xf0, 0xc3, - 0x18, 0xe5, 0xe7, 0x16, 0x45, 0x59, 0xee, 0x43, 0xf8, 0xa4, 0xec, 0xba, 0x04, 0x17, 0xfa, 0x0d, - 0x54, 0xe5, 0x33, 0x1e, 0x8c, 0x1b, 0xcc, 0x8e, 0x71, 0xe3, 0xf9, 0x0b, 0x16, 0xd7, 0xfa, 0x6a, - 0x73, 0x70, 0x1f, 0x4e, 0x05, 0xda, 0x7f, 0xaa, 0xcf, 0xa4, 0x2d, 0x3c, 0x57, 0x5e, 0xaf, 0x33, - 0x35, 0xa8, 0x85, 0xc2, 0x65, 0x18, 0xe2, 0xee, 0x3a, 0xec, 0x7f, 0x68, 0xc1, 0x23, 0x3a, 0xa1, - 0x76, 0x1f, 0xae, 0xc8, 0x2f, 0x5c, 0x87, 0x91, 0xb0, 0x4d, 0x22, 0x27, 0xdd, 0x08, 0x5d, 0x94, - 0xa3, 0x7f, 0x5b, 0xc0, 0x0f, 0xf6, 0x66, 0xcf, 0xe8, 0xdc, 0x25, 0x1c, 0xab, 0x92, 0xc8, 0x86, - 0x21, 0x36, 0x2e, 0xb1, 0xb8, 0xc9, 0xc8, 0x52, 0x66, 0xb0, 0xd3, 0x90, 0x18, 0x0b, 0x8c, 0xfd, - 0xd7, 0x2c, 0x2e, 0x6c, 0x7a, 0xd3, 0xd1, 0xd7, 0x60, 0x6a, 0x9b, 0xee, 0x99, 0x96, 0x1e, 0xb4, - 0xe9, 0x4a, 0xca, 0x4e, 0x81, 0xad, 0x32, 0xeb, 0x47, 0x8f, 0xee, 0x2e, 0x4c, 0x8b, 0xd6, 0x4f, - 0xad, 0x66, 0xd8, 0xe2, 0xae, 0x8a, 0xec, 0x3f, 0x10, 0x53, 0x96, 0x19, 0x6f, 0x4f, 0xc3, 0x70, - 0x3b, 0x74, 0x17, 0x57, 0xea, 0x58, 0x8c, 0x95, 0xd2, 0x39, 0x0d, 0x0e, 0xc6, 0x12, 0x8f, 0xae, - 0x02, 0x90, 0x07, 0x09, 0x89, 0x02, 0xc7, 0x57, 0xa7, 0xb7, 0xca, 0x56, 0x5a, 0x52, 0x18, 0xac, - 0x51, 0xd1, 0x32, 0xed, 0x28, 0xdc, 0xf1, 0x5c, 0x16, 0x97, 0x5e, 0x35, 0xcb, 0x34, 0x14, 0x06, - 0x6b, 0x54, 0x74, 0xa7, 0xda, 0x09, 0x62, 0xbe, 0x8e, 0x39, 0xeb, 0x22, 0xd3, 0xc3, 0x48, 0xba, - 0x53, 0xbd, 0xa3, 0x23, 0xb1, 0x49, 0x6b, 0xff, 0x4e, 0x0d, 0x20, 0xb5, 0x94, 0xd0, 0x7b, 0xdd, - 0x33, 0xf4, 0x53, 0x65, 0xcd, 0xac, 0x87, 0x37, 0x3d, 0xd1, 0x37, 0x2d, 0x18, 0x75, 0x7c, 0x3f, - 0x6c, 0x39, 0x09, 0xeb, 0x51, 0xa5, 0xac, 0xae, 0x10, 0x2d, 0x99, 0x4f, 0xcb, 0xf2, 0xc6, 0x3c, - 0x2f, 0x0f, 0xf7, 0x34, 0x4c, 0x61, 0x7b, 0xf4, 0x26, 0xa0, 0x4f, 0x4a, 0x0b, 0x9b, 0x7f, 0x94, - 0x99, 0xac, 0x85, 0x5d, 0x63, 0x1a, 0x52, 0x33, 0xae, 0xd1, 0x3b, 0x46, 0x52, 0x83, 0x81, 0x32, - 0x97, 0x68, 0x0d, 0xdb, 0xa1, 0x28, 0x9f, 0x01, 0xfa, 0xa2, 0x1e, 0xb2, 0x3b, 0x58, 0xe6, 0x86, - 0xaa, 0x66, 0xc2, 0x16, 0x84, 0xeb, 0x26, 0x30, 0xe9, 0x9a, 0x6b, 0xa5, 0x88, 0xc1, 0xba, 0x52, - 0x5c, 0x43, 0x66, 0x91, 0x4d, 0x57, 0xc7, 0x0c, 0x02, 0x67, 0xab, 0x40, 0x5f, 0xe4, 0x01, 0xd5, - 0x2b, 0xc1, 0x46, 0x28, 0xc2, 0xb0, 0x2e, 0x95, 0xf8, 0xe6, 0xbb, 0x71, 0x42, 0xb6, 0x69, 0x99, - 0x74, 0x35, 0xbc, 0x25, 0xb8, 0x60, 0xc5, 0x0f, 0xad, 0xc1, 0x10, 0xbb, 0xfe, 0x11, 0x4f, 0x8f, - 0x94, 0xf1, 0x96, 0x99, 0x17, 0x1f, 0x53, 0x1b, 0x84, 0xfd, 0x8d, 0xb1, 0xe0, 0x85, 0xae, 0xcb, - 0x8b, 0xc2, 0xf1, 0x4a, 0x70, 0x27, 0x26, 0xec, 0xa2, 0x70, 0x6d, 0xe1, 0xe3, 0xe9, 0xcd, 0x5f, - 0x0e, 0xcf, 0x4d, 0xe3, 0x64, 0x94, 0xa4, 0xa6, 0x88, 0xf8, 0x2f, 0xb3, 0x43, 0x4d, 0x43, 0x99, - 0x86, 0x9a, 0xb9, 0xa4, 0xd2, 0xc1, 0x7e, 0xc3, 0x64, 0x86, 0xb3, 0xdc, 0x4f, 0x70, 0x0d, 0x9c, - 0xf1, 0x61, 0x2a, 0x3b, 0x25, 0x8f, 0x71, 0xc5, 0xfd, 0xe3, 0x01, 0x98, 0x30, 0x05, 0x03, 0x5d, - 0x86, 0xda, 0x36, 0xcb, 0xdd, 0x94, 0x66, 0x8c, 0x51, 0xf2, 0xbf, 0x2a, 0x11, 0x38, 0xa5, 0x61, - 0xb9, 0x73, 0x58, 0x71, 0x2d, 0xf4, 0x26, 0xcd, 0x9d, 0xa3, 0x30, 0x58, 0xa3, 0xa2, 0x76, 0xeb, - 0x7a, 0x18, 0x26, 0x4a, 0x71, 0x2b, 0x99, 0x59, 0x60, 0x50, 0x2c, 0xb0, 0x54, 0x61, 0xdf, 0xa3, - 0x1d, 0xf2, 0x4d, 0xb7, 0x9f, 0x52, 0xd8, 0x37, 0x74, 0x24, 0x36, 0x69, 0xe9, 0x02, 0x14, 0xc6, - 0x4c, 0x08, 0x85, 0x75, 0x9c, 0x86, 0x32, 0x35, 0xf9, 0x75, 0x28, 0x89, 0x47, 0x5f, 0x80, 0x47, - 0xd4, 0xed, 0x25, 0xcc, 0xdd, 0xa8, 0xb2, 0xc6, 0x21, 0x63, 0x8b, 0xfb, 0xc8, 0x62, 0x3e, 0x19, - 0xee, 0x55, 0x1e, 0xbd, 0x06, 0x13, 0xc2, 0xb2, 0x95, 0x1c, 0x87, 0xcd, 0x93, 0xee, 0x1b, 0x06, - 0x16, 0x67, 0xa8, 0x51, 0x1d, 0xa6, 0x28, 0x84, 0x59, 0x94, 0x92, 0x03, 0xbf, 0x85, 0xa5, 0x56, - 0xe6, 0x1b, 0x19, 0x3c, 0xee, 0x2a, 0x81, 0xe6, 0x61, 0x92, 0xdb, 0x16, 0x74, 0x23, 0xc7, 0xbe, - 0x83, 0x08, 0x9b, 0x54, 0x93, 0xe0, 0xb6, 0x89, 0xc6, 0x59, 0x7a, 0xf4, 0x32, 0x8c, 0x39, 0x51, - 0x6b, 0xcb, 0x4b, 0x48, 0x2b, 0xe9, 0x44, 0xfc, 0x0a, 0xbe, 0x16, 0x2a, 0x30, 0xaf, 0xe1, 0xb0, - 0x41, 0x69, 0x7f, 0x15, 0x4e, 0xe7, 0x44, 0x67, 0x53, 0xc1, 0x71, 0xda, 0x9e, 0xec, 0x53, 0x26, - 0x28, 0x69, 0xbe, 0xb1, 0x22, 0x7b, 0xa3, 0x51, 0x51, 0xe9, 0x64, 0xfe, 0x63, 0x2d, 0x91, 0x9b, - 0x92, 0xce, 0x65, 0x89, 0xc0, 0x29, 0x8d, 0xfd, 0x3f, 0x6a, 0xa0, 0x79, 0x5b, 0x4a, 0x84, 0xa2, - 0xbc, 0x0c, 0x63, 0x32, 0x37, 0xa1, 0x96, 0x13, 0x4c, 0x75, 0xf3, 0x9a, 0x86, 0xc3, 0x06, 0x25, - 0x6d, 0x5b, 0x20, 0x7d, 0x47, 0xd9, 0x10, 0x28, 0xe5, 0x54, 0xc2, 0x29, 0x0d, 0xba, 0x04, 0x23, - 0x31, 0xf1, 0x37, 0x6e, 0x7a, 0xc1, 0x3d, 0x21, 0xd8, 0x4a, 0x2b, 0x37, 0x05, 0x1c, 0x2b, 0x0a, - 0xf4, 0x39, 0xa8, 0x76, 0x3c, 0x57, 0x88, 0xf2, 0x9c, 0xb4, 0x3b, 0xef, 0xac, 0xd4, 0x0f, 0xf6, - 0x66, 0x67, 0xf3, 0x13, 0x2e, 0xd2, 0xdd, 0x74, 0x3c, 0x47, 0x27, 0x1f, 0x2d, 0x9a, 0xe7, 0x46, - 0x1f, 0xea, 0xd3, 0x8d, 0x7e, 0x15, 0x40, 0xf4, 0x59, 0x4a, 0x72, 0x35, 0xfd, 0x66, 0xd7, 0x14, - 0x06, 0x6b, 0x54, 0x74, 0x4f, 0xde, 0x8a, 0x88, 0x23, 0x37, 0xad, 0x3c, 0x74, 0x78, 0xe4, 0x03, - 0xec, 0xc9, 0x17, 0xb3, 0xdc, 0x70, 0x77, 0x05, 0xa8, 0x0d, 0xa7, 0x5c, 0x3a, 0x8f, 0x8c, 0x5a, - 0x6b, 0x47, 0x08, 0x58, 0xa6, 0x35, 0xd6, 0xb3, 0x9c, 0x70, 0x37, 0x73, 0xf4, 0x36, 0xcc, 0x48, - 0x60, 0xf7, 0xfd, 0x44, 0x36, 0x5d, 0xaa, 0x0b, 0xe7, 0xf7, 0xf7, 0x66, 0x67, 0xea, 0x3d, 0xa9, - 0xf0, 0x21, 0x1c, 0xd0, 0x5b, 0x30, 0xc4, 0x0e, 0x5e, 0xe2, 0xe9, 0x51, 0xb6, 0xda, 0xbd, 0x50, - 0xd6, 0xef, 0x38, 0xc7, 0x8e, 0x6f, 0x44, 0x3c, 0x67, 0x7a, 0x98, 0xc5, 0x80, 0x58, 0xf0, 0x44, - 0x6d, 0x18, 0x75, 0x82, 0x20, 0x4c, 0x1c, 0x6e, 0x84, 0x8d, 0x95, 0xb1, 0x23, 0xb5, 0x2a, 0xe6, - 0xd3, 0xb2, 0xbc, 0x1e, 0x15, 0x24, 0xa6, 0x61, 0xb0, 0x5e, 0x05, 0x5d, 0xc6, 0xc3, 0xfb, 0x54, - 0x61, 0xca, 0xb3, 0x87, 0x78, 0x7a, 0xbc, 0xcc, 0x32, 0x7e, 0xdb, 0x28, 0xa4, 0x69, 0x30, 0x93, - 0x19, 0xce, 0x72, 0x47, 0x73, 0x86, 0x3b, 0x79, 0x22, 0x8d, 0x56, 0x4e, 0xdd, 0xc9, 0xba, 0xf7, - 0x98, 0xdd, 0x7d, 0xe5, 0x11, 0x8a, 0x4c, 0x13, 0x4c, 0x66, 0xee, 0xbe, 0xa6, 0x28, 0xac, 0xd3, - 0xcd, 0x7c, 0x1a, 0x46, 0xb5, 0x01, 0xef, 0x27, 0x2c, 0x76, 0xe6, 0x35, 0x98, 0xca, 0x0e, 0x64, - 0x5f, 0x61, 0xb5, 0xff, 0xab, 0x02, 0x93, 0x39, 0x07, 0x3a, 0xf7, 0x3c, 0x16, 0xda, 0x6d, 0xa8, - 0xbc, 0x1b, 0x5e, 0xe0, 0x62, 0x86, 0x31, 0x15, 0x57, 0xa5, 0x84, 0xe2, 0x92, 0x5a, 0xb4, 0xda, - 0x53, 0x8b, 0x0a, 0x65, 0x35, 0x70, 0x74, 0x65, 0x65, 0xae, 0x0e, 0x83, 0xa5, 0x56, 0x87, 0x87, - 0xa0, 0xe0, 0x8c, 0x05, 0x66, 0xb8, 0xc4, 0x02, 0x73, 0x60, 0xc1, 0x84, 0x29, 0x79, 0x25, 0x46, - 0xfc, 0xc3, 0x3a, 0x80, 0x73, 0x6c, 0x23, 0x96, 0x44, 0xa1, 0xef, 0x93, 0x48, 0x04, 0xcc, 0x4d, - 0x88, 0x7d, 0x95, 0x80, 0x62, 0x8d, 0xc2, 0xfe, 0x76, 0x05, 0xa6, 0xd2, 0xe8, 0x69, 0x91, 0xa3, - 0xf5, 0xf8, 0x4e, 0x48, 0xd6, 0x8c, 0x13, 0x92, 0xa2, 0xd4, 0xab, 0x99, 0x76, 0xf5, 0x3c, 0x2d, - 0x79, 0x2b, 0x73, 0x5a, 0xf2, 0x42, 0x9f, 0x7c, 0x0f, 0x3f, 0x39, 0xf9, 0xe7, 0x15, 0x38, 0x9b, - 0x2d, 0xb2, 0xe8, 0x3b, 0xde, 0xf6, 0x31, 0x8e, 0xd3, 0x17, 0x8c, 0x71, 0x7a, 0xa9, 0xbf, 0xfe, - 0xb0, 0xc6, 0xf5, 0x1c, 0x2c, 0x27, 0x33, 0x58, 0x9f, 0x3e, 0x0a, 0xf3, 0xc3, 0x47, 0xec, 0x77, - 0x2d, 0x78, 0x34, 0xb7, 0xdc, 0x49, 0x78, 0x82, 0xdf, 0x34, 0x3d, 0xc1, 0xcf, 0x1f, 0xa1, 0x7b, - 0x3d, 0x5c, 0xc3, 0xff, 0xad, 0xd2, 0xa3, 0x5b, 0xcc, 0x5b, 0x76, 0x1b, 0x46, 0x9d, 0x56, 0x8b, - 0xc4, 0xf1, 0x6a, 0xe8, 0xaa, 0xa4, 0x41, 0xcf, 0xb1, 0xf5, 0x33, 0x05, 0x1f, 0xec, 0xcd, 0xce, - 0x64, 0x59, 0xa4, 0x68, 0xac, 0x73, 0x30, 0x93, 0x7f, 0x55, 0x8e, 0x29, 0xf9, 0xd7, 0x55, 0x80, - 0x1d, 0xb5, 0x4b, 0xcf, 0x3a, 0xe1, 0xb4, 0xfd, 0xbb, 0x46, 0x85, 0xde, 0x66, 0x56, 0x2f, 0x8f, - 0x14, 0x19, 0x28, 0x9c, 0x70, 0xc6, 0x07, 0xd4, 0xc3, 0x4e, 0xf8, 0xe5, 0x4e, 0xe5, 0xb1, 0x54, - 0x3c, 0xed, 0xef, 0x56, 0xe1, 0xa3, 0x87, 0x88, 0x1d, 0x9a, 0x37, 0x0f, 0x80, 0x9f, 0xcd, 0xba, - 0xa7, 0x66, 0x72, 0x0b, 0x1b, 0xfe, 0xaa, 0xcc, 0xc7, 0xaa, 0x7c, 0xe0, 0x8f, 0xf5, 0x2d, 0xdd, - 0x99, 0xc8, 0x23, 0x3e, 0xaf, 0x1d, 0x79, 0x62, 0xfd, 0x74, 0x3a, 0xff, 0xbf, 0x6e, 0xc1, 0xc7, - 0x72, 0x3b, 0x65, 0xc4, 0x99, 0x5c, 0x86, 0x5a, 0x8b, 0x02, 0xb5, 0x2b, 0x39, 0xe9, 0x5d, 0x38, - 0x89, 0xc0, 0x29, 0x8d, 0x11, 0x4e, 0x52, 0x29, 0x0c, 0x27, 0xf9, 0x0f, 0x16, 0x9c, 0xc9, 0x36, - 0xe2, 0x24, 0xb4, 0x4e, 0xd3, 0xd4, 0x3a, 0x73, 0xfd, 0x7d, 0xfb, 0x1e, 0x0a, 0xe7, 0xdb, 0xe3, - 0x70, 0xae, 0x6b, 0xb1, 0xe2, 0xc3, 0xf8, 0xb3, 0x16, 0x9c, 0xda, 0x64, 0xfb, 0x0b, 0xed, 0xe2, - 0x93, 0xe8, 0x58, 0xc1, 0x6d, 0xb1, 0x43, 0xef, 0x4b, 0xf1, 0xdd, 0x52, 0x17, 0x09, 0xee, 0xae, - 0x0c, 0x7d, 0xc3, 0x82, 0x33, 0xce, 0xfd, 0xb8, 0x2b, 0xe1, 0xbf, 0x90, 0xa3, 0xd7, 0x0a, 0x5c, - 0x79, 0x05, 0x4f, 0x05, 0x2c, 0x4c, 0xef, 0xef, 0xcd, 0x9e, 0xc9, 0xa3, 0xc2, 0xb9, 0xb5, 0xa2, - 0xb7, 0x44, 0xa2, 0x34, 0x6a, 0xf6, 0x95, 0xba, 0xc2, 0x97, 0x77, 0x0d, 0x83, 0xeb, 0x24, 0x89, - 0xc1, 0x8a, 0x23, 0xfa, 0x32, 0xd4, 0x36, 0xe5, 0x5d, 0x27, 0xa1, 0xf4, 0x0a, 0x56, 0x96, 0xdc, - 0xab, 0x51, 0x3c, 0xd8, 0x5f, 0xa1, 0x70, 0xca, 0x14, 0x5d, 0x87, 0x6a, 0xb0, 0x11, 0x8b, 0x8b, - 0xc5, 0x45, 0xe1, 0x44, 0x66, 0xf0, 0x16, 0xbf, 0x88, 0x79, 0x6b, 0xb9, 0x89, 0x29, 0x0b, 0xca, - 0x29, 0x5a, 0x77, 0x85, 0x0f, 0xbb, 0x80, 0x13, 0x5e, 0xa8, 0x77, 0x73, 0xc2, 0x0b, 0x75, 0x4c, - 0x59, 0xb0, 0xb8, 0xc5, 0xb8, 0x15, 0x7b, 0xc2, 0x41, 0x5d, 0x70, 0xeb, 0xbc, 0xeb, 0x72, 0x0a, - 0xcf, 0x99, 0xc7, 0xc0, 0x98, 0x33, 0x42, 0x6b, 0x30, 0xd4, 0x62, 0x39, 0xae, 0x85, 0xff, 0xa0, - 0x28, 0xf3, 0x71, 0x57, 0x3e, 0x6c, 0x7e, 0x90, 0xc6, 0xe1, 0x58, 0xf0, 0x62, 0x5c, 0x49, 0x7b, - 0x6b, 0x23, 0x16, 0xfe, 0x81, 0x22, 0xae, 0x5d, 0xd9, 0xca, 0x05, 0x57, 0x06, 0xc7, 0x82, 0x17, - 0xaa, 0x43, 0x65, 0xa3, 0x25, 0x12, 0x55, 0x16, 0xec, 0x68, 0xcd, 0x5b, 0xb5, 0x0b, 0x43, 0xfb, - 0x7b, 0xb3, 0x95, 0xe5, 0x45, 0x5c, 0xd9, 0x68, 0xa1, 0x37, 0x61, 0x78, 0x83, 0xdf, 0x93, 0x14, - 0x49, 0x29, 0xaf, 0x14, 0x5d, 0xe6, 0xec, 0xba, 0x54, 0xc9, 0x2f, 0x74, 0x08, 0x04, 0x96, 0xec, - 0xd0, 0xdb, 0x00, 0x1b, 0xea, 0xe6, 0xa7, 0xc8, 0x4a, 0x39, 0xd7, 0xdf, 0x4d, 0x51, 0xb1, 0x7b, - 0x56, 0x50, 0xac, 0x71, 0xa4, 0x32, 0xef, 0xc8, 0x34, 0xfd, 0x2c, 0x23, 0x65, 0xa1, 0xcc, 0xe7, - 0x66, 0xf5, 0xe7, 0x32, 0xaf, 0x50, 0x38, 0x65, 0x8a, 0x3a, 0x30, 0xbe, 0x13, 0xb7, 0xb7, 0x88, - 0x9c, 0xfa, 0x2c, 0x4d, 0xe5, 0xe8, 0xd5, 0x57, 0x0b, 0x72, 0x8f, 0x8a, 0x22, 0x5e, 0x94, 0x74, - 0x1c, 0xbf, 0x4b, 0x83, 0xb1, 0x7c, 0x4f, 0x6f, 0xe8, 0x6c, 0xb1, 0x59, 0x0b, 0xfd, 0x24, 0xef, - 0x76, 0xc2, 0xf5, 0xdd, 0x84, 0x88, 0x34, 0x96, 0x05, 0x9f, 0xe4, 0x75, 0x4e, 0xdc, 0xfd, 0x49, - 0x04, 0x02, 0x4b, 0x76, 0x6a, 0xc8, 0x98, 0x36, 0x9e, 0x2a, 0x3d, 0x64, 0x5d, 0x7d, 0x48, 0x87, - 0x8c, 0x69, 0xdf, 0x94, 0x29, 0xd3, 0xba, 0xed, 0xad, 0x30, 0x09, 0x83, 0x8c, 0xee, 0x3f, 0x55, - 0x46, 0xeb, 0x36, 0x72, 0x4a, 0x76, 0x6b, 0xdd, 0x3c, 0x2a, 0x9c, 0x5b, 0xab, 0xfd, 0x07, 0x83, - 0xdd, 0xeb, 0x2d, 0x33, 0x87, 0x7f, 0xa9, 0xfb, 0x74, 0xf5, 0x73, 0xfd, 0x6f, 0xf7, 0x1e, 0xe2, - 0x39, 0xeb, 0x37, 0x2c, 0x38, 0xd7, 0xce, 0x5d, 0x4c, 0xc5, 0x82, 0xd5, 0xef, 0xae, 0x91, 0x0f, - 0x98, 0xca, 0xd1, 0x9a, 0x8f, 0xc7, 0x3d, 0xea, 0xcc, 0x5a, 0xa0, 0xd5, 0x0f, 0x6c, 0x81, 0xde, - 0x85, 0x11, 0x66, 0x34, 0xa5, 0x49, 0x42, 0xfa, 0xcc, 0xab, 0xc1, 0x96, 0xbe, 0x45, 0xc1, 0x02, - 0x2b, 0x66, 0x74, 0xe0, 0x1e, 0xcf, 0x76, 0x02, 0x13, 0x86, 0x16, 0xc9, 0x65, 0xb9, 0x6b, 0x62, - 0x59, 0x8c, 0xc4, 0xe3, 0x8d, 0xc3, 0x88, 0x0f, 0x8a, 0x08, 0xf0, 0xe1, 0x95, 0x9d, 0xa4, 0x45, - 0xfb, 0x4f, 0xac, 0x1c, 0xfb, 0x8b, 0xef, 0x41, 0x5e, 0x35, 0xf7, 0x20, 0x4f, 0x65, 0xf7, 0x20, - 0x5d, 0x1e, 0x03, 0x63, 0xfb, 0x51, 0x3e, 0xc1, 0x62, 0xd9, 0x2c, 0x26, 0xb6, 0x0f, 0x17, 0x8a, - 0x26, 0x37, 0x8b, 0x63, 0x72, 0xd5, 0xa1, 0x60, 0x1a, 0xc7, 0xe4, 0xae, 0xd4, 0x31, 0xc3, 0x94, - 0xbd, 0x05, 0x6f, 0xff, 0x1f, 0x0b, 0xaa, 0x8d, 0xd0, 0x3d, 0x46, 0x0f, 0xc8, 0x35, 0xc3, 0x03, - 0xf2, 0x64, 0xe1, 0xe3, 0x44, 0x3d, 0xfd, 0x1d, 0xb7, 0x33, 0xfe, 0x8e, 0x4f, 0x14, 0xb3, 0x3a, - 0xdc, 0xbb, 0xf1, 0xbd, 0x2a, 0xe8, 0xcf, 0x2b, 0xa1, 0xdf, 0x3e, 0x4a, 0x64, 0x6b, 0xb5, 0xdc, - 0x8b, 0x4b, 0xa2, 0x0e, 0x16, 0x00, 0x25, 0xaf, 0xbd, 0xfd, 0xd4, 0x06, 0xb8, 0xde, 0x25, 0xde, - 0xe6, 0x56, 0x42, 0xdc, 0x6c, 0xc7, 0x4e, 0x2e, 0xc0, 0xf5, 0xbf, 0x5b, 0x30, 0x99, 0xa9, 0x1d, - 0x6d, 0xe7, 0xdd, 0x9c, 0x39, 0xaa, 0x4b, 0xe3, 0x54, 0xe1, 0x5d, 0x9b, 0x39, 0x00, 0xe5, 0x86, - 0x97, 0x8e, 0x07, 0x66, 0x84, 0x29, 0x3f, 0x7d, 0x8c, 0x35, 0x0a, 0xf4, 0x22, 0x8c, 0x26, 0x61, - 0x3b, 0xf4, 0xc3, 0xcd, 0xdd, 0x1b, 0x44, 0x26, 0x66, 0x50, 0x47, 0x18, 0x6b, 0x29, 0x0a, 0xeb, - 0x74, 0xf6, 0x0f, 0xaa, 0x90, 0x7d, 0x9d, 0xeb, 0xcf, 0x05, 0xf5, 0xa7, 0x47, 0x50, 0x7f, 0xcf, - 0x82, 0x29, 0x5a, 0x3b, 0x8b, 0x5f, 0x91, 0x61, 0xa8, 0x2a, 0x2f, 0xba, 0x75, 0x48, 0x5e, 0xf4, - 0xa7, 0xa8, 0xba, 0x73, 0xc3, 0x4e, 0x22, 0x9c, 0x25, 0x9a, 0x16, 0xa3, 0x50, 0x2c, 0xb0, 0x82, - 0x8e, 0x44, 0x91, 0xb8, 0xa3, 0xa3, 0xd3, 0x91, 0x28, 0xc2, 0x02, 0x2b, 0xd3, 0xa6, 0x0f, 0xe4, - 0xa7, 0x4d, 0xe7, 0xa9, 0x8d, 0x44, 0xdc, 0x84, 0xb0, 0x03, 0xb4, 0xd4, 0x46, 0x32, 0xa0, 0x22, - 0xa5, 0xb1, 0xff, 0x65, 0x15, 0xc6, 0x1a, 0xa1, 0x9b, 0x86, 0x98, 0xbf, 0x60, 0x84, 0x98, 0x5f, - 0xc8, 0x84, 0x98, 0x4f, 0xe9, 0xb4, 0x0f, 0x27, 0xc2, 0x5c, 0x24, 0xc1, 0x62, 0x89, 0xfd, 0x8f, - 0x1a, 0x5d, 0x6e, 0x24, 0xc1, 0x52, 0x9c, 0xb0, 0xc9, 0xf8, 0xcf, 0x54, 0x54, 0xf9, 0x9f, 0x58, - 0x30, 0xd1, 0x08, 0x5d, 0x2a, 0xa2, 0x7f, 0x96, 0xe4, 0x51, 0x4f, 0x9d, 0x35, 0x74, 0x48, 0xea, - 0xac, 0x5f, 0xb3, 0x60, 0xb8, 0x11, 0xba, 0x27, 0xe1, 0x4a, 0x5c, 0x36, 0x5d, 0x89, 0x1f, 0x2b, - 0x54, 0xbe, 0x3d, 0xbc, 0x87, 0xbf, 0x59, 0x85, 0x71, 0xda, 0xe4, 0x70, 0x53, 0x7e, 0x30, 0x63, - 0x70, 0xac, 0x12, 0x83, 0x43, 0xcd, 0xc1, 0xd0, 0xf7, 0xc3, 0xfb, 0xd9, 0x8f, 0xb7, 0xcc, 0xa0, - 0x58, 0x60, 0xd1, 0x25, 0x18, 0x69, 0x47, 0x64, 0xc7, 0x0b, 0x3b, 0x71, 0xf6, 0xca, 0x5f, 0x43, - 0xc0, 0xb1, 0xa2, 0x40, 0x2f, 0xc0, 0x58, 0xec, 0x05, 0x2d, 0x22, 0x03, 0x2b, 0x06, 0x58, 0x60, - 0x05, 0xcf, 0x50, 0xa8, 0xc1, 0xb1, 0x41, 0x85, 0xde, 0x84, 0x1a, 0xfb, 0xcf, 0xe6, 0xd0, 0x11, - 0x72, 0xb9, 0xf3, 0xe4, 0x5c, 0x92, 0x03, 0x4e, 0x99, 0xa1, 0xab, 0x00, 0x89, 0x8c, 0x01, 0x89, - 0xc5, 0x99, 0xa9, 0x32, 0x4e, 0x55, 0x74, 0x48, 0x8c, 0x35, 0x2a, 0xf4, 0x2c, 0xd4, 0x12, 0xc7, - 0xf3, 0x6f, 0x7a, 0x01, 0x89, 0x45, 0x14, 0x8d, 0xc8, 0xb4, 0x2b, 0x80, 0x38, 0xc5, 0xd3, 0x35, - 0x9f, 0x5d, 0x38, 0xe6, 0x2f, 0x45, 0x8c, 0x30, 0x6a, 0xb6, 0xe6, 0xdf, 0x54, 0x50, 0xac, 0x51, - 0xd8, 0xcf, 0xb3, 0xb5, 0xbb, 0xcf, 0x2b, 0x08, 0x3f, 0xa9, 0x00, 0x6a, 0xb0, 0x58, 0x13, 0xe3, - 0x31, 0x8d, 0x2d, 0x98, 0x88, 0xc9, 0x4d, 0x2f, 0xe8, 0x3c, 0x10, 0xac, 0xca, 0x5d, 0xfa, 0x68, - 0x2e, 0xe9, 0x65, 0xf8, 0x25, 0x5b, 0x13, 0x86, 0x33, 0x7c, 0xe9, 0x90, 0x44, 0x9d, 0x60, 0x3e, - 0xbe, 0x13, 0x93, 0x48, 0x3c, 0x87, 0xc1, 0x86, 0x04, 0x4b, 0x20, 0x4e, 0xf1, 0x54, 0x06, 0xd8, - 0x9f, 0x5b, 0x61, 0x80, 0xc3, 0x30, 0x91, 0x52, 0xc3, 0x72, 0xa3, 0x6b, 0x70, 0x6c, 0x50, 0xa1, - 0x65, 0x40, 0x71, 0xa7, 0xdd, 0xf6, 0xd9, 0xd1, 0x96, 0xe3, 0x5f, 0x8b, 0xc2, 0x4e, 0x9b, 0x87, - 0x1b, 0x8b, 0xb4, 0xe2, 0xcd, 0x2e, 0x2c, 0xce, 0x29, 0x41, 0x27, 0xfd, 0x46, 0xcc, 0x7e, 0x8b, - 0x4b, 0xc4, 0xdc, 0xc1, 0xd6, 0x64, 0x20, 0x2c, 0x71, 0x76, 0x87, 0x2d, 0x55, 0xec, 0x99, 0x82, - 0xa4, 0x13, 0x11, 0x44, 0x60, 0xbc, 0xcd, 0x96, 0x23, 0x79, 0xbe, 0x5e, 0x6a, 0x28, 0x33, 0xd1, - 0x2e, 0x3c, 0x1d, 0xb9, 0xce, 0x06, 0x9b, 0x5c, 0xed, 0xff, 0x04, 0x4c, 0xd7, 0x88, 0x53, 0xc5, - 0x61, 0x11, 0xcb, 0x2a, 0x6c, 0xb1, 0x8f, 0x97, 0x79, 0x97, 0x27, 0xd5, 0xe3, 0x22, 0x32, 0x16, - 0x4b, 0x2e, 0xe8, 0x4b, 0x3c, 0x40, 0x80, 0xcd, 0xef, 0xf2, 0x8f, 0x65, 0x71, 0x7a, 0x23, 0x4a, - 0x5b, 0xb0, 0xc0, 0x1a, 0x3b, 0x74, 0x13, 0xc6, 0x45, 0x2e, 0x7b, 0xe1, 0x19, 0xa8, 0x1a, 0xbb, - 0xe3, 0x71, 0xac, 0x23, 0x0f, 0xb2, 0x00, 0x6c, 0x16, 0x46, 0x9b, 0xf0, 0xb8, 0xf6, 0xc0, 0x4d, - 0x4e, 0x44, 0x16, 0x57, 0x1c, 0x1f, 0xdb, 0xdf, 0x9b, 0x7d, 0x7c, 0xed, 0x30, 0x42, 0x7c, 0x38, - 0x1f, 0x74, 0x1b, 0xce, 0x3a, 0xad, 0xc4, 0xdb, 0x21, 0x75, 0xe2, 0xb8, 0xbe, 0x17, 0x10, 0xf3, - 0x86, 0xf9, 0xa3, 0xfb, 0x7b, 0xb3, 0x67, 0xe7, 0xf3, 0x08, 0x70, 0x7e, 0x39, 0xf4, 0x2a, 0xd4, - 0xdc, 0x20, 0x16, 0x63, 0x30, 0x64, 0xbc, 0xe5, 0x53, 0xab, 0xdf, 0x6a, 0xaa, 0xfe, 0xa7, 0x7f, - 0x70, 0x5a, 0x00, 0xbd, 0xcb, 0x9f, 0x18, 0x56, 0x1b, 0x12, 0xfe, 0x86, 0xd4, 0x4b, 0xa5, 0xb6, - 0xc0, 0xc6, 0x2d, 0x10, 0xee, 0x34, 0x53, 0x91, 0x8f, 0xc6, 0x05, 0x11, 0xa3, 0x0a, 0xf4, 0x79, - 0x40, 0x31, 0x89, 0x76, 0xbc, 0x16, 0x99, 0x6f, 0xb1, 0xdc, 0x9c, 0xec, 0x78, 0x6e, 0xc4, 0x08, - 0xff, 0x47, 0xcd, 0x2e, 0x0a, 0x9c, 0x53, 0x0a, 0x5d, 0xa7, 0x1a, 0x47, 0x87, 0x8a, 0x40, 0x55, - 0x69, 0xda, 0x4d, 0xd7, 0x49, 0x3b, 0x22, 0x2d, 0x27, 0x21, 0xae, 0xc9, 0x11, 0x67, 0xca, 0xd1, - 0x65, 0x45, 0xe5, 0x1c, 0x07, 0x33, 0xbc, 0xb2, 0x3b, 0xef, 0x38, 0xdd, 0x29, 0x6d, 0x85, 0x71, - 0x72, 0x8b, 0x24, 0xf7, 0xc3, 0xe8, 0x1e, 0x73, 0xb6, 0x8f, 0x68, 0x99, 0xce, 0x52, 0x14, 0xd6, - 0xe9, 0xa8, 0x0d, 0xc4, 0x4e, 0x79, 0x56, 0xea, 0xcc, 0x85, 0x3e, 0x92, 0xce, 0x9d, 0xeb, 0x1c, - 0x8c, 0x25, 0x5e, 0x92, 0xae, 0x34, 0x16, 0x99, 0x3b, 0x3c, 0x43, 0xba, 0xd2, 0x58, 0xc4, 0x12, - 0x8f, 0xc2, 0xee, 0x17, 0x93, 0x26, 0xca, 0x1c, 0x4d, 0x74, 0x6b, 0xf0, 0x92, 0x8f, 0x26, 0x3d, - 0x80, 0x29, 0xf5, 0x6a, 0x13, 0x4f, 0x41, 0x19, 0x4f, 0x4f, 0x96, 0x79, 0xe0, 0x38, 0x37, 0x93, - 0xa5, 0x8a, 0x4c, 0x5e, 0xc9, 0xf0, 0xc4, 0x5d, 0xb5, 0x18, 0x99, 0x12, 0xa6, 0x0a, 0xf3, 0xc8, - 0x5f, 0x86, 0x5a, 0xdc, 0x59, 0x77, 0xc3, 0x6d, 0xc7, 0x0b, 0x98, 0xcf, 0x5a, 0x7f, 0xae, 0x57, - 0x22, 0x70, 0x4a, 0x33, 0xf3, 0x59, 0x38, 0xd5, 0x25, 0xd3, 0x7d, 0x85, 0xd4, 0xfd, 0xd2, 0x00, - 0xd4, 0x94, 0x57, 0x07, 0x5d, 0x36, 0x1d, 0x77, 0x8f, 0x66, 0x1d, 0x77, 0x23, 0x74, 0xe5, 0xd5, - 0x7d, 0x75, 0x6f, 0xe7, 0xbc, 0xd7, 0xf9, 0x4c, 0xe1, 0x47, 0x2c, 0x7f, 0xb3, 0xa5, 0x8f, 0xd7, - 0x4c, 0x53, 0xb3, 0x7e, 0xe0, 0x50, 0xb3, 0xbe, 0xe4, 0x73, 0x4c, 0xd4, 0x80, 0x6f, 0x87, 0xee, - 0x4a, 0x23, 0xfb, 0xd4, 0x48, 0x83, 0x02, 0x31, 0xc7, 0x31, 0xbb, 0x8b, 0x2a, 0x65, 0x66, 0x77, - 0x0d, 0x1f, 0xd5, 0xee, 0x92, 0x1c, 0x70, 0xca, 0x0c, 0xed, 0xc0, 0xa9, 0x96, 0xf9, 0x74, 0x8c, - 0xba, 0xb0, 0xf2, 0x5c, 0x1f, 0x4f, 0xb7, 0x74, 0xb4, 0x34, 0xf9, 0x8b, 0x59, 0x7e, 0xb8, 0xbb, - 0x0a, 0xfb, 0x07, 0xdc, 0x0b, 0x24, 0xb6, 0x85, 0x24, 0xee, 0xf8, 0xc7, 0x99, 0xf5, 0xfa, 0xb6, - 0xb1, 0x53, 0x7d, 0x08, 0xfe, 0xc7, 0xdf, 0xb2, 0x98, 0xff, 0x71, 0x8d, 0x6c, 0xb7, 0x7d, 0x27, - 0x39, 0xce, 0x68, 0xbd, 0x2f, 0xc1, 0x48, 0x22, 0x6a, 0x29, 0x97, 0xaa, 0x5b, 0x6b, 0x16, 0xf3, - 0xc7, 0x2a, 0x45, 0x20, 0xa1, 0x58, 0x31, 0xb4, 0xff, 0x0d, 0xff, 0x0a, 0x12, 0x73, 0x12, 0x3b, - 0xab, 0x5b, 0xe6, 0xce, 0xea, 0xe9, 0xd2, 0x9d, 0xe9, 0xb1, 0xc3, 0xfa, 0xae, 0xd9, 0x05, 0x66, - 0xb0, 0x7d, 0xf8, 0x3d, 0xe2, 0xf6, 0x2a, 0x98, 0xcf, 0xe1, 0xa0, 0x57, 0x79, 0xa8, 0x2a, 0xd7, - 0x88, 0xcf, 0xf4, 0x19, 0xa6, 0x6a, 0xff, 0x46, 0x05, 0xce, 0xe4, 0xbd, 0x92, 0x8f, 0x5c, 0x18, - 0x6b, 0x6b, 0xe6, 0x73, 0xb9, 0x7c, 0x0e, 0xba, 0xc1, 0x9d, 0x9a, 0x2e, 0x3a, 0x14, 0x1b, 0x5c, - 0x11, 0x81, 0x31, 0xb2, 0xe3, 0xb5, 0x94, 0x7b, 0xa5, 0xd2, 0xbf, 0x8a, 0x52, 0xd5, 0x2c, 0x69, - 0x8c, 0xb0, 0xc1, 0xf6, 0x18, 0xb2, 0xc9, 0xdb, 0xff, 0xc8, 0x82, 0x47, 0x7a, 0x24, 0x7d, 0xa0, - 0xd5, 0xdd, 0x67, 0x5e, 0x48, 0xf1, 0xdc, 0x92, 0xaa, 0x8e, 0xfb, 0x26, 0xb1, 0xc0, 0xa2, 0x75, - 0x00, 0xee, 0x5b, 0x64, 0x6f, 0xd0, 0x56, 0xca, 0xc4, 0x00, 0x74, 0xdd, 0xac, 0xd6, 0x2e, 0xdd, - 0xaa, 0x57, 0x67, 0x35, 0xae, 0xf6, 0x77, 0xaa, 0x30, 0xc8, 0x9f, 0xc1, 0x6c, 0xc0, 0xf0, 0x16, - 0xcf, 0x31, 0xd9, 0x5f, 0x8a, 0xcb, 0xd4, 0x4e, 0xe2, 0x00, 0x2c, 0xd9, 0xa0, 0x55, 0x38, 0xed, - 0x05, 0x5e, 0xe2, 0x39, 0x7e, 0x9d, 0xf8, 0xce, 0xae, 0x34, 0xbc, 0x79, 0x7e, 0x71, 0x99, 0x0a, - 0xf7, 0xf4, 0x4a, 0x37, 0x09, 0xce, 0x2b, 0x87, 0x5e, 0xeb, 0x4a, 0x12, 0xc5, 0x73, 0x77, 0xaa, - 0xbb, 0x5a, 0x87, 0x27, 0x8a, 0x42, 0xaf, 0xc0, 0x78, 0xbb, 0x6b, 0x8b, 0xa1, 0xbd, 0x9f, 0x68, - 0x6e, 0x2b, 0x4c, 0x5a, 0x54, 0x87, 0xa9, 0xb8, 0xc3, 0x4e, 0x64, 0xd7, 0xb6, 0x22, 0x12, 0x6f, - 0x85, 0xbe, 0x2b, 0xde, 0xfd, 0x52, 0xe6, 0x54, 0x33, 0x83, 0xc7, 0x5d, 0x25, 0x28, 0x97, 0x0d, - 0xc7, 0xf3, 0x3b, 0x11, 0x49, 0xb9, 0x0c, 0x99, 0x5c, 0x96, 0x33, 0x78, 0xdc, 0x55, 0xc2, 0xfe, - 0x23, 0x0b, 0x4e, 0xe7, 0x84, 0x2d, 0xf0, 0x68, 0xba, 0x4d, 0x2f, 0x4e, 0x54, 0x16, 0x69, 0x2d, - 0x9a, 0x8e, 0xc3, 0xb1, 0xa2, 0xa0, 0x52, 0xc8, 0xf7, 0x8d, 0xd9, 0xe3, 0x40, 0x71, 0x30, 0x2b, - 0xb0, 0xfd, 0xa5, 0x7c, 0x52, 0xaf, 0xf9, 0x0f, 0xf4, 0x7c, 0xcd, 0xff, 0x09, 0x18, 0xdc, 0x54, - 0xbb, 0x73, 0xcd, 0x30, 0xe1, 0xfb, 0x73, 0x8e, 0xb3, 0xbf, 0x55, 0x85, 0xc9, 0x4c, 0xf8, 0x12, - 0x6d, 0xc8, 0x76, 0x18, 0x78, 0x49, 0xa8, 0xb2, 0x0d, 0x31, 0x97, 0xc2, 0x22, 0x69, 0x6f, 0xad, - 0x0a, 0x38, 0x56, 0x14, 0xe8, 0x29, 0xf3, 0x4d, 0xe2, 0xb4, 0xcd, 0x0b, 0x75, 0xe3, 0xb5, 0xb5, - 0xb2, 0x99, 0xed, 0x9f, 0x80, 0x81, 0x76, 0xa8, 0x1e, 0xcf, 0x54, 0x42, 0x8f, 0x17, 0xea, 0x8d, - 0x30, 0xf4, 0x31, 0x43, 0xa2, 0x27, 0x45, 0xef, 0x33, 0xce, 0x49, 0xec, 0xb8, 0x61, 0xac, 0x0d, - 0xc1, 0xd3, 0x30, 0x7c, 0x8f, 0xec, 0x46, 0x5e, 0xb0, 0x99, 0x75, 0xcd, 0xde, 0xe0, 0x60, 0x2c, - 0xf1, 0x66, 0xf6, 0xfa, 0xe1, 0x63, 0xce, 0x5e, 0x3f, 0x52, 0x18, 0x82, 0xf9, 0xab, 0x16, 0x4c, - 0xb2, 0xd4, 0x7b, 0xe2, 0x1a, 0xac, 0x17, 0x06, 0xc7, 0xb8, 0x2a, 0x3e, 0x01, 0x83, 0x11, 0xad, - 0x2c, 0x9b, 0x78, 0x9a, 0xb5, 0x00, 0x73, 0x1c, 0x7a, 0x4c, 0x3c, 0xed, 0x4e, 0x3f, 0xdf, 0x18, - 0x4f, 0xe4, 0x9b, 0xbe, 0xd1, 0xce, 0x02, 0xfc, 0x31, 0x69, 0xfb, 0x1e, 0x6f, 0x6c, 0xea, 0x89, - 0xf9, 0xb0, 0x04, 0xf8, 0xe7, 0x36, 0xee, 0x61, 0x05, 0xf8, 0xe7, 0x33, 0x3f, 0xdc, 0x04, 0xfd, - 0x9f, 0x15, 0x38, 0x9f, 0x5b, 0x2e, 0x3d, 0xd6, 0x59, 0x36, 0x8e, 0x75, 0xae, 0x66, 0x8e, 0x75, - 0xec, 0xc3, 0x4b, 0x3f, 0x9c, 0x83, 0x9e, 0xfc, 0xe3, 0x97, 0xea, 0x49, 0x1e, 0xbf, 0x0c, 0x94, - 0xb5, 0x15, 0x06, 0x0b, 0x6c, 0x85, 0xdf, 0xb5, 0xe0, 0xd1, 0xdc, 0x31, 0xfb, 0xf0, 0x5d, 0xa9, - 0xc8, 0x6d, 0x66, 0x0f, 0x0b, 0xfa, 0x6f, 0x54, 0x7b, 0x74, 0x8b, 0xd9, 0xd2, 0x17, 0xa9, 0xde, - 0x61, 0xc8, 0x58, 0x98, 0x41, 0x63, 0x5c, 0xe7, 0x70, 0x18, 0x56, 0x58, 0x14, 0x6b, 0x57, 0x12, - 0x78, 0x23, 0x97, 0x8e, 0x38, 0xa5, 0xe6, 0x4c, 0xe7, 0x99, 0x7e, 0x9f, 0x37, 0x73, 0x4f, 0x01, - 0xdd, 0xd5, 0xb6, 0x47, 0xd5, 0xa3, 0x6c, 0x8f, 0xc6, 0xf2, 0xb7, 0x46, 0x68, 0x1e, 0x26, 0xb7, - 0xbd, 0x80, 0x3d, 0xee, 0x66, 0xda, 0x21, 0xea, 0x16, 0xdc, 0xaa, 0x89, 0xc6, 0x59, 0xfa, 0x99, - 0x57, 0x60, 0xfc, 0xe8, 0x1e, 0x93, 0xf7, 0xab, 0xf0, 0xd1, 0x43, 0xd4, 0x02, 0x5f, 0x0f, 0x8c, - 0xef, 0xa2, 0xad, 0x07, 0x5d, 0xdf, 0xa6, 0x01, 0x67, 0x36, 0x3a, 0xbe, 0xbf, 0xcb, 0xc2, 0x22, - 0x88, 0x2b, 0x29, 0x84, 0x8d, 0xa7, 0x9e, 0x5d, 0x5d, 0xce, 0xa1, 0xc1, 0xb9, 0x25, 0xd1, 0xe7, - 0x01, 0x85, 0xeb, 0x2c, 0x1f, 0xa5, 0x9b, 0xde, 0x58, 0x66, 0x9f, 0xa0, 0x9a, 0xce, 0xd5, 0xdb, - 0x5d, 0x14, 0x38, 0xa7, 0x14, 0xb5, 0xf8, 0xd8, 0x8b, 0xad, 0xaa, 0x59, 0x19, 0x8b, 0x0f, 0xeb, - 0x48, 0x6c, 0xd2, 0xa2, 0x6b, 0x70, 0xca, 0xd9, 0x71, 0x3c, 0x9e, 0x6d, 0x46, 0x32, 0xe0, 0x26, - 0x9f, 0x72, 0x49, 0xcc, 0x67, 0x09, 0x70, 0x77, 0x19, 0xd4, 0x36, 0x9c, 0x4c, 0x3c, 0xff, 0xf4, - 0xab, 0x47, 0x90, 0xe0, 0xd2, 0x6e, 0x27, 0xfb, 0x0f, 0x2d, 0xba, 0xe8, 0xe5, 0x3c, 0x86, 0x66, - 0xbc, 0x21, 0xae, 0xdd, 0xd2, 0xe8, 0x7e, 0x43, 0x9c, 0xf9, 0x5f, 0x4d, 0x5a, 0x2e, 0x1a, 0x71, - 0x1a, 0x56, 0x69, 0xd8, 0x97, 0xe2, 0x76, 0x92, 0xa2, 0x40, 0x77, 0x61, 0xd8, 0xf5, 0x76, 0xbc, - 0x38, 0x8c, 0x4a, 0x3c, 0xd9, 0xdb, 0x15, 0xaa, 0x97, 0xaa, 0xcb, 0x3a, 0x67, 0x82, 0x25, 0x37, - 0xfb, 0x6f, 0x55, 0x60, 0x5c, 0xd6, 0xf7, 0x7a, 0x27, 0x64, 0x3a, 0xec, 0xb8, 0x96, 0xf2, 0xd7, - 0x8d, 0xa5, 0xfc, 0x72, 0xb9, 0x2b, 0x5a, 0xac, 0x51, 0x3d, 0x97, 0xf0, 0x2f, 0x64, 0x96, 0xf0, - 0x2b, 0xfd, 0x30, 0x2d, 0xf4, 0x1e, 0x9d, 0x32, 0xe8, 0x3f, 0x44, 0xf9, 0x8f, 0xf3, 0xba, 0xd3, - 0x63, 0xe1, 0xf8, 0x4e, 0x25, 0xd3, 0x0d, 0xb6, 0x60, 0x7c, 0x0d, 0x06, 0xb6, 0x9c, 0xc8, 0x2d, - 0x97, 0x6f, 0xad, 0xab, 0xf8, 0xdc, 0x75, 0x27, 0x72, 0xb9, 0xda, 0xbf, 0xa4, 0x1e, 0x6a, 0x71, - 0x22, 0xb7, 0x30, 0xc8, 0x98, 0x55, 0x8a, 0x5e, 0x86, 0xa1, 0xb8, 0x15, 0xb6, 0x55, 0x54, 0xd7, - 0x05, 0xfe, 0x88, 0x0b, 0x85, 0x1c, 0xec, 0xcd, 0x22, 0xb3, 0x3a, 0x0a, 0xc6, 0x82, 0x7e, 0x86, - 0x40, 0x4d, 0x55, 0x7d, 0x8c, 0xe1, 0xac, 0xef, 0x57, 0xe1, 0x74, 0x8e, 0xa8, 0xa0, 0x9f, 0x31, - 0x46, 0xed, 0x95, 0xbe, 0x65, 0xed, 0x03, 0x8e, 0xdb, 0xcf, 0xb0, 0x0d, 0x91, 0x2b, 0x64, 0xe3, - 0x08, 0xd5, 0xdf, 0x89, 0x49, 0xb6, 0x7a, 0x0a, 0x2a, 0xae, 0x9e, 0x56, 0x7b, 0x42, 0x83, 0x4f, - 0xab, 0x51, 0xed, 0x3c, 0xc6, 0x6f, 0xfc, 0xde, 0x00, 0x9c, 0xc9, 0xbb, 0x06, 0x8a, 0x7e, 0xde, - 0xca, 0x64, 0x50, 0x7f, 0xad, 0xff, 0xbb, 0xa4, 0x3c, 0xad, 0xba, 0x48, 0x0f, 0x31, 0x67, 0xe6, - 0x54, 0x2f, 0x1c, 0x6d, 0x51, 0x3b, 0xbb, 0x18, 0x10, 0xf1, 0x64, 0xf8, 0x52, 0x1f, 0x7c, 0xee, - 0x08, 0x4d, 0x11, 0xf9, 0xf4, 0xe3, 0xcc, 0xc5, 0x00, 0x09, 0x2e, 0xbe, 0x18, 0x20, 0xdb, 0x30, - 0xb3, 0x09, 0xa3, 0x5a, 0xbf, 0x8e, 0x51, 0x04, 0x3c, 0xba, 0x26, 0x69, 0xad, 0x3e, 0x46, 0x31, - 0xf8, 0x3b, 0x16, 0x64, 0xc2, 0x35, 0x94, 0xd7, 0xc5, 0xea, 0xe9, 0x75, 0xb9, 0x00, 0x03, 0x51, - 0xe8, 0x93, 0x6c, 0x6a, 0x6f, 0x1c, 0xfa, 0x04, 0x33, 0x8c, 0x7a, 0xb0, 0xb1, 0xda, 0xeb, 0xc1, - 0x46, 0xba, 0x1d, 0xf7, 0xc9, 0x0e, 0x91, 0x3e, 0x10, 0xa5, 0xbc, 0x6f, 0x52, 0x20, 0xe6, 0x38, - 0xfb, 0x47, 0x55, 0x18, 0xe2, 0x8e, 0x86, 0x63, 0x5c, 0x96, 0x1b, 0x62, 0xcf, 0x5f, 0xea, 0x42, - 0x26, 0x6f, 0xcd, 0x5c, 0xdd, 0x49, 0x1c, 0x2e, 0x50, 0xaa, 0x6f, 0xa9, 0x9f, 0x00, 0xcd, 0x19, - 0xbd, 0x9f, 0xc9, 0x6c, 0x69, 0x81, 0xf3, 0xd0, 0xc6, 0x62, 0x0b, 0x20, 0x66, 0x2f, 0x83, 0x51, - 0x1e, 0x22, 0x29, 0xde, 0x0b, 0xa5, 0xda, 0xd1, 0x54, 0xc5, 0x78, 0x6b, 0xd2, 0x6c, 0x5c, 0x0a, - 0x81, 0x35, 0xde, 0x33, 0x2f, 0x41, 0x4d, 0x11, 0x17, 0x59, 0xfa, 0x63, 0xba, 0x48, 0xfe, 0x05, - 0x98, 0xcc, 0xd4, 0xd5, 0xd7, 0x46, 0xe1, 0xfb, 0x16, 0x9c, 0xea, 0x7a, 0x6b, 0x16, 0xbd, 0x67, - 0xc1, 0x19, 0x3f, 0xc7, 0xc3, 0x24, 0x3e, 0xf0, 0x51, 0x7c, 0x53, 0x6a, 0x97, 0x90, 0x87, 0xc5, - 0xb9, 0xb5, 0xc9, 0x34, 0x9f, 0x95, 0xfc, 0x34, 0x9f, 0xec, 0x39, 0x24, 0xde, 0xf6, 0x93, 0xb0, - 0x80, 0x56, 0x4c, 0x0b, 0xe8, 0xe3, 0x65, 0xc4, 0xa0, 0x87, 0xe9, 0xf3, 0xef, 0x2d, 0x40, 0x9c, - 0x20, 0xfb, 0x42, 0x20, 0xf7, 0xd8, 0x69, 0x36, 0x7b, 0x2a, 0x37, 0x0a, 0x83, 0x35, 0xaa, 0x3e, - 0xb3, 0xbf, 0xab, 0x97, 0xb5, 0xca, 0x3d, 0xb0, 0x5f, 0x2d, 0xf1, 0xc0, 0xfe, 0x6f, 0x55, 0x21, - 0x1b, 0xda, 0x80, 0xbe, 0x0c, 0x63, 0x2d, 0xa7, 0xed, 0xac, 0x7b, 0xbe, 0x97, 0x78, 0x24, 0x2e, - 0x77, 0x6c, 0xb4, 0xa8, 0x95, 0x10, 0x3e, 0x5f, 0x0d, 0x82, 0x0d, 0x8e, 0x68, 0x0e, 0xa0, 0x1d, - 0x79, 0x3b, 0x9e, 0x4f, 0x36, 0x99, 0xdd, 0xa1, 0x92, 0xa4, 0x34, 0x14, 0x14, 0x6b, 0x14, 0x39, - 0x31, 0x74, 0xd5, 0x93, 0x88, 0xa1, 0x1b, 0xe8, 0x33, 0x86, 0x6e, 0xb0, 0x54, 0x0c, 0x1d, 0x86, - 0x73, 0xd2, 0x55, 0x4b, 0xff, 0x2f, 0x7b, 0x3e, 0xe1, 0x79, 0xfd, 0x44, 0xe4, 0xe3, 0xcc, 0xfe, - 0xde, 0xec, 0x39, 0x9c, 0x4b, 0x81, 0x7b, 0x94, 0xb4, 0x3b, 0x70, 0xba, 0x49, 0x22, 0x8f, 0xa5, - 0x5d, 0x72, 0xd3, 0x19, 0xf8, 0x36, 0xd4, 0xa2, 0xcc, 0xe4, 0xef, 0xf3, 0x4e, 0x9a, 0x96, 0xbc, - 0x42, 0x4e, 0xf6, 0x94, 0xa5, 0xfd, 0x57, 0x2a, 0x30, 0x2c, 0x42, 0x88, 0x8e, 0x71, 0x21, 0xb9, - 0x61, 0xec, 0xef, 0x9e, 0x2e, 0x9a, 0xb9, 0xac, 0x39, 0x3d, 0x77, 0x76, 0xcd, 0xcc, 0xce, 0xee, - 0xd9, 0x72, 0xec, 0x0e, 0xdf, 0xd3, 0xfd, 0xb0, 0x02, 0x13, 0x66, 0x28, 0xd5, 0x31, 0x0e, 0xc7, - 0x9b, 0x30, 0x1c, 0x8b, 0xf8, 0xa2, 0x4a, 0x99, 0x58, 0x8d, 0xec, 0x27, 0x4d, 0x1f, 0xeb, 0x17, - 0x11, 0x45, 0x92, 0x5d, 0x6e, 0x08, 0x53, 0xf5, 0x24, 0x42, 0x98, 0xec, 0x1f, 0x31, 0x95, 0xaa, - 0x0f, 0xe0, 0x49, 0xac, 0x09, 0xaf, 0x9b, 0xda, 0xf7, 0x52, 0x29, 0x51, 0x10, 0xed, 0xeb, 0xb1, - 0x36, 0x7c, 0xcf, 0x82, 0x51, 0x41, 0x78, 0x12, 0x3d, 0xf8, 0xbc, 0xd9, 0x83, 0x27, 0x4b, 0xf5, - 0xa0, 0x47, 0xd3, 0xff, 0x5e, 0x45, 0x35, 0xbd, 0x21, 0x5e, 0x4e, 0x2d, 0x4c, 0xf4, 0x38, 0xd2, - 0x8e, 0xc2, 0x24, 0x6c, 0x85, 0xbe, 0x58, 0xe5, 0x1f, 0x4b, 0xa3, 0xce, 0x39, 0xfc, 0x40, 0xfb, - 0x8d, 0x15, 0x35, 0x8b, 0xa6, 0x0e, 0xa3, 0x44, 0x2c, 0x51, 0x79, 0xef, 0xb6, 0xae, 0xcb, 0x77, - 0xb1, 0x29, 0x4c, 0x5c, 0xd9, 0xe8, 0xf7, 0x3d, 0xd8, 0x34, 0x86, 0x5c, 0x71, 0xc2, 0x1a, 0x57, - 0x19, 0xde, 0xc8, 0x6a, 0x18, 0x34, 0xdd, 0xa8, 0xb7, 0x04, 0x1c, 0x2b, 0x0a, 0xfb, 0x25, 0xa6, - 0x63, 0xd9, 0xf0, 0xf4, 0x17, 0x18, 0xfe, 0x8b, 0x43, 0x6a, 0x60, 0x99, 0x93, 0xe4, 0x16, 0x0c, - 0xd2, 0x2e, 0xca, 0x7d, 0x60, 0x39, 0x85, 0x46, 0x9b, 0xa0, 0x07, 0x88, 0x45, 0x49, 0x8c, 0x39, - 0x1b, 0x44, 0xba, 0x7c, 0xef, 0x2f, 0x95, 0xd6, 0x91, 0x7d, 0x78, 0xdb, 0x59, 0xe2, 0x18, 0x96, - 0x2c, 0x63, 0xa5, 0x91, 0x4d, 0xce, 0xb9, 0x28, 0x11, 0x38, 0xa5, 0x41, 0x97, 0x85, 0xb9, 0x6e, - 0x3e, 0xab, 0x2b, 0xcd, 0x75, 0x39, 0x24, 0x9a, 0xbd, 0x7e, 0x05, 0x46, 0x55, 0x7a, 0xf2, 0x06, - 0xcf, 0x32, 0x5d, 0xe3, 0xf6, 0xcb, 0x52, 0x0a, 0xc6, 0x3a, 0x0d, 0x5a, 0x81, 0xd3, 0xae, 0x8a, - 0x66, 0x6d, 0x74, 0xd6, 0x7d, 0xaf, 0x45, 0x8b, 0xf2, 0x9b, 0x24, 0x8f, 0xec, 0xef, 0xcd, 0x9e, - 0xae, 0x77, 0xa3, 0x71, 0x5e, 0x19, 0xb4, 0x06, 0x93, 0x31, 0x4f, 0xc3, 0x2e, 0xef, 0x9c, 0x89, - 0xec, 0x75, 0xcf, 0x48, 0xa7, 0x7f, 0xd3, 0x44, 0x1f, 0x30, 0x10, 0x57, 0x0a, 0x02, 0x84, 0xb3, - 0x2c, 0xd0, 0x6b, 0x30, 0xe1, 0xeb, 0xaf, 0x4a, 0x35, 0x44, 0x50, 0xaf, 0x0a, 0x88, 0x30, 0xde, - 0x9c, 0x6a, 0xe0, 0x0c, 0x35, 0x7a, 0x13, 0xa6, 0x75, 0x88, 0xb8, 0xd4, 0xee, 0x04, 0x9b, 0x24, - 0x16, 0xf9, 0x9f, 0x1f, 0xdb, 0xdf, 0x9b, 0x9d, 0xbe, 0xd9, 0x83, 0x06, 0xf7, 0x2c, 0x8d, 0x5e, - 0x86, 0x31, 0x39, 0x92, 0x5a, 0x80, 0x6f, 0x1a, 0x8a, 0xa3, 0xe1, 0xb0, 0x41, 0xf9, 0xc1, 0xce, - 0x36, 0xbe, 0x46, 0x0b, 0x6b, 0x8b, 0x2a, 0xfa, 0x0a, 0x8c, 0xe9, 0x6d, 0x14, 0x6a, 0xf2, 0x93, - 0xe5, 0x5f, 0xea, 0x12, 0x8b, 0xb3, 0x6a, 0xb9, 0x8e, 0xc3, 0x06, 0x6f, 0xfb, 0x36, 0x0c, 0x35, - 0x77, 0xe3, 0x56, 0xe2, 0x3f, 0xac, 0x17, 0x95, 0x5b, 0x30, 0x99, 0x79, 0x7a, 0x58, 0xbd, 0x61, - 0x6d, 0x3d, 0xac, 0x37, 0xac, 0xed, 0xaf, 0x5b, 0x30, 0xb8, 0xe6, 0x78, 0xc5, 0x2f, 0x27, 0x94, - 0x69, 0x32, 0x7a, 0x11, 0x86, 0xc8, 0xc6, 0x06, 0x69, 0xc9, 0x37, 0xb1, 0x1f, 0x97, 0x46, 0xcd, - 0x12, 0x83, 0xd2, 0xa9, 0xc9, 0x2a, 0xe3, 0x7f, 0xb1, 0x20, 0xb6, 0xff, 0xa3, 0x05, 0xb0, 0x16, - 0xfa, 0xf2, 0xd8, 0xa6, 0xa0, 0x25, 0x0b, 0x5d, 0x6f, 0x38, 0x3c, 0x95, 0xf3, 0x86, 0x03, 0x4a, - 0x19, 0xe6, 0xbc, 0xe0, 0xa0, 0x7a, 0x53, 0x2d, 0xd5, 0x9b, 0x81, 0x7e, 0x7a, 0xf3, 0x4d, 0x0b, - 0x44, 0x0c, 0x4d, 0x09, 0x49, 0x70, 0x65, 0xde, 0x75, 0x23, 0x5d, 0xc5, 0x33, 0x65, 0x2e, 0x82, - 0x88, 0x24, 0x15, 0x4a, 0x36, 0x8d, 0xd4, 0x14, 0x06, 0x57, 0xba, 0x97, 0x1f, 0xe5, 0xe8, 0x55, - 0x66, 0x41, 0x16, 0xb7, 0xab, 0xaf, 0xcc, 0x5c, 0x2c, 0x2d, 0x39, 0x65, 0xac, 0x12, 0x34, 0xe9, - 0x69, 0xc9, 0x25, 0x02, 0xa7, 0x34, 0xe8, 0x69, 0x18, 0x8e, 0x3b, 0xeb, 0x8c, 0x3c, 0x13, 0x50, - 0xd3, 0xe4, 0x60, 0x2c, 0xf1, 0xf6, 0xcf, 0x21, 0x30, 0xba, 0x66, 0x24, 0x83, 0xb2, 0x1e, 0x7a, - 0x32, 0xa8, 0xb7, 0x60, 0x84, 0x6c, 0xb7, 0x93, 0xdd, 0xba, 0x17, 0x95, 0x4b, 0xcc, 0xb7, 0x24, - 0xa8, 0xbb, 0xb9, 0x4b, 0x0c, 0x56, 0x1c, 0x7b, 0xa4, 0xf6, 0xaa, 0x7e, 0x28, 0x52, 0x7b, 0x0d, - 0xfc, 0xa9, 0xa4, 0xf6, 0x7a, 0x13, 0x86, 0x37, 0xbd, 0x04, 0x93, 0x76, 0x28, 0x2e, 0xfe, 0x15, - 0x9c, 0x87, 0x5d, 0xe3, 0xc4, 0xdd, 0xf9, 0x7a, 0x04, 0x02, 0x4b, 0x76, 0x68, 0x0d, 0x86, 0xf8, - 0xee, 0x43, 0x64, 0xcb, 0xfa, 0x64, 0x19, 0xbf, 0x4c, 0x77, 0xe2, 0x28, 0x11, 0x35, 0x25, 0x78, - 0xc9, 0x54, 0x5e, 0xc3, 0x1f, 0x3c, 0x95, 0x97, 0x4a, 0xc0, 0x35, 0xf2, 0xb0, 0x12, 0x70, 0x19, - 0x89, 0xcc, 0x6a, 0xc7, 0x91, 0xc8, 0xec, 0x9b, 0x16, 0x9c, 0x6d, 0xe7, 0xe5, 0x01, 0x14, 0xa9, - 0xb4, 0x3e, 0x7b, 0x84, 0xbc, 0x88, 0x46, 0xd5, 0xec, 0x3e, 0x56, 0x2e, 0x19, 0xce, 0xaf, 0x58, - 0x66, 0x44, 0x1b, 0xfd, 0xe0, 0x19, 0xd1, 0x8e, 0x3b, 0xe7, 0x56, 0x9a, 0x1f, 0x6d, 0xfc, 0x58, - 0xf2, 0xa3, 0x4d, 0x3c, 0xc4, 0xfc, 0x68, 0x5a, 0x66, 0xb3, 0xc9, 0x87, 0x9b, 0xd9, 0x6c, 0x0b, - 0x46, 0xdd, 0xf0, 0x7e, 0x70, 0xdf, 0x89, 0xdc, 0xf9, 0xc6, 0x8a, 0x48, 0xa4, 0x55, 0x90, 0xb4, - 0xa1, 0x9e, 0x16, 0x30, 0x6a, 0xe0, 0x0e, 0xc8, 0x14, 0x89, 0x75, 0xd6, 0x22, 0xc7, 0xdb, 0xa9, - 0x0f, 0x98, 0xe3, 0xcd, 0xc8, 0x94, 0x86, 0x8e, 0x23, 0x53, 0xda, 0x97, 0xd9, 0xd5, 0xed, 0x0d, - 0x6f, 0x73, 0xd5, 0x69, 0x4f, 0x9f, 0x2e, 0x53, 0xc3, 0xa2, 0x24, 0xef, 0xae, 0x41, 0xa1, 0x70, - 0xca, 0xb4, 0x3b, 0x17, 0xdb, 0x99, 0x93, 0xce, 0xc5, 0x76, 0xf6, 0x18, 0x73, 0xb1, 0x9d, 0x3b, - 0xd1, 0x5c, 0x6c, 0x8f, 0xfc, 0xa9, 0xe4, 0x62, 0xfb, 0x4b, 0x70, 0xfe, 0xf0, 0xcf, 0x91, 0x66, - 0xfb, 0x6d, 0xa4, 0x2e, 0x83, 0x4c, 0xb6, 0x5f, 0x66, 0xea, 0x68, 0x54, 0xa5, 0x53, 0x42, 0xfd, - 0x0b, 0x0b, 0x1e, 0xe9, 0x91, 0x38, 0xa5, 0xf4, 0x6d, 0x86, 0x36, 0x4c, 0xb6, 0xcd, 0xa2, 0xa5, - 0xef, 0x1d, 0x19, 0x89, 0x5a, 0x54, 0x9c, 0x5c, 0x06, 0x81, 0xb3, 0xec, 0x17, 0x3e, 0xfe, 0xe3, - 0xf7, 0xcf, 0x7f, 0xe4, 0x27, 0xef, 0x9f, 0xff, 0xc8, 0xef, 0xbf, 0x7f, 0xfe, 0x23, 0x3f, 0xbb, - 0x7f, 0xde, 0xfa, 0xf1, 0xfe, 0x79, 0xeb, 0x27, 0xfb, 0xe7, 0xad, 0x3f, 0xda, 0x3f, 0x6f, 0x7d, - 0xf3, 0x8f, 0xcf, 0x7f, 0xe4, 0x8b, 0x95, 0x9d, 0x2b, 0xff, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x1a, - 0xda, 0xcb, 0x09, 0x5a, 0xb6, 0x00, 0x00, + // 10019 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x8c, 0x24, 0xc7, + 0x75, 0x98, 0x7a, 0x66, 0xbf, 0xe6, 0xed, 0xe7, 0xd5, 0x7d, 0x70, 0xb9, 0x22, 0x6f, 0x4f, 0x4d, + 0x91, 0x3a, 0x92, 0xc7, 0x5d, 0xdd, 0x91, 0x14, 0x29, 0x91, 0xa1, 0xb4, 0xbb, 0xb3, 0x7b, 0xb7, + 0xba, 0xdb, 0xbb, 0x61, 0xcd, 0x1e, 0x8f, 0x92, 0x08, 0x49, 0xbd, 0xd3, 0xb5, 0xbb, 0xad, 0xeb, + 0xed, 0x1e, 0x76, 0xf7, 0xec, 0xdd, 0x4a, 0x31, 0xe0, 0xc8, 0x8c, 0x8d, 0x40, 0x82, 0xa3, 0x20, + 0x10, 0x12, 0x20, 0x09, 0xa2, 0x04, 0x48, 0xe0, 0xc4, 0xb0, 0x15, 0x45, 0x4a, 0x20, 0xc5, 0xb2, + 0x81, 0x20, 0xb6, 0xa3, 0x20, 0x71, 0x20, 0xfd, 0x89, 0x0d, 0x1b, 0xd8, 0x98, 0xeb, 0xe4, 0x5f, + 0x7e, 0x04, 0xc8, 0xaf, 0x1c, 0x8c, 0x24, 0xa8, 0xcf, 0xae, 0xea, 0xe9, 0xd9, 0xee, 0x39, 0xde, + 0x9c, 0x4f, 0x46, 0xfe, 0xcd, 0xbc, 0xf7, 0xea, 0xd5, 0x47, 0xbf, 0x7a, 0xf5, 0xea, 0xd5, 0xab, + 0x57, 0x70, 0xe1, 0xf6, 0xab, 0xf1, 0x82, 0x17, 0x2e, 0xde, 0xee, 0x6c, 0x91, 0x28, 0x20, 0x09, + 0x89, 0x17, 0xdb, 0xb7, 0x77, 0x16, 0x9d, 0xb6, 0xb7, 0xb8, 0x7f, 0x71, 0x71, 0x87, 0x04, 0x24, + 0x72, 0x12, 0xe2, 0x2e, 0xb4, 0xa3, 0x30, 0x09, 0xd1, 0x13, 0x9c, 0x7a, 0x21, 0xa5, 0x5e, 0x68, + 0xdf, 0xde, 0x59, 0x70, 0xda, 0xde, 0xc2, 0xfe, 0xc5, 0xb9, 0x17, 0x76, 0xbc, 0x64, 0xb7, 0xb3, + 0xb5, 0xd0, 0x0a, 0xf7, 0x16, 0x77, 0xc2, 0x9d, 0x70, 0x91, 0x15, 0xda, 0xea, 0x6c, 0xb3, 0x7f, + 0xec, 0x0f, 0xfb, 0xc5, 0x99, 0xcd, 0x5d, 0xea, 0x5d, 0x75, 0x44, 0xe2, 0xb0, 0x13, 0xb5, 0x48, + 0xb6, 0x01, 0xc7, 0x94, 0x89, 0x17, 0xf7, 0x48, 0xe2, 0xe4, 0x34, 0x7a, 0xee, 0x85, 0xfc, 0x32, + 0x51, 0x27, 0x48, 0xbc, 0xbd, 0xee, 0x2a, 0x5e, 0x3a, 0x9e, 0x3c, 0x6e, 0xed, 0x92, 0x3d, 0xa7, + 0xab, 0xd4, 0xc5, 0xfc, 0x52, 0x9d, 0xc4, 0xf3, 0x17, 0xbd, 0x20, 0x89, 0x93, 0x28, 0x5b, 0xc4, + 0xfe, 0x43, 0x0b, 0xce, 0x2d, 0xdd, 0x6a, 0xae, 0xfa, 0x4e, 0x9c, 0x78, 0xad, 0x65, 0x3f, 0x6c, + 0xdd, 0x6e, 0x26, 0x61, 0x44, 0xde, 0x0a, 0xfd, 0xce, 0x1e, 0x69, 0xb2, 0x01, 0x40, 0x17, 0x60, + 0x6c, 0x9f, 0xfd, 0x5f, 0xaf, 0xcf, 0x5a, 0xe7, 0xac, 0xf3, 0xb5, 0xe5, 0x99, 0x9f, 0x1c, 0xce, + 0x7f, 0xe8, 0xe8, 0x70, 0x7e, 0xec, 0x2d, 0x01, 0xc7, 0x8a, 0x02, 0x3d, 0x03, 0x23, 0xdb, 0xf1, + 0xe6, 0x41, 0x9b, 0xcc, 0x56, 0x18, 0xed, 0x94, 0xa0, 0x1d, 0x59, 0x6b, 0x52, 0x28, 0x16, 0x58, + 0xb4, 0x08, 0xb5, 0xb6, 0x13, 0x25, 0x5e, 0xe2, 0x85, 0xc1, 0x6c, 0xf5, 0x9c, 0x75, 0x7e, 0x78, + 0xf9, 0x84, 0x20, 0xad, 0x35, 0x24, 0x02, 0xa7, 0x34, 0xb4, 0x19, 0x11, 0x71, 0xdc, 0x1b, 0x81, + 0x7f, 0x30, 0x3b, 0x74, 0xce, 0x3a, 0x3f, 0x96, 0x36, 0x03, 0x0b, 0x38, 0x56, 0x14, 0xf6, 0x0f, + 0x2b, 0x30, 0xb6, 0xb4, 0xbd, 0xed, 0x05, 0x5e, 0x72, 0x80, 0xbe, 0x0c, 0x13, 0x41, 0xe8, 0x12, + 0xf9, 0x9f, 0xf5, 0x62, 0xfc, 0xd2, 0x73, 0x0b, 0xc7, 0x89, 0xd2, 0xc2, 0x75, 0xad, 0xc4, 0xf2, + 0xcc, 0xd1, 0xe1, 0xfc, 0x84, 0x0e, 0xc1, 0x06, 0x47, 0xf4, 0x0e, 0x8c, 0xb7, 0x43, 0x57, 0x55, + 0x50, 0x61, 0x15, 0x3c, 0x7b, 0x7c, 0x05, 0x8d, 0xb4, 0xc0, 0xf2, 0xf4, 0xd1, 0xe1, 0xfc, 0xb8, + 0x06, 0xc0, 0x3a, 0x3b, 0xe4, 0xc3, 0x34, 0xfd, 0x1b, 0x24, 0x9e, 0xaa, 0xa1, 0xca, 0x6a, 0x78, + 0xa1, 0xb8, 0x06, 0xad, 0xd0, 0xf2, 0xc9, 0xa3, 0xc3, 0xf9, 0xe9, 0x0c, 0x10, 0x67, 0x59, 0xdb, + 0x5f, 0x85, 0xa9, 0xa5, 0x24, 0x71, 0x5a, 0xbb, 0xc4, 0xe5, 0xdf, 0x17, 0xbd, 0x04, 0x43, 0x81, + 0xb3, 0x47, 0xc4, 0xd7, 0x3f, 0x27, 0x86, 0x7d, 0xe8, 0xba, 0xb3, 0x47, 0xee, 0x1d, 0xce, 0xcf, + 0xdc, 0x0c, 0xbc, 0x77, 0x3b, 0x42, 0x66, 0x28, 0x0c, 0x33, 0x6a, 0x74, 0x09, 0xc0, 0x25, 0xfb, + 0x5e, 0x8b, 0x34, 0x9c, 0x64, 0x57, 0x48, 0x03, 0x12, 0x65, 0xa1, 0xae, 0x30, 0x58, 0xa3, 0xb2, + 0xbf, 0x6e, 0x41, 0x6d, 0x69, 0x3f, 0xf4, 0xdc, 0x46, 0xe8, 0xc6, 0xa8, 0x03, 0xd3, 0xed, 0x88, + 0x6c, 0x93, 0x48, 0x81, 0x66, 0xad, 0x73, 0xd5, 0xf3, 0xe3, 0x97, 0x2e, 0x15, 0xf4, 0xdb, 0x2c, + 0xb4, 0x1a, 0x24, 0xd1, 0xc1, 0xf2, 0x63, 0xa2, 0xea, 0xe9, 0x0c, 0x16, 0x67, 0xeb, 0xb0, 0xff, + 0x56, 0x05, 0x4e, 0x2f, 0x7d, 0xb5, 0x13, 0x91, 0xba, 0x17, 0xdf, 0xce, 0x4e, 0x05, 0xd7, 0x8b, + 0x6f, 0x5f, 0x4f, 0x07, 0x43, 0xc9, 0x60, 0x5d, 0xc0, 0xb1, 0xa2, 0x40, 0x2f, 0xc0, 0x28, 0xfd, + 0x7d, 0x13, 0xaf, 0x8b, 0xde, 0x9f, 0x14, 0xc4, 0xe3, 0x75, 0x27, 0x71, 0xea, 0x1c, 0x85, 0x25, + 0x0d, 0xda, 0x80, 0xf1, 0x96, 0xd3, 0xda, 0xf5, 0x82, 0x9d, 0x8d, 0xd0, 0x25, 0xec, 0x0b, 0xd7, + 0x96, 0x9f, 0xa7, 0xe4, 0x2b, 0x29, 0xf8, 0xde, 0xe1, 0xfc, 0x2c, 0x6f, 0x9b, 0x60, 0xa1, 0xe1, + 0xb0, 0x5e, 0x1e, 0xd9, 0x6a, 0x22, 0x0e, 0x31, 0x4e, 0x90, 0x33, 0x09, 0xcf, 0x6b, 0x73, 0x6a, + 0x98, 0xcd, 0xa9, 0x89, 0x1e, 0xf3, 0xe9, 0x9f, 0x5b, 0x62, 0x4c, 0xd6, 0x3c, 0xdf, 0x54, 0x0f, + 0x97, 0x00, 0x62, 0xd2, 0x8a, 0x48, 0xa2, 0x8d, 0x8a, 0xfa, 0xcc, 0x4d, 0x85, 0xc1, 0x1a, 0x15, + 0x9d, 0xfc, 0xf1, 0xae, 0x13, 0x31, 0x69, 0x11, 0x63, 0xa3, 0x26, 0x7f, 0x53, 0x22, 0x70, 0x4a, + 0x63, 0x4c, 0xfe, 0x6a, 0xe1, 0xe4, 0xff, 0x37, 0x16, 0x8c, 0x2e, 0x7b, 0x81, 0xeb, 0x05, 0x3b, + 0xe8, 0x6d, 0x18, 0xa3, 0x5a, 0xd9, 0x75, 0x12, 0x47, 0xcc, 0xfb, 0xf3, 0xc7, 0x0b, 0xcf, 0x8d, + 0xad, 0xaf, 0x90, 0x56, 0xb2, 0x41, 0x12, 0x27, 0xed, 0x46, 0x0a, 0xc3, 0x8a, 0x1b, 0xba, 0x09, + 0x23, 0x89, 0x13, 0xed, 0x90, 0x44, 0x4c, 0xf7, 0x17, 0xca, 0xf0, 0xc5, 0x54, 0xd4, 0x48, 0xd0, + 0x22, 0xa9, 0x62, 0xdc, 0x64, 0x4c, 0xb0, 0x60, 0x66, 0xb7, 0x60, 0x62, 0xc5, 0x69, 0x3b, 0x5b, + 0x9e, 0xef, 0x25, 0x1e, 0x89, 0xd1, 0xc7, 0xa0, 0xea, 0xb8, 0x2e, 0x13, 0xfc, 0xda, 0xf2, 0xe9, + 0xa3, 0xc3, 0xf9, 0xea, 0x92, 0xeb, 0xde, 0x3b, 0x9c, 0x07, 0x45, 0x75, 0x80, 0x29, 0x05, 0x7a, + 0x0e, 0x86, 0xdc, 0x28, 0x6c, 0xcf, 0x56, 0x18, 0xe5, 0x19, 0x3a, 0x43, 0xeb, 0x51, 0xd8, 0xce, + 0x90, 0x32, 0x1a, 0xfb, 0xf7, 0x2a, 0x80, 0x56, 0x48, 0x7b, 0x77, 0xad, 0x69, 0x7c, 0xcb, 0xf3, + 0x30, 0xb6, 0x17, 0x06, 0x5e, 0x12, 0x46, 0xb1, 0xa8, 0x90, 0xc9, 0xc3, 0x86, 0x80, 0x61, 0x85, + 0x45, 0xe7, 0x60, 0xa8, 0x9d, 0x4e, 0xeb, 0x09, 0xa9, 0x12, 0xd8, 0x84, 0x66, 0x18, 0x4a, 0xd1, + 0x89, 0x49, 0x24, 0xe4, 0x58, 0x51, 0xdc, 0x8c, 0x49, 0x84, 0x19, 0x26, 0x95, 0x1c, 0x2a, 0x53, + 0x42, 0x4a, 0x33, 0x92, 0x43, 0x31, 0x58, 0xa3, 0x42, 0x5f, 0x82, 0x1a, 0xff, 0x87, 0xc9, 0x36, + 0x13, 0xd9, 0x42, 0x65, 0x70, 0x2d, 0x6c, 0x39, 0x7e, 0x76, 0xf0, 0x27, 0x99, 0xa4, 0x49, 0x46, + 0x38, 0xe5, 0x69, 0x48, 0xda, 0x48, 0xa1, 0xa4, 0xfd, 0x5d, 0x0b, 0xd0, 0x8a, 0x17, 0xb8, 0x24, + 0x7a, 0x08, 0x4b, 0x66, 0x7f, 0x93, 0xe0, 0x4f, 0x68, 0xd3, 0xc2, 0xbd, 0x76, 0x18, 0x90, 0x20, + 0x59, 0x09, 0x03, 0x97, 0x2f, 0xa3, 0x9f, 0x82, 0xa1, 0x84, 0x56, 0xc5, 0x9b, 0xf5, 0x8c, 0xfc, + 0x2c, 0xb4, 0x82, 0x7b, 0x87, 0xf3, 0x67, 0xba, 0x4b, 0xb0, 0x26, 0xb0, 0x32, 0xe8, 0x93, 0x30, + 0x12, 0x27, 0x4e, 0xd2, 0x89, 0x45, 0x43, 0x3f, 0x22, 0x1b, 0xda, 0x64, 0xd0, 0x7b, 0x87, 0xf3, + 0xd3, 0xaa, 0x18, 0x07, 0x61, 0x51, 0x00, 0x3d, 0x0b, 0xa3, 0x7b, 0x24, 0x8e, 0x9d, 0x1d, 0xa9, + 0xd8, 0xa6, 0x45, 0xd9, 0xd1, 0x0d, 0x0e, 0xc6, 0x12, 0x8f, 0x9e, 0x82, 0x61, 0x12, 0x45, 0x61, + 0x24, 0x24, 0x62, 0x52, 0x10, 0x0e, 0xaf, 0x52, 0x20, 0xe6, 0x38, 0xfb, 0x67, 0x16, 0x4c, 0xab, + 0xb6, 0xf2, 0xba, 0x06, 0x38, 0xd5, 0x5d, 0x80, 0x96, 0xec, 0x58, 0xcc, 0x26, 0xd8, 0xf8, 0xa5, + 0x8f, 0x1f, 0xcf, 0xbb, 0x7b, 0x20, 0xd3, 0x3a, 0x14, 0x28, 0xc6, 0x1a, 0x5f, 0xfb, 0xf7, 0x2c, + 0x38, 0x99, 0xe9, 0xd3, 0x35, 0x2f, 0x4e, 0xd0, 0xe7, 0xbb, 0xfa, 0x75, 0xa1, 0x77, 0xdd, 0xf1, + 0x02, 0xa5, 0x65, 0x82, 0xef, 0xc5, 0xbc, 0x6f, 0x4a, 0x4a, 0x24, 0x44, 0xeb, 0x19, 0x86, 0x61, + 0x2f, 0x21, 0x7b, 0xb2, 0x53, 0x2f, 0x94, 0xec, 0x14, 0x6f, 0x5d, 0xfa, 0x6d, 0xd6, 0x29, 0x0f, + 0xcc, 0x59, 0xd9, 0xff, 0xcb, 0x82, 0xda, 0x4a, 0x18, 0x6c, 0x7b, 0x3b, 0x1b, 0x4e, 0x7b, 0x80, + 0x5f, 0xa5, 0x09, 0x43, 0x8c, 0x2b, 0x6f, 0xfa, 0xc5, 0xa2, 0xa6, 0x8b, 0x06, 0x2d, 0xd0, 0x95, + 0x93, 0x9b, 0x04, 0x4a, 0x29, 0x51, 0x10, 0x66, 0xcc, 0xe6, 0x5e, 0x81, 0x9a, 0x22, 0x40, 0x33, + 0x50, 0xbd, 0x4d, 0xb8, 0xbd, 0x58, 0xc3, 0xf4, 0x27, 0x3a, 0x05, 0xc3, 0xfb, 0x8e, 0xdf, 0x11, + 0x53, 0x15, 0xf3, 0x3f, 0x9f, 0xaa, 0xbc, 0x6a, 0xd9, 0x3f, 0xb6, 0xe0, 0x94, 0xaa, 0xe4, 0x2a, + 0x39, 0x68, 0x12, 0x9f, 0xb4, 0x92, 0x30, 0x42, 0xef, 0x59, 0x70, 0xca, 0xcf, 0x51, 0x42, 0x62, + 0x34, 0xee, 0x47, 0x7d, 0x3d, 0x21, 0x1a, 0x7e, 0x2a, 0x0f, 0x8b, 0x73, 0x6b, 0x43, 0x4f, 0xf2, + 0xbe, 0xf0, 0x99, 0x3b, 0x2e, 0x18, 0x54, 0xaf, 0x92, 0x03, 0xd6, 0x31, 0xfb, 0x47, 0x16, 0x4c, + 0xaa, 0xe6, 0x0f, 0x5c, 0xec, 0xae, 0x99, 0x62, 0xf7, 0xb1, 0x92, 0xdf, 0xae, 0x87, 0xc0, 0xfd, + 0xc3, 0x0a, 0x9c, 0x56, 0x34, 0x86, 0x22, 0x7e, 0x44, 0xc6, 0xbe, 0xbf, 0xee, 0x5e, 0x25, 0x07, + 0x9b, 0x21, 0x5d, 0x49, 0xf3, 0xbb, 0x8b, 0x2e, 0xc2, 0xb8, 0x4b, 0xb6, 0x9d, 0x8e, 0x9f, 0x28, + 0x43, 0x71, 0x98, 0xef, 0x20, 0xea, 0x29, 0x18, 0xeb, 0x34, 0xf6, 0x1f, 0xd4, 0xd8, 0x94, 0x4c, + 0x1c, 0x2f, 0x20, 0x11, 0x5d, 0x9a, 0x35, 0x7b, 0x7e, 0x42, 0xb7, 0xe7, 0x85, 0xed, 0xfe, 0x14, + 0x0c, 0x7b, 0x7b, 0x54, 0x59, 0x57, 0x4c, 0x1d, 0xbc, 0x4e, 0x81, 0x98, 0xe3, 0xd0, 0xd3, 0x30, + 0xda, 0x0a, 0xf7, 0xf6, 0x9c, 0xc0, 0x9d, 0xad, 0x32, 0x63, 0x61, 0x9c, 0xea, 0xf3, 0x15, 0x0e, + 0xc2, 0x12, 0x87, 0x9e, 0x80, 0x21, 0x27, 0xda, 0x89, 0x67, 0x87, 0x18, 0xcd, 0x18, 0xad, 0x69, + 0x29, 0xda, 0x89, 0x31, 0x83, 0x52, 0x23, 0xe0, 0x4e, 0x18, 0xdd, 0xf6, 0x82, 0x9d, 0xba, 0x17, + 0xb1, 0x15, 0x5d, 0x33, 0x02, 0x6e, 0x29, 0x0c, 0xd6, 0xa8, 0x50, 0x03, 0x86, 0xdb, 0x61, 0x94, + 0xc4, 0xb3, 0x23, 0x6c, 0x38, 0x9f, 0x2f, 0x94, 0x1e, 0xde, 0xef, 0x46, 0x18, 0x25, 0x69, 0x57, + 0xe8, 0xbf, 0x18, 0x73, 0x46, 0x68, 0x05, 0xaa, 0x24, 0xd8, 0x9f, 0x1d, 0x65, 0xfc, 0x3e, 0x7a, + 0x3c, 0xbf, 0xd5, 0x60, 0xff, 0x2d, 0x27, 0x4a, 0xa7, 0xd0, 0x6a, 0xb0, 0x8f, 0x69, 0x69, 0xd4, + 0x82, 0x9a, 0xf4, 0x1a, 0xc4, 0xb3, 0x63, 0x65, 0x04, 0x0c, 0x0b, 0x72, 0x4c, 0xde, 0xed, 0x78, + 0x11, 0xd9, 0x23, 0x41, 0x12, 0xa7, 0x96, 0xb0, 0xc4, 0xc6, 0x38, 0xe5, 0x8b, 0x5a, 0x30, 0xc1, + 0x0d, 0x87, 0x8d, 0xb0, 0x13, 0x24, 0xf1, 0x6c, 0x8d, 0x35, 0xb9, 0x60, 0xab, 0xf9, 0x56, 0x5a, + 0x62, 0xf9, 0x94, 0x60, 0x3f, 0xa1, 0x01, 0x63, 0x6c, 0x30, 0x45, 0xef, 0xc0, 0xa4, 0xef, 0xed, + 0x93, 0x80, 0xc4, 0x71, 0x23, 0x0a, 0xb7, 0xc8, 0x2c, 0xb0, 0xde, 0x3c, 0x55, 0xb4, 0xed, 0x0a, + 0xb7, 0xc8, 0xf2, 0x89, 0xa3, 0xc3, 0xf9, 0xc9, 0x6b, 0x7a, 0x69, 0x6c, 0x32, 0x43, 0x5f, 0x82, + 0x29, 0x6a, 0xa5, 0x78, 0x29, 0xfb, 0xf1, 0xf2, 0xec, 0xd1, 0xd1, 0xe1, 0xfc, 0x14, 0x36, 0x8a, + 0xe3, 0x0c, 0x3b, 0xb4, 0x09, 0x35, 0xdf, 0xdb, 0x26, 0xad, 0x83, 0x96, 0x4f, 0x66, 0x27, 0x18, + 0xef, 0x82, 0x29, 0x77, 0x4d, 0x92, 0x73, 0xcb, 0x50, 0xfd, 0xc5, 0x29, 0x23, 0xf4, 0x16, 0x9c, + 0x49, 0x48, 0xb4, 0xe7, 0x05, 0x0e, 0x5d, 0xae, 0x85, 0xd9, 0xc2, 0xf6, 0xb6, 0x93, 0x4c, 0x6a, + 0xcf, 0x8a, 0x81, 0x3d, 0xb3, 0x99, 0x4b, 0x85, 0x7b, 0x94, 0x46, 0x37, 0x60, 0x9a, 0xcd, 0xa7, + 0x46, 0xc7, 0xf7, 0x1b, 0xa1, 0xef, 0xb5, 0x0e, 0x66, 0xa7, 0x18, 0xc3, 0xa7, 0xe5, 0x8e, 0x75, + 0xdd, 0x44, 0x53, 0x8b, 0x3e, 0xfd, 0x87, 0xb3, 0xa5, 0x91, 0x0f, 0xd3, 0x31, 0x69, 0x75, 0x22, + 0x2f, 0x39, 0xa0, 0xb2, 0x4f, 0xee, 0x26, 0xb3, 0xd3, 0x65, 0x76, 0x28, 0x4d, 0xb3, 0x10, 0x77, + 0x17, 0x64, 0x80, 0x38, 0xcb, 0x9a, 0xaa, 0x8a, 0x38, 0x71, 0xbd, 0x60, 0x76, 0x86, 0x99, 0xa4, + 0x6a, 0x7e, 0x35, 0x29, 0x10, 0x73, 0x1c, 0xdb, 0xf0, 0xd1, 0x1f, 0x37, 0xa8, 0xee, 0x3d, 0xc1, + 0x08, 0xd3, 0x0d, 0x9f, 0x44, 0xe0, 0x94, 0x86, 0xae, 0x56, 0x49, 0x72, 0x30, 0x8b, 0x18, 0xa9, + 0x9a, 0x6a, 0x9b, 0x9b, 0x9f, 0xc3, 0x14, 0x6e, 0x6f, 0xc1, 0x94, 0x9a, 0xd6, 0x6c, 0x74, 0xd0, + 0x3c, 0x0c, 0x53, 0xcd, 0x25, 0xf7, 0x2d, 0x35, 0xda, 0x04, 0xaa, 0xd0, 0x62, 0xcc, 0xe1, 0xac, + 0x09, 0xde, 0x57, 0xc9, 0xf2, 0x41, 0x42, 0xb8, 0xfd, 0x5a, 0xd5, 0x9a, 0x20, 0x11, 0x38, 0xa5, + 0xb1, 0xff, 0x0f, 0x5f, 0x11, 0x53, 0xdd, 0x51, 0x42, 0x6f, 0x5e, 0x80, 0xb1, 0xdd, 0x30, 0x4e, + 0x28, 0x35, 0xab, 0x63, 0x38, 0x5d, 0x05, 0xaf, 0x08, 0x38, 0x56, 0x14, 0xe8, 0x35, 0x98, 0x6c, + 0xe9, 0x15, 0x08, 0x55, 0x7e, 0x5a, 0x14, 0x31, 0x6b, 0xc7, 0x26, 0x2d, 0x7a, 0x15, 0xc6, 0x98, + 0x13, 0xaf, 0x15, 0xfa, 0xc2, 0x52, 0x96, 0x2b, 0xd3, 0x58, 0x43, 0xc0, 0xef, 0x69, 0xbf, 0xb1, + 0xa2, 0xa6, 0xfb, 0x0d, 0xda, 0x84, 0xf5, 0x86, 0x50, 0xb7, 0x6a, 0xbf, 0x71, 0x85, 0x41, 0xb1, + 0xc0, 0xda, 0xff, 0xa2, 0xa2, 0x8d, 0x32, 0xb5, 0xf8, 0x08, 0xfa, 0x3c, 0x8c, 0xde, 0x71, 0xbc, + 0xc4, 0x0b, 0x76, 0xc4, 0x0a, 0xfa, 0x62, 0x49, 0xdd, 0xcb, 0x8a, 0xdf, 0xe2, 0x45, 0xf9, 0x3a, + 0x21, 0xfe, 0x60, 0xc9, 0x90, 0xf2, 0x8e, 0x3a, 0x41, 0x40, 0x79, 0x57, 0xfa, 0xe7, 0x8d, 0x79, + 0x51, 0xce, 0x5b, 0xfc, 0xc1, 0x92, 0x21, 0xda, 0x06, 0x90, 0xb3, 0x8f, 0xb8, 0xc2, 0x79, 0xf6, + 0x89, 0x7e, 0xd8, 0x6f, 0xaa, 0xd2, 0xcb, 0x53, 0x74, 0x65, 0x4a, 0xff, 0x63, 0x8d, 0xb3, 0x1d, + 0x31, 0x43, 0xa4, 0xbb, 0x59, 0xe8, 0x73, 0x74, 0x02, 0x38, 0x51, 0x42, 0xdc, 0xa5, 0xa4, 0xd8, + 0x0c, 0x4e, 0xad, 0xa9, 0x4d, 0x6f, 0x8f, 0xe8, 0x53, 0x45, 0xb0, 0xc0, 0x29, 0x37, 0xfb, 0xfb, + 0x55, 0x98, 0xed, 0xd5, 0x58, 0x2a, 0x90, 0xe4, 0xae, 0x97, 0xac, 0x50, 0x43, 0xc1, 0x32, 0x05, + 0x72, 0x55, 0xc0, 0xb1, 0xa2, 0xa0, 0x92, 0x11, 0x7b, 0x3b, 0x81, 0xe3, 0x0b, 0xe1, 0x55, 0x92, + 0xd1, 0x64, 0x50, 0x2c, 0xb0, 0x94, 0x2e, 0x22, 0x4e, 0x2c, 0x3c, 0xb7, 0x9a, 0x04, 0x61, 0x06, + 0xc5, 0x02, 0xab, 0xef, 0xfa, 0x86, 0x0a, 0x76, 0x7d, 0xc6, 0x00, 0x0d, 0x3f, 0xc8, 0x01, 0x42, + 0xef, 0x00, 0x6c, 0x7b, 0x81, 0x17, 0xef, 0x32, 0xde, 0x23, 0x7d, 0xf2, 0x56, 0xc6, 0xc8, 0x9a, + 0xe2, 0x81, 0x35, 0x7e, 0xe8, 0x65, 0x18, 0x57, 0x13, 0x73, 0xbd, 0x3e, 0x3b, 0x6a, 0x7a, 0xfa, + 0x52, 0x2d, 0x55, 0xc7, 0x3a, 0x9d, 0xfd, 0x95, 0xac, 0xa4, 0x88, 0xf9, 0xa0, 0x8d, 0xad, 0x55, + 0x76, 0x6c, 0x2b, 0xc7, 0x8f, 0xad, 0xfd, 0x5f, 0xaa, 0x74, 0xb3, 0xac, 0x55, 0xd6, 0x89, 0x4b, + 0xe8, 0xb2, 0x37, 0xa9, 0x62, 0x77, 0x12, 0x22, 0x66, 0xe3, 0x85, 0x7e, 0xa6, 0x8b, 0xbe, 0x0c, + 0xd0, 0x59, 0xc0, 0x39, 0xa1, 0x5d, 0xa8, 0xf9, 0x4e, 0xcc, 0x76, 0x8f, 0x44, 0xcc, 0xc2, 0xfe, + 0xd8, 0xa6, 0xc6, 0xb7, 0x13, 0x27, 0xda, 0x3a, 0xcb, 0x6b, 0x49, 0x99, 0xd3, 0x55, 0x89, 0x1a, + 0x05, 0xf2, 0xa8, 0x40, 0x35, 0x87, 0x5a, 0x0e, 0x07, 0x98, 0xe3, 0xd0, 0xab, 0x30, 0x11, 0x11, + 0x26, 0x27, 0x2b, 0xd4, 0xee, 0x61, 0x62, 0x37, 0x9c, 0x1a, 0x48, 0x58, 0xc3, 0x61, 0x83, 0x32, + 0xb5, 0x8f, 0x47, 0x8e, 0xb1, 0x8f, 0x9f, 0x85, 0x51, 0xf6, 0x43, 0x49, 0x85, 0xfa, 0x42, 0xeb, + 0x1c, 0x8c, 0x25, 0x3e, 0x2b, 0x44, 0x63, 0x25, 0x85, 0xe8, 0x39, 0x98, 0xaa, 0x3b, 0x64, 0x2f, + 0x0c, 0x56, 0x03, 0xb7, 0x1d, 0x7a, 0x41, 0x82, 0x66, 0x61, 0x88, 0xad, 0x24, 0x7c, 0xae, 0x0f, + 0x51, 0x0e, 0x78, 0x88, 0xda, 0xb8, 0xf6, 0xff, 0xb5, 0x60, 0xb2, 0x4e, 0x7c, 0x92, 0x90, 0x1b, + 0x6d, 0xe6, 0x6f, 0x40, 0x6b, 0x80, 0x76, 0x22, 0xa7, 0x45, 0x1a, 0x24, 0xf2, 0x42, 0xb7, 0x49, + 0x5a, 0x61, 0xc0, 0x3c, 0xec, 0x74, 0x69, 0x3c, 0x73, 0x74, 0x38, 0x8f, 0x2e, 0x77, 0x61, 0x71, + 0x4e, 0x09, 0xe4, 0xc2, 0x64, 0x3b, 0x22, 0x86, 0x83, 0xc4, 0x2a, 0x36, 0xcb, 0x1b, 0x7a, 0x11, + 0x6e, 0x35, 0x1a, 0x20, 0x6c, 0x32, 0x45, 0x9f, 0x81, 0x99, 0x30, 0x6a, 0xef, 0x3a, 0x41, 0x9d, + 0xb4, 0x49, 0xe0, 0x52, 0x53, 0x59, 0x78, 0xc1, 0x4e, 0x1d, 0x1d, 0xce, 0xcf, 0xdc, 0xc8, 0xe0, + 0x70, 0x17, 0xb5, 0xfd, 0xeb, 0x15, 0x38, 0x5d, 0x0f, 0xef, 0x04, 0x77, 0x9c, 0xc8, 0x5d, 0x6a, + 0xac, 0x73, 0xfb, 0x97, 0x79, 0x15, 0xa5, 0x37, 0xd3, 0xea, 0xe9, 0xcd, 0xfc, 0x02, 0x8c, 0x6d, + 0x7b, 0xc4, 0x77, 0x31, 0xd9, 0x16, 0xdd, 0xbb, 0x58, 0xc6, 0x8b, 0xb1, 0x46, 0xcb, 0x48, 0x4f, + 0x00, 0x77, 0xa6, 0xae, 0x09, 0x36, 0x58, 0x31, 0x44, 0x1d, 0x98, 0x91, 0x06, 0xbe, 0xc4, 0x8a, + 0xd9, 0xf1, 0x62, 0xb9, 0xfd, 0x83, 0x59, 0x0d, 0x1b, 0x0f, 0x9c, 0x61, 0x88, 0xbb, 0xaa, 0xa0, + 0x1b, 0xb3, 0x3d, 0xba, 0x2e, 0x0c, 0x31, 0x59, 0x61, 0x1b, 0x33, 0xb6, 0x73, 0x64, 0x50, 0xfb, + 0x9f, 0x5a, 0xf0, 0x58, 0xd7, 0x68, 0x89, 0x6d, 0xf5, 0xdb, 0x72, 0x3f, 0xcb, 0x8f, 0x63, 0x0a, + 0x5a, 0x99, 0x3b, 0xe6, 0xe5, 0xf6, 0xb6, 0x95, 0x12, 0x7b, 0xdb, 0x1b, 0x70, 0x6a, 0x75, 0xaf, + 0x9d, 0x1c, 0xd4, 0x3d, 0xd3, 0x09, 0xfb, 0x0a, 0x8c, 0xec, 0x11, 0xd7, 0xeb, 0xec, 0x89, 0xcf, + 0x3a, 0x2f, 0x15, 0xe9, 0x06, 0x83, 0xde, 0x3b, 0x9c, 0x9f, 0x6c, 0x26, 0x61, 0xe4, 0xec, 0x10, + 0x0e, 0xc0, 0x82, 0xdc, 0x7e, 0xdf, 0x82, 0x69, 0x39, 0xa1, 0x96, 0x5c, 0x37, 0x22, 0x71, 0x8c, + 0xe6, 0xa0, 0xe2, 0xb5, 0x05, 0x23, 0x10, 0x8c, 0x2a, 0xeb, 0x0d, 0x5c, 0xf1, 0xda, 0xe8, 0xf3, + 0x50, 0xe3, 0xbe, 0xfb, 0x54, 0x38, 0xfa, 0x3c, 0x0b, 0x60, 0x9b, 0x8e, 0x4d, 0xc9, 0x03, 0xa7, + 0xec, 0xa4, 0x41, 0xc9, 0x54, 0x75, 0xd5, 0xf4, 0x24, 0x5f, 0x11, 0x70, 0xac, 0x28, 0xd0, 0x79, + 0x18, 0x0b, 0x42, 0x97, 0x1f, 0xab, 0xf0, 0x05, 0x97, 0x89, 0xdc, 0x75, 0x01, 0xc3, 0x0a, 0x6b, + 0x7f, 0xd3, 0x82, 0x09, 0xd9, 0xc7, 0x92, 0xb6, 0x2d, 0x9d, 0x24, 0xa9, 0x5d, 0x9b, 0x4e, 0x12, + 0x6a, 0x9b, 0x32, 0x8c, 0x61, 0x92, 0x56, 0xfb, 0x31, 0x49, 0xed, 0x1f, 0x55, 0x60, 0x4a, 0x36, + 0xa7, 0xd9, 0xd9, 0x8a, 0x49, 0x82, 0xbe, 0x08, 0x35, 0x87, 0x0f, 0x3e, 0x91, 0x72, 0xf6, 0x42, + 0xd1, 0xc6, 0xdc, 0xf8, 0x66, 0xa9, 0x55, 0xb0, 0x24, 0xf9, 0xe0, 0x94, 0x25, 0xda, 0x87, 0x13, + 0x41, 0x98, 0xb0, 0xf5, 0x40, 0xe1, 0xcb, 0x79, 0x41, 0xb3, 0xf5, 0x3c, 0x2e, 0xea, 0x39, 0x71, + 0x3d, 0xcb, 0x0f, 0x77, 0x57, 0x81, 0x6e, 0x48, 0xe7, 0x45, 0x95, 0xd5, 0xf5, 0x5c, 0xb9, 0xba, + 0x7a, 0xfb, 0x2e, 0xec, 0xdf, 0xb1, 0xa0, 0x26, 0xc9, 0x06, 0xe9, 0x04, 0xbf, 0x05, 0xa3, 0x31, + 0xfb, 0x34, 0x72, 0x98, 0x2e, 0x94, 0x6b, 0x3a, 0xff, 0x9e, 0xe9, 0xe2, 0xc7, 0xff, 0xc7, 0x58, + 0x72, 0x63, 0xae, 0x47, 0xd5, 0x81, 0x47, 0xcc, 0xf5, 0xa8, 0xda, 0xd5, 0xc3, 0xf5, 0xf8, 0x6b, + 0x16, 0x8c, 0x70, 0x87, 0x50, 0x39, 0xaf, 0x9a, 0xe6, 0x3c, 0x4e, 0x39, 0xbe, 0x45, 0x81, 0xc2, + 0x97, 0x8c, 0x6e, 0x41, 0x8d, 0xfd, 0x58, 0x8b, 0xc2, 0x3d, 0xb1, 0x0a, 0x3c, 0x57, 0xc6, 0x21, + 0xc5, 0xb5, 0x1e, 0x57, 0x25, 0x6f, 0x49, 0x06, 0x38, 0xe5, 0x65, 0xff, 0xb8, 0x4a, 0xa7, 0x7c, + 0x4a, 0x6a, 0xac, 0x69, 0xd6, 0xc3, 0x58, 0xd3, 0x2a, 0x83, 0x5f, 0xd3, 0xde, 0x85, 0xe9, 0x96, + 0xe6, 0x84, 0x4f, 0x57, 0xd2, 0x4b, 0x25, 0x5d, 0xcc, 0x9a, 0xe7, 0x9e, 0x3b, 0x40, 0x56, 0x4c, + 0x76, 0x38, 0xcb, 0x1f, 0x11, 0x98, 0xe0, 0xc7, 0x87, 0xa2, 0xbe, 0x21, 0x56, 0xdf, 0x62, 0xa1, + 0xaf, 0x85, 0x97, 0x50, 0x95, 0xb1, 0x10, 0x93, 0xa6, 0xc6, 0x08, 0x1b, 0x6c, 0xed, 0x5f, 0x1d, + 0x86, 0xe1, 0xd5, 0x7d, 0x12, 0x24, 0x03, 0x9c, 0xe2, 0x7b, 0x30, 0xe5, 0x05, 0xfb, 0xa1, 0xbf, + 0x4f, 0x5c, 0x8e, 0xbf, 0xbf, 0xe5, 0xec, 0x8c, 0xa8, 0x64, 0x6a, 0xdd, 0x60, 0x86, 0x33, 0xcc, + 0x07, 0xb1, 0x8d, 0x7c, 0x13, 0x46, 0xb8, 0x44, 0x88, 0x3d, 0x64, 0x81, 0x63, 0x94, 0x0d, 0xa8, + 0x98, 0x39, 0xe9, 0x66, 0x97, 0xfb, 0x64, 0x05, 0x23, 0xb4, 0x0b, 0x53, 0xdb, 0x5e, 0x14, 0x27, + 0x74, 0x37, 0x18, 0x27, 0xce, 0x5e, 0xbb, 0xef, 0x2d, 0xa4, 0x1a, 0x8f, 0x35, 0x83, 0x0f, 0xce, + 0xf0, 0x45, 0x04, 0x26, 0xe9, 0x0e, 0x26, 0xad, 0x68, 0xb4, 0xcf, 0x8a, 0x94, 0xe7, 0xe8, 0x9a, + 0xce, 0x06, 0x9b, 0x5c, 0xa9, 0x1a, 0x6a, 0xb1, 0xfd, 0xce, 0x18, 0x5b, 0xc9, 0x95, 0x1a, 0xe2, + 0x1b, 0x1d, 0x8e, 0xa3, 0xda, 0x8c, 0x9d, 0x13, 0xd7, 0x4c, 0x6d, 0x96, 0x9e, 0x06, 0xdb, 0xdf, + 0xa3, 0xeb, 0x0e, 0x1d, 0xbf, 0x81, 0xab, 0xec, 0x2b, 0xa6, 0xca, 0x7e, 0xaa, 0xc4, 0x37, 0xed, + 0xa1, 0xae, 0xbf, 0x0c, 0xe3, 0xda, 0x27, 0x47, 0x8b, 0x50, 0x6b, 0xc9, 0x23, 0x4d, 0xa1, 0xb7, + 0x95, 0xd1, 0xa0, 0xce, 0x3a, 0x71, 0x4a, 0x43, 0x47, 0x85, 0x1a, 0x5b, 0xd9, 0xb0, 0x07, 0x6a, + 0x8a, 0x61, 0x86, 0xb1, 0x5f, 0x04, 0x58, 0xbd, 0x4b, 0x5a, 0x4b, 0x2d, 0x76, 0xda, 0xae, 0x1d, + 0x91, 0x58, 0xbd, 0x8f, 0x48, 0xe8, 0x50, 0x4e, 0xad, 0xad, 0x18, 0xd6, 0xeb, 0x02, 0x00, 0xb7, + 0x02, 0x6f, 0xdd, 0xba, 0x2e, 0x9d, 0x9a, 0xdc, 0xf3, 0xa4, 0xa0, 0x58, 0xa3, 0x40, 0x8f, 0x43, + 0xd5, 0xef, 0x04, 0xc2, 0x38, 0x1b, 0x3d, 0x3a, 0x9c, 0xaf, 0x5e, 0xeb, 0x04, 0x98, 0xc2, 0xb4, + 0xf8, 0x82, 0x6a, 0xe9, 0xf8, 0x82, 0xe2, 0x08, 0xbb, 0x6f, 0x57, 0x61, 0x66, 0xcd, 0x27, 0x77, + 0x8d, 0x56, 0x3f, 0x03, 0x23, 0x6e, 0xe4, 0xed, 0x93, 0x28, 0xeb, 0xbc, 0xa8, 0x33, 0x28, 0x16, + 0xd8, 0xd2, 0x21, 0x0f, 0x46, 0xb8, 0x47, 0x75, 0xc0, 0xe1, 0x1e, 0x85, 0x7d, 0x46, 0xdb, 0x30, + 0x1a, 0xf2, 0xcd, 0xf3, 0xec, 0x30, 0x13, 0xc5, 0xd7, 0x8e, 0x6f, 0x4c, 0x76, 0x7c, 0x16, 0xc4, + 0xd6, 0x9b, 0x1f, 0x3f, 0x2b, 0x2d, 0x26, 0xa0, 0x58, 0x32, 0x9f, 0xfb, 0x14, 0x4c, 0xe8, 0x94, + 0x7d, 0x9d, 0x43, 0xff, 0x92, 0x05, 0x27, 0xd7, 0xfc, 0xb0, 0x75, 0x3b, 0x13, 0x93, 0xf2, 0x32, + 0x8c, 0xd3, 0xc9, 0x14, 0x1b, 0x81, 0x5a, 0x46, 0x44, 0x9a, 0x40, 0x61, 0x9d, 0x4e, 0x2b, 0x76, + 0xf3, 0xe6, 0x7a, 0x3d, 0x2f, 0x90, 0x4d, 0xa0, 0xb0, 0x4e, 0x67, 0xff, 0x67, 0x0b, 0x9e, 0xbc, + 0xbc, 0xb2, 0xda, 0x20, 0x51, 0xec, 0xc5, 0x09, 0x09, 0x92, 0xae, 0x58, 0xba, 0x67, 0x60, 0xa4, + 0xed, 0x6a, 0x4d, 0x51, 0x22, 0xd0, 0xa8, 0xb3, 0x56, 0x08, 0xec, 0xa3, 0x12, 0x50, 0xfa, 0x6b, + 0x16, 0x9c, 0xbc, 0xec, 0x25, 0x98, 0xb4, 0xc3, 0x6c, 0xf8, 0x5b, 0x44, 0xda, 0x61, 0xec, 0x25, + 0x61, 0x74, 0x90, 0x0d, 0x7f, 0xc3, 0x0a, 0x83, 0x35, 0x2a, 0x5e, 0xf3, 0xbe, 0x17, 0xd3, 0x96, + 0x56, 0xcc, 0x4d, 0x1d, 0x16, 0x70, 0xac, 0x28, 0x68, 0xc7, 0x5c, 0x2f, 0x62, 0x46, 0xc2, 0x81, + 0x98, 0xc1, 0xaa, 0x63, 0x75, 0x89, 0xc0, 0x29, 0x8d, 0xfd, 0xf7, 0x2d, 0x38, 0x7d, 0xd9, 0xef, + 0xc4, 0x09, 0x89, 0xb6, 0x63, 0xa3, 0xb1, 0x2f, 0x42, 0x8d, 0x48, 0x83, 0x56, 0xb4, 0x55, 0x2d, + 0x19, 0xca, 0xd2, 0xe5, 0xb1, 0x77, 0x8a, 0xae, 0x44, 0xa8, 0x57, 0x7f, 0x81, 0x49, 0xbf, 0x55, + 0x81, 0xc9, 0x2b, 0x9b, 0x9b, 0x8d, 0xcb, 0x24, 0x11, 0x5a, 0xb2, 0xd8, 0xfd, 0xd2, 0xd0, 0xf6, + 0x9e, 0xe3, 0x97, 0x16, 0x7a, 0xcc, 0xba, 0x4e, 0xe2, 0xf9, 0x0b, 0x3c, 0xd4, 0x79, 0x61, 0x3d, + 0x48, 0x6e, 0x44, 0xcd, 0x24, 0xf2, 0x82, 0x9d, 0xdc, 0xbd, 0xaa, 0xd4, 0xe4, 0xd5, 0x5e, 0x9a, + 0x1c, 0xbd, 0x08, 0x23, 0x2c, 0xd2, 0x5a, 0x1a, 0x1d, 0x1f, 0x56, 0xf6, 0x01, 0x83, 0xde, 0x3b, + 0x9c, 0xaf, 0xdd, 0xc4, 0xeb, 0xfc, 0x0f, 0x16, 0xa4, 0xe8, 0x4b, 0x30, 0xbe, 0x9b, 0x24, 0xed, + 0x2b, 0xc4, 0x71, 0x49, 0x24, 0xb5, 0x44, 0x81, 0x79, 0x46, 0x07, 0x83, 0x17, 0x48, 0x27, 0x56, + 0x0a, 0x8b, 0xb1, 0xce, 0xd1, 0x6e, 0x02, 0xa4, 0xb8, 0x07, 0xb4, 0xe7, 0xb0, 0xff, 0x5a, 0x05, + 0x46, 0xaf, 0x38, 0x81, 0xeb, 0x93, 0x08, 0xad, 0xc1, 0x10, 0xb9, 0x4b, 0x5a, 0xe5, 0x2c, 0xcb, + 0x74, 0xa9, 0xe3, 0xfe, 0x23, 0xfa, 0x1f, 0xb3, 0xf2, 0x08, 0xc3, 0x28, 0x6d, 0xf7, 0x65, 0x15, + 0x1f, 0xf9, 0x7c, 0xf1, 0x28, 0x28, 0x91, 0xe0, 0xeb, 0xa4, 0x00, 0x61, 0xc9, 0x88, 0x79, 0x5a, + 0x5a, 0xed, 0x26, 0x55, 0x6e, 0x49, 0xb9, 0x10, 0xe8, 0xcd, 0x95, 0x06, 0x27, 0x17, 0x7c, 0xb9, + 0xa7, 0x45, 0x02, 0x71, 0xca, 0xce, 0x7e, 0x15, 0x4e, 0xb1, 0x23, 0x3a, 0x27, 0xd9, 0x35, 0xe6, + 0x4c, 0xa1, 0x70, 0xda, 0xff, 0xa8, 0x02, 0x27, 0xd6, 0x9b, 0x2b, 0x4d, 0xd3, 0x47, 0xf6, 0x2a, + 0x4c, 0xf0, 0xe5, 0x99, 0x0a, 0x9d, 0xe3, 0x8b, 0xf2, 0xca, 0xb9, 0xbc, 0xa9, 0xe1, 0xb0, 0x41, + 0x89, 0x9e, 0x84, 0xaa, 0xf7, 0x6e, 0x90, 0x8d, 0xd4, 0x59, 0x7f, 0xf3, 0x3a, 0xa6, 0x70, 0x8a, + 0xa6, 0x2b, 0x3d, 0x57, 0x71, 0x0a, 0xad, 0x56, 0xfb, 0x37, 0x60, 0xca, 0x8b, 0x5b, 0xb1, 0xb7, + 0x1e, 0xd0, 0xf9, 0xef, 0xb4, 0xa4, 0xf8, 0xa6, 0x46, 0x39, 0x6d, 0xaa, 0xc2, 0xe2, 0x0c, 0xb5, + 0xa6, 0x6f, 0x87, 0x4b, 0x5b, 0x0b, 0xc5, 0x81, 0x92, 0x5f, 0x81, 0x9a, 0x0a, 0x6b, 0x91, 0xa1, + 0x48, 0x56, 0x7e, 0x28, 0x52, 0x09, 0x85, 0x23, 0x3d, 0x97, 0xd5, 0x5c, 0xcf, 0xe5, 0x6f, 0x58, + 0x90, 0x9e, 0xe0, 0x23, 0x0c, 0xb5, 0x76, 0xc8, 0x8e, 0x05, 0x22, 0x79, 0xf2, 0xf6, 0x74, 0x81, + 0x24, 0xf2, 0x99, 0xc0, 0x65, 0xa5, 0x21, 0xcb, 0xe2, 0x94, 0x0d, 0xba, 0x06, 0xa3, 0xed, 0x88, + 0x34, 0x13, 0x16, 0x6d, 0xdb, 0x07, 0x47, 0x26, 0xd5, 0x0d, 0x5e, 0x12, 0x4b, 0x16, 0xf6, 0xbf, + 0xb6, 0x00, 0xae, 0x79, 0x7b, 0x5e, 0x82, 0x9d, 0x60, 0x87, 0x0c, 0x70, 0x7b, 0x77, 0x1d, 0x86, + 0xe2, 0x36, 0x69, 0x95, 0x3b, 0xd0, 0x49, 0x5b, 0xd4, 0x6c, 0x93, 0x56, 0xfa, 0x19, 0xe8, 0x3f, + 0xcc, 0xf8, 0xd8, 0xbf, 0x09, 0x30, 0x95, 0x92, 0x51, 0x43, 0x1b, 0xbd, 0x60, 0x84, 0x97, 0x3e, + 0x9e, 0x09, 0x2f, 0xad, 0x31, 0x6a, 0x2d, 0xa2, 0x34, 0x81, 0xea, 0x9e, 0x73, 0x57, 0xd8, 0xf5, + 0x2f, 0x97, 0x6d, 0x10, 0xad, 0x69, 0x61, 0xc3, 0xb9, 0xcb, 0xcd, 0xa8, 0xe7, 0xa5, 0x00, 0x6d, + 0x38, 0x77, 0xef, 0xf1, 0x63, 0x1b, 0x36, 0x03, 0xe9, 0x46, 0xe2, 0xeb, 0xff, 0x35, 0xfd, 0xcf, + 0x94, 0x22, 0xad, 0x8e, 0xd5, 0xea, 0x05, 0xc2, 0x01, 0xd7, 0x67, 0xad, 0x5e, 0x90, 0xad, 0xd5, + 0x0b, 0x4a, 0xd4, 0xea, 0x05, 0xe8, 0x3d, 0x0b, 0x46, 0x85, 0xdf, 0x9a, 0xc5, 0x42, 0x8d, 0x5f, + 0xfa, 0x64, 0x5f, 0x55, 0x0b, 0x07, 0x38, 0xaf, 0x7e, 0x51, 0xda, 0x8e, 0x02, 0x5a, 0xd8, 0x04, + 0x59, 0x35, 0xfa, 0x8e, 0x05, 0x53, 0xe2, 0x37, 0x26, 0xef, 0x76, 0x48, 0x9c, 0x88, 0x55, 0xea, + 0x33, 0xf7, 0xd3, 0x1a, 0xc1, 0x82, 0x37, 0xea, 0x13, 0x52, 0xc5, 0x98, 0xc8, 0xc2, 0xb6, 0x65, + 0xda, 0x83, 0x7e, 0x68, 0xc1, 0xa9, 0x3d, 0xe7, 0x2e, 0xaf, 0x91, 0xc3, 0xb0, 0x93, 0x78, 0xa1, + 0x88, 0xf7, 0x5a, 0xeb, 0x57, 0x4e, 0xba, 0x18, 0xf1, 0xe6, 0xbe, 0x2e, 0x0f, 0x13, 0xf3, 0x48, + 0x0a, 0x1b, 0x9d, 0xdb, 0xc2, 0x39, 0x17, 0xc6, 0xa4, 0x60, 0xe6, 0x58, 0xed, 0xcb, 0xfa, 0x62, + 0x7c, 0xfc, 0x0c, 0x94, 0x9e, 0xad, 0x85, 0x37, 0x3b, 0x4e, 0x90, 0x78, 0xc9, 0x81, 0x66, 0xe3, + 0xb3, 0x5a, 0x84, 0x20, 0x0e, 0xb0, 0x96, 0x5d, 0x98, 0xd0, 0x65, 0x6e, 0x80, 0x35, 0x85, 0x70, + 0x32, 0x47, 0x9e, 0x06, 0x58, 0x61, 0x07, 0x1e, 0xef, 0x29, 0x17, 0x83, 0xab, 0xd6, 0xfe, 0x2d, + 0x4b, 0x57, 0x98, 0x03, 0xf7, 0x9b, 0x6c, 0x98, 0x7e, 0x93, 0xf3, 0x65, 0xe7, 0x4d, 0x0f, 0xe7, + 0xc9, 0xb6, 0xde, 0x78, 0xba, 0x0c, 0xa0, 0x4d, 0x18, 0xf1, 0x29, 0x44, 0x1e, 0xd0, 0x5c, 0xe8, + 0x67, 0x66, 0xa6, 0x96, 0x05, 0x83, 0xc7, 0x58, 0xf0, 0xb2, 0x7f, 0x60, 0xc1, 0xd0, 0xc0, 0xc7, + 0xa6, 0x61, 0x8e, 0x4d, 0x2f, 0xe3, 0x54, 0xdc, 0xb9, 0x5c, 0xc0, 0xce, 0x9d, 0xd5, 0xbb, 0x09, + 0x09, 0x62, 0x66, 0x44, 0xe6, 0x0e, 0xcf, 0xaf, 0x57, 0x60, 0x9c, 0x56, 0x24, 0x8f, 0xd7, 0x5f, + 0x83, 0x49, 0xdf, 0xd9, 0x22, 0xbe, 0xf4, 0xf0, 0x66, 0x37, 0x5c, 0xd7, 0x74, 0x24, 0x36, 0x69, + 0x69, 0xe1, 0x6d, 0xdd, 0x01, 0x2e, 0x8c, 0x21, 0x55, 0xd8, 0xf0, 0x8e, 0x63, 0x93, 0x96, 0xda, + 0xfc, 0x77, 0x9c, 0xa4, 0xb5, 0x2b, 0x36, 0x63, 0xaa, 0xb9, 0xb7, 0x28, 0x10, 0x73, 0x1c, 0x5a, + 0x82, 0x69, 0x29, 0xab, 0x6f, 0xd1, 0x5d, 0x7a, 0x18, 0x08, 0x43, 0x51, 0x5d, 0x94, 0xc3, 0x26, + 0x1a, 0x67, 0xe9, 0xd1, 0xa7, 0x60, 0x8a, 0x0e, 0x4e, 0xd8, 0x49, 0x64, 0xf0, 0xc0, 0x30, 0x0b, + 0x1e, 0x60, 0x31, 0x9a, 0x9b, 0x06, 0x06, 0x67, 0x28, 0xed, 0x2f, 0xc1, 0xc9, 0x6b, 0xa1, 0xe3, + 0x2e, 0x3b, 0xbe, 0x13, 0xb4, 0x48, 0xb4, 0x1e, 0xec, 0x14, 0x9e, 0xb3, 0xea, 0x67, 0xa1, 0x95, + 0xa2, 0xb3, 0x50, 0x3b, 0x02, 0xa4, 0x57, 0x20, 0xc2, 0x5e, 0xde, 0x81, 0x51, 0x8f, 0x57, 0x25, + 0x44, 0xf6, 0x62, 0x91, 0x3b, 0xa9, 0xab, 0x8d, 0x5a, 0x18, 0x07, 0x07, 0x60, 0xc9, 0x92, 0xee, + 0x21, 0xf2, 0xfc, 0x4f, 0xc5, 0xdb, 0x34, 0xfb, 0x6f, 0x58, 0x30, 0x7d, 0x3d, 0x73, 0x1b, 0xeb, + 0x19, 0x18, 0x89, 0x49, 0x94, 0xe3, 0x4c, 0x6b, 0x32, 0x28, 0x16, 0xd8, 0x07, 0xbe, 0x41, 0xff, + 0x46, 0x05, 0x6a, 0x2c, 0x74, 0xb2, 0xed, 0xb4, 0x06, 0x69, 0x8e, 0x6e, 0x18, 0xe6, 0x68, 0xc1, + 0xf6, 0x50, 0x35, 0xa8, 0x97, 0x35, 0x8a, 0x6e, 0xaa, 0xdb, 0x49, 0xa5, 0x76, 0x86, 0x29, 0x43, + 0x7e, 0x97, 0x65, 0xca, 0xbc, 0xcc, 0x24, 0x6f, 0x2e, 0xb1, 0xd3, 0x49, 0x45, 0xfb, 0x88, 0x9d, + 0x4e, 0xaa, 0x76, 0xf5, 0x50, 0x49, 0x0d, 0xad, 0xe9, 0x4c, 0x61, 0x7f, 0x9a, 0x85, 0xc2, 0x39, + 0xbe, 0xf7, 0x55, 0xa2, 0xae, 0xf8, 0xcd, 0x8b, 0xe0, 0x36, 0x01, 0xbd, 0xc7, 0xb4, 0x8b, 0xf8, + 0xc7, 0x6f, 0x6e, 0xa6, 0x45, 0xec, 0x2b, 0x30, 0x9d, 0x19, 0x38, 0xf4, 0x32, 0x0c, 0xb7, 0x77, + 0x9d, 0x98, 0x64, 0xc2, 0x2c, 0x86, 0x1b, 0x14, 0x78, 0xef, 0x70, 0x7e, 0x4a, 0x15, 0x60, 0x10, + 0xcc, 0xa9, 0xed, 0x3f, 0xb7, 0x60, 0xe8, 0x7a, 0xe8, 0x0e, 0x52, 0xc0, 0xae, 0x18, 0x02, 0xf6, + 0x4c, 0xf1, 0x7d, 0xef, 0x9e, 0xb2, 0xd5, 0xc8, 0xc8, 0xd6, 0xf9, 0x12, 0xbc, 0x8e, 0x17, 0xab, + 0x3d, 0x18, 0x67, 0xf7, 0xc9, 0x45, 0x7c, 0xc9, 0x8b, 0xc6, 0xbe, 0x69, 0x3e, 0xb3, 0x6f, 0x9a, + 0xd6, 0x48, 0xb5, 0xdd, 0xd3, 0xb3, 0x30, 0x2a, 0xe2, 0x19, 0xb2, 0x21, 0x80, 0x82, 0x16, 0x4b, + 0xbc, 0xfd, 0x2f, 0xab, 0x60, 0xdc, 0x5f, 0x47, 0xbf, 0x6f, 0xc1, 0x42, 0xc4, 0xaf, 0x1d, 0xb8, + 0xf5, 0x4e, 0xe4, 0x05, 0x3b, 0xcd, 0xd6, 0x2e, 0x71, 0x3b, 0xbe, 0x17, 0xec, 0xac, 0xef, 0x04, + 0xa1, 0x02, 0xaf, 0xde, 0x25, 0xad, 0x0e, 0x73, 0xaa, 0x96, 0xbe, 0x36, 0xaf, 0xce, 0x34, 0x2f, + 0x1d, 0x1d, 0xce, 0x2f, 0xe0, 0xbe, 0x6a, 0xc1, 0x7d, 0xb6, 0x0a, 0xfd, 0x91, 0x05, 0x8b, 0xfc, + 0x06, 0x77, 0xf9, 0x9e, 0x94, 0xda, 0x6f, 0x36, 0x24, 0xd3, 0x94, 0xdd, 0x26, 0x89, 0xf6, 0x96, + 0x5f, 0x11, 0x83, 0xbc, 0xd8, 0xe8, 0xaf, 0x56, 0xdc, 0x6f, 0x33, 0xed, 0xdf, 0xae, 0xc2, 0x24, + 0x1d, 0xcf, 0xf4, 0xf6, 0xe6, 0xcb, 0x86, 0x98, 0x7c, 0x24, 0x23, 0x26, 0x27, 0x0c, 0xe2, 0x07, + 0x73, 0x71, 0xf3, 0x5d, 0x38, 0xe1, 0x3b, 0x71, 0x72, 0x85, 0x38, 0x51, 0xb2, 0x45, 0x1c, 0x76, + 0x8c, 0x58, 0x3c, 0x09, 0x32, 0xe7, 0x92, 0x2a, 0x42, 0xe6, 0x5a, 0x96, 0x15, 0xee, 0xe6, 0x8e, + 0x12, 0x40, 0xec, 0xc0, 0x32, 0x72, 0x82, 0x98, 0xf7, 0xc4, 0x13, 0x4e, 0xd8, 0x7e, 0xea, 0x9c, + 0x13, 0x75, 0xa2, 0x6b, 0x5d, 0xbc, 0x70, 0x0e, 0x7f, 0xed, 0x30, 0x7a, 0xb8, 0xec, 0x61, 0xf4, + 0x48, 0x41, 0xdc, 0xed, 0x2f, 0x5b, 0x70, 0x92, 0x7e, 0x12, 0x33, 0x46, 0x33, 0x46, 0x21, 0x4c, + 0xd3, 0xe6, 0xfb, 0x24, 0x91, 0xb0, 0xe2, 0x75, 0x84, 0x05, 0xd2, 0x19, 0x7c, 0x52, 0x43, 0xed, + 0xaa, 0xc9, 0x0c, 0x67, 0xb9, 0xdb, 0xdf, 0xb5, 0x80, 0x05, 0x81, 0x0d, 0x7c, 0xf9, 0xba, 0x6c, + 0x2e, 0x5f, 0x76, 0xb1, 0xae, 0xe8, 0xb1, 0x72, 0xbd, 0x04, 0x33, 0x14, 0xdb, 0x88, 0xc2, 0xbb, + 0x07, 0xd2, 0xa0, 0x2e, 0xf6, 0xc4, 0xbe, 0x57, 0xe1, 0x13, 0x46, 0xdd, 0x9c, 0x42, 0xbf, 0x62, + 0xc1, 0x58, 0xcb, 0x69, 0x3b, 0x2d, 0x9e, 0xf7, 0xa3, 0x84, 0xd7, 0xc5, 0x28, 0xbf, 0xb0, 0x22, + 0xca, 0x72, 0x8f, 0xc1, 0xc7, 0x65, 0xd7, 0x25, 0xb8, 0xd0, 0x4b, 0xa0, 0x2a, 0x9f, 0xf3, 0x60, + 0xd2, 0x60, 0x36, 0xc0, 0x6d, 0xe6, 0xaf, 0x58, 0x5c, 0xd9, 0xab, 0x0d, 0xc1, 0x1d, 0x38, 0x11, + 0x68, 0xff, 0xa9, 0x1a, 0x93, 0xf6, 0xef, 0x42, 0x79, 0x75, 0xce, 0xb4, 0x9f, 0x16, 0xec, 0x96, + 0x61, 0x88, 0xbb, 0xeb, 0xb0, 0xff, 0xb1, 0x05, 0x8f, 0xe9, 0x84, 0xda, 0x45, 0xb7, 0x22, 0x2f, + 0x70, 0x1d, 0xc6, 0xc2, 0x36, 0x89, 0x9c, 0x74, 0xf3, 0x73, 0x5e, 0x8e, 0xfe, 0x0d, 0x01, 0xbf, + 0x77, 0x38, 0x7f, 0x4a, 0xe7, 0x2e, 0xe1, 0x58, 0x95, 0x44, 0x36, 0x8c, 0xb0, 0x71, 0x89, 0xc5, + 0x15, 0x45, 0x96, 0x05, 0x83, 0x9d, 0x7d, 0xc4, 0x58, 0x60, 0xec, 0xbf, 0x69, 0x71, 0x61, 0xd3, + 0x9b, 0x8e, 0xbe, 0x06, 0x33, 0x7b, 0x74, 0x9f, 0xb4, 0x7a, 0xb7, 0x4d, 0x17, 0x50, 0x76, 0xe6, + 0x6b, 0x95, 0x59, 0x36, 0x7a, 0x74, 0x77, 0x79, 0x56, 0xb4, 0x7e, 0x66, 0x23, 0xc3, 0x16, 0x77, + 0x55, 0x64, 0xff, 0xb1, 0x98, 0xaf, 0xcc, 0x66, 0x7b, 0x16, 0x46, 0xdb, 0xa1, 0xbb, 0xb2, 0x5e, + 0xc7, 0x62, 0xac, 0x94, 0xc2, 0x69, 0x70, 0x30, 0x96, 0x78, 0x74, 0x09, 0x80, 0xdc, 0x4d, 0x48, + 0x14, 0x38, 0xbe, 0x3a, 0xab, 0x55, 0x26, 0xd2, 0xaa, 0xc2, 0x60, 0x8d, 0x8a, 0x96, 0x69, 0x47, + 0xe1, 0xbe, 0xe7, 0xb2, 0xc8, 0xf3, 0xaa, 0x59, 0xa6, 0xa1, 0x30, 0x58, 0xa3, 0xa2, 0xbb, 0xd3, + 0x4e, 0x10, 0xf3, 0xe5, 0xcb, 0xd9, 0x12, 0xc9, 0x1b, 0xc6, 0xd2, 0xdd, 0xe9, 0x4d, 0x1d, 0x89, + 0x4d, 0x5a, 0xfb, 0x67, 0x35, 0x80, 0xd4, 0x40, 0x42, 0xef, 0x75, 0xcf, 0xd0, 0x4f, 0x94, 0xb5, + 0xae, 0x1e, 0xdc, 0xf4, 0x44, 0xdf, 0xb2, 0x60, 0xdc, 0xf1, 0xfd, 0xb0, 0xe5, 0x24, 0xac, 0x47, + 0x95, 0xb2, 0xba, 0x42, 0xb4, 0x64, 0x29, 0x2d, 0xcb, 0x1b, 0xf3, 0xa2, 0x3c, 0xca, 0xd3, 0x30, + 0x85, 0xed, 0xd1, 0x9b, 0x80, 0x3e, 0x2e, 0x0d, 0x6b, 0xfe, 0x51, 0xe6, 0xb2, 0x86, 0x75, 0x8d, + 0x69, 0x48, 0xcd, 0xa6, 0x46, 0x5f, 0x32, 0xf2, 0x14, 0x0c, 0x95, 0xb9, 0x1d, 0x6b, 0x98, 0x0c, + 0x45, 0x29, 0x0a, 0xd0, 0xe7, 0xf5, 0xa0, 0xdc, 0xe1, 0x32, 0x57, 0x4f, 0x35, 0xcb, 0xb5, 0x20, + 0x20, 0x37, 0x81, 0x69, 0xd7, 0x5c, 0x28, 0x45, 0xa0, 0xd5, 0xc5, 0xe2, 0x1a, 0x32, 0x2b, 0x6c, + 0xba, 0x34, 0x66, 0x10, 0x38, 0x5b, 0x05, 0x5d, 0x0d, 0xa9, 0xda, 0x5a, 0x0f, 0xb6, 0x43, 0x11, + 0x6e, 0x75, 0xa1, 0xc4, 0x37, 0x3f, 0x88, 0x13, 0xb2, 0x47, 0xcb, 0xa4, 0xab, 0xe1, 0x75, 0xc1, + 0x05, 0x2b, 0x7e, 0x68, 0x13, 0x46, 0xd8, 0x05, 0x8f, 0x78, 0x76, 0xac, 0x8c, 0x7b, 0xcc, 0xbc, + 0xd1, 0x98, 0x1a, 0x20, 0xec, 0x6f, 0x8c, 0x05, 0x2f, 0x74, 0x45, 0xde, 0x00, 0x8e, 0xd7, 0x83, + 0x9b, 0x31, 0x61, 0x37, 0x80, 0x6b, 0xcb, 0x1f, 0x4d, 0xaf, 0xf4, 0x72, 0x78, 0x6e, 0x66, 0x26, + 0xa3, 0x24, 0xb5, 0x43, 0xc4, 0x7f, 0x99, 0xf0, 0x69, 0x16, 0xca, 0x34, 0xd4, 0x4c, 0x0f, 0x95, + 0x0e, 0xf6, 0x5b, 0x26, 0x33, 0x9c, 0xe5, 0xfe, 0x10, 0xd7, 0xc0, 0x39, 0x1f, 0x66, 0xb2, 0x53, + 0x72, 0x80, 0x2b, 0xee, 0x9f, 0x0d, 0xc1, 0x94, 0x29, 0x18, 0x68, 0x11, 0x6a, 0x7b, 0x2c, 0x1d, + 0x53, 0x9a, 0x04, 0x46, 0xc9, 0xff, 0x86, 0x44, 0xe0, 0x94, 0x86, 0xa5, 0xc3, 0x61, 0xc5, 0xb5, + 0x40, 0x9b, 0x34, 0x1d, 0x8e, 0xc2, 0x60, 0x8d, 0x8a, 0x1a, 0xad, 0x5b, 0x61, 0x98, 0x28, 0xc5, + 0xad, 0x64, 0x66, 0x99, 0x41, 0xb1, 0xc0, 0x52, 0x85, 0x7d, 0x9b, 0x76, 0xc8, 0x37, 0x5d, 0x7d, + 0x4a, 0x61, 0x5f, 0xd5, 0x91, 0xd8, 0xa4, 0xa5, 0x0b, 0x50, 0x18, 0x33, 0x21, 0x14, 0xa6, 0x71, + 0x1a, 0xb8, 0xd4, 0xe4, 0x17, 0x9e, 0x24, 0x1e, 0x7d, 0x0e, 0x1e, 0x53, 0xf7, 0x93, 0x30, 0x77, + 0x9d, 0xca, 0x1a, 0x47, 0x8c, 0x9d, 0xed, 0x63, 0x2b, 0xf9, 0x64, 0xb8, 0x57, 0x79, 0xf4, 0x06, + 0x4c, 0x09, 0xb3, 0x56, 0x72, 0x1c, 0x35, 0xcf, 0xb5, 0xaf, 0x1a, 0x58, 0x9c, 0xa1, 0x46, 0x75, + 0x98, 0xa1, 0x10, 0x66, 0x51, 0x4a, 0x0e, 0xfc, 0x9e, 0x95, 0x5a, 0x99, 0xaf, 0x66, 0xf0, 0xb8, + 0xab, 0x04, 0x5a, 0x82, 0x69, 0x6e, 0x5b, 0xd0, 0xfd, 0x1b, 0xfb, 0x0e, 0x22, 0x42, 0x52, 0x4d, + 0x82, 0x1b, 0x26, 0x1a, 0x67, 0xe9, 0xd1, 0xab, 0x30, 0xe1, 0x44, 0xad, 0x5d, 0x2f, 0x21, 0xad, + 0xa4, 0x13, 0xf1, 0xbb, 0xf5, 0x5a, 0x60, 0xc0, 0x92, 0x86, 0xc3, 0x06, 0xa5, 0xfd, 0x55, 0x38, + 0x99, 0x13, 0x82, 0x4d, 0x05, 0xc7, 0x69, 0x7b, 0xb2, 0x4f, 0x99, 0x10, 0xa4, 0xa5, 0xc6, 0xba, + 0xec, 0x8d, 0x46, 0x45, 0xa5, 0x93, 0xf9, 0x8c, 0xb5, 0xdc, 0x6c, 0x4a, 0x3a, 0xd7, 0x24, 0x02, + 0xa7, 0x34, 0xf6, 0x7f, 0xaf, 0x81, 0xe6, 0x64, 0x29, 0x11, 0x78, 0xf2, 0x2a, 0x4c, 0xc8, 0x74, + 0x83, 0x5a, 0x9a, 0x2f, 0xd5, 0xcd, 0xcb, 0x1a, 0x0e, 0x1b, 0x94, 0xb4, 0x6d, 0x81, 0x74, 0x19, + 0x65, 0x03, 0x9e, 0x94, 0x2f, 0x09, 0xa7, 0x34, 0xe8, 0x02, 0x8c, 0xc5, 0xc4, 0xdf, 0xbe, 0xe6, + 0x05, 0xb7, 0x85, 0x60, 0x2b, 0xad, 0xdc, 0x14, 0x70, 0xac, 0x28, 0xd0, 0x67, 0xa0, 0xda, 0xf1, + 0x5c, 0x21, 0xca, 0x0b, 0xd2, 0xee, 0xbc, 0xb9, 0x5e, 0xbf, 0x77, 0x38, 0x3f, 0x9f, 0x9f, 0x43, + 0x91, 0x6e, 0xa2, 0xe3, 0x05, 0x3a, 0xf9, 0x68, 0xd1, 0x3c, 0xd7, 0xf9, 0x48, 0x9f, 0xae, 0xf3, + 0x4b, 0x00, 0xa2, 0xcf, 0x52, 0x92, 0xab, 0xe9, 0x37, 0xbb, 0xac, 0x30, 0x58, 0xa3, 0xa2, 0x5b, + 0xf1, 0x56, 0x44, 0x1c, 0xb9, 0x63, 0xe5, 0x21, 0xc2, 0x63, 0xf7, 0xbb, 0x15, 0x5f, 0xc9, 0xb2, + 0xc2, 0xdd, 0xdc, 0xd1, 0x1e, 0x9c, 0x70, 0xe9, 0x24, 0x32, 0xaa, 0xac, 0xf5, 0x1b, 0x95, 0x4c, + 0xab, 0xab, 0x67, 0xd9, 0xe0, 0x6e, 0xce, 0xe8, 0x8b, 0x30, 0x27, 0x81, 0xdd, 0x77, 0x0f, 0xd9, + 0x44, 0xa9, 0x2e, 0x9f, 0x3d, 0x3a, 0x9c, 0x9f, 0xab, 0xf7, 0xa4, 0xc2, 0xc7, 0x70, 0x40, 0xef, + 0xc0, 0x08, 0x3b, 0x66, 0x89, 0x67, 0xc7, 0xd9, 0x3a, 0xf7, 0x52, 0x59, 0x47, 0xe3, 0x02, 0x3b, + 0xac, 0x11, 0x71, 0x9b, 0xe9, 0xb9, 0x15, 0x03, 0x62, 0xc1, 0x13, 0xb5, 0x61, 0xdc, 0x09, 0x82, + 0x30, 0x71, 0xb8, 0xf9, 0x35, 0x51, 0xc6, 0x82, 0xd4, 0xaa, 0x58, 0x4a, 0xcb, 0xf2, 0x7a, 0x54, + 0x30, 0x98, 0x86, 0xc1, 0x7a, 0x15, 0x74, 0x01, 0x0f, 0xef, 0x50, 0x55, 0x29, 0x4f, 0x1a, 0xe2, + 0xd9, 0xc9, 0x32, 0x0b, 0xf8, 0x0d, 0xa3, 0x90, 0xa6, 0xbb, 0x4c, 0x66, 0x38, 0xcb, 0x1d, 0x2d, + 0x18, 0xfe, 0xe3, 0xa9, 0x34, 0x2a, 0x39, 0xf5, 0x1f, 0xeb, 0xee, 0x62, 0x76, 0xaf, 0x95, 0x47, + 0x22, 0x32, 0x1d, 0x30, 0x9d, 0xb9, 0xd7, 0x9a, 0xa2, 0xb0, 0x4e, 0x37, 0xf7, 0x49, 0x18, 0xd7, + 0x06, 0xbc, 0x9f, 0xf0, 0xd7, 0xb9, 0x37, 0x60, 0x26, 0x3b, 0x90, 0x7d, 0x85, 0xcf, 0xfe, 0xcf, + 0x0a, 0x4c, 0xe7, 0x1c, 0xdf, 0xdc, 0xf6, 0x58, 0x08, 0xb7, 0xa1, 0xec, 0xae, 0x7a, 0x81, 0x8b, + 0x19, 0xc6, 0x54, 0x59, 0x95, 0x12, 0x2a, 0x4b, 0xea, 0xcf, 0x6a, 0x4f, 0xfd, 0x29, 0xd4, 0xd4, + 0xd0, 0xfd, 0xab, 0x29, 0x73, 0x5d, 0x18, 0x2e, 0xb5, 0x2e, 0x3c, 0x00, 0xd5, 0x66, 0x2c, 0x2d, + 0xa3, 0x25, 0x96, 0x96, 0x7b, 0x16, 0x4c, 0x99, 0x92, 0x57, 0x62, 0xc4, 0x1f, 0xd5, 0x01, 0x5c, + 0x60, 0x5b, 0xb0, 0x24, 0x0a, 0x7d, 0x9f, 0x44, 0x22, 0x30, 0x6e, 0x4a, 0xec, 0xa8, 0x04, 0x14, + 0x6b, 0x14, 0xf6, 0x77, 0x2a, 0x30, 0x93, 0x46, 0x49, 0x8b, 0x84, 0xab, 0x83, 0x3b, 0x12, 0xd9, + 0x34, 0x8e, 0x44, 0x8a, 0xf2, 0xa8, 0x66, 0xda, 0xd5, 0xf3, 0x78, 0xe4, 0x9d, 0xcc, 0xf1, 0xc8, + 0x4b, 0x7d, 0xf2, 0x3d, 0xfe, 0xa8, 0xe4, 0xbb, 0x15, 0x38, 0x9d, 0x2d, 0xb2, 0xe2, 0x3b, 0xde, + 0xde, 0x00, 0xc7, 0xe9, 0x73, 0xc6, 0x38, 0xbd, 0xd2, 0x5f, 0x7f, 0x58, 0xe3, 0x7a, 0x0e, 0x96, + 0x93, 0x19, 0xac, 0x4f, 0xde, 0x0f, 0xf3, 0xe3, 0x47, 0xec, 0x67, 0x16, 0x3c, 0x9e, 0x5b, 0x6e, + 0xe0, 0x0e, 0xe0, 0xb7, 0x4d, 0x07, 0xf0, 0x8b, 0xf7, 0xd1, 0xb7, 0x1e, 0x1e, 0xe1, 0xa3, 0x4a, + 0x8f, 0x3e, 0x31, 0x27, 0xd9, 0x0d, 0x18, 0x77, 0x5a, 0x2d, 0x12, 0xc7, 0x1b, 0xa1, 0xab, 0x92, + 0x00, 0xbd, 0xc0, 0x16, 0xcf, 0x14, 0x7c, 0xef, 0x70, 0x7e, 0x2e, 0xcb, 0x22, 0x45, 0x63, 0x9d, + 0x83, 0x99, 0xcc, 0xab, 0x32, 0xa0, 0x64, 0x5e, 0x97, 0x00, 0xf6, 0xd5, 0xe6, 0x3c, 0xeb, 0x7b, + 0xd3, 0xb6, 0xed, 0x1a, 0x15, 0xfa, 0x02, 0x33, 0x76, 0x79, 0x50, 0xc8, 0x50, 0x91, 0x7f, 0x44, + 0xfb, 0x7a, 0x7a, 0x78, 0x09, 0xbf, 0xb5, 0xa9, 0xbc, 0x94, 0x8a, 0xa1, 0xfd, 0x83, 0x2a, 0x7c, + 0xf8, 0x18, 0x81, 0x43, 0x4b, 0xe6, 0x59, 0xef, 0xf3, 0x59, 0x97, 0xd4, 0x5c, 0x6e, 0x61, 0xc3, + 0x47, 0x95, 0xf9, 0x52, 0x95, 0x0f, 0xfc, 0xa5, 0xbe, 0xad, 0x3b, 0x10, 0x79, 0x4c, 0xe7, 0xe5, + 0xfb, 0x9e, 0x52, 0x3f, 0x9f, 0x0e, 0xff, 0xaf, 0x5b, 0xf0, 0x91, 0xdc, 0x4e, 0x19, 0xf1, 0x24, + 0x8b, 0x50, 0x6b, 0x51, 0xa0, 0x76, 0xe9, 0x26, 0xbd, 0xed, 0x26, 0x11, 0x38, 0xa5, 0x31, 0xc2, + 0x46, 0x2a, 0x85, 0x61, 0x23, 0xff, 0xde, 0x82, 0x53, 0xd9, 0x46, 0x0c, 0x5c, 0xdf, 0x34, 0x4d, + 0x7d, 0xb3, 0xd0, 0xdf, 0x87, 0xef, 0xa1, 0x6a, 0xbe, 0x33, 0x09, 0x67, 0xba, 0xd6, 0x28, 0x3e, + 0x86, 0xbf, 0x68, 0xc1, 0x89, 0x1d, 0xb6, 0xad, 0xd0, 0xee, 0x35, 0x89, 0x5e, 0x15, 0x5c, 0x06, + 0x3b, 0xf6, 0x3a, 0x14, 0xdf, 0x24, 0x75, 0x91, 0xe0, 0xee, 0xca, 0xd0, 0x37, 0x2d, 0x38, 0xe5, + 0xdc, 0x89, 0xbb, 0x92, 0xf6, 0x0b, 0x21, 0x7a, 0xa3, 0xc0, 0x77, 0x57, 0x90, 0xee, 0x7f, 0x79, + 0xf6, 0xe8, 0x70, 0xfe, 0x54, 0x1e, 0x15, 0xce, 0xad, 0x15, 0xbd, 0x23, 0x52, 0x9e, 0x51, 0x6b, + 0xaf, 0xd4, 0x0d, 0xbd, 0xbc, 0x5b, 0x16, 0x5c, 0x21, 0x49, 0x0c, 0x56, 0x1c, 0xd1, 0x97, 0xa1, + 0xb6, 0x23, 0xaf, 0x32, 0x09, 0x75, 0x57, 0xb0, 0xa6, 0xe4, 0xde, 0x7c, 0xe2, 0xb1, 0xfc, 0x0a, + 0x85, 0x53, 0xa6, 0xe8, 0x0a, 0x54, 0x83, 0xed, 0x58, 0x5c, 0x17, 0x2e, 0x8a, 0x19, 0x32, 0x23, + 0xb4, 0xf8, 0x3d, 0xcb, 0xeb, 0x6b, 0x4d, 0x4c, 0x59, 0x50, 0x4e, 0xd1, 0x96, 0x2b, 0x9c, 0xd6, + 0x05, 0x9c, 0xf0, 0x72, 0xbd, 0x9b, 0x13, 0x5e, 0xae, 0x63, 0xca, 0x82, 0x05, 0x27, 0xc6, 0xad, + 0xd8, 0x13, 0x1e, 0xe9, 0x82, 0xbb, 0xe4, 0x5d, 0x77, 0x4f, 0x78, 0xf6, 0x3b, 0x06, 0xc6, 0x9c, + 0x11, 0xda, 0x84, 0x91, 0x16, 0xcb, 0x53, 0x2d, 0x1c, 0x06, 0x45, 0xd9, 0x8b, 0xbb, 0x72, 0x5a, + 0xf3, 0x93, 0x33, 0x0e, 0xc7, 0x82, 0x17, 0xe3, 0x4a, 0xda, 0xbb, 0xdb, 0xb1, 0xf0, 0x09, 0x14, + 0x71, 0xed, 0xca, 0x38, 0x2e, 0xb8, 0x32, 0x38, 0x16, 0xbc, 0x50, 0x1d, 0x2a, 0xdb, 0x2d, 0x91, + 0x72, 0xb2, 0x60, 0x23, 0x6b, 0x5e, 0x9a, 0x5d, 0x1e, 0x39, 0x3a, 0x9c, 0xaf, 0xac, 0xad, 0xe0, + 0xca, 0x76, 0x0b, 0xbd, 0x0d, 0xa3, 0xdb, 0xfc, 0x1a, 0xa4, 0x48, 0x2f, 0x79, 0xb1, 0xe8, 0xae, + 0x66, 0xd7, 0x9d, 0x49, 0x7e, 0x5f, 0x43, 0x20, 0xb0, 0x64, 0x87, 0xbe, 0x08, 0xb0, 0xad, 0x2e, + 0x76, 0x8a, 0xfc, 0x92, 0x0b, 0xfd, 0x5d, 0x04, 0x15, 0x9b, 0x66, 0x05, 0xc5, 0x1a, 0x47, 0x2a, + 0xf3, 0x8e, 0x4c, 0xb5, 0xcf, 0x72, 0x4b, 0x16, 0xca, 0x7c, 0x6e, 0x66, 0x7e, 0x2e, 0xf3, 0x0a, + 0x85, 0x53, 0xa6, 0xa8, 0x03, 0x93, 0xfb, 0x71, 0x7b, 0x97, 0xc8, 0xa9, 0xcf, 0x12, 0x4e, 0x8e, + 0x5f, 0x7a, 0xbd, 0x20, 0x8b, 0xa8, 0x28, 0xe2, 0x45, 0x49, 0xc7, 0xf1, 0xbb, 0x34, 0x18, 0x4b, + 0xe1, 0xf4, 0x96, 0xce, 0x16, 0x9b, 0xb5, 0xd0, 0x4f, 0xf2, 0x6e, 0x27, 0xdc, 0x3a, 0x48, 0x88, + 0x48, 0x48, 0x59, 0xf0, 0x49, 0xde, 0xe4, 0xc4, 0xdd, 0x9f, 0x44, 0x20, 0xb0, 0x64, 0xa7, 0x86, + 0x8c, 0x69, 0xe3, 0x99, 0xd2, 0x43, 0xd6, 0xd5, 0x87, 0x74, 0xc8, 0x98, 0xf6, 0x4d, 0x99, 0x32, + 0xad, 0xdb, 0xde, 0x0d, 0x93, 0x30, 0xc8, 0xe8, 0xfe, 0x13, 0x65, 0xb4, 0x6e, 0x23, 0xa7, 0x64, + 0xb7, 0xd6, 0xcd, 0xa3, 0xc2, 0xb9, 0xb5, 0xda, 0x7f, 0x3c, 0xdc, 0xbd, 0xd8, 0x32, 0x43, 0xf8, + 0x57, 0xbb, 0x8f, 0x53, 0x3f, 0xd3, 0xff, 0x2e, 0xef, 0x01, 0x1e, 0xac, 0x7e, 0xd3, 0x82, 0x33, + 0xed, 0xdc, 0xc5, 0x54, 0x2c, 0x58, 0xfd, 0x6e, 0x16, 0xf9, 0x80, 0xa9, 0x6c, 0xab, 0xf9, 0x78, + 0xdc, 0xa3, 0xce, 0xac, 0xf9, 0x59, 0xfd, 0xc0, 0xe6, 0xe7, 0x2d, 0x18, 0x63, 0x16, 0x53, 0x9a, + 0xfa, 0xa3, 0xcf, 0x6c, 0x19, 0x6c, 0xe9, 0x5b, 0x11, 0x2c, 0xb0, 0x62, 0x46, 0x07, 0xee, 0xc9, + 0x6c, 0x27, 0x30, 0x61, 0x68, 0x91, 0x26, 0x96, 0x7b, 0x24, 0xd6, 0xc4, 0x48, 0x3c, 0xd9, 0x38, + 0x8e, 0xf8, 0x5e, 0x11, 0x01, 0x3e, 0xbe, 0xb2, 0x87, 0x69, 0xce, 0xfe, 0x33, 0x2b, 0xc7, 0xfe, + 0xe2, 0x1b, 0x90, 0xd7, 0xcd, 0x0d, 0xc8, 0x33, 0xd9, 0x0d, 0x48, 0x97, 0xa3, 0xc0, 0xd8, 0x7b, + 0x94, 0xcf, 0x99, 0x58, 0x36, 0x37, 0x89, 0xed, 0xc3, 0xb9, 0xa2, 0xc9, 0xcd, 0x02, 0x97, 0x5c, + 0x75, 0x0a, 0x98, 0x06, 0x2e, 0xb9, 0xeb, 0x75, 0xcc, 0x30, 0x65, 0x2f, 0xb9, 0xdb, 0xff, 0xdb, + 0x82, 0x6a, 0x23, 0x74, 0x07, 0xe8, 0xf8, 0xb8, 0x6c, 0x38, 0x3e, 0x9e, 0x2e, 0x7c, 0x60, 0xa8, + 0xa7, 0x9b, 0xe3, 0x46, 0xc6, 0xcd, 0xf1, 0xb1, 0x62, 0x56, 0xc7, 0x3b, 0x35, 0x7e, 0x58, 0x05, + 0xfd, 0x89, 0x24, 0xf4, 0x07, 0xf7, 0x13, 0xc1, 0x5a, 0x2d, 0xf7, 0x6a, 0x92, 0xa8, 0x83, 0x45, + 0x3c, 0xc9, 0x5b, 0x6d, 0x3f, 0xb7, 0x81, 0xac, 0xb7, 0x88, 0xb7, 0xb3, 0x9b, 0x10, 0x37, 0xdb, + 0xb1, 0x87, 0x17, 0xc8, 0xfa, 0xdf, 0x2c, 0x98, 0xce, 0xd4, 0x8e, 0xbe, 0x92, 0x77, 0x3d, 0xe6, + 0xbe, 0x9c, 0x19, 0x27, 0x0a, 0x6f, 0xd3, 0x2c, 0x00, 0x28, 0xd7, 0xbb, 0x74, 0x39, 0x30, 0x0b, + 0x4c, 0xf9, 0xe6, 0x63, 0xac, 0x51, 0xa0, 0x97, 0x61, 0x3c, 0x09, 0xdb, 0xa1, 0x1f, 0xee, 0x1c, + 0x5c, 0x25, 0x32, 0xe9, 0x82, 0x3a, 0xb6, 0xd8, 0x4c, 0x51, 0x58, 0xa7, 0xb3, 0x7f, 0x5c, 0x85, + 0xec, 0xf3, 0x5a, 0xff, 0x5f, 0x4a, 0x7f, 0x7e, 0xa4, 0xf4, 0x0f, 0x2d, 0x98, 0xa1, 0xb5, 0xb3, + 0x68, 0x15, 0x19, 0x74, 0xaa, 0xd2, 0x9b, 0x5b, 0xc7, 0xa4, 0x37, 0x7f, 0x86, 0xea, 0x3a, 0x37, + 0xec, 0x24, 0xc2, 0x4d, 0xa2, 0xa9, 0x30, 0x0a, 0xc5, 0x02, 0x2b, 0xe8, 0x48, 0x14, 0x89, 0x5b, + 0x38, 0x3a, 0x1d, 0x89, 0x22, 0x2c, 0xb0, 0x32, 0xfb, 0xf9, 0x50, 0x7e, 0xf6, 0x73, 0x9e, 0xb6, + 0x48, 0x44, 0x49, 0x08, 0x23, 0x40, 0x4b, 0x5b, 0x24, 0xc3, 0x27, 0x52, 0x1a, 0xfb, 0xbb, 0x55, + 0x98, 0x68, 0x84, 0x6e, 0x1a, 0x47, 0xfe, 0x92, 0x11, 0x47, 0x7e, 0x2e, 0x13, 0x47, 0x3e, 0xa3, + 0xd3, 0x3e, 0x98, 0x30, 0x72, 0x91, 0xda, 0x8a, 0xe5, 0xe7, 0xbf, 0xaf, 0x10, 0x72, 0x23, 0xb5, + 0x95, 0x62, 0x83, 0x4d, 0xae, 0x7f, 0x79, 0x42, 0xc7, 0xff, 0xdc, 0x82, 0xa9, 0x46, 0xe8, 0x52, + 0xe1, 0xfc, 0xcb, 0x24, 0x89, 0x7a, 0x42, 0xac, 0x91, 0x63, 0x12, 0x62, 0xfd, 0x86, 0x05, 0xa3, + 0x8d, 0xd0, 0x1d, 0xb8, 0xfb, 0x70, 0xcd, 0x74, 0x1f, 0x7e, 0xa4, 0x50, 0xe7, 0xf6, 0xf0, 0x18, + 0xfe, 0xa0, 0x0a, 0x93, 0xb4, 0xbd, 0xe1, 0x8e, 0xfc, 0x5a, 0xc6, 0xc8, 0x58, 0x25, 0x46, 0x86, + 0x9a, 0x80, 0xa1, 0xef, 0x87, 0x77, 0xb2, 0x5f, 0x6e, 0x8d, 0x41, 0xb1, 0xc0, 0xa2, 0x0b, 0x30, + 0xd6, 0x8e, 0xc8, 0xbe, 0x17, 0x76, 0xe2, 0xec, 0x5d, 0xbe, 0x86, 0x80, 0x63, 0x45, 0x81, 0x5e, + 0x82, 0x89, 0xd8, 0x0b, 0x5a, 0x44, 0xc6, 0x50, 0x0c, 0xb1, 0x18, 0x0a, 0x9e, 0x6b, 0x50, 0x83, + 0x63, 0x83, 0x0a, 0xdd, 0x84, 0x1a, 0xfb, 0xcf, 0x66, 0x4f, 0xbf, 0xc9, 0xd8, 0x79, 0xb2, 0x2d, + 0x59, 0x1c, 0xa7, 0x9c, 0xd0, 0x25, 0x80, 0x44, 0xc6, 0x7a, 0xc4, 0xe2, 0x6c, 0x54, 0x59, 0xa3, + 0x2a, 0x0a, 0x24, 0xc6, 0x1a, 0x15, 0x7a, 0x1e, 0x6a, 0x89, 0xe3, 0xf9, 0xd7, 0xbc, 0x80, 0xc4, + 0x22, 0x4e, 0x46, 0x64, 0xcb, 0x15, 0x40, 0x9c, 0xe2, 0xe9, 0x3a, 0xcf, 0xee, 0x10, 0xf3, 0x47, + 0x1e, 0xc6, 0x18, 0x35, 0x5b, 0xe7, 0xaf, 0x29, 0x28, 0xd6, 0x28, 0xec, 0x17, 0xd9, 0x7a, 0xdd, + 0xe7, 0x25, 0x83, 0x9f, 0x56, 0x00, 0x35, 0x58, 0x4c, 0x89, 0xf1, 0x0e, 0xc6, 0x2e, 0x4c, 0xc5, + 0xe4, 0x9a, 0x17, 0x74, 0xee, 0x0a, 0x56, 0xe5, 0xee, 0x74, 0x34, 0x57, 0xf5, 0x32, 0xfc, 0xea, + 0xac, 0x09, 0xc3, 0x19, 0xbe, 0x74, 0x48, 0xa2, 0x4e, 0xb0, 0x14, 0xdf, 0x8c, 0x49, 0x24, 0x5e, + 0xb2, 0x60, 0x43, 0x82, 0x25, 0x10, 0xa7, 0x78, 0x2a, 0x00, 0xec, 0xcf, 0xf5, 0x30, 0xc0, 0x61, + 0x98, 0x48, 0x91, 0x61, 0xf9, 0xcd, 0x35, 0x38, 0x36, 0xa8, 0xd0, 0x1a, 0xa0, 0xb8, 0xd3, 0x6e, + 0xfb, 0xec, 0x14, 0xcb, 0xf1, 0x2f, 0x47, 0x61, 0xa7, 0xcd, 0x03, 0x8a, 0x45, 0x6a, 0xf0, 0x66, + 0x17, 0x16, 0xe7, 0x94, 0xa0, 0xd3, 0x7d, 0x3b, 0x66, 0xbf, 0xc5, 0xd5, 0x60, 0xee, 0x51, 0x6b, + 0x32, 0x10, 0x96, 0x38, 0xbb, 0xc3, 0x96, 0x27, 0xf6, 0xc8, 0x40, 0xd2, 0x89, 0x08, 0x5d, 0x2d, + 0xda, 0x6c, 0x09, 0x92, 0xe7, 0xe8, 0xa5, 0x86, 0x32, 0x13, 0xd5, 0xc2, 0x53, 0x8a, 0xeb, 0x6c, + 0xb0, 0xc9, 0xd5, 0xfe, 0x4f, 0xc0, 0xb4, 0x8c, 0x38, 0x40, 0x1c, 0x15, 0xd1, 0xaa, 0xc2, 0xfe, + 0xfa, 0x68, 0x99, 0x27, 0x75, 0x52, 0x0d, 0x2e, 0x62, 0x5f, 0xb1, 0xe4, 0x82, 0xbe, 0xc0, 0x03, + 0x01, 0xd8, 0xe4, 0x2e, 0xff, 0xce, 0x15, 0xa7, 0x37, 0xe2, 0xb0, 0x05, 0x0b, 0xac, 0xb1, 0x43, + 0xd7, 0x60, 0x52, 0xe4, 0xa3, 0x17, 0xae, 0x80, 0xaa, 0xb1, 0x1d, 0x9e, 0xc4, 0x3a, 0xf2, 0x5e, + 0x16, 0x80, 0xcd, 0xc2, 0x68, 0x07, 0x9e, 0xd4, 0xde, 0xa6, 0xc9, 0x89, 0xbc, 0xe2, 0x5a, 0xe3, + 0x23, 0x47, 0x87, 0xf3, 0x4f, 0x6e, 0x1e, 0x47, 0x88, 0x8f, 0xe7, 0x83, 0x6e, 0xc0, 0x69, 0xa7, + 0x95, 0x78, 0xfb, 0xa4, 0x4e, 0x1c, 0xd7, 0xf7, 0x02, 0x62, 0xde, 0x1b, 0x7f, 0xfc, 0xe8, 0x70, + 0xfe, 0xf4, 0x52, 0x1e, 0x01, 0xce, 0x2f, 0x87, 0x5e, 0x87, 0x9a, 0x1b, 0xc4, 0x62, 0x0c, 0x46, + 0x8c, 0x67, 0x78, 0x6a, 0xf5, 0xeb, 0x4d, 0xd5, 0xff, 0xf4, 0x0f, 0x4e, 0x0b, 0xa0, 0x77, 0xf9, + 0xbb, 0xc0, 0x6a, 0x07, 0xc2, 0x9f, 0x7f, 0x7a, 0xa5, 0xd4, 0x9e, 0xd7, 0xb8, 0xe7, 0xc1, 0xbd, + 0x64, 0x2a, 0xb6, 0xd1, 0xb8, 0x02, 0x62, 0x54, 0x81, 0x3e, 0x0b, 0x28, 0x26, 0xd1, 0xbe, 0xd7, + 0x22, 0x4b, 0x2d, 0x96, 0x68, 0x93, 0x1d, 0xc6, 0x8d, 0x19, 0x01, 0xfe, 0xa8, 0xd9, 0x45, 0x81, + 0x73, 0x4a, 0xa1, 0x2b, 0x54, 0xe3, 0xe8, 0x50, 0x11, 0x8a, 0x2a, 0xcd, 0xb9, 0xd9, 0x3a, 0x69, + 0x47, 0xa4, 0xe5, 0x24, 0xc4, 0x35, 0x39, 0xe2, 0x4c, 0x39, 0xba, 0xa6, 0xa8, 0xbc, 0xe1, 0x60, + 0x06, 0x50, 0x76, 0xe7, 0x0e, 0xa7, 0xbb, 0xa3, 0xdd, 0x30, 0x4e, 0xae, 0x93, 0xe4, 0x4e, 0x18, + 0xdd, 0x66, 0xde, 0xf5, 0x31, 0x2d, 0x73, 0x59, 0x8a, 0xc2, 0x3a, 0x1d, 0xb5, 0x7e, 0xd8, 0xb1, + 0xce, 0x7a, 0x9d, 0xf9, 0xcc, 0xc7, 0xd2, 0xb9, 0x73, 0x85, 0x83, 0xb1, 0xc4, 0x4b, 0xd2, 0xf5, + 0xc6, 0x0a, 0xf3, 0x7f, 0x67, 0x48, 0xd7, 0x1b, 0x2b, 0x58, 0xe2, 0x51, 0xd8, 0xfd, 0xd8, 0xd1, + 0x54, 0x99, 0xb3, 0x88, 0x6e, 0x0d, 0x5e, 0xf2, 0xbd, 0xa3, 0xbb, 0x30, 0xa3, 0x1e, 0x5c, 0xe2, + 0x29, 0x25, 0xe3, 0xd9, 0xe9, 0x32, 0xaf, 0x12, 0xe7, 0x66, 0xa6, 0x54, 0xb1, 0xc7, 0xeb, 0x19, + 0x9e, 0xb8, 0xab, 0x16, 0x23, 0xff, 0xc1, 0x4c, 0x61, 0x2e, 0xf8, 0x45, 0xa8, 0xc5, 0x9d, 0x2d, + 0x37, 0xdc, 0x73, 0xbc, 0x80, 0x39, 0xa9, 0xf5, 0x37, 0x76, 0x25, 0x02, 0xa7, 0x34, 0x73, 0x9f, + 0x86, 0x13, 0x5d, 0x32, 0xdd, 0x57, 0xe8, 0xdc, 0x37, 0x86, 0xa0, 0xa6, 0xdc, 0x38, 0x68, 0xd1, + 0xf4, 0xd4, 0x3d, 0x9e, 0xf5, 0xd4, 0x8d, 0xd1, 0x95, 0x57, 0x77, 0xce, 0x7d, 0x31, 0xe7, 0x91, + 0xcd, 0xe7, 0x0a, 0x3f, 0x62, 0xf9, 0xbb, 0x2b, 0x7d, 0x3c, 0x41, 0x9a, 0x1a, 0xf4, 0x43, 0xc7, + 0x1a, 0xf4, 0x25, 0x5f, 0x52, 0xa2, 0xa6, 0x7b, 0x3b, 0x74, 0xd7, 0x1b, 0xd9, 0xe7, 0x42, 0x1a, + 0x14, 0x88, 0x39, 0x8e, 0x19, 0x5d, 0x54, 0x29, 0x33, 0xa3, 0x6b, 0xf4, 0xbe, 0x8c, 0x2e, 0x59, + 0x1c, 0xa7, 0x9c, 0xd0, 0x3e, 0x9c, 0x68, 0x99, 0x6f, 0xbf, 0xa8, 0xfb, 0x28, 0x2f, 0xf4, 0xf1, + 0xf6, 0x4a, 0x47, 0xcb, 0x73, 0xbf, 0x92, 0xe5, 0x87, 0xbb, 0xab, 0xb0, 0x7f, 0xcc, 0x7d, 0x3e, + 0x62, 0x1f, 0x48, 0xe2, 0x8e, 0x3f, 0xc8, 0xcc, 0xd5, 0x37, 0x8c, 0xad, 0xe9, 0x03, 0xf0, 0x36, + 0xfe, 0xae, 0xc5, 0xbc, 0x8d, 0x9b, 0x64, 0xaf, 0xed, 0x3b, 0xc9, 0x20, 0x43, 0xf2, 0xbe, 0x00, + 0x63, 0x89, 0xa8, 0xa5, 0x5c, 0xba, 0x6d, 0xad, 0x59, 0xcc, 0xfb, 0xaa, 0xb4, 0x80, 0x84, 0x62, + 0xc5, 0xd0, 0xfe, 0x6d, 0xfe, 0x15, 0x24, 0x66, 0xe0, 0x1b, 0xaa, 0xeb, 0xe6, 0x86, 0xea, 0xd9, + 0xd2, 0x3d, 0xe9, 0xb5, 0xb1, 0x32, 0xdb, 0xcf, 0x4c, 0xb5, 0x47, 0xdf, 0xf9, 0x6d, 0x6f, 0x80, + 0xf9, 0x98, 0x0d, 0x7a, 0x9d, 0x07, 0xa3, 0x72, 0x5d, 0xf8, 0x5c, 0x9f, 0x81, 0xa8, 0xf6, 0xf7, + 0x2b, 0x70, 0x2a, 0xef, 0x51, 0x7b, 0xe4, 0xc2, 0x44, 0x5b, 0x33, 0x9c, 0xcb, 0xa5, 0x68, 0xd0, + 0x4d, 0xed, 0xd4, 0x68, 0xd1, 0xa1, 0xd8, 0xe0, 0x8a, 0xb6, 0x60, 0x82, 0xec, 0x7b, 0x2d, 0xe5, + 0x4f, 0xa9, 0xf4, 0xa9, 0x9c, 0x54, 0x1d, 0xab, 0x1a, 0x17, 0x6c, 0xf0, 0x1c, 0x40, 0x2e, 0x78, + 0xfb, 0x9f, 0x58, 0xf0, 0x58, 0x8f, 0x24, 0x0e, 0xb4, 0xba, 0x3b, 0xcc, 0xe1, 0x28, 0x5e, 0x4a, + 0x52, 0xd5, 0x71, 0x37, 0x24, 0x16, 0x58, 0xb4, 0x05, 0xc0, 0xdd, 0x88, 0xec, 0xd5, 0xd8, 0x4a, + 0x99, 0xb3, 0xfe, 0xae, 0x2b, 0xd3, 0xda, 0x6d, 0x5a, 0xf5, 0x4e, 0xac, 0xc6, 0xd5, 0xfe, 0x5e, + 0x15, 0x86, 0xf9, 0xc3, 0x95, 0x0d, 0x18, 0xdd, 0xe5, 0xa9, 0x22, 0xfb, 0xcb, 0x54, 0x99, 0x9a, + 0x47, 0x1c, 0x80, 0x25, 0x1b, 0xb4, 0x01, 0x27, 0xbd, 0xc0, 0x4b, 0x3c, 0xc7, 0xaf, 0x13, 0xdf, + 0x39, 0x90, 0xf6, 0x36, 0x4f, 0x13, 0x2e, 0x33, 0xda, 0x9e, 0x5c, 0xef, 0x26, 0xc1, 0x79, 0xe5, + 0xd0, 0x1b, 0x5d, 0x19, 0x9f, 0x78, 0x0a, 0x4e, 0x75, 0x09, 0xeb, 0xf8, 0xac, 0x4f, 0xe8, 0x35, + 0x98, 0x6c, 0x77, 0xed, 0x2c, 0xb4, 0x17, 0x0f, 0xcd, 0xdd, 0x84, 0x49, 0x8b, 0xea, 0x30, 0x13, + 0x77, 0xd8, 0xc9, 0xeb, 0xe6, 0x6e, 0x44, 0xe2, 0xdd, 0xd0, 0x77, 0xc5, 0x93, 0x5d, 0xca, 0x8a, + 0x6a, 0x66, 0xf0, 0xb8, 0xab, 0x04, 0xe5, 0xb2, 0xed, 0x78, 0x7e, 0x27, 0x22, 0x29, 0x97, 0x11, + 0x93, 0xcb, 0x5a, 0x06, 0x8f, 0xbb, 0x4a, 0xd8, 0x7f, 0x6a, 0xc1, 0xc9, 0x9c, 0xf0, 0x04, 0x1e, + 0x32, 0xb7, 0xe3, 0xc5, 0x89, 0x4a, 0x06, 0xad, 0x85, 0xcc, 0x71, 0x38, 0x56, 0x14, 0x54, 0x0a, + 0xf9, 0x76, 0x31, 0x7b, 0xec, 0x27, 0x0e, 0x60, 0x05, 0xb6, 0xbf, 0xfc, 0x4d, 0xea, 0xe5, 0xfd, + 0xa1, 0x9e, 0x2f, 0xef, 0x3f, 0x05, 0xc3, 0x3b, 0x6a, 0x53, 0xae, 0xd9, 0x23, 0x7c, 0x5b, 0xce, + 0x71, 0xf6, 0xb7, 0xab, 0x30, 0x9d, 0x09, 0x53, 0xa2, 0x0d, 0xd9, 0x0b, 0x03, 0x2f, 0x09, 0x55, + 0xf6, 0x20, 0xe6, 0x49, 0x58, 0x21, 0xed, 0xdd, 0x0d, 0x01, 0xc7, 0x8a, 0x02, 0x3d, 0x63, 0xbe, + 0x22, 0x9c, 0xb6, 0x79, 0xb9, 0x6e, 0x3c, 0x94, 0x56, 0x36, 0x41, 0xfd, 0x53, 0x30, 0xd4, 0x0e, + 0xd5, 0x73, 0x97, 0x4a, 0xe8, 0xf1, 0x72, 0xbd, 0x11, 0x86, 0x3e, 0x66, 0x48, 0xf4, 0xb4, 0xe8, + 0x7d, 0xc6, 0x1b, 0x89, 0x1d, 0x37, 0x8c, 0xb5, 0x21, 0x78, 0x16, 0x46, 0x6f, 0x93, 0x83, 0xc8, + 0x0b, 0x76, 0xb2, 0xbe, 0xd8, 0xab, 0x1c, 0x8c, 0x25, 0xde, 0x4c, 0x42, 0x3f, 0x3a, 0xe0, 0x24, + 0xf4, 0x63, 0x85, 0x71, 0x96, 0xbf, 0x69, 0xc1, 0x34, 0x4b, 0xa2, 0x27, 0xee, 0xb7, 0x7a, 0x61, + 0x30, 0xc0, 0x25, 0xf1, 0x29, 0x18, 0x8e, 0x68, 0x65, 0xd9, 0xfc, 0xd1, 0xac, 0x05, 0x98, 0xe3, + 0xd0, 0x13, 0xe2, 0x25, 0x76, 0xfa, 0xf9, 0x26, 0x78, 0x3e, 0xde, 0xf4, 0x49, 0x75, 0x16, 0xbf, + 0x8f, 0x49, 0xdb, 0xf7, 0x78, 0x63, 0x53, 0x07, 0xcc, 0xa3, 0x12, 0xbf, 0x9f, 0xdb, 0xb8, 0x07, + 0x15, 0xbf, 0x9f, 0xcf, 0xfc, 0x78, 0xe3, 0xf3, 0x7f, 0x54, 0xe0, 0x6c, 0x6e, 0xb9, 0xf4, 0x04, + 0x67, 0xcd, 0x38, 0xc1, 0xb9, 0x94, 0x39, 0xc1, 0xb1, 0x8f, 0x2f, 0xfd, 0x60, 0xce, 0x74, 0xf2, + 0x0f, 0x5b, 0xaa, 0x0f, 0xed, 0xb0, 0x65, 0xa8, 0xac, 0xa1, 0x30, 0x5c, 0x60, 0x28, 0xfc, 0xcc, + 0x82, 0xc7, 0x73, 0x07, 0xec, 0x11, 0xbb, 0x2e, 0x91, 0xdb, 0xc6, 0x1e, 0x86, 0xf3, 0xdf, 0xae, + 0xf6, 0xe8, 0x13, 0x33, 0xa1, 0xcf, 0x53, 0x8d, 0xc3, 0x90, 0xb1, 0x30, 0x80, 0x26, 0xb8, 0xb6, + 0xe1, 0x30, 0xac, 0xb0, 0x28, 0xd6, 0xae, 0x1b, 0xf0, 0x46, 0xae, 0xde, 0xe7, 0x64, 0x5a, 0x30, + 0xbd, 0x65, 0xfa, 0x15, 0xdd, 0xcc, 0x35, 0x04, 0x74, 0x4b, 0xdb, 0x12, 0x55, 0xef, 0x67, 0x4b, + 0x34, 0x91, 0xbf, 0x1d, 0x42, 0x4b, 0x30, 0xbd, 0xe7, 0x05, 0xec, 0x45, 0x36, 0xd3, 0x02, 0x51, + 0xd7, 0xdb, 0x36, 0x4c, 0x34, 0xce, 0xd2, 0xcf, 0xbd, 0x06, 0x93, 0xf7, 0xef, 0x22, 0x79, 0xbf, + 0x0a, 0x1f, 0x3e, 0x46, 0x21, 0xf0, 0x95, 0xc0, 0xf8, 0x2e, 0xda, 0x4a, 0xd0, 0xf5, 0x6d, 0x1a, + 0x70, 0x6a, 0xbb, 0xe3, 0xfb, 0x07, 0x2c, 0xf6, 0x81, 0xb8, 0x92, 0x42, 0x58, 0x77, 0xea, 0xad, + 0xd4, 0xb5, 0x1c, 0x1a, 0x9c, 0x5b, 0x12, 0x7d, 0x16, 0x50, 0xb8, 0xc5, 0xd2, 0x4a, 0xba, 0xe9, + 0x25, 0x64, 0xf6, 0x09, 0xaa, 0xe9, 0x44, 0xbd, 0xd1, 0x45, 0x81, 0x73, 0x4a, 0x51, 0x5b, 0x8f, + 0x3d, 0xb3, 0xaa, 0x9a, 0x95, 0xb1, 0xf5, 0xb0, 0x8e, 0xc4, 0x26, 0x2d, 0xba, 0x0c, 0x27, 0x9c, + 0x7d, 0xc7, 0xe3, 0x09, 0x64, 0x24, 0x03, 0x6e, 0xec, 0x29, 0x37, 0xc4, 0x52, 0x96, 0x00, 0x77, + 0x97, 0x41, 0x6d, 0xc3, 0xab, 0xc4, 0x13, 0x48, 0xbf, 0x7e, 0x1f, 0x12, 0x5c, 0xda, 0xcf, 0x64, + 0xff, 0x89, 0x45, 0x97, 0xbb, 0x9c, 0x47, 0xcc, 0x8c, 0xf7, 0xbe, 0xb5, 0x4b, 0x18, 0xdd, 0xef, + 0x7d, 0x33, 0x87, 0xab, 0x49, 0xcb, 0x45, 0x23, 0x4e, 0x03, 0x27, 0x0d, 0xcb, 0x52, 0xdc, 0x3c, + 0x52, 0x14, 0xe8, 0x16, 0x8c, 0xba, 0xde, 0xbe, 0x17, 0x87, 0x51, 0x89, 0x77, 0x76, 0xbb, 0x82, + 0xf1, 0x52, 0x5d, 0x59, 0xe7, 0x4c, 0xb0, 0xe4, 0x66, 0xff, 0x9d, 0x0a, 0x4c, 0xca, 0xfa, 0xde, + 0xec, 0x84, 0x4c, 0x87, 0x0d, 0x6a, 0x11, 0x7f, 0xd3, 0x58, 0xc4, 0x17, 0xcb, 0x5d, 0xbf, 0x62, + 0x8d, 0xea, 0xb9, 0x78, 0x7f, 0x2e, 0xb3, 0x78, 0x5f, 0xec, 0x87, 0xe9, 0xf1, 0x8b, 0xf6, 0xbf, + 0xb5, 0xe0, 0x84, 0x41, 0xff, 0xa8, 0xe4, 0x30, 0xce, 0xeb, 0x4b, 0x8f, 0x55, 0xe3, 0x7b, 0x95, + 0x4c, 0x1f, 0xd8, 0x6a, 0xf1, 0x35, 0x18, 0xda, 0x75, 0x22, 0xb7, 0x5c, 0xfe, 0xb4, 0xae, 0xe2, + 0x0b, 0x57, 0x9c, 0xc8, 0xe5, 0x3a, 0xff, 0x82, 0x7a, 0x66, 0xc5, 0x89, 0xdc, 0xc2, 0x18, 0x62, + 0x56, 0x29, 0x7a, 0x15, 0x46, 0xe2, 0x56, 0xd8, 0x56, 0x71, 0x5b, 0xe7, 0xf8, 0x13, 0x2c, 0x14, + 0x72, 0xef, 0x70, 0x1e, 0x99, 0xd5, 0x51, 0x30, 0x16, 0xf4, 0x73, 0x04, 0x6a, 0xaa, 0xea, 0x01, + 0x46, 0xab, 0xbe, 0x5f, 0x85, 0x93, 0x39, 0x72, 0x82, 0x7e, 0xc1, 0x18, 0xb5, 0xd7, 0xfa, 0x16, + 0xb4, 0x0f, 0x38, 0x6e, 0xbf, 0xc0, 0xf6, 0x41, 0xae, 0x90, 0x8d, 0xfb, 0xa8, 0xfe, 0x66, 0x4c, + 0xb2, 0xd5, 0x53, 0x50, 0x71, 0xf5, 0xb4, 0xda, 0x87, 0x34, 0xf8, 0xb4, 0x1a, 0xd5, 0xce, 0x01, + 0x7e, 0xe3, 0xf7, 0x86, 0xe0, 0x54, 0xde, 0xfd, 0x4e, 0xf4, 0xcb, 0x56, 0x26, 0x05, 0xfa, 0x1b, + 0xfd, 0x5f, 0x12, 0xe5, 0x79, 0xd1, 0x45, 0xd2, 0x87, 0x05, 0x33, 0x29, 0x7a, 0xe1, 0x68, 0x8b, + 0xda, 0x59, 0xdc, 0x7f, 0xc4, 0x53, 0xd9, 0x4b, 0x7d, 0xf0, 0x99, 0xfb, 0x68, 0x8a, 0xc8, 0x86, + 0x1f, 0x67, 0xe2, 0xfe, 0x25, 0xb8, 0x38, 0xee, 0x5f, 0xb6, 0x61, 0x6e, 0x07, 0xc6, 0xb5, 0x7e, + 0x0d, 0x50, 0x04, 0x3c, 0xba, 0x20, 0x69, 0xad, 0x1e, 0xa0, 0x18, 0xfc, 0x3d, 0x0b, 0x32, 0xc1, + 0x19, 0xca, 0xd9, 0x62, 0xf5, 0x74, 0xb6, 0x9c, 0x83, 0xa1, 0x28, 0xf4, 0x49, 0x36, 0x3d, 0x37, + 0x0e, 0x7d, 0x82, 0x19, 0x46, 0xbd, 0xb5, 0x58, 0xed, 0xf5, 0xd6, 0x22, 0xdd, 0x85, 0xfb, 0x64, + 0x9f, 0x48, 0xd7, 0x87, 0x52, 0xde, 0xd7, 0x28, 0x10, 0x73, 0x9c, 0xfd, 0xfb, 0x55, 0x18, 0xe1, + 0xfe, 0x85, 0x01, 0xae, 0xc9, 0x0d, 0xb1, 0xd5, 0x2f, 0x75, 0xdf, 0x92, 0xb7, 0x66, 0xa1, 0xee, + 0x24, 0x0e, 0x17, 0x28, 0xd5, 0xb7, 0xd4, 0x3d, 0x80, 0x16, 0x8c, 0xde, 0xcf, 0x65, 0x76, 0xb2, + 0xc0, 0x79, 0x68, 0x63, 0xb1, 0x0b, 0x10, 0xb3, 0x77, 0xbd, 0x28, 0x0f, 0x91, 0xe4, 0xee, 0xa5, + 0x52, 0xed, 0x68, 0xaa, 0x62, 0xbc, 0x35, 0x69, 0x76, 0x2d, 0x85, 0xc0, 0x1a, 0xef, 0xb9, 0x57, + 0xa0, 0xa6, 0x88, 0x8b, 0xcc, 0xfc, 0x09, 0x5d, 0x24, 0xff, 0x0a, 0x4c, 0x67, 0xea, 0xea, 0x6b, + 0x97, 0xf0, 0x23, 0x0b, 0x4e, 0x74, 0x3d, 0x10, 0x8b, 0xde, 0xb3, 0xe0, 0x94, 0x9f, 0xe3, 0x58, + 0x12, 0x1f, 0xf8, 0x7e, 0x5c, 0x52, 0x6a, 0x8b, 0x90, 0x87, 0xc5, 0xb9, 0xb5, 0xc9, 0xb4, 0x9d, + 0x95, 0xfc, 0xb4, 0x9d, 0xf6, 0xf7, 0x2d, 0x10, 0x9f, 0x6c, 0xe0, 0xe6, 0xcf, 0xba, 0x69, 0xfe, + 0x7c, 0xb4, 0x8c, 0x0c, 0xf4, 0xb0, 0x7b, 0xfe, 0x83, 0x05, 0x88, 0x13, 0x64, 0x1f, 0xf7, 0xe3, + 0x5e, 0x3a, 0xcd, 0x5a, 0x4f, 0x85, 0x46, 0x61, 0xb0, 0x46, 0xd5, 0x67, 0x06, 0x77, 0xf5, 0x28, + 0x56, 0xb9, 0xf7, 0xf0, 0xab, 0x25, 0xde, 0xc3, 0xff, 0xdd, 0x2a, 0x64, 0xa3, 0x18, 0xd0, 0x97, + 0x61, 0xa2, 0xe5, 0xb4, 0x9d, 0x2d, 0xcf, 0xf7, 0x12, 0x8f, 0xc4, 0xe5, 0xce, 0x89, 0x56, 0xb4, + 0x12, 0xc2, 0xcf, 0xab, 0x41, 0xb0, 0xc1, 0x11, 0x2d, 0x00, 0xb4, 0x23, 0x6f, 0xdf, 0xf3, 0xc9, + 0x0e, 0x33, 0x3a, 0x54, 0xde, 0x93, 0x86, 0x82, 0x62, 0x8d, 0x22, 0x27, 0x5c, 0xae, 0xfa, 0x30, + 0xc2, 0xe5, 0x86, 0xfa, 0x0c, 0x97, 0x1b, 0x2e, 0x15, 0x2e, 0x87, 0xe1, 0x8c, 0x74, 0xcf, 0xd2, + 0xff, 0x6b, 0x9e, 0x4f, 0x78, 0x92, 0x3e, 0x11, 0xe4, 0x38, 0x77, 0x74, 0x38, 0x7f, 0x06, 0xe7, + 0x52, 0xe0, 0x1e, 0x25, 0xed, 0x0e, 0x9c, 0x6c, 0x92, 0xc8, 0x63, 0x99, 0x94, 0xdc, 0x74, 0xfa, + 0x7d, 0x11, 0x6a, 0x51, 0x66, 0xe6, 0xf7, 0x79, 0xdf, 0x4c, 0x4b, 0x49, 0x21, 0x67, 0x7a, 0xca, + 0xd2, 0xfe, 0xeb, 0x15, 0x18, 0x15, 0xd1, 0x42, 0x03, 0x5c, 0x45, 0xae, 0x1a, 0x3b, 0xbb, 0x67, + 0x8b, 0x66, 0x2e, 0x6b, 0x4e, 0xcf, 0x3d, 0x5d, 0x33, 0xb3, 0xa7, 0x7b, 0xbe, 0x1c, 0xbb, 0xe3, + 0x77, 0x73, 0xbf, 0x53, 0x81, 0x29, 0x33, 0x6a, 0x6a, 0x80, 0xc3, 0xf1, 0x36, 0x8c, 0xc6, 0x22, + 0x94, 0xa8, 0x52, 0x26, 0x32, 0x23, 0xfb, 0x49, 0xd3, 0xb7, 0xf5, 0x45, 0xf0, 0x90, 0x64, 0x97, + 0x1b, 0xad, 0x54, 0x7d, 0x18, 0xd1, 0x4a, 0xf6, 0xbf, 0x63, 0x2a, 0x55, 0x1f, 0xc0, 0x81, 0x2f, + 0x08, 0x6f, 0x9a, 0xaa, 0xf7, 0x42, 0x29, 0x39, 0x10, 0x8d, 0xeb, 0xb1, 0x30, 0xfc, 0x2b, 0x0b, + 0xc6, 0x05, 0xe1, 0xc0, 0x9b, 0xff, 0x59, 0xb3, 0xf9, 0x4f, 0x97, 0x6a, 0x7e, 0x8f, 0x76, 0xff, + 0x83, 0x8a, 0x6a, 0x77, 0x43, 0x3c, 0x77, 0x5a, 0x98, 0xaf, 0x71, 0xac, 0x1d, 0x85, 0x49, 0xd8, + 0x0a, 0x7d, 0xb1, 0xb8, 0x3f, 0x91, 0xc6, 0x95, 0x73, 0xf8, 0x3d, 0xed, 0x37, 0x56, 0xd4, 0x2c, + 0x64, 0x3a, 0x8c, 0x12, 0xb1, 0x38, 0xe5, 0x3d, 0xb6, 0xba, 0x25, 0x1f, 0xb3, 0xa6, 0x30, 0x71, + 0x1d, 0xa3, 0xdf, 0x47, 0x5c, 0xd3, 0x40, 0x71, 0xc5, 0x09, 0x6b, 0x5c, 0x65, 0x0c, 0x23, 0xab, + 0x61, 0xd8, 0x74, 0x9d, 0x5e, 0x17, 0x70, 0xac, 0x28, 0xec, 0x57, 0x98, 0x76, 0x65, 0xc3, 0xd3, + 0x5f, 0xf4, 0xf7, 0x37, 0x46, 0xd4, 0xc0, 0x32, 0xdf, 0xc8, 0x75, 0x18, 0xa6, 0x5d, 0x94, 0xdb, + 0xbf, 0x72, 0xaa, 0x8c, 0x36, 0x41, 0x8f, 0x02, 0x8b, 0x92, 0x18, 0x73, 0x36, 0x88, 0x74, 0xf9, + 0xdb, 0x5f, 0x29, 0xad, 0x1d, 0xfb, 0xf0, 0xb0, 0xb3, 0x5c, 0x30, 0x2c, 0x05, 0xc6, 0x7a, 0x23, + 0x9b, 0x63, 0x73, 0x45, 0x22, 0x70, 0x4a, 0x83, 0x16, 0x85, 0x95, 0x6e, 0xbe, 0x85, 0x2b, 0xad, + 0x74, 0x39, 0x24, 0x9a, 0x99, 0x7e, 0x11, 0xc6, 0x55, 0x96, 0xf1, 0x06, 0x4f, 0x16, 0x5d, 0xe3, + 0x96, 0xcb, 0x6a, 0x0a, 0xc6, 0x3a, 0x0d, 0x5a, 0x87, 0x93, 0xae, 0x0a, 0x59, 0x6d, 0x74, 0xb6, + 0x7c, 0xaf, 0x45, 0x8b, 0xf2, 0x8b, 0x22, 0x8f, 0x1d, 0x1d, 0xce, 0x9f, 0xac, 0x77, 0xa3, 0x71, + 0x5e, 0x19, 0xb4, 0x09, 0xd3, 0x31, 0xcf, 0xa6, 0x2e, 0x2f, 0x93, 0x89, 0x54, 0x74, 0xcf, 0x49, + 0x47, 0x7f, 0xd3, 0x44, 0xdf, 0x63, 0x20, 0xae, 0x11, 0x04, 0x08, 0x67, 0x59, 0xa0, 0x37, 0x60, + 0xca, 0xd7, 0x1f, 0x84, 0x6a, 0x88, 0xc8, 0x5d, 0x15, 0xfe, 0x60, 0x3c, 0x17, 0xd5, 0xc0, 0x19, + 0x6a, 0xf4, 0x36, 0xcc, 0xea, 0x10, 0x71, 0x55, 0xdd, 0x09, 0x76, 0x48, 0x2c, 0xd2, 0x38, 0x3f, + 0x71, 0x74, 0x38, 0x3f, 0x7b, 0xad, 0x07, 0x0d, 0xee, 0x59, 0x1a, 0xbd, 0x0a, 0x13, 0x72, 0x24, + 0xb5, 0x28, 0xde, 0x34, 0xf0, 0x46, 0xc3, 0x61, 0x83, 0xf2, 0x83, 0x9d, 0x67, 0x7c, 0x8d, 0x16, + 0xd6, 0x96, 0x53, 0xf4, 0x15, 0x98, 0xd0, 0xdb, 0x28, 0x74, 0xe4, 0xc7, 0xcb, 0x3f, 0xb2, 0x25, + 0x96, 0x65, 0xd5, 0x72, 0x1d, 0x87, 0x0d, 0xde, 0xf6, 0x0d, 0x18, 0x69, 0x1e, 0xc4, 0xad, 0xc4, + 0x7f, 0x50, 0xcf, 0x20, 0xb7, 0x60, 0x3a, 0xf3, 0x5e, 0xb0, 0x7a, 0x78, 0xda, 0x7a, 0x50, 0x0f, + 0x4f, 0xdb, 0x5f, 0xb7, 0x60, 0x78, 0xd3, 0xf1, 0x8a, 0x1f, 0x40, 0x28, 0xd3, 0x64, 0xf4, 0x32, + 0x8c, 0x90, 0xed, 0x6d, 0xd2, 0x92, 0x0f, 0x59, 0x3f, 0x29, 0xcd, 0x99, 0x55, 0x06, 0xa5, 0x53, + 0x93, 0x55, 0xc6, 0xff, 0x62, 0x41, 0x6c, 0xff, 0x47, 0x0b, 0x60, 0x33, 0xf4, 0xe5, 0x51, 0x4d, + 0x41, 0x4b, 0x96, 0xbb, 0x9e, 0x62, 0x78, 0x26, 0xe7, 0x29, 0x06, 0x94, 0x32, 0xcc, 0x79, 0x88, + 0x41, 0xf5, 0xa6, 0x5a, 0xaa, 0x37, 0x43, 0xfd, 0xf4, 0xe6, 0x5b, 0x16, 0x88, 0x88, 0x99, 0x12, + 0x92, 0xe0, 0xca, 0xf4, 0xe9, 0x46, 0x12, 0x8a, 0xe7, 0xca, 0xdc, 0xf6, 0x10, 0xa9, 0x27, 0x94, + 0x6c, 0x1a, 0x09, 0x27, 0x0c, 0xae, 0x74, 0x0b, 0x3f, 0xce, 0xd1, 0x1b, 0xcc, 0x76, 0x2c, 0x6e, + 0x57, 0x5f, 0xc9, 0xb6, 0x58, 0x76, 0x71, 0xca, 0x58, 0xa5, 0x5d, 0xd2, 0xb3, 0x8b, 0x4b, 0x04, + 0x4e, 0x69, 0xd0, 0xb3, 0x30, 0x1a, 0x77, 0xb6, 0x18, 0x79, 0x26, 0x7c, 0xa6, 0xc9, 0xc1, 0x58, + 0xe2, 0xed, 0x5f, 0x42, 0x60, 0x74, 0xcd, 0x48, 0xf1, 0x64, 0x3d, 0xf0, 0x14, 0x4f, 0xef, 0xc0, + 0x18, 0xd9, 0x6b, 0x27, 0x07, 0x75, 0x2f, 0x2a, 0x97, 0x68, 0x6f, 0x55, 0x50, 0x77, 0x73, 0x97, + 0x18, 0xac, 0x38, 0xf6, 0x48, 0xd8, 0x55, 0x7d, 0x24, 0x12, 0x76, 0x0d, 0xfd, 0x85, 0x24, 0xec, + 0x7a, 0x1b, 0x46, 0x77, 0xbc, 0x04, 0x93, 0x76, 0x28, 0xae, 0xf6, 0x15, 0x9c, 0x81, 0x5d, 0xe6, + 0xc4, 0xdd, 0x59, 0x78, 0x04, 0x02, 0x4b, 0x76, 0x68, 0x13, 0x46, 0xf8, 0xbe, 0x43, 0xe4, 0xc0, + 0xfa, 0x78, 0x19, 0x8f, 0x4c, 0x77, 0x3a, 0x28, 0x11, 0x23, 0x25, 0x78, 0xc9, 0x04, 0x5d, 0xa3, + 0x1f, 0x3c, 0x41, 0x97, 0x4a, 0xab, 0x35, 0xf6, 0xa0, 0xd2, 0x6a, 0x19, 0xe9, 0xc9, 0x6a, 0x83, + 0x48, 0x4f, 0xf6, 0x2d, 0x0b, 0x4e, 0xb7, 0xf3, 0x52, 0xfb, 0x89, 0x04, 0x59, 0x9f, 0xbe, 0x8f, + 0x54, 0x87, 0x46, 0xd5, 0xec, 0xd2, 0x55, 0x2e, 0x19, 0xce, 0xaf, 0x58, 0xe6, 0x39, 0x1b, 0xff, + 0xe0, 0x79, 0xce, 0x06, 0x9d, 0x49, 0x2b, 0xcd, 0x7a, 0x36, 0x39, 0x90, 0xac, 0x67, 0x53, 0x0f, + 0x30, 0xeb, 0x99, 0x96, 0xaf, 0x6c, 0xfa, 0xc1, 0xe6, 0x2b, 0xdb, 0x85, 0x71, 0x37, 0xbc, 0x13, + 0xdc, 0x71, 0x22, 0x77, 0xa9, 0xb1, 0x2e, 0xd2, 0x63, 0x15, 0x64, 0x63, 0xa8, 0xa7, 0x05, 0x8c, + 0x1a, 0xb8, 0xeb, 0x31, 0x45, 0x62, 0x9d, 0xb5, 0xc8, 0xdc, 0x76, 0xe2, 0x03, 0x66, 0x6e, 0x33, + 0xf2, 0x9f, 0xa1, 0x41, 0xe4, 0x3f, 0xfb, 0x32, 0xbb, 0x9c, 0xbd, 0xed, 0xed, 0x6c, 0x38, 0xed, + 0xd9, 0x93, 0x65, 0x6a, 0x58, 0x91, 0xe4, 0xdd, 0x35, 0x28, 0x14, 0x4e, 0x99, 0x76, 0x67, 0x58, + 0x3b, 0xf5, 0xb0, 0x33, 0xac, 0x9d, 0x1e, 0x60, 0x86, 0xb5, 0x33, 0x0f, 0x35, 0xc3, 0xda, 0x63, + 0x7f, 0x21, 0x19, 0xd6, 0xfe, 0x2a, 0x9c, 0x3d, 0xfe, 0x73, 0xa4, 0xd9, 0x7b, 0x1b, 0xa9, 0xcb, + 0x20, 0x93, 0xbd, 0x97, 0x99, 0x3a, 0x1a, 0x55, 0xe9, 0x44, 0x4f, 0xdf, 0xb7, 0xe0, 0xb1, 0x1e, + 0x19, 0x51, 0x4a, 0xdf, 0x5d, 0x68, 0xc3, 0x74, 0xdb, 0x2c, 0x5a, 0xfa, 0x7e, 0x91, 0x91, 0x81, + 0x45, 0xc5, 0xc6, 0x65, 0x10, 0x38, 0xcb, 0x7e, 0xf9, 0xa3, 0x3f, 0x79, 0xff, 0xec, 0x87, 0x7e, + 0xfa, 0xfe, 0xd9, 0x0f, 0xfd, 0xd1, 0xfb, 0x67, 0x3f, 0xf4, 0x8b, 0x47, 0x67, 0xad, 0x9f, 0x1c, + 0x9d, 0xb5, 0x7e, 0x7a, 0x74, 0xd6, 0xfa, 0xd3, 0xa3, 0xb3, 0xd6, 0xb7, 0xfe, 0xec, 0xec, 0x87, + 0x3e, 0x5f, 0xd9, 0xbf, 0xf8, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x69, 0x61, 0x78, 0x3b, 0xf1, + 0xb5, 0x00, 0x00, } diff --git a/pkg/api/v1/generated.proto b/pkg/api/v1/generated.proto index c536f6abe83..d0d79528cf7 100644 --- a/pkg/api/v1/generated.proto +++ b/pkg/api/v1/generated.proto @@ -22,7 +22,7 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.api.v1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -252,7 +252,7 @@ message ComponentStatusList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of ComponentStatus objects. repeated ComponentStatus items = 2; @@ -284,7 +284,7 @@ message ConfigMapKeySelector { message ConfigMapList { // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of ConfigMaps. repeated ConfigMap items = 2; @@ -508,7 +508,7 @@ message ContainerState { message ContainerStateRunning { // Time at which the container was last (re-)started // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startedAt = 1; } // ContainerStateTerminated is a terminated state of a container. @@ -530,11 +530,11 @@ message ContainerStateTerminated { // Time at which previous execution of the container started // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 5; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startedAt = 5; // Time at which the container last terminated // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time finishedAt = 6; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time finishedAt = 6; // Container's ID in the format 'docker://' // +optional @@ -765,7 +765,7 @@ message EndpointsList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of endpoints. repeated Endpoints items = 2; @@ -840,11 +840,11 @@ message Event { // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time firstTimestamp = 6; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time firstTimestamp = 6; // The time at which the most recent occurrence of this event was recorded. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTimestamp = 7; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTimestamp = 7; // The number of times this event has occurred. // +optional @@ -860,7 +860,7 @@ message EventList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of events repeated Event items = 2; @@ -1205,7 +1205,7 @@ message LimitRangeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of LimitRange objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_limit_range.md @@ -1223,7 +1223,7 @@ message List { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of objects repeated k8s.io.kubernetes.pkg.runtime.RawExtension items = 2; @@ -1331,7 +1331,7 @@ message NamespaceList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Namespace objects in the list. // More info: http://kubernetes.io/docs/user-guide/namespaces @@ -1417,11 +1417,11 @@ message NodeCondition { // Last time we got an update on a given condition. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastHeartbeatTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastHeartbeatTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -1444,7 +1444,7 @@ message NodeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of nodes repeated Node items = 2; @@ -1700,7 +1700,7 @@ message ObjectMeta { // Null for lists. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time creationTimestamp = 8; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time creationTimestamp = 8; // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // field is set by the server when a graceful deletion is requested by the user, and is not @@ -1720,7 +1720,7 @@ message ObjectMeta { // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time deletionTimestamp = 9; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time deletionTimestamp = 9; // Number of seconds allowed for this object to gracefully terminate before // it will be removed from the system. Only set when deletionTimestamp is also set. @@ -1878,7 +1878,7 @@ message PersistentVolumeClaimList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // A list of persistent volume claims. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims @@ -1895,7 +1895,7 @@ message PersistentVolumeClaimSpec { // A label query over volumes to consider for binding. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // Resources represents the minimum resources the volume should have. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources @@ -1943,7 +1943,7 @@ message PersistentVolumeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of persistent volumes. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes @@ -2161,7 +2161,7 @@ message PodAffinity { message PodAffinityTerm { // A label query over a set of resources, in this case pods. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector labelSelector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector labelSelector = 1; // namespaces specifies which namespaces the labelSelector applies to (matches against); // nil list means "this pod's namespace," empty list means "all namespaces" @@ -2262,11 +2262,11 @@ message PodCondition { // Last time we probed the condition. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transitioned from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // Unique, one-word, CamelCase reason for the condition's last transition. // +optional @@ -2316,7 +2316,7 @@ message PodList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of pods. // More info: http://kubernetes.io/docs/user-guide/pods @@ -2349,7 +2349,7 @@ message PodLogOptions { // If this value is in the future, no logs will be returned. // Only one of sinceSeconds or sinceTime may be specified. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time sinceTime = 5; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time sinceTime = 5; // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // of log output. Defaults to false. @@ -2573,7 +2573,7 @@ message PodStatus { // RFC 3339 date and time at which the object was acknowledged by the Kubelet. // This is before the Kubelet pulled the container image(s) for the pod. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 7; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 7; // The list has one entry per container in the manifest. Each entry is currently the output // of `docker inspect`. @@ -2616,7 +2616,7 @@ message PodTemplateList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of pod templates repeated PodTemplate items = 2; @@ -2649,7 +2649,7 @@ message PreferAvoidPodsEntry { // Time at which this entry was added to the list. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time evictionTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time evictionTime = 2; // (brief) reason why this entry was added to the list. // +optional @@ -2827,7 +2827,7 @@ message ReplicationControllerCondition { // The last time the condition transitioned from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 3; // The reason for the condition's last transition. // +optional @@ -2843,7 +2843,7 @@ message ReplicationControllerList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of replication controllers. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -2945,7 +2945,7 @@ message ResourceQuotaList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of ResourceQuota objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota @@ -3054,7 +3054,7 @@ message SecretList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of secret objects. // More info: http://kubernetes.io/docs/user-guide/secrets @@ -3192,7 +3192,7 @@ message ServiceAccountList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of ServiceAccounts. // More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md#service-accounts @@ -3204,7 +3204,7 @@ message ServiceList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of services repeated Service items = 2; diff --git a/pkg/api/v1/meta.go b/pkg/api/v1/meta.go index 7c13814b126..dde646c4eee 100644 --- a/pkg/api/v1/meta.go +++ b/pkg/api/v1/meta.go @@ -27,19 +27,19 @@ func (obj *ObjectMeta) GetObjectMeta() meta.Object { return obj } // Namespace implements meta.Object for any object with an ObjectMeta typed field. Allows // fast, direct access to metadata fields for API objects. -func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } -func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } -func (meta *ObjectMeta) GetName() string { return meta.Name } -func (meta *ObjectMeta) SetName(name string) { meta.Name = name } -func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } -func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } -func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } -func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } -func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } -func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } -func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } -func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } -func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } +func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } +func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } +func (meta *ObjectMeta) GetName() string { return meta.Name } +func (meta *ObjectMeta) SetName(name string) { meta.Name = name } +func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } +func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } +func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } +func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } +func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } +func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } +func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } +func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } +func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) { meta.CreationTimestamp = creationTimestamp } diff --git a/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index 914207638ec..11c42a9bc66 100644 --- a/pkg/api/v1/types.generated.go +++ b/pkg/api/v1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_resource "k8s.io/kubernetes/pkg/api/resource" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg5_runtime "k8s.io/kubernetes/pkg/runtime" pkg1_types "k8s.io/kubernetes/pkg/types" pkg4_intstr "k8s.io/kubernetes/pkg/util/intstr" @@ -66,7 +66,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg3_resource.Quantity - var v1 pkg2_unversioned.Time + var v1 pkg2_v1.Time var v2 pkg5_runtime.RawExtension var v3 pkg1_types.UID var v4 pkg4_intstr.IntOrString @@ -674,7 +674,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv62 := &x.CreationTimestamp yym63 := z.DecBinary() @@ -696,7 +696,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym65 := z.DecBinary() _ = yym65 @@ -918,7 +918,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv85 := &x.CreationTimestamp yym86 := z.DecBinary() @@ -950,7 +950,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym88 := z.DecBinary() _ = yym88 @@ -8173,7 +8173,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv474 := &x.ListMeta yym475 := z.DecBinary() @@ -8254,7 +8254,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv481 := &x.ListMeta yym482 := z.DecBinary() @@ -8860,7 +8860,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv537 := &x.ListMeta yym538 := z.DecBinary() @@ -8941,7 +8941,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv544 := &x.ListMeta yym545 := z.DecBinary() @@ -9214,7 +9214,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromMap(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym568 := z.DecBinary() _ = yym568 @@ -9290,7 +9290,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromArray(l int, d *codec1978 } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym575 := z.DecBinary() _ = yym575 @@ -22631,7 +22631,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromMap(l int, d *codec1978.Decod switch yys1636 { case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1637 := &x.StartedAt yym1638 := z.DecBinary() @@ -22672,7 +22672,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1640 := &x.StartedAt yym1641 := z.DecBinary() @@ -23019,7 +23019,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1676 := &x.StartedAt yym1677 := z.DecBinary() @@ -23036,7 +23036,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "finishedAt": if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1678 := &x.FinishedAt yym1679 := z.DecBinary() @@ -23147,7 +23147,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1686 := &x.StartedAt yym1687 := z.DecBinary() @@ -23174,7 +23174,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1688 := &x.FinishedAt yym1689 := z.DecBinary() @@ -24271,7 +24271,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1781 := &x.LastProbeTime yym1782 := z.DecBinary() @@ -24288,7 +24288,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1783 := &x.LastTransitionTime yym1784 := z.DecBinary() @@ -24373,7 +24373,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1790 := &x.LastProbeTime yym1791 := z.DecBinary() @@ -24400,7 +24400,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1792 := &x.LastTransitionTime yym1793 := z.DecBinary() @@ -26353,7 +26353,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym1935 := z.DecBinary() _ = yym1935 @@ -26412,7 +26412,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym1941 := z.DecBinary() _ = yym1941 @@ -29413,7 +29413,7 @@ func (x *PodStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2201 := z.DecBinary() _ = yym2201 @@ -29572,7 +29572,7 @@ func (x *PodStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2213 := z.DecBinary() _ = yym2213 @@ -30482,7 +30482,7 @@ func (x *PodList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2294 := &x.ListMeta yym2295 := z.DecBinary() @@ -30563,7 +30563,7 @@ func (x *PodList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2301 := &x.ListMeta yym2302 := z.DecBinary() @@ -31332,7 +31332,7 @@ func (x *PodTemplateList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2368 := &x.ListMeta yym2369 := z.DecBinary() @@ -31413,7 +31413,7 @@ func (x *PodTemplateList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2375 := &x.ListMeta yym2376 := z.DecBinary() @@ -32494,7 +32494,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromMap(l int, d *codec1 } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2469 := &x.LastTransitionTime yym2470 := z.DecBinary() @@ -32579,7 +32579,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromArray(l int, d *code } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2476 := &x.LastTransitionTime yym2477 := z.DecBinary() @@ -33199,7 +33199,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2532 := &x.ListMeta yym2533 := z.DecBinary() @@ -33280,7 +33280,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2539 := &x.ListMeta yym2540 := z.DecBinary() @@ -35551,7 +35551,7 @@ func (x *ServiceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2734 := &x.ListMeta yym2735 := z.DecBinary() @@ -35632,7 +35632,7 @@ func (x *ServiceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2741 := &x.ListMeta yym2742 := z.DecBinary() @@ -36290,7 +36290,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2801 := &x.ListMeta yym2802 := z.DecBinary() @@ -36371,7 +36371,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromArray(l int, d *codec1978.Decode } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2808 := &x.ListMeta yym2809 := z.DecBinary() @@ -37871,7 +37871,7 @@ func (x *EndpointsList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2935 := &x.ListMeta yym2936 := z.DecBinary() @@ -37952,7 +37952,7 @@ func (x *EndpointsList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2942 := &x.ListMeta yym2943 := z.DecBinary() @@ -40458,7 +40458,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "evictionTime": if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3159 := &x.EvictionTime yym3160 := z.DecBinary() @@ -40528,7 +40528,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3165 := &x.EvictionTime yym3166 := z.DecBinary() @@ -41301,7 +41301,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastHeartbeatTime": if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3225 := &x.LastHeartbeatTime yym3226 := z.DecBinary() @@ -41318,7 +41318,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3227 := &x.LastTransitionTime yym3228 := z.DecBinary() @@ -41403,7 +41403,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3234 := &x.LastHeartbeatTime yym3235 := z.DecBinary() @@ -41430,7 +41430,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3236 := &x.LastTransitionTime yym3237 := z.DecBinary() @@ -42325,7 +42325,7 @@ func (x *NodeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3312 := &x.ListMeta yym3313 := z.DecBinary() @@ -42406,7 +42406,7 @@ func (x *NodeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3319 := &x.ListMeta yym3320 := z.DecBinary() @@ -43412,7 +43412,7 @@ func (x *NamespaceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3401 := &x.ListMeta yym3402 := z.DecBinary() @@ -43493,7 +43493,7 @@ func (x *NamespaceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3408 := &x.ListMeta yym3409 := z.DecBinary() @@ -45407,7 +45407,7 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } yym3584 := z.DecBinary() _ = yym3584 @@ -45596,7 +45596,7 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } yym3599 := z.DecBinary() _ = yym3599 @@ -49343,7 +49343,7 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "firstTimestamp": if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { yyv3930 := &x.FirstTimestamp yym3931 := z.DecBinary() @@ -49360,7 +49360,7 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTimestamp": if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { yyv3932 := &x.LastTimestamp yym3933 := z.DecBinary() @@ -49528,7 +49528,7 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { yyv3944 := &x.FirstTimestamp yym3945 := z.DecBinary() @@ -49555,7 +49555,7 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { yyv3946 := &x.LastTimestamp yym3947 := z.DecBinary() @@ -49832,7 +49832,7 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3971 := &x.ListMeta yym3972 := z.DecBinary() @@ -49913,7 +49913,7 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3978 := &x.ListMeta yym3979 := z.DecBinary() @@ -50176,7 +50176,7 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4003 := &x.ListMeta yym4004 := z.DecBinary() @@ -50257,7 +50257,7 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4010 := &x.ListMeta yym4011 := z.DecBinary() @@ -51428,7 +51428,7 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4100 := &x.ListMeta yym4101 := z.DecBinary() @@ -51509,7 +51509,7 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4107 := &x.ListMeta yym4108 := z.DecBinary() @@ -52595,7 +52595,7 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4193 := &x.ListMeta yym4194 := z.DecBinary() @@ -52676,7 +52676,7 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4200 := &x.ListMeta yym4201 := z.DecBinary() @@ -53398,7 +53398,7 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4265 := &x.ListMeta yym4266 := z.DecBinary() @@ -53479,7 +53479,7 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4272 := &x.ListMeta yym4273 := z.DecBinary() @@ -54069,7 +54069,7 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4325 := &x.ListMeta yym4326 := z.DecBinary() @@ -54150,7 +54150,7 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4332 := &x.ListMeta yym4333 := z.DecBinary() @@ -55045,7 +55045,7 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4409 := &x.ListMeta yym4410 := z.DecBinary() @@ -55126,7 +55126,7 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv4416 := &x.ListMeta yym4417 := z.DecBinary() diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go index 0ab490b0220..6537c627a4e 100644 --- a/pkg/api/validation/validation.go +++ b/pkg/api/validation/validation.go @@ -32,8 +32,8 @@ import ( utilpod "k8s.io/kubernetes/pkg/api/pod" "k8s.io/kubernetes/pkg/api/resource" apiservice "k8s.io/kubernetes/pkg/api/service" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/api/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index 0c0c46eb75b..463e45ef870 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/service" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/security/apparmor" diff --git a/pkg/apis/abac/types.go b/pkg/apis/abac/types.go index d848b907510..1a192f21802 100644 --- a/pkg/apis/abac/types.go +++ b/pkg/apis/abac/types.go @@ -17,7 +17,9 @@ limitations under the License. // +k8s:openapi-gen=true package abac -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) // Policy contains a single ABAC policy rule type Policy struct { diff --git a/pkg/apis/abac/v0/types.go b/pkg/apis/abac/v0/types.go index e3867023e5d..a656e05132c 100644 --- a/pkg/apis/abac/v0/types.go +++ b/pkg/apis/abac/v0/types.go @@ -17,7 +17,9 @@ limitations under the License. // +k8s:openapi-gen=true package v0 -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) // Policy contains a single ABAC policy rule type Policy struct { diff --git a/pkg/apis/abac/v1beta1/types.go b/pkg/apis/abac/v1beta1/types.go index a7898001943..793243b9dfb 100644 --- a/pkg/apis/abac/v1beta1/types.go +++ b/pkg/apis/abac/v1beta1/types.go @@ -17,7 +17,9 @@ limitations under the License. // +k8s:openapi-gen=true package v1beta1 -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) // Policy contains a single ABAC policy rule type Policy struct { diff --git a/pkg/apis/apps/types.generated.go b/pkg/apis/apps/types.generated.go index 5fe8db386d1..b0da09e459c 100644 --- a/pkg/apis/apps/types.generated.go +++ b/pkg/apis/apps/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -67,7 +67,7 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.TypeMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -648,7 +648,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym54 := z.DecBinary() _ = yym54 @@ -730,7 +730,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym62 := z.DecBinary() _ = yym62 @@ -1265,7 +1265,7 @@ func (x *StatefulSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv108 := &x.ListMeta yym109 := z.DecBinary() @@ -1346,7 +1346,7 @@ func (x *StatefulSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv115 := &x.ListMeta yym116 := z.DecBinary() diff --git a/pkg/apis/apps/types.go b/pkg/apis/apps/types.go index 0b5de623973..b9402708c6a 100644 --- a/pkg/apis/apps/types.go +++ b/pkg/apis/apps/types.go @@ -99,5 +99,5 @@ type StatefulSetList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty"` - Items []StatefulSet `json:"items"` + Items []StatefulSet `json:"items"` } diff --git a/pkg/apis/apps/v1beta1/conversion.go b/pkg/apis/apps/v1beta1/conversion.go index 0998225ae2b..2f84ba29299 100644 --- a/pkg/apis/apps/v1beta1/conversion.go +++ b/pkg/apis/apps/v1beta1/conversion.go @@ -20,9 +20,9 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/apis/apps/v1beta1/generated.pb.go b/pkg/apis/apps/v1beta1/generated.pb.go index d2e9bdf7910..14272ac1829 100644 --- a/pkg/apis/apps/v1beta1/generated.pb.go +++ b/pkg/apis/apps/v1beta1/generated.pb.go @@ -36,8 +36,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -354,7 +354,7 @@ func (this *StatefulSetList) String() string { return "nil" } s := strings.Join([]string{`&StatefulSetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StatefulSet", "StatefulSet", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -366,7 +366,7 @@ func (this *StatefulSetSpec) String() string { } s := strings.Join([]string{`&StatefulSetSpec{`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `VolumeClaimTemplates:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.VolumeClaimTemplates), "PersistentVolumeClaim", "k8s_io_kubernetes_pkg_api_v1.PersistentVolumeClaim", 1), `&`, ``, 1) + `,`, `ServiceName:` + fmt.Sprintf("%v", this.ServiceName) + `,`, @@ -720,7 +720,7 @@ func (m *StatefulSetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1032,45 +1032,45 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 637 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x86, 0xe3, 0xa4, 0xe9, 0x97, 0x6f, 0x52, 0xfe, 0x86, 0x0a, 0x45, 0x11, 0x72, 0xab, 0x6c, - 0x08, 0x52, 0x3b, 0x56, 0x4a, 0x2b, 0x2a, 0x96, 0x46, 0x02, 0x21, 0x01, 0x45, 0x0e, 0xaa, 0xa0, - 0x08, 0xa4, 0xb1, 0x73, 0x9a, 0x9a, 0xd8, 0x1e, 0xcb, 0x73, 0x9c, 0x35, 0x1b, 0x16, 0xec, 0xb8, - 0x0b, 0x2e, 0x81, 0x5b, 0xa8, 0xc4, 0xa6, 0x4b, 0x56, 0x15, 0x0d, 0x37, 0x82, 0x3c, 0x99, 0x24, - 0xa6, 0x4e, 0x4a, 0xd5, 0x9d, 0xcf, 0xcc, 0x79, 0x9f, 0xf3, 0x33, 0xaf, 0xc9, 0xc3, 0xc1, 0xae, - 0x64, 0xbe, 0xb0, 0x06, 0xa9, 0x0b, 0x49, 0x04, 0x08, 0xd2, 0x8a, 0x07, 0x7d, 0x8b, 0xc7, 0xbe, - 0xb4, 0x78, 0x1c, 0x4b, 0x6b, 0xd8, 0x71, 0x01, 0x79, 0xc7, 0xea, 0x43, 0x04, 0x09, 0x47, 0xe8, - 0xb1, 0x38, 0x11, 0x28, 0xe8, 0xbd, 0xb1, 0x90, 0xcd, 0x84, 0x2c, 0x1e, 0xf4, 0x59, 0x26, 0x64, - 0x99, 0x90, 0x69, 0x61, 0x73, 0xb3, 0xef, 0xe3, 0x51, 0xea, 0x32, 0x4f, 0x84, 0x56, 0x5f, 0xf4, - 0x85, 0xa5, 0xf4, 0x6e, 0x7a, 0xa8, 0x22, 0x15, 0xa8, 0xaf, 0x31, 0xb7, 0xb9, 0xb5, 0xb0, 0x21, - 0x2b, 0x01, 0x29, 0xd2, 0xc4, 0x83, 0xf3, 0xbd, 0x34, 0x77, 0x16, 0x6b, 0xd2, 0x68, 0x08, 0x89, - 0xf4, 0x45, 0x04, 0xbd, 0x82, 0x6c, 0x63, 0xb1, 0x6c, 0x58, 0x18, 0xb8, 0xb9, 0x39, 0x3f, 0x3b, - 0x49, 0x23, 0xf4, 0xc3, 0x62, 0x4f, 0xdb, 0x17, 0xa7, 0x4b, 0xef, 0x08, 0x42, 0x5e, 0x50, 0x75, - 0xe6, 0xab, 0x52, 0xf4, 0x03, 0xcb, 0x8f, 0x50, 0x62, 0x72, 0x5e, 0xd2, 0xfa, 0x56, 0x26, 0xf5, - 0x2e, 0x72, 0x84, 0xc3, 0x34, 0xe8, 0x02, 0xd2, 0x37, 0xa4, 0x16, 0x02, 0xf2, 0x1e, 0x47, 0xde, - 0x30, 0xd6, 0x8d, 0x76, 0x7d, 0xab, 0xcd, 0x16, 0xbe, 0x15, 0x1b, 0x76, 0xd8, 0x9e, 0xfb, 0x11, - 0x3c, 0x7c, 0x01, 0xc8, 0x6d, 0x7a, 0x7c, 0xba, 0x56, 0x1a, 0x9d, 0xae, 0x91, 0xd9, 0x99, 0x33, - 0xa5, 0xd1, 0x03, 0xb2, 0x24, 0x63, 0xf0, 0x1a, 0x65, 0x45, 0xdd, 0x65, 0x97, 0x74, 0x00, 0xcb, - 0x75, 0xd7, 0x8d, 0xc1, 0xb3, 0x57, 0x74, 0x95, 0xa5, 0x2c, 0x72, 0x14, 0x93, 0xba, 0x64, 0x59, - 0x22, 0xc7, 0x54, 0x36, 0x2a, 0x8a, 0xfe, 0xe8, 0x4a, 0x74, 0x45, 0xb0, 0xaf, 0x6b, 0xfe, 0xf2, - 0x38, 0x76, 0x34, 0xb9, 0xf5, 0xc3, 0x20, 0x37, 0x72, 0xd9, 0xcf, 0x7d, 0x89, 0xf4, 0x7d, 0x61, - 0x5b, 0xd6, 0x05, 0xdb, 0xca, 0xb9, 0x89, 0x65, 0x72, 0xb5, 0xb4, 0x9b, 0xba, 0x5c, 0x6d, 0x72, - 0x92, 0x5b, 0xd9, 0x5b, 0x52, 0xf5, 0x11, 0x42, 0xd9, 0x28, 0xaf, 0x57, 0xda, 0xf5, 0xad, 0xed, - 0xab, 0x4c, 0x65, 0x5f, 0xd3, 0x05, 0xaa, 0xcf, 0x32, 0x94, 0x33, 0x26, 0xb6, 0xbe, 0x57, 0xfe, - 0x9a, 0x26, 0xdb, 0x25, 0x6d, 0x93, 0x5a, 0x02, 0x71, 0xe0, 0x7b, 0x5c, 0xaa, 0x69, 0xaa, 0xf6, - 0x4a, 0xd6, 0x98, 0xa3, 0xcf, 0x9c, 0xe9, 0x2d, 0xfd, 0x40, 0x6a, 0x12, 0x02, 0xf0, 0x50, 0x24, - 0xfa, 0x3d, 0xb7, 0x2f, 0x3b, 0x37, 0x77, 0x21, 0xe8, 0x6a, 0xed, 0x98, 0x3f, 0x89, 0x9c, 0x29, - 0x93, 0xbe, 0x23, 0x35, 0x84, 0x30, 0x0e, 0x38, 0x82, 0x7e, 0xd1, 0xcd, 0x8b, 0x5d, 0xf8, 0x4a, - 0xf4, 0x5e, 0x6b, 0x81, 0x32, 0xc9, 0x74, 0xab, 0x93, 0x53, 0x67, 0x0a, 0xa4, 0x9f, 0x0d, 0xb2, - 0x3a, 0x14, 0x41, 0x1a, 0xc2, 0xe3, 0x80, 0xfb, 0xe1, 0x24, 0x43, 0x36, 0x96, 0xd4, 0x96, 0x1f, - 0xfc, 0xa3, 0x52, 0x36, 0x8a, 0x44, 0x88, 0x70, 0x7f, 0xc6, 0xb0, 0xef, 0xea, 0x7a, 0xab, 0xfb, - 0x73, 0xc0, 0xce, 0xdc, 0x72, 0x74, 0x87, 0xd4, 0x25, 0x24, 0x43, 0xdf, 0x83, 0x97, 0x3c, 0x84, - 0x46, 0x75, 0xdd, 0x68, 0xff, 0x6f, 0xdf, 0xd6, 0xa0, 0x7a, 0x77, 0x76, 0xe5, 0xe4, 0xf3, 0x5a, - 0x5f, 0x0c, 0x72, 0xab, 0xe0, 0x5a, 0xfa, 0x84, 0x50, 0xe1, 0x66, 0x69, 0xd0, 0x7b, 0x3a, 0xfe, - 0xc5, 0x7d, 0x11, 0xa9, 0x57, 0xac, 0xd8, 0x77, 0x46, 0xa7, 0x6b, 0x74, 0xaf, 0x70, 0xeb, 0xcc, - 0x51, 0xd0, 0x8d, 0x9c, 0x07, 0xca, 0xca, 0x03, 0xd3, 0x55, 0x16, 0x7d, 0x60, 0xdf, 0x3f, 0x3e, - 0x33, 0x4b, 0x27, 0x67, 0x66, 0xe9, 0xe7, 0x99, 0x59, 0xfa, 0x34, 0x32, 0x8d, 0xe3, 0x91, 0x69, - 0x9c, 0x8c, 0x4c, 0xe3, 0xd7, 0xc8, 0x34, 0xbe, 0xfe, 0x36, 0x4b, 0x07, 0xff, 0x69, 0x4b, 0xfe, - 0x09, 0x00, 0x00, 0xff, 0xff, 0x64, 0x32, 0x5a, 0xad, 0x2b, 0x06, 0x00, 0x00, + // 627 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcb, 0x6e, 0xd3, 0x4c, + 0x14, 0xc7, 0xe3, 0xa4, 0xe9, 0x97, 0x6f, 0x52, 0x6e, 0x43, 0x85, 0xa2, 0x0a, 0xb9, 0x55, 0x36, + 0x04, 0xa9, 0x1d, 0x2b, 0xa5, 0x88, 0x8a, 0xa5, 0x91, 0x40, 0x48, 0x40, 0x91, 0x83, 0x2a, 0x28, + 0xab, 0xb1, 0x73, 0x9a, 0x0e, 0xb1, 0x63, 0xcb, 0x73, 0x9c, 0x35, 0x1b, 0x16, 0xec, 0x78, 0x0b, + 0x5e, 0x80, 0x87, 0xc8, 0xb2, 0x4b, 0x56, 0x15, 0x0d, 0x2f, 0x82, 0x66, 0x32, 0xb9, 0x50, 0xbb, + 0xa1, 0xea, 0xce, 0xe7, 0xcc, 0xf9, 0xff, 0xce, 0xd5, 0xe4, 0x49, 0x7f, 0x5f, 0x32, 0x11, 0x3b, + 0xfd, 0xcc, 0x87, 0x74, 0x00, 0x08, 0xd2, 0x49, 0xfa, 0x3d, 0x87, 0x27, 0x42, 0x3a, 0x3c, 0x49, + 0xa4, 0x33, 0x6c, 0xfb, 0x80, 0xbc, 0xed, 0xf4, 0x60, 0x00, 0x29, 0x47, 0xe8, 0xb2, 0x24, 0x8d, + 0x31, 0xa6, 0x0f, 0x26, 0x42, 0x36, 0x17, 0xb2, 0xa4, 0xdf, 0x63, 0x4a, 0xc8, 0x94, 0x90, 0x19, + 0xe1, 0xc6, 0x4e, 0x4f, 0xe0, 0x49, 0xe6, 0xb3, 0x20, 0x8e, 0x9c, 0x5e, 0xdc, 0x8b, 0x1d, 0xad, + 0xf7, 0xb3, 0x63, 0x6d, 0x69, 0x43, 0x7f, 0x4d, 0xb8, 0x1b, 0xbb, 0x97, 0x16, 0xe4, 0xa4, 0x20, + 0xe3, 0x2c, 0x0d, 0xe0, 0x62, 0x2d, 0x1b, 0xdb, 0x97, 0x6b, 0x86, 0xb9, 0xca, 0x97, 0x64, 0x90, + 0x4e, 0x04, 0xc8, 0x8b, 0x34, 0x3b, 0xc5, 0x9a, 0x34, 0x1b, 0xa0, 0x88, 0xf2, 0x05, 0xed, 0x2d, + 0x0f, 0x97, 0xc1, 0x09, 0x44, 0x3c, 0xa7, 0x6a, 0x17, 0xab, 0x32, 0x14, 0xa1, 0x23, 0x06, 0x28, + 0x31, 0xbd, 0x28, 0x69, 0x7e, 0x2f, 0x93, 0x7a, 0x07, 0x39, 0xc2, 0x71, 0x16, 0x76, 0x00, 0xe9, + 0x7b, 0x52, 0x53, 0x2d, 0x74, 0x39, 0xf2, 0x86, 0xb5, 0x65, 0xb5, 0xea, 0xbb, 0x2d, 0x76, 0xe9, + 0xa2, 0xd8, 0xb0, 0xcd, 0x0e, 0xfc, 0x4f, 0x10, 0xe0, 0x6b, 0x40, 0xee, 0xd2, 0xd1, 0xd9, 0x66, + 0x69, 0x7c, 0xb6, 0x49, 0xe6, 0x3e, 0x6f, 0x46, 0xa3, 0x47, 0x64, 0x45, 0x26, 0x10, 0x34, 0xca, + 0x9a, 0xba, 0xcf, 0xae, 0xb8, 0x7e, 0xb6, 0x50, 0x5d, 0x27, 0x81, 0xc0, 0x5d, 0x33, 0x59, 0x56, + 0x94, 0xe5, 0x69, 0x26, 0xf5, 0xc9, 0xaa, 0x44, 0x8e, 0x99, 0x6c, 0x54, 0x34, 0xfd, 0xe9, 0xb5, + 0xe8, 0x9a, 0xe0, 0xde, 0x34, 0xfc, 0xd5, 0x89, 0xed, 0x19, 0x72, 0x73, 0x64, 0x91, 0x5b, 0x0b, + 0xd1, 0xaf, 0x84, 0x44, 0x7a, 0x94, 0x9b, 0xd6, 0xf6, 0xb2, 0xcc, 0x2a, 0x56, 0xcd, 0x4c, 0x69, + 0xf5, 0xc4, 0x6e, 0x9b, 0x5c, 0xb5, 0xa9, 0x67, 0x61, 0x5e, 0x1f, 0x48, 0x55, 0x20, 0x44, 0xb2, + 0x51, 0xde, 0xaa, 0xb4, 0xea, 0xbb, 0x7b, 0xd7, 0x69, 0xc9, 0xbd, 0x61, 0x12, 0x54, 0x5f, 0x2a, + 0x94, 0x37, 0x21, 0x36, 0x7f, 0x54, 0xfe, 0x6a, 0x45, 0x0d, 0x92, 0xb6, 0x48, 0x2d, 0x85, 0x24, + 0x14, 0x01, 0x97, 0xba, 0x95, 0xaa, 0xbb, 0xa6, 0x0a, 0xf3, 0x8c, 0xcf, 0x9b, 0xbd, 0xd2, 0x8f, + 0xa4, 0x26, 0x21, 0x84, 0x00, 0xe3, 0xd4, 0x2c, 0xb3, 0x7d, 0xa5, 0xa6, 0xb9, 0x0f, 0x61, 0xc7, + 0x08, 0x27, 0xf0, 0xa9, 0xe5, 0xcd, 0x80, 0x0a, 0x8e, 0x10, 0x25, 0x21, 0x47, 0x30, 0xbb, 0xdc, + 0x59, 0x7e, 0x7f, 0x6f, 0xe3, 0xee, 0x3b, 0x23, 0xd0, 0xe7, 0x31, 0x1b, 0xe9, 0xd4, 0xeb, 0xcd, + 0x80, 0xf4, 0x8b, 0x45, 0xd6, 0x87, 0x71, 0x98, 0x45, 0xf0, 0x2c, 0xe4, 0x22, 0x9a, 0x46, 0xc8, + 0xc6, 0x8a, 0x1e, 0xf1, 0xa3, 0x7f, 0x64, 0x82, 0x54, 0x0a, 0x89, 0x30, 0xc0, 0xc3, 0x39, 0xc3, + 0xbd, 0x6f, 0xf2, 0xad, 0x1f, 0x16, 0x80, 0xbd, 0xc2, 0x74, 0xf4, 0x31, 0xa9, 0x4b, 0x48, 0x87, + 0x22, 0x80, 0x37, 0x3c, 0x82, 0x46, 0x75, 0xcb, 0x6a, 0xfd, 0xef, 0xde, 0x35, 0xa0, 0x7a, 0x67, + 0xfe, 0xe4, 0x2d, 0xc6, 0x35, 0xbf, 0x5a, 0xe4, 0x4e, 0xee, 0x5e, 0xe9, 0x73, 0x42, 0x63, 0x5f, + 0x85, 0x41, 0xf7, 0xc5, 0xe4, 0xe7, 0x16, 0xf1, 0x40, 0xaf, 0xb0, 0xe2, 0xde, 0x1b, 0x9f, 0x6d, + 0xd2, 0x83, 0xdc, 0xab, 0x57, 0xa0, 0xa0, 0xdb, 0x0b, 0x07, 0x50, 0xd6, 0x07, 0x30, 0x1b, 0x65, + 0xfe, 0x08, 0xdc, 0x87, 0xa3, 0x73, 0xbb, 0x74, 0x7a, 0x6e, 0x97, 0x7e, 0x9e, 0xdb, 0xa5, 0xcf, + 0x63, 0xdb, 0x1a, 0x8d, 0x6d, 0xeb, 0x74, 0x6c, 0x5b, 0xbf, 0xc6, 0xb6, 0xf5, 0xed, 0xb7, 0x5d, + 0x3a, 0xfa, 0xcf, 0xdc, 0xe3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x47, 0x2a, 0x55, 0x22, + 0x06, 0x00, 0x00, } diff --git a/pkg/apis/apps/v1beta1/generated.proto b/pkg/apis/apps/v1beta1/generated.proto index 960c5e6b5c3..0e58bfd78d7 100644 --- a/pkg/apis/apps/v1beta1/generated.proto +++ b/pkg/apis/apps/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.apps.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -54,7 +54,7 @@ message StatefulSet { // StatefulSetList is a collection of StatefulSets. message StatefulSetList { // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; repeated StatefulSet items = 2; } @@ -73,7 +73,7 @@ message StatefulSetSpec { // If empty, defaulted to labels on the pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; // Template is the object that describes the pod that will be created if // insufficient replicas are detected. Each pod stamped out by the StatefulSet diff --git a/pkg/apis/apps/v1beta1/register.go b/pkg/apis/apps/v1beta1/register.go index e99fe0aa12f..81b8a383288 100644 --- a/pkg/apis/apps/v1beta1/register.go +++ b/pkg/apis/apps/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/apps/v1beta1/types.generated.go b/pkg/apis/apps/v1beta1/types.generated.go index 99e788e8f1e..71ee844caaa 100644 --- a/pkg/apis/apps/v1beta1/types.generated.go +++ b/pkg/apis/apps/v1beta1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -668,7 +668,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym57 := z.DecBinary() _ = yym57 @@ -760,7 +760,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym66 := z.DecBinary() _ = yym66 @@ -1295,7 +1295,7 @@ func (x *StatefulSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv112 := &x.ListMeta yym113 := z.DecBinary() @@ -1376,7 +1376,7 @@ func (x *StatefulSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv119 := &x.ListMeta yym120 := z.DecBinary() diff --git a/pkg/apis/apps/v1beta1/types.go b/pkg/apis/apps/v1beta1/types.go index 49f4343d74c..edf434ca8bc 100644 --- a/pkg/apis/apps/v1beta1/types.go +++ b/pkg/apis/apps/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true @@ -99,5 +99,5 @@ type StatefulSetList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` - Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` + Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` } diff --git a/pkg/apis/apps/validation/validation.go b/pkg/apis/apps/validation/validation.go index 00c573be11e..13a10e6a99f 100644 --- a/pkg/apis/apps/validation/validation.go +++ b/pkg/apis/apps/validation/validation.go @@ -20,10 +20,10 @@ import ( "reflect" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/validation/field" ) diff --git a/pkg/apis/apps/validation/validation_test.go b/pkg/apis/apps/validation/validation_test.go index 38f97c33abb..418378af61f 100644 --- a/pkg/apis/apps/validation/validation_test.go +++ b/pkg/apis/apps/validation/validation_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestValidateStatefulSet(t *testing.T) { diff --git a/pkg/apis/authentication/types.generated.go b/pkg/apis/authentication/types.generated.go index f5b26081527..aed4784ea5b 100644 --- a/pkg/apis/authentication/types.generated.go +++ b/pkg/apis/authentication/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -784,7 +784,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv76 := &x.CreationTimestamp yym77 := z.DecBinary() @@ -801,7 +801,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -809,7 +809,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym79 := z.DecBinary() _ = yym79 @@ -1080,7 +1080,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv103 := &x.CreationTimestamp yym104 := z.DecBinary() @@ -1096,7 +1096,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj93++ if yyhl93 { @@ -1115,7 +1115,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym106 := z.DecBinary() _ = yym106 diff --git a/pkg/apis/authentication/v1beta1/generated.pb.go b/pkg/apis/authentication/v1beta1/generated.pb.go index e14bb106041..d3382aa3d5f 100644 --- a/pkg/apis/authentication/v1beta1/generated.pb.go +++ b/pkg/apis/authentication/v1beta1/generated.pb.go @@ -1236,46 +1236,46 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 654 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x93, 0xcd, 0x6e, 0xd3, 0x4a, - 0x14, 0xc7, 0xed, 0x7c, 0xf4, 0x26, 0x93, 0xdb, 0x7b, 0xcb, 0x48, 0x48, 0x51, 0x24, 0x9c, 0x28, - 0x6c, 0x82, 0xd4, 0x8e, 0x95, 0x8a, 0x8f, 0xaa, 0x15, 0x8b, 0x5a, 0x2d, 0xa8, 0x0b, 0x84, 0x34, - 0xa5, 0x08, 0x21, 0xb1, 0x98, 0x38, 0xa7, 0xae, 0x71, 0x63, 0x5b, 0xe3, 0x99, 0x94, 0xee, 0xfa, - 0x08, 0x2c, 0x59, 0xf2, 0x1e, 0xbc, 0x40, 0x97, 0x5d, 0xb0, 0x60, 0x81, 0x2a, 0x12, 0x5e, 0x04, - 0xcd, 0x78, 0x68, 0xd2, 0xa6, 0x41, 0xa2, 0xdd, 0x79, 0xfe, 0x73, 0xfe, 0xbf, 0xf3, 0x31, 0x3e, - 0x68, 0x33, 0x5a, 0xcb, 0x48, 0x98, 0xb8, 0x91, 0xec, 0x01, 0x8f, 0x41, 0x40, 0xe6, 0xa6, 0x51, - 0xe0, 0xb2, 0x34, 0xcc, 0x5c, 0x26, 0xc5, 0x01, 0xc4, 0x22, 0xf4, 0x99, 0x08, 0x93, 0xd8, 0x1d, - 0x76, 0x7b, 0x20, 0x58, 0xd7, 0x0d, 0x20, 0x06, 0xce, 0x04, 0xf4, 0x49, 0xca, 0x13, 0x91, 0xe0, - 0x6e, 0x8e, 0x20, 0x13, 0x04, 0x49, 0xa3, 0x80, 0x28, 0x04, 0xb9, 0x8c, 0x20, 0x06, 0xd1, 0x58, - 0x09, 0x42, 0x71, 0x20, 0x7b, 0xc4, 0x4f, 0x06, 0x6e, 0x90, 0x04, 0x89, 0xab, 0x49, 0x3d, 0xb9, - 0xaf, 0x4f, 0xfa, 0xa0, 0xbf, 0xf2, 0x0c, 0x8d, 0xd5, 0xb9, 0x45, 0xba, 0x1c, 0xb2, 0x44, 0x72, - 0x1f, 0xae, 0x56, 0xd5, 0x78, 0x34, 0xdf, 0x23, 0xe3, 0x21, 0xf0, 0x2c, 0x4c, 0x62, 0xe8, 0xcf, - 0xd8, 0x96, 0xe7, 0xdb, 0x86, 0x33, 0xad, 0x37, 0x56, 0xae, 0x8f, 0xe6, 0x32, 0x16, 0xe1, 0x60, - 0xb6, 0xa6, 0x87, 0x7f, 0x0e, 0xcf, 0xfc, 0x03, 0x18, 0xb0, 0x19, 0x57, 0xf7, 0x7a, 0x97, 0x14, - 0xe1, 0xa1, 0x1b, 0xc6, 0x22, 0x13, 0xfc, 0xaa, 0xa5, 0xfd, 0x04, 0xa1, 0xed, 0x0f, 0x82, 0xb3, - 0xd7, 0xec, 0x50, 0x02, 0x6e, 0xa2, 0x72, 0x28, 0x60, 0x90, 0xd5, 0xed, 0x56, 0xb1, 0x53, 0xf5, - 0xaa, 0xe3, 0xf3, 0x66, 0x79, 0x47, 0x09, 0x34, 0xd7, 0xd7, 0x2b, 0x9f, 0x3e, 0x37, 0xad, 0x93, - 0xef, 0x2d, 0xab, 0xfd, 0xa5, 0x80, 0x6a, 0xaf, 0x92, 0x08, 0x62, 0x0a, 0xc3, 0x10, 0x8e, 0xf0, - 0x1b, 0x54, 0x19, 0x80, 0x60, 0x7d, 0x26, 0x58, 0xdd, 0x6e, 0xd9, 0x9d, 0xda, 0x6a, 0x87, 0xcc, - 0x7d, 0x6e, 0x32, 0xec, 0x92, 0x97, 0xbd, 0xf7, 0xe0, 0x8b, 0x17, 0x20, 0x98, 0x87, 0x4f, 0xcf, - 0x9b, 0xd6, 0xf8, 0xbc, 0x89, 0x26, 0x1a, 0xbd, 0xa0, 0xe1, 0x3e, 0x2a, 0x65, 0x29, 0xf8, 0xf5, - 0x82, 0xa6, 0x7a, 0xe4, 0xaf, 0x7f, 0x22, 0x32, 0x55, 0xe7, 0x6e, 0x0a, 0xbe, 0xf7, 0xaf, 0xc9, - 0x57, 0x52, 0x27, 0xaa, 0xe9, 0xf8, 0x10, 0x2d, 0x64, 0x82, 0x09, 0x99, 0xd5, 0x8b, 0x3a, 0xcf, - 0xd6, 0x2d, 0xf3, 0x68, 0x96, 0xf7, 0x9f, 0xc9, 0xb4, 0x90, 0x9f, 0xa9, 0xc9, 0xd1, 0x7e, 0x8c, - 0xfe, 0xbf, 0x52, 0x14, 0xbe, 0x8f, 0xca, 0x42, 0x49, 0x7a, 0x7a, 0x55, 0x6f, 0xd1, 0x38, 0xcb, - 0x79, 0x5c, 0x7e, 0xd7, 0xfe, 0x6a, 0xa3, 0x3b, 0x33, 0x59, 0xf0, 0x06, 0x5a, 0x9c, 0xaa, 0x08, - 0xfa, 0x1a, 0x51, 0xf1, 0xee, 0x1a, 0xc4, 0xe2, 0xe6, 0xf4, 0x25, 0xbd, 0x1c, 0x8b, 0xdf, 0xa1, - 0x92, 0xcc, 0x80, 0x9b, 0xf1, 0x6e, 0xdc, 0xa0, 0xed, 0xbd, 0x0c, 0xf8, 0x4e, 0xbc, 0x9f, 0x4c, - 0xe6, 0xaa, 0x14, 0xaa, 0xb1, 0xaa, 0x2d, 0xe0, 0x3c, 0xe1, 0x7a, 0xac, 0x53, 0x6d, 0x6d, 0x2b, - 0x91, 0xe6, 0x77, 0xed, 0x51, 0x01, 0x55, 0x7e, 0x53, 0xf0, 0x32, 0xaa, 0x28, 0x67, 0xcc, 0x06, - 0x60, 0x66, 0xb1, 0x64, 0x4c, 0x3a, 0x46, 0xe9, 0xf4, 0x22, 0x02, 0xdf, 0x43, 0x45, 0x19, 0xf6, - 0x75, 0xf5, 0x55, 0xaf, 0x66, 0x02, 0x8b, 0x7b, 0x3b, 0x5b, 0x54, 0xe9, 0xb8, 0x8d, 0x16, 0x02, - 0x9e, 0xc8, 0x54, 0x3d, 0xab, 0xfa, 0xa5, 0x91, 0x7a, 0x8c, 0xe7, 0x5a, 0xa1, 0xe6, 0x06, 0x47, - 0xa8, 0x0c, 0x6a, 0x07, 0xea, 0xa5, 0x56, 0xb1, 0x53, 0x5b, 0x7d, 0x76, 0x8b, 0x11, 0x10, 0xbd, - 0x4c, 0xdb, 0xb1, 0xe0, 0xc7, 0x53, 0xad, 0x2a, 0x8d, 0xe6, 0x39, 0x1a, 0x47, 0x66, 0xe1, 0x74, - 0x0c, 0x5e, 0x42, 0xc5, 0x08, 0x8e, 0xf3, 0x36, 0xa9, 0xfa, 0xc4, 0xbb, 0xa8, 0x3c, 0x54, 0xbb, - 0x68, 0xde, 0xe3, 0xe9, 0x0d, 0x8a, 0x99, 0x2c, 0x34, 0xcd, 0x59, 0xeb, 0x85, 0x35, 0xdb, 0x7b, - 0x70, 0x3a, 0x72, 0xac, 0xb3, 0x91, 0x63, 0x7d, 0x1b, 0x39, 0xd6, 0xc9, 0xd8, 0xb1, 0x4f, 0xc7, - 0x8e, 0x7d, 0x36, 0x76, 0xec, 0x1f, 0x63, 0xc7, 0xfe, 0xf8, 0xd3, 0xb1, 0xde, 0xfe, 0x63, 0x00, - 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xce, 0xcd, 0xc2, 0x6f, 0xeb, 0x05, 0x00, 0x00, + // 644 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x53, 0x4f, 0x4f, 0x13, 0x41, + 0x14, 0xdf, 0xed, 0x1f, 0x6c, 0xa7, 0xa2, 0x38, 0x89, 0x49, 0xd3, 0xc4, 0x6d, 0x53, 0x2f, 0x35, + 0x81, 0xd9, 0x94, 0x18, 0x25, 0x10, 0x0f, 0x6c, 0x40, 0xc3, 0xc1, 0x98, 0x0c, 0x62, 0x8c, 0x89, + 0x87, 0xe9, 0xf6, 0xb1, 0xac, 0x4b, 0x77, 0x37, 0x33, 0xb3, 0x45, 0x6e, 0x7c, 0x04, 0x8f, 0x1e, + 0xfd, 0x1e, 0x7e, 0x01, 0x8e, 0x1c, 0x3c, 0x78, 0x30, 0xc4, 0xd6, 0x2f, 0x62, 0x66, 0x76, 0xa4, + 0x85, 0x02, 0x89, 0x70, 0xdb, 0xf9, 0xcd, 0xfb, 0xfd, 0x79, 0x6f, 0xf6, 0xa1, 0xf5, 0x68, 0x45, + 0x90, 0x30, 0x71, 0xa3, 0xac, 0x07, 0x3c, 0x06, 0x09, 0xc2, 0x4d, 0xa3, 0xc0, 0x65, 0x69, 0x28, + 0x5c, 0x96, 0xc9, 0x3d, 0x88, 0x65, 0xe8, 0x33, 0x19, 0x26, 0xb1, 0x3b, 0xec, 0xf6, 0x40, 0xb2, + 0xae, 0x1b, 0x40, 0x0c, 0x9c, 0x49, 0xe8, 0x93, 0x94, 0x27, 0x32, 0xc1, 0xdd, 0x5c, 0x82, 0x4c, + 0x24, 0x48, 0x1a, 0x05, 0x44, 0x49, 0x90, 0xf3, 0x12, 0xc4, 0x48, 0x34, 0x96, 0x82, 0x50, 0xee, + 0x65, 0x3d, 0xe2, 0x27, 0x03, 0x37, 0x48, 0x82, 0xc4, 0xd5, 0x4a, 0xbd, 0x6c, 0x57, 0x9f, 0xf4, + 0x41, 0x7f, 0xe5, 0x0e, 0x8d, 0xe5, 0x2b, 0x43, 0xba, 0x1c, 0x44, 0x92, 0x71, 0x1f, 0x2e, 0xa6, + 0x6a, 0x2c, 0x5e, 0xcd, 0x19, 0xce, 0xf4, 0x70, 0x8d, 0x83, 0x70, 0x07, 0x20, 0xd9, 0x65, 0x9c, + 0xa5, 0xcb, 0x39, 0x3c, 0x8b, 0x65, 0x38, 0x98, 0x0d, 0xf4, 0xf4, 0xfa, 0x72, 0xe1, 0xef, 0xc1, + 0x80, 0xcd, 0xb0, 0xba, 0x97, 0xb3, 0x32, 0x19, 0xee, 0xbb, 0x61, 0x2c, 0x85, 0xe4, 0x17, 0x29, + 0xed, 0xe7, 0x08, 0x6d, 0x7e, 0x96, 0x9c, 0xbd, 0x63, 0xfb, 0x19, 0xe0, 0x26, 0x2a, 0x87, 0x12, + 0x06, 0xa2, 0x6e, 0xb7, 0x8a, 0x9d, 0xaa, 0x57, 0x1d, 0x9f, 0x36, 0xcb, 0x5b, 0x0a, 0xa0, 0x39, + 0xbe, 0x5a, 0xf9, 0xfa, 0xad, 0x69, 0x1d, 0xfd, 0x6a, 0x59, 0xed, 0xef, 0x05, 0x54, 0x7b, 0x9b, + 0x44, 0x10, 0x53, 0x18, 0x86, 0x70, 0x80, 0xdf, 0xa3, 0x8a, 0xea, 0xbd, 0xcf, 0x24, 0xab, 0xdb, + 0x2d, 0xbb, 0x53, 0x5b, 0xee, 0x90, 0x2b, 0xdf, 0x9a, 0x0c, 0xbb, 0xe4, 0x4d, 0xef, 0x13, 0xf8, + 0xf2, 0x35, 0x48, 0xe6, 0xe1, 0xe3, 0xd3, 0xa6, 0x35, 0x3e, 0x6d, 0xa2, 0x09, 0x46, 0xcf, 0xd4, + 0x70, 0x1f, 0x95, 0x44, 0x0a, 0x7e, 0xbd, 0xa0, 0x55, 0x3d, 0xf2, 0xdf, 0x7f, 0x10, 0x99, 0xca, + 0xb9, 0x9d, 0x82, 0xef, 0xdd, 0x35, 0x7e, 0x25, 0x75, 0xa2, 0x5a, 0x1d, 0xef, 0xa3, 0x39, 0x21, + 0x99, 0xcc, 0x44, 0xbd, 0xa8, 0x7d, 0x36, 0x6e, 0xe9, 0xa3, 0xb5, 0xbc, 0x7b, 0xc6, 0x69, 0x2e, + 0x3f, 0x53, 0xe3, 0xd1, 0x7e, 0x86, 0xee, 0x5f, 0x08, 0x85, 0x1f, 0xa3, 0xb2, 0x54, 0x90, 0x9e, + 0x5e, 0xd5, 0x9b, 0x37, 0xcc, 0x72, 0x5e, 0x97, 0xdf, 0xb5, 0x7f, 0xd8, 0xe8, 0xc1, 0x8c, 0x0b, + 0x5e, 0x43, 0xf3, 0x53, 0x89, 0xa0, 0xaf, 0x25, 0x2a, 0xde, 0x43, 0x23, 0x31, 0xbf, 0x3e, 0x7d, + 0x49, 0xcf, 0xd7, 0xe2, 0x8f, 0xa8, 0x94, 0x09, 0xe0, 0x66, 0xbc, 0x6b, 0x37, 0x68, 0x7b, 0x47, + 0x00, 0xdf, 0x8a, 0x77, 0x93, 0xc9, 0x5c, 0x15, 0x42, 0xb5, 0xac, 0x6a, 0x0b, 0x38, 0x4f, 0xb8, + 0x1e, 0xeb, 0x54, 0x5b, 0x9b, 0x0a, 0xa4, 0xf9, 0x5d, 0x7b, 0x54, 0x40, 0x95, 0x7f, 0x2a, 0x78, + 0x11, 0x55, 0x14, 0x33, 0x66, 0x03, 0x30, 0xb3, 0x58, 0x30, 0x24, 0x5d, 0xa3, 0x70, 0x7a, 0x56, + 0x81, 0x1f, 0xa1, 0x62, 0x16, 0xf6, 0x75, 0xfa, 0xaa, 0x57, 0x33, 0x85, 0xc5, 0x9d, 0xad, 0x0d, + 0xaa, 0x70, 0xdc, 0x46, 0x73, 0x01, 0x4f, 0xb2, 0x54, 0x3d, 0xab, 0xfa, 0xa5, 0x91, 0x7a, 0x8c, + 0x57, 0x1a, 0xa1, 0xe6, 0x06, 0x47, 0xa8, 0x0c, 0x6a, 0x07, 0xea, 0xa5, 0x56, 0xb1, 0x53, 0x5b, + 0x7e, 0x79, 0x8b, 0x11, 0x10, 0xbd, 0x4c, 0x9b, 0xb1, 0xe4, 0x87, 0x53, 0xad, 0x2a, 0x8c, 0xe6, + 0x1e, 0x8d, 0x03, 0xb3, 0x70, 0xba, 0x06, 0x2f, 0xa0, 0x62, 0x04, 0x87, 0x79, 0x9b, 0x54, 0x7d, + 0xe2, 0x6d, 0x54, 0x1e, 0xaa, 0x5d, 0x34, 0xef, 0xf1, 0xe2, 0x06, 0x61, 0x26, 0x0b, 0x4d, 0x73, + 0xad, 0xd5, 0xc2, 0x8a, 0xed, 0x3d, 0x39, 0x1e, 0x39, 0xd6, 0xc9, 0xc8, 0xb1, 0x7e, 0x8e, 0x1c, + 0xeb, 0x68, 0xec, 0xd8, 0xc7, 0x63, 0xc7, 0x3e, 0x19, 0x3b, 0xf6, 0xef, 0xb1, 0x63, 0x7f, 0xf9, + 0xe3, 0x58, 0x1f, 0xee, 0x18, 0x81, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x1c, 0x7a, 0x75, + 0xe8, 0x05, 0x00, 0x00, } diff --git a/pkg/apis/authentication/v1beta1/generated.proto b/pkg/apis/authentication/v1beta1/generated.proto index 2fd8b0e2089..9aa00ff1067 100644 --- a/pkg/apis/authentication/v1beta1/generated.proto +++ b/pkg/apis/authentication/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.authentication.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; diff --git a/pkg/apis/authentication/v1beta1/register.go b/pkg/apis/authentication/v1beta1/register.go index 08fcb917c76..b61149dfea8 100644 --- a/pkg/apis/authentication/v1beta1/register.go +++ b/pkg/apis/authentication/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/apis/authentication/v1beta1/types.generated.go b/pkg/apis/authentication/v1beta1/types.generated.go index 1b4b4f1c87e..c381d58c8d0 100644 --- a/pkg/apis/authentication/v1beta1/types.generated.go +++ b/pkg/apis/authentication/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/apis/authentication/v1beta1/types.go b/pkg/apis/authentication/v1beta1/types.go index 7220e24ec42..4d41942271c 100644 --- a/pkg/apis/authentication/v1beta1/types.go +++ b/pkg/apis/authentication/v1beta1/types.go @@ -19,8 +19,8 @@ package v1beta1 import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/authorization/types.generated.go b/pkg/apis/authorization/types.generated.go index fe2735d2988..5dbf1c9bfc8 100644 --- a/pkg/apis/authorization/types.generated.go +++ b/pkg/apis/authorization/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -784,7 +784,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv76 := &x.CreationTimestamp yym77 := z.DecBinary() @@ -801,7 +801,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -809,7 +809,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym79 := z.DecBinary() _ = yym79 @@ -1080,7 +1080,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv103 := &x.CreationTimestamp yym104 := z.DecBinary() @@ -1096,7 +1096,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj93++ if yyhl93 { @@ -1115,7 +1115,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym106 := z.DecBinary() _ = yym106 @@ -2025,7 +2025,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv195 := &x.CreationTimestamp yym196 := z.DecBinary() @@ -2042,7 +2042,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -2050,7 +2050,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym198 := z.DecBinary() _ = yym198 @@ -2321,7 +2321,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv222 := &x.CreationTimestamp yym223 := z.DecBinary() @@ -2337,7 +2337,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj212++ if yyhl212 { @@ -2356,7 +2356,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym225 := z.DecBinary() _ = yym225 @@ -3266,7 +3266,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv314 := &x.CreationTimestamp yym315 := z.DecBinary() @@ -3283,7 +3283,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -3291,7 +3291,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym317 := z.DecBinary() _ = yym317 @@ -3562,7 +3562,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv341 := &x.CreationTimestamp yym342 := z.DecBinary() @@ -3578,7 +3578,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978. } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj331++ if yyhl331 { @@ -3597,7 +3597,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978. } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym344 := z.DecBinary() _ = yym344 diff --git a/pkg/apis/authorization/v1beta1/generated.pb.go b/pkg/apis/authorization/v1beta1/generated.pb.go index fa155f9cb84..a7c030140b3 100644 --- a/pkg/apis/authorization/v1beta1/generated.pb.go +++ b/pkg/apis/authorization/v1beta1/generated.pb.go @@ -2283,61 +2283,60 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 884 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x41, 0x8f, 0xdb, 0x44, - 0x14, 0x8e, 0x93, 0x78, 0x37, 0x99, 0x05, 0xb6, 0x4c, 0x55, 0xd6, 0x0d, 0x92, 0x13, 0x05, 0x09, - 0x6d, 0xa5, 0xd6, 0x66, 0x57, 0x54, 0x54, 0x15, 0x07, 0xd6, 0x62, 0x55, 0x55, 0xd0, 0x82, 0x66, - 0x61, 0x85, 0xe0, 0x34, 0xf6, 0xbe, 0x26, 0x26, 0x89, 0xc7, 0x9a, 0x19, 0xbb, 0x2c, 0xa7, 0xfe, - 0x00, 0x0e, 0x1c, 0x7b, 0xe4, 0x2f, 0xf0, 0x07, 0xb8, 0xb2, 0xc7, 0x72, 0x41, 0x20, 0xa1, 0x88, - 0x35, 0xff, 0x82, 0x13, 0xf2, 0x78, 0x12, 0x37, 0x1b, 0xa7, 0x68, 0x61, 0x85, 0x38, 0xec, 0xcd, - 0xf3, 0xde, 0xf7, 0xde, 0xfb, 0x66, 0xe6, 0x1b, 0xbf, 0x87, 0xde, 0x1b, 0xdd, 0x11, 0x4e, 0xc8, - 0xdc, 0x51, 0xe2, 0x03, 0x8f, 0x40, 0x82, 0x70, 0xe3, 0xd1, 0xc0, 0xa5, 0x71, 0x28, 0x5c, 0x9a, - 0xc8, 0x21, 0xe3, 0xe1, 0xd7, 0x54, 0x86, 0x2c, 0x72, 0xd3, 0x1d, 0x1f, 0x24, 0xdd, 0x71, 0x07, - 0x10, 0x01, 0xa7, 0x12, 0x8e, 0x9c, 0x98, 0x33, 0xc9, 0xf0, 0x5b, 0x45, 0x06, 0xa7, 0xcc, 0xe0, - 0xc4, 0xa3, 0x81, 0x93, 0x67, 0x70, 0x16, 0x32, 0x38, 0x3a, 0x43, 0xe7, 0xd6, 0x20, 0x94, 0xc3, - 0xc4, 0x77, 0x02, 0x36, 0x71, 0x07, 0x6c, 0xc0, 0x5c, 0x95, 0xc8, 0x4f, 0x1e, 0xa9, 0x95, 0x5a, - 0xa8, 0xaf, 0xa2, 0x40, 0x67, 0x77, 0x25, 0x45, 0x97, 0x83, 0x60, 0x09, 0x0f, 0xe0, 0x2c, 0xa9, - 0xce, 0xed, 0xd5, 0x31, 0x49, 0x94, 0x02, 0x17, 0x21, 0x8b, 0xe0, 0x68, 0x29, 0xec, 0xe6, 0xea, - 0xb0, 0x74, 0x69, 0xe7, 0x9d, 0x5b, 0xd5, 0x68, 0x9e, 0x44, 0x32, 0x9c, 0x2c, 0x73, 0x7a, 0xfb, - 0xc5, 0x70, 0x11, 0x0c, 0x61, 0x42, 0x97, 0xa2, 0x76, 0xaa, 0xa3, 0x12, 0x19, 0x8e, 0xdd, 0x30, - 0x92, 0x42, 0xf2, 0xb3, 0x21, 0xfd, 0x77, 0x10, 0xda, 0xff, 0x4a, 0x72, 0x7a, 0x48, 0xc7, 0x09, - 0xe0, 0x2e, 0x32, 0x43, 0x09, 0x13, 0x61, 0x19, 0xbd, 0xc6, 0x76, 0xdb, 0x6b, 0x67, 0xd3, 0xae, - 0x79, 0x3f, 0x37, 0x90, 0xc2, 0x7e, 0xb7, 0xf5, 0xf4, 0xbb, 0x6e, 0xed, 0xc9, 0x6f, 0xbd, 0x5a, - 0xff, 0xe7, 0x3a, 0xb2, 0x3e, 0x64, 0x01, 0x1d, 0x1f, 0x24, 0xfe, 0x97, 0x10, 0xc8, 0xbd, 0x20, - 0x00, 0x21, 0x08, 0xa4, 0x21, 0x3c, 0xc6, 0x9f, 0xa1, 0xd6, 0x04, 0x24, 0x3d, 0xa2, 0x92, 0x5a, - 0x46, 0xcf, 0xd8, 0xde, 0xd8, 0xdd, 0x76, 0x56, 0x5e, 0xbd, 0x93, 0xee, 0x38, 0x1f, 0xa9, 0x1c, - 0x0f, 0x40, 0x52, 0x0f, 0x9f, 0x4c, 0xbb, 0xb5, 0x6c, 0xda, 0x45, 0xa5, 0x8d, 0xcc, 0xb3, 0xe1, - 0x11, 0x6a, 0x8a, 0x18, 0x02, 0xab, 0xae, 0xb2, 0xde, 0x77, 0xce, 0x2b, 0x28, 0xa7, 0x82, 0xee, - 0x41, 0x0c, 0x81, 0xf7, 0x92, 0x2e, 0xdb, 0xcc, 0x57, 0x44, 0x15, 0xc1, 0x02, 0xad, 0x09, 0x49, - 0x65, 0x22, 0xac, 0x86, 0x2a, 0xf7, 0xc1, 0xc5, 0x94, 0x53, 0x29, 0xbd, 0x57, 0x74, 0xc1, 0xb5, - 0x62, 0x4d, 0x74, 0xa9, 0xfe, 0x17, 0xe8, 0xda, 0x43, 0x16, 0x11, 0xad, 0xd6, 0x3d, 0x29, 0x79, - 0xe8, 0x27, 0x12, 0x04, 0xee, 0xa1, 0x66, 0x4c, 0xe5, 0x50, 0x1d, 0x68, 0xbb, 0xe4, 0xfb, 0x31, - 0x95, 0x43, 0xa2, 0x3c, 0x39, 0x22, 0x05, 0xee, 0xab, 0xc3, 0x79, 0x0e, 0x71, 0x08, 0xdc, 0x27, - 0xca, 0xd3, 0xff, 0xa1, 0x8e, 0x70, 0x45, 0x6a, 0x17, 0xb5, 0x23, 0x3a, 0x01, 0x11, 0xd3, 0x00, - 0x74, 0xfe, 0x57, 0x75, 0x74, 0xfb, 0xe1, 0xcc, 0x41, 0x4a, 0xcc, 0xdf, 0x57, 0xc2, 0x6f, 0x20, - 0x73, 0xc0, 0x59, 0x12, 0xab, 0xa3, 0x6b, 0x7b, 0x2f, 0x6b, 0x88, 0x79, 0x2f, 0x37, 0x92, 0xc2, - 0x87, 0x6f, 0xa0, 0x75, 0xfd, 0xc0, 0xac, 0xa6, 0x82, 0x6d, 0x6a, 0xd8, 0xfa, 0x61, 0x61, 0x26, - 0x33, 0x3f, 0xbe, 0x89, 0x5a, 0xb3, 0x17, 0x6c, 0x99, 0x0a, 0x7b, 0x45, 0x63, 0x5b, 0xb3, 0x0d, - 0x91, 0x39, 0x02, 0xdf, 0x46, 0x1b, 0x22, 0xf1, 0xe7, 0x01, 0x6b, 0x2a, 0xe0, 0xaa, 0x0e, 0xd8, - 0x38, 0x28, 0x5d, 0xe4, 0x79, 0x5c, 0xbe, 0xad, 0x7c, 0x8f, 0xd6, 0xfa, 0xe2, 0xb6, 0xf2, 0x23, - 0x20, 0xca, 0xd3, 0xff, 0xb5, 0x8e, 0xb6, 0x0e, 0x60, 0xfc, 0xe8, 0xbf, 0x55, 0x3d, 0x5b, 0x50, - 0xfd, 0x83, 0x7f, 0x20, 0xc3, 0x6a, 0xca, 0xff, 0x2f, 0xe5, 0xff, 0x58, 0x47, 0xaf, 0xbf, 0x80, - 0x28, 0xfe, 0xc6, 0x40, 0x98, 0x2f, 0x89, 0x57, 0x1f, 0xf5, 0xfb, 0xe7, 0x67, 0xb8, 0xfc, 0x10, - 0xbc, 0xd7, 0xb2, 0x69, 0xb7, 0xe2, 0x81, 0x90, 0x8a, 0xba, 0xf8, 0xa9, 0x81, 0xae, 0x45, 0x55, - 0x2f, 0x55, 0x5f, 0xd3, 0xbd, 0xf3, 0x33, 0xaa, 0x7c, 0xf8, 0xde, 0xf5, 0x6c, 0xda, 0xad, 0xfe, - 0x27, 0x90, 0x6a, 0x02, 0xfd, 0x9f, 0xea, 0xe8, 0xea, 0xe5, 0x7f, 0xf9, 0x62, 0xd5, 0xf9, 0x67, - 0x13, 0x6d, 0x5d, 0x2a, 0xf3, 0x5f, 0x2a, 0x73, 0xde, 0x38, 0x1a, 0x8b, 0x7f, 0xd8, 0x4f, 0x05, - 0x70, 0xdd, 0x38, 0x7a, 0xb3, 0xc6, 0xd1, 0x54, 0x33, 0x08, 0xca, 0xaf, 0x42, 0x35, 0x0d, 0x31, - 0xeb, 0x1a, 0xc7, 0xc8, 0x84, 0x7c, 0x66, 0xb1, 0xcc, 0x5e, 0x63, 0x7b, 0x63, 0xf7, 0x93, 0x0b, - 0x13, 0x9b, 0xa3, 0x46, 0xa1, 0xfd, 0x48, 0xf2, 0xe3, 0xb2, 0x61, 0x29, 0x1b, 0x29, 0x2a, 0x76, - 0x52, 0x3d, 0x2e, 0x29, 0x0c, 0xbe, 0x82, 0x1a, 0x23, 0x38, 0x2e, 0x1a, 0x26, 0xc9, 0x3f, 0x31, - 0x41, 0x66, 0x9a, 0x4f, 0x52, 0xfa, 0xa0, 0xdf, 0x3d, 0x3f, 0xb5, 0x72, 0x1a, 0x23, 0x45, 0xaa, - 0xbb, 0xf5, 0x3b, 0x46, 0xff, 0x7b, 0x03, 0x5d, 0x5f, 0x29, 0xd9, 0xbc, 0x8d, 0xd2, 0xf1, 0x98, - 0x3d, 0x86, 0x23, 0xc5, 0xa5, 0x55, 0xb6, 0xd1, 0xbd, 0xc2, 0x4c, 0x66, 0x7e, 0xfc, 0x26, 0x5a, - 0xe3, 0x40, 0x05, 0x8b, 0x74, 0xeb, 0x9e, 0xab, 0x9d, 0x28, 0x2b, 0xd1, 0x5e, 0xbc, 0x87, 0x36, - 0x21, 0x2f, 0xaf, 0xc8, 0xed, 0x73, 0xce, 0xb8, 0xbe, 0xb2, 0x2d, 0x1d, 0xb0, 0xb9, 0xbf, 0xe8, - 0x26, 0x67, 0xf1, 0xde, 0x8d, 0x93, 0x53, 0xbb, 0xf6, 0xec, 0xd4, 0xae, 0xfd, 0x72, 0x6a, 0xd7, - 0x9e, 0x64, 0xb6, 0x71, 0x92, 0xd9, 0xc6, 0xb3, 0xcc, 0x36, 0x7e, 0xcf, 0x6c, 0xe3, 0xdb, 0x3f, - 0xec, 0xda, 0xe7, 0xeb, 0x7a, 0xd3, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x06, 0x55, 0x79, 0xe0, - 0x5a, 0x0c, 0x00, 0x00, + // 880 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x8f, 0xdb, 0x44, + 0x14, 0x8f, 0x93, 0x78, 0x37, 0x99, 0x05, 0xb6, 0x4c, 0x55, 0xd6, 0x5d, 0x24, 0x27, 0x0a, 0x12, + 0xda, 0x4a, 0xad, 0xcd, 0xae, 0x40, 0x54, 0x15, 0x07, 0xd6, 0x62, 0x55, 0x55, 0xd0, 0x82, 0x66, + 0x61, 0x85, 0xe0, 0x34, 0xf6, 0xbe, 0x26, 0x26, 0x89, 0xc7, 0x9a, 0x19, 0xbb, 0x2c, 0xa7, 0x7e, + 0x00, 0x0e, 0x1c, 0x7b, 0xe4, 0x2b, 0xf0, 0x05, 0xb8, 0xb2, 0xc7, 0x72, 0x41, 0x20, 0xa1, 0x88, + 0x35, 0xdf, 0x82, 0x13, 0xf2, 0x78, 0x12, 0x37, 0x1b, 0x67, 0x51, 0x60, 0x85, 0x7a, 0xe8, 0xcd, + 0xf3, 0xfe, 0xfc, 0xde, 0x6f, 0xde, 0xfc, 0xc6, 0x6f, 0xd0, 0xfb, 0xc3, 0xdb, 0xc2, 0x09, 0x99, + 0x3b, 0x4c, 0x7c, 0xe0, 0x11, 0x48, 0x10, 0x6e, 0x3c, 0xec, 0xbb, 0x34, 0x0e, 0x85, 0x4b, 0x13, + 0x39, 0x60, 0x3c, 0xfc, 0x86, 0xca, 0x90, 0x45, 0x6e, 0xba, 0xeb, 0x83, 0xa4, 0xbb, 0x6e, 0x1f, + 0x22, 0xe0, 0x54, 0xc2, 0xb1, 0x13, 0x73, 0x26, 0x19, 0x7e, 0xab, 0x40, 0x70, 0x4a, 0x04, 0x27, + 0x1e, 0xf6, 0x9d, 0x1c, 0xc1, 0x99, 0x43, 0x70, 0x34, 0xc2, 0xf6, 0xad, 0x7e, 0x28, 0x07, 0x89, + 0xef, 0x04, 0x6c, 0xec, 0xf6, 0x59, 0x9f, 0xb9, 0x0a, 0xc8, 0x4f, 0x1e, 0xaa, 0x95, 0x5a, 0xa8, + 0xaf, 0xa2, 0xc0, 0xf6, 0xde, 0x52, 0x8a, 0x2e, 0x07, 0xc1, 0x12, 0x1e, 0xc0, 0x79, 0x52, 0xdb, + 0x37, 0x97, 0xe7, 0xa4, 0x0b, 0x5b, 0xb8, 0xa0, 0x82, 0x70, 0xc7, 0x20, 0x69, 0x55, 0xce, 0xad, + 0xea, 0x1c, 0x9e, 0x44, 0x32, 0x1c, 0x2f, 0x12, 0x7a, 0xfb, 0xe2, 0x70, 0x11, 0x0c, 0x60, 0x4c, + 0x17, 0xb2, 0x76, 0xab, 0xb3, 0x12, 0x19, 0x8e, 0xdc, 0x30, 0x92, 0x42, 0xf2, 0xf3, 0x29, 0xbd, + 0x77, 0x11, 0x3a, 0xf8, 0x5a, 0x72, 0x7a, 0x44, 0x47, 0x09, 0xe0, 0x0e, 0x32, 0x43, 0x09, 0x63, + 0x61, 0x19, 0xdd, 0xc6, 0x4e, 0xdb, 0x6b, 0x67, 0x93, 0x8e, 0x79, 0x2f, 0x37, 0x90, 0xc2, 0x7e, + 0xa7, 0xf5, 0xe4, 0xfb, 0x4e, 0xed, 0xf1, 0xef, 0xdd, 0x5a, 0xef, 0x97, 0x3a, 0xb2, 0x3e, 0x62, + 0x01, 0x1d, 0x1d, 0x26, 0xfe, 0x57, 0x10, 0xc8, 0xfd, 0x20, 0x00, 0x21, 0x08, 0xa4, 0x21, 0x3c, + 0xc2, 0x9f, 0xa3, 0x56, 0xde, 0x88, 0x63, 0x2a, 0xa9, 0x65, 0x74, 0x8d, 0x9d, 0x8d, 0xbd, 0x1d, + 0x67, 0xe9, 0xb9, 0x3b, 0xe9, 0xae, 0xf3, 0xb1, 0xc2, 0xb8, 0x0f, 0x92, 0x7a, 0xf8, 0x74, 0xd2, + 0xa9, 0x65, 0x93, 0x0e, 0x2a, 0x6d, 0x64, 0x86, 0x86, 0x87, 0xa8, 0x29, 0x62, 0x08, 0xac, 0xba, + 0x42, 0xbd, 0xe7, 0xac, 0xaa, 0x26, 0xa7, 0x82, 0xee, 0x61, 0x0c, 0x81, 0xf7, 0x92, 0x2e, 0xdb, + 0xcc, 0x57, 0x44, 0x15, 0xc1, 0x02, 0xad, 0x09, 0x49, 0x65, 0x22, 0xac, 0x86, 0x2a, 0xf7, 0xe1, + 0xe5, 0x94, 0x53, 0x90, 0xde, 0x2b, 0xba, 0xe0, 0x5a, 0xb1, 0x26, 0xba, 0x54, 0xef, 0x4b, 0x74, + 0xed, 0x01, 0x8b, 0x88, 0x96, 0xea, 0xbe, 0x94, 0x3c, 0xf4, 0x13, 0x09, 0x02, 0x77, 0x51, 0x33, + 0xa6, 0x72, 0xa0, 0x1a, 0xda, 0x2e, 0xf9, 0x7e, 0x42, 0xe5, 0x80, 0x28, 0x4f, 0x1e, 0x91, 0x02, + 0xf7, 0x55, 0x73, 0x9e, 0x89, 0x38, 0x02, 0xee, 0x13, 0xe5, 0xe9, 0xfd, 0x58, 0x47, 0xb8, 0x02, + 0xda, 0x45, 0xed, 0x88, 0x8e, 0x41, 0xc4, 0x34, 0x00, 0x8d, 0xff, 0xaa, 0xce, 0x6e, 0x3f, 0x98, + 0x3a, 0x48, 0x19, 0xf3, 0xcf, 0x95, 0xf0, 0x1b, 0xc8, 0xec, 0x73, 0x96, 0xc4, 0xaa, 0x75, 0x6d, + 0xef, 0x65, 0x1d, 0x62, 0xde, 0xcd, 0x8d, 0xa4, 0xf0, 0xe1, 0x1b, 0x68, 0x3d, 0x05, 0x2e, 0x42, + 0x16, 0x59, 0x4d, 0x15, 0xb6, 0xa9, 0xc3, 0xd6, 0x8f, 0x0a, 0x33, 0x99, 0xfa, 0xf1, 0x4d, 0xd4, + 0x9a, 0x5e, 0x5f, 0xcb, 0x54, 0xb1, 0x57, 0x74, 0x6c, 0x6b, 0xba, 0x21, 0x32, 0x8b, 0xc0, 0xef, + 0xa0, 0x0d, 0x91, 0xf8, 0xb3, 0x84, 0x35, 0x95, 0x70, 0x55, 0x27, 0x6c, 0x1c, 0x96, 0x2e, 0xf2, + 0x6c, 0x5c, 0xbe, 0xad, 0x7c, 0x8f, 0xd6, 0xfa, 0xfc, 0xb6, 0xf2, 0x16, 0x10, 0xe5, 0xe9, 0xfd, + 0x56, 0x47, 0x5b, 0x87, 0x30, 0x7a, 0xf8, 0xff, 0xaa, 0x9e, 0xcd, 0xa9, 0xfe, 0xfe, 0xbf, 0x90, + 0x61, 0x35, 0xe5, 0xe7, 0x4b, 0xf9, 0x3f, 0xd5, 0xd1, 0xeb, 0x17, 0x10, 0xc5, 0xdf, 0x1a, 0x08, + 0xf3, 0x05, 0xf1, 0xea, 0x56, 0x7f, 0xb0, 0x3a, 0xc3, 0xc5, 0x8b, 0xe0, 0xbd, 0x96, 0x4d, 0x3a, + 0x15, 0x17, 0x84, 0x54, 0xd4, 0xc5, 0x4f, 0x0c, 0x74, 0x2d, 0xaa, 0xba, 0xa9, 0xfa, 0x98, 0xee, + 0xae, 0xce, 0xa8, 0xf2, 0xe2, 0x7b, 0xd7, 0xb3, 0x49, 0xa7, 0xfa, 0x9f, 0x40, 0xaa, 0x09, 0xf4, + 0x7e, 0xae, 0xa3, 0xab, 0x2f, 0xfe, 0xcb, 0x97, 0xab, 0xce, 0xbf, 0x9a, 0x68, 0xeb, 0x85, 0x32, + 0xff, 0xa3, 0x32, 0x67, 0x83, 0xa3, 0x31, 0xff, 0x87, 0xfd, 0x4c, 0x00, 0xd7, 0x83, 0xa3, 0x3b, + 0x1d, 0x1c, 0x4d, 0xf5, 0x06, 0x41, 0xf9, 0x51, 0xa8, 0xa1, 0x21, 0xa6, 0x53, 0xe3, 0x04, 0x99, + 0x90, 0xbf, 0x59, 0x2c, 0xb3, 0xdb, 0xd8, 0xd9, 0xd8, 0xfb, 0xf4, 0xd2, 0xc4, 0xe6, 0xa8, 0xa7, + 0xd0, 0x41, 0x24, 0xf9, 0x49, 0x39, 0xb0, 0x94, 0x8d, 0x14, 0x15, 0xb7, 0x53, 0xfd, 0x5c, 0x52, + 0x31, 0xf8, 0x0a, 0x6a, 0x0c, 0xe1, 0xa4, 0x18, 0x98, 0x24, 0xff, 0xc4, 0x04, 0x99, 0x69, 0xfe, + 0x92, 0xd2, 0x8d, 0x7e, 0x6f, 0x75, 0x6a, 0xe5, 0x6b, 0x8c, 0x14, 0x50, 0x77, 0xea, 0xb7, 0x8d, + 0xde, 0x0f, 0x06, 0xba, 0xbe, 0x54, 0xb2, 0xf9, 0x18, 0xa5, 0xa3, 0x11, 0x7b, 0x04, 0xc7, 0x8a, + 0x4b, 0xab, 0x1c, 0xa3, 0xfb, 0x85, 0x99, 0x4c, 0xfd, 0xf8, 0x4d, 0xb4, 0xc6, 0x81, 0x0a, 0x16, + 0xe9, 0xd1, 0x3d, 0x53, 0x3b, 0x51, 0x56, 0xa2, 0xbd, 0x78, 0x1f, 0x6d, 0x42, 0x5e, 0x5e, 0x91, + 0x3b, 0xe0, 0x9c, 0x71, 0x7d, 0x64, 0x5b, 0x3a, 0x61, 0xf3, 0x60, 0xde, 0x4d, 0xce, 0xc7, 0x7b, + 0x37, 0x4e, 0xcf, 0xec, 0xda, 0xd3, 0x33, 0xbb, 0xf6, 0xeb, 0x99, 0x5d, 0x7b, 0x9c, 0xd9, 0xc6, + 0x69, 0x66, 0x1b, 0x4f, 0x33, 0xdb, 0xf8, 0x23, 0xb3, 0x8d, 0xef, 0xfe, 0xb4, 0x6b, 0x5f, 0xac, + 0xeb, 0x4d, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x8f, 0xa4, 0x81, 0x57, 0x0c, 0x00, 0x00, } diff --git a/pkg/apis/authorization/v1beta1/generated.proto b/pkg/apis/authorization/v1beta1/generated.proto index 137e8c632ab..8552ead252e 100644 --- a/pkg/apis/authorization/v1beta1/generated.proto +++ b/pkg/apis/authorization/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.authorization.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; diff --git a/pkg/apis/authorization/v1beta1/register.go b/pkg/apis/authorization/v1beta1/register.go index 72abc46dba1..33ac83c4f99 100644 --- a/pkg/apis/authorization/v1beta1/register.go +++ b/pkg/apis/authorization/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/authorization/v1beta1/types.generated.go b/pkg/apis/authorization/v1beta1/types.generated.go index 69ccda875c9..fbc4764e988 100644 --- a/pkg/apis/authorization/v1beta1/types.generated.go +++ b/pkg/apis/authorization/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/apis/authorization/v1beta1/types.go b/pkg/apis/authorization/v1beta1/types.go index 6fe1b6e7cae..4f13fbeab1f 100644 --- a/pkg/apis/authorization/v1beta1/types.go +++ b/pkg/apis/authorization/v1beta1/types.go @@ -19,8 +19,8 @@ package v1beta1 import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/autoscaling/types.generated.go b/pkg/apis/autoscaling/types.generated.go index 7a67c084d3f..9ed2e9f6449 100644 --- a/pkg/apis/autoscaling/types.generated.go +++ b/pkg/apis/autoscaling/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1665,7 +1665,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19 } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym141 := z.DecBinary() _ = yym141 @@ -1764,7 +1764,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym150 := z.DecBinary() _ = yym150 @@ -2409,7 +2409,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv207 := &x.ListMeta yym208 := z.DecBinary() @@ -2490,7 +2490,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv214 := &x.ListMeta yym215 := z.DecBinary() diff --git a/pkg/apis/autoscaling/v1/generated.pb.go b/pkg/apis/autoscaling/v1/generated.pb.go index 54b74a0cb8e..1faa606e344 100644 --- a/pkg/apis/autoscaling/v1/generated.pb.go +++ b/pkg/apis/autoscaling/v1/generated.pb.go @@ -40,7 +40,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -555,7 +555,7 @@ func (this *HorizontalPodAutoscalerList) String() string { return "nil" } s := strings.Join([]string{`&HorizontalPodAutoscalerList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -580,7 +580,7 @@ func (this *HorizontalPodAutoscalerStatus) String() string { } s := strings.Join([]string{`&HorizontalPodAutoscalerStatus{`, `ObservedGeneration:` + valueToStringGenerated(this.ObservedGeneration) + `,`, - `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `CurrentReplicas:` + fmt.Sprintf("%v", this.CurrentReplicas) + `,`, `DesiredReplicas:` + fmt.Sprintf("%v", this.DesiredReplicas) + `,`, `CurrentCPUUtilizationPercentage:` + valueToStringGenerated(this.CurrentCPUUtilizationPercentage) + `,`, @@ -1232,7 +1232,7 @@ func (m *HorizontalPodAutoscalerStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LastScaleTime == nil { - m.LastScaleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.LastScaleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.LastScaleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1730,58 +1730,58 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 845 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x8f, 0xdb, 0x44, - 0x14, 0x8f, 0xf3, 0x51, 0x6d, 0xc7, 0xec, 0x2e, 0x0c, 0x52, 0x1b, 0x6d, 0x85, 0xbd, 0x0a, 0x1c, - 0x16, 0xd1, 0xda, 0x4a, 0xd4, 0x22, 0x7a, 0x5c, 0x2f, 0x2a, 0xad, 0xe8, 0xd2, 0xd5, 0x6c, 0x5b, - 0x21, 0x24, 0x90, 0x26, 0xf6, 0xab, 0x77, 0x9a, 0xf8, 0x43, 0x33, 0xe3, 0x08, 0xf5, 0xc4, 0x89, - 0x33, 0x17, 0x0e, 0xfc, 0x3b, 0x9c, 0xf6, 0x46, 0x8f, 0x9c, 0x22, 0xd6, 0x88, 0xff, 0x82, 0x03, - 0xf2, 0x64, 0xea, 0x38, 0xc9, 0x3a, 0xdd, 0x08, 0xb8, 0x65, 0xe6, 0xfd, 0x3e, 0xde, 0x7b, 0xf3, - 0xfc, 0x82, 0xee, 0x8f, 0x3e, 0x13, 0x0e, 0x4b, 0xdc, 0x51, 0x36, 0x04, 0x1e, 0x83, 0x04, 0xe1, - 0xa6, 0xa3, 0xd0, 0xa5, 0x29, 0x13, 0x2e, 0xcd, 0x64, 0x22, 0x7c, 0x3a, 0x66, 0x71, 0xe8, 0x4e, - 0xfa, 0x6e, 0x08, 0x31, 0x70, 0x2a, 0x21, 0x70, 0x52, 0x9e, 0xc8, 0x04, 0x7f, 0x3c, 0xa3, 0x3a, - 0x73, 0xaa, 0x93, 0x8e, 0x42, 0xa7, 0xa0, 0x3a, 0x15, 0xaa, 0x33, 0xe9, 0xef, 0xdd, 0x09, 0x99, - 0x3c, 0xcb, 0x86, 0x8e, 0x9f, 0x44, 0x6e, 0x98, 0x84, 0x89, 0xab, 0x14, 0x86, 0xd9, 0x0b, 0x75, - 0x52, 0x07, 0xf5, 0x6b, 0xa6, 0xbc, 0x37, 0xa8, 0x4d, 0xca, 0xe5, 0x20, 0x92, 0x8c, 0xfb, 0xb0, - 0x9c, 0xcd, 0xde, 0xbd, 0x7a, 0x4e, 0x16, 0x4f, 0x80, 0x0b, 0x96, 0xc4, 0x10, 0xac, 0xd0, 0x6e, - 0xd7, 0xd3, 0x56, 0x4b, 0xde, 0xbb, 0x73, 0x39, 0x9a, 0x67, 0xb1, 0x64, 0xd1, 0x6a, 0x4e, 0x77, - 0xd7, 0xc3, 0x85, 0x7f, 0x06, 0x11, 0x5d, 0x61, 0xf5, 0x2f, 0x67, 0x65, 0x92, 0x8d, 0x5d, 0x16, - 0x4b, 0x21, 0xf9, 0x32, 0xa5, 0xf7, 0xb3, 0x81, 0x6e, 0x1d, 0xf1, 0x44, 0x88, 0xe7, 0xb3, 0x42, - 0x9f, 0x0c, 0x5f, 0x82, 0x2f, 0x09, 0xbc, 0x00, 0x0e, 0xb1, 0x0f, 0x78, 0x1f, 0xb5, 0x47, 0x2c, - 0x0e, 0xba, 0xc6, 0xbe, 0x71, 0x70, 0xdd, 0x7b, 0xe7, 0x7c, 0x6a, 0x37, 0xf2, 0xa9, 0xdd, 0xfe, - 0x92, 0xc5, 0x01, 0x51, 0x91, 0x02, 0x11, 0xd3, 0x08, 0xba, 0xcd, 0x45, 0xc4, 0x57, 0x34, 0x02, - 0xa2, 0x22, 0x78, 0x80, 0x10, 0x4d, 0x99, 0x36, 0xe8, 0xb6, 0x14, 0x0e, 0x6b, 0x1c, 0x3a, 0x3c, - 0x79, 0xa4, 0x23, 0xa4, 0x82, 0xea, 0xfd, 0xd6, 0x44, 0x37, 0x1f, 0x26, 0x9c, 0xbd, 0x4a, 0x62, - 0x49, 0xc7, 0x27, 0x49, 0x70, 0xa8, 0xe7, 0x02, 0x38, 0xfe, 0x1a, 0x6d, 0x45, 0x20, 0x69, 0x40, - 0x25, 0x55, 0x79, 0x99, 0x83, 0x03, 0xa7, 0x76, 0xa2, 0x9c, 0x49, 0xdf, 0x99, 0x15, 0x75, 0x0c, - 0x92, 0xce, 0x7d, 0xe7, 0x77, 0xa4, 0x54, 0xc3, 0x67, 0xa8, 0x2d, 0x52, 0xf0, 0x55, 0x2d, 0xe6, - 0xe0, 0x81, 0x73, 0xe5, 0x39, 0x75, 0x6a, 0x72, 0x3d, 0x4d, 0xc1, 0x9f, 0xf7, 0xa4, 0x38, 0x11, - 0xe5, 0x80, 0x53, 0x74, 0x4d, 0x48, 0x2a, 0x33, 0xa1, 0xfa, 0x61, 0x0e, 0x1e, 0xfe, 0x07, 0x5e, - 0x4a, 0xcf, 0xdb, 0xd1, 0x6e, 0xd7, 0x66, 0x67, 0xa2, 0x7d, 0x7a, 0x7f, 0x19, 0xe8, 0x56, 0x0d, - 0xf3, 0x31, 0x13, 0x12, 0x7f, 0xbb, 0xd2, 0x55, 0x77, 0x4d, 0x57, 0x2b, 0x5f, 0x86, 0x53, 0xd0, - 0x55, 0x73, 0xdf, 0xd5, 0xd6, 0x5b, 0x6f, 0x6e, 0x2a, 0xad, 0x0d, 0x51, 0x87, 0x49, 0x88, 0x44, - 0xb7, 0xb9, 0xdf, 0x3a, 0x30, 0x07, 0xde, 0xbf, 0xaf, 0xd7, 0xdb, 0xd6, 0x76, 0x9d, 0x47, 0x85, - 0x30, 0x99, 0xe9, 0xf7, 0xfe, 0x6e, 0xd6, 0xd6, 0x59, 0xf4, 0x1f, 0xff, 0x68, 0xa0, 0x1d, 0x75, - 0x7c, 0x4a, 0x79, 0x08, 0xc5, 0xa8, 0xeb, 0x72, 0x37, 0x79, 0xee, 0x35, 0x9f, 0x8c, 0x77, 0x43, - 0xa7, 0xb5, 0x73, 0xba, 0xe0, 0x42, 0x96, 0x5c, 0x71, 0x1f, 0x99, 0x11, 0x8b, 0x09, 0xa4, 0x63, - 0xe6, 0x53, 0xa1, 0x66, 0xae, 0xe3, 0xed, 0xe6, 0x53, 0xdb, 0x3c, 0x9e, 0x5f, 0x93, 0x2a, 0x06, - 0xdf, 0x43, 0x66, 0x44, 0xbf, 0x2f, 0x29, 0x2d, 0x45, 0x79, 0x5f, 0xfb, 0x99, 0xc7, 0xf3, 0x10, - 0xa9, 0xe2, 0xf0, 0x4b, 0x64, 0x49, 0x65, 0x7b, 0x74, 0xf2, 0xec, 0x99, 0x64, 0x63, 0xf6, 0x8a, - 0x4a, 0x96, 0xc4, 0x27, 0xc0, 0x7d, 0x88, 0x25, 0x0d, 0xa1, 0xdb, 0x56, 0x4a, 0xbd, 0x7c, 0x6a, - 0x5b, 0x4f, 0xd7, 0x22, 0xc9, 0x5b, 0x94, 0x7a, 0xbf, 0xb6, 0xd0, 0x07, 0x6b, 0x07, 0x14, 0x3f, - 0x40, 0x38, 0x19, 0x0a, 0xe0, 0x13, 0x08, 0xbe, 0x98, 0x6d, 0xa3, 0x62, 0x2d, 0x14, 0x6f, 0xd0, - 0xf2, 0x6e, 0xe4, 0x53, 0x1b, 0x3f, 0x59, 0x89, 0x92, 0x4b, 0x18, 0x38, 0x40, 0xdb, 0x63, 0x2a, - 0xe4, 0xac, 0xcb, 0x4c, 0x6f, 0x20, 0x73, 0xf0, 0xc9, 0x15, 0xa7, 0xb6, 0xa0, 0x78, 0xef, 0xe5, - 0x53, 0x7b, 0xfb, 0x71, 0x55, 0x85, 0x2c, 0x8a, 0xe2, 0x43, 0xb4, 0xeb, 0x67, 0x9c, 0x43, 0x2c, - 0x97, 0xda, 0x7e, 0x53, 0xb7, 0x7d, 0xf7, 0x68, 0x31, 0x4c, 0x96, 0xf1, 0x85, 0x44, 0x00, 0x82, - 0x71, 0x08, 0x4a, 0x89, 0xf6, 0xa2, 0xc4, 0xe7, 0x8b, 0x61, 0xb2, 0x8c, 0xc7, 0x11, 0xb2, 0xb5, - 0x6a, 0xed, 0x13, 0x76, 0x94, 0xe4, 0x87, 0xf9, 0xd4, 0xb6, 0x8f, 0xd6, 0x43, 0xc9, 0xdb, 0xb4, - 0x7a, 0xbf, 0x34, 0x51, 0x47, 0xb5, 0xe0, 0x7f, 0xdc, 0xb5, 0xcf, 0x17, 0x76, 0xed, 0xdd, 0x0d, - 0x3e, 0x3e, 0x95, 0x59, 0xed, 0x66, 0xfd, 0x6e, 0x69, 0xb3, 0x7e, 0xba, 0xb1, 0xf2, 0xfa, 0x3d, - 0x7a, 0x1f, 0x5d, 0x2f, 0x13, 0xc0, 0xb7, 0xd1, 0x16, 0x7f, 0xf3, 0xa6, 0x86, 0x7a, 0x80, 0x72, - 0x07, 0x96, 0x8f, 0x59, 0x22, 0x7a, 0x0c, 0x99, 0x15, 0x87, 0xcd, 0xc8, 0x05, 0x5a, 0xc0, 0x18, - 0x7c, 0x99, 0x70, 0xfd, 0x5f, 0x5b, 0xa2, 0x4f, 0xf5, 0x3d, 0x29, 0x11, 0xde, 0x47, 0xe7, 0x17, - 0x56, 0xe3, 0xf5, 0x85, 0xd5, 0xf8, 0xfd, 0xc2, 0x6a, 0xfc, 0x90, 0x5b, 0xc6, 0x79, 0x6e, 0x19, - 0xaf, 0x73, 0xcb, 0xf8, 0x23, 0xb7, 0x8c, 0x9f, 0xfe, 0xb4, 0x1a, 0xdf, 0x34, 0x27, 0xfd, 0x7f, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x11, 0x6a, 0xc0, 0x63, 0xc4, 0x09, 0x00, 0x00, + // 838 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6f, 0xdc, 0x44, + 0x14, 0x5f, 0xef, 0x47, 0x95, 0x8e, 0x49, 0x02, 0x83, 0xd4, 0xae, 0x52, 0x61, 0x47, 0x0b, 0x87, + 0x20, 0xa5, 0xb6, 0x76, 0x55, 0x10, 0x3d, 0xc6, 0x41, 0xa5, 0x15, 0x0d, 0x8d, 0x26, 0x6d, 0x85, + 0x7a, 0x40, 0x9a, 0xf5, 0xbe, 0x3a, 0xd3, 0x5d, 0x7b, 0xac, 0x99, 0xf1, 0x0a, 0xf5, 0xc4, 0x89, + 0x33, 0x17, 0x0e, 0xfc, 0x35, 0x5c, 0x73, 0xa3, 0x47, 0x4e, 0x2b, 0x62, 0xfe, 0x0d, 0x0e, 0xc8, + 0xb3, 0x53, 0xef, 0x57, 0xec, 0x12, 0x01, 0xb7, 0x9d, 0x79, 0xbf, 0x8f, 0x37, 0xef, 0x3d, 0xbf, + 0x45, 0xf7, 0xc7, 0x5f, 0x48, 0x8f, 0x71, 0x7f, 0x9c, 0x0d, 0x41, 0x24, 0xa0, 0x40, 0xfa, 0xe9, + 0x38, 0xf2, 0x69, 0xca, 0xa4, 0x4f, 0x33, 0xc5, 0x65, 0x48, 0x27, 0x2c, 0x89, 0xfc, 0x69, 0xdf, + 0x8f, 0x20, 0x01, 0x41, 0x15, 0x8c, 0xbc, 0x54, 0x70, 0xc5, 0xf1, 0xa7, 0x73, 0xaa, 0xb7, 0xa0, + 0x7a, 0xe9, 0x38, 0xf2, 0x0a, 0xaa, 0xb7, 0x44, 0xf5, 0xa6, 0xfd, 0xbd, 0xbb, 0x11, 0x53, 0xe7, + 0xd9, 0xd0, 0x0b, 0x79, 0xec, 0x47, 0x3c, 0xe2, 0xbe, 0x56, 0x18, 0x66, 0x2f, 0xf5, 0x49, 0x1f, + 0xf4, 0xaf, 0xb9, 0xf2, 0xde, 0xa0, 0x32, 0x29, 0x5f, 0x80, 0xe4, 0x99, 0x08, 0x61, 0x3d, 0x9b, + 0xbd, 0xc3, 0x6a, 0xce, 0x66, 0xee, 0x35, 0x0e, 0xd2, 0x8f, 0x41, 0xd1, 0xab, 0x38, 0x77, 0xaf, + 0xe6, 0x88, 0x2c, 0x51, 0x2c, 0xde, 0x4c, 0xe8, 0x5e, 0x3d, 0x5c, 0x86, 0xe7, 0x10, 0xd3, 0x0d, + 0x56, 0xff, 0x6a, 0x56, 0xa6, 0xd8, 0xc4, 0x67, 0x89, 0x92, 0x4a, 0xac, 0x53, 0x7a, 0x3f, 0x5b, + 0xe8, 0xce, 0xb1, 0xe0, 0x52, 0x3e, 0x07, 0x21, 0x19, 0x4f, 0x9e, 0x0c, 0x5f, 0x41, 0xa8, 0x08, + 0xbc, 0x04, 0x01, 0x49, 0x08, 0x78, 0x1f, 0xb5, 0xc7, 0x2c, 0x19, 0x75, 0xad, 0x7d, 0xeb, 0xe0, + 0x66, 0xf0, 0xde, 0xc5, 0xcc, 0x6d, 0xe4, 0x33, 0xb7, 0xfd, 0x35, 0x4b, 0x46, 0x44, 0x47, 0x0a, + 0x44, 0x42, 0x63, 0xe8, 0x36, 0x57, 0x11, 0xdf, 0xd0, 0x18, 0x88, 0x8e, 0xe0, 0x01, 0x42, 0x34, + 0x65, 0xc6, 0xa0, 0xdb, 0xd2, 0x38, 0x6c, 0x70, 0xe8, 0xe8, 0xf4, 0x91, 0x89, 0x90, 0x25, 0x54, + 0xef, 0xb7, 0x26, 0xba, 0xfd, 0x90, 0x0b, 0xf6, 0x9a, 0x27, 0x8a, 0x4e, 0x4e, 0xf9, 0xe8, 0xc8, + 0x0c, 0x05, 0x08, 0xfc, 0x2d, 0xda, 0x2a, 0xca, 0x3c, 0xa2, 0x8a, 0xea, 0xbc, 0xec, 0xc1, 0x81, + 0x57, 0x39, 0x4e, 0xde, 0xb4, 0xef, 0xcd, 0x1f, 0x75, 0x02, 0x8a, 0x2e, 0x7c, 0x17, 0x77, 0xa4, + 0x54, 0xc3, 0xe7, 0xa8, 0x2d, 0x53, 0x08, 0xf5, 0x5b, 0xec, 0xc1, 0x03, 0xef, 0x1f, 0x0f, 0xa9, + 0x57, 0x91, 0xeb, 0x59, 0x0a, 0xe1, 0xa2, 0x26, 0xc5, 0x89, 0x68, 0x07, 0x9c, 0xa2, 0x1b, 0x52, + 0x51, 0x95, 0x49, 0x5d, 0x0f, 0x7b, 0xf0, 0xf0, 0x3f, 0xf0, 0xd2, 0x7a, 0xc1, 0x8e, 0x71, 0xbb, + 0x31, 0x3f, 0x13, 0xe3, 0xd3, 0xcb, 0x2d, 0x74, 0xa7, 0x82, 0xf9, 0x98, 0x49, 0x85, 0x5f, 0x6c, + 0x54, 0xf5, 0xb0, 0x2e, 0xa7, 0x02, 0x5b, 0x24, 0x53, 0x70, 0x75, 0x65, 0xdf, 0x37, 0xbe, 0x5b, + 0x6f, 0x6f, 0x96, 0xea, 0x1a, 0xa1, 0x0e, 0x53, 0x10, 0xcb, 0x6e, 0x73, 0xbf, 0x75, 0x60, 0x0f, + 0x82, 0x7f, 0xff, 0xd8, 0x60, 0xdb, 0xd8, 0x75, 0x1e, 0x15, 0xc2, 0x64, 0xae, 0xdf, 0xfb, 0xab, + 0x59, 0xf9, 0xc8, 0xa2, 0xf8, 0xf8, 0x47, 0x0b, 0xed, 0xe8, 0xe3, 0x53, 0x2a, 0x22, 0x28, 0xe6, + 0xdc, 0xbc, 0xf5, 0x3a, 0xbd, 0xae, 0xf9, 0x5e, 0x82, 0x5b, 0x26, 0xad, 0x9d, 0xb3, 0x15, 0x17, + 0xb2, 0xe6, 0x8a, 0xfb, 0xc8, 0x8e, 0x59, 0x42, 0x20, 0x9d, 0xb0, 0x90, 0x4a, 0x3d, 0x70, 0x9d, + 0x60, 0x37, 0x9f, 0xb9, 0xf6, 0xc9, 0xe2, 0x9a, 0x2c, 0x63, 0xf0, 0x67, 0xc8, 0x8e, 0xe9, 0xf7, + 0x25, 0xa5, 0xa5, 0x29, 0x1f, 0x1a, 0x3f, 0xfb, 0x64, 0x11, 0x22, 0xcb, 0x38, 0xfc, 0x0a, 0x39, + 0x4a, 0xdb, 0x1e, 0x9f, 0x3e, 0x7b, 0xa6, 0xd8, 0x84, 0xbd, 0xa6, 0x8a, 0xf1, 0xe4, 0x14, 0x44, + 0x08, 0x89, 0xa2, 0x11, 0x74, 0xdb, 0x5a, 0xa9, 0x97, 0xcf, 0x5c, 0xe7, 0x69, 0x2d, 0x92, 0xbc, + 0x43, 0xa9, 0xf7, 0x6b, 0x0b, 0x7d, 0x54, 0x3b, 0x9d, 0xf8, 0x01, 0xc2, 0x7c, 0x28, 0x41, 0x4c, + 0x61, 0xf4, 0xd5, 0x7c, 0x15, 0x15, 0x3b, 0xa1, 0xe8, 0x41, 0x2b, 0xb8, 0x95, 0xcf, 0x5c, 0xfc, + 0x64, 0x23, 0x4a, 0xae, 0x60, 0x60, 0x8a, 0xb6, 0x27, 0x54, 0xaa, 0x79, 0x95, 0x99, 0x59, 0x3f, + 0xb5, 0x8b, 0x60, 0x31, 0xb2, 0x05, 0x3e, 0xf8, 0x20, 0x9f, 0xb9, 0xdb, 0x8f, 0x97, 0x25, 0xc8, + 0xaa, 0x22, 0x3e, 0x42, 0xbb, 0x61, 0x26, 0x04, 0x24, 0x6a, 0xad, 0xe6, 0xb7, 0x4d, 0xcd, 0x77, + 0x8f, 0x57, 0xc3, 0x64, 0x1d, 0x5f, 0x48, 0x8c, 0x40, 0x32, 0x01, 0xa3, 0x52, 0xa2, 0xbd, 0x2a, + 0xf1, 0xe5, 0x6a, 0x98, 0xac, 0xe3, 0x71, 0x8c, 0x5c, 0xa3, 0x5a, 0xd9, 0xbf, 0x8e, 0x96, 0xfc, + 0x38, 0x9f, 0xb9, 0xee, 0x71, 0x3d, 0x94, 0xbc, 0x4b, 0xab, 0xf7, 0x4b, 0x13, 0x75, 0x74, 0x09, + 0xfe, 0xc7, 0x2d, 0xfb, 0x7c, 0x65, 0xcb, 0xde, 0xbb, 0xc6, 0x97, 0xa7, 0x33, 0xab, 0xdc, 0xa9, + 0xdf, 0xad, 0xed, 0xd4, 0xcf, 0xaf, 0xad, 0x5c, 0xbf, 0x41, 0xef, 0xa3, 0x9b, 0x65, 0x02, 0xf8, + 0x10, 0x6d, 0x89, 0xb7, 0x3d, 0xb5, 0x74, 0x03, 0xca, 0x05, 0x58, 0x36, 0xb3, 0x44, 0xf4, 0x18, + 0xb2, 0x97, 0x1c, 0xae, 0x47, 0x2e, 0xd0, 0x12, 0x26, 0x10, 0x2a, 0x2e, 0xcc, 0xbf, 0x6c, 0x89, + 0x3e, 0x33, 0xf7, 0xa4, 0x44, 0x04, 0x9f, 0x5c, 0x5c, 0x3a, 0x8d, 0x37, 0x97, 0x4e, 0xe3, 0xf7, + 0x4b, 0xa7, 0xf1, 0x43, 0xee, 0x58, 0x17, 0xb9, 0x63, 0xbd, 0xc9, 0x1d, 0xeb, 0x8f, 0xdc, 0xb1, + 0x7e, 0xfa, 0xd3, 0x69, 0xbc, 0x68, 0x4e, 0xfb, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x62, + 0x6b, 0x34, 0xbb, 0x09, 0x00, 0x00, } diff --git a/pkg/apis/autoscaling/v1/generated.proto b/pkg/apis/autoscaling/v1/generated.proto index 249ce57252b..20f864c1aa2 100644 --- a/pkg/apis/autoscaling/v1/generated.proto +++ b/pkg/apis/autoscaling/v1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.autoscaling.v1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -63,7 +63,7 @@ message HorizontalPodAutoscaler { message HorizontalPodAutoscalerList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // list of horizontal pod autoscaler objects. repeated HorizontalPodAutoscaler items = 2; @@ -97,7 +97,7 @@ message HorizontalPodAutoscalerStatus { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScaleTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScaleTime = 2; // current number of replicas of pods managed by this autoscaler. optional int32 currentReplicas = 3; diff --git a/pkg/apis/autoscaling/v1/register.go b/pkg/apis/autoscaling/v1/register.go index 89b4b552ca7..1eee20f39cf 100644 --- a/pkg/apis/autoscaling/v1/register.go +++ b/pkg/apis/autoscaling/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/autoscaling/v1/types.generated.go b/pkg/apis/autoscaling/v1/types.generated.go index 29cb4e957bf..cc488868426 100644 --- a/pkg/apis/autoscaling/v1/types.generated.go +++ b/pkg/apis/autoscaling/v1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.Time - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.Time var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -943,7 +943,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19 } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym83 := z.DecBinary() _ = yym83 @@ -1042,7 +1042,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym92 := z.DecBinary() _ = yym92 @@ -1687,7 +1687,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv149 := &x.ListMeta yym150 := z.DecBinary() @@ -1768,7 +1768,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv156 := &x.ListMeta yym157 := z.DecBinary() diff --git a/pkg/apis/autoscaling/v1/types.go b/pkg/apis/autoscaling/v1/types.go index 5f5cf98ddfa..74790cae7a2 100644 --- a/pkg/apis/autoscaling/v1/types.go +++ b/pkg/apis/autoscaling/v1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // CrossVersionObjectReference contains enough information to let you identify the referred resource. diff --git a/pkg/apis/batch/types.generated.go b/pkg/apis/batch/types.generated.go index 376960cbcc9..1a80bff3e6f 100644 --- a/pkg/apis/batch/types.generated.go +++ b/pkg/apis/batch/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -67,7 +67,7 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.TypeMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv53 := &x.ListMeta yym54 := z.DecBinary() @@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv60 := &x.ListMeta yym61 := z.DecBinary() @@ -1605,7 +1605,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym144 := z.DecBinary() _ = yym144 @@ -1747,7 +1747,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym156 := z.DecBinary() _ = yym156 @@ -2126,7 +2126,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym186 := z.DecBinary() _ = yym186 @@ -2147,7 +2147,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym188 := z.DecBinary() _ = yym188 @@ -2232,7 +2232,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym196 := z.DecBinary() _ = yym196 @@ -2263,7 +2263,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym198 := z.DecBinary() _ = yym198 @@ -2630,7 +2630,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv231 := &x.LastProbeTime yym232 := z.DecBinary() @@ -2647,7 +2647,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv233 := &x.LastTransitionTime yym234 := z.DecBinary() @@ -2732,7 +2732,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv240 := &x.LastProbeTime yym241 := z.DecBinary() @@ -2759,7 +2759,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv242 := &x.LastTransitionTime yym243 := z.DecBinary() @@ -3379,7 +3379,7 @@ func (x *CronJobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv298 := &x.ListMeta yym299 := z.DecBinary() @@ -3460,7 +3460,7 @@ func (x *CronJobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv305 := &x.ListMeta yym306 := z.DecBinary() @@ -4114,7 +4114,7 @@ func (x *CronJobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym362 := z.DecBinary() _ = yym362 @@ -4181,7 +4181,7 @@ func (x *CronJobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym367 := z.DecBinary() _ = yym367 diff --git a/pkg/apis/batch/v1/generated.pb.go b/pkg/apis/batch/v1/generated.pb.go index 1bebc216552..5b197f67231 100644 --- a/pkg/apis/batch/v1/generated.pb.go +++ b/pkg/apis/batch/v1/generated.pb.go @@ -37,8 +37,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -481,8 +481,8 @@ func (this *JobCondition) String() string { s := strings.Join([]string{`&JobCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -494,7 +494,7 @@ func (this *JobList) String() string { return "nil" } s := strings.Join([]string{`&JobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -508,7 +508,7 @@ func (this *JobSpec) String() string { `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, @@ -521,8 +521,8 @@ func (this *JobStatus) String() string { } s := strings.Join([]string{`&JobStatus{`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, - `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, + `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, @@ -1131,7 +1131,7 @@ func (m *JobSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1296,7 +1296,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1329,7 +1329,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.CompletionTime == nil { - m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1519,60 +1519,59 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 872 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0xce, 0x8f, 0xa6, 0x4d, 0xa6, 0x3f, 0x76, 0x19, 0xa9, 0x52, 0xc8, 0x21, 0x59, 0x05, 0x84, - 0x16, 0xb1, 0x1d, 0x2b, 0xa5, 0x48, 0x88, 0x03, 0x12, 0x2e, 0x42, 0xa2, 0x6a, 0xd9, 0x6a, 0x52, - 0xa1, 0x15, 0x08, 0xa4, 0xb1, 0xfd, 0x36, 0x1d, 0x6a, 0x7b, 0x2c, 0xcf, 0x38, 0x68, 0x6f, 0xdc, - 0xb8, 0xf2, 0xd7, 0x80, 0xf8, 0x0f, 0x7a, 0x5c, 0x71, 0xe2, 0x14, 0x51, 0xf3, 0x5f, 0xec, 0x09, - 0x79, 0x3c, 0xb1, 0x9d, 0x26, 0x8d, 0xb2, 0xdc, 0x3c, 0xef, 0x7d, 0xdf, 0xf7, 0x9e, 0xe7, 0x7d, - 0xf3, 0xd0, 0xc7, 0x37, 0x9f, 0x4a, 0xc2, 0x85, 0x75, 0x93, 0x38, 0x10, 0x87, 0xa0, 0x40, 0x5a, - 0xd1, 0xcd, 0xc4, 0x62, 0x11, 0x97, 0x96, 0xc3, 0x94, 0x7b, 0x6d, 0x4d, 0x47, 0xd6, 0x04, 0x42, - 0x88, 0x99, 0x02, 0x8f, 0x44, 0xb1, 0x50, 0x02, 0xbf, 0x97, 0x93, 0x48, 0x49, 0x22, 0xd1, 0xcd, - 0x84, 0x64, 0x24, 0xa2, 0x49, 0x64, 0x3a, 0xea, 0x1d, 0x4d, 0xb8, 0xba, 0x4e, 0x1c, 0xe2, 0x8a, - 0xc0, 0x9a, 0x88, 0x89, 0xb0, 0x34, 0xd7, 0x49, 0x5e, 0xea, 0x93, 0x3e, 0xe8, 0xaf, 0x5c, 0xb3, - 0x77, 0xfc, 0x60, 0x23, 0x56, 0x0c, 0x52, 0x24, 0xb1, 0x0b, 0xf7, 0xfb, 0xe8, 0x7d, 0xf2, 0x30, - 0x27, 0x09, 0xa7, 0x10, 0x4b, 0x2e, 0x42, 0xf0, 0x96, 0x68, 0xcf, 0x1e, 0xa6, 0x2d, 0xff, 0x6c, - 0xef, 0x68, 0x35, 0x3a, 0x4e, 0x42, 0xc5, 0x83, 0xe5, 0x9e, 0x4e, 0xd6, 0xc3, 0xa5, 0x7b, 0x0d, - 0x01, 0x5b, 0x62, 0x8d, 0x56, 0xb3, 0x12, 0xc5, 0x7d, 0x8b, 0x87, 0x4a, 0xaa, 0xf8, 0x3e, 0x65, - 0xf8, 0x6b, 0x03, 0x35, 0xcf, 0x84, 0x83, 0x5f, 0xa0, 0x76, 0x00, 0x8a, 0x79, 0x4c, 0xb1, 0x6e, - 0xfd, 0x49, 0xfd, 0xe9, 0xee, 0xf1, 0x53, 0xf2, 0xe0, 0x7c, 0xc8, 0x74, 0x44, 0x9e, 0x3b, 0x3f, - 0x81, 0xab, 0x2e, 0x40, 0x31, 0x1b, 0xdf, 0xce, 0x06, 0xb5, 0x74, 0x36, 0x40, 0x65, 0x8c, 0x16, - 0x6a, 0xf8, 0x1b, 0xb4, 0x25, 0x23, 0x70, 0xbb, 0x0d, 0xad, 0xfa, 0x8c, 0x6c, 0x30, 0x75, 0x72, - 0x26, 0x9c, 0x71, 0x04, 0xae, 0xbd, 0x67, 0x94, 0xb7, 0xb2, 0x13, 0xd5, 0x3a, 0xf8, 0x5b, 0xb4, - 0x2d, 0x15, 0x53, 0x89, 0xec, 0x36, 0xb5, 0x22, 0xd9, 0x58, 0x51, 0xb3, 0xec, 0x03, 0xa3, 0xb9, - 0x9d, 0x9f, 0xa9, 0x51, 0x1b, 0xfe, 0xd5, 0x44, 0x7b, 0x67, 0xc2, 0x39, 0x15, 0xa1, 0xc7, 0x15, - 0x17, 0x21, 0x3e, 0x41, 0x5b, 0xea, 0x55, 0x04, 0xfa, 0x3a, 0x3a, 0xf6, 0x93, 0x79, 0x2b, 0x57, - 0xaf, 0x22, 0x78, 0x33, 0x1b, 0x3c, 0xae, 0x62, 0xb3, 0x18, 0xd5, 0xe8, 0x4a, 0x7b, 0x0d, 0xcd, - 0xfb, 0x7c, 0xb1, 0xdc, 0x9b, 0xd9, 0x60, 0xad, 0x71, 0x48, 0xa1, 0xb9, 0xd8, 0x1e, 0xbe, 0x46, - 0xfb, 0x3e, 0x93, 0xea, 0x32, 0x16, 0x0e, 0x5c, 0xf1, 0x00, 0xcc, 0xdf, 0x7f, 0xb4, 0x66, 0x4a, - 0x15, 0xf7, 0x92, 0x8c, 0x62, 0x1f, 0x9a, 0x5e, 0xf6, 0xcf, 0xab, 0x4a, 0x74, 0x51, 0x18, 0xff, - 0x8c, 0x70, 0x16, 0xb8, 0x8a, 0x59, 0x28, 0xf3, 0xbf, 0xcb, 0xca, 0x6d, 0xbd, 0x7d, 0xb9, 0x9e, - 0x29, 0x87, 0xcf, 0x97, 0xe4, 0xe8, 0x8a, 0x12, 0xf8, 0x03, 0xb4, 0x1d, 0x03, 0x93, 0x22, 0xec, - 0xb6, 0xf4, 0xd5, 0x15, 0x93, 0xa2, 0x3a, 0x4a, 0x4d, 0x16, 0x7f, 0x88, 0x76, 0x02, 0x90, 0x92, - 0x4d, 0xa0, 0xbb, 0xad, 0x81, 0x8f, 0x0c, 0x70, 0xe7, 0x22, 0x0f, 0xd3, 0x79, 0x7e, 0xf8, 0x47, - 0x1d, 0xed, 0x9c, 0x09, 0xe7, 0x9c, 0x4b, 0x85, 0x7f, 0x58, 0xb2, 0xb8, 0xb5, 0xe1, 0xdf, 0x64, - 0x74, 0xed, 0xf4, 0xc7, 0xa6, 0x50, 0x7b, 0x1e, 0xa9, 0xf8, 0xfc, 0x02, 0xb5, 0xb8, 0x82, 0x20, - 0x9b, 0x7b, 0x73, 0xfd, 0xf3, 0x59, 0xb4, 0xa5, 0xbd, 0x6f, 0x44, 0x5b, 0x5f, 0x67, 0x74, 0x9a, - 0xab, 0x0c, 0xff, 0x6c, 0xea, 0xce, 0x33, 0xe3, 0xe3, 0x11, 0xda, 0x8d, 0x58, 0xcc, 0x7c, 0x1f, - 0x7c, 0x2e, 0x03, 0xdd, 0x7c, 0xcb, 0x7e, 0x94, 0xce, 0x06, 0xbb, 0x97, 0x65, 0x98, 0x56, 0x31, - 0x19, 0xc5, 0x15, 0x41, 0xe4, 0x43, 0x76, 0xbb, 0xb9, 0x17, 0x0d, 0xe5, 0xb4, 0x0c, 0xd3, 0x2a, - 0x06, 0x3f, 0x47, 0x87, 0xcc, 0x55, 0x7c, 0x0a, 0x5f, 0x02, 0xf3, 0x7c, 0x1e, 0xc2, 0x18, 0x5c, - 0x11, 0x7a, 0xf9, 0x3b, 0x6b, 0xda, 0xef, 0xa6, 0xb3, 0xc1, 0xe1, 0x17, 0xab, 0x00, 0x74, 0x35, - 0x0f, 0xff, 0x88, 0xda, 0x12, 0x7c, 0x70, 0x95, 0x88, 0x8d, 0x7d, 0x4e, 0x36, 0xbd, 0x70, 0xe6, - 0x80, 0x3f, 0x36, 0x5c, 0x7b, 0x2f, 0xbb, 0xf1, 0xf9, 0x89, 0x16, 0x9a, 0xf8, 0x33, 0x74, 0x10, - 0xb0, 0x30, 0x61, 0x05, 0x52, 0xfb, 0xa6, 0x6d, 0xe3, 0x74, 0x36, 0x38, 0xb8, 0x58, 0xc8, 0xd0, - 0x7b, 0x48, 0xfc, 0x3d, 0x6a, 0x2b, 0x08, 0x22, 0x9f, 0xa9, 0xdc, 0x44, 0xbb, 0xc7, 0x47, 0xeb, - 0xf7, 0xdd, 0xa5, 0xf0, 0xae, 0x0c, 0x41, 0xaf, 0xa6, 0xc2, 0x0a, 0xf3, 0x28, 0x2d, 0x04, 0x87, - 0xbf, 0x37, 0x51, 0xa7, 0x58, 0x38, 0x18, 0x10, 0x72, 0xe7, 0x8f, 0x5a, 0x76, 0xeb, 0xda, 0x1d, - 0xa3, 0x4d, 0xdd, 0x51, 0xac, 0x83, 0x72, 0xcb, 0x16, 0x21, 0x49, 0x2b, 0xc2, 0xf8, 0x05, 0xea, - 0x48, 0xc5, 0x62, 0xa5, 0x5f, 0x6b, 0xe3, 0xed, 0x5f, 0xeb, 0x7e, 0x3a, 0x1b, 0x74, 0xc6, 0x73, - 0x05, 0x5a, 0x8a, 0xe1, 0x09, 0x3a, 0x28, 0x7d, 0xf2, 0x7f, 0x77, 0x8f, 0x1e, 0xca, 0xe9, 0x82, - 0x0c, 0xbd, 0x27, 0x9b, 0x2d, 0x80, 0xdc, 0x49, 0xda, 0x2e, 0xad, 0x72, 0x01, 0xe4, 0xb6, 0xa3, - 0x26, 0x8b, 0x2d, 0xd4, 0x91, 0x89, 0xeb, 0x02, 0x78, 0xe0, 0xe9, 0x99, 0xb7, 0xec, 0x77, 0x0c, - 0xb4, 0x33, 0x9e, 0x27, 0x68, 0x89, 0xc9, 0x84, 0x5f, 0x32, 0xee, 0x83, 0xa7, 0x67, 0x5d, 0x11, - 0xfe, 0x4a, 0x47, 0xa9, 0xc9, 0xda, 0xef, 0xdf, 0xde, 0xf5, 0x6b, 0xaf, 0xef, 0xfa, 0xb5, 0xbf, - 0xef, 0xfa, 0xb5, 0x5f, 0xd2, 0x7e, 0xfd, 0x36, 0xed, 0xd7, 0x5f, 0xa7, 0xfd, 0xfa, 0x3f, 0x69, - 0xbf, 0xfe, 0xdb, 0xbf, 0xfd, 0xda, 0x77, 0x8d, 0xe9, 0xe8, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x9f, 0xc8, 0x32, 0x84, 0xee, 0x08, 0x00, 0x00, + // 863 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x6f, 0xe3, 0x44, + 0x18, 0xce, 0x47, 0xd3, 0x36, 0xd3, 0x8f, 0x5d, 0x46, 0xaa, 0x14, 0x7a, 0x48, 0x56, 0x01, 0xa1, + 0x22, 0xb5, 0xb6, 0x5c, 0xf6, 0x80, 0x38, 0x20, 0xe1, 0x22, 0x24, 0xaa, 0x96, 0xad, 0x26, 0x05, + 0xa1, 0xe5, 0x34, 0xb6, 0xdf, 0x4d, 0x4d, 0x6d, 0x8f, 0xe5, 0x19, 0x47, 0xda, 0x1b, 0x37, 0xae, + 0xfc, 0x14, 0x0e, 0x88, 0xdf, 0xd0, 0x03, 0x87, 0x3d, 0x72, 0xb2, 0xa8, 0xf9, 0x17, 0x7b, 0x42, + 0x33, 0x1e, 0x7f, 0xa4, 0x49, 0x43, 0x76, 0x6f, 0xf6, 0x3b, 0xcf, 0xf3, 0xcc, 0x33, 0xf3, 0x3e, + 0xf3, 0xa2, 0xcf, 0x6e, 0x3f, 0xe7, 0x86, 0xcf, 0xcc, 0xdb, 0xd4, 0x81, 0x24, 0x02, 0x01, 0xdc, + 0x8c, 0x6f, 0xa7, 0x26, 0x8d, 0x7d, 0x6e, 0x3a, 0x54, 0xb8, 0x37, 0xe6, 0xcc, 0x32, 0xa7, 0x10, + 0x41, 0x42, 0x05, 0x78, 0x46, 0x9c, 0x30, 0xc1, 0xf0, 0x47, 0x05, 0xc9, 0xa8, 0x49, 0x46, 0x7c, + 0x3b, 0x35, 0x24, 0xc9, 0x50, 0x24, 0x63, 0x66, 0x1d, 0x9e, 0x4c, 0x7d, 0x71, 0x93, 0x3a, 0x86, + 0xcb, 0x42, 0x73, 0xca, 0xa6, 0xcc, 0x54, 0x5c, 0x27, 0x7d, 0xa5, 0xfe, 0xd4, 0x8f, 0xfa, 0x2a, + 0x34, 0x0f, 0x4f, 0x1f, 0x35, 0x62, 0x26, 0xc0, 0x59, 0x9a, 0xb8, 0xf0, 0xd0, 0xc7, 0xe1, 0xf1, + 0xe3, 0x9c, 0x45, 0xd7, 0x2b, 0x76, 0xe0, 0x66, 0x08, 0x82, 0x2e, 0xe3, 0x9c, 0x2c, 0xe7, 0x24, + 0x69, 0x24, 0xfc, 0x70, 0xd1, 0xd0, 0xf3, 0xd5, 0x70, 0xee, 0xde, 0x40, 0x48, 0x17, 0x58, 0xd6, + 0x72, 0x56, 0x2a, 0xfc, 0xc0, 0xf4, 0x23, 0xc1, 0x45, 0xf2, 0x90, 0x32, 0xfe, 0xb5, 0x83, 0xba, + 0xe7, 0xcc, 0xc1, 0x3f, 0xa2, 0x6d, 0x69, 0xdd, 0xa3, 0x82, 0x0e, 0xda, 0xcf, 0xda, 0x47, 0x3b, + 0xa7, 0x47, 0xc6, 0xa3, 0xcd, 0x31, 0x66, 0x96, 0xf1, 0xc2, 0xf9, 0x19, 0x5c, 0x71, 0x09, 0x82, + 0xda, 0xf8, 0x2e, 0x1b, 0xb5, 0xf2, 0x6c, 0x84, 0xea, 0x1a, 0xa9, 0xd4, 0xf0, 0x77, 0x68, 0x83, + 0xc7, 0xe0, 0x0e, 0x3a, 0x4a, 0xf5, 0xd8, 0x58, 0xa3, 0xe5, 0xc6, 0x39, 0x73, 0x26, 0x31, 0xb8, + 0xf6, 0xae, 0x56, 0xde, 0x90, 0x7f, 0x44, 0xe9, 0xe0, 0x1f, 0xd0, 0x26, 0x17, 0x54, 0xa4, 0x7c, + 0xd0, 0x55, 0x8a, 0xc6, 0xda, 0x8a, 0x8a, 0x65, 0xef, 0x6b, 0xcd, 0xcd, 0xe2, 0x9f, 0x68, 0xb5, + 0xf1, 0x5f, 0x5d, 0xb4, 0x7b, 0xce, 0x9c, 0x33, 0x16, 0x79, 0xbe, 0xf0, 0x59, 0x84, 0x9f, 0xa3, + 0x0d, 0xf1, 0x3a, 0x06, 0x75, 0x1d, 0x7d, 0xfb, 0x59, 0x69, 0xe5, 0xfa, 0x75, 0x0c, 0x6f, 0xb3, + 0xd1, 0xd3, 0x26, 0x56, 0xd6, 0x88, 0x42, 0x37, 0xec, 0x75, 0x14, 0xef, 0xcb, 0xf9, 0xed, 0xde, + 0x66, 0xa3, 0x95, 0x61, 0x33, 0x2a, 0xcd, 0x79, 0x7b, 0x18, 0xd0, 0x5e, 0x40, 0xb9, 0xb8, 0x4a, + 0x98, 0x03, 0xd7, 0x7e, 0x08, 0xfa, 0xf4, 0x47, 0xab, 0x4e, 0x2f, 0x7b, 0x20, 0x0f, 0x2f, 0xf1, + 0xf6, 0x81, 0x36, 0xb2, 0x77, 0xd1, 0x94, 0x21, 0xf3, 0xaa, 0x58, 0x20, 0x2c, 0x0b, 0xd7, 0x09, + 0x8d, 0x78, 0x71, 0x34, 0xb9, 0xd7, 0xc6, 0x3b, 0xee, 0x75, 0xa8, 0xf7, 0xc2, 0x17, 0x0b, 0x5a, + 0x64, 0x89, 0x3e, 0xfe, 0x04, 0x6d, 0x26, 0x40, 0x39, 0x8b, 0x06, 0x3d, 0x75, 0x69, 0x55, 0x8f, + 0x88, 0xaa, 0x12, 0xbd, 0x8a, 0x3f, 0x45, 0x5b, 0x21, 0x70, 0x4e, 0xa7, 0x30, 0xd8, 0x54, 0xc0, + 0x27, 0x1a, 0xb8, 0x75, 0x59, 0x94, 0x49, 0xb9, 0x3e, 0xfe, 0xa3, 0x8d, 0xb6, 0xce, 0x99, 0x73, + 0xe1, 0x73, 0x81, 0x5f, 0x2e, 0x84, 0xfb, 0x78, 0x9d, 0xa3, 0x48, 0xae, 0x0a, 0xf8, 0x53, 0xbd, + 0xcb, 0x76, 0x59, 0x69, 0xc4, 0xfb, 0x12, 0xf5, 0x7c, 0x01, 0xa1, 0x6c, 0x77, 0xf7, 0xff, 0xee, + 0xa8, 0x99, 0x46, 0x7b, 0x4f, 0x8b, 0xf6, 0xbe, 0x95, 0x74, 0x52, 0xa8, 0x8c, 0xff, 0xec, 0x2a, + 0xdb, 0x32, 0xef, 0xd8, 0x42, 0x3b, 0x31, 0x4d, 0x68, 0x10, 0x40, 0xe0, 0xf3, 0x50, 0x39, 0xef, + 0xd9, 0x4f, 0xf2, 0x6c, 0xb4, 0x73, 0x55, 0x97, 0x49, 0x13, 0x23, 0x29, 0x2e, 0x0b, 0xe3, 0x00, + 0xe4, 0xd5, 0x16, 0x11, 0xd4, 0x94, 0xb3, 0xba, 0x4c, 0x9a, 0x18, 0xfc, 0x02, 0x1d, 0x50, 0x57, + 0xf8, 0x33, 0xf8, 0x1a, 0xa8, 0x17, 0xf8, 0x11, 0x4c, 0xc0, 0x65, 0x91, 0x57, 0x3c, 0xaf, 0xae, + 0xfd, 0x61, 0x9e, 0x8d, 0x0e, 0xbe, 0x5a, 0x06, 0x20, 0xcb, 0x79, 0xf8, 0x27, 0xb4, 0xcd, 0x21, + 0x00, 0x57, 0xb0, 0x44, 0x07, 0xc7, 0x5a, 0xeb, 0xb6, 0xa9, 0x03, 0xc1, 0x44, 0x13, 0xed, 0x5d, + 0x79, 0xdd, 0xe5, 0x1f, 0xa9, 0x04, 0xf1, 0x17, 0x68, 0x3f, 0xa4, 0x51, 0x4a, 0x2b, 0xa4, 0x4a, + 0xcc, 0xb6, 0x8d, 0xf3, 0x6c, 0xb4, 0x7f, 0x39, 0xb7, 0x42, 0x1e, 0x20, 0xa5, 0x31, 0x01, 0x61, + 0x1c, 0x50, 0x51, 0xc4, 0x67, 0xe7, 0xf4, 0x64, 0xf5, 0x8c, 0xbb, 0x62, 0xde, 0xb5, 0x26, 0xa8, + 0x71, 0x54, 0xe5, 0xa0, 0xac, 0x92, 0x4a, 0x70, 0xfc, 0x7b, 0x17, 0xf5, 0xab, 0x21, 0x83, 0x01, + 0x21, 0xb7, 0x7c, 0xc8, 0x7c, 0xd0, 0x56, 0xd1, 0xb0, 0xd6, 0x8d, 0x46, 0x35, 0x02, 0xea, 0xc9, + 0x5a, 0x95, 0x38, 0x69, 0x08, 0xe3, 0xef, 0x51, 0x9f, 0x0b, 0x9a, 0x08, 0xf5, 0x48, 0x3b, 0xef, + 0xf8, 0x48, 0xf7, 0xf2, 0x6c, 0xd4, 0x9f, 0x94, 0x74, 0x52, 0x2b, 0x61, 0x0f, 0xed, 0xd7, 0x09, + 0x79, 0xaf, 0x61, 0xa3, 0xda, 0x71, 0x36, 0xa7, 0x41, 0x1e, 0x68, 0xca, 0x47, 0x5f, 0x04, 0x48, + 0xa5, 0xa4, 0x57, 0x3f, 0xfa, 0x22, 0x6d, 0x44, 0xaf, 0x62, 0x13, 0xf5, 0x79, 0xea, 0xba, 0x00, + 0x1e, 0x78, 0xaa, 0xdb, 0x3d, 0xfb, 0x03, 0x0d, 0xed, 0x4f, 0xca, 0x05, 0x52, 0x63, 0xa4, 0xf0, + 0x2b, 0xea, 0x07, 0xe0, 0xa9, 0x2e, 0x37, 0x84, 0xbf, 0x51, 0x55, 0xa2, 0x57, 0xed, 0x8f, 0xef, + 0xee, 0x87, 0xad, 0x37, 0xf7, 0xc3, 0xd6, 0xdf, 0xf7, 0xc3, 0xd6, 0x2f, 0xf9, 0xb0, 0x7d, 0x97, + 0x0f, 0xdb, 0x6f, 0xf2, 0x61, 0xfb, 0x9f, 0x7c, 0xd8, 0xfe, 0xed, 0xdf, 0x61, 0xeb, 0x65, 0x67, + 0x66, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x37, 0xe1, 0x87, 0xd9, 0x08, 0x00, 0x00, } diff --git a/pkg/apis/batch/v1/generated.proto b/pkg/apis/batch/v1/generated.proto index 25957a999d0..62122e211ec 100644 --- a/pkg/apis/batch/v1/generated.proto +++ b/pkg/apis/batch/v1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.batch.v1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -59,11 +59,11 @@ message JobCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -79,7 +79,7 @@ message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Job. repeated Job items = 2; @@ -113,7 +113,7 @@ message JobSpec { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -145,13 +145,13 @@ message JobStatus { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3; // Active is the number of actively running pods. // +optional diff --git a/pkg/apis/batch/v1/register.go b/pkg/apis/batch/v1/register.go index 539210e4807..5af162b46db 100644 --- a/pkg/apis/batch/v1/register.go +++ b/pkg/apis/batch/v1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/batch/v1/types.generated.go b/pkg/apis/batch/v1/types.generated.go index 0f8b73c0da0..7242a724186 100644 --- a/pkg/apis/batch/v1/types.generated.go +++ b/pkg/apis/batch/v1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv53 := &x.ListMeta yym54 := z.DecBinary() @@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv60 := &x.ListMeta yym61 := z.DecBinary() @@ -1099,7 +1099,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym102 := z.DecBinary() _ = yym102 @@ -1241,7 +1241,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym114 := z.DecBinary() _ = yym114 @@ -1620,7 +1620,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym144 := z.DecBinary() _ = yym144 @@ -1641,7 +1641,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym146 := z.DecBinary() _ = yym146 @@ -1726,7 +1726,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym154 := z.DecBinary() _ = yym154 @@ -1757,7 +1757,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym156 := z.DecBinary() _ = yym156 @@ -2124,7 +2124,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv189 := &x.LastProbeTime yym190 := z.DecBinary() @@ -2141,7 +2141,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv191 := &x.LastTransitionTime yym192 := z.DecBinary() @@ -2226,7 +2226,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv198 := &x.LastProbeTime yym199 := z.DecBinary() @@ -2253,7 +2253,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv200 := &x.LastTransitionTime yym201 := z.DecBinary() diff --git a/pkg/apis/batch/v1/types.go b/pkg/apis/batch/v1/types.go index 6d549a91ff6..b3dd42adc83 100644 --- a/pkg/apis/batch/v1/types.go +++ b/pkg/apis/batch/v1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/batch/v2alpha1/generated.pb.go b/pkg/apis/batch/v2alpha1/generated.pb.go index 67ebb92298f..a4d8e36af98 100644 --- a/pkg/apis/batch/v2alpha1/generated.pb.go +++ b/pkg/apis/batch/v2alpha1/generated.pb.go @@ -43,8 +43,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -832,7 +832,7 @@ func (this *CronJobList) String() string { return "nil" } s := strings.Join([]string{`&CronJobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CronJob", "CronJob", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -858,7 +858,7 @@ func (this *CronJobStatus) String() string { } s := strings.Join([]string{`&CronJobStatus{`, `Active:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Active), "ObjectReference", "k8s_io_kubernetes_pkg_api_v1.ObjectReference", 1), `&`, ``, 1) + `,`, - `LastScheduleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScheduleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `LastScheduleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScheduleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `}`, }, "") return s @@ -882,8 +882,8 @@ func (this *JobCondition) String() string { s := strings.Join([]string{`&JobCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -895,7 +895,7 @@ func (this *JobList) String() string { return "nil" } s := strings.Join([]string{`&JobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -909,7 +909,7 @@ func (this *JobSpec) String() string { `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, @@ -922,8 +922,8 @@ func (this *JobStatus) String() string { } s := strings.Join([]string{`&JobStatus{`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, - `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, + `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, @@ -1478,7 +1478,7 @@ func (m *CronJobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LastScheduleTime == nil { - m.LastScheduleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.LastScheduleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.LastScheduleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2098,7 +2098,7 @@ func (m *JobSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2263,7 +2263,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2296,7 +2296,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.CompletionTime == nil { - m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2706,77 +2706,77 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 1149 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4d, 0x6f, 0xe3, 0x44, - 0x18, 0xae, 0x93, 0x36, 0x1f, 0x93, 0xed, 0xd7, 0x40, 0xb5, 0xa1, 0x48, 0x49, 0x15, 0x09, 0xd4, - 0x85, 0xad, 0xad, 0x46, 0x05, 0x96, 0x3d, 0x20, 0xad, 0x8b, 0x90, 0xa8, 0x5a, 0x6d, 0x35, 0xe9, - 0x42, 0x05, 0x0b, 0x62, 0x62, 0x4f, 0x13, 0x6f, 0x6d, 0x8f, 0xf1, 0x8c, 0x8b, 0x7a, 0xe3, 0xcc, - 0x09, 0x89, 0x1f, 0xc0, 0xef, 0x40, 0x82, 0x03, 0x07, 0xa4, 0x1e, 0x17, 0x24, 0x24, 0x4e, 0x11, - 0x35, 0xff, 0xa2, 0x27, 0xe4, 0xf1, 0xf8, 0x23, 0x5f, 0xa5, 0x29, 0x5a, 0x24, 0x6e, 0xf1, 0x3b, - 0xcf, 0xf3, 0xcc, 0x3b, 0xf3, 0x3e, 0xf3, 0xbe, 0x01, 0xef, 0x9e, 0x3e, 0x60, 0xaa, 0x45, 0xb5, - 0xd3, 0xa0, 0x4b, 0x7c, 0x97, 0x70, 0xc2, 0x34, 0xef, 0xb4, 0xa7, 0x61, 0xcf, 0x62, 0x5a, 0x17, - 0x73, 0xa3, 0xaf, 0x9d, 0xb5, 0xb1, 0xed, 0xf5, 0xf1, 0xb6, 0xd6, 0x23, 0x2e, 0xf1, 0x31, 0x27, - 0xa6, 0xea, 0xf9, 0x94, 0x53, 0x78, 0x2f, 0xa6, 0xaa, 0x19, 0x55, 0xf5, 0x4e, 0x7b, 0x6a, 0x44, - 0x55, 0x05, 0x55, 0x4d, 0xa8, 0xeb, 0x5b, 0x3d, 0x8b, 0xf7, 0x83, 0xae, 0x6a, 0x50, 0x47, 0xeb, - 0xd1, 0x1e, 0xd5, 0x84, 0x42, 0x37, 0x38, 0x11, 0x5f, 0xe2, 0x43, 0xfc, 0x8a, 0x95, 0xd7, 0xdb, - 0x53, 0x93, 0xd2, 0x7c, 0xc2, 0x68, 0xe0, 0x1b, 0x64, 0x34, 0x9b, 0xf5, 0xb7, 0xa6, 0x73, 0x02, - 0xf7, 0x8c, 0xf8, 0xcc, 0xa2, 0x2e, 0x31, 0xc7, 0x68, 0xf7, 0xa7, 0xd3, 0xce, 0xc6, 0x8e, 0xbc, - 0xbe, 0x35, 0x19, 0xed, 0x07, 0x2e, 0xb7, 0x9c, 0xf1, 0x9c, 0x76, 0xae, 0x87, 0x33, 0xa3, 0x4f, - 0x1c, 0x3c, 0xc6, 0xda, 0x9e, 0xcc, 0x0a, 0xb8, 0x65, 0x6b, 0x96, 0xcb, 0x19, 0xf7, 0x47, 0x29, - 0xad, 0xef, 0x0b, 0xa0, 0xbc, 0xeb, 0x53, 0x77, 0x8f, 0x76, 0xe1, 0x31, 0xa8, 0x38, 0x84, 0x63, - 0x13, 0x73, 0x5c, 0x57, 0x36, 0x94, 0xcd, 0x5a, 0x7b, 0x53, 0x9d, 0x5a, 0x29, 0xf5, 0x6c, 0x5b, - 0x7d, 0xdc, 0x7d, 0x46, 0x0c, 0x7e, 0x40, 0x38, 0xd6, 0xe1, 0xc5, 0xa0, 0x39, 0x17, 0x0e, 0x9a, - 0x20, 0x8b, 0xa1, 0x54, 0x0d, 0x1e, 0x83, 0x79, 0xe6, 0x11, 0xa3, 0x5e, 0x10, 0xaa, 0x6f, 0xab, - 0x37, 0xae, 0xbf, 0x2a, 0x73, 0xeb, 0x78, 0xc4, 0xd0, 0xef, 0xc8, 0x3d, 0xe6, 0xa3, 0x2f, 0x24, - 0x14, 0xe1, 0x17, 0xa0, 0xc4, 0x38, 0xe6, 0x01, 0xab, 0x17, 0x85, 0xf6, 0x83, 0x5b, 0x68, 0x0b, - 0xbe, 0xbe, 0x24, 0xd5, 0x4b, 0xf1, 0x37, 0x92, 0xba, 0xad, 0x5f, 0x14, 0x50, 0x93, 0xc8, 0x7d, - 0x8b, 0x71, 0xf8, 0xd9, 0xd8, 0x2d, 0x69, 0xd7, 0xdc, 0x52, 0xce, 0x41, 0x6a, 0x44, 0x17, 0x97, - 0xb5, 0x22, 0xb7, 0xaa, 0x24, 0x91, 0xdc, 0x55, 0x7d, 0x0c, 0x16, 0x2c, 0x4e, 0x1c, 0x56, 0x2f, - 0x6c, 0x14, 0x37, 0x6b, 0xed, 0xf6, 0xec, 0xe7, 0xd1, 0x17, 0xa5, 0xfc, 0xc2, 0x87, 0x91, 0x10, - 0x8a, 0xf5, 0x5a, 0xdf, 0x14, 0xd3, 0x73, 0x44, 0xf7, 0x07, 0xef, 0x83, 0x4a, 0x64, 0x23, 0x33, - 0xb0, 0x89, 0x38, 0x47, 0x35, 0x4b, 0xab, 0x23, 0xe3, 0x28, 0x45, 0xc0, 0x27, 0xe0, 0x2e, 0xe3, - 0xd8, 0xe7, 0x96, 0xdb, 0x7b, 0x9f, 0x60, 0xd3, 0xb6, 0x5c, 0xd2, 0x21, 0x06, 0x75, 0x4d, 0x26, - 0x8a, 0x5a, 0xd4, 0x5f, 0x0d, 0x07, 0xcd, 0xbb, 0x9d, 0xc9, 0x10, 0x34, 0x8d, 0x0b, 0x9f, 0x82, - 0x55, 0x83, 0xba, 0x46, 0xe0, 0xfb, 0xc4, 0x35, 0xce, 0x0f, 0xa9, 0x6d, 0x19, 0xe7, 0xa2, 0x92, - 0x55, 0x5d, 0x95, 0xd9, 0xac, 0xee, 0x8e, 0x02, 0xae, 0x26, 0x05, 0xd1, 0xb8, 0x10, 0x7c, 0x0d, - 0x94, 0x59, 0xc0, 0x3c, 0xe2, 0x9a, 0xf5, 0xf9, 0x0d, 0x65, 0xb3, 0xa2, 0xd7, 0xc2, 0x41, 0xb3, - 0xdc, 0x89, 0x43, 0x28, 0x59, 0x83, 0x5f, 0x82, 0xda, 0x33, 0xda, 0x3d, 0x22, 0x8e, 0x67, 0x63, - 0x4e, 0xea, 0x0b, 0xa2, 0xa8, 0x0f, 0x67, 0xb8, 0xf8, 0xbd, 0x8c, 0x2d, 0x8c, 0xfa, 0x92, 0x4c, - 0xbd, 0x96, 0x5b, 0x40, 0xf9, 0x3d, 0x5a, 0xbf, 0x2b, 0x60, 0x71, 0xc8, 0x7e, 0xf0, 0x09, 0x28, - 0x61, 0x83, 0x5b, 0x67, 0x51, 0x31, 0xa2, 0xc2, 0x6f, 0xdd, 0xe4, 0xe9, 0x21, 0x72, 0x42, 0xa2, - 0x03, 0x93, 0xcc, 0xbd, 0x8f, 0x84, 0x08, 0x92, 0x62, 0xd0, 0x01, 0x2b, 0x36, 0x66, 0x3c, 0xa9, - 0xe8, 0x91, 0xe5, 0x10, 0x71, 0x17, 0xb5, 0xf6, 0x9b, 0x37, 0x74, 0x6d, 0x44, 0xd1, 0x5f, 0x0e, - 0x07, 0xcd, 0x95, 0xfd, 0x11, 0x21, 0x34, 0x26, 0xdd, 0xfa, 0xae, 0x00, 0x8a, 0x2f, 0xb6, 0x95, - 0x1c, 0x0d, 0xb5, 0x92, 0xf6, 0x6c, 0x55, 0x9a, 0xda, 0x46, 0x9e, 0x8e, 0xb4, 0x91, 0x9d, 0x19, - 0x75, 0xaf, 0x6f, 0x21, 0xbf, 0x15, 0xc1, 0x9d, 0x3d, 0xda, 0xdd, 0xa5, 0xae, 0x69, 0x71, 0x8b, - 0xba, 0x70, 0x07, 0xcc, 0xf3, 0x73, 0x2f, 0x79, 0x77, 0x1b, 0x49, 0x42, 0x47, 0xe7, 0x1e, 0xb9, - 0x1a, 0x34, 0x57, 0xf2, 0xd8, 0x28, 0x86, 0x04, 0x1a, 0x7e, 0x94, 0x26, 0x59, 0x10, 0xbc, 0xf7, - 0x86, 0xb7, 0xbb, 0x1a, 0x34, 0xaf, 0x9d, 0x49, 0x6a, 0xaa, 0x39, 0x9c, 0x1e, 0xec, 0x83, 0xc5, - 0xa8, 0x90, 0x87, 0x3e, 0xed, 0xc6, 0x06, 0x29, 0xce, 0x6e, 0x90, 0x35, 0x99, 0xcb, 0xe2, 0x7e, - 0x5e, 0x09, 0x0d, 0x0b, 0xc3, 0xaf, 0x00, 0x8c, 0x02, 0x47, 0x3e, 0x76, 0x59, 0x7c, 0xba, 0x5b, - 0xfa, 0x71, 0x5d, 0x6e, 0x07, 0xf7, 0xc7, 0xe4, 0xd0, 0x84, 0x2d, 0xe0, 0xeb, 0xa0, 0xe4, 0x13, - 0xcc, 0xa8, 0x2b, 0x5e, 0x77, 0x35, 0xab, 0x14, 0x12, 0x51, 0x24, 0x57, 0xe1, 0x3d, 0x50, 0x76, - 0x08, 0x63, 0xb8, 0x47, 0xea, 0x25, 0x01, 0x5c, 0x96, 0xc0, 0xf2, 0x41, 0x1c, 0x46, 0xc9, 0x7a, - 0xeb, 0x27, 0x05, 0x94, 0xff, 0xa3, 0x99, 0xd0, 0x19, 0x9e, 0x09, 0xea, 0x6c, 0xe6, 0x9c, 0x32, - 0x0f, 0x7e, 0x28, 0x8a, 0xfc, 0xc5, 0x2c, 0xd8, 0x06, 0x35, 0x0f, 0xfb, 0xd8, 0xb6, 0x89, 0x6d, - 0x31, 0x47, 0x1c, 0x61, 0x41, 0x5f, 0x8e, 0x3a, 0xd8, 0x61, 0x16, 0x46, 0x79, 0x4c, 0x44, 0x31, - 0xa8, 0xe3, 0xd9, 0x24, 0xba, 0xe3, 0xd8, 0x91, 0x92, 0xb2, 0x9b, 0x85, 0x51, 0x1e, 0x03, 0x1f, - 0x83, 0xb5, 0xb8, 0x2b, 0x8d, 0x4e, 0x90, 0xa2, 0x98, 0x20, 0xaf, 0x84, 0x83, 0xe6, 0xda, 0xa3, - 0x49, 0x00, 0x34, 0x99, 0x07, 0x3f, 0x07, 0x15, 0x46, 0x6c, 0x62, 0x70, 0xea, 0x4b, 0x13, 0xed, - 0xdc, 0xf4, 0xda, 0x71, 0x97, 0xd8, 0x1d, 0xc9, 0xd5, 0xef, 0x88, 0xa1, 0x27, 0xbf, 0x50, 0xaa, - 0x09, 0x1f, 0x82, 0x25, 0x07, 0xbb, 0x01, 0x4e, 0x91, 0xc2, 0x3d, 0x15, 0x1d, 0x86, 0x83, 0xe6, - 0xd2, 0xc1, 0xd0, 0x0a, 0x1a, 0x41, 0xc2, 0x4f, 0x41, 0x85, 0x27, 0x13, 0xa5, 0x24, 0x72, 0xfb, - 0x87, 0x8e, 0x7e, 0x48, 0xcd, 0xa1, 0x21, 0x92, 0x1a, 0x22, 0x9d, 0x20, 0xa9, 0x60, 0xeb, 0xc7, - 0x22, 0xa8, 0x66, 0xa3, 0xe3, 0x14, 0x00, 0x23, 0x79, 0xda, 0x4c, 0x8e, 0x8f, 0x77, 0x66, 0xf3, - 0x48, 0xda, 0x1a, 0xb2, 0xee, 0x9b, 0x86, 0x18, 0xca, 0xc9, 0xc3, 0x63, 0x50, 0x15, 0xc3, 0x5c, - 0xbc, 0xdc, 0xc2, 0xec, 0x2f, 0x77, 0x31, 0x1c, 0x34, 0xab, 0x9d, 0x44, 0x01, 0x65, 0x62, 0xb0, - 0x07, 0x96, 0x32, 0xb7, 0xdc, 0xb6, 0x0f, 0x89, 0xd2, 0xec, 0x0e, 0xc9, 0xa0, 0x11, 0xd9, 0xa8, - 0x19, 0xc8, 0x51, 0x3b, 0x2f, 0x5c, 0x3b, 0x6d, 0x76, 0x6a, 0xa0, 0xca, 0x02, 0xc3, 0x20, 0xc4, - 0x24, 0xa6, 0xa8, 0xfc, 0x82, 0xbe, 0x2a, 0xa1, 0xd5, 0x4e, 0xb2, 0x80, 0x32, 0x4c, 0x24, 0x7c, - 0x82, 0x2d, 0x9b, 0x98, 0xa2, 0xe2, 0x39, 0xe1, 0x0f, 0x44, 0x14, 0xc9, 0xd5, 0xd6, 0xaf, 0x0a, - 0xc8, 0xff, 0x35, 0x78, 0x81, 0xd3, 0xb2, 0x9f, 0x73, 0x61, 0xe1, 0x5f, 0xff, 0xaf, 0xb9, 0xce, - 0x92, 0x3f, 0x2b, 0x60, 0x79, 0x04, 0xff, 0x7f, 0xfb, 0x17, 0xa0, 0xbf, 0x71, 0x71, 0xd9, 0x98, - 0x7b, 0x7e, 0xd9, 0x98, 0xfb, 0xe3, 0xb2, 0x31, 0xf7, 0x75, 0xd8, 0x50, 0x2e, 0xc2, 0x86, 0xf2, - 0x3c, 0x6c, 0x28, 0x7f, 0x86, 0x0d, 0xe5, 0xdb, 0xbf, 0x1a, 0x73, 0x9f, 0x54, 0x12, 0x9d, 0xbf, - 0x03, 0x00, 0x00, 0xff, 0xff, 0x74, 0x47, 0xe8, 0xb0, 0xff, 0x0e, 0x00, 0x00, + // 1137 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4b, 0x6f, 0x23, 0x45, + 0x17, 0x4d, 0xdb, 0x89, 0x1f, 0xe5, 0x3c, 0xeb, 0xfb, 0xa2, 0x31, 0x41, 0xb2, 0x23, 0x4b, 0xa0, + 0x0c, 0x4a, 0xba, 0x15, 0x2b, 0x82, 0x61, 0x16, 0x48, 0xd3, 0x41, 0x48, 0x44, 0x89, 0x26, 0x2a, + 0x27, 0x30, 0x1a, 0x66, 0x41, 0xb9, 0xbb, 0xe2, 0x74, 0xd2, 0xee, 0x6a, 0xba, 0xaa, 0x23, 0x65, + 0xc7, 0x9a, 0x15, 0x12, 0x3f, 0x80, 0x7f, 0xc1, 0x82, 0x1d, 0xac, 0xb2, 0x60, 0x31, 0xb0, 0x62, + 0x65, 0x91, 0xe6, 0x5f, 0x64, 0x85, 0xaa, 0x5c, 0xfd, 0xf0, 0x93, 0x38, 0x68, 0x90, 0xd8, 0xb9, + 0x6f, 0x9d, 0x73, 0xea, 0x56, 0xdd, 0x53, 0xf7, 0x1a, 0x7c, 0x78, 0xf9, 0x84, 0xe9, 0x0e, 0x35, + 0x2e, 0xc3, 0x36, 0x09, 0x3c, 0xc2, 0x09, 0x33, 0xfc, 0xcb, 0x8e, 0x81, 0x7d, 0x87, 0x19, 0x6d, + 0xcc, 0xad, 0x73, 0xe3, 0xaa, 0x89, 0x5d, 0xff, 0x1c, 0xef, 0x1a, 0x1d, 0xe2, 0x91, 0x00, 0x73, + 0x62, 0xeb, 0x7e, 0x40, 0x39, 0x85, 0x8f, 0xfb, 0x54, 0x3d, 0xa5, 0xea, 0xfe, 0x65, 0x47, 0x17, + 0x54, 0x5d, 0x52, 0xf5, 0x98, 0xba, 0xb1, 0xd3, 0x71, 0xf8, 0x79, 0xd8, 0xd6, 0x2d, 0xda, 0x35, + 0x3a, 0xb4, 0x43, 0x0d, 0xa9, 0xd0, 0x0e, 0xcf, 0xe4, 0x97, 0xfc, 0x90, 0xbf, 0xfa, 0xca, 0x1b, + 0xcd, 0x89, 0x49, 0x19, 0x01, 0x61, 0x34, 0x0c, 0x2c, 0x32, 0x9c, 0xcd, 0xc6, 0xf6, 0x64, 0xce, + 0xd5, 0x48, 0xee, 0x53, 0x76, 0x60, 0x46, 0x97, 0x70, 0x3c, 0x8e, 0xb3, 0x33, 0x9e, 0x13, 0x84, + 0x1e, 0x77, 0xba, 0xa3, 0x09, 0xed, 0x4d, 0x87, 0x33, 0xeb, 0x9c, 0x74, 0xf1, 0x08, 0x6b, 0x77, + 0x3c, 0x2b, 0xe4, 0x8e, 0x6b, 0x38, 0x1e, 0x67, 0x3c, 0x18, 0xa6, 0x34, 0xbe, 0xcf, 0x81, 0xe2, + 0x7e, 0x40, 0xbd, 0x03, 0xda, 0x86, 0x2f, 0x40, 0x49, 0xa4, 0x6f, 0x63, 0x8e, 0xab, 0xda, 0xa6, + 0xb6, 0x55, 0x69, 0x6e, 0xe9, 0x13, 0xcb, 0xa4, 0x5f, 0xed, 0xea, 0xcf, 0xdb, 0x17, 0xc4, 0xe2, + 0x47, 0x84, 0x63, 0x13, 0xde, 0xf4, 0xea, 0x73, 0x51, 0xaf, 0x0e, 0xd2, 0x18, 0x4a, 0xd4, 0xe0, + 0x0b, 0x30, 0xcf, 0x7c, 0x62, 0x55, 0x73, 0x52, 0xf5, 0x7d, 0xfd, 0xde, 0xc5, 0xd7, 0x55, 0x6e, + 0x2d, 0x9f, 0x58, 0xe6, 0xa2, 0xda, 0x63, 0x5e, 0x7c, 0x21, 0xa9, 0x08, 0xbf, 0x04, 0x05, 0xc6, + 0x31, 0x0f, 0x59, 0x35, 0x2f, 0xb5, 0x9f, 0x3c, 0x40, 0x5b, 0xf2, 0xcd, 0x65, 0xa5, 0x5e, 0xe8, + 0x7f, 0x23, 0xa5, 0xdb, 0xf8, 0x59, 0x03, 0x15, 0x85, 0x3c, 0x74, 0x18, 0x87, 0x2f, 0x47, 0x6e, + 0x69, 0x7b, 0xda, 0x9e, 0x02, 0x2b, 0xee, 0x4a, 0x70, 0xe5, 0x4d, 0xad, 0xaa, 0x7d, 0x4a, 0x71, + 0x24, 0x73, 0x4f, 0x9f, 0x83, 0x05, 0x87, 0x93, 0x2e, 0xab, 0xe6, 0x36, 0xf3, 0x5b, 0x95, 0x66, + 0x73, 0xf6, 0xc3, 0x98, 0x4b, 0x4a, 0x7e, 0xe1, 0x53, 0x21, 0x84, 0xfa, 0x7a, 0x8d, 0x6f, 0xf2, + 0xc9, 0x21, 0xc4, 0xe5, 0xc1, 0x6d, 0x50, 0x12, 0x1e, 0xb2, 0x43, 0x97, 0xc8, 0x43, 0x94, 0xd3, + 0xb4, 0x5a, 0x2a, 0x8e, 0x12, 0x04, 0x3c, 0x05, 0x8f, 0x18, 0xc7, 0x01, 0x77, 0xbc, 0xce, 0xc7, + 0x04, 0xdb, 0xae, 0xe3, 0x91, 0x16, 0xb1, 0xa8, 0x67, 0x33, 0x59, 0xd1, 0xbc, 0xf9, 0x76, 0xd4, + 0xab, 0x3f, 0x6a, 0x8d, 0x87, 0xa0, 0x49, 0x5c, 0xf8, 0x0a, 0xac, 0x59, 0xd4, 0xb3, 0xc2, 0x20, + 0x20, 0x9e, 0x75, 0x7d, 0x4c, 0x5d, 0xc7, 0xba, 0x96, 0x65, 0x2c, 0x9b, 0xba, 0xca, 0x66, 0x6d, + 0x7f, 0x18, 0x70, 0x37, 0x2e, 0x88, 0x46, 0x85, 0xe0, 0x3b, 0xa0, 0xc8, 0x42, 0xe6, 0x13, 0xcf, + 0xae, 0xce, 0x6f, 0x6a, 0x5b, 0x25, 0xb3, 0x12, 0xf5, 0xea, 0xc5, 0x56, 0x3f, 0x84, 0xe2, 0x35, + 0xf8, 0x15, 0xa8, 0x5c, 0xd0, 0xf6, 0x09, 0xe9, 0xfa, 0x2e, 0xe6, 0xa4, 0xba, 0x20, 0x2b, 0xfa, + 0x74, 0x86, 0x8b, 0x3f, 0x48, 0xd9, 0xd2, 0xa5, 0xff, 0x53, 0xa9, 0x57, 0x32, 0x0b, 0x28, 0xbb, + 0x47, 0xe3, 0x37, 0x0d, 0x2c, 0x0d, 0x78, 0x0f, 0x9e, 0x82, 0x02, 0xb6, 0xb8, 0x73, 0x25, 0x8a, + 0x21, 0x0a, 0xbf, 0x73, 0x9f, 0x77, 0x87, 0xc8, 0x19, 0x11, 0x07, 0x26, 0xa9, 0x75, 0x9f, 0x49, + 0x11, 0xa4, 0xc4, 0xe0, 0x05, 0x58, 0x75, 0x31, 0xe3, 0x71, 0x45, 0x4f, 0x9c, 0x2e, 0x91, 0x77, + 0x31, 0xf5, 0x61, 0xa7, 0x96, 0x15, 0x78, 0xf3, 0xff, 0x51, 0xaf, 0xbe, 0x7a, 0x38, 0xa4, 0x82, + 0x46, 0x74, 0x1b, 0xdf, 0xe5, 0x40, 0xfe, 0xcd, 0x36, 0x91, 0x93, 0x81, 0x26, 0xd2, 0x9c, 0xad, + 0x44, 0x13, 0x1b, 0xc8, 0xab, 0xa1, 0x06, 0xb2, 0x37, 0xa3, 0xee, 0xf4, 0xe6, 0xf1, 0x4b, 0x1e, + 0x2c, 0x1e, 0xd0, 0xf6, 0x3e, 0xf5, 0x6c, 0x87, 0x3b, 0xd4, 0x83, 0x7b, 0x60, 0x9e, 0x5f, 0xfb, + 0xf1, 0xa3, 0xdb, 0x8c, 0x13, 0x3a, 0xb9, 0xf6, 0xc9, 0x5d, 0xaf, 0xbe, 0x9a, 0xc5, 0x8a, 0x18, + 0x92, 0x68, 0xf8, 0x59, 0x92, 0x64, 0x4e, 0xf2, 0x3e, 0x1a, 0xdc, 0xee, 0xae, 0x57, 0x9f, 0x3a, + 0xc1, 0xf4, 0x44, 0x73, 0x30, 0x3d, 0x48, 0xc0, 0x92, 0x28, 0xe4, 0x71, 0x40, 0xdb, 0x7d, 0x77, + 0xe4, 0x67, 0x74, 0xc7, 0xba, 0x4a, 0x64, 0xe9, 0x30, 0x2b, 0x83, 0x06, 0x55, 0x21, 0x07, 0x50, + 0x04, 0x4e, 0x02, 0xec, 0xb1, 0xfe, 0xd1, 0x1e, 0xe2, 0xc4, 0x0d, 0xb5, 0x17, 0x3c, 0x1c, 0xd1, + 0x42, 0x63, 0xf4, 0xe1, 0xbb, 0xa0, 0x10, 0x10, 0xcc, 0xa8, 0x27, 0x1f, 0x75, 0x39, 0xad, 0x11, + 0x92, 0x51, 0xa4, 0x56, 0xe1, 0x63, 0x50, 0xec, 0x12, 0xc6, 0x70, 0x87, 0x54, 0x0b, 0x12, 0xb8, + 0xa2, 0x80, 0xc5, 0xa3, 0x7e, 0x18, 0xc5, 0xeb, 0x8d, 0x1f, 0x35, 0x50, 0xfc, 0x37, 0xe6, 0x40, + 0x6b, 0x70, 0x0e, 0xe8, 0xb3, 0x79, 0x72, 0xc2, 0x0c, 0xf8, 0x21, 0x2f, 0x93, 0x97, 0xfd, 0x7f, + 0x17, 0x54, 0x7c, 0x1c, 0x60, 0xd7, 0x25, 0xae, 0xc3, 0xba, 0x32, 0xff, 0x05, 0x73, 0x45, 0x74, + 0xad, 0xe3, 0x34, 0x8c, 0xb2, 0x18, 0x41, 0xb1, 0x68, 0xd7, 0x77, 0x89, 0xb8, 0xe0, 0xbe, 0x11, + 0x15, 0x65, 0x3f, 0x0d, 0xa3, 0x2c, 0x06, 0x3e, 0x07, 0xeb, 0xfd, 0x4e, 0x34, 0x3c, 0x35, 0xf2, + 0x72, 0x6a, 0xbc, 0x15, 0xf5, 0xea, 0xeb, 0xcf, 0xc6, 0x01, 0xd0, 0x78, 0x1e, 0xfc, 0x02, 0x94, + 0x18, 0x71, 0x89, 0xc5, 0x69, 0xa0, 0xec, 0xb3, 0x7b, 0xaf, 0x3b, 0xc7, 0x6d, 0xe2, 0xb6, 0x14, + 0xd1, 0x5c, 0x94, 0x53, 0x4e, 0x7d, 0xa1, 0x44, 0x10, 0x3e, 0x05, 0xcb, 0x5d, 0xec, 0x85, 0x38, + 0x41, 0x4a, 0xdf, 0x94, 0x4c, 0x18, 0xf5, 0xea, 0xcb, 0x47, 0x03, 0x2b, 0x68, 0x08, 0x29, 0x12, + 0xe3, 0xf1, 0x08, 0x29, 0xc8, 0xc4, 0xfe, 0xa6, 0x85, 0x1f, 0x53, 0x7b, 0x60, 0x6a, 0x24, 0x6e, + 0x48, 0x46, 0x46, 0x22, 0x28, 0x0a, 0x57, 0x4e, 0x67, 0xc5, 0x25, 0x00, 0x56, 0xfc, 0x9c, 0x99, + 0x9a, 0x17, 0x1f, 0xcc, 0x66, 0x90, 0xa4, 0x1d, 0xa4, 0x1d, 0x37, 0x09, 0x31, 0x94, 0x91, 0x87, + 0xa7, 0xa0, 0x2c, 0xa7, 0xb7, 0x7c, 0xb0, 0xb9, 0x19, 0x1f, 0xec, 0x52, 0xd4, 0xab, 0x97, 0x5b, + 0x31, 0x1d, 0xa5, 0x4a, 0xd0, 0x06, 0xcb, 0xa9, 0x4f, 0x1e, 0xd4, 0x78, 0x64, 0x51, 0xf6, 0x07, + 0x34, 0xd0, 0x90, 0xa6, 0x68, 0x00, 0x6a, 0xaa, 0xce, 0x4b, 0xb3, 0x4e, 0x1a, 0x93, 0x06, 0x28, + 0xb3, 0xd0, 0xb2, 0x08, 0xb1, 0x89, 0x2d, 0x6b, 0xbe, 0x60, 0xae, 0x29, 0x68, 0xb9, 0x15, 0x2f, + 0xa0, 0x14, 0x23, 0x84, 0xcf, 0xb0, 0xe3, 0x12, 0x5b, 0xd6, 0x3a, 0x23, 0xfc, 0x89, 0x8c, 0x22, + 0xb5, 0xda, 0xf8, 0x55, 0x03, 0xd9, 0x7f, 0x01, 0x6f, 0x70, 0x36, 0x9e, 0x67, 0xfc, 0x97, 0xfb, + 0xc7, 0x7f, 0x61, 0xa6, 0x99, 0xf1, 0x27, 0x0d, 0xac, 0x0c, 0xe1, 0xff, 0x6b, 0x33, 0xdf, 0x7c, + 0xef, 0xe6, 0xb6, 0x36, 0xf7, 0xfa, 0xb6, 0x36, 0xf7, 0xfb, 0x6d, 0x6d, 0xee, 0xeb, 0xa8, 0xa6, + 0xdd, 0x44, 0x35, 0xed, 0x75, 0x54, 0xd3, 0xfe, 0x88, 0x6a, 0xda, 0xb7, 0x7f, 0xd6, 0xe6, 0x5e, + 0x96, 0x62, 0x9d, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x1c, 0xb0, 0x5a, 0xe4, 0x0e, 0x00, + 0x00, } diff --git a/pkg/apis/batch/v2alpha1/generated.proto b/pkg/apis/batch/v2alpha1/generated.proto index ffa7f5ae4f9..46d1223c1e2 100644 --- a/pkg/apis/batch/v2alpha1/generated.proto +++ b/pkg/apis/batch/v2alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.batch.v2alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -54,7 +54,7 @@ message CronJobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of CronJob. repeated CronJob items = 2; @@ -92,7 +92,7 @@ message CronJobStatus { // LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScheduleTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScheduleTime = 4; } // Job represents the configuration of a single job. @@ -123,11 +123,11 @@ message JobCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -143,7 +143,7 @@ message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Job. repeated Job items = 2; @@ -177,7 +177,7 @@ message JobSpec { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -209,13 +209,13 @@ message JobStatus { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3; // Active is the number of actively running pods. // +optional diff --git a/pkg/apis/batch/v2alpha1/types.generated.go b/pkg/apis/batch/v2alpha1/types.generated.go index 8c4daef5dd2..c69dc1effc2 100644 --- a/pkg/apis/batch/v2alpha1/types.generated.go +++ b/pkg/apis/batch/v2alpha1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv53 := &x.ListMeta yym54 := z.DecBinary() @@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv60 := &x.ListMeta yym61 := z.DecBinary() @@ -1605,7 +1605,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym144 := z.DecBinary() _ = yym144 @@ -1747,7 +1747,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym156 := z.DecBinary() _ = yym156 @@ -2126,7 +2126,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym186 := z.DecBinary() _ = yym186 @@ -2147,7 +2147,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym188 := z.DecBinary() _ = yym188 @@ -2232,7 +2232,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym196 := z.DecBinary() _ = yym196 @@ -2263,7 +2263,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym198 := z.DecBinary() _ = yym198 @@ -2630,7 +2630,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv231 := &x.LastProbeTime yym232 := z.DecBinary() @@ -2647,7 +2647,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv233 := &x.LastTransitionTime yym234 := z.DecBinary() @@ -2732,7 +2732,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv240 := &x.LastProbeTime yym241 := z.DecBinary() @@ -2759,7 +2759,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv242 := &x.LastTransitionTime yym243 := z.DecBinary() @@ -3379,7 +3379,7 @@ func (x *CronJobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv298 := &x.ListMeta yym299 := z.DecBinary() @@ -3460,7 +3460,7 @@ func (x *CronJobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv305 := &x.ListMeta yym306 := z.DecBinary() @@ -4114,7 +4114,7 @@ func (x *CronJobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym362 := z.DecBinary() _ = yym362 @@ -4181,7 +4181,7 @@ func (x *CronJobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym367 := z.DecBinary() _ = yym367 diff --git a/pkg/apis/batch/v2alpha1/types.go b/pkg/apis/batch/v2alpha1/types.go index 18d73912b49..f83fff4cad0 100644 --- a/pkg/apis/batch/v2alpha1/types.go +++ b/pkg/apis/batch/v2alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v2alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/batch/validation/validation.go b/pkg/apis/batch/validation/validation.go index 22f72b8bdfd..c60696935a9 100644 --- a/pkg/apis/batch/validation/validation.go +++ b/pkg/apis/batch/validation/validation.go @@ -20,10 +20,10 @@ import ( "github.com/robfig/cron" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/validation/field" ) diff --git a/pkg/apis/batch/validation/validation_test.go b/pkg/apis/batch/validation/validation_test.go index 0c7b00663cb..016b9440ba9 100644 --- a/pkg/apis/batch/validation/validation_test.go +++ b/pkg/apis/batch/validation/validation_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/apis/certificates/types.generated.go b/pkg/apis/certificates/types.generated.go index 262d23819d1..fbc108750c4 100644 --- a/pkg/apis/certificates/types.generated.go +++ b/pkg/apis/certificates/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1253,7 +1253,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromMap(l int, d *co } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv104 := &x.LastUpdateTime yym105 := z.DecBinary() @@ -1342,7 +1342,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv110 := &x.LastUpdateTime yym111 := z.DecBinary() @@ -1594,7 +1594,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromMap(l int, d *codec19 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv133 := &x.ListMeta yym134 := z.DecBinary() @@ -1675,7 +1675,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromArray(l int, d *codec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv140 := &x.ListMeta yym141 := z.DecBinary() diff --git a/pkg/apis/certificates/v1alpha1/generated.pb.go b/pkg/apis/certificates/v1alpha1/generated.pb.go index c6f2e1d7412..b8e8e12e7e8 100644 --- a/pkg/apis/certificates/v1alpha1/generated.pb.go +++ b/pkg/apis/certificates/v1alpha1/generated.pb.go @@ -425,7 +425,7 @@ func (this *CertificateSigningRequestCondition) String() string { `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -435,7 +435,7 @@ func (this *CertificateSigningRequestList) String() string { return "nil" } s := strings.Join([]string{`&CertificateSigningRequestList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CertificateSigningRequest", "CertificateSigningRequest", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1277,49 +1277,49 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 700 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x4f, 0x13, 0x41, - 0x14, 0xef, 0xb6, 0xa5, 0xb4, 0x53, 0x04, 0x33, 0x31, 0xa6, 0x36, 0x61, 0x4b, 0x1a, 0x35, 0x55, - 0x61, 0xd6, 0x12, 0x4d, 0x38, 0x9a, 0xc5, 0xc4, 0x10, 0x21, 0xc4, 0x01, 0x12, 0x63, 0xe2, 0x61, - 0xba, 0x7d, 0x2c, 0x63, 0xd9, 0x3f, 0xec, 0xcc, 0x36, 0xe1, 0xe6, 0xd1, 0xa3, 0x9f, 0xc0, 0xaf, - 0xe1, 0x57, 0xe0, 0xc8, 0xd1, 0x53, 0x95, 0xf2, 0x05, 0x3c, 0x7b, 0x32, 0x3b, 0x9d, 0xfe, 0xb1, - 0x65, 0x51, 0x13, 0x6e, 0xfb, 0x7e, 0xf3, 0x7e, 0xbf, 0xdf, 0x7b, 0x6f, 0xde, 0x2c, 0x7a, 0xd1, - 0xd9, 0x10, 0x84, 0x07, 0x56, 0x27, 0x6e, 0x41, 0xe4, 0x83, 0x04, 0x61, 0x85, 0x1d, 0xd7, 0x62, - 0x21, 0x17, 0x96, 0x03, 0x91, 0xe4, 0x87, 0xdc, 0x61, 0x09, 0xda, 0x6d, 0xb2, 0xe3, 0xf0, 0x88, - 0x35, 0x2d, 0x17, 0x7c, 0x88, 0x98, 0x84, 0x36, 0x09, 0xa3, 0x40, 0x06, 0xf8, 0xe9, 0x40, 0x81, - 0x8c, 0x15, 0x48, 0xd8, 0x71, 0x49, 0xa2, 0x40, 0x26, 0x15, 0xc8, 0x50, 0xa1, 0xba, 0xe6, 0x72, - 0x79, 0x14, 0xb7, 0x88, 0x13, 0x78, 0x96, 0x1b, 0xb8, 0x81, 0xa5, 0x84, 0x5a, 0xf1, 0xa1, 0x8a, - 0x54, 0xa0, 0xbe, 0x06, 0x06, 0xd5, 0xf5, 0xd4, 0x12, 0xad, 0x08, 0x44, 0x10, 0x47, 0x0e, 0x4c, - 0x17, 0x55, 0x7d, 0x9e, 0xce, 0x89, 0xfd, 0x2e, 0x44, 0x82, 0x07, 0x3e, 0xb4, 0x67, 0x68, 0xab, - 0xe9, 0xb4, 0xee, 0x4c, 0xe7, 0xd5, 0xb5, 0xab, 0xb3, 0xa3, 0xd8, 0x97, 0xdc, 0x9b, 0xad, 0xe9, - 0xd9, 0xf5, 0xe9, 0xc2, 0x39, 0x02, 0x8f, 0xcd, 0xb0, 0x9a, 0x57, 0xb3, 0x62, 0xc9, 0x8f, 0x2d, - 0xee, 0x4b, 0x21, 0xa3, 0x69, 0x4a, 0xfd, 0x32, 0x8b, 0xee, 0x6d, 0x8e, 0x27, 0xbf, 0xc7, 0x5d, - 0x9f, 0xfb, 0x2e, 0x85, 0x93, 0x18, 0x84, 0xc4, 0x6f, 0x51, 0xd1, 0x03, 0xc9, 0xda, 0x4c, 0xb2, - 0x8a, 0xb1, 0x62, 0x34, 0xca, 0xeb, 0x0d, 0x92, 0x7a, 0x85, 0xa4, 0xdb, 0x24, 0xbb, 0xad, 0x0f, - 0xe0, 0xc8, 0x1d, 0x90, 0xcc, 0xc6, 0x67, 0xbd, 0x5a, 0xa6, 0xdf, 0xab, 0xa1, 0x31, 0x46, 0x47, - 0x6a, 0xf8, 0x04, 0xe5, 0x45, 0x08, 0x4e, 0x25, 0xab, 0x54, 0x77, 0xc9, 0xff, 0x2e, 0x06, 0x49, - 0x2d, 0x7a, 0x2f, 0x04, 0xc7, 0x5e, 0xd0, 0xe6, 0xf9, 0x24, 0xa2, 0xca, 0x0a, 0x9f, 0xa2, 0x82, - 0x90, 0x4c, 0xc6, 0xa2, 0x92, 0x53, 0xa6, 0x6f, 0x6e, 0xd2, 0x54, 0x09, 0xdb, 0x8b, 0xda, 0xb6, - 0x30, 0x88, 0xa9, 0x36, 0xac, 0x7f, 0xc9, 0xa2, 0x7a, 0x2a, 0x77, 0x33, 0xf0, 0xdb, 0x5c, 0xf2, - 0xc0, 0xc7, 0x1b, 0x28, 0x2f, 0x4f, 0x43, 0x50, 0xa3, 0x2e, 0xd9, 0xf7, 0x87, 0x3d, 0xec, 0x9f, - 0x86, 0xf0, 0xab, 0x57, 0xbb, 0x33, 0x9d, 0x9f, 0xe0, 0x54, 0x31, 0xf0, 0x43, 0x54, 0x88, 0x80, - 0x89, 0xc0, 0x57, 0x03, 0x2d, 0x8d, 0x0b, 0xa1, 0x0a, 0xa5, 0xfa, 0x14, 0x3f, 0x42, 0xf3, 0x1e, - 0x08, 0xc1, 0x5c, 0x50, 0x43, 0x28, 0xd9, 0x4b, 0x3a, 0x71, 0x7e, 0x67, 0x00, 0xd3, 0xe1, 0x39, - 0xee, 0xa0, 0xc5, 0x63, 0x26, 0xe4, 0x41, 0xd8, 0x66, 0x12, 0xf6, 0xb9, 0x07, 0x95, 0xbc, 0x1a, - 0xdb, 0x93, 0x6b, 0x36, 0x60, 0xe2, 0xbd, 0x90, 0x84, 0x62, 0xdf, 0xd5, 0xf2, 0x8b, 0xdb, 0x7f, - 0x48, 0xd1, 0x29, 0xe9, 0xfa, 0x4f, 0x03, 0x2d, 0xa7, 0x0e, 0x68, 0x9b, 0x0b, 0x89, 0xdf, 0xcf, - 0xac, 0xa2, 0xf5, 0x8f, 0x85, 0x24, 0x74, 0xb5, 0x91, 0xb7, 0x75, 0x31, 0xc5, 0x21, 0x32, 0xb1, - 0x8f, 0x21, 0x9a, 0xe3, 0x12, 0x3c, 0x51, 0xc9, 0xae, 0xe4, 0x1a, 0xe5, 0xf5, 0xd7, 0x37, 0xb8, - 0x1b, 0xf6, 0x2d, 0xed, 0x3b, 0xb7, 0x95, 0x38, 0xd0, 0x81, 0x51, 0xfd, 0xeb, 0x75, 0x2d, 0x27, - 0x6b, 0x8b, 0x1f, 0xa0, 0xf9, 0x68, 0x10, 0xaa, 0x8e, 0x17, 0xec, 0x72, 0x72, 0x51, 0x3a, 0x83, - 0x0e, 0xcf, 0xf0, 0x2a, 0x2a, 0xc6, 0x02, 0x22, 0x9f, 0x79, 0xa0, 0x6f, 0x7f, 0xd4, 0xe8, 0x81, - 0xc6, 0xe9, 0x28, 0x03, 0x2f, 0xa3, 0x5c, 0xcc, 0xdb, 0xfa, 0xf6, 0xcb, 0x3a, 0x31, 0x77, 0xb0, - 0xf5, 0x92, 0x26, 0x38, 0xae, 0xa3, 0x82, 0x1b, 0x05, 0x71, 0x28, 0x2a, 0xf9, 0x95, 0x5c, 0xa3, - 0x64, 0xa3, 0x64, 0x89, 0x5e, 0x29, 0x84, 0xea, 0x93, 0xfa, 0x77, 0x03, 0xd5, 0xfe, 0xf2, 0x12, - 0xf0, 0x27, 0x03, 0x21, 0x67, 0xb8, 0xa8, 0xa2, 0x62, 0xa8, 0xa9, 0xee, 0xdf, 0xe0, 0x54, 0x47, - 0xaf, 0x60, 0xfc, 0xa3, 0x19, 0x41, 0x82, 0x4e, 0x78, 0xe3, 0x26, 0x2a, 0x4f, 0x68, 0xab, 0x11, - 0x2d, 0xd8, 0x4b, 0xfd, 0x5e, 0xad, 0x3c, 0x21, 0x4e, 0x27, 0x73, 0xec, 0xc7, 0x67, 0x17, 0x66, - 0xe6, 0xfc, 0xc2, 0xcc, 0x7c, 0xbb, 0x30, 0x33, 0x1f, 0xfb, 0xa6, 0x71, 0xd6, 0x37, 0x8d, 0xf3, - 0xbe, 0x69, 0xfc, 0xe8, 0x9b, 0xc6, 0xe7, 0x4b, 0x33, 0xf3, 0xae, 0x38, 0xac, 0xf0, 0x77, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xa5, 0xb0, 0x36, 0xc9, 0x16, 0x07, 0x00, 0x00, + // 691 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x4f, 0x13, 0x4f, + 0x18, 0xee, 0xb6, 0xa5, 0xb4, 0x53, 0x7e, 0xf0, 0xcb, 0xc4, 0x98, 0x4a, 0xc2, 0x96, 0x34, 0x6a, + 0xaa, 0x81, 0x59, 0x4b, 0x3c, 0x70, 0x34, 0x8b, 0x89, 0x21, 0x42, 0x88, 0x03, 0x24, 0x86, 0xdb, + 0x74, 0xfb, 0xb2, 0x1d, 0xcb, 0xfe, 0x61, 0x67, 0x96, 0x84, 0x9b, 0x47, 0x8f, 0xde, 0xfd, 0x20, + 0x7e, 0x05, 0x8e, 0x1c, 0x3d, 0x55, 0x29, 0x67, 0xbf, 0x80, 0x27, 0x33, 0xd3, 0xe9, 0x1f, 0x5b, + 0x0a, 0x9a, 0x70, 0xeb, 0xfb, 0xcc, 0xfb, 0x3e, 0xcf, 0xfb, 0xe7, 0xe9, 0xa2, 0x57, 0x9d, 0x4d, + 0x41, 0x78, 0xe4, 0x74, 0xd2, 0x26, 0x24, 0x21, 0x48, 0x10, 0x4e, 0xdc, 0xf1, 0x1d, 0x16, 0x73, + 0xe1, 0x78, 0x90, 0x48, 0x7e, 0xcc, 0x3d, 0xa6, 0xd0, 0xb3, 0x06, 0x3b, 0x89, 0xdb, 0xac, 0xe1, + 0xf8, 0x10, 0x42, 0xc2, 0x24, 0xb4, 0x48, 0x9c, 0x44, 0x32, 0xc2, 0x2f, 0xfa, 0x0c, 0x64, 0xc4, + 0x40, 0xe2, 0x8e, 0x4f, 0x14, 0x03, 0x19, 0x67, 0x20, 0x03, 0x86, 0xe5, 0x75, 0x9f, 0xcb, 0x76, + 0xda, 0x24, 0x5e, 0x14, 0x38, 0x7e, 0xe4, 0x47, 0x8e, 0x26, 0x6a, 0xa6, 0xc7, 0x3a, 0xd2, 0x81, + 0xfe, 0xd5, 0x17, 0x58, 0xde, 0x98, 0xd9, 0xa2, 0x93, 0x80, 0x88, 0xd2, 0xc4, 0x83, 0xc9, 0xa6, + 0x96, 0xd7, 0x66, 0xd7, 0x9c, 0x4d, 0x8d, 0x70, 0x8b, 0x82, 0x70, 0x02, 0x90, 0xec, 0xa6, 0x9a, + 0xf5, 0x9b, 0x6b, 0x92, 0x34, 0x94, 0x3c, 0x98, 0x6e, 0xe8, 0xe5, 0xed, 0xe9, 0xc2, 0x6b, 0x43, + 0xc0, 0xa6, 0xaa, 0x1a, 0x37, 0x57, 0xa5, 0x92, 0x9f, 0x38, 0x3c, 0x94, 0x42, 0x26, 0x93, 0x25, + 0xb5, 0xeb, 0x2c, 0x7a, 0xb4, 0x35, 0x5a, 0xfb, 0x3e, 0xf7, 0x43, 0x1e, 0xfa, 0x14, 0x4e, 0x53, + 0x10, 0x12, 0xbf, 0x47, 0x45, 0x35, 0x50, 0x8b, 0x49, 0x56, 0xb1, 0x56, 0xad, 0x7a, 0x79, 0xa3, + 0x4e, 0x66, 0xde, 0x8f, 0x9c, 0x35, 0xc8, 0x5e, 0xf3, 0x03, 0x78, 0x72, 0x17, 0x24, 0x73, 0xf1, + 0x45, 0xb7, 0x9a, 0xe9, 0x75, 0xab, 0x68, 0x84, 0xd1, 0x21, 0x1b, 0x3e, 0x45, 0x79, 0x11, 0x83, + 0x57, 0xc9, 0x6a, 0xd6, 0x3d, 0xf2, 0xaf, 0xae, 0x20, 0x33, 0x9b, 0xde, 0x8f, 0xc1, 0x73, 0x17, + 0x8c, 0x78, 0x5e, 0x45, 0x54, 0x4b, 0xe1, 0x73, 0x54, 0x10, 0x92, 0xc9, 0x54, 0x54, 0x72, 0x5a, + 0xf4, 0xdd, 0x7d, 0x8a, 0x6a, 0x62, 0x77, 0xd1, 0xc8, 0x16, 0xfa, 0x31, 0x35, 0x82, 0xb5, 0x2f, + 0x59, 0x54, 0x9b, 0x59, 0xbb, 0x15, 0x85, 0x2d, 0x2e, 0x79, 0x14, 0xe2, 0x4d, 0x94, 0x97, 0xe7, + 0x31, 0xe8, 0x55, 0x97, 0xdc, 0xc7, 0x83, 0x19, 0x0e, 0xce, 0x63, 0xf8, 0xd5, 0xad, 0x3e, 0x98, + 0xcc, 0x57, 0x38, 0xd5, 0x15, 0xf8, 0x29, 0x2a, 0x24, 0xc0, 0x44, 0x14, 0xea, 0x85, 0x96, 0x46, + 0x8d, 0x50, 0x8d, 0x52, 0xf3, 0x8a, 0x9f, 0xa1, 0xf9, 0x00, 0x84, 0x60, 0x3e, 0xe8, 0x25, 0x94, + 0xdc, 0x25, 0x93, 0x38, 0xbf, 0xdb, 0x87, 0xe9, 0xe0, 0x1d, 0xb7, 0xd1, 0xe2, 0x09, 0x13, 0xf2, + 0x30, 0x6e, 0x31, 0x09, 0x07, 0x3c, 0x80, 0x4a, 0xfe, 0x2e, 0x07, 0x08, 0xa2, 0xee, 0xab, 0x7c, + 0xa0, 0xf2, 0xdd, 0x87, 0x86, 0x7b, 0x71, 0xe7, 0x0f, 0x1e, 0x3a, 0xc1, 0x5b, 0xfb, 0x69, 0xa1, + 0x95, 0x99, 0xdb, 0xd9, 0xe1, 0x42, 0xe2, 0xa3, 0x29, 0x1f, 0xae, 0xfd, 0x4d, 0x17, 0xaa, 0x56, + 0x7b, 0xf1, 0x7f, 0xd3, 0x49, 0x71, 0x80, 0x8c, 0x39, 0x31, 0x46, 0x73, 0x5c, 0x42, 0x20, 0x2a, + 0xd9, 0xd5, 0x5c, 0xbd, 0xbc, 0xf1, 0xf6, 0x1e, 0x5d, 0xe1, 0xfe, 0x67, 0x74, 0xe7, 0xb6, 0x95, + 0x02, 0xed, 0x0b, 0xd5, 0xbe, 0xde, 0x36, 0xaf, 0x32, 0x2c, 0x7e, 0x82, 0xe6, 0x93, 0x7e, 0xa8, + 0xc7, 0x5d, 0x70, 0xcb, 0xea, 0x44, 0x26, 0x83, 0x0e, 0xde, 0xf0, 0x1a, 0x2a, 0xa6, 0x02, 0x92, + 0x90, 0x05, 0x60, 0xee, 0x3e, 0x1c, 0xf4, 0xd0, 0xe0, 0x74, 0x98, 0x81, 0x57, 0x50, 0x2e, 0xe5, + 0x2d, 0x73, 0xf7, 0xb2, 0x49, 0xcc, 0x1d, 0x6e, 0xbf, 0xa6, 0x0a, 0xc7, 0x35, 0x54, 0xf0, 0x93, + 0x28, 0x8d, 0x45, 0x25, 0xbf, 0x9a, 0xab, 0x97, 0x5c, 0xa4, 0xec, 0xf3, 0x46, 0x23, 0xd4, 0xbc, + 0xd4, 0xbe, 0x5b, 0xa8, 0x7a, 0xc7, 0x7f, 0x00, 0x7f, 0xb2, 0x10, 0xf2, 0x06, 0x16, 0x15, 0x15, + 0x4b, 0x6f, 0xf5, 0xe0, 0x1e, 0xb7, 0x3a, 0xf4, 0xff, 0xe8, 0x13, 0x33, 0x84, 0x04, 0x1d, 0xd3, + 0xc6, 0x0d, 0x54, 0x1e, 0xe3, 0xd6, 0x2b, 0x5a, 0x70, 0x97, 0x7a, 0xdd, 0x6a, 0x79, 0x8c, 0x9c, + 0x8e, 0xe7, 0xb8, 0xcf, 0x2f, 0xae, 0xec, 0xcc, 0xe5, 0x95, 0x9d, 0xf9, 0x76, 0x65, 0x67, 0x3e, + 0xf6, 0x6c, 0xeb, 0xa2, 0x67, 0x5b, 0x97, 0x3d, 0xdb, 0xfa, 0xd1, 0xb3, 0xad, 0xcf, 0xd7, 0x76, + 0xe6, 0xa8, 0x38, 0xe8, 0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x02, 0x0e, 0x3c, 0x0d, + 0x07, 0x00, 0x00, } diff --git a/pkg/apis/certificates/v1alpha1/generated.proto b/pkg/apis/certificates/v1alpha1/generated.proto index 6939a912fa3..ae88f9f6e9e 100644 --- a/pkg/apis/certificates/v1alpha1/generated.proto +++ b/pkg/apis/certificates/v1alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.certificates.v1alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -59,12 +59,12 @@ message CertificateSigningRequestCondition { // timestamp for the last update to this condition // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastUpdateTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastUpdateTime = 4; } message CertificateSigningRequestList { // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; repeated CertificateSigningRequest items = 2; } diff --git a/pkg/apis/certificates/v1alpha1/register.go b/pkg/apis/certificates/v1alpha1/register.go index 6cc4ce41261..04798dd6fb3 100644 --- a/pkg/apis/certificates/v1alpha1/register.go +++ b/pkg/apis/certificates/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/certificates/v1alpha1/types.generated.go b/pkg/apis/certificates/v1alpha1/types.generated.go index a0d7b735f15..44658c2bdd5 100644 --- a/pkg/apis/certificates/v1alpha1/types.generated.go +++ b/pkg/apis/certificates/v1alpha1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1253,7 +1253,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromMap(l int, d *co } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv104 := &x.LastUpdateTime yym105 := z.DecBinary() @@ -1342,7 +1342,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv110 := &x.LastUpdateTime yym111 := z.DecBinary() @@ -1587,7 +1587,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromMap(l int, d *codec19 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv133 := &x.ListMeta yym134 := z.DecBinary() @@ -1668,7 +1668,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromArray(l int, d *codec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv140 := &x.ListMeta yym141 := z.DecBinary() diff --git a/pkg/apis/certificates/v1alpha1/types.go b/pkg/apis/certificates/v1alpha1/types.go index 2b04da43816..cf9e4f09022 100644 --- a/pkg/apis/certificates/v1alpha1/types.go +++ b/pkg/apis/certificates/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/componentconfig/types.generated.go b/pkg/apis/componentconfig/types.generated.go index be357cb7efe..e2375601186 100644 --- a/pkg/apis/componentconfig/types.generated.go +++ b/pkg/apis/componentconfig/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_config "k8s.io/kubernetes/pkg/util/config" "reflect" "runtime" @@ -62,7 +62,7 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta + var v0 pkg1_v1.TypeMeta var v1 pkg2_config.ConfigurationMap var v2 time.Duration _, _, _ = v0, v1, v2 @@ -721,7 +721,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "iptablesSyncPeriodSeconds": if r.TryDecodeAsNil() { - x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesSyncPeriod = pkg1_v1.Duration{} } else { yyv96 := &x.IPTablesSyncPeriod yym97 := z.DecBinary() @@ -736,7 +736,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "iptablesMinSyncPeriodSeconds": if r.TryDecodeAsNil() { - x.IPTablesMinSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesMinSyncPeriod = pkg1_v1.Duration{} } else { yyv98 := &x.IPTablesMinSyncPeriod yym99 := z.DecBinary() @@ -803,7 +803,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "udpTimeoutMilliseconds": if r.TryDecodeAsNil() { - x.UDPIdleTimeout = pkg1_unversioned.Duration{} + x.UDPIdleTimeout = pkg1_v1.Duration{} } else { yyv108 := &x.UDPIdleTimeout yym109 := z.DecBinary() @@ -836,7 +836,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "conntrackTCPEstablishedTimeout": if r.TryDecodeAsNil() { - x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPEstablishedTimeout = pkg1_v1.Duration{} } else { yyv113 := &x.ConntrackTCPEstablishedTimeout yym114 := z.DecBinary() @@ -851,7 +851,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "conntrackTCPCloseWaitTimeout": if r.TryDecodeAsNil() { - x.ConntrackTCPCloseWaitTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPCloseWaitTimeout = pkg1_v1.Duration{} } else { yyv115 := &x.ConntrackTCPCloseWaitTimeout yym116 := z.DecBinary() @@ -1028,7 +1028,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesSyncPeriod = pkg1_v1.Duration{} } else { yyv127 := &x.IPTablesSyncPeriod yym128 := z.DecBinary() @@ -1053,7 +1053,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.IPTablesMinSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesMinSyncPeriod = pkg1_v1.Duration{} } else { yyv129 := &x.IPTablesMinSyncPeriod yym130 := z.DecBinary() @@ -1200,7 +1200,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.UDPIdleTimeout = pkg1_unversioned.Duration{} + x.UDPIdleTimeout = pkg1_v1.Duration{} } else { yyv139 := &x.UDPIdleTimeout yym140 := z.DecBinary() @@ -1273,7 +1273,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPEstablishedTimeout = pkg1_v1.Duration{} } else { yyv144 := &x.ConntrackTCPEstablishedTimeout yym145 := z.DecBinary() @@ -1298,7 +1298,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ConntrackTCPCloseWaitTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPCloseWaitTimeout = pkg1_v1.Duration{} } else { yyv146 := &x.ConntrackTCPCloseWaitTimeout yym147 := z.DecBinary() @@ -3958,7 +3958,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "syncFrequency": if r.TryDecodeAsNil() { - x.SyncFrequency = pkg1_unversioned.Duration{} + x.SyncFrequency = pkg1_v1.Duration{} } else { yyv521 := &x.SyncFrequency yym522 := z.DecBinary() @@ -3973,7 +3973,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "fileCheckFrequency": if r.TryDecodeAsNil() { - x.FileCheckFrequency = pkg1_unversioned.Duration{} + x.FileCheckFrequency = pkg1_v1.Duration{} } else { yyv523 := &x.FileCheckFrequency yym524 := z.DecBinary() @@ -3988,7 +3988,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "httpCheckFrequency": if r.TryDecodeAsNil() { - x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + x.HTTPCheckFrequency = pkg1_v1.Duration{} } else { yyv525 := &x.HTTPCheckFrequency yym526 := z.DecBinary() @@ -4173,7 +4173,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "minimumGCAge": if r.TryDecodeAsNil() { - x.MinimumGCAge = pkg1_unversioned.Duration{} + x.MinimumGCAge = pkg1_v1.Duration{} } else { yyv555 := &x.MinimumGCAge yym556 := z.DecBinary() @@ -4248,7 +4248,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "streamingConnectionIdleTimeout": if r.TryDecodeAsNil() { - x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} + x.StreamingConnectionIdleTimeout = pkg1_v1.Duration{} } else { yyv567 := &x.StreamingConnectionIdleTimeout yym568 := z.DecBinary() @@ -4263,7 +4263,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "nodeStatusUpdateFrequency": if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} + x.NodeStatusUpdateFrequency = pkg1_v1.Duration{} } else { yyv569 := &x.NodeStatusUpdateFrequency yym570 := z.DecBinary() @@ -4278,7 +4278,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "imageMinimumGCAge": if r.TryDecodeAsNil() { - x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + x.ImageMinimumGCAge = pkg1_v1.Duration{} } else { yyv571 := &x.ImageMinimumGCAge yym572 := z.DecBinary() @@ -4311,7 +4311,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "volumeStatsAggPeriod": if r.TryDecodeAsNil() { - x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} + x.VolumeStatsAggPeriod = pkg1_v1.Duration{} } else { yyv576 := &x.VolumeStatsAggPeriod yym577 := z.DecBinary() @@ -4428,7 +4428,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "runtimeRequestTimeout": if r.TryDecodeAsNil() { - x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} + x.RuntimeRequestTimeout = pkg1_v1.Duration{} } else { yyv595 := &x.RuntimeRequestTimeout yym596 := z.DecBinary() @@ -4575,7 +4575,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "outOfDiskTransitionFrequency": if r.TryDecodeAsNil() { - x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} + x.OutOfDiskTransitionFrequency = pkg1_v1.Duration{} } else { yyv619 := &x.OutOfDiskTransitionFrequency yym620 := z.DecBinary() @@ -4638,7 +4638,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "evictionPressureTransitionPeriod": if r.TryDecodeAsNil() { - x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} + x.EvictionPressureTransitionPeriod = pkg1_v1.Duration{} } else { yyv629 := &x.EvictionPressureTransitionPeriod yym630 := z.DecBinary() @@ -4835,7 +4835,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.SyncFrequency = pkg1_unversioned.Duration{} + x.SyncFrequency = pkg1_v1.Duration{} } else { yyv653 := &x.SyncFrequency yym654 := z.DecBinary() @@ -4860,7 +4860,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FileCheckFrequency = pkg1_unversioned.Duration{} + x.FileCheckFrequency = pkg1_v1.Duration{} } else { yyv655 := &x.FileCheckFrequency yym656 := z.DecBinary() @@ -4885,7 +4885,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + x.HTTPCheckFrequency = pkg1_v1.Duration{} } else { yyv657 := &x.HTTPCheckFrequency yym658 := z.DecBinary() @@ -5330,7 +5330,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MinimumGCAge = pkg1_unversioned.Duration{} + x.MinimumGCAge = pkg1_v1.Duration{} } else { yyv687 := &x.MinimumGCAge yym688 := z.DecBinary() @@ -5515,7 +5515,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} + x.StreamingConnectionIdleTimeout = pkg1_v1.Duration{} } else { yyv699 := &x.StreamingConnectionIdleTimeout yym700 := z.DecBinary() @@ -5540,7 +5540,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} + x.NodeStatusUpdateFrequency = pkg1_v1.Duration{} } else { yyv701 := &x.NodeStatusUpdateFrequency yym702 := z.DecBinary() @@ -5565,7 +5565,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + x.ImageMinimumGCAge = pkg1_v1.Duration{} } else { yyv703 := &x.ImageMinimumGCAge yym704 := z.DecBinary() @@ -5638,7 +5638,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} + x.VolumeStatsAggPeriod = pkg1_v1.Duration{} } else { yyv708 := &x.VolumeStatsAggPeriod yym709 := z.DecBinary() @@ -5935,7 +5935,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} + x.RuntimeRequestTimeout = pkg1_v1.Duration{} } else { yyv727 := &x.RuntimeRequestTimeout yym728 := z.DecBinary() @@ -6312,7 +6312,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} + x.OutOfDiskTransitionFrequency = pkg1_v1.Duration{} } else { yyv751 := &x.OutOfDiskTransitionFrequency yym752 := z.DecBinary() @@ -6455,7 +6455,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} + x.EvictionPressureTransitionPeriod = pkg1_v1.Duration{} } else { yyv761 := &x.EvictionPressureTransitionPeriod yym762 := z.DecBinary() @@ -7104,7 +7104,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromMap(l int, d *codec1978 switch yys811 { case "cacheAuthorizedTTL": if r.TryDecodeAsNil() { - x.CacheAuthorizedTTL = pkg1_unversioned.Duration{} + x.CacheAuthorizedTTL = pkg1_v1.Duration{} } else { yyv812 := &x.CacheAuthorizedTTL yym813 := z.DecBinary() @@ -7119,7 +7119,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromMap(l int, d *codec1978 } case "cacheUnauthorizedTTL": if r.TryDecodeAsNil() { - x.CacheUnauthorizedTTL = pkg1_unversioned.Duration{} + x.CacheUnauthorizedTTL = pkg1_v1.Duration{} } else { yyv814 := &x.CacheUnauthorizedTTL yym815 := z.DecBinary() @@ -7158,7 +7158,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CacheAuthorizedTTL = pkg1_unversioned.Duration{} + x.CacheAuthorizedTTL = pkg1_v1.Duration{} } else { yyv817 := &x.CacheAuthorizedTTL yym818 := z.DecBinary() @@ -7183,7 +7183,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CacheUnauthorizedTTL = pkg1_unversioned.Duration{} + x.CacheUnauthorizedTTL = pkg1_v1.Duration{} } else { yyv819 := &x.CacheUnauthorizedTTL yym820 := z.DecBinary() @@ -7745,7 +7745,7 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromMap(l int, d *codec197 } case "cacheTTL": if r.TryDecodeAsNil() { - x.CacheTTL = pkg1_unversioned.Duration{} + x.CacheTTL = pkg1_v1.Duration{} } else { yyv867 := &x.CacheTTL yym868 := z.DecBinary() @@ -7800,7 +7800,7 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromArray(l int, d *codec1 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CacheTTL = pkg1_unversioned.Duration{} + x.CacheTTL = pkg1_v1.Duration{} } else { yyv871 := &x.CacheTTL yym872 := z.DecBinary() @@ -8934,7 +8934,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } case "leaseDuration": if r.TryDecodeAsNil() { - x.LeaseDuration = pkg1_unversioned.Duration{} + x.LeaseDuration = pkg1_v1.Duration{} } else { yyv989 := &x.LeaseDuration yym990 := z.DecBinary() @@ -8949,7 +8949,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } case "renewDeadline": if r.TryDecodeAsNil() { - x.RenewDeadline = pkg1_unversioned.Duration{} + x.RenewDeadline = pkg1_v1.Duration{} } else { yyv991 := &x.RenewDeadline yym992 := z.DecBinary() @@ -8964,7 +8964,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } case "retryPeriod": if r.TryDecodeAsNil() { - x.RetryPeriod = pkg1_unversioned.Duration{} + x.RetryPeriod = pkg1_v1.Duration{} } else { yyv993 := &x.RetryPeriod yym994 := z.DecBinary() @@ -9019,7 +9019,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LeaseDuration = pkg1_unversioned.Duration{} + x.LeaseDuration = pkg1_v1.Duration{} } else { yyv997 := &x.LeaseDuration yym998 := z.DecBinary() @@ -9044,7 +9044,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RenewDeadline = pkg1_unversioned.Duration{} + x.RenewDeadline = pkg1_v1.Duration{} } else { yyv999 := &x.RenewDeadline yym1000 := z.DecBinary() @@ -9069,7 +9069,7 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RetryPeriod = pkg1_unversioned.Duration{} + x.RetryPeriod = pkg1_v1.Duration{} } else { yyv1001 := &x.RetryPeriod yym1002 := z.DecBinary() @@ -10580,7 +10580,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "serviceSyncPeriod": if r.TryDecodeAsNil() { - x.ServiceSyncPeriod = pkg1_unversioned.Duration{} + x.ServiceSyncPeriod = pkg1_v1.Duration{} } else { yyv1239 := &x.ServiceSyncPeriod yym1240 := z.DecBinary() @@ -10595,7 +10595,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeSyncPeriod": if r.TryDecodeAsNil() { - x.NodeSyncPeriod = pkg1_unversioned.Duration{} + x.NodeSyncPeriod = pkg1_v1.Duration{} } else { yyv1241 := &x.NodeSyncPeriod yym1242 := z.DecBinary() @@ -10610,7 +10610,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "routeReconciliationPeriod": if r.TryDecodeAsNil() { - x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} + x.RouteReconciliationPeriod = pkg1_v1.Duration{} } else { yyv1243 := &x.RouteReconciliationPeriod yym1244 := z.DecBinary() @@ -10625,7 +10625,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "resourceQuotaSyncPeriod": if r.TryDecodeAsNil() { - x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} + x.ResourceQuotaSyncPeriod = pkg1_v1.Duration{} } else { yyv1245 := &x.ResourceQuotaSyncPeriod yym1246 := z.DecBinary() @@ -10640,7 +10640,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "namespaceSyncPeriod": if r.TryDecodeAsNil() { - x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} + x.NamespaceSyncPeriod = pkg1_v1.Duration{} } else { yyv1247 := &x.NamespaceSyncPeriod yym1248 := z.DecBinary() @@ -10655,7 +10655,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "pvClaimBinderSyncPeriod": if r.TryDecodeAsNil() { - x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} + x.PVClaimBinderSyncPeriod = pkg1_v1.Duration{} } else { yyv1249 := &x.PVClaimBinderSyncPeriod yym1250 := z.DecBinary() @@ -10670,7 +10670,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "minResyncPeriod": if r.TryDecodeAsNil() { - x.MinResyncPeriod = pkg1_unversioned.Duration{} + x.MinResyncPeriod = pkg1_v1.Duration{} } else { yyv1251 := &x.MinResyncPeriod yym1252 := z.DecBinary() @@ -10691,7 +10691,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "horizontalPodAutoscalerSyncPeriod": if r.TryDecodeAsNil() { - x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} + x.HorizontalPodAutoscalerSyncPeriod = pkg1_v1.Duration{} } else { yyv1254 := &x.HorizontalPodAutoscalerSyncPeriod yym1255 := z.DecBinary() @@ -10706,7 +10706,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "deploymentControllerSyncPeriod": if r.TryDecodeAsNil() { - x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + x.DeploymentControllerSyncPeriod = pkg1_v1.Duration{} } else { yyv1256 := &x.DeploymentControllerSyncPeriod yym1257 := z.DecBinary() @@ -10721,7 +10721,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "podEvictionTimeout": if r.TryDecodeAsNil() { - x.PodEvictionTimeout = pkg1_unversioned.Duration{} + x.PodEvictionTimeout = pkg1_v1.Duration{} } else { yyv1258 := &x.PodEvictionTimeout yym1259 := z.DecBinary() @@ -10748,7 +10748,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeMonitorGracePeriod": if r.TryDecodeAsNil() { - x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} + x.NodeMonitorGracePeriod = pkg1_v1.Duration{} } else { yyv1262 := &x.NodeMonitorGracePeriod yym1263 := z.DecBinary() @@ -10769,7 +10769,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeStartupGracePeriod": if r.TryDecodeAsNil() { - x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} + x.NodeStartupGracePeriod = pkg1_v1.Duration{} } else { yyv1265 := &x.NodeStartupGracePeriod yym1266 := z.DecBinary() @@ -10784,7 +10784,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeMonitorPeriod": if r.TryDecodeAsNil() { - x.NodeMonitorPeriod = pkg1_unversioned.Duration{} + x.NodeMonitorPeriod = pkg1_v1.Duration{} } else { yyv1267 := &x.NodeMonitorPeriod yym1268 := z.DecBinary() @@ -10903,7 +10903,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "controllerStartInterval": if r.TryDecodeAsNil() { - x.ControllerStartInterval = pkg1_unversioned.Duration{} + x.ControllerStartInterval = pkg1_v1.Duration{} } else { yyv1286 := &x.ControllerStartInterval yym1287 := z.DecBinary() @@ -11298,7 +11298,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ServiceSyncPeriod = pkg1_unversioned.Duration{} + x.ServiceSyncPeriod = pkg1_v1.Duration{} } else { yyv1315 := &x.ServiceSyncPeriod yym1316 := z.DecBinary() @@ -11323,7 +11323,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeSyncPeriod = pkg1_unversioned.Duration{} + x.NodeSyncPeriod = pkg1_v1.Duration{} } else { yyv1317 := &x.NodeSyncPeriod yym1318 := z.DecBinary() @@ -11348,7 +11348,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} + x.RouteReconciliationPeriod = pkg1_v1.Duration{} } else { yyv1319 := &x.RouteReconciliationPeriod yym1320 := z.DecBinary() @@ -11373,7 +11373,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} + x.ResourceQuotaSyncPeriod = pkg1_v1.Duration{} } else { yyv1321 := &x.ResourceQuotaSyncPeriod yym1322 := z.DecBinary() @@ -11398,7 +11398,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} + x.NamespaceSyncPeriod = pkg1_v1.Duration{} } else { yyv1323 := &x.NamespaceSyncPeriod yym1324 := z.DecBinary() @@ -11423,7 +11423,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} + x.PVClaimBinderSyncPeriod = pkg1_v1.Duration{} } else { yyv1325 := &x.PVClaimBinderSyncPeriod yym1326 := z.DecBinary() @@ -11448,7 +11448,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MinResyncPeriod = pkg1_unversioned.Duration{} + x.MinResyncPeriod = pkg1_v1.Duration{} } else { yyv1327 := &x.MinResyncPeriod yym1328 := z.DecBinary() @@ -11489,7 +11489,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} + x.HorizontalPodAutoscalerSyncPeriod = pkg1_v1.Duration{} } else { yyv1330 := &x.HorizontalPodAutoscalerSyncPeriod yym1331 := z.DecBinary() @@ -11514,7 +11514,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + x.DeploymentControllerSyncPeriod = pkg1_v1.Duration{} } else { yyv1332 := &x.DeploymentControllerSyncPeriod yym1333 := z.DecBinary() @@ -11539,7 +11539,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PodEvictionTimeout = pkg1_unversioned.Duration{} + x.PodEvictionTimeout = pkg1_v1.Duration{} } else { yyv1334 := &x.PodEvictionTimeout yym1335 := z.DecBinary() @@ -11596,7 +11596,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} + x.NodeMonitorGracePeriod = pkg1_v1.Duration{} } else { yyv1338 := &x.NodeMonitorGracePeriod yym1339 := z.DecBinary() @@ -11637,7 +11637,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} + x.NodeStartupGracePeriod = pkg1_v1.Duration{} } else { yyv1341 := &x.NodeStartupGracePeriod yym1342 := z.DecBinary() @@ -11662,7 +11662,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeMonitorPeriod = pkg1_unversioned.Duration{} + x.NodeMonitorPeriod = pkg1_v1.Duration{} } else { yyv1343 := &x.NodeMonitorPeriod yym1344 := z.DecBinary() @@ -11961,7 +11961,7 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ControllerStartInterval = pkg1_unversioned.Duration{} + x.ControllerStartInterval = pkg1_v1.Duration{} } else { yyv1362 := &x.ControllerStartInterval yym1363 := z.DecBinary() diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go index 5ecd0eccf67..24514b8f515 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.go +++ b/pkg/apis/componentconfig/v1alpha1/types.go @@ -16,7 +16,9 @@ limitations under the License. package v1alpha1 -import ( metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) +import ( + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" +) type KubeProxyConfiguration struct { metav1.TypeMeta diff --git a/pkg/apis/extensions/register.go b/pkg/apis/extensions/register.go index 993e7449d35..e29ad885a50 100644 --- a/pkg/apis/extensions/register.go +++ b/pkg/apis/extensions/register.go @@ -18,9 +18,9 @@ package extensions import ( "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/apis/extensions/types.generated.go b/pkg/apis/extensions/types.generated.go index 61937a334cd..008807d9582 100644 --- a/pkg/apis/extensions/types.generated.go +++ b/pkg/apis/extensions/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -67,7 +67,7 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.LabelSelector + var v2 pkg1_v1.LabelSelector var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -403,7 +403,7 @@ func (x *ScaleStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym25 := z.DecBinary() _ = yym25 @@ -460,7 +460,7 @@ func (x *ScaleStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym29 := z.DecBinary() _ = yym29 @@ -2457,7 +2457,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv197 := &x.ListMeta yym198 := z.DecBinary() @@ -2538,7 +2538,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv204 := &x.ListMeta yym205 := z.DecBinary() @@ -3769,7 +3769,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym314 := z.DecBinary() _ = yym314 @@ -3895,7 +3895,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym327 := z.DecBinary() _ = yym327 @@ -5818,7 +5818,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv486 := &x.LastUpdateTime yym487 := z.DecBinary() @@ -5835,7 +5835,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv488 := &x.LastTransitionTime yym489 := z.DecBinary() @@ -5920,7 +5920,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv495 := &x.LastUpdateTime yym496 := z.DecBinary() @@ -5947,7 +5947,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv497 := &x.LastTransitionTime yym498 := z.DecBinary() @@ -6224,7 +6224,7 @@ func (x *DeploymentList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv522 := &x.ListMeta yym523 := z.DecBinary() @@ -6305,7 +6305,7 @@ func (x *DeploymentList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv529 := &x.ListMeta yym530 := z.DecBinary() @@ -6499,7 +6499,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym545 := z.DecBinary() _ = yym545 @@ -6547,7 +6547,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym549 := z.DecBinary() _ = yym549 @@ -7432,7 +7432,7 @@ func (x *DaemonSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv629 := &x.ListMeta yym630 := z.DecBinary() @@ -7513,7 +7513,7 @@ func (x *DaemonSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv636 := &x.ListMeta yym637 := z.DecBinary() @@ -7776,7 +7776,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromMap(l int, d *codec1978. } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv661 := &x.ListMeta yym662 := z.DecBinary() @@ -7857,7 +7857,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromArray(l int, d *codec197 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv668 := &x.ListMeta yym669 := z.DecBinary() @@ -8463,7 +8463,7 @@ func (x *IngressList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv724 := &x.ListMeta yym725 := z.DecBinary() @@ -8544,7 +8544,7 @@ func (x *IngressList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv731 := &x.ListMeta yym732 := z.DecBinary() @@ -10900,7 +10900,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv911 := &x.ListMeta yym912 := z.DecBinary() @@ -10981,7 +10981,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv918 := &x.ListMeta yym919 := z.DecBinary() @@ -11239,7 +11239,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym942 := z.DecBinary() _ = yym942 @@ -11319,7 +11319,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym948 := z.DecBinary() _ = yym948 @@ -12035,7 +12035,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1012 := &x.LastTransitionTime yym1013 := z.DecBinary() @@ -12120,7 +12120,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1019 := &x.LastTransitionTime yym1020 := z.DecBinary() @@ -14957,7 +14957,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decod } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1258 := &x.ListMeta yym1259 := z.DecBinary() @@ -15038,7 +15038,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1265 := &x.ListMeta yym1266 := z.DecBinary() @@ -15538,7 +15538,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) switch yys1307 { case "podSelector": if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1308 := &x.PodSelector yym1309 := z.DecBinary() @@ -15587,7 +15587,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1313 := &x.PodSelector yym1314 := z.DecBinary() @@ -16342,7 +16342,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1369 := z.DecBinary() _ = yym1369 @@ -16359,7 +16359,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1371 := z.DecBinary() _ = yym1371 @@ -16400,7 +16400,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1374 := z.DecBinary() _ = yym1374 @@ -16427,7 +16427,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1376 := z.DecBinary() _ = yym1376 @@ -16667,7 +16667,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1398 := &x.ListMeta yym1399 := z.DecBinary() @@ -16748,7 +16748,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1405 := &x.ListMeta yym1406 := z.DecBinary() diff --git a/pkg/apis/extensions/v1beta1/conversion.go b/pkg/apis/extensions/v1beta1/conversion.go index 75d0f5dcb1d..0a8fa482dfd 100644 --- a/pkg/apis/extensions/v1beta1/conversion.go +++ b/pkg/apis/extensions/v1beta1/conversion.go @@ -20,11 +20,11 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/pkg/apis/extensions/v1beta1/defaults.go b/pkg/apis/extensions/v1beta1/defaults.go index 43b76f47ec1..19bac99fb87 100644 --- a/pkg/apis/extensions/v1beta1/defaults.go +++ b/pkg/apis/extensions/v1beta1/defaults.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/apis/extensions/v1beta1/defaults_test.go b/pkg/apis/extensions/v1beta1/defaults_test.go index 1403a81f989..1bf8046c77d 100644 --- a/pkg/apis/extensions/v1beta1/defaults_test.go +++ b/pkg/apis/extensions/v1beta1/defaults_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/kubernetes/pkg/api" _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apis/extensions/install" . "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/apis/extensions/v1beta1/generated.pb.go b/pkg/apis/extensions/v1beta1/generated.pb.go index 0ced69f5686..52aa5f6fd9c 100644 --- a/pkg/apis/extensions/v1beta1/generated.pb.go +++ b/pkg/apis/extensions/v1beta1/generated.pb.go @@ -99,8 +99,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_util_intstr "k8s.io/kubernetes/pkg/util/intstr" @@ -4155,7 +4155,7 @@ func (this *DaemonSetList) String() string { return "nil" } s := strings.Join([]string{`&DaemonSetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "DaemonSet", "DaemonSet", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4166,7 +4166,7 @@ func (this *DaemonSetSpec) String() string { return "nil" } s := strings.Join([]string{`&DaemonSetSpec{`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4206,8 +4206,8 @@ func (this *DeploymentCondition) String() string { `Status:` + fmt.Sprintf("%v", this.Status) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -4217,7 +4217,7 @@ func (this *DeploymentList) String() string { return "nil" } s := strings.Join([]string{`&DeploymentList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Deployment", "Deployment", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4251,7 +4251,7 @@ func (this *DeploymentSpec) String() string { } s := strings.Join([]string{`&DeploymentSpec{`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `Strategy:` + strings.Replace(strings.Replace(this.Strategy.String(), "DeploymentStrategy", "DeploymentStrategy", 1), `&`, ``, 1) + `,`, `MinReadySeconds:` + fmt.Sprintf("%v", this.MinReadySeconds) + `,`, @@ -4338,7 +4338,7 @@ func (this *HorizontalPodAutoscalerList) String() string { return "nil" } s := strings.Join([]string{`&HorizontalPodAutoscalerList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4363,7 +4363,7 @@ func (this *HorizontalPodAutoscalerStatus) String() string { } s := strings.Join([]string{`&HorizontalPodAutoscalerStatus{`, `ObservedGeneration:` + valueToStringGenerated(this.ObservedGeneration) + `,`, - `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `CurrentReplicas:` + fmt.Sprintf("%v", this.CurrentReplicas) + `,`, `DesiredReplicas:` + fmt.Sprintf("%v", this.DesiredReplicas) + `,`, `CurrentCPUUtilizationPercentage:` + valueToStringGenerated(this.CurrentCPUUtilizationPercentage) + `,`, @@ -4421,7 +4421,7 @@ func (this *IngressList) String() string { return "nil" } s := strings.Join([]string{`&IngressList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Ingress", "Ingress", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4500,8 +4500,8 @@ func (this *JobCondition) String() string { s := strings.Join([]string{`&JobCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -4513,7 +4513,7 @@ func (this *JobList) String() string { return "nil" } s := strings.Join([]string{`&JobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4527,7 +4527,7 @@ func (this *JobSpec) String() string { `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `AutoSelector:` + valueToStringGenerated(this.AutoSelector) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, @@ -4540,8 +4540,8 @@ func (this *JobStatus) String() string { } s := strings.Join([]string{`&JobStatus{`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, - `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, + `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, @@ -4576,7 +4576,7 @@ func (this *NetworkPolicyList) String() string { return "nil" } s := strings.Join([]string{`&NetworkPolicyList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "NetworkPolicy", "NetworkPolicy", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4587,8 +4587,8 @@ func (this *NetworkPolicyPeer) String() string { return "nil" } s := strings.Join([]string{`&NetworkPolicyPeer{`, - `PodSelector:` + strings.Replace(fmt.Sprintf("%v", this.PodSelector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, - `NamespaceSelector:` + strings.Replace(fmt.Sprintf("%v", this.NamespaceSelector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `PodSelector:` + strings.Replace(fmt.Sprintf("%v", this.PodSelector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, + `NamespaceSelector:` + strings.Replace(fmt.Sprintf("%v", this.NamespaceSelector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") return s @@ -4609,7 +4609,7 @@ func (this *NetworkPolicySpec) String() string { return "nil" } s := strings.Join([]string{`&NetworkPolicySpec{`, - `PodSelector:` + strings.Replace(strings.Replace(this.PodSelector.String(), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1), `&`, ``, 1) + `,`, + `PodSelector:` + strings.Replace(strings.Replace(this.PodSelector.String(), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1), `&`, ``, 1) + `,`, `Ingress:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Ingress), "NetworkPolicyIngressRule", "NetworkPolicyIngressRule", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4631,7 +4631,7 @@ func (this *PodSecurityPolicyList) String() string { return "nil" } s := strings.Join([]string{`&PodSecurityPolicyList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodSecurityPolicy", "PodSecurityPolicy", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4679,7 +4679,7 @@ func (this *ReplicaSetCondition) String() string { s := strings.Join([]string{`&ReplicaSetCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -4691,7 +4691,7 @@ func (this *ReplicaSetList) String() string { return "nil" } s := strings.Join([]string{`&ReplicaSetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ReplicaSet", "ReplicaSet", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4703,7 +4703,7 @@ func (this *ReplicaSetSpec) String() string { } s := strings.Join([]string{`&ReplicaSetSpec{`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `MinReadySeconds:` + fmt.Sprintf("%v", this.MinReadySeconds) + `,`, `}`, @@ -4873,7 +4873,7 @@ func (this *ThirdPartyResourceDataList) String() string { return "nil" } s := strings.Join([]string{`&ThirdPartyResourceDataList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ThirdPartyResourceData", "ThirdPartyResourceData", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4884,7 +4884,7 @@ func (this *ThirdPartyResourceList) String() string { return "nil" } s := strings.Join([]string{`&ThirdPartyResourceList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ThirdPartyResource", "ThirdPartyResource", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -5733,7 +5733,7 @@ func (m *DaemonSetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -6689,7 +6689,7 @@ func (m *DeploymentSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -7955,7 +7955,7 @@ func (m *HorizontalPodAutoscalerStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LastScaleTime == nil { - m.LastScaleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.LastScaleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.LastScaleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -9694,7 +9694,7 @@ func (m *JobSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -9859,7 +9859,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -9892,7 +9892,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.CompletionTime == nil { - m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -10365,7 +10365,7 @@ func (m *NetworkPolicyPeer) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.PodSelector == nil { - m.PodSelector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.PodSelector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.PodSelector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -10398,7 +10398,7 @@ func (m *NetworkPolicyPeer) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.NamespaceSelector == nil { - m.NamespaceSelector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.NamespaceSelector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.NamespaceSelector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -11810,7 +11810,7 @@ func (m *ReplicaSetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -13792,248 +13792,247 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 3876 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe4, 0x5b, 0x5d, 0x6c, 0x24, 0xd9, - 0x55, 0x9e, 0xea, 0x76, 0x8f, 0xbb, 0x4f, 0x8f, 0x3d, 0x9e, 0x3b, 0x1e, 0x4f, 0xaf, 0x77, 0xd7, - 0x3d, 0xa9, 0x88, 0x64, 0x22, 0x76, 0xdb, 0xcc, 0xb0, 0x13, 0x36, 0xbb, 0x9b, 0x4d, 0xdc, 0xf6, - 0xfc, 0x62, 0xcf, 0x74, 0x6e, 0xdb, 0x93, 0x21, 0x3f, 0x1b, 0xaa, 0xbb, 0xae, 0xdb, 0xb5, 0xae, - 0xbf, 0xad, 0xba, 0xe5, 0x9d, 0x4e, 0x84, 0x12, 0x09, 0xf1, 0x1a, 0xf2, 0x06, 0x12, 0xf0, 0xc0, - 0x03, 0xe2, 0x89, 0x88, 0x08, 0xa4, 0x48, 0x3c, 0x01, 0x02, 0x31, 0x48, 0x20, 0x02, 0x12, 0x82, - 0x07, 0xe8, 0x65, 0x1d, 0xa1, 0x15, 0xef, 0x08, 0xa4, 0xe1, 0x05, 0xdd, 0x5b, 0xb7, 0x7e, 0xbb, - 0xaa, 0xc7, 0xd5, 0xfe, 0x91, 0x10, 0x6f, 0xdd, 0xf7, 0x9e, 0xf3, 0x9d, 0x73, 0x6e, 0x9d, 0x3a, - 0xe7, 0xdc, 0x7b, 0x4f, 0xc1, 0x17, 0xf7, 0xdf, 0x74, 0x5b, 0x9a, 0xb5, 0xba, 0xef, 0xf5, 0x88, - 0x63, 0x12, 0x4a, 0xdc, 0x55, 0x7b, 0x7f, 0xb0, 0xaa, 0xd8, 0x9a, 0xbb, 0x4a, 0x9e, 0x52, 0x62, - 0xba, 0x9a, 0x65, 0xba, 0xab, 0x07, 0x37, 0x7a, 0x84, 0x2a, 0x37, 0x56, 0x07, 0xc4, 0x24, 0x8e, - 0x42, 0x89, 0xda, 0xb2, 0x1d, 0x8b, 0x5a, 0xe8, 0x75, 0x9f, 0xbd, 0x15, 0xb1, 0xb7, 0xec, 0xfd, - 0x41, 0x8b, 0xb1, 0xb7, 0x22, 0xf6, 0x96, 0x60, 0x5f, 0x7e, 0x7d, 0xa0, 0xd1, 0x3d, 0xaf, 0xd7, - 0xea, 0x5b, 0xc6, 0xea, 0xc0, 0x1a, 0x58, 0xab, 0x1c, 0xa5, 0xe7, 0xed, 0xf2, 0x7f, 0xfc, 0x0f, - 0xff, 0xe5, 0xa3, 0x2f, 0xdf, 0xcc, 0x55, 0x6e, 0xd5, 0x21, 0xae, 0xe5, 0x39, 0x7d, 0x92, 0xd6, - 0x68, 0xf9, 0x56, 0x3e, 0x8f, 0x67, 0x1e, 0x10, 0x87, 0x29, 0x44, 0xd4, 0x31, 0xb6, 0xd7, 0xf2, - 0xd9, 0x0e, 0xc6, 0xcc, 0x5e, 0x7e, 0x3d, 0x9b, 0xda, 0xf1, 0x4c, 0xaa, 0x19, 0xe3, 0x3a, 0xbd, - 0x31, 0x99, 0xdc, 0xed, 0xef, 0x11, 0x43, 0x19, 0xe3, 0xba, 0x91, 0xcd, 0xe5, 0x51, 0x4d, 0x5f, - 0xd5, 0x4c, 0xea, 0x52, 0x27, 0xcd, 0x22, 0xb7, 0x00, 0xd6, 0x3a, 0xf7, 0x1f, 0xfb, 0x56, 0xa2, - 0x6b, 0x30, 0x63, 0x2a, 0x06, 0x69, 0x48, 0xd7, 0xa4, 0xeb, 0xb5, 0xf6, 0x85, 0x67, 0xa3, 0xe6, - 0xb9, 0xc3, 0x51, 0x73, 0xe6, 0xa1, 0x62, 0x10, 0xcc, 0x67, 0xe4, 0x6f, 0xc0, 0xe2, 0x7a, 0x67, - 0x67, 0x5b, 0x71, 0x06, 0x84, 0xee, 0x50, 0x4d, 0xd7, 0xbe, 0xad, 0x50, 0xc6, 0xb9, 0x01, 0x0b, - 0x94, 0x0f, 0x76, 0x88, 0xd3, 0x27, 0x26, 0x55, 0x06, 0x3e, 0x4a, 0xa5, 0xdd, 0x10, 0x28, 0x0b, - 0xdb, 0xa9, 0x79, 0x3c, 0xc6, 0x21, 0xff, 0x86, 0x04, 0x2f, 0xad, 0x7b, 0x2e, 0xb5, 0x8c, 0x2d, - 0x42, 0x1d, 0xad, 0xbf, 0xee, 0x39, 0x0e, 0x31, 0x69, 0x97, 0x2a, 0xd4, 0x73, 0x5f, 0xac, 0x1d, - 0x7a, 0x02, 0x95, 0x03, 0x45, 0xf7, 0x48, 0xa3, 0x74, 0x4d, 0xba, 0x5e, 0xbf, 0xf9, 0x5a, 0x2b, - 0xd7, 0xd9, 0x5a, 0x81, 0x3b, 0xb4, 0xbe, 0xe2, 0x29, 0x26, 0xd5, 0xe8, 0xb0, 0xbd, 0x28, 0x00, - 0x2f, 0x08, 0xa9, 0x8f, 0x19, 0x12, 0xf6, 0x01, 0xe5, 0xef, 0x4b, 0xf0, 0x6a, 0xae, 0x66, 0x9b, - 0x9a, 0x4b, 0x91, 0x01, 0x15, 0x8d, 0x12, 0xc3, 0x6d, 0x48, 0xd7, 0xca, 0xd7, 0xeb, 0x37, 0xef, - 0xb5, 0x0a, 0x39, 0x7a, 0x2b, 0x17, 0xbc, 0x3d, 0x27, 0xf4, 0xaa, 0xdc, 0x67, 0xf0, 0xd8, 0x97, - 0x22, 0xff, 0xba, 0x04, 0x28, 0xce, 0xe3, 0xaf, 0xee, 0x11, 0xd6, 0xe8, 0xab, 0xc7, 0x59, 0xa3, - 0xcb, 0x02, 0xb0, 0xee, 0x8b, 0x4b, 0x2c, 0xd1, 0xf7, 0x24, 0x58, 0x1a, 0xd7, 0x88, 0xaf, 0xcd, - 0x6e, 0x72, 0x6d, 0xd6, 0x8e, 0xb1, 0x36, 0x3e, 0x6a, 0xce, 0xa2, 0xfc, 0x41, 0x09, 0x6a, 0x1b, - 0x0a, 0x31, 0x2c, 0xb3, 0x4b, 0x28, 0x7a, 0x02, 0x55, 0x83, 0x50, 0x45, 0x55, 0xa8, 0xc2, 0xd7, - 0xa3, 0x7e, 0xf3, 0xfa, 0x04, 0x63, 0x0f, 0x6e, 0xb4, 0x1e, 0xf5, 0xde, 0x27, 0x7d, 0xba, 0x45, - 0xa8, 0xd2, 0x46, 0x02, 0x1f, 0xa2, 0x31, 0x1c, 0xa2, 0xa1, 0xf7, 0x60, 0xc6, 0xb5, 0x49, 0x5f, - 0x2c, 0xe1, 0x3b, 0x05, 0xcd, 0x09, 0x35, 0xec, 0xda, 0xa4, 0x1f, 0x3d, 0x23, 0xf6, 0x0f, 0x73, - 0x5c, 0xb4, 0x0b, 0xe7, 0x5d, 0xfe, 0xf0, 0x1b, 0x65, 0x2e, 0xe1, 0xdd, 0xa9, 0x25, 0xf8, 0x2e, - 0x34, 0x2f, 0x64, 0x9c, 0xf7, 0xff, 0x63, 0x81, 0x2e, 0xff, 0xad, 0x04, 0x73, 0x21, 0x2d, 0x7f, - 0x52, 0xdf, 0x1c, 0x5b, 0xb3, 0xd5, 0x09, 0x6b, 0x16, 0x8b, 0x8f, 0x2d, 0xc6, 0xce, 0x97, 0x6e, - 0x41, 0x08, 0xab, 0x06, 0x23, 0xb1, 0x85, 0xfb, 0x66, 0xe0, 0x08, 0x25, 0xee, 0x08, 0x6f, 0x4e, - 0x6b, 0x57, 0xce, 0xf3, 0xff, 0x9b, 0xb8, 0x3d, 0x6c, 0x3d, 0xd1, 0x7b, 0x50, 0x75, 0x89, 0x4e, - 0xfa, 0xd4, 0x72, 0x84, 0x3d, 0x6f, 0x1c, 0xd5, 0x1e, 0xa5, 0x47, 0xf4, 0xae, 0xe0, 0x6d, 0x5f, - 0x60, 0x06, 0x05, 0xff, 0x70, 0x88, 0x89, 0xbe, 0x0e, 0x55, 0x4a, 0x0c, 0x5b, 0x57, 0x68, 0xf0, - 0x42, 0xbd, 0x3e, 0xd9, 0xc7, 0x3a, 0x96, 0xba, 0x2d, 0x18, 0xf8, 0xe3, 0x0f, 0x57, 0x2b, 0x18, - 0xc5, 0x21, 0xa0, 0xfc, 0x17, 0x25, 0xb8, 0x98, 0x7a, 0x94, 0xe8, 0x31, 0x2c, 0xf5, 0xfd, 0xf0, - 0xf0, 0xd0, 0x33, 0x7a, 0xc4, 0xe9, 0xf6, 0xf7, 0x88, 0xea, 0xe9, 0x44, 0x15, 0xe1, 0x76, 0x45, - 0xe0, 0x2d, 0xad, 0x67, 0x52, 0xe1, 0x1c, 0x6e, 0xf4, 0x00, 0x90, 0xc9, 0x87, 0xb6, 0x34, 0xd7, - 0x0d, 0x31, 0x4b, 0x1c, 0x73, 0x59, 0x60, 0xa2, 0x87, 0x63, 0x14, 0x38, 0x83, 0x8b, 0xe9, 0xa8, - 0x12, 0x57, 0x73, 0x88, 0x9a, 0xd6, 0xb1, 0x9c, 0xd4, 0x71, 0x23, 0x93, 0x0a, 0xe7, 0x70, 0xa3, - 0x5b, 0x50, 0xf7, 0xa5, 0x61, 0xa2, 0xa8, 0xc3, 0xc6, 0x0c, 0x07, 0x0b, 0x43, 0xd2, 0xc3, 0x68, - 0x0a, 0xc7, 0xe9, 0xe4, 0x3f, 0x2c, 0x01, 0x6c, 0x10, 0x5b, 0xb7, 0x86, 0x06, 0x31, 0x4f, 0x33, - 0x2c, 0x7c, 0x2b, 0x11, 0x16, 0xbe, 0x58, 0xd4, 0xb9, 0x43, 0x15, 0x73, 0xe3, 0xc2, 0x20, 0x15, - 0x17, 0xbe, 0x34, 0xbd, 0x88, 0xc9, 0x81, 0xe1, 0xa7, 0x65, 0xb8, 0x1c, 0x11, 0xaf, 0x5b, 0xa6, - 0xaa, 0xf1, 0x34, 0xff, 0x36, 0xcc, 0xd0, 0xa1, 0x1d, 0xa4, 0x97, 0xcf, 0x06, 0x2a, 0x6e, 0x0f, - 0x6d, 0xf2, 0x7c, 0xd4, 0xbc, 0x9a, 0xc1, 0xc2, 0xa6, 0x30, 0x67, 0x42, 0x8f, 0x43, 0xed, 0x4b, - 0x9c, 0xfd, 0xdd, 0xa4, 0xf0, 0xe7, 0xa3, 0xe6, 0xc4, 0x9a, 0xaa, 0x15, 0x62, 0x26, 0x95, 0x45, - 0x9f, 0x81, 0xf3, 0x0e, 0x51, 0x5c, 0xcb, 0xe4, 0x1e, 0x51, 0x8b, 0x8c, 0xc2, 0x7c, 0x14, 0x8b, - 0x59, 0xf4, 0x39, 0x98, 0x35, 0x88, 0xeb, 0xb2, 0xd2, 0xa4, 0xc2, 0x09, 0x2f, 0x0a, 0xc2, 0xd9, - 0x2d, 0x7f, 0x18, 0x07, 0xf3, 0x68, 0x1f, 0xe6, 0x75, 0xc5, 0xa5, 0x3b, 0xb6, 0xaa, 0x50, 0xb2, - 0xad, 0x19, 0xa4, 0x71, 0x9e, 0x2f, 0xf8, 0xcf, 0x1e, 0x31, 0x78, 0x30, 0x96, 0xf6, 0x92, 0x80, - 0x9f, 0xdf, 0x4c, 0x40, 0xe1, 0x14, 0x34, 0xfa, 0x10, 0x10, 0x1b, 0xd9, 0x76, 0x14, 0xd3, 0xf5, - 0xd7, 0x8c, 0x09, 0x9c, 0x2d, 0x2e, 0x30, 0x7c, 0x4f, 0x37, 0xc7, 0xe0, 0x70, 0x86, 0x08, 0xf9, - 0xef, 0x24, 0x98, 0x8f, 0x1e, 0xd9, 0x59, 0xc4, 0xff, 0xf7, 0x92, 0xf1, 0xff, 0x0b, 0x53, 0xfb, - 0x6f, 0x4e, 0x02, 0xf8, 0xcd, 0x32, 0xa0, 0x88, 0x08, 0x5b, 0xba, 0xde, 0x53, 0xfa, 0xfb, 0x47, - 0xa8, 0x8a, 0x7e, 0x4f, 0x02, 0xe4, 0xf1, 0x47, 0xa2, 0xae, 0x99, 0xa6, 0x45, 0x79, 0x55, 0x1b, - 0xa8, 0xf9, 0x4b, 0x53, 0xab, 0x19, 0x68, 0xd0, 0xda, 0x19, 0xc3, 0xbe, 0x6d, 0x52, 0x67, 0x18, - 0x3d, 0xb2, 0x71, 0x02, 0x9c, 0xa1, 0x10, 0xfa, 0x00, 0xc0, 0x11, 0x98, 0xdb, 0x96, 0x88, 0x02, - 0x45, 0x03, 0x4d, 0xa0, 0xd4, 0xba, 0x65, 0xee, 0x6a, 0x83, 0x28, 0xa6, 0xe1, 0x10, 0x18, 0xc7, - 0x84, 0x2c, 0xdf, 0x86, 0xab, 0x39, 0xda, 0xa3, 0x05, 0x28, 0xef, 0x93, 0xa1, 0xbf, 0xac, 0x98, - 0xfd, 0x44, 0x8b, 0xf1, 0xea, 0xb2, 0x26, 0x4a, 0xc3, 0xb7, 0x4a, 0x6f, 0x4a, 0xf2, 0x27, 0x95, - 0xb8, 0xb3, 0xf1, 0xe4, 0x7c, 0x1d, 0xaa, 0x0e, 0xb1, 0x75, 0xad, 0xaf, 0xb8, 0x22, 0x7b, 0xf1, - 0x34, 0x8b, 0xc5, 0x18, 0x0e, 0x67, 0x13, 0x69, 0xbc, 0x74, 0xca, 0x69, 0xbc, 0x7c, 0xc2, 0x69, - 0x1c, 0x59, 0x50, 0x75, 0x29, 0xdb, 0x74, 0x0d, 0xfc, 0x9c, 0x55, 0xbc, 0x00, 0x8e, 0xc7, 0x6d, - 0x1f, 0x28, 0x12, 0x18, 0x8c, 0xe0, 0x50, 0x08, 0x5a, 0x83, 0x8b, 0x86, 0x66, 0xf2, 0xe4, 0xd7, - 0x25, 0x7d, 0xcb, 0x54, 0x5d, 0x1e, 0xf0, 0x2a, 0xed, 0xab, 0x82, 0xe9, 0xe2, 0x56, 0x72, 0x1a, - 0xa7, 0xe9, 0xd1, 0x26, 0x2c, 0x3a, 0xe4, 0x40, 0x63, 0x6a, 0xdc, 0xd3, 0x5c, 0x6a, 0x39, 0xc3, - 0x4d, 0xcd, 0xd0, 0x28, 0x0f, 0x83, 0x95, 0x76, 0xe3, 0x70, 0xd4, 0x5c, 0xc4, 0x19, 0xf3, 0x38, - 0x93, 0x8b, 0x45, 0x68, 0x5b, 0xf1, 0x5c, 0xa2, 0xf2, 0xa8, 0x56, 0x8d, 0x22, 0x74, 0x87, 0x8f, - 0x62, 0x31, 0x8b, 0x8c, 0x84, 0x77, 0x57, 0x4f, 0xc2, 0xbb, 0xe7, 0xf3, 0x3d, 0x1b, 0xed, 0xc0, - 0x55, 0xdb, 0xb1, 0x06, 0x0e, 0x71, 0xdd, 0x0d, 0xa2, 0xa8, 0xba, 0x66, 0x92, 0x60, 0xbd, 0x6a, - 0xdc, 0xce, 0x97, 0x0f, 0x47, 0xcd, 0xab, 0x9d, 0x6c, 0x12, 0x9c, 0xc7, 0x2b, 0x7f, 0x54, 0x86, - 0x85, 0x74, 0xa6, 0x65, 0xf5, 0x95, 0xd5, 0x73, 0x89, 0x73, 0x40, 0xd4, 0xbb, 0xfe, 0x1e, 0x5c, - 0xb3, 0x4c, 0xee, 0xf5, 0xe5, 0x28, 0x08, 0x3c, 0x1a, 0xa3, 0xc0, 0x19, 0x5c, 0xe8, 0xb5, 0xd8, - 0x7b, 0xe3, 0x57, 0x68, 0xa1, 0x37, 0x64, 0xbc, 0x3b, 0x6b, 0x70, 0x51, 0x04, 0x92, 0x60, 0x52, - 0x94, 0x61, 0xa1, 0x37, 0xec, 0x24, 0xa7, 0x71, 0x9a, 0x1e, 0xdd, 0x85, 0x4b, 0xca, 0x81, 0xa2, - 0xe9, 0x4a, 0x4f, 0x27, 0x21, 0x88, 0x5f, 0x7e, 0xbd, 0x24, 0x40, 0x2e, 0xad, 0xa5, 0x09, 0xf0, - 0x38, 0x0f, 0xda, 0x82, 0xcb, 0x9e, 0x39, 0x0e, 0xe5, 0x7b, 0xe7, 0xcb, 0x02, 0xea, 0xf2, 0xce, - 0x38, 0x09, 0xce, 0xe2, 0x43, 0x07, 0x00, 0xfd, 0xa0, 0x28, 0x70, 0x1b, 0xe7, 0x79, 0xb0, 0x6e, - 0x4f, 0xfd, 0x6e, 0x85, 0xf5, 0x45, 0x14, 0x12, 0xc3, 0x21, 0x17, 0xc7, 0x24, 0xc9, 0x7f, 0x2f, - 0xc5, 0xd3, 0x4c, 0xf0, 0x06, 0xa2, 0xb7, 0x12, 0xd5, 0xd1, 0x67, 0x52, 0xd5, 0xd1, 0xd2, 0x38, - 0x47, 0xac, 0x38, 0xfa, 0x2e, 0xcc, 0x31, 0xcf, 0xd4, 0xcc, 0x81, 0xff, 0x34, 0x44, 0x98, 0xbb, - 0x33, 0x85, 0xf7, 0x87, 0x18, 0xb1, 0x74, 0x79, 0xe9, 0x70, 0xd4, 0x9c, 0x4b, 0x4c, 0xe2, 0xa4, - 0x3c, 0xf9, 0x47, 0x12, 0x2c, 0xdd, 0xe9, 0xde, 0x75, 0x2c, 0xcf, 0x0e, 0xd4, 0x7b, 0x64, 0xfb, - 0x49, 0xe7, 0x17, 0x60, 0xc6, 0xf1, 0xf4, 0xc0, 0xae, 0x4f, 0x07, 0x76, 0x61, 0x4f, 0x67, 0x76, - 0x5d, 0x4e, 0x71, 0xf9, 0x46, 0x31, 0x06, 0xf4, 0x1e, 0x9c, 0x77, 0x14, 0x73, 0x40, 0x82, 0x44, - 0xfa, 0xf9, 0x82, 0xd6, 0xdc, 0xdf, 0xc0, 0x8c, 0x3d, 0x56, 0xd1, 0x71, 0x34, 0x2c, 0x50, 0xe5, - 0xdf, 0x91, 0xe0, 0xe2, 0xbd, 0xed, 0xed, 0xce, 0x7d, 0x93, 0xbf, 0x88, 0x1d, 0x85, 0xee, 0xb1, - 0x5c, 0x6f, 0x2b, 0x74, 0x2f, 0x9d, 0xeb, 0xd9, 0x1c, 0xe6, 0x33, 0x68, 0x0f, 0x66, 0x59, 0x00, - 0x20, 0xa6, 0x3a, 0x65, 0xa5, 0x2e, 0xc4, 0xb5, 0x7d, 0x90, 0xa8, 0x8c, 0x14, 0x03, 0x38, 0x80, - 0x97, 0xbf, 0x03, 0x8b, 0x31, 0xf5, 0xd8, 0x7a, 0xf1, 0x13, 0x13, 0xd4, 0x87, 0x0a, 0xd3, 0x24, - 0x38, 0x0f, 0x29, 0xba, 0xbd, 0x4f, 0x99, 0x1c, 0xd5, 0x42, 0xec, 0x9f, 0x8b, 0x7d, 0x6c, 0xf9, - 0x9f, 0x4a, 0x70, 0xf5, 0x9e, 0xe5, 0x68, 0xdf, 0xb6, 0x4c, 0xaa, 0xe8, 0x1d, 0x4b, 0x5d, 0xf3, - 0xa8, 0xe5, 0xf6, 0x15, 0x9d, 0x38, 0xa7, 0xb8, 0x07, 0xd2, 0x13, 0x7b, 0xa0, 0x07, 0x45, 0x2d, - 0xcb, 0xd6, 0x37, 0x77, 0x43, 0x44, 0x53, 0x1b, 0xa2, 0xcd, 0x13, 0x92, 0x37, 0x79, 0x77, 0xf4, - 0x1f, 0x12, 0xbc, 0x9c, 0xc3, 0x79, 0x16, 0x45, 0xf4, 0x7e, 0xb2, 0x88, 0xbe, 0x73, 0x32, 0x36, - 0xe7, 0x54, 0xd4, 0xff, 0x53, 0xca, 0xb5, 0x95, 0xd7, 0x70, 0x1f, 0x40, 0x95, 0xff, 0xc3, 0x64, - 0x57, 0xd8, 0xba, 0x5e, 0x50, 0x9f, 0xae, 0xd7, 0x0b, 0x0e, 0x1a, 0x31, 0xd9, 0x25, 0x0e, 0x31, - 0xfb, 0x24, 0x56, 0xde, 0x08, 0x70, 0x1c, 0x8a, 0x41, 0x37, 0xa0, 0xce, 0xcb, 0x95, 0x44, 0x06, - 0xbc, 0x78, 0x38, 0x6a, 0xd6, 0xb7, 0xa2, 0x61, 0x1c, 0xa7, 0x41, 0xb7, 0xa0, 0x6e, 0x28, 0x4f, - 0x53, 0xf9, 0x2f, 0x3c, 0x39, 0xd8, 0x8a, 0xa6, 0x70, 0x9c, 0x0e, 0x7d, 0x17, 0xe6, 0xfb, 0xb6, - 0x17, 0x3b, 0xe7, 0x16, 0xf5, 0x5b, 0x51, 0x13, 0xb3, 0x8e, 0xcc, 0xdb, 0x88, 0x6d, 0x0d, 0xd7, - 0x3b, 0x3b, 0xb1, 0x31, 0x9c, 0x12, 0x27, 0xff, 0x79, 0x19, 0x5e, 0x9d, 0xe8, 0xa3, 0xe8, 0xce, - 0x84, 0xba, 0x62, 0xa9, 0x40, 0x4d, 0xa1, 0xc2, 0x1c, 0xdb, 0x21, 0xf2, 0xe5, 0xe6, 0xfb, 0xcf, - 0x52, 0xf1, 0xfd, 0x27, 0x4f, 0x32, 0x9b, 0x71, 0x14, 0x9c, 0x04, 0x65, 0xb5, 0x88, 0x38, 0x7f, - 0xca, 0xab, 0x45, 0xd6, 0x93, 0xd3, 0x38, 0x4d, 0xcf, 0x20, 0xc4, 0xf1, 0x50, 0xaa, 0x12, 0x09, - 0x21, 0x36, 0x92, 0xd3, 0x38, 0x4d, 0x8f, 0x0c, 0x68, 0x0a, 0xd4, 0xe4, 0xf2, 0xc7, 0xee, 0x2e, - 0xfc, 0x8a, 0xe4, 0xd3, 0x87, 0xa3, 0x66, 0x73, 0x7d, 0x32, 0x29, 0x7e, 0x11, 0x96, 0xbc, 0x05, - 0x73, 0xf7, 0x2c, 0x97, 0x76, 0x2c, 0x87, 0xf2, 0xfc, 0x85, 0x5e, 0x85, 0xb2, 0xa1, 0x99, 0x62, - 0xcb, 0x53, 0x17, 0x6a, 0x97, 0x99, 0xf3, 0xb2, 0x71, 0x3e, 0xad, 0x3c, 0x15, 0x7e, 0x1d, 0x4d, - 0x2b, 0x4f, 0x31, 0x1b, 0x97, 0xef, 0xc2, 0xac, 0xc8, 0x8b, 0x71, 0xa0, 0xf2, 0x64, 0xa0, 0x72, - 0x06, 0xd0, 0xef, 0x97, 0x60, 0x56, 0xa4, 0x91, 0x53, 0x4c, 0x08, 0xdf, 0x48, 0x24, 0x84, 0xb7, - 0xa6, 0x4b, 0xb5, 0xb9, 0x09, 0x40, 0x4d, 0x25, 0x80, 0x77, 0xa6, 0xc4, 0x9f, 0x1c, 0xf0, 0x7f, - 0x28, 0xc1, 0x7c, 0x32, 0xe9, 0xb3, 0x88, 0xc2, 0xde, 0x21, 0xad, 0x4f, 0x1e, 0x46, 0x27, 0x0b, - 0x61, 0x44, 0xe9, 0x46, 0x53, 0x38, 0x4e, 0x87, 0x48, 0xc8, 0xc6, 0xdc, 0x41, 0x2c, 0x4a, 0x2b, - 0x47, 0x69, 0x8f, 0x6a, 0x7a, 0xcb, 0xbf, 0xb8, 0x6b, 0xdd, 0x37, 0xe9, 0x23, 0xa7, 0x4b, 0x1d, - 0xcd, 0x1c, 0x8c, 0x89, 0xe1, 0x9e, 0x15, 0xc7, 0x95, 0xff, 0x5a, 0x82, 0xba, 0x50, 0xf8, 0x2c, - 0x32, 0xd2, 0xd7, 0x93, 0x19, 0xe9, 0xf3, 0x53, 0xd6, 0x53, 0xd9, 0x19, 0xe8, 0xc7, 0x91, 0x2d, - 0xac, 0x82, 0x62, 0x05, 0xde, 0x9e, 0xe5, 0xd2, 0x74, 0x81, 0xc7, 0x5e, 0x31, 0xcc, 0x67, 0xd0, - 0xaf, 0x49, 0xb0, 0xa0, 0xa5, 0x6a, 0x2e, 0xb1, 0xd4, 0x5f, 0x9a, 0x4e, 0xb5, 0x10, 0x26, 0xba, - 0xce, 0x4c, 0xcf, 0xe0, 0x31, 0x91, 0xb2, 0x07, 0x63, 0x54, 0x48, 0x81, 0x99, 0x3d, 0x4a, 0xed, - 0x29, 0x73, 0x65, 0x56, 0x35, 0xd9, 0xae, 0x72, 0xf3, 0xb7, 0xb7, 0x3b, 0x98, 0x43, 0xcb, 0x3f, - 0x2c, 0x85, 0x0b, 0xd6, 0xf5, 0xdf, 0x91, 0xb0, 0xde, 0x95, 0x4e, 0xa2, 0xde, 0xad, 0x67, 0xd5, - 0xba, 0xe8, 0x09, 0x94, 0xa9, 0x3e, 0xed, 0xc1, 0x9e, 0x90, 0xb0, 0xbd, 0xd9, 0x8d, 0xe2, 0xd4, - 0xf6, 0x66, 0x17, 0x33, 0x48, 0xf4, 0x2d, 0xa8, 0xb0, 0xdd, 0x04, 0x7b, 0xc5, 0xcb, 0xd3, 0x87, - 0x10, 0xb6, 0x5e, 0x91, 0x87, 0xb1, 0x7f, 0x2e, 0xf6, 0x71, 0xe5, 0xef, 0xc0, 0x5c, 0x22, 0x0e, - 0xa0, 0xf7, 0xe1, 0x82, 0x6e, 0x29, 0x6a, 0x5b, 0xd1, 0x15, 0xb3, 0x4f, 0x82, 0x9b, 0xa3, 0x9f, - 0x9b, 0x1c, 0x11, 0x37, 0x63, 0x1c, 0x22, 0x9e, 0x84, 0x57, 0xca, 0xf1, 0x39, 0x9c, 0xc0, 0x96, - 0x15, 0x80, 0xc8, 0x7a, 0xd4, 0x84, 0x0a, 0x73, 0x61, 0x7f, 0x67, 0x50, 0x6b, 0xd7, 0x98, 0xae, - 0xcc, 0xb3, 0x5d, 0xec, 0x8f, 0xa3, 0x9b, 0x00, 0x2e, 0xe9, 0x3b, 0x84, 0xf2, 0xb0, 0xe3, 0x1f, - 0xa4, 0x87, 0x01, 0xb8, 0x1b, 0xce, 0xe0, 0x18, 0x95, 0xfc, 0x5b, 0x25, 0x28, 0x3f, 0xb0, 0x7a, - 0xa7, 0x18, 0xe4, 0x9f, 0x24, 0x82, 0x7c, 0xd1, 0xf7, 0xff, 0x81, 0xd5, 0xcb, 0x0d, 0xf0, 0xbf, - 0x9c, 0x0a, 0xf0, 0x6f, 0x4e, 0x81, 0x3d, 0x39, 0xb8, 0xff, 0x43, 0x19, 0x2e, 0x3c, 0xb0, 0x7a, - 0xd1, 0x25, 0xc7, 0x1b, 0x89, 0x6d, 0xfc, 0xb5, 0xd4, 0x36, 0x7e, 0x21, 0x4e, 0x7b, 0x06, 0xb7, - 0x1b, 0x7b, 0x7e, 0x61, 0xd6, 0x71, 0xac, 0x9e, 0x5f, 0x98, 0x95, 0x8b, 0x17, 0x66, 0x57, 0x84, - 0x2e, 0xbc, 0x38, 0x0b, 0x91, 0x70, 0x12, 0x38, 0xe7, 0x1e, 0x62, 0xe6, 0xd4, 0xef, 0x21, 0x62, - 0x17, 0x38, 0x95, 0xa3, 0x5e, 0xe0, 0x9c, 0x9f, 0x7c, 0x81, 0x23, 0xff, 0x99, 0x04, 0xb3, 0x0f, - 0xac, 0xde, 0x59, 0x24, 0xbf, 0xaf, 0x26, 0x93, 0xdf, 0xcd, 0xe2, 0x0e, 0x9a, 0x93, 0xf8, 0xfe, - 0xa8, 0xcc, 0x6d, 0xe0, 0x31, 0xfc, 0x06, 0xd4, 0x6d, 0xc5, 0x51, 0x74, 0x9d, 0xe8, 0x9a, 0x6b, - 0x88, 0xd2, 0x91, 0xef, 0x79, 0x3a, 0xd1, 0x30, 0x8e, 0xd3, 0x30, 0x96, 0xbe, 0x65, 0xd8, 0x3a, - 0x09, 0xae, 0x32, 0x42, 0x96, 0xf5, 0x68, 0x18, 0xc7, 0x69, 0xd0, 0x23, 0xb8, 0xa2, 0xf4, 0xa9, - 0x76, 0x40, 0xd2, 0xc7, 0xa1, 0x65, 0x5e, 0x42, 0xbe, 0x74, 0x38, 0x6a, 0x5e, 0x59, 0xcb, 0x22, - 0xc0, 0xd9, 0x7c, 0x89, 0x73, 0xfb, 0x99, 0x53, 0x38, 0xb7, 0x7f, 0x03, 0x2e, 0x28, 0x1e, 0xb5, - 0x82, 0x19, 0xee, 0x3f, 0xd5, 0xf6, 0x02, 0x0b, 0xb9, 0x6b, 0xb1, 0x71, 0x9c, 0xa0, 0x4a, 0x9c, - 0xf6, 0x9f, 0x3f, 0xe9, 0x4b, 0xfb, 0x3f, 0x2d, 0x43, 0x2d, 0x0c, 0x3a, 0xc8, 0x4a, 0x9c, 0x50, - 0xfa, 0xc7, 0x3d, 0x6f, 0x17, 0xf7, 0x90, 0x23, 0x1f, 0x4d, 0xa2, 0x27, 0x50, 0x73, 0xa9, 0xe2, - 0xd0, 0x69, 0xf7, 0x70, 0x73, 0x87, 0xa3, 0x66, 0xad, 0x1b, 0x20, 0xe0, 0x08, 0x0c, 0x0d, 0x60, - 0x3e, 0xf2, 0x95, 0x69, 0x23, 0x91, 0xbf, 0xe9, 0x4d, 0xc0, 0xe0, 0x14, 0x2c, 0x0b, 0x07, 0xbe, - 0x37, 0x89, 0x8d, 0x5d, 0x18, 0x0e, 0x7c, 0xd7, 0xc3, 0x62, 0x16, 0xad, 0x42, 0xcd, 0xf5, 0xfa, - 0x7d, 0x42, 0x54, 0xa2, 0x8a, 0x0d, 0xdb, 0x25, 0x41, 0x5a, 0xeb, 0x06, 0x13, 0x38, 0xa2, 0x61, - 0xc0, 0xbb, 0x8a, 0xa6, 0x13, 0x55, 0x5c, 0x63, 0x84, 0xc0, 0x77, 0xf8, 0x28, 0x16, 0xb3, 0xbc, - 0x2d, 0xe6, 0x21, 0xa1, 0x1f, 0x5a, 0xce, 0x7e, 0xc7, 0xd2, 0xb5, 0xfe, 0xf0, 0x14, 0x33, 0x67, - 0x2f, 0x91, 0x39, 0xbf, 0x5c, 0xd0, 0x35, 0x12, 0x5a, 0xe6, 0xe5, 0x50, 0xf9, 0xdf, 0x25, 0x68, - 0x24, 0x28, 0xe3, 0xe5, 0x34, 0x81, 0x8a, 0x6d, 0x39, 0x34, 0x70, 0xce, 0x63, 0x69, 0xc0, 0xf6, - 0x1e, 0xb1, 0xd3, 0x48, 0x06, 0x8b, 0x7d, 0x74, 0x66, 0xe7, 0xae, 0x63, 0x19, 0x22, 0x48, 0x1e, - 0x4f, 0x0a, 0x21, 0x4e, 0x64, 0xe7, 0x1d, 0xc7, 0x32, 0x30, 0xc7, 0x96, 0xff, 0x51, 0x82, 0x4b, - 0x09, 0xca, 0xb3, 0x08, 0xff, 0x4a, 0x32, 0xfc, 0xbf, 0x73, 0x1c, 0xcb, 0x72, 0x12, 0xc1, 0x7f, - 0xa7, 0xed, 0x62, 0x2b, 0x80, 0x06, 0x50, 0xb7, 0x2d, 0xb5, 0x7b, 0x12, 0xdd, 0x4d, 0x7e, 0x22, - 0x89, 0xc0, 0x70, 0x1c, 0x19, 0x0d, 0xe1, 0x92, 0xa9, 0x18, 0xc4, 0xb5, 0x95, 0x3e, 0xe9, 0x9e, - 0xc4, 0x2d, 0xec, 0x95, 0xc3, 0x51, 0xf3, 0xd2, 0xc3, 0x34, 0x24, 0x1e, 0x97, 0x22, 0xff, 0xf1, - 0x98, 0xe5, 0x96, 0x43, 0xd1, 0x57, 0xa0, 0xca, 0xbb, 0x57, 0xfb, 0x96, 0x2e, 0x8a, 0xb4, 0x5b, - 0xec, 0xe1, 0x74, 0xc4, 0xd8, 0xf3, 0x51, 0xf3, 0x67, 0x26, 0x96, 0x5a, 0x01, 0x21, 0x0e, 0x61, - 0xd0, 0x26, 0xcc, 0xd8, 0xd3, 0x6f, 0xc8, 0xf9, 0x0e, 0x8c, 0xef, 0xc2, 0x39, 0x8a, 0xfc, 0x9f, - 0x69, 0xb5, 0x79, 0x0e, 0xdf, 0x3f, 0xb9, 0x07, 0x16, 0x9e, 0x00, 0xe4, 0x3e, 0x34, 0x07, 0x66, - 0xc5, 0x7e, 0x54, 0x38, 0xe6, 0xdd, 0xe3, 0x38, 0x66, 0x7c, 0x0f, 0x15, 0x16, 0x5d, 0xc1, 0x60, - 0x20, 0x88, 0xbf, 0x7f, 0x5c, 0xa1, 0xbe, 0xe7, 0x68, 0x74, 0x78, 0xea, 0xb1, 0x73, 0x37, 0x11, - 0x3b, 0x37, 0x0a, 0x1a, 0x38, 0xa6, 0x69, 0x6e, 0xfc, 0xfc, 0x57, 0x09, 0xae, 0x8c, 0x51, 0x9f, - 0x45, 0x6c, 0x21, 0xc9, 0xd8, 0xf2, 0xe5, 0xe3, 0x5a, 0x98, 0x13, 0x5f, 0x9e, 0x41, 0x86, 0x7d, - 0xdc, 0x65, 0x6f, 0x02, 0xd8, 0x8e, 0x76, 0xa0, 0xe9, 0x64, 0x20, 0x3a, 0x0c, 0xab, 0xd1, 0x33, - 0xe9, 0x84, 0x33, 0x38, 0x46, 0x85, 0x7e, 0x05, 0x96, 0x54, 0xb2, 0xab, 0x78, 0x3a, 0x5d, 0x53, - 0xd5, 0x75, 0xc5, 0x56, 0x7a, 0x9a, 0xae, 0x51, 0x4d, 0x5c, 0x02, 0xd6, 0xda, 0xb7, 0xfd, 0xce, - 0xbf, 0x2c, 0x8a, 0xe7, 0xa3, 0xe6, 0x67, 0x27, 0x6f, 0x92, 0x02, 0xe2, 0x21, 0xce, 0x11, 0x82, - 0x7e, 0x55, 0x82, 0x86, 0x43, 0x3e, 0xf0, 0x34, 0x87, 0xa8, 0x1b, 0x8e, 0x65, 0x27, 0x34, 0x28, - 0x73, 0x0d, 0xee, 0x1e, 0x8e, 0x9a, 0x0d, 0x9c, 0x43, 0x53, 0x44, 0x87, 0x5c, 0x41, 0x88, 0xc2, - 0x65, 0x45, 0xd7, 0xad, 0x0f, 0x49, 0x72, 0x05, 0x66, 0xb8, 0xfc, 0xf6, 0xe1, 0xa8, 0x79, 0x79, - 0x6d, 0x7c, 0xba, 0x88, 0xe8, 0x2c, 0x78, 0xb4, 0x0a, 0xb3, 0x07, 0x96, 0xee, 0x19, 0xc4, 0x6d, - 0x54, 0xb8, 0x24, 0x16, 0x69, 0x67, 0x1f, 0xfb, 0x43, 0xcf, 0x59, 0xa1, 0xd3, 0xe5, 0x3b, 0xd6, - 0x80, 0x0a, 0xdd, 0x82, 0xfa, 0x9e, 0xe5, 0x52, 0xf1, 0xae, 0xf3, 0xb2, 0xa8, 0x1a, 0x05, 0x97, - 0x7b, 0xd1, 0x14, 0x8e, 0xd3, 0x21, 0x03, 0x6a, 0x7b, 0xe2, 0x44, 0xdb, 0x6d, 0xcc, 0x4e, 0x95, - 0xf7, 0x12, 0x27, 0xe2, 0x51, 0xdd, 0x16, 0x0c, 0xbb, 0x38, 0x92, 0xc0, 0xf6, 0x7d, 0xfc, 0xcf, - 0xfd, 0x0d, 0xde, 0x13, 0x52, 0x8d, 0x42, 0xd0, 0x3d, 0x7f, 0x18, 0x07, 0xf3, 0x01, 0xe9, 0xfd, - 0xce, 0x3a, 0x6f, 0xe1, 0x48, 0x91, 0xde, 0xef, 0xac, 0xe3, 0x60, 0x1e, 0xd9, 0x30, 0xeb, 0x92, - 0x4d, 0xcd, 0xf4, 0x9e, 0x36, 0x80, 0xbf, 0xba, 0xb7, 0x8b, 0x5e, 0x5c, 0xdd, 0xe6, 0xdc, 0xa9, - 0xdb, 0xf2, 0x48, 0xa2, 0x98, 0xc7, 0x81, 0x18, 0xf4, 0x14, 0x6a, 0x8e, 0x67, 0xae, 0xb9, 0x3b, - 0x2e, 0x71, 0x1a, 0x75, 0x2e, 0xb3, 0x68, 0x54, 0xc6, 0x01, 0x7f, 0x5a, 0x6a, 0xb8, 0x82, 0x21, - 0x05, 0x8e, 0x84, 0xa1, 0xdf, 0x96, 0x00, 0xb9, 0x9e, 0x6d, 0xeb, 0xc4, 0x20, 0x26, 0x55, 0x74, - 0x7e, 0x61, 0xef, 0x36, 0x2e, 0x70, 0x1d, 0x3a, 0x85, 0x2f, 0xec, 0xd2, 0x40, 0x69, 0x65, 0xc2, - 0x03, 0x80, 0x71, 0x52, 0x9c, 0xa1, 0x07, 0x7b, 0x14, 0xbb, 0x2e, 0xff, 0xdd, 0x98, 0x9b, 0xea, - 0x51, 0x64, 0x37, 0x2e, 0x44, 0x8f, 0x42, 0xcc, 0xe3, 0x40, 0x0c, 0x7a, 0x0c, 0x4b, 0x0e, 0x51, - 0xd4, 0x47, 0xa6, 0x3e, 0xc4, 0x96, 0x45, 0xef, 0x68, 0x3a, 0x71, 0x87, 0x2e, 0x25, 0x46, 0x63, - 0x9e, 0xbb, 0x4d, 0xd8, 0xa2, 0x8c, 0x33, 0xa9, 0x70, 0x0e, 0x37, 0xef, 0x35, 0x16, 0xf7, 0x4c, - 0xa7, 0xfb, 0x09, 0xc2, 0xf1, 0x7a, 0x8d, 0x23, 0x15, 0x4f, 0xad, 0xd7, 0x38, 0x26, 0x62, 0xf2, - 0xf9, 0xdb, 0x7f, 0x95, 0xe0, 0x72, 0x44, 0x7c, 0xe4, 0x5e, 0xe3, 0x0c, 0x96, 0x33, 0x38, 0x8d, - 0xcb, 0x3e, 0x23, 0x2b, 0x9f, 0xe5, 0x19, 0xd9, 0x49, 0x35, 0x39, 0xf3, 0xf6, 0xdf, 0x68, 0x15, - 0xff, 0x0f, 0xb4, 0xff, 0x46, 0xca, 0xe6, 0x14, 0x32, 0x7f, 0x52, 0x8a, 0x5b, 0xf4, 0xff, 0xa9, - 0xc7, 0x34, 0xa3, 0xe5, 0x73, 0xa6, 0x58, 0xcb, 0xa7, 0xfc, 0x2f, 0x65, 0x58, 0x48, 0xbf, 0xb4, - 0x89, 0x56, 0x43, 0xe9, 0x85, 0xad, 0x86, 0x1d, 0x58, 0xdc, 0xf5, 0x74, 0x7d, 0xc8, 0x17, 0x24, - 0x76, 0x41, 0xef, 0x9f, 0x3d, 0xbe, 0x22, 0x38, 0x17, 0xef, 0x64, 0xd0, 0xe0, 0x4c, 0xce, 0x9c, - 0xb6, 0xc9, 0xf2, 0x54, 0x6d, 0x93, 0x6f, 0xc3, 0x9c, 0xc3, 0xbf, 0x0e, 0x49, 0xf6, 0x0d, 0x84, - 0x87, 0xe3, 0x38, 0x3e, 0x89, 0x93, 0xb4, 0xd9, 0x2d, 0x90, 0x95, 0x29, 0x5a, 0x20, 0x4f, 0xa2, - 0x67, 0x31, 0x23, 0xf6, 0xbd, 0xb0, 0x67, 0xf1, 0x15, 0x58, 0x16, 0x6c, 0xec, 0xff, 0xba, 0x65, - 0x52, 0xc7, 0xd2, 0x75, 0xe2, 0x6c, 0x78, 0x86, 0x31, 0x94, 0xdf, 0x85, 0xf9, 0x64, 0xe3, 0xac, - 0xff, 0xe4, 0xfd, 0x5e, 0x5e, 0xd1, 0x60, 0x10, 0x7b, 0xf2, 0xfe, 0x38, 0x0e, 0x29, 0xe4, 0x8f, - 0x24, 0xb8, 0x9a, 0xd3, 0x7b, 0x88, 0xde, 0x87, 0x79, 0x43, 0x79, 0x1a, 0x6b, 0xea, 0x14, 0xa1, - 0xa5, 0xe8, 0x2e, 0x9b, 0x9f, 0x1d, 0x6e, 0x25, 0x90, 0x70, 0x0a, 0x99, 0x27, 0x5c, 0xe5, 0x69, - 0xd7, 0x73, 0x06, 0x64, 0xca, 0xbd, 0x3c, 0x7f, 0x7d, 0xb7, 0x04, 0x06, 0x0e, 0xd1, 0xe4, 0x1f, - 0x49, 0xd0, 0xc8, 0xab, 0xbe, 0xd0, 0xad, 0x44, 0x87, 0xe4, 0xa7, 0x52, 0x1d, 0x92, 0x97, 0xc6, - 0xf8, 0xce, 0xa8, 0x3f, 0xf2, 0xc7, 0x12, 0x2c, 0x65, 0x57, 0xa9, 0xe8, 0xe7, 0x13, 0x1a, 0x37, - 0x53, 0x1a, 0x5f, 0x4c, 0x71, 0x09, 0x7d, 0xf7, 0x60, 0x5e, 0xd4, 0xb2, 0x02, 0xe6, 0x08, 0x1f, - 0x91, 0x1e, 0x84, 0x85, 0x72, 0x50, 0x95, 0xf1, 0xe7, 0x98, 0x1c, 0xc3, 0x29, 0x5c, 0xf9, 0x77, - 0x4b, 0x50, 0xe1, 0x6d, 0x43, 0xa7, 0x58, 0x42, 0x7d, 0x2d, 0x51, 0x42, 0x15, 0xbd, 0x58, 0xe4, - 0xda, 0xe5, 0x56, 0x4f, 0xbd, 0x54, 0xf5, 0xf4, 0xd6, 0x54, 0xe8, 0x93, 0x0b, 0xa7, 0x2f, 0x40, - 0x2d, 0x54, 0xa2, 0x58, 0xa0, 0x66, 0x65, 0x6a, 0x3d, 0x26, 0xa2, 0x60, 0x98, 0x3f, 0x48, 0x64, - 0xca, 0x69, 0xbe, 0x76, 0x8e, 0xc9, 0x6e, 0x05, 0xa9, 0xd2, 0xff, 0x20, 0x26, 0x6a, 0xfc, 0x1b, - 0xcf, 0xa0, 0xef, 0xc2, 0xbc, 0xff, 0xc9, 0x78, 0x78, 0x86, 0x56, 0xe6, 0xde, 0x1b, 0x7e, 0x68, - 0xb5, 0x9d, 0x98, 0xc5, 0x29, 0xea, 0xe5, 0xb7, 0x61, 0x2e, 0x21, 0xac, 0xd0, 0xf7, 0x2b, 0x7f, - 0x29, 0xc1, 0x62, 0x56, 0xab, 0x22, 0xba, 0x06, 0x33, 0xfb, 0x9a, 0xe8, 0xad, 0x88, 0xf5, 0xa3, - 0xfc, 0xa2, 0x66, 0xaa, 0x98, 0xcf, 0x84, 0x9f, 0x1f, 0x95, 0x72, 0x3f, 0x3f, 0xba, 0x09, 0xa0, - 0xd8, 0x9a, 0xf8, 0x0c, 0x5f, 0x58, 0x15, 0x3a, 0x6f, 0xf4, 0x81, 0x3e, 0x8e, 0x51, 0xf1, 0x0e, - 0xa4, 0x48, 0x1f, 0x51, 0x16, 0x46, 0xad, 0x41, 0x31, 0x55, 0xe3, 0x74, 0xf2, 0x5f, 0x49, 0xf0, - 0xa9, 0x17, 0xee, 0xe0, 0x50, 0x3b, 0x11, 0x1e, 0x5a, 0xa9, 0xf0, 0xb0, 0x92, 0x0f, 0x70, 0x86, - 0xdd, 0xdf, 0xdf, 0x2f, 0x01, 0xda, 0xde, 0xd3, 0x1c, 0xb5, 0xa3, 0x38, 0x74, 0x88, 0x85, 0x81, - 0xa7, 0x18, 0x30, 0x6e, 0x41, 0x5d, 0x25, 0x6e, 0xdf, 0xd1, 0xf8, 0x22, 0x89, 0xc7, 0x19, 0xae, - 0xf8, 0x46, 0x34, 0x85, 0xe3, 0x74, 0x68, 0x00, 0x55, 0x51, 0x2b, 0x06, 0x2d, 0x2c, 0x45, 0x0b, - 0xdf, 0xc8, 0x03, 0xa2, 0xf7, 0x43, 0x0c, 0xb8, 0x38, 0x04, 0x97, 0x7f, 0x20, 0xc1, 0xd2, 0xf8, - 0x82, 0x6c, 0xf8, 0x0d, 0x1a, 0xa7, 0xb5, 0x28, 0xaf, 0xc0, 0x0c, 0x47, 0x65, 0xab, 0x71, 0xc1, - 0x3f, 0x09, 0x67, 0x12, 0x31, 0x1f, 0x95, 0x3f, 0x91, 0x60, 0x39, 0x5b, 0xa5, 0xb3, 0xd8, 0x6f, - 0xbc, 0x9f, 0xdc, 0x6f, 0x14, 0x3d, 0x55, 0xc8, 0x56, 0x3c, 0x67, 0xef, 0xf1, 0x51, 0xe6, 0xe2, - 0x9f, 0x85, 0x95, 0xbb, 0x49, 0x2b, 0xd7, 0x8e, 0x6d, 0x65, 0xb6, 0x85, 0xed, 0xcf, 0x3d, 0xfb, - 0x78, 0xe5, 0xdc, 0x4f, 0x3e, 0x5e, 0x39, 0xf7, 0xcf, 0x1f, 0xaf, 0x9c, 0xfb, 0xde, 0xe1, 0x8a, - 0xf4, 0xec, 0x70, 0x45, 0xfa, 0xc9, 0xe1, 0x8a, 0xf4, 0x6f, 0x87, 0x2b, 0xd2, 0x0f, 0x7e, 0xba, - 0x72, 0xee, 0x6b, 0xb3, 0x02, 0xf3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x14, 0xb2, 0x70, 0xfe, - 0x25, 0x46, 0x00, 0x00, + // 3866 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe4, 0x5b, 0x4d, 0x6c, 0x1c, 0xc9, + 0x75, 0x56, 0xcf, 0x90, 0x22, 0xf9, 0x46, 0xa4, 0xc8, 0x12, 0x45, 0xcd, 0x6a, 0x77, 0x39, 0x72, + 0x1b, 0xb1, 0x65, 0x60, 0x77, 0x18, 0x29, 0x2b, 0x67, 0xbd, 0xbb, 0x5e, 0x9b, 0x43, 0xea, 0x37, + 0xa4, 0x34, 0xae, 0x21, 0xe5, 0xcd, 0xda, 0x59, 0xa7, 0x66, 0xba, 0x38, 0xec, 0x65, 0xff, 0x6d, + 0x77, 0x35, 0xcd, 0xb1, 0x11, 0xd8, 0x40, 0x90, 0xab, 0xe3, 0x5b, 0x02, 0x24, 0x39, 0xe4, 0x10, + 0xe4, 0x14, 0xc3, 0x06, 0x02, 0x18, 0xc8, 0x21, 0xb9, 0xe4, 0x47, 0x09, 0x1c, 0xc0, 0x09, 0x10, + 0x24, 0x08, 0x1c, 0x3a, 0xcb, 0x38, 0xb9, 0x07, 0xb9, 0x29, 0x97, 0xa0, 0xaa, 0xab, 0x7f, 0xa7, + 0x7b, 0xa4, 0x1e, 0x72, 0x84, 0x00, 0xbe, 0xcd, 0x54, 0xbd, 0xf7, 0xbd, 0x57, 0x55, 0xaf, 0xde, + 0x7b, 0x55, 0xf5, 0x1a, 0x3e, 0x7f, 0xf0, 0xa6, 0xd7, 0xd4, 0xed, 0xb5, 0x03, 0xbf, 0x4b, 0x5d, + 0x8b, 0x32, 0xea, 0xad, 0x39, 0x07, 0xfd, 0x35, 0xe2, 0xe8, 0xde, 0x1a, 0x3d, 0x62, 0xd4, 0xf2, + 0x74, 0xdb, 0xf2, 0xd6, 0x0e, 0x6f, 0x74, 0x29, 0x23, 0x37, 0xd6, 0xfa, 0xd4, 0xa2, 0x2e, 0x61, + 0x54, 0x6b, 0x3a, 0xae, 0xcd, 0x6c, 0xf4, 0x7a, 0xc0, 0xde, 0x8c, 0xd9, 0x9b, 0xce, 0x41, 0xbf, + 0xc9, 0xd9, 0x9b, 0x31, 0x7b, 0x53, 0xb2, 0x5f, 0x7d, 0xbd, 0xaf, 0xb3, 0x7d, 0xbf, 0xdb, 0xec, + 0xd9, 0xe6, 0x5a, 0xdf, 0xee, 0xdb, 0x6b, 0x02, 0xa5, 0xeb, 0xef, 0x89, 0x7f, 0xe2, 0x8f, 0xf8, + 0x15, 0xa0, 0x5f, 0xbd, 0x59, 0xa8, 0xdc, 0x9a, 0x4b, 0x3d, 0xdb, 0x77, 0x7b, 0x34, 0xab, 0xd1, + 0xd5, 0xd7, 0x8a, 0x79, 0x0e, 0x87, 0xf4, 0x1f, 0x21, 0xc1, 0x5b, 0x33, 0x29, 0x23, 0x79, 0x3c, + 0xaf, 0xe7, 0xf3, 0xb8, 0xbe, 0xc5, 0x74, 0x73, 0x58, 0xa1, 0x37, 0x46, 0x93, 0x7b, 0xbd, 0x7d, + 0x6a, 0x92, 0x21, 0xae, 0x1b, 0xf9, 0x5c, 0x3e, 0xd3, 0x8d, 0x35, 0xdd, 0x62, 0x1e, 0x73, 0xb3, + 0x2c, 0x6a, 0x13, 0x60, 0xbd, 0x7d, 0xff, 0x31, 0x75, 0xf9, 0x9c, 0xa3, 0x6b, 0x30, 0x65, 0x11, + 0x93, 0xd6, 0x95, 0x6b, 0xca, 0xf5, 0xb9, 0xd6, 0x85, 0x27, 0xc7, 0x8d, 0x73, 0x27, 0xc7, 0x8d, + 0xa9, 0x87, 0xc4, 0xa4, 0x58, 0xf4, 0xa8, 0x5f, 0x85, 0xe5, 0x8d, 0xf6, 0xee, 0x0e, 0x71, 0xfb, + 0x94, 0xed, 0x32, 0xdd, 0xd0, 0xbf, 0x41, 0x18, 0xe7, 0xdc, 0x84, 0x45, 0x26, 0x1a, 0xdb, 0xd4, + 0xed, 0x51, 0x8b, 0x91, 0x7e, 0x80, 0x32, 0xdd, 0xaa, 0x4b, 0x94, 0xc5, 0x9d, 0x4c, 0x3f, 0x1e, + 0xe2, 0x50, 0x7f, 0x47, 0x81, 0x97, 0x36, 0x7c, 0x8f, 0xd9, 0xe6, 0x36, 0x65, 0xae, 0xde, 0xdb, + 0xf0, 0x5d, 0x97, 0x5a, 0xac, 0xc3, 0x08, 0xf3, 0xbd, 0x67, 0x6b, 0x87, 0xde, 0x83, 0xe9, 0x43, + 0x62, 0xf8, 0xb4, 0x5e, 0xb9, 0xa6, 0x5c, 0xaf, 0xdd, 0x7c, 0xad, 0x59, 0x68, 0x69, 0xcd, 0xd0, + 0x16, 0x9a, 0x5f, 0xf2, 0x89, 0xc5, 0x74, 0x36, 0x68, 0x2d, 0x4b, 0xc0, 0x0b, 0x52, 0xea, 0x63, + 0x8e, 0x84, 0x03, 0x40, 0xf5, 0x3b, 0x0a, 0xbc, 0x5a, 0xa8, 0xd9, 0x96, 0xee, 0x31, 0x64, 0xc2, + 0xb4, 0xce, 0xa8, 0xe9, 0xd5, 0x95, 0x6b, 0xd5, 0xeb, 0xb5, 0x9b, 0xf7, 0x9a, 0xa5, 0xac, 0xbc, + 0x59, 0x08, 0xde, 0x9a, 0x97, 0x7a, 0x4d, 0xdf, 0xe7, 0xf0, 0x38, 0x90, 0xa2, 0xfe, 0xb6, 0x02, + 0x28, 0xc9, 0x13, 0xcc, 0xee, 0x73, 0xcc, 0xd1, 0x97, 0x4f, 0x33, 0x47, 0x97, 0x24, 0x60, 0x2d, + 0x10, 0x97, 0x9a, 0xa2, 0x6f, 0x2b, 0xb0, 0x32, 0xac, 0x91, 0x98, 0x9b, 0xbd, 0xf4, 0xdc, 0xac, + 0x9f, 0x62, 0x6e, 0x02, 0xd4, 0x82, 0x49, 0xf9, 0x93, 0x0a, 0xcc, 0x6d, 0x12, 0x6a, 0xda, 0x56, + 0x87, 0x32, 0xf4, 0x1e, 0xcc, 0xf2, 0xed, 0xa8, 0x11, 0x46, 0xc4, 0x7c, 0xd4, 0x6e, 0x5e, 0x1f, + 0x31, 0xd8, 0xc3, 0x1b, 0xcd, 0x47, 0xdd, 0x0f, 0x69, 0x8f, 0x6d, 0x53, 0x46, 0x5a, 0x48, 0xe2, + 0x43, 0xdc, 0x86, 0x23, 0x34, 0xf4, 0x01, 0x4c, 0x79, 0x0e, 0xed, 0xc9, 0x29, 0x7c, 0xa7, 0xe4, + 0x70, 0x22, 0x0d, 0x3b, 0x0e, 0xed, 0xc5, 0x6b, 0xc4, 0xff, 0x61, 0x81, 0x8b, 0xf6, 0xe0, 0xbc, + 0x27, 0x16, 0xbf, 0x5e, 0x15, 0x12, 0xde, 0x1d, 0x5b, 0x42, 0x60, 0x42, 0x0b, 0x52, 0xc6, 0xf9, + 0xe0, 0x3f, 0x96, 0xe8, 0xea, 0xdf, 0x29, 0x30, 0x1f, 0xd1, 0x8a, 0x95, 0x7a, 0x7f, 0x68, 0xce, + 0x5e, 0x1b, 0x25, 0x9b, 0xd3, 0xf2, 0x99, 0xe3, 0xbc, 0x62, 0xde, 0x16, 0xa5, 0xa4, 0xd9, 0xb0, + 0x25, 0x31, 0x6b, 0xbf, 0x16, 0x5a, 0x41, 0x45, 0x58, 0xc1, 0x9b, 0xe3, 0x0e, 0xaa, 0x60, 0xf1, + 0xff, 0x36, 0x39, 0x18, 0x3e, 0x99, 0xe8, 0x2b, 0x30, 0xeb, 0x51, 0x83, 0xf6, 0x98, 0xed, 0xca, + 0xc1, 0xdc, 0x78, 0xae, 0xc1, 0x90, 0x2e, 0x35, 0x3a, 0x92, 0xb1, 0x75, 0x81, 0x8f, 0x26, 0xfc, + 0x87, 0x23, 0x40, 0x0e, 0xce, 0xa8, 0xe9, 0x18, 0x84, 0x85, 0x5b, 0xe9, 0xf5, 0xd1, 0xd6, 0xd5, + 0xb6, 0xb5, 0x1d, 0xc9, 0x20, 0x16, 0x3e, 0x9a, 0xaa, 0xb0, 0x15, 0x47, 0x80, 0xea, 0x5f, 0x56, + 0xe0, 0x62, 0x66, 0x11, 0xd1, 0x63, 0x58, 0xe9, 0x05, 0x8e, 0xe1, 0xa1, 0x6f, 0x76, 0xa9, 0xdb, + 0xe9, 0xed, 0x53, 0xcd, 0x37, 0xa8, 0x26, 0x1d, 0xed, 0xaa, 0xc4, 0x5b, 0xd9, 0xc8, 0xa5, 0xc2, + 0x05, 0xdc, 0xe8, 0x01, 0x20, 0x4b, 0x34, 0x6d, 0xeb, 0x9e, 0x17, 0x61, 0x56, 0x04, 0xe6, 0x55, + 0x89, 0x89, 0x1e, 0x0e, 0x51, 0xe0, 0x1c, 0x2e, 0xae, 0xa3, 0x46, 0x3d, 0xdd, 0xa5, 0x5a, 0x56, + 0xc7, 0x6a, 0x5a, 0xc7, 0xcd, 0x5c, 0x2a, 0x5c, 0xc0, 0x8d, 0x6e, 0x41, 0x2d, 0x90, 0x86, 0x29, + 0xd1, 0x06, 0xf5, 0x29, 0x01, 0x16, 0x39, 0xa3, 0x87, 0x71, 0x17, 0x4e, 0xd2, 0xa9, 0xdf, 0xaf, + 0x00, 0x6c, 0x52, 0xc7, 0xb0, 0x07, 0x26, 0xb5, 0x26, 0xe9, 0x10, 0xbe, 0x96, 0x72, 0x08, 0x9f, + 0x2f, 0x6b, 0xd9, 0x91, 0x8a, 0x85, 0x1e, 0xa1, 0x9f, 0xf1, 0x08, 0x5f, 0x18, 0x5f, 0xc4, 0x68, + 0x97, 0xf0, 0x6f, 0x55, 0xb8, 0x14, 0x13, 0x6f, 0xd8, 0x96, 0xa6, 0x8b, 0x00, 0xff, 0x36, 0x4c, + 0xb1, 0x81, 0x13, 0x06, 0x96, 0x4f, 0x87, 0x2a, 0xee, 0x0c, 0x1c, 0xfa, 0xf4, 0xb8, 0x71, 0x25, + 0x87, 0x85, 0x77, 0x61, 0xc1, 0x84, 0x1e, 0x47, 0xda, 0x57, 0x04, 0xfb, 0xbb, 0x69, 0xe1, 0x4f, + 0x8f, 0x1b, 0x23, 0x33, 0xb0, 0x66, 0x84, 0x99, 0x56, 0x16, 0x7d, 0x0a, 0xce, 0xbb, 0x94, 0x78, + 0xb6, 0x25, 0x2c, 0x62, 0x2e, 0x1e, 0x14, 0x16, 0xad, 0x58, 0xf6, 0xa2, 0xcf, 0xc0, 0x8c, 0x49, + 0x3d, 0x8f, 0x27, 0x25, 0xd3, 0x82, 0xf0, 0xa2, 0x24, 0x9c, 0xd9, 0x0e, 0x9a, 0x71, 0xd8, 0x8f, + 0xf6, 0x61, 0xc1, 0x20, 0x1e, 0xdb, 0x75, 0x34, 0xc2, 0xe8, 0x8e, 0x6e, 0xd2, 0xfa, 0xf9, 0x67, + 0x59, 0x4a, 0xec, 0x39, 0x38, 0x7d, 0x6b, 0x45, 0x62, 0x2f, 0x6c, 0xa5, 0x70, 0x70, 0x06, 0x17, + 0x31, 0x40, 0xbc, 0x65, 0xc7, 0x25, 0x96, 0x17, 0x4c, 0x18, 0x97, 0x36, 0x53, 0x52, 0x5a, 0xb4, + 0x43, 0xb7, 0x86, 0xb0, 0x70, 0x0e, 0xbe, 0xfa, 0x23, 0x05, 0x16, 0xe2, 0xc5, 0x9a, 0xb8, 0xcf, + 0xff, 0x20, 0xed, 0xf3, 0x3f, 0x37, 0xb6, 0xd9, 0x16, 0x38, 0xfd, 0xdf, 0xad, 0x02, 0x8a, 0x89, + 0xb0, 0x6d, 0x18, 0x5d, 0xd2, 0x3b, 0x78, 0x8e, 0x34, 0xe8, 0x8f, 0x14, 0x40, 0xbe, 0x58, 0x0c, + 0x6d, 0xdd, 0xb2, 0x6c, 0x26, 0xd2, 0xd8, 0x50, 0xcd, 0x5f, 0x1d, 0x5b, 0xcd, 0x50, 0x83, 0xe6, + 0xee, 0x10, 0xf6, 0x6d, 0x8b, 0xb9, 0x83, 0x78, 0xbd, 0x86, 0x09, 0x70, 0x8e, 0x42, 0xe8, 0x23, + 0x00, 0x57, 0x62, 0xee, 0xd8, 0x72, 0xf3, 0x97, 0xf5, 0x2f, 0xa1, 0x52, 0x1b, 0xb6, 0xb5, 0xa7, + 0xf7, 0x63, 0x57, 0x86, 0x23, 0x60, 0x9c, 0x10, 0x72, 0xf5, 0x36, 0x5c, 0x29, 0xd0, 0x1e, 0x2d, + 0x42, 0xf5, 0x80, 0x0e, 0x82, 0x69, 0xc5, 0xfc, 0x27, 0x5a, 0x4e, 0xa6, 0x93, 0x73, 0x32, 0x17, + 0x7c, 0xab, 0xf2, 0xa6, 0xa2, 0xfe, 0x6c, 0x3a, 0x69, 0x69, 0x22, 0x20, 0x5f, 0x87, 0x59, 0x97, + 0x3a, 0x86, 0xde, 0x23, 0x9e, 0x0c, 0x5a, 0x22, 0xba, 0x62, 0xd9, 0x86, 0xa3, 0xde, 0x54, 0xe8, + 0xae, 0x4c, 0x32, 0x74, 0x57, 0xcf, 0x38, 0x74, 0x23, 0x1b, 0x66, 0x3d, 0xc6, 0x8f, 0x58, 0xfd, + 0x20, 0x4e, 0x95, 0x4f, 0x77, 0x93, 0xbe, 0x3a, 0x00, 0x8a, 0x05, 0x86, 0x2d, 0x38, 0x12, 0x82, + 0xd6, 0xe1, 0xa2, 0xa9, 0x5b, 0x22, 0xe0, 0x75, 0x68, 0xcf, 0xb6, 0x34, 0x4f, 0x38, 0xb9, 0xe9, + 0xd6, 0x15, 0xc9, 0x74, 0x71, 0x3b, 0xdd, 0x8d, 0xb3, 0xf4, 0x68, 0x0b, 0x96, 0x5d, 0x7a, 0xa8, + 0x73, 0x35, 0xee, 0xe9, 0x1e, 0xb3, 0xdd, 0xc1, 0x96, 0x6e, 0xea, 0x4c, 0xb8, 0xbe, 0xe9, 0x56, + 0xfd, 0xe4, 0xb8, 0xb1, 0x8c, 0x73, 0xfa, 0x71, 0x2e, 0x17, 0xf7, 0xca, 0x0e, 0xf1, 0x3d, 0xaa, + 0x09, 0x67, 0x36, 0x1b, 0x7b, 0xe5, 0xb6, 0x68, 0xc5, 0xb2, 0x17, 0x99, 0x29, 0xd3, 0x9e, 0x3d, + 0x0b, 0xd3, 0x5e, 0x28, 0x36, 0x6b, 0xb4, 0x0b, 0x57, 0x1c, 0xd7, 0xee, 0xbb, 0xd4, 0xf3, 0x36, + 0x29, 0xd1, 0x0c, 0xdd, 0xa2, 0xe1, 0x7c, 0xcd, 0x89, 0x71, 0xbe, 0x7c, 0x72, 0xdc, 0xb8, 0xd2, + 0xce, 0x27, 0xc1, 0x45, 0xbc, 0xea, 0x4f, 0xab, 0xb0, 0x98, 0x8d, 0xae, 0x3c, 0xa7, 0xb2, 0xbb, + 0x1e, 0x75, 0x0f, 0xa9, 0x76, 0x37, 0x38, 0x71, 0xeb, 0xb6, 0x25, 0x4c, 0xbe, 0x1a, 0x7b, 0x80, + 0x47, 0x43, 0x14, 0x38, 0x87, 0x0b, 0xbd, 0x96, 0xd8, 0x34, 0x41, 0x56, 0x16, 0x59, 0x43, 0xce, + 0xc6, 0x59, 0x87, 0x8b, 0xd2, 0x8b, 0x84, 0x9d, 0x32, 0xf5, 0x8a, 0xac, 0x61, 0x37, 0xdd, 0x8d, + 0xb3, 0xf4, 0xe8, 0x2e, 0x2c, 0x91, 0x43, 0xa2, 0x1b, 0xa4, 0x6b, 0xd0, 0x08, 0x24, 0x48, 0xb9, + 0x5e, 0x92, 0x20, 0x4b, 0xeb, 0x59, 0x02, 0x3c, 0xcc, 0x83, 0xb6, 0xe1, 0x92, 0x6f, 0x0d, 0x43, + 0x05, 0xd6, 0xf9, 0xb2, 0x84, 0xba, 0xb4, 0x3b, 0x4c, 0x82, 0xf3, 0xf8, 0xd0, 0x21, 0x40, 0x2f, + 0x4c, 0x04, 0xbc, 0xfa, 0x79, 0xe1, 0xa9, 0x5b, 0x63, 0xef, 0xad, 0x28, 0xa7, 0x88, 0xfd, 0x61, + 0xd4, 0xe4, 0xe1, 0x84, 0x24, 0xf5, 0x1f, 0x94, 0x64, 0x8c, 0x09, 0x77, 0x20, 0x7a, 0x2b, 0x95, + 0x11, 0x7d, 0x2a, 0x93, 0x11, 0xad, 0x0c, 0x73, 0x24, 0x12, 0xa2, 0x6f, 0xc1, 0x3c, 0xb7, 0x4c, + 0xdd, 0xea, 0x07, 0xab, 0x21, 0x7d, 0xdc, 0x9d, 0x31, 0xac, 0x3f, 0xc2, 0x48, 0xc4, 0xca, 0xa5, + 0x93, 0xe3, 0xc6, 0x7c, 0xaa, 0x13, 0xa7, 0xe5, 0xa9, 0x3f, 0x50, 0x60, 0xe5, 0x4e, 0xe7, 0xae, + 0x6b, 0xfb, 0x4e, 0xa8, 0xde, 0x23, 0x27, 0x88, 0x38, 0xbf, 0x0c, 0x53, 0xae, 0x6f, 0x84, 0xe3, + 0xfa, 0x64, 0x38, 0x2e, 0xec, 0x1b, 0x7c, 0x5c, 0x97, 0x32, 0x5c, 0xc1, 0xa0, 0x38, 0x03, 0xfa, + 0x00, 0xce, 0xbb, 0xc4, 0xea, 0xd3, 0x30, 0x8a, 0x7e, 0xb6, 0xe4, 0x68, 0xee, 0x6f, 0x62, 0xce, + 0x9e, 0xc8, 0xe2, 0x04, 0x1a, 0x96, 0xa8, 0xea, 0x1f, 0x28, 0x70, 0xf1, 0xde, 0xce, 0x4e, 0xfb, + 0xbe, 0x25, 0x36, 0x62, 0x9b, 0xb0, 0x7d, 0x1e, 0xe8, 0x1d, 0xc2, 0xf6, 0xb3, 0x81, 0x9e, 0xf7, + 0x61, 0xd1, 0x83, 0xf6, 0x61, 0x86, 0x3b, 0x00, 0x6a, 0x69, 0x63, 0x66, 0xe7, 0x52, 0x5c, 0x2b, + 0x00, 0x89, 0x53, 0x47, 0xd9, 0x80, 0x43, 0x78, 0xf5, 0x9b, 0xb0, 0x9c, 0x50, 0x8f, 0xcf, 0x97, + 0xb8, 0x1f, 0x41, 0x3d, 0x98, 0xe6, 0x9a, 0x84, 0xb7, 0x1f, 0x65, 0x0f, 0xf3, 0x99, 0x21, 0xc7, + 0x89, 0x10, 0xff, 0xe7, 0xe1, 0x00, 0x5b, 0xfd, 0xe7, 0x0a, 0x5c, 0xb9, 0x67, 0xbb, 0xfa, 0x37, + 0x6c, 0x8b, 0x11, 0xa3, 0x6d, 0x6b, 0xeb, 0x3e, 0xb3, 0xbd, 0x1e, 0x31, 0xa8, 0x3b, 0xc1, 0x73, + 0x8f, 0x91, 0x3a, 0xf7, 0x3c, 0x28, 0x3b, 0xb2, 0x7c, 0x7d, 0x0b, 0x0f, 0x41, 0x2c, 0x73, 0x08, + 0xda, 0x3a, 0x23, 0x79, 0xa3, 0x4f, 0x44, 0xff, 0xa5, 0xc0, 0xcb, 0x05, 0x9c, 0x13, 0x4f, 0x9f, + 0x0f, 0xd2, 0xe9, 0xf3, 0x9d, 0xb3, 0x19, 0x70, 0x41, 0x2e, 0xfd, 0xbf, 0x95, 0xc2, 0x81, 0x8a, + 0xec, 0xed, 0x23, 0x98, 0x15, 0xff, 0x30, 0xdd, 0x93, 0x03, 0xdd, 0x28, 0xa9, 0x4f, 0xc7, 0xef, + 0x86, 0x77, 0x8a, 0x98, 0xee, 0x51, 0x97, 0x5a, 0x3d, 0x9a, 0xc8, 0x6d, 0x24, 0x38, 0x8e, 0xc4, + 0xa0, 0x1b, 0x50, 0x13, 0xb9, 0x4a, 0x2a, 0xfc, 0x5d, 0xe4, 0x67, 0xfe, 0xed, 0xb8, 0x19, 0x27, + 0x69, 0xd0, 0x2d, 0xa8, 0x99, 0xe4, 0x28, 0x13, 0xfc, 0xa2, 0xab, 0x82, 0xed, 0xb8, 0x0b, 0x27, + 0xe9, 0xd0, 0xb7, 0x60, 0xa1, 0xe7, 0xf8, 0x89, 0x2b, 0x6d, 0x99, 0xbc, 0x95, 0x1d, 0x62, 0xde, + 0xed, 0x78, 0x0b, 0xf1, 0xe3, 0xe0, 0x46, 0x7b, 0x37, 0xd1, 0x86, 0x33, 0xe2, 0xd4, 0xbf, 0xa8, + 0xc2, 0xab, 0x23, 0x0d, 0x14, 0xdd, 0x19, 0x91, 0x54, 0xac, 0x94, 0x48, 0x28, 0x08, 0xcc, 0xf3, + 0x83, 0xa1, 0x98, 0x6e, 0x71, 0xe6, 0xac, 0x94, 0x3c, 0x73, 0x8a, 0xf0, 0xb2, 0x95, 0x84, 0xc0, + 0x69, 0x44, 0x9e, 0x85, 0xc8, 0xdb, 0xa6, 0xa2, 0x2c, 0x64, 0x23, 0xdd, 0x8d, 0xb3, 0xf4, 0x1c, + 0x42, 0x5e, 0x06, 0x65, 0x72, 0x90, 0x08, 0x62, 0x33, 0xdd, 0x8d, 0xb3, 0xf4, 0xc8, 0x84, 0x86, + 0x44, 0x4d, 0xcf, 0x7d, 0xe2, 0x8d, 0x22, 0xc8, 0x45, 0x3e, 0x79, 0x72, 0xdc, 0x68, 0x6c, 0x8c, + 0x26, 0xc5, 0xcf, 0xc2, 0x52, 0xb7, 0x61, 0xfe, 0x9e, 0xed, 0xb1, 0xb6, 0xed, 0x32, 0x11, 0xb9, + 0xd0, 0xab, 0x50, 0x35, 0x75, 0x4b, 0x9e, 0x74, 0x6a, 0x52, 0xed, 0x2a, 0xb7, 0x5c, 0xde, 0x2e, + 0xba, 0xc9, 0x91, 0x34, 0xea, 0xb8, 0x9b, 0x1c, 0x61, 0xde, 0xae, 0xde, 0x85, 0x19, 0x19, 0x11, + 0x93, 0x40, 0xd5, 0xd1, 0x40, 0xd5, 0x1c, 0xa0, 0x3f, 0xae, 0xc0, 0x8c, 0x0c, 0x20, 0x13, 0x0c, + 0x05, 0x5f, 0x4d, 0x85, 0x82, 0xb7, 0xc6, 0x0b, 0xb2, 0x85, 0xae, 0x5f, 0xcb, 0xb8, 0xfe, 0x77, + 0xc6, 0xc4, 0x1f, 0xed, 0xea, 0xbf, 0xa7, 0xc0, 0x42, 0x3a, 0xdc, 0x73, 0x77, 0xc2, 0x37, 0x90, + 0xde, 0xa3, 0x0f, 0xe3, 0x0b, 0x85, 0xc8, 0x9d, 0x74, 0xe2, 0x2e, 0x9c, 0xa4, 0x43, 0x34, 0x62, + 0xe3, 0xe6, 0x20, 0x27, 0xa5, 0x59, 0xa0, 0xb4, 0xcf, 0x74, 0xa3, 0x19, 0x3c, 0xd0, 0x35, 0xef, + 0x5b, 0xec, 0x91, 0xdb, 0x61, 0xae, 0x6e, 0xf5, 0x87, 0xc4, 0x08, 0xcb, 0x4a, 0xe2, 0xaa, 0x7f, + 0xad, 0x40, 0x4d, 0x2a, 0x3c, 0xf1, 0x58, 0xf4, 0x95, 0x74, 0x2c, 0xfa, 0xec, 0x98, 0x69, 0x54, + 0x7e, 0xec, 0xf9, 0x61, 0x3c, 0x10, 0x9e, 0x38, 0xf1, 0xbc, 0x6e, 0xdf, 0xf6, 0x58, 0x36, 0xaf, + 0xe3, 0xfb, 0x0b, 0x8b, 0x1e, 0xf4, 0x5b, 0x0a, 0x2c, 0xea, 0x99, 0x54, 0x4b, 0xce, 0xf3, 0x17, + 0xc6, 0x53, 0x2d, 0x82, 0x89, 0xdf, 0x2c, 0xb3, 0x3d, 0x78, 0x48, 0xa4, 0xea, 0xc3, 0x10, 0x15, + 0x22, 0x30, 0xb5, 0xcf, 0x98, 0x33, 0x66, 0x94, 0xcc, 0x4b, 0x22, 0x5b, 0xb3, 0x62, 0xf8, 0x3b, + 0x3b, 0x6d, 0x2c, 0xa0, 0xd5, 0xef, 0x55, 0xa2, 0x09, 0xeb, 0x04, 0x1b, 0x24, 0x4a, 0x73, 0x95, + 0xb3, 0x48, 0x73, 0x6b, 0x79, 0x29, 0x2e, 0x7a, 0x0f, 0xaa, 0xcc, 0x18, 0xf7, 0x32, 0x4f, 0x4a, + 0xd8, 0xd9, 0xea, 0xc4, 0x4e, 0x6a, 0x67, 0xab, 0x83, 0x39, 0x24, 0xfa, 0x1a, 0x4c, 0xf3, 0x43, + 0x04, 0xdf, 0xdf, 0xd5, 0xf1, 0xfd, 0x07, 0x9f, 0xaf, 0xd8, 0xc2, 0xf8, 0x3f, 0x0f, 0x07, 0xb8, + 0xea, 0x37, 0x61, 0x3e, 0xe5, 0x04, 0xd0, 0x87, 0x70, 0xc1, 0xb0, 0x89, 0xd6, 0x22, 0x06, 0xb1, + 0x7a, 0x34, 0x7c, 0x21, 0xfa, 0xc5, 0xd1, 0xee, 0x70, 0x2b, 0xc1, 0x21, 0x9d, 0x49, 0xf4, 0x6e, + 0x9c, 0xec, 0xc3, 0x29, 0x6c, 0x95, 0x00, 0xc4, 0xa3, 0x47, 0x0d, 0x98, 0xe6, 0x26, 0x1c, 0x1c, + 0x08, 0xe6, 0x5a, 0x73, 0x5c, 0x57, 0x6e, 0xd9, 0x1e, 0x0e, 0xda, 0xd1, 0x4d, 0x00, 0x8f, 0xf6, + 0x5c, 0xca, 0x84, 0xcf, 0x09, 0xee, 0xcc, 0x23, 0xef, 0xdb, 0x89, 0x7a, 0x70, 0x82, 0x4a, 0xfd, + 0xbd, 0x0a, 0x54, 0x1f, 0xd8, 0xdd, 0x09, 0x7a, 0xf8, 0xf7, 0x52, 0x1e, 0xbe, 0xec, 0xfe, 0x7f, + 0x60, 0x77, 0x0b, 0xbd, 0xfb, 0xaf, 0x67, 0xbc, 0xfb, 0x9b, 0x63, 0x60, 0x8f, 0xf6, 0xec, 0x3f, + 0xaa, 0xc2, 0x85, 0x07, 0x76, 0x37, 0x7e, 0xcf, 0x78, 0x23, 0x75, 0x7a, 0xbf, 0x96, 0x39, 0xbd, + 0x2f, 0x26, 0x69, 0x5f, 0xc0, 0x43, 0x06, 0x0d, 0x52, 0xb2, 0xb6, 0x6b, 0x77, 0x83, 0x94, 0xac, + 0x5a, 0x32, 0x25, 0xbb, 0x2c, 0x15, 0x11, 0x69, 0x59, 0x04, 0x83, 0xd3, 0xa8, 0x05, 0x4f, 0x0e, + 0x53, 0x93, 0x7d, 0x72, 0x48, 0xbc, 0xd2, 0x4c, 0x3f, 0xef, 0x2b, 0xcd, 0xf9, 0xd1, 0xaf, 0x34, + 0xea, 0x9f, 0x2b, 0x30, 0xf3, 0xc0, 0xee, 0x4e, 0x3c, 0xe6, 0x7d, 0x39, 0x1d, 0xf3, 0x6e, 0x96, + 0xb7, 0xcb, 0x82, 0x78, 0xf7, 0xfd, 0xaa, 0x18, 0x80, 0x70, 0xdd, 0x37, 0xa0, 0xe6, 0x10, 0x97, + 0x18, 0x06, 0x35, 0x74, 0xcf, 0x94, 0xe9, 0xa2, 0x38, 0xe4, 0xb4, 0xe3, 0x66, 0x9c, 0xa4, 0xe1, + 0x2c, 0x3d, 0xdb, 0x74, 0x0c, 0x1a, 0xbe, 0x5a, 0x44, 0x2c, 0x1b, 0x71, 0x33, 0x4e, 0xd2, 0xa0, + 0x47, 0x70, 0x99, 0xf4, 0x98, 0x7e, 0x48, 0xb3, 0x97, 0x9f, 0x55, 0x91, 0x36, 0xbe, 0x74, 0x72, + 0xdc, 0xb8, 0xbc, 0x9e, 0x47, 0x80, 0xf3, 0xf9, 0x52, 0x57, 0xf4, 0x53, 0x67, 0x7d, 0x45, 0xff, + 0x06, 0x5c, 0x20, 0x3e, 0xb3, 0xc3, 0x1e, 0x61, 0x39, 0xb3, 0xad, 0x45, 0xee, 0x66, 0xd7, 0x13, + 0xed, 0x38, 0x45, 0x95, 0xba, 0xd8, 0x3f, 0x7f, 0xd6, 0x6f, 0xf2, 0x7f, 0x56, 0x85, 0xb9, 0xc8, + 0xd1, 0x20, 0x3b, 0x75, 0x19, 0x19, 0xdc, 0xec, 0xbc, 0x5d, 0xde, 0x3c, 0x9e, 0xfb, 0x16, 0x12, + 0xed, 0xc2, 0x9c, 0xc7, 0x88, 0xcb, 0xc6, 0x3a, 0xb1, 0xcd, 0x9f, 0x1c, 0x37, 0xe6, 0x3a, 0x21, + 0x3b, 0x8e, 0x91, 0x90, 0x06, 0x0b, 0xb1, 0x95, 0x8c, 0xe5, 0x7a, 0x82, 0xc3, 0x6d, 0x0a, 0x03, + 0x67, 0x30, 0xb9, 0x0b, 0x08, 0x8c, 0x48, 0x9e, 0xe1, 0x22, 0x17, 0x10, 0x58, 0x1c, 0x96, 0xbd, + 0x68, 0x0d, 0xe6, 0x3c, 0xbf, 0xd7, 0xa3, 0x54, 0xa3, 0x9a, 0x3c, 0x9b, 0x2d, 0x49, 0xd2, 0xb9, + 0x4e, 0xd8, 0x81, 0x63, 0x1a, 0x0e, 0xbc, 0x47, 0x74, 0x83, 0x6a, 0xf2, 0xad, 0x22, 0x02, 0xbe, + 0x23, 0x5a, 0xb1, 0xec, 0x55, 0xff, 0x5e, 0x81, 0xf9, 0x87, 0x94, 0x7d, 0xdd, 0x76, 0x0f, 0xda, + 0xb6, 0xa1, 0xf7, 0x06, 0x13, 0x8c, 0x93, 0xdd, 0x54, 0x9c, 0xfc, 0x62, 0x49, 0xa3, 0x48, 0x69, + 0x59, 0x14, 0x31, 0xd5, 0xff, 0x54, 0xa0, 0x9e, 0xa2, 0x4c, 0x26, 0xcf, 0x14, 0xa6, 0x1d, 0xdb, + 0x65, 0xa1, 0x59, 0x9e, 0x4a, 0x03, 0x7e, 0xcc, 0x48, 0x5c, 0x39, 0x72, 0x58, 0x1c, 0xa0, 0xf3, + 0x71, 0xee, 0xb9, 0xb6, 0x29, 0x7d, 0xe3, 0xe9, 0xa4, 0x50, 0xea, 0xc6, 0xe3, 0xbc, 0xe3, 0xda, + 0x26, 0x16, 0xd8, 0xea, 0x3f, 0x2a, 0xb0, 0x94, 0xa2, 0x9c, 0xb8, 0xcb, 0x27, 0x69, 0x97, 0xff, + 0xce, 0x69, 0x86, 0x55, 0xe0, 0xfc, 0xff, 0x3b, 0x3b, 0x28, 0x3e, 0x7c, 0xa4, 0x41, 0xcd, 0xb1, + 0xb5, 0xce, 0xa9, 0x0b, 0x96, 0x82, 0xc8, 0x11, 0x23, 0xe1, 0x24, 0x2c, 0x3a, 0x84, 0x25, 0x8b, + 0x98, 0xd4, 0x73, 0x48, 0x8f, 0x76, 0x4e, 0xfd, 0xc2, 0x7a, 0xf9, 0xe4, 0xb8, 0xb1, 0xf4, 0x30, + 0x8b, 0x87, 0x87, 0x45, 0xa8, 0x7f, 0x3a, 0x34, 0x66, 0xdb, 0x65, 0xe8, 0x4b, 0x30, 0x2b, 0xea, + 0x50, 0x7b, 0xb6, 0x21, 0x33, 0xb1, 0x5b, 0x7c, 0x59, 0xda, 0xb2, 0xed, 0xe9, 0x71, 0xe3, 0x17, + 0x46, 0xe6, 0x53, 0x21, 0x21, 0x8e, 0x60, 0xd0, 0x16, 0x4c, 0x39, 0xe3, 0x1f, 0xb9, 0xc5, 0x31, + 0x4b, 0x9c, 0xb3, 0x05, 0xca, 0xf0, 0x52, 0x89, 0x88, 0xbd, 0x7f, 0x46, 0x4b, 0x15, 0x1d, 0xf0, + 0x0b, 0x97, 0xcb, 0x85, 0x19, 0x79, 0xe2, 0x94, 0xf6, 0x78, 0xf7, 0x34, 0xf6, 0x98, 0x3c, 0x25, + 0x45, 0xc9, 0x55, 0xd8, 0x18, 0x0a, 0x52, 0xff, 0x49, 0x81, 0x25, 0xa1, 0x50, 0xcf, 0x77, 0x75, + 0x36, 0x98, 0xb8, 0xbf, 0xdc, 0x4b, 0xf9, 0xcb, 0xcd, 0x92, 0x03, 0x1c, 0xd2, 0xb4, 0xd0, 0x67, + 0xfe, 0xab, 0x02, 0x97, 0x87, 0xa8, 0x27, 0xee, 0x4f, 0x68, 0xda, 0x9f, 0x7c, 0xf1, 0xb4, 0xc3, + 0x2b, 0xf0, 0x29, 0x4f, 0x20, 0x67, 0x70, 0xc2, 0x58, 0x6f, 0x02, 0x38, 0xae, 0x7e, 0xa8, 0x1b, + 0xb4, 0x2f, 0x6b, 0x05, 0x67, 0xe3, 0x05, 0x69, 0x47, 0x3d, 0x38, 0x41, 0x85, 0x7e, 0x03, 0x56, + 0x34, 0xba, 0x47, 0x7c, 0x83, 0xad, 0x6b, 0xda, 0x06, 0x71, 0x48, 0x57, 0x37, 0x74, 0xa6, 0xcb, + 0xa7, 0xbd, 0xb9, 0xd6, 0xed, 0xa0, 0x86, 0x2f, 0x8f, 0xe2, 0xe9, 0x71, 0xe3, 0xd3, 0xa3, 0xcf, + 0x40, 0x21, 0xf1, 0x00, 0x17, 0x08, 0x41, 0xbf, 0xa9, 0x40, 0xdd, 0xa5, 0x1f, 0xf9, 0xba, 0x4b, + 0xb5, 0x4d, 0xd7, 0x76, 0x52, 0x1a, 0x54, 0x85, 0x06, 0x77, 0x4f, 0x8e, 0x1b, 0x75, 0x5c, 0x40, + 0x53, 0x46, 0x87, 0x42, 0x41, 0x88, 0xc1, 0x25, 0x62, 0x18, 0xf6, 0xd7, 0x69, 0x7a, 0x06, 0xa6, + 0x84, 0xfc, 0xd6, 0xc9, 0x71, 0xe3, 0xd2, 0xfa, 0x70, 0x77, 0x19, 0xd1, 0x79, 0xf0, 0x68, 0x0d, + 0x66, 0x0e, 0x6d, 0xc3, 0x37, 0xa9, 0x57, 0x9f, 0x16, 0x92, 0xb8, 0x8f, 0x9d, 0x79, 0x1c, 0x34, + 0x3d, 0xe5, 0x99, 0x4d, 0x47, 0x1c, 0x48, 0x43, 0x2a, 0x74, 0x0b, 0x6a, 0xfb, 0xb6, 0xc7, 0xe4, + 0x46, 0x17, 0x79, 0xd0, 0x6c, 0xec, 0x59, 0xee, 0xc5, 0x5d, 0x38, 0x49, 0x87, 0x4c, 0x98, 0xdb, + 0x97, 0xb7, 0xd5, 0x5e, 0x7d, 0x66, 0xac, 0x58, 0x97, 0xba, 0xed, 0x8e, 0x13, 0xb5, 0xb0, 0xd9, + 0xc3, 0xb1, 0x04, 0x7e, 0xb8, 0x13, 0x7f, 0xee, 0x6f, 0x8a, 0x4a, 0x8f, 0xd9, 0xd8, 0xff, 0xdc, + 0x0b, 0x9a, 0x71, 0xd8, 0x1f, 0x92, 0xde, 0x6f, 0x6f, 0x88, 0xc2, 0x8c, 0x0c, 0xe9, 0xfd, 0xf6, + 0x06, 0x0e, 0xfb, 0x91, 0x03, 0x33, 0x1e, 0xdd, 0xd2, 0x2d, 0xff, 0xa8, 0x0e, 0x62, 0xdf, 0xde, + 0x2e, 0xfb, 0x22, 0x75, 0x5b, 0x70, 0x67, 0xde, 0xc0, 0x63, 0x89, 0xb2, 0x1f, 0x87, 0x62, 0xd0, + 0x11, 0xcc, 0xb9, 0xbe, 0xb5, 0xee, 0xed, 0x7a, 0xd4, 0xad, 0xd7, 0x84, 0xcc, 0xb2, 0x2e, 0x19, + 0x87, 0xfc, 0x59, 0xa9, 0xd1, 0x0c, 0x46, 0x14, 0x38, 0x16, 0x86, 0x7e, 0x5f, 0x01, 0xe4, 0xf9, + 0x8e, 0x63, 0x50, 0x93, 0x5a, 0x8c, 0x18, 0xe2, 0x19, 0xde, 0xab, 0x5f, 0x10, 0x3a, 0xb4, 0x4b, + 0xbf, 0xc4, 0x65, 0x81, 0xb2, 0xca, 0x44, 0xa7, 0xfc, 0x61, 0x52, 0x9c, 0xa3, 0x07, 0x5f, 0x8a, + 0x3d, 0x4f, 0xfc, 0xae, 0xcf, 0x8f, 0xb5, 0x14, 0xf9, 0xe5, 0x08, 0xf1, 0x52, 0xc8, 0x7e, 0x1c, + 0x8a, 0x41, 0x8f, 0x61, 0xc5, 0xa5, 0x44, 0x7b, 0x64, 0x19, 0x03, 0x6c, 0xdb, 0xec, 0x8e, 0x6e, + 0x50, 0x6f, 0xe0, 0x31, 0x6a, 0xd6, 0x17, 0x84, 0xd9, 0x44, 0xc5, 0xc6, 0x38, 0x97, 0x0a, 0x17, + 0x70, 0x8b, 0xaa, 0x61, 0xf9, 0x86, 0x34, 0xd9, 0xcf, 0x08, 0x4e, 0x57, 0x35, 0x1c, 0xab, 0x38, + 0xb1, 0xaa, 0xe1, 0x84, 0x88, 0xd1, 0xd7, 0x6b, 0xff, 0x53, 0x81, 0x4b, 0x31, 0xf1, 0x73, 0x57, + 0x0d, 0xe7, 0xb0, 0xbc, 0x80, 0xcb, 0xb6, 0xfc, 0x5b, 0xb0, 0xea, 0x0b, 0xbb, 0x05, 0x3b, 0xab, + 0x5a, 0x65, 0x51, 0xcb, 0x1b, 0x4f, 0xe1, 0xff, 0xf7, 0x5a, 0xde, 0x58, 0xd3, 0xa2, 0x37, 0xa0, + 0x4a, 0x72, 0x38, 0x3f, 0x37, 0x05, 0xa3, 0x39, 0xf5, 0x9b, 0x53, 0xe5, 0xea, 0x37, 0xd5, 0x9f, + 0x54, 0x61, 0x31, 0xbb, 0x57, 0x53, 0x75, 0x83, 0xca, 0x33, 0xeb, 0x06, 0xdb, 0xb0, 0xbc, 0xe7, + 0x1b, 0xc6, 0x40, 0x4c, 0x48, 0xe2, 0xcd, 0x3d, 0xb8, 0x5a, 0x7c, 0x45, 0x72, 0x2e, 0xdf, 0xc9, + 0xa1, 0xc1, 0xb9, 0x9c, 0x05, 0x35, 0x90, 0xd5, 0xb1, 0x6a, 0x20, 0xdf, 0x86, 0x79, 0x57, 0x7c, + 0xde, 0x91, 0x2e, 0x05, 0x88, 0x6e, 0xbd, 0x71, 0xb2, 0x13, 0xa7, 0x69, 0xf3, 0xeb, 0x19, 0xa7, + 0xc7, 0xa8, 0x67, 0x3c, 0x8b, 0x02, 0xc4, 0x1c, 0x97, 0xf7, 0xcc, 0x02, 0xc4, 0x57, 0xe0, 0xaa, + 0x64, 0xe3, 0xff, 0x37, 0x6c, 0x8b, 0xb9, 0xb6, 0x61, 0x50, 0x77, 0xd3, 0x37, 0xcd, 0x81, 0xfa, + 0x2e, 0x2c, 0xa4, 0xab, 0x60, 0x83, 0x95, 0x0f, 0x0a, 0x73, 0x65, 0xcd, 0x40, 0x62, 0xe5, 0x83, + 0x76, 0x1c, 0x51, 0xa8, 0x3f, 0x55, 0xe0, 0x4a, 0x41, 0x21, 0x21, 0xfa, 0x10, 0x16, 0x4c, 0x72, + 0x94, 0xa8, 0xd0, 0x94, 0x4e, 0xa5, 0xec, 0xb1, 0x5a, 0xdc, 0x11, 0x6e, 0xa7, 0x90, 0x70, 0x06, + 0x59, 0xc4, 0x59, 0x72, 0xd4, 0xf1, 0xdd, 0x3e, 0x1d, 0xf3, 0xf0, 0x2e, 0xb6, 0xef, 0xb6, 0xc4, + 0xc0, 0x11, 0x9a, 0xfa, 0x03, 0x05, 0xea, 0x45, 0x49, 0x17, 0xba, 0x95, 0x2a, 0x77, 0xfc, 0x44, + 0xa6, 0xdc, 0x71, 0x69, 0x88, 0xef, 0x05, 0x15, 0x3b, 0xfe, 0x50, 0x81, 0x95, 0xfc, 0xe4, 0x14, + 0xfd, 0x52, 0x4a, 0xe3, 0x46, 0x46, 0xe3, 0x8b, 0x19, 0x2e, 0xa9, 0xef, 0x3e, 0x2c, 0xc8, 0x14, + 0x56, 0xc2, 0x3c, 0xc7, 0xf7, 0x9f, 0x87, 0x51, 0x7e, 0x1c, 0x26, 0x63, 0x62, 0x1d, 0xd3, 0x6d, + 0x38, 0x83, 0xab, 0xfe, 0x61, 0x05, 0xa6, 0x45, 0x25, 0xd0, 0x04, 0x33, 0xa7, 0xf7, 0x53, 0x99, + 0x53, 0xd9, 0xe7, 0x42, 0xa1, 0x5d, 0x61, 0xd2, 0xd4, 0xcd, 0x24, 0x4d, 0x6f, 0x8d, 0x85, 0x3e, + 0x3a, 0x5f, 0xfa, 0x1c, 0xcc, 0x45, 0x4a, 0x94, 0x73, 0xd4, 0x3c, 0x3b, 0xad, 0x25, 0x44, 0x94, + 0x74, 0xf3, 0x87, 0xa9, 0x30, 0x39, 0xce, 0x87, 0xca, 0x09, 0xd9, 0xcd, 0x30, 0x54, 0x06, 0x9f, + 0xb6, 0xc4, 0x85, 0x7c, 0xc3, 0x11, 0xf4, 0x5d, 0x58, 0x08, 0xbe, 0xf6, 0x8e, 0x2e, 0xcd, 0xaa, + 0xc2, 0x7a, 0xa3, 0x8f, 0xa5, 0x76, 0x52, 0xbd, 0x38, 0x43, 0x7d, 0xf5, 0x6d, 0x98, 0x4f, 0x09, + 0x2b, 0xf5, 0x25, 0xca, 0x5f, 0x29, 0xb0, 0x9c, 0x57, 0x7a, 0x88, 0xae, 0xc1, 0xd4, 0x81, 0x2e, + 0x2b, 0x26, 0x12, 0x55, 0x26, 0xbf, 0xa2, 0x5b, 0x1a, 0x16, 0x3d, 0xd1, 0x87, 0x44, 0x95, 0xc2, + 0x0f, 0x89, 0x6e, 0x02, 0x10, 0x47, 0x97, 0x5f, 0xd0, 0xcb, 0x51, 0x45, 0xc6, 0x1b, 0x7f, 0x5b, + 0x8f, 0x13, 0x54, 0xa2, 0xa8, 0x28, 0xd6, 0x47, 0x26, 0x84, 0x71, 0xb5, 0x4f, 0x42, 0xd5, 0x24, + 0x9d, 0xfa, 0x37, 0x0a, 0x7c, 0xe2, 0x99, 0x07, 0x37, 0xd4, 0x4a, 0xb9, 0x87, 0x66, 0xc6, 0x3d, + 0xac, 0x16, 0x03, 0xbc, 0xc0, 0x52, 0xee, 0xef, 0x54, 0x00, 0xed, 0xec, 0xeb, 0xae, 0xd6, 0x26, + 0x2e, 0x1b, 0x60, 0x39, 0xc0, 0x09, 0x3a, 0x8c, 0x5b, 0x50, 0xd3, 0xa8, 0xd7, 0x73, 0x75, 0x31, + 0x49, 0x72, 0x39, 0xa3, 0x19, 0xdf, 0x8c, 0xbb, 0x70, 0x92, 0x0e, 0xf5, 0x61, 0xf6, 0x30, 0x58, + 0xb3, 0xb0, 0x30, 0xa5, 0x6c, 0xd6, 0x1b, 0x5b, 0x40, 0xbc, 0x3f, 0x64, 0x83, 0x87, 0x23, 0x70, + 0xf5, 0xbb, 0x0a, 0xac, 0x0c, 0x4f, 0xc8, 0x66, 0x50, 0x76, 0x31, 0xa9, 0x49, 0x79, 0x05, 0xa6, + 0x04, 0x2a, 0x9f, 0x8d, 0x0b, 0xc1, 0xd5, 0x37, 0x97, 0x88, 0x45, 0xab, 0xfa, 0x33, 0x05, 0xae, + 0xe6, 0xab, 0x34, 0xf1, 0x93, 0xc6, 0x87, 0xe9, 0x93, 0x46, 0xd9, 0x9b, 0x84, 0x7c, 0xad, 0x0b, + 0x4e, 0x1d, 0x3f, 0xc9, 0x9d, 0xf9, 0x89, 0x0f, 0x71, 0x2f, 0x3d, 0xc4, 0xf5, 0x53, 0x0f, 0x31, + 0x7f, 0x78, 0xad, 0xcf, 0x3c, 0xf9, 0x78, 0xf5, 0xdc, 0x8f, 0x3f, 0x5e, 0x3d, 0xf7, 0x2f, 0x1f, + 0xaf, 0x9e, 0xfb, 0xf6, 0xc9, 0xaa, 0xf2, 0xe4, 0x64, 0x55, 0xf9, 0xf1, 0xc9, 0xaa, 0xf2, 0xef, + 0x27, 0xab, 0xca, 0x77, 0xff, 0x63, 0xf5, 0xdc, 0xfb, 0x33, 0x12, 0xf3, 0xff, 0x02, 0x00, 0x00, + 0xff, 0xff, 0xfb, 0xcc, 0x56, 0x9a, 0xd7, 0x45, 0x00, 0x00, } diff --git a/pkg/apis/extensions/v1beta1/generated.proto b/pkg/apis/extensions/v1beta1/generated.proto index f5043e24229..865877f66aa 100644 --- a/pkg/apis/extensions/v1beta1/generated.proto +++ b/pkg/apis/extensions/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.extensions.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -95,7 +95,7 @@ message DaemonSetList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of daemon sets. repeated DaemonSet items = 2; @@ -108,7 +108,7 @@ message DaemonSetSpec { // If empty, defaulted to labels on Pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 1; // Template is the object that describes the pod that will be created. // The DaemonSet will create exactly one copy of this pod on every node @@ -164,10 +164,10 @@ message DeploymentCondition { optional string status = 2; // The last time this condition was updated. - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastUpdateTime = 6; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastUpdateTime = 6; // Last time the condition transitioned from one status to another. - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 7; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 7; // The reason for the condition's last transition. optional string reason = 4; @@ -180,7 +180,7 @@ message DeploymentCondition { message DeploymentList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Deployments. repeated Deployment items = 2; @@ -209,7 +209,7 @@ message DeploymentSpec { // Label selector for pods. Existing ReplicaSets whose pods are // selected by this will be the ones affected by this deployment. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; // Template describes the pods that will be created. optional k8s.io.kubernetes.pkg.api.v1.PodTemplateSpec template = 3; @@ -348,7 +348,7 @@ message HorizontalPodAutoscaler { message HorizontalPodAutoscalerList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // list of horizontal pod autoscaler objects. repeated HorizontalPodAutoscaler items = 2; @@ -382,7 +382,7 @@ message HorizontalPodAutoscalerStatus { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScaleTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScaleTime = 2; // current number of replicas of pods managed by this autoscaler. optional int32 currentReplicas = 3; @@ -450,7 +450,7 @@ message IngressList { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Ingress. repeated Ingress items = 2; @@ -570,11 +570,11 @@ message JobCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -591,7 +591,7 @@ message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Job. repeated Job items = 2; @@ -625,7 +625,7 @@ message JobSpec { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // AutoSelector controls generation of pod labels and pod selectors. // It was not present in the original extensions/v1beta1 Job definition, but exists @@ -652,13 +652,13 @@ message JobStatus { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3; // Active is the number of actively running pods. // +optional @@ -712,7 +712,7 @@ message NetworkPolicyList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of schema objects. repeated NetworkPolicy items = 2; @@ -724,7 +724,7 @@ message NetworkPolicyPeer { // If not provided, this selector selects no pods. // If present but empty, this selector selects all pods in this namespace. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector podSelector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector podSelector = 1; // Selects Namespaces using cluster scoped-labels. This // matches all pods in all namespaces selected by this label selector. @@ -732,7 +732,7 @@ message NetworkPolicyPeer { // If omitted, this selector selects no namespaces. // If present but empty, this selector selects all namespaces. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector namespaceSelector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector namespaceSelector = 2; } message NetworkPolicyPort { @@ -756,7 +756,7 @@ message NetworkPolicySpec { // same set of pods. In this case, the ingress rules for each are combined additively. // This field is NOT optional and follows standard label selector semantics. // An empty podSelector matches all pods in this namespace. - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector podSelector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector podSelector = 1; // List of ingress rules to be applied to the selected pods. // Traffic is allowed to a pod if namespace.networkPolicy.ingress.isolation is undefined and cluster policy allows it, @@ -788,7 +788,7 @@ message PodSecurityPolicyList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of schema objects. repeated PodSecurityPolicy items = 2; @@ -891,7 +891,7 @@ message ReplicaSetCondition { // The last time the condition transitioned from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 3; // The reason for the condition's last transition. // +optional @@ -907,7 +907,7 @@ message ReplicaSetList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of ReplicaSets. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -934,7 +934,7 @@ message ReplicaSetSpec { // Label keys and values that must match in order to be controlled by this replica set. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; // Template is the object that describes the pod that will be created if // insufficient replicas are detected. @@ -1135,7 +1135,7 @@ message ThirdPartyResourceDataList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of ThirdpartyResourceData. repeated ThirdPartyResourceData items = 2; @@ -1145,7 +1145,7 @@ message ThirdPartyResourceDataList { message ThirdPartyResourceList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of ThirdPartyResources. repeated ThirdPartyResource items = 2; diff --git a/pkg/apis/extensions/v1beta1/register.go b/pkg/apis/extensions/v1beta1/register.go index a89a6f51298..1f0886fbaf8 100644 --- a/pkg/apis/extensions/v1beta1/register.go +++ b/pkg/apis/extensions/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index b4266118246..9a2a95e0f95 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/kubernetes/pkg/api/resource" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" pkg5_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -2978,7 +2978,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19 } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym240 := z.DecBinary() _ = yym240 @@ -3077,7 +3077,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym249 := z.DecBinary() _ = yym249 @@ -3722,7 +3722,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv306 := &x.ListMeta yym307 := z.DecBinary() @@ -3803,7 +3803,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv313 := &x.ListMeta yym314 := z.DecBinary() @@ -4441,7 +4441,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv371 := &x.ListMeta yym372 := z.DecBinary() @@ -4522,7 +4522,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv378 := &x.ListMeta yym379 := z.DecBinary() @@ -5773,7 +5773,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym491 := z.DecBinary() _ = yym491 @@ -5909,7 +5909,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym505 := z.DecBinary() _ = yym505 @@ -7860,7 +7860,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv660 := &x.LastUpdateTime yym661 := z.DecBinary() @@ -7877,7 +7877,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv662 := &x.LastTransitionTime yym663 := z.DecBinary() @@ -7962,7 +7962,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv669 := &x.LastUpdateTime yym670 := z.DecBinary() @@ -7989,7 +7989,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv671 := &x.LastTransitionTime yym672 := z.DecBinary() @@ -8266,7 +8266,7 @@ func (x *DeploymentList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv696 := &x.ListMeta yym697 := z.DecBinary() @@ -8347,7 +8347,7 @@ func (x *DeploymentList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv703 := &x.ListMeta yym704 := z.DecBinary() @@ -8541,7 +8541,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym719 := z.DecBinary() _ = yym719 @@ -8589,7 +8589,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym723 := z.DecBinary() _ = yym723 @@ -9474,7 +9474,7 @@ func (x *DaemonSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv803 := &x.ListMeta yym804 := z.DecBinary() @@ -9555,7 +9555,7 @@ func (x *DaemonSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv810 := &x.ListMeta yym811 := z.DecBinary() @@ -9818,7 +9818,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromMap(l int, d *codec1978. } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv835 := &x.ListMeta yym836 := z.DecBinary() @@ -9899,7 +9899,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromArray(l int, d *codec197 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv842 := &x.ListMeta yym843 := z.DecBinary() @@ -10505,7 +10505,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv898 := &x.ListMeta yym899 := z.DecBinary() @@ -10586,7 +10586,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv905 := &x.ListMeta yym906 := z.DecBinary() @@ -10972,7 +10972,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym947 := z.DecBinary() _ = yym947 @@ -11114,7 +11114,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym959 := z.DecBinary() _ = yym959 @@ -11493,7 +11493,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym989 := z.DecBinary() _ = yym989 @@ -11514,7 +11514,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym991 := z.DecBinary() _ = yym991 @@ -11599,7 +11599,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym999 := z.DecBinary() _ = yym999 @@ -11630,7 +11630,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym1001 := z.DecBinary() _ = yym1001 @@ -11997,7 +11997,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv1034 := &x.LastProbeTime yym1035 := z.DecBinary() @@ -12014,7 +12014,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1036 := &x.LastTransitionTime yym1037 := z.DecBinary() @@ -12099,7 +12099,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv1043 := &x.LastProbeTime yym1044 := z.DecBinary() @@ -12126,7 +12126,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1045 := &x.LastTransitionTime yym1046 := z.DecBinary() @@ -12746,7 +12746,7 @@ func (x *IngressList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1101 := &x.ListMeta yym1102 := z.DecBinary() @@ -12827,7 +12827,7 @@ func (x *IngressList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1108 := &x.ListMeta yym1109 := z.DecBinary() @@ -15183,7 +15183,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1288 := &x.ListMeta yym1289 := z.DecBinary() @@ -15264,7 +15264,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1295 := &x.ListMeta yym1296 := z.DecBinary() @@ -15549,7 +15549,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym1322 := z.DecBinary() _ = yym1322 @@ -15639,7 +15639,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym1329 := z.DecBinary() _ = yym1329 @@ -16355,7 +16355,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1393 := &x.LastTransitionTime yym1394 := z.DecBinary() @@ -16440,7 +16440,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1400 := &x.LastTransitionTime yym1401 := z.DecBinary() @@ -19277,7 +19277,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decod } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1639 := &x.ListMeta yym1640 := z.DecBinary() @@ -19358,7 +19358,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1646 := &x.ListMeta yym1647 := z.DecBinary() @@ -19858,7 +19858,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) switch yys1688 { case "podSelector": if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1689 := &x.PodSelector yym1690 := z.DecBinary() @@ -19907,7 +19907,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1694 := &x.PodSelector yym1695 := z.DecBinary() @@ -20662,7 +20662,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1750 := z.DecBinary() _ = yym1750 @@ -20679,7 +20679,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1752 := z.DecBinary() _ = yym1752 @@ -20720,7 +20720,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1755 := z.DecBinary() _ = yym1755 @@ -20747,7 +20747,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1757 := z.DecBinary() _ = yym1757 @@ -20987,7 +20987,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1779 := &x.ListMeta yym1780 := z.DecBinary() @@ -21068,7 +21068,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1786 := &x.ListMeta yym1787 := z.DecBinary() diff --git a/pkg/apis/extensions/v1beta1/types.go b/pkg/apis/extensions/v1beta1/types.go index cf375647dbd..37dabfba3fd 100644 --- a/pkg/apis/extensions/v1beta1/types.go +++ b/pkg/apis/extensions/v1beta1/types.go @@ -18,8 +18,8 @@ package v1beta1 import ( "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/intstr" ) diff --git a/pkg/apis/extensions/validation/validation.go b/pkg/apis/extensions/validation/validation.go index d0a5e0c2a50..68226830550 100644 --- a/pkg/apis/extensions/validation/validation.go +++ b/pkg/apis/extensions/validation/validation.go @@ -25,10 +25,10 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" diff --git a/pkg/apis/extensions/validation/validation_test.go b/pkg/apis/extensions/validation/validation_test.go index 58d31742b4e..f54be5aa58a 100644 --- a/pkg/apis/extensions/validation/validation_test.go +++ b/pkg/apis/extensions/validation/validation_test.go @@ -22,8 +22,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp" psputil "k8s.io/kubernetes/pkg/security/podsecuritypolicy/util" diff --git a/pkg/apis/imagepolicy/types.generated.go b/pkg/apis/imagepolicy/types.generated.go index ad407d8322a..2140e8838dd 100644 --- a/pkg/apis/imagepolicy/types.generated.go +++ b/pkg/apis/imagepolicy/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -784,7 +784,7 @@ func (x *ImageReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv76 := &x.CreationTimestamp yym77 := z.DecBinary() @@ -801,7 +801,7 @@ func (x *ImageReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -809,7 +809,7 @@ func (x *ImageReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym79 := z.DecBinary() _ = yym79 @@ -1080,7 +1080,7 @@ func (x *ImageReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv103 := &x.CreationTimestamp yym104 := z.DecBinary() @@ -1096,7 +1096,7 @@ func (x *ImageReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj93++ if yyhl93 { @@ -1115,7 +1115,7 @@ func (x *ImageReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym106 := z.DecBinary() _ = yym106 diff --git a/pkg/apis/imagepolicy/v1alpha1/generated.pb.go b/pkg/apis/imagepolicy/v1alpha1/generated.pb.go index 42dcd1ab8cf..88d02e60ef3 100644 --- a/pkg/apis/imagepolicy/v1alpha1/generated.pb.go +++ b/pkg/apis/imagepolicy/v1alpha1/generated.pb.go @@ -1019,42 +1019,42 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 585 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0x3f, 0x6f, 0x13, 0x3f, - 0x18, 0xc7, 0x73, 0x49, 0xff, 0xc5, 0xf9, 0xfd, 0x68, 0x6b, 0x18, 0xa2, 0x0c, 0xd7, 0x2a, 0x48, - 0xa8, 0x20, 0x6a, 0x2b, 0x15, 0x48, 0x15, 0x03, 0xa5, 0x87, 0x18, 0x3a, 0x00, 0xc2, 0x2c, 0x88, - 0xcd, 0xb9, 0x3c, 0xbd, 0xba, 0xb9, 0xb3, 0x4f, 0x67, 0xdf, 0x55, 0x1d, 0x90, 0x18, 0x19, 0x18, - 0x78, 0x37, 0xbc, 0x85, 0x8e, 0x1d, 0x99, 0x2a, 0x1a, 0xde, 0x08, 0x8a, 0xef, 0xd2, 0x3b, 0x92, - 0x06, 0x09, 0x65, 0xf3, 0xe3, 0xc7, 0xdf, 0xcf, 0xf7, 0x6b, 0x3f, 0x46, 0x07, 0xc3, 0x7d, 0x4d, - 0x84, 0xa2, 0xc3, 0xb4, 0x0f, 0x89, 0x04, 0x03, 0x9a, 0xc6, 0xc3, 0x80, 0xf2, 0x58, 0x68, 0x2a, - 0x22, 0x1e, 0x40, 0xac, 0x42, 0xe1, 0x9f, 0xd3, 0xac, 0xc7, 0xc3, 0xf8, 0x84, 0xf7, 0x68, 0x00, - 0x12, 0x12, 0x6e, 0x60, 0x40, 0xe2, 0x44, 0x19, 0x85, 0x69, 0x0e, 0x20, 0x25, 0x80, 0xc4, 0xc3, - 0x80, 0x8c, 0x01, 0xa4, 0x02, 0x20, 0x13, 0x40, 0x67, 0x37, 0x10, 0xe6, 0x24, 0xed, 0x13, 0x5f, - 0x45, 0x34, 0x50, 0x81, 0xa2, 0x96, 0xd3, 0x4f, 0x8f, 0x6d, 0x65, 0x0b, 0xbb, 0xca, 0xf9, 0x9d, - 0xbd, 0xb9, 0x01, 0x69, 0x02, 0x5a, 0xa5, 0x89, 0x0f, 0xd3, 0x99, 0x3a, 0x4f, 0xe7, 0x6b, 0x52, - 0x99, 0x41, 0xa2, 0x85, 0x92, 0x30, 0x98, 0x91, 0x3d, 0x9e, 0x2f, 0xcb, 0x66, 0x2e, 0xde, 0xd9, - 0xbd, 0xfd, 0x74, 0x92, 0x4a, 0x23, 0xa2, 0xd9, 0x4c, 0x4f, 0xfe, 0x7e, 0x5c, 0xfb, 0x27, 0x10, - 0xf1, 0x19, 0x55, 0xef, 0x76, 0x55, 0x6a, 0x44, 0x48, 0x85, 0x34, 0xda, 0x24, 0xd3, 0x92, 0xee, - 0xf7, 0x3a, 0x6a, 0x1d, 0x8d, 0x1f, 0x9e, 0x41, 0x26, 0xe0, 0x0c, 0x7f, 0x40, 0x6b, 0x11, 0x18, - 0x3e, 0xe0, 0x86, 0xb7, 0x9d, 0x6d, 0x67, 0xa7, 0xb5, 0xb7, 0x43, 0xe6, 0xce, 0x8c, 0x64, 0x3d, - 0xf2, 0xb6, 0x7f, 0x0a, 0xbe, 0x79, 0x0d, 0x86, 0x7b, 0xf8, 0xe2, 0x6a, 0xab, 0x36, 0xba, 0xda, - 0x42, 0xe5, 0x1e, 0xbb, 0xa1, 0xe1, 0x3e, 0x5a, 0xd2, 0x31, 0xf8, 0xed, 0xba, 0xa5, 0xbe, 0x20, - 0xff, 0xf8, 0x13, 0x48, 0x25, 0xe5, 0xfb, 0x18, 0x7c, 0xef, 0xbf, 0xc2, 0x6d, 0x69, 0x5c, 0x31, - 0xcb, 0xc6, 0xa7, 0x68, 0x45, 0x1b, 0x6e, 0x52, 0xdd, 0x6e, 0x58, 0x17, 0x6f, 0x21, 0x17, 0x4b, - 0xf2, 0xee, 0x14, 0x3e, 0x2b, 0x79, 0xcd, 0x0a, 0x87, 0xee, 0x01, 0x6a, 0x57, 0x0e, 0xbf, 0x54, - 0xd2, 0x70, 0x21, 0x21, 0x19, 0xa7, 0xc1, 0xf7, 0xd1, 0xb2, 0xa5, 0xdb, 0x27, 0x6c, 0x7a, 0xff, - 0x17, 0x88, 0xe5, 0x5c, 0x90, 0xf7, 0xba, 0x5f, 0x1b, 0x68, 0x7d, 0xea, 0x52, 0xf8, 0x13, 0x42, - 0xfe, 0x84, 0xa4, 0xdb, 0xce, 0x76, 0x63, 0xa7, 0xb5, 0x77, 0xb4, 0xc8, 0x25, 0xfe, 0xc8, 0x55, - 0x4e, 0xe8, 0x66, 0x5b, 0xb3, 0x8a, 0x21, 0xfe, 0xe2, 0xa0, 0x16, 0x97, 0x52, 0x19, 0x6e, 0x84, - 0x92, 0xba, 0x5d, 0xb7, 0x01, 0xde, 0x2d, 0x3a, 0x2b, 0x72, 0x58, 0x32, 0x5f, 0x49, 0x93, 0x9c, - 0x7b, 0x77, 0x8b, 0x20, 0xad, 0x4a, 0x87, 0x55, 0xad, 0x31, 0x45, 0x4d, 0xc9, 0x23, 0xd0, 0x31, - 0xf7, 0xc1, 0x4e, 0xb3, 0xe9, 0x6d, 0x16, 0xa2, 0xe6, 0x9b, 0x49, 0x83, 0x95, 0x67, 0x3a, 0xcf, - 0xd1, 0xc6, 0xb4, 0x0d, 0xde, 0x40, 0x8d, 0x21, 0x9c, 0xe7, 0x53, 0x60, 0xe3, 0x25, 0xbe, 0x87, - 0x96, 0x33, 0x1e, 0xa6, 0x60, 0xbf, 0x61, 0x93, 0xe5, 0xc5, 0xb3, 0xfa, 0xbe, 0xd3, 0x3d, 0x46, - 0x9b, 0x33, 0xc3, 0xc7, 0x0f, 0xd1, 0x2a, 0x0f, 0x43, 0x75, 0x06, 0x03, 0x0b, 0x59, 0xf3, 0xd6, - 0x8b, 0x0c, 0xab, 0x87, 0xf9, 0x36, 0x9b, 0xf4, 0xf1, 0x03, 0xb4, 0x92, 0x00, 0xd7, 0x4a, 0xe6, - 0xe8, 0xf2, 0xdf, 0x30, 0xbb, 0xcb, 0x8a, 0xae, 0xf7, 0xe8, 0xe2, 0xda, 0xad, 0x5d, 0x5e, 0xbb, - 0xb5, 0x1f, 0xd7, 0x6e, 0xed, 0xf3, 0xc8, 0x75, 0x2e, 0x46, 0xae, 0x73, 0x39, 0x72, 0x9d, 0x9f, - 0x23, 0xd7, 0xf9, 0xf6, 0xcb, 0xad, 0x7d, 0x5c, 0x9b, 0xbc, 0xe3, 0xef, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x16, 0xa4, 0x8e, 0xac, 0x70, 0x05, 0x00, 0x00, + // 579 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0x4f, 0x6f, 0xd3, 0x3e, + 0x18, 0xc7, 0x9b, 0x76, 0xff, 0xea, 0xfe, 0x7e, 0x6c, 0x33, 0x1c, 0xa2, 0x1e, 0xb2, 0xa9, 0x48, + 0x68, 0x20, 0x66, 0xab, 0x13, 0x87, 0x89, 0x03, 0x63, 0x41, 0x1c, 0x76, 0x00, 0x84, 0xb9, 0x20, + 0x6e, 0x6e, 0xf6, 0x2c, 0xcb, 0x9a, 0xd8, 0x51, 0xec, 0x74, 0xda, 0x01, 0x89, 0x23, 0x07, 0x0e, + 0xbc, 0x1b, 0xde, 0x42, 0x8f, 0x3b, 0x72, 0x9a, 0x68, 0x79, 0x23, 0x28, 0x4e, 0xba, 0x84, 0xfe, + 0x99, 0x84, 0x7a, 0xf3, 0xe3, 0xc7, 0xdf, 0xcf, 0xf7, 0x6b, 0x3f, 0x46, 0x47, 0xfd, 0x43, 0x45, + 0x02, 0x49, 0xfb, 0x69, 0x0f, 0x12, 0x01, 0x1a, 0x14, 0x8d, 0xfb, 0x3e, 0xe5, 0x71, 0xa0, 0x68, + 0x10, 0x71, 0x1f, 0x62, 0x19, 0x06, 0xde, 0x15, 0x1d, 0x74, 0x79, 0x18, 0x9f, 0xf3, 0x2e, 0xf5, + 0x41, 0x40, 0xc2, 0x35, 0x9c, 0x92, 0x38, 0x91, 0x5a, 0x62, 0x9a, 0x03, 0x48, 0x09, 0x20, 0x71, + 0xdf, 0x27, 0x19, 0x80, 0x54, 0x00, 0x64, 0x02, 0x68, 0xef, 0xfb, 0x81, 0x3e, 0x4f, 0x7b, 0xc4, + 0x93, 0x11, 0xf5, 0xa5, 0x2f, 0xa9, 0xe1, 0xf4, 0xd2, 0x33, 0x53, 0x99, 0xc2, 0xac, 0x72, 0x7e, + 0xfb, 0x60, 0x61, 0x40, 0x9a, 0x80, 0x92, 0x69, 0xe2, 0xc1, 0x74, 0xa6, 0xf6, 0xd3, 0xc5, 0x9a, + 0xc1, 0xcc, 0x0d, 0xee, 0x70, 0x50, 0x34, 0x02, 0xcd, 0xe7, 0x69, 0xf6, 0xe7, 0x6b, 0x92, 0x54, + 0xe8, 0x20, 0x9a, 0x0d, 0xf4, 0xec, 0xee, 0xe3, 0xca, 0x3b, 0x87, 0x88, 0xcf, 0xa8, 0xba, 0xf3, + 0x55, 0xa9, 0x0e, 0x42, 0x1a, 0x08, 0xad, 0x74, 0x32, 0x2d, 0xe9, 0xfc, 0xa8, 0xa3, 0xd6, 0x49, + 0xf6, 0xea, 0x0c, 0x06, 0x01, 0x5c, 0xe2, 0x8f, 0x68, 0x23, 0xbb, 0xc2, 0x29, 0xd7, 0xdc, 0xb6, + 0x76, 0xad, 0xbd, 0xd6, 0xc1, 0x1e, 0x59, 0x38, 0x30, 0x32, 0xe8, 0x92, 0x77, 0xbd, 0x0b, 0xf0, + 0xf4, 0x1b, 0xd0, 0xdc, 0xc5, 0xc3, 0x9b, 0x9d, 0xda, 0xf8, 0x66, 0x07, 0x95, 0x7b, 0xec, 0x96, + 0x86, 0x7b, 0x68, 0x45, 0xc5, 0xe0, 0xd9, 0x75, 0x43, 0x7d, 0x49, 0xfe, 0xf1, 0x1b, 0x90, 0x4a, + 0xca, 0x0f, 0x31, 0x78, 0xee, 0x7f, 0x85, 0xdb, 0x4a, 0x56, 0x31, 0xc3, 0xc6, 0x17, 0x68, 0x4d, + 0x69, 0xae, 0x53, 0x65, 0x37, 0x8c, 0x8b, 0xbb, 0x94, 0x8b, 0x21, 0xb9, 0xf7, 0x0a, 0x9f, 0xb5, + 0xbc, 0x66, 0x85, 0x43, 0xe7, 0x08, 0xd9, 0x95, 0xc3, 0xaf, 0xa4, 0xd0, 0x3c, 0x10, 0x90, 0x64, + 0x69, 0xf0, 0x43, 0xb4, 0x6a, 0xe8, 0xe6, 0x09, 0x9b, 0xee, 0xff, 0x05, 0x62, 0x35, 0x17, 0xe4, + 0xbd, 0xce, 0xb7, 0x06, 0xda, 0x9c, 0xba, 0x14, 0xfe, 0x8c, 0x90, 0x37, 0x21, 0x29, 0xdb, 0xda, + 0x6d, 0xec, 0xb5, 0x0e, 0x4e, 0x96, 0xb9, 0xc4, 0x5f, 0xb9, 0xca, 0x09, 0xdd, 0x6e, 0x2b, 0x56, + 0x31, 0xc4, 0x5f, 0x2d, 0xd4, 0xe2, 0x42, 0x48, 0xcd, 0x75, 0x20, 0x85, 0xb2, 0xeb, 0x26, 0xc0, + 0xfb, 0x65, 0x67, 0x45, 0x8e, 0x4b, 0xe6, 0x6b, 0xa1, 0x93, 0x2b, 0xf7, 0x7e, 0x11, 0xa4, 0x55, + 0xe9, 0xb0, 0xaa, 0x35, 0xa6, 0xa8, 0x29, 0x78, 0x04, 0x2a, 0xe6, 0x1e, 0x98, 0x69, 0x36, 0xdd, + 0xed, 0x42, 0xd4, 0x7c, 0x3b, 0x69, 0xb0, 0xf2, 0x4c, 0xfb, 0x05, 0xda, 0x9a, 0xb6, 0xc1, 0x5b, + 0xa8, 0xd1, 0x87, 0xab, 0x7c, 0x0a, 0x2c, 0x5b, 0xe2, 0x07, 0x68, 0x75, 0xc0, 0xc3, 0x14, 0xcc, + 0x37, 0x6c, 0xb2, 0xbc, 0x78, 0x5e, 0x3f, 0xb4, 0x3a, 0x67, 0x68, 0x7b, 0x66, 0xf8, 0xf8, 0x31, + 0x5a, 0xe7, 0x61, 0x28, 0x2f, 0xe1, 0xd4, 0x40, 0x36, 0xdc, 0xcd, 0x22, 0xc3, 0xfa, 0x71, 0xbe, + 0xcd, 0x26, 0x7d, 0xfc, 0x08, 0xad, 0x25, 0xc0, 0x95, 0x14, 0x39, 0xba, 0xfc, 0x37, 0xcc, 0xec, + 0xb2, 0xa2, 0xeb, 0x3e, 0x19, 0x8e, 0x9c, 0xda, 0xf5, 0xc8, 0xa9, 0xfd, 0x1c, 0x39, 0xb5, 0x2f, + 0x63, 0xc7, 0x1a, 0x8e, 0x1d, 0xeb, 0x7a, 0xec, 0x58, 0xbf, 0xc6, 0x8e, 0xf5, 0xfd, 0xb7, 0x53, + 0xfb, 0xb4, 0x31, 0x79, 0xc7, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x06, 0xba, 0x95, 0xb5, 0x6d, + 0x05, 0x00, 0x00, } diff --git a/pkg/apis/imagepolicy/v1alpha1/generated.proto b/pkg/apis/imagepolicy/v1alpha1/generated.proto index 06419a135a0..963c5ab2874 100644 --- a/pkg/apis/imagepolicy/v1alpha1/generated.proto +++ b/pkg/apis/imagepolicy/v1alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.imagepolicy.v1alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; diff --git a/pkg/apis/imagepolicy/v1alpha1/register.go b/pkg/apis/imagepolicy/v1alpha1/register.go index 8dad71f414d..817402ccb6d 100644 --- a/pkg/apis/imagepolicy/v1alpha1/register.go +++ b/pkg/apis/imagepolicy/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/pkg/apis/imagepolicy/v1alpha1/types.generated.go b/pkg/apis/imagepolicy/v1alpha1/types.generated.go index 403f805dca3..0b6269c5468 100644 --- a/pkg/apis/imagepolicy/v1alpha1/types.generated.go +++ b/pkg/apis/imagepolicy/v1alpha1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/apis/imagepolicy/v1alpha1/types.go b/pkg/apis/imagepolicy/v1alpha1/types.go index 228491b1ee7..c238df5e527 100644 --- a/pkg/apis/imagepolicy/v1alpha1/types.go +++ b/pkg/apis/imagepolicy/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apis/meta/v1/generated.pb.go b/pkg/apis/meta/v1/generated.pb.go index 6d1f25700bb..dc19ce16108 100644 --- a/pkg/apis/meta/v1/generated.pb.go +++ b/pkg/apis/meta/v1/generated.pb.go @@ -15,14 +15,14 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. -// source: k8s.io/kubernetes/pkg/api/unversioned/generated.proto +// source: k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto // DO NOT EDIT! /* - Package unversioned is a generated protocol buffer package. + Package v1 is a generated protocol buffer package. It is generated from these files: - k8s.io/kubernetes/pkg/api/unversioned/generated.proto + k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto It has these top-level messages: APIGroup @@ -176,30 +176,30 @@ func (*TypeMeta) ProtoMessage() {} func (*TypeMeta) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{23} } func init() { - proto.RegisterType((*APIGroup)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIGroup") - proto.RegisterType((*APIGroupList)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIGroupList") - proto.RegisterType((*APIResource)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIResource") - proto.RegisterType((*APIResourceList)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIResourceList") - proto.RegisterType((*APIVersions)(nil), "k8s.io.kubernetes.pkg.api.unversioned.APIVersions") - proto.RegisterType((*Duration)(nil), "k8s.io.kubernetes.pkg.api.unversioned.Duration") - proto.RegisterType((*ExportOptions)(nil), "k8s.io.kubernetes.pkg.api.unversioned.ExportOptions") - proto.RegisterType((*GroupKind)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupKind") - proto.RegisterType((*GroupResource)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupResource") - proto.RegisterType((*GroupVersion)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupVersion") - proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupVersionForDiscovery") - proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupVersionKind") - proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.kubernetes.pkg.api.unversioned.GroupVersionResource") - proto.RegisterType((*LabelSelector)(nil), "k8s.io.kubernetes.pkg.api.unversioned.LabelSelector") - proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.kubernetes.pkg.api.unversioned.LabelSelectorRequirement") - proto.RegisterType((*ListMeta)(nil), "k8s.io.kubernetes.pkg.api.unversioned.ListMeta") - proto.RegisterType((*RootPaths)(nil), "k8s.io.kubernetes.pkg.api.unversioned.RootPaths") - proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.kubernetes.pkg.api.unversioned.ServerAddressByClientCIDR") - proto.RegisterType((*Status)(nil), "k8s.io.kubernetes.pkg.api.unversioned.Status") - proto.RegisterType((*StatusCause)(nil), "k8s.io.kubernetes.pkg.api.unversioned.StatusCause") - proto.RegisterType((*StatusDetails)(nil), "k8s.io.kubernetes.pkg.api.unversioned.StatusDetails") - proto.RegisterType((*Time)(nil), "k8s.io.kubernetes.pkg.api.unversioned.Time") - proto.RegisterType((*Timestamp)(nil), "k8s.io.kubernetes.pkg.api.unversioned.Timestamp") - proto.RegisterType((*TypeMeta)(nil), "k8s.io.kubernetes.pkg.api.unversioned.TypeMeta") + proto.RegisterType((*APIGroup)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIGroup") + proto.RegisterType((*APIGroupList)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIGroupList") + proto.RegisterType((*APIResource)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIResource") + proto.RegisterType((*APIResourceList)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIResourceList") + proto.RegisterType((*APIVersions)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.APIVersions") + proto.RegisterType((*Duration)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Duration") + proto.RegisterType((*ExportOptions)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.ExportOptions") + proto.RegisterType((*GroupKind)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupKind") + proto.RegisterType((*GroupResource)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupResource") + proto.RegisterType((*GroupVersion)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupVersion") + proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupVersionForDiscovery") + proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupVersionKind") + proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.GroupVersionResource") + proto.RegisterType((*LabelSelector)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector") + proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelectorRequirement") + proto.RegisterType((*ListMeta)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta") + proto.RegisterType((*RootPaths)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.RootPaths") + proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.ServerAddressByClientCIDR") + proto.RegisterType((*Status)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Status") + proto.RegisterType((*StatusCause)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.StatusCause") + proto.RegisterType((*StatusDetails)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.StatusDetails") + proto.RegisterType((*Time)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Time") + proto.RegisterType((*Timestamp)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.Timestamp") + proto.RegisterType((*TypeMeta)(nil), "k8s.io.kubernetes.pkg.apis.meta.v1.TypeMeta") } func (m *APIGroup) Marshal() (data []byte, err error) { size := m.Size() @@ -4446,93 +4446,93 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 1400 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6b, 0x1b, 0x47, - 0x14, 0xd7, 0x4a, 0x96, 0xb2, 0x7a, 0xb2, 0x6a, 0x67, 0xeb, 0xd0, 0x8d, 0xa1, 0x92, 0xba, 0xa1, - 0xc5, 0x81, 0x44, 0x22, 0x26, 0x2d, 0x21, 0xa5, 0x7f, 0x2c, 0xdb, 0x09, 0x26, 0x71, 0x62, 0xc6, - 0x21, 0x85, 0x24, 0x85, 0xae, 0xb5, 0x63, 0x79, 0x91, 0xb4, 0xbb, 0x9d, 0x99, 0x35, 0x11, 0x2d, - 0x34, 0x97, 0x40, 0x0f, 0xa5, 0xe4, 0xd8, 0x4b, 0x4b, 0x02, 0xf9, 0x06, 0xfd, 0x12, 0xa1, 0xa7, - 0x5c, 0x0a, 0x3d, 0x14, 0xd3, 0xb8, 0x97, 0x5e, 0x7b, 0xf5, 0xa9, 0xcc, 0xec, 0xcc, 0x6a, 0x57, - 0x8e, 0xe2, 0x75, 0x9b, 0x43, 0x4f, 0xda, 0xf7, 0xff, 0xcd, 0x7b, 0xbf, 0x79, 0x6f, 0x04, 0xef, - 0xf7, 0x2e, 0xd1, 0xa6, 0xeb, 0xb7, 0x7a, 0xe1, 0x16, 0x26, 0x1e, 0x66, 0x98, 0xb6, 0x82, 0x5e, - 0xb7, 0x65, 0x07, 0x6e, 0x2b, 0xf4, 0x76, 0x31, 0xa1, 0xae, 0xef, 0x61, 0xa7, 0xd5, 0xc5, 0x1e, - 0x26, 0x36, 0xc3, 0x4e, 0x33, 0x20, 0x3e, 0xf3, 0x8d, 0x77, 0x23, 0xb3, 0xe6, 0xc8, 0xac, 0x19, - 0xf4, 0xba, 0x4d, 0x3b, 0x70, 0x9b, 0x09, 0xb3, 0xf9, 0xf3, 0x5d, 0x97, 0xed, 0x84, 0x5b, 0xcd, - 0x8e, 0x3f, 0x68, 0x75, 0xfd, 0xae, 0xdf, 0x12, 0xd6, 0x5b, 0xe1, 0xb6, 0xa0, 0x04, 0x21, 0xbe, - 0x22, 0xaf, 0xf3, 0xe7, 0x5f, 0x9e, 0x0c, 0x09, 0x3d, 0xe6, 0x0e, 0xf0, 0x78, 0x12, 0xf3, 0x17, - 0x5f, 0xad, 0x4e, 0x3b, 0x3b, 0x78, 0x60, 0x1f, 0xb2, 0xba, 0xf0, 0x72, 0xab, 0x90, 0xb9, 0xfd, - 0x96, 0xeb, 0x31, 0xca, 0xc8, 0xb8, 0x89, 0xf5, 0x4b, 0x01, 0xf4, 0xa5, 0x8d, 0xb5, 0xab, 0xc4, - 0x0f, 0x03, 0xa3, 0x01, 0x53, 0x9e, 0x3d, 0xc0, 0xa6, 0xd6, 0xd0, 0x16, 0xca, 0xed, 0xe9, 0x67, - 0x7b, 0xf5, 0xdc, 0xfe, 0x5e, 0x7d, 0xea, 0x86, 0x3d, 0xc0, 0x48, 0x48, 0x8c, 0x01, 0xe8, 0xb2, - 0x04, 0xd4, 0xcc, 0x37, 0x0a, 0x0b, 0x95, 0xc5, 0x4f, 0x9a, 0x99, 0xea, 0xd5, 0x14, 0x11, 0x6e, - 0x47, 0xe4, 0x15, 0x9f, 0xac, 0xb8, 0xb4, 0xe3, 0xef, 0x62, 0x32, 0x6c, 0xcf, 0xca, 0x30, 0xba, - 0x14, 0x52, 0x14, 0x87, 0x30, 0x1e, 0x6a, 0x30, 0x1b, 0x10, 0xbc, 0x8d, 0x09, 0xc1, 0x8e, 0x94, - 0x9b, 0x85, 0x86, 0xf6, 0x3a, 0xe2, 0x9a, 0x32, 0xee, 0xec, 0xc6, 0x58, 0x00, 0x74, 0x28, 0xa4, - 0xf1, 0x54, 0x83, 0x79, 0x8a, 0xc9, 0x2e, 0x26, 0x4b, 0x8e, 0x43, 0x30, 0xa5, 0xed, 0xe1, 0x72, - 0xdf, 0xc5, 0x1e, 0x5b, 0x5e, 0x5b, 0x41, 0xd4, 0x9c, 0x12, 0x95, 0xf8, 0x34, 0x63, 0x46, 0x9b, - 0x93, 0x1c, 0xb5, 0x2d, 0x99, 0xd2, 0xfc, 0x44, 0x15, 0x8a, 0x5e, 0x91, 0x87, 0xd5, 0x85, 0x69, - 0xd5, 0xcb, 0xeb, 0x2e, 0x65, 0xc6, 0x67, 0x50, 0xea, 0x72, 0x82, 0x9a, 0x9a, 0xc8, 0xb0, 0x95, - 0x31, 0x43, 0xe5, 0xa4, 0xfd, 0x86, 0x4c, 0xa8, 0x24, 0x48, 0x8a, 0xa4, 0x3b, 0xeb, 0xa1, 0x06, - 0x95, 0xa5, 0x8d, 0x35, 0x84, 0xa9, 0x1f, 0x92, 0x0e, 0xce, 0x00, 0x9c, 0x45, 0x00, 0xfe, 0x4b, - 0x03, 0xbb, 0x83, 0x1d, 0x33, 0xdf, 0xd0, 0x16, 0xf4, 0xb6, 0x21, 0xf5, 0xe0, 0x46, 0x2c, 0x41, - 0x09, 0x2d, 0xee, 0xb5, 0xe7, 0x7a, 0x8e, 0x68, 0x78, 0xc2, 0xeb, 0x35, 0xd7, 0x73, 0x90, 0x90, - 0x58, 0x3f, 0x6b, 0x30, 0x93, 0xc8, 0x43, 0x1c, 0xfa, 0x12, 0x4c, 0x77, 0x13, 0x3d, 0x97, 0x39, - 0xcd, 0x49, 0xeb, 0xe9, 0x24, 0x1e, 0x50, 0x4a, 0xd3, 0xd8, 0x86, 0x32, 0x91, 0x9e, 0x14, 0xba, - 0x17, 0xb3, 0x57, 0x4c, 0x25, 0x31, 0x0a, 0x95, 0x60, 0x52, 0x34, 0x72, 0x6d, 0xfd, 0x15, 0x55, - 0x4f, 0xe1, 0xdd, 0x58, 0x48, 0x5c, 0x2a, 0xde, 0xa8, 0x72, 0x7b, 0x7a, 0xc2, 0x7d, 0x38, 0x02, - 0x87, 0xf9, 0xff, 0x07, 0x0e, 0x2f, 0xeb, 0x3f, 0x3c, 0xae, 0xe7, 0x1e, 0xfc, 0xde, 0xc8, 0x59, - 0x6b, 0xa0, 0xaf, 0x84, 0xc4, 0x66, 0xbc, 0xbc, 0x1f, 0x81, 0xee, 0xc8, 0x6f, 0xd1, 0x94, 0x42, - 0xfb, 0x1d, 0x75, 0xf5, 0x95, 0xce, 0xc1, 0x5e, 0xbd, 0xca, 0x07, 0x5c, 0x53, 0x31, 0x50, 0x6c, - 0x62, 0xdd, 0x83, 0xea, 0xea, 0xfd, 0xc0, 0x27, 0xec, 0x66, 0xc0, 0x44, 0x31, 0xde, 0x83, 0x12, - 0x16, 0x0c, 0xe1, 0x4d, 0x1f, 0x81, 0x35, 0x52, 0x43, 0x52, 0x6a, 0x9c, 0x81, 0x22, 0xbe, 0x6f, - 0x77, 0x98, 0x44, 0x5d, 0x55, 0xaa, 0x15, 0x57, 0x39, 0x13, 0x45, 0x32, 0xeb, 0x1e, 0x94, 0x05, - 0x32, 0x38, 0xb8, 0xb8, 0x85, 0x00, 0x86, 0xc4, 0x4e, 0x6c, 0x21, 0x34, 0x50, 0x24, 0x8b, 0xd1, - 0x99, 0x9f, 0x84, 0xce, 0x44, 0x19, 0xfa, 0x50, 0x8d, 0x6c, 0xd5, 0x85, 0xc9, 0x14, 0xe1, 0x1c, - 0xe8, 0x0a, 0x34, 0x32, 0x4a, 0x3c, 0x2b, 0x95, 0x23, 0x14, 0x6b, 0x24, 0xa2, 0xed, 0x40, 0x0a, - 0xe5, 0xd9, 0x82, 0x9d, 0x85, 0x13, 0x12, 0x1a, 0x32, 0xd6, 0x8c, 0x54, 0x3b, 0xa1, 0x2e, 0x8b, - 0x92, 0x27, 0x22, 0x7d, 0x03, 0xe6, 0xa4, 0xf9, 0xfa, 0x1f, 0xee, 0x61, 0xf6, 0x54, 0xac, 0xef, - 0x35, 0x98, 0x4d, 0x7a, 0xca, 0xde, 0xbe, 0xec, 0x41, 0x8e, 0x9e, 0x43, 0x89, 0x8a, 0xfc, 0xa4, - 0xc1, 0x5c, 0xea, 0x68, 0xc7, 0xea, 0xf8, 0x31, 0x92, 0x4a, 0x82, 0xa3, 0x70, 0x0c, 0x70, 0xfc, - 0x9a, 0x87, 0xea, 0x75, 0x7b, 0x0b, 0xf7, 0x37, 0x71, 0x1f, 0x77, 0x98, 0x4f, 0x8c, 0xaf, 0xa1, - 0x32, 0xb0, 0x59, 0x67, 0x47, 0x70, 0xd5, 0xaa, 0x58, 0xcd, 0x38, 0x44, 0x52, 0xae, 0x9a, 0xeb, - 0x23, 0x3f, 0xab, 0x1e, 0x23, 0xc3, 0xf6, 0x9b, 0x32, 0xa7, 0x4a, 0x42, 0x82, 0x92, 0xe1, 0xc4, - 0x8a, 0x17, 0xf4, 0xea, 0xfd, 0x80, 0x4f, 0x92, 0x7f, 0xf1, 0xb4, 0x48, 0xe5, 0x80, 0xf0, 0x97, - 0xa1, 0x4b, 0xf0, 0x00, 0x7b, 0x6c, 0xb4, 0xe2, 0xd7, 0xc7, 0x02, 0xa0, 0x43, 0x21, 0xe7, 0x3f, - 0x86, 0xd9, 0xf1, 0xec, 0x8d, 0x59, 0x28, 0xf4, 0xf0, 0x30, 0xea, 0x18, 0xe2, 0x9f, 0xc6, 0x1c, - 0x14, 0x77, 0xed, 0x7e, 0x28, 0xef, 0x23, 0x8a, 0x88, 0xcb, 0xf9, 0x4b, 0x9a, 0xf5, 0x54, 0x03, - 0x73, 0x52, 0x22, 0xc6, 0xdb, 0x09, 0x47, 0xed, 0x8a, 0xcc, 0xaa, 0x70, 0x0d, 0x0f, 0x23, 0xaf, - 0xab, 0xa0, 0xfb, 0x01, 0x7f, 0x96, 0xf9, 0x44, 0xf6, 0xfd, 0xac, 0xea, 0xe5, 0x4d, 0xc9, 0x3f, - 0xd8, 0xab, 0x9f, 0x4a, 0xb9, 0x57, 0x02, 0x14, 0x9b, 0x1a, 0x16, 0x94, 0x44, 0x3e, 0xd4, 0x2c, - 0x88, 0x2d, 0x02, 0x7c, 0x18, 0xde, 0x16, 0x1c, 0x24, 0x25, 0xd6, 0x57, 0xa0, 0xf3, 0x2d, 0xb9, - 0x8e, 0x99, 0xcd, 0x21, 0x44, 0x71, 0x7f, 0xfb, 0xba, 0xeb, 0xf5, 0x64, 0x6a, 0x31, 0x84, 0x36, - 0x25, 0x1f, 0xc5, 0x1a, 0xc6, 0x12, 0xcc, 0x28, 0x38, 0xdd, 0x4e, 0x61, 0xf4, 0x2d, 0x69, 0x34, - 0x83, 0xd2, 0x62, 0x34, 0xae, 0x6f, 0x9d, 0x83, 0x32, 0xf2, 0x7d, 0xb6, 0x61, 0xb3, 0x1d, 0x6a, - 0xd4, 0xa1, 0x18, 0xf0, 0x0f, 0xb9, 0xf2, 0xca, 0xfc, 0x32, 0x08, 0x09, 0x8a, 0xf8, 0xd6, 0x77, - 0x1a, 0x9c, 0x9e, 0xb8, 0x80, 0xf8, 0x83, 0xa2, 0x13, 0x53, 0x32, 0xfd, 0xf8, 0x41, 0x31, 0xd2, - 0x43, 0x09, 0x2d, 0xe3, 0x43, 0xa8, 0xa6, 0xb6, 0x96, 0x3c, 0xc0, 0x29, 0x69, 0x56, 0x4d, 0x45, - 0x43, 0x69, 0x5d, 0xeb, 0xef, 0x3c, 0x94, 0x36, 0x99, 0xcd, 0x42, 0x6a, 0x7c, 0x0e, 0xfa, 0x00, - 0x33, 0xdb, 0xb1, 0x99, 0x2d, 0x22, 0x67, 0x7f, 0x59, 0xa9, 0xda, 0x8f, 0x2a, 0xad, 0x38, 0x28, - 0x76, 0xc9, 0x17, 0x1b, 0x15, 0x81, 0x64, 0x7e, 0xf1, 0x62, 0x8b, 0xc2, 0x23, 0x29, 0xe5, 0xd3, - 0x62, 0x80, 0x29, 0xb5, 0xbb, 0x6a, 0x02, 0xc4, 0xd3, 0x62, 0x3d, 0x62, 0x23, 0x25, 0x37, 0x3e, - 0x80, 0x12, 0xc1, 0x36, 0xf5, 0x3d, 0x73, 0x4a, 0x68, 0xd6, 0x94, 0x4b, 0x24, 0xb8, 0x07, 0x7b, - 0xf5, 0x69, 0xe9, 0x5c, 0xd0, 0x48, 0x6a, 0x1b, 0x77, 0xe1, 0x84, 0x83, 0x99, 0xed, 0xf6, 0xa9, - 0x59, 0x14, 0x07, 0xbd, 0x98, 0xf5, 0x71, 0x21, 0xbc, 0xad, 0x44, 0xb6, 0xed, 0x0a, 0x4f, 0x4a, - 0x12, 0x48, 0x79, 0xe4, 0x73, 0xb5, 0xe3, 0x3b, 0xd8, 0x2c, 0x35, 0xb4, 0x85, 0xe2, 0x68, 0xae, - 0x2e, 0xfb, 0x0e, 0x46, 0x42, 0x62, 0x3d, 0xd2, 0xa0, 0x12, 0x79, 0x5a, 0xb6, 0x43, 0x8a, 0x8d, - 0x0b, 0xf1, 0x31, 0xa2, 0x86, 0x9f, 0x56, 0x36, 0xb7, 0x86, 0x01, 0x3e, 0xd8, 0xab, 0x97, 0x85, - 0x1a, 0x27, 0xe2, 0x13, 0x24, 0x8a, 0x94, 0x3f, 0xa2, 0x48, 0x67, 0xa0, 0xb8, 0xed, 0xe2, 0xbe, - 0x1a, 0xf4, 0xf1, 0x88, 0xbe, 0xc2, 0x99, 0x28, 0x92, 0x59, 0x3f, 0xe6, 0xa1, 0x9a, 0x3a, 0x5c, - 0x86, 0xc7, 0x6f, 0x3c, 0xfb, 0xf3, 0x19, 0xde, 0x13, 0x13, 0xb7, 0x8c, 0x71, 0x07, 0x4a, 0x1d, - 0x7e, 0x3e, 0xf5, 0x87, 0x63, 0xf1, 0x58, 0xbd, 0x10, 0xa5, 0x19, 0x61, 0x49, 0x90, 0x14, 0x49, - 0x8f, 0xc6, 0x55, 0x38, 0x49, 0x30, 0x23, 0xc3, 0xa5, 0x6d, 0x86, 0xc9, 0x26, 0xee, 0xf8, 0x9e, - 0x13, 0xb5, 0xbc, 0x18, 0x17, 0xf9, 0x24, 0x1a, 0x57, 0x40, 0x87, 0x6d, 0xac, 0x3e, 0x4c, 0xdd, - 0x72, 0x07, 0x98, 0xd7, 0x9d, 0x4a, 0x37, 0xd1, 0x63, 0x2f, 0xae, 0xbb, 0x32, 0x56, 0x72, 0x5e, - 0x1e, 0xcf, 0xf6, 0xfc, 0x08, 0xee, 0xc5, 0x51, 0x79, 0x6e, 0x70, 0x26, 0x8a, 0x64, 0x97, 0xe7, - 0xf8, 0x06, 0xfb, 0xf6, 0x49, 0x3d, 0xf7, 0xe8, 0x49, 0x3d, 0xf7, 0xf8, 0x89, 0xdc, 0x66, 0x77, - 0xa1, 0xcc, 0xa3, 0x51, 0x66, 0x0f, 0x82, 0xd7, 0x1d, 0xd2, 0xfa, 0x02, 0x74, 0x0e, 0x25, 0x31, - 0x2b, 0x55, 0x77, 0xb4, 0x89, 0xdd, 0x59, 0x04, 0xb0, 0x03, 0x37, 0x3d, 0x1a, 0xe3, 0x81, 0x34, - 0x7a, 0xee, 0xa3, 0x84, 0x56, 0xfb, 0xfc, 0xb3, 0x17, 0xb5, 0xdc, 0xf3, 0x17, 0xb5, 0xdc, 0x6f, - 0x2f, 0x6a, 0xb9, 0x07, 0xfb, 0x35, 0xed, 0xd9, 0x7e, 0x4d, 0x7b, 0xbe, 0x5f, 0xd3, 0xfe, 0xd8, - 0xaf, 0x69, 0x8f, 0xfe, 0xac, 0xe5, 0xee, 0x54, 0x12, 0x8d, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, - 0xac, 0x17, 0x87, 0x87, 0xd2, 0x10, 0x00, 0x00, + // 1406 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0xdb, 0xc6, + 0x12, 0x17, 0x25, 0x4b, 0x91, 0x46, 0xd6, 0xb3, 0xc3, 0xe7, 0xe0, 0x31, 0x06, 0x9e, 0xa4, 0xc7, + 0x3c, 0x14, 0x0e, 0x90, 0x48, 0xb0, 0x51, 0x14, 0x41, 0xda, 0x14, 0x30, 0x6d, 0x27, 0x30, 0x12, + 0x27, 0xc6, 0x3a, 0x48, 0x8b, 0x34, 0x87, 0xd2, 0xe4, 0x5a, 0x66, 0x25, 0x91, 0xec, 0xee, 0x4a, + 0x88, 0xd0, 0x43, 0x83, 0x02, 0x05, 0x7a, 0x28, 0x8a, 0x1c, 0x8b, 0x1e, 0x8a, 0x18, 0xe8, 0x07, + 0xe8, 0x57, 0xe8, 0x2d, 0xb7, 0xe6, 0xd8, 0x43, 0x61, 0x34, 0x2e, 0x7a, 0xea, 0x37, 0xf0, 0xa9, + 0xd8, 0xe5, 0x2e, 0x45, 0xca, 0x51, 0x4c, 0x23, 0x3d, 0xf4, 0x64, 0xed, 0xfc, 0xf9, 0xcd, 0x70, + 0xe6, 0xb7, 0x33, 0x6b, 0x58, 0xe9, 0x5e, 0xa3, 0x2d, 0x2f, 0x68, 0x77, 0x07, 0xbb, 0x98, 0xf8, + 0x98, 0x61, 0xda, 0x0e, 0xbb, 0x9d, 0xb6, 0x1d, 0x7a, 0xb4, 0xdd, 0xc7, 0xcc, 0x6e, 0x0f, 0x97, + 0xdb, 0x1d, 0xec, 0x63, 0x62, 0x33, 0xec, 0xb6, 0x42, 0x12, 0xb0, 0x40, 0x37, 0x23, 0x9f, 0xd6, + 0xd8, 0xa7, 0x15, 0x76, 0x3b, 0x2d, 0xee, 0xd3, 0xe2, 0x3e, 0xad, 0xe1, 0xf2, 0xe2, 0xd5, 0x8e, + 0xc7, 0xf6, 0x07, 0xbb, 0x2d, 0x27, 0xe8, 0xb7, 0x3b, 0x41, 0x27, 0x68, 0x0b, 0xd7, 0xdd, 0xc1, + 0x9e, 0x38, 0x89, 0x83, 0xf8, 0x15, 0x41, 0x2e, 0x5e, 0x7d, 0x75, 0x1a, 0x64, 0xe0, 0x33, 0xaf, + 0x8f, 0x27, 0x33, 0x58, 0x7c, 0xfb, 0xf5, 0xe6, 0xd4, 0xd9, 0xc7, 0x7d, 0xfb, 0x84, 0xd7, 0xf2, + 0xab, 0xbd, 0x06, 0xcc, 0xeb, 0xb5, 0x3d, 0x9f, 0x51, 0x46, 0x26, 0x5d, 0xcc, 0x9f, 0x0a, 0x50, + 0x5e, 0xdd, 0xde, 0xbc, 0x45, 0x82, 0x41, 0xa8, 0x37, 0x61, 0xc6, 0xb7, 0xfb, 0xd8, 0xd0, 0x9a, + 0xda, 0x52, 0xc5, 0x9a, 0x7d, 0x7e, 0xd8, 0xc8, 0x1d, 0x1d, 0x36, 0x66, 0xee, 0xda, 0x7d, 0x8c, + 0x84, 0x46, 0xff, 0x04, 0xca, 0x43, 0x4c, 0xa8, 0x17, 0xf8, 0xd4, 0xc8, 0x37, 0x0b, 0x4b, 0xd5, + 0x95, 0xf7, 0x5a, 0xa7, 0x17, 0xab, 0x25, 0xe0, 0x1f, 0x44, 0x8e, 0x37, 0x03, 0xb2, 0xee, 0x51, + 0x27, 0x18, 0x62, 0x32, 0xb2, 0xe6, 0x65, 0x8c, 0xb2, 0x54, 0x52, 0x14, 0xe3, 0xeb, 0x5f, 0x68, + 0x30, 0x1f, 0x12, 0xbc, 0x87, 0x09, 0xc1, 0xae, 0xd4, 0x1b, 0x85, 0xa6, 0xf6, 0xc6, 0x41, 0x0d, + 0x19, 0x74, 0x7e, 0x7b, 0x02, 0x1d, 0x9d, 0x88, 0xa7, 0x1f, 0x68, 0xb0, 0x48, 0x31, 0x19, 0x62, + 0xb2, 0xea, 0xba, 0x04, 0x53, 0x6a, 0x8d, 0xd6, 0x7a, 0x1e, 0xf6, 0xd9, 0xda, 0xe6, 0x3a, 0xa2, + 0xc6, 0x8c, 0xa8, 0xc1, 0x8d, 0x2c, 0xe9, 0xec, 0x4c, 0x43, 0xb1, 0x4c, 0x99, 0xcf, 0xe2, 0x54, + 0x13, 0x8a, 0x5e, 0x93, 0x84, 0xe9, 0xc2, 0xac, 0x6a, 0xe1, 0x1d, 0x8f, 0x32, 0xfd, 0x3e, 0x94, + 0x3a, 0xfc, 0x40, 0x0d, 0x4d, 0xa4, 0x77, 0x25, 0x4b, 0x7a, 0x0a, 0xc1, 0xfa, 0x97, 0xcc, 0xa6, + 0x24, 0x8e, 0x14, 0x49, 0x2c, 0xf3, 0x4b, 0x0d, 0xaa, 0xab, 0xdb, 0x9b, 0x08, 0xd3, 0x60, 0x40, + 0x1c, 0x9c, 0x81, 0x2c, 0x2b, 0x00, 0xfc, 0x2f, 0x0d, 0x6d, 0x07, 0xbb, 0x46, 0xbe, 0xa9, 0x2d, + 0x95, 0x2d, 0x5d, 0xda, 0xc1, 0xdd, 0x58, 0x83, 0x12, 0x56, 0x1c, 0xb5, 0xeb, 0xf9, 0xae, 0xe8, + 0x73, 0x02, 0xf5, 0xb6, 0xe7, 0xbb, 0x48, 0x68, 0xcc, 0x1f, 0x35, 0x98, 0x4b, 0xe4, 0x21, 0xbe, + 0xf8, 0x1a, 0xcc, 0x76, 0x12, 0xdd, 0x96, 0x39, 0x2d, 0x48, 0xef, 0xd9, 0x24, 0x13, 0x50, 0xca, + 0x52, 0x77, 0xa0, 0x42, 0x24, 0x92, 0x62, 0x74, 0x3b, 0x63, 0xb9, 0x54, 0x06, 0xe3, 0x38, 0x09, + 0x21, 0x45, 0x63, 0x5c, 0xf3, 0x8f, 0xa8, 0x74, 0x8a, 0xe3, 0xfa, 0x52, 0xe2, 0x16, 0xf1, 0x16, + 0x55, 0xac, 0xd9, 0x29, 0x77, 0xe0, 0x14, 0xfa, 0xe5, 0xff, 0x01, 0xf4, 0xbb, 0x5e, 0xfe, 0xf6, + 0x59, 0x23, 0xf7, 0xe4, 0xd7, 0x66, 0xce, 0xdc, 0x84, 0xf2, 0xfa, 0x80, 0xd8, 0x8c, 0x17, 0xf6, + 0x06, 0x94, 0x5d, 0xf9, 0x5b, 0xb4, 0xa3, 0x60, 0xfd, 0x4f, 0xdd, 0x75, 0x65, 0x73, 0x7c, 0xd8, + 0xa8, 0xf1, 0x71, 0xd6, 0x52, 0x02, 0x14, 0xbb, 0x98, 0x8f, 0xa0, 0xb6, 0xf1, 0x38, 0x0c, 0x08, + 0xbb, 0x17, 0x32, 0x51, 0x89, 0xb7, 0xa0, 0x84, 0x85, 0x40, 0xa0, 0x95, 0xc7, 0x34, 0x8d, 0xcc, + 0x90, 0xd4, 0xea, 0x97, 0xa0, 0x88, 0x1f, 0xdb, 0x0e, 0x93, 0x7c, 0xab, 0x49, 0xb3, 0xe2, 0x06, + 0x17, 0xa2, 0x48, 0x67, 0x3e, 0x82, 0x8a, 0xe0, 0x04, 0xa7, 0x15, 0xf7, 0x10, 0x94, 0x90, 0xac, + 0x89, 0x3d, 0x84, 0x05, 0x8a, 0x74, 0x31, 0x2f, 0xf3, 0xd3, 0x78, 0x99, 0x28, 0x43, 0x0f, 0x6a, + 0x91, 0xaf, 0xba, 0x2a, 0x99, 0x22, 0x5c, 0x81, 0xb2, 0x62, 0x8c, 0x8c, 0x12, 0x0f, 0x47, 0x05, + 0x84, 0x62, 0x8b, 0x44, 0xb4, 0x7d, 0x48, 0xf1, 0x3b, 0x5b, 0xb0, 0xcb, 0x70, 0x4e, 0x72, 0x4c, + 0xc6, 0x9a, 0x93, 0x66, 0xe7, 0xd4, 0x35, 0x51, 0xfa, 0x44, 0xa4, 0xcf, 0xc1, 0x98, 0x36, 0x53, + 0xdf, 0xe0, 0x06, 0x66, 0x4f, 0xc5, 0xfc, 0x46, 0x83, 0xf9, 0x24, 0x52, 0xf6, 0xf6, 0x65, 0x0f, + 0x72, 0xfa, 0x04, 0x4a, 0x54, 0xe4, 0x7b, 0x0d, 0x16, 0x52, 0x9f, 0x76, 0xa6, 0x8e, 0x9f, 0x21, + 0xa9, 0x24, 0x39, 0x0a, 0x67, 0x20, 0xc7, 0xcf, 0x79, 0xa8, 0xdd, 0xb1, 0x77, 0x71, 0x6f, 0x07, + 0xf7, 0xb0, 0xc3, 0x02, 0xa2, 0x8f, 0xa0, 0xda, 0xb7, 0x99, 0xb3, 0x2f, 0xa4, 0x6a, 0x43, 0x58, + 0x59, 0x26, 0x48, 0x0a, 0xa7, 0xb5, 0x35, 0x06, 0xd9, 0xf0, 0x19, 0x19, 0x59, 0xff, 0x96, 0x09, + 0x55, 0x13, 0x1a, 0x94, 0x8c, 0x25, 0x16, 0xba, 0x38, 0x6f, 0x3c, 0x0e, 0xf9, 0x18, 0x39, 0xeb, + 0x2b, 0x22, 0x95, 0x00, 0xc2, 0x9f, 0x0e, 0x3c, 0x82, 0xfb, 0xd8, 0x67, 0xe3, 0x85, 0xbe, 0x35, + 0x81, 0x8e, 0x4e, 0xc4, 0x5b, 0x7c, 0x1f, 0xe6, 0x27, 0x53, 0xd7, 0xe7, 0xa1, 0xd0, 0xc5, 0xa3, + 0xa8, 0x57, 0x88, 0xff, 0xd4, 0x17, 0xa0, 0x38, 0xb4, 0x7b, 0x03, 0x79, 0x13, 0x51, 0x74, 0xb8, + 0x9e, 0xbf, 0xa6, 0x99, 0x3f, 0x68, 0x60, 0x4c, 0x4b, 0x44, 0xff, 0x6f, 0x02, 0xc8, 0xaa, 0xca, + 0xac, 0x0a, 0xb7, 0xf1, 0x28, 0x42, 0xdd, 0x80, 0x72, 0x10, 0xf2, 0xe7, 0x57, 0x40, 0x64, 0xc7, + 0x2f, 0xab, 0x2e, 0xde, 0x93, 0xf2, 0xe3, 0xc3, 0xc6, 0x85, 0x14, 0xbc, 0x52, 0xa0, 0xd8, 0x55, + 0x37, 0xa1, 0x24, 0xf2, 0xa1, 0x46, 0x41, 0x2c, 0x0f, 0xe0, 0x63, 0xf0, 0x81, 0x90, 0x20, 0xa9, + 0x31, 0x3f, 0x83, 0x32, 0xdf, 0x8c, 0x5b, 0x98, 0xd9, 0x9c, 0x3c, 0x14, 0xf7, 0xf6, 0xee, 0x78, + 0x7e, 0x57, 0xa6, 0x16, 0x93, 0x67, 0x47, 0xca, 0x51, 0x6c, 0xa1, 0xaf, 0xc2, 0x9c, 0x22, 0xd2, + 0x83, 0x14, 0x3b, 0xff, 0x23, 0x9d, 0xe6, 0x50, 0x5a, 0x8d, 0x26, 0xed, 0xcd, 0x2b, 0x50, 0x41, + 0x41, 0xc0, 0xb6, 0x6d, 0xb6, 0x4f, 0xf5, 0x06, 0x14, 0x43, 0xfe, 0x43, 0x6e, 0xba, 0x0a, 0xbf, + 0x06, 0x42, 0x83, 0x22, 0xb9, 0xf9, 0xb5, 0x06, 0x17, 0xa7, 0xae, 0x1e, 0xfe, 0x88, 0x70, 0xe2, + 0x93, 0x4c, 0x3f, 0x7e, 0x44, 0x8c, 0xed, 0x50, 0xc2, 0x4a, 0x7f, 0x17, 0x6a, 0xa9, 0x7d, 0x25, + 0x3f, 0xe0, 0x82, 0x74, 0xab, 0xa5, 0xa2, 0xa1, 0xb4, 0xad, 0xf9, 0x67, 0x1e, 0x4a, 0x3b, 0xcc, + 0x66, 0x03, 0xaa, 0x3f, 0x84, 0x32, 0xe7, 0x9e, 0x6b, 0x33, 0x5b, 0x44, 0xce, 0xf8, 0x94, 0x52, + 0x85, 0x1f, 0x97, 0x59, 0x49, 0x50, 0x8c, 0xc7, 0xf7, 0x19, 0x15, 0x51, 0x64, 0x72, 0xf1, 0x3e, + 0x8b, 0x62, 0x23, 0xa9, 0xe5, 0x43, 0xa2, 0x8f, 0x29, 0xb5, 0x3b, 0xea, 0xe2, 0xc7, 0x43, 0x62, + 0x2b, 0x12, 0x23, 0xa5, 0xd7, 0xdf, 0x81, 0x12, 0xc1, 0x36, 0x0d, 0x7c, 0x63, 0x46, 0x58, 0xd6, + 0x15, 0x24, 0x12, 0xd2, 0xe3, 0xc3, 0xc6, 0xac, 0x04, 0x17, 0x67, 0x24, 0xad, 0xf5, 0x0f, 0xe1, + 0x9c, 0x8b, 0x99, 0xed, 0xf5, 0xa8, 0x51, 0x14, 0x5f, 0xb9, 0x9c, 0xe9, 0x41, 0x21, 0xa0, 0xd6, + 0x23, 0x47, 0xab, 0xca, 0x33, 0x92, 0x07, 0xa4, 0xe0, 0xf8, 0x2c, 0x75, 0x02, 0x17, 0x1b, 0xa5, + 0xa6, 0xb6, 0x54, 0x1c, 0xcf, 0xd2, 0xb5, 0xc0, 0xc5, 0x48, 0x68, 0xcc, 0xa7, 0x1a, 0x54, 0x23, + 0xa4, 0x35, 0x7b, 0x40, 0xb1, 0xbe, 0x1c, 0x7f, 0x43, 0xd4, 0xea, 0x8b, 0xca, 0xe7, 0xfe, 0x28, + 0xc4, 0xc7, 0x87, 0x8d, 0x8a, 0x30, 0xe3, 0x87, 0x38, 0xfd, 0x44, 0x85, 0xf2, 0xa7, 0x54, 0xe8, + 0x12, 0x14, 0xf7, 0x3c, 0xdc, 0x53, 0xc3, 0x3d, 0x1e, 0xcb, 0x37, 0xb9, 0x10, 0x45, 0x3a, 0xf3, + 0xbb, 0x3c, 0xd4, 0x52, 0x1f, 0x97, 0xe1, 0xa9, 0x1b, 0xcf, 0xfb, 0x7c, 0x86, 0x37, 0xc4, 0xd4, + 0xcd, 0xa2, 0x7f, 0x00, 0x25, 0x87, 0x7f, 0x9f, 0xfa, 0xc7, 0xa2, 0x9d, 0xbd, 0x11, 0xa2, 0x2e, + 0x63, 0x16, 0x89, 0x23, 0x45, 0x12, 0x4e, 0xbf, 0x05, 0xe7, 0x09, 0x66, 0x64, 0xb4, 0xba, 0xc7, + 0x30, 0xd9, 0xc1, 0x4e, 0xe0, 0xbb, 0x51, 0xb3, 0x8b, 0x71, 0x85, 0xcf, 0xa3, 0x49, 0x03, 0x74, + 0xd2, 0xc7, 0xec, 0xc1, 0xcc, 0x7d, 0xaf, 0x8f, 0x79, 0xd1, 0xa9, 0x84, 0x89, 0x5e, 0x77, 0x71, + 0xd1, 0x95, 0xb3, 0xd2, 0xf3, 0xda, 0xf8, 0xb6, 0x1f, 0x44, 0x44, 0x2f, 0x8e, 0x6b, 0x73, 0x97, + 0x0b, 0x51, 0xa4, 0xbb, 0xbe, 0xc0, 0x57, 0xd6, 0x57, 0x07, 0x8d, 0xdc, 0xd3, 0x83, 0x46, 0xee, + 0xd9, 0x81, 0x5c, 0x5f, 0x1f, 0x41, 0x85, 0x47, 0xa3, 0xcc, 0xee, 0x87, 0x7f, 0x77, 0x48, 0xf3, + 0x63, 0x28, 0x73, 0x1e, 0x89, 0x11, 0xa9, 0x5a, 0xa3, 0x4d, 0x6d, 0xcd, 0x0a, 0x80, 0x1d, 0x7a, + 0xe9, 0x89, 0x18, 0xcf, 0xa1, 0xf1, 0xe3, 0x1e, 0x25, 0xac, 0xac, 0xff, 0x3f, 0x7f, 0x59, 0xcf, + 0xbd, 0x78, 0x59, 0xcf, 0xfd, 0xf2, 0xb2, 0x9e, 0x7b, 0x72, 0x54, 0xd7, 0x9e, 0x1f, 0xd5, 0xb5, + 0x17, 0x47, 0x75, 0xed, 0xb7, 0xa3, 0xba, 0xf6, 0xf4, 0xf7, 0x7a, 0xee, 0x61, 0x7e, 0xb8, 0xfc, + 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, 0xf3, 0x8f, 0xb8, 0xa2, 0x10, 0x00, 0x00, } diff --git a/pkg/apis/meta/v1/generated.proto b/pkg/apis/meta/v1/generated.proto index c2a6b7c1cbd..191c6ef5d4a 100644 --- a/pkg/apis/meta/v1/generated.proto +++ b/pkg/apis/meta/v1/generated.proto @@ -19,14 +19,14 @@ limitations under the License. syntax = 'proto2'; -package k8s.io.kubernetes.pkg.api.unversioned; +package k8s.io.kubernetes.pkg.apis.meta.v1; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "unversioned"; +option go_package = "v1"; // APIGroup contains the name, the supported versions, and the preferred version // of a group. diff --git a/pkg/apis/policy/types.generated.go b/pkg/apis/policy/types.generated.go index cdd6c4eee7d..7df59553e30 100644 --- a/pkg/apis/policy/types.generated.go +++ b/pkg/apis/policy/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_api "k8s.io/kubernetes/pkg/api" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg4_types "k8s.io/kubernetes/pkg/types" pkg1_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -65,7 +65,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg3_api.ObjectMeta - var v1 pkg2_unversioned.LabelSelector + var v1 pkg2_v1.LabelSelector var v2 pkg4_types.UID var v3 pkg1_intstr.IntOrString var v4 time.Time @@ -256,7 +256,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym17 := z.DecBinary() _ = yym17 @@ -322,7 +322,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym22 := z.DecBinary() _ = yym22 @@ -413,7 +413,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym29 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } else { @@ -427,7 +427,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym30 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } @@ -583,7 +583,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromMap(l int, d *codec1978.D _ = yym48 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv47), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv47), d) } } case "disruptionsAllowed": @@ -659,7 +659,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromArray(l int, d *codec1978 _ = yym56 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv55), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv55), d) } } yyj53++ @@ -1299,7 +1299,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv113 := &x.ListMeta yym114 := z.DecBinary() @@ -1380,7 +1380,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv120 := &x.ListMeta yym121 := z.DecBinary() @@ -1744,7 +1744,7 @@ func (x *Eviction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversioned.Time, e *codec1978.Encoder) { +func (x codecSelfer1234) encMapstringv1_Time(v map[string]pkg2_v1.Time, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -1774,7 +1774,7 @@ func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversio z.EncSendContainerState(codecSelfer_containerMapEnd1234) } -func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversioned.Time, d *codec1978.Decoder) { +func (x codecSelfer1234) decMapstringv1_Time(v *map[string]pkg2_v1.Time, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -1784,11 +1784,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi yybh152 := z.DecBasicHandle() if yyv152 == nil { yyrl152, _ := z.DecInferLen(yyl152, yybh152.MaxInitLen, 40) - yyv152 = make(map[string]pkg2_unversioned.Time, yyrl152) + yyv152 = make(map[string]pkg2_v1.Time, yyrl152) *v = yyv152 } var yymk152 string - var yymv152 pkg2_unversioned.Time + var yymv152 pkg2_v1.Time var yymg152 bool if yybh152.MapValueReset { yymg152 = true @@ -1805,11 +1805,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv154 := &yymv152 yym155 := z.DecBinary() @@ -1841,11 +1841,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv157 := &yymv152 yym158 := z.DecBinary() diff --git a/pkg/apis/policy/types.go b/pkg/apis/policy/types.go index 02f3f75535c..535e744f97d 100644 --- a/pkg/apis/policy/types.go +++ b/pkg/apis/policy/types.go @@ -92,7 +92,7 @@ type PodDisruptionBudgetList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty"` - Items []PodDisruptionBudget `json:"items"` + Items []PodDisruptionBudget `json:"items"` } // +genclient=true diff --git a/pkg/apis/policy/v1alpha1/register.go b/pkg/apis/policy/v1alpha1/register.go index b898c9f3281..25d1462bdb4 100644 --- a/pkg/apis/policy/v1alpha1/register.go +++ b/pkg/apis/policy/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/policy/v1alpha1/types.go b/pkg/apis/policy/v1alpha1/types.go index 5c05d5610bb..d9cafe227d8 100644 --- a/pkg/apis/policy/v1alpha1/types.go +++ b/pkg/apis/policy/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -74,7 +74,7 @@ type PodDisruptionBudgetList struct { metav1.TypeMeta `json:",inline"` // +optional metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` - Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` + Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` } // Eviction evicts a pod from its node subject to certain policies and safety constraints. diff --git a/pkg/apis/policy/v1beta1/generated.pb.go b/pkg/apis/policy/v1beta1/generated.pb.go index 1c33839feaf..5d1a716ce1e 100644 --- a/pkg/apis/policy/v1beta1/generated.pb.go +++ b/pkg/apis/policy/v1beta1/generated.pb.go @@ -37,8 +37,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/kubernetes/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -429,7 +429,7 @@ func (this *PodDisruptionBudgetList) String() string { return "nil" } s := strings.Join([]string{`&PodDisruptionBudgetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodDisruptionBudget", "PodDisruptionBudget", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -441,7 +441,7 @@ func (this *PodDisruptionBudgetSpec) String() string { } s := strings.Join([]string{`&PodDisruptionBudgetSpec{`, `MinAvailable:` + strings.Replace(strings.Replace(this.MinAvailable.String(), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") return s @@ -455,7 +455,7 @@ func (this *PodDisruptionBudgetStatus) String() string { keysForDisruptedPods = append(keysForDisruptedPods, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForDisruptedPods) - mapStringForDisruptedPods := "map[string]k8s_io_kubernetes_pkg_api_unversioned.Time{" + mapStringForDisruptedPods := "map[string]k8s_io_kubernetes_pkg_apis_meta_v1.Time{" for _, k := range keysForDisruptedPods { mapStringForDisruptedPods += fmt.Sprintf("%v: %v,", k, this.DisruptedPods[k]) } @@ -929,7 +929,7 @@ func (m *PodDisruptionBudgetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1110,13 +1110,13 @@ func (m *PodDisruptionBudgetStatus) Unmarshal(data []byte) error { if postmsgIndex > l { return io.ErrUnexpectedEOF } - mapvalue := &k8s_io_kubernetes_pkg_api_unversioned.Time{} + mapvalue := &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} if err := mapvalue.Unmarshal(data[iNdEx:postmsgIndex]); err != nil { return err } iNdEx = postmsgIndex if m.DisruptedPods == nil { - m.DisruptedPods = make(map[string]k8s_io_kubernetes_pkg_api_unversioned.Time) + m.DisruptedPods = make(map[string]k8s_io_kubernetes_pkg_apis_meta_v1.Time) } m.DisruptedPods[mapkey] = *mapvalue iNdEx = postIndex @@ -1323,53 +1323,53 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 764 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0x4d, 0x6f, 0xf3, 0x44, - 0x10, 0xc7, 0xe3, 0x26, 0x29, 0x61, 0x9b, 0x54, 0x65, 0xa1, 0x10, 0x22, 0xe1, 0xa2, 0x9c, 0x5a, - 0x41, 0xd7, 0x4a, 0x55, 0xa4, 0xc2, 0xa1, 0x52, 0x4d, 0x2a, 0x28, 0xa2, 0x4a, 0xe5, 0x22, 0x81, - 0x90, 0x40, 0xf2, 0xcb, 0xe0, 0x2c, 0xb1, 0xbd, 0xd6, 0xee, 0xda, 0x90, 0x1b, 0x1f, 0x81, 0x03, - 0xdf, 0x88, 0x4b, 0xc5, 0xa9, 0x47, 0x2e, 0x54, 0x34, 0xfd, 0x0e, 0x9c, 0x91, 0xed, 0x4d, 0x1a, - 0xe7, 0xa5, 0xaa, 0xd4, 0xe7, 0xb9, 0x79, 0x77, 0xe7, 0xf7, 0xff, 0xcf, 0xcc, 0xce, 0x1a, 0x7d, - 0x3a, 0x3a, 0x11, 0x84, 0x32, 0x63, 0x94, 0x38, 0xc0, 0x23, 0x90, 0x20, 0x8c, 0x78, 0xe4, 0x1b, - 0x76, 0x4c, 0x85, 0x11, 0xb3, 0x80, 0xba, 0x63, 0x23, 0xed, 0x39, 0x20, 0xed, 0x9e, 0xe1, 0x43, - 0x04, 0xdc, 0x96, 0xe0, 0x91, 0x98, 0x33, 0xc9, 0xf0, 0x41, 0x81, 0x92, 0x47, 0x94, 0xc4, 0x23, - 0x9f, 0x64, 0x28, 0x29, 0x50, 0xa2, 0xd0, 0xce, 0xa1, 0x4f, 0xe5, 0x30, 0x71, 0x88, 0xcb, 0x42, - 0xc3, 0x67, 0x3e, 0x33, 0x72, 0x05, 0x27, 0xf9, 0x29, 0x5f, 0xe5, 0x8b, 0xfc, 0xab, 0x50, 0xee, - 0x1c, 0xad, 0x4d, 0xca, 0xe0, 0x20, 0x58, 0xc2, 0x5d, 0x58, 0xcc, 0xa6, 0xf3, 0xc9, 0x7a, 0x26, - 0x89, 0x52, 0xe0, 0x82, 0xb2, 0x08, 0xbc, 0x25, 0xec, 0xe3, 0xf5, 0x58, 0xba, 0x54, 0x72, 0xe7, - 0x70, 0x75, 0x34, 0x4f, 0x22, 0x49, 0xc3, 0xe5, 0x9c, 0x8e, 0x9f, 0x0e, 0x17, 0xee, 0x10, 0x42, - 0x7b, 0x89, 0xea, 0xad, 0xa6, 0x12, 0x49, 0x03, 0x83, 0x46, 0x52, 0x48, 0xbe, 0x88, 0x74, 0xff, - 0xd2, 0x50, 0xe3, 0x3c, 0xa5, 0xae, 0xa4, 0x2c, 0xc2, 0xdf, 0xa1, 0x46, 0x08, 0xd2, 0xf6, 0x6c, - 0x69, 0xb7, 0xb5, 0x0f, 0xb5, 0xfd, 0xad, 0xa3, 0x7d, 0xb2, 0xf6, 0xaa, 0x48, 0xda, 0x23, 0x03, - 0xe7, 0x67, 0x70, 0xe5, 0x25, 0x48, 0xdb, 0xc4, 0x37, 0x77, 0x7b, 0x95, 0xc9, 0xdd, 0x1e, 0x7a, - 0xdc, 0xb3, 0x66, 0x6a, 0xd8, 0x43, 0x2d, 0x0f, 0x02, 0x90, 0x30, 0x88, 0x33, 0x27, 0xd1, 0xde, - 0xc8, 0xe5, 0x3f, 0x7a, 0x5a, 0xbe, 0x3f, 0x8f, 0x98, 0x6f, 0x4d, 0xee, 0xf6, 0x5a, 0xa5, 0x2d, - 0xab, 0x2c, 0xda, 0xfd, 0x73, 0x03, 0xbd, 0x7d, 0xc5, 0xbc, 0x3e, 0x15, 0x3c, 0xc9, 0xb7, 0xcc, - 0xc4, 0xf3, 0x41, 0xbe, 0xd6, 0xba, 0x6a, 0x22, 0x06, 0x57, 0x95, 0x63, 0x92, 0x67, 0x0f, 0x36, - 0x59, 0x91, 0xe7, 0x75, 0x0c, 0xae, 0xd9, 0x54, 0x7e, 0xb5, 0x6c, 0x65, 0xe5, 0xea, 0x38, 0x40, - 0x9b, 0x42, 0xda, 0x32, 0x11, 0xed, 0x6a, 0xee, 0xd3, 0x7f, 0xa1, 0x4f, 0xae, 0x65, 0x6e, 0x2b, - 0xa7, 0xcd, 0x62, 0x6d, 0x29, 0x8f, 0xee, 0x3f, 0x1a, 0x7a, 0x6f, 0x05, 0xf5, 0x35, 0x15, 0x12, - 0xff, 0xb0, 0xd4, 0x49, 0xe3, 0x89, 0x4e, 0xce, 0x3d, 0x1f, 0x92, 0xe1, 0x79, 0x43, 0x77, 0x94, - 0x6d, 0x63, 0xba, 0x33, 0xd7, 0x4e, 0x17, 0xd5, 0xa9, 0x84, 0x30, 0x1b, 0x8f, 0xea, 0xfe, 0xd6, - 0xd1, 0xe9, 0xcb, 0xea, 0x34, 0x5b, 0xca, 0xaa, 0x7e, 0x91, 0x89, 0x5a, 0x85, 0x76, 0xf7, 0x61, - 0x75, 0x7d, 0x59, 0xbf, 0xf1, 0x10, 0x35, 0x43, 0x1a, 0x9d, 0xa5, 0x36, 0x0d, 0x6c, 0x27, 0x00, - 0x55, 0x23, 0x59, 0x93, 0x47, 0xf6, 0xb0, 0x48, 0xf1, 0xb0, 0xc8, 0x45, 0x24, 0x07, 0xfc, 0x5a, - 0x72, 0x1a, 0xf9, 0xe6, 0x3b, 0xca, 0xb7, 0x79, 0x39, 0xa7, 0x65, 0x95, 0x94, 0xf1, 0x8f, 0xa8, - 0x21, 0x20, 0x00, 0x57, 0x32, 0xae, 0xa6, 0xe7, 0xf8, 0xb9, 0x9d, 0xb4, 0x1d, 0x08, 0xae, 0x15, - 0x6b, 0x36, 0xb3, 0x56, 0x4e, 0x57, 0xd6, 0x4c, 0xb3, 0xfb, 0x5f, 0x0d, 0xbd, 0xbf, 0xf6, 0xee, - 0xf1, 0x57, 0x08, 0x33, 0x47, 0x00, 0x4f, 0xc1, 0xfb, 0xa2, 0xf8, 0x23, 0x50, 0x16, 0xe5, 0xd5, - 0x56, 0xcd, 0x8e, 0xca, 0x1e, 0x0f, 0x96, 0x22, 0xac, 0x15, 0x14, 0xfe, 0x43, 0x43, 0x2d, 0xaf, - 0xb0, 0x01, 0xef, 0x8a, 0x79, 0xd3, 0xdb, 0xfb, 0xf6, 0x55, 0x4c, 0x29, 0xe9, 0xcf, 0x2b, 0x9f, - 0x47, 0x92, 0x8f, 0xcd, 0x5d, 0x95, 0x60, 0xab, 0x74, 0x66, 0x95, 0x93, 0xc0, 0x97, 0x08, 0x7b, - 0x33, 0x49, 0x71, 0x16, 0x04, 0xec, 0x17, 0xf0, 0xf2, 0x07, 0x54, 0x37, 0x3f, 0x50, 0x0a, 0xbb, - 0x25, 0xdf, 0x69, 0x90, 0xb5, 0x02, 0xc4, 0xa7, 0x68, 0xdb, 0x4d, 0x38, 0x87, 0x48, 0x7e, 0x09, - 0x76, 0x20, 0x87, 0xe3, 0x76, 0x2d, 0x97, 0x7a, 0x57, 0x49, 0x6d, 0x7f, 0x5e, 0x3a, 0xb5, 0x16, - 0xa2, 0x33, 0xde, 0x03, 0x41, 0x39, 0x78, 0x53, 0xbe, 0x5e, 0xe6, 0xfb, 0xa5, 0x53, 0x6b, 0x21, - 0x1a, 0x9f, 0xa0, 0x26, 0xfc, 0x1a, 0x83, 0x3b, 0xed, 0xf1, 0x66, 0x4e, 0xcf, 0x26, 0xed, 0x7c, - 0xee, 0xcc, 0x2a, 0x45, 0x76, 0x42, 0x84, 0x97, 0x9b, 0x88, 0x77, 0x50, 0x75, 0x04, 0xe3, 0xfc, - 0xca, 0xdf, 0xb4, 0xb2, 0x4f, 0x7c, 0x86, 0xea, 0xa9, 0x1d, 0x24, 0xf0, 0x8c, 0x7f, 0xf3, 0xfc, - 0x38, 0x7e, 0x43, 0x43, 0xb0, 0x0a, 0xf2, 0xb3, 0x8d, 0x13, 0xcd, 0x3c, 0xb8, 0xb9, 0xd7, 0x2b, - 0xb7, 0xf7, 0x7a, 0xe5, 0xef, 0x7b, 0xbd, 0xf2, 0xdb, 0x44, 0xd7, 0x6e, 0x26, 0xba, 0x76, 0x3b, - 0xd1, 0xb5, 0x7f, 0x27, 0xba, 0xf6, 0xfb, 0x83, 0x5e, 0xf9, 0xfe, 0x0d, 0x75, 0xeb, 0xff, 0x07, - 0x00, 0x00, 0xff, 0xff, 0x5e, 0x98, 0x33, 0x48, 0x43, 0x08, 0x00, 0x00, + // 762 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xdb, 0x46, + 0x10, 0xc6, 0x45, 0x4b, 0x72, 0xd5, 0xb5, 0x64, 0xb8, 0xdb, 0xba, 0x55, 0x05, 0x94, 0x2e, 0x74, + 0x92, 0x51, 0x7b, 0x09, 0x19, 0x3d, 0xb8, 0x3d, 0x18, 0x30, 0x2b, 0xa3, 0x75, 0x51, 0x43, 0x06, + 0x5d, 0xa0, 0x85, 0x7b, 0xe2, 0x9f, 0x29, 0xb5, 0x16, 0x45, 0x12, 0xbb, 0x4b, 0x25, 0xba, 0xe5, + 0x11, 0x72, 0xc8, 0x1b, 0xe5, 0x62, 0xe4, 0xe4, 0x63, 0x90, 0x83, 0x61, 0x2b, 0x8f, 0x90, 0x17, + 0x08, 0x48, 0xae, 0x64, 0x51, 0xa2, 0x04, 0x03, 0x4e, 0x6e, 0xdc, 0xdd, 0xf9, 0x7d, 0xdf, 0xcc, + 0xec, 0x2c, 0xd1, 0x2f, 0xfd, 0x43, 0x4e, 0x68, 0xa0, 0xf5, 0x23, 0x0b, 0x98, 0x0f, 0x02, 0xb8, + 0x16, 0xf6, 0x5d, 0xcd, 0x0c, 0x29, 0xd7, 0xc2, 0xc0, 0xa3, 0xf6, 0x48, 0x1b, 0xb6, 0x2d, 0x10, + 0x66, 0x5b, 0x73, 0xc1, 0x07, 0x66, 0x0a, 0x70, 0x48, 0xc8, 0x02, 0x11, 0xe0, 0xdd, 0x14, 0x25, + 0x0f, 0x28, 0x09, 0xfb, 0x2e, 0x89, 0x51, 0x92, 0xa2, 0x44, 0xa2, 0x8d, 0x7d, 0x97, 0x8a, 0x5e, + 0x64, 0x11, 0x3b, 0x18, 0x68, 0x6e, 0xe0, 0x06, 0x5a, 0xa2, 0x60, 0x45, 0xff, 0x27, 0xab, 0x64, + 0x91, 0x7c, 0xa5, 0xca, 0x8d, 0x83, 0xa5, 0x49, 0x69, 0x0c, 0x78, 0x10, 0x31, 0x1b, 0xe6, 0xb3, + 0x69, 0xec, 0x2d, 0x67, 0x86, 0x0b, 0xb9, 0xaf, 0x70, 0xe0, 0xda, 0x00, 0x84, 0x99, 0xc7, 0xec, + 0xe7, 0x33, 0x2c, 0xf2, 0x05, 0x1d, 0x2c, 0x26, 0xf4, 0xf3, 0xea, 0x70, 0x6e, 0xf7, 0x60, 0x60, + 0x2e, 0x50, 0xed, 0x7c, 0x2a, 0x12, 0xd4, 0xd3, 0xa8, 0x2f, 0xb8, 0x60, 0xf3, 0x48, 0xf3, 0x8d, + 0x82, 0x2a, 0x27, 0x43, 0x6a, 0x0b, 0x1a, 0xf8, 0xf8, 0x5f, 0x54, 0x89, 0xf3, 0x77, 0x4c, 0x61, + 0xd6, 0x95, 0x1f, 0x95, 0xd6, 0xc6, 0x41, 0x8b, 0x2c, 0xbd, 0x27, 0x32, 0x6c, 0x93, 0xae, 0x75, + 0x05, 0xb6, 0x38, 0x03, 0x61, 0xea, 0xf8, 0xfa, 0x76, 0xa7, 0x30, 0xbe, 0xdd, 0x41, 0x0f, 0x7b, + 0xc6, 0x54, 0x0d, 0x3b, 0xa8, 0xe6, 0x80, 0x07, 0x02, 0xba, 0x61, 0xec, 0xc4, 0xeb, 0x6b, 0x89, + 0xfc, 0x4f, 0xab, 0xe5, 0x3b, 0xb3, 0x88, 0xfe, 0xd5, 0xf8, 0x76, 0xa7, 0x96, 0xd9, 0x32, 0xb2, + 0xa2, 0xcd, 0xd7, 0x6b, 0xe8, 0xeb, 0xf3, 0xc0, 0xe9, 0x50, 0xce, 0xa2, 0x64, 0x4b, 0x8f, 0x1c, + 0x17, 0xc4, 0x67, 0xad, 0xab, 0xc4, 0x43, 0xb0, 0x65, 0x39, 0x3a, 0x79, 0xf4, 0x54, 0x93, 0x9c, + 0x3c, 0x2f, 0x42, 0xb0, 0xf5, 0xaa, 0xf4, 0x2b, 0xc5, 0x2b, 0x23, 0x51, 0xc7, 0x1e, 0x5a, 0xe7, + 0xc2, 0x14, 0x11, 0xaf, 0x17, 0x13, 0x9f, 0xce, 0x13, 0x7d, 0x12, 0x2d, 0x7d, 0x53, 0x3a, 0xad, + 0xa7, 0x6b, 0x43, 0x7a, 0x34, 0xdf, 0x29, 0xe8, 0xbb, 0x1c, 0xea, 0x2f, 0xca, 0x05, 0xbe, 0x5c, + 0xe8, 0xe4, 0xde, 0xaa, 0x5c, 0xe2, 0xd8, 0xb8, 0x9f, 0x31, 0x9b, 0x74, 0x73, 0x4b, 0x7a, 0x56, + 0x26, 0x3b, 0x33, 0xbd, 0xb4, 0x51, 0x99, 0x0a, 0x18, 0xc4, 0xb3, 0x51, 0x6c, 0x6d, 0x1c, 0x1c, + 0x3d, 0xad, 0x48, 0xbd, 0x26, 0xad, 0xca, 0xa7, 0xb1, 0xa8, 0x91, 0x6a, 0x37, 0xef, 0xf2, 0x8b, + 0x8b, 0x9b, 0x8d, 0x7b, 0xa8, 0x3a, 0xa0, 0xfe, 0xf1, 0xd0, 0xa4, 0x9e, 0x69, 0x79, 0x20, 0x0b, + 0x24, 0x4b, 0xf2, 0x88, 0x5f, 0x15, 0x49, 0x5f, 0x15, 0x39, 0xf5, 0x45, 0x97, 0x5d, 0x08, 0x46, + 0x7d, 0x57, 0xff, 0x46, 0xfa, 0x56, 0xcf, 0x66, 0xb4, 0x8c, 0x8c, 0x32, 0xfe, 0x0f, 0x55, 0x38, + 0x78, 0x60, 0x8b, 0x80, 0xc9, 0xd1, 0x69, 0x3f, 0xaa, 0x8d, 0xa6, 0x05, 0xde, 0x85, 0x04, 0xf5, + 0x6a, 0xdc, 0xc7, 0xc9, 0xca, 0x98, 0x0a, 0x36, 0x3f, 0x94, 0xd0, 0xf7, 0x4b, 0x6f, 0x1d, 0xff, + 0x89, 0x70, 0x60, 0x71, 0x60, 0x43, 0x70, 0x7e, 0x4f, 0xff, 0x05, 0x34, 0xf0, 0x93, 0x52, 0x8b, + 0x7a, 0x43, 0xa6, 0x8e, 0xbb, 0x0b, 0x11, 0x46, 0x0e, 0x85, 0x5f, 0x29, 0xa8, 0xe6, 0xa4, 0x36, + 0xe0, 0x9c, 0x07, 0xce, 0xe4, 0xea, 0xfe, 0xf9, 0x14, 0xf3, 0x49, 0x3a, 0xb3, 0xca, 0x27, 0xbe, + 0x60, 0x23, 0x7d, 0x5b, 0x26, 0x58, 0xcb, 0x9c, 0x19, 0xd9, 0x24, 0xf0, 0x19, 0xc2, 0xce, 0x54, + 0x92, 0x1f, 0x7b, 0x5e, 0xf0, 0x0c, 0x9c, 0xe4, 0xe9, 0x94, 0xf5, 0x1f, 0xa4, 0xc2, 0x76, 0xc6, + 0x77, 0x12, 0x64, 0xe4, 0x80, 0xf8, 0x08, 0x6d, 0xda, 0x11, 0x63, 0xe0, 0x8b, 0x3f, 0xc0, 0xf4, + 0x44, 0x6f, 0x54, 0x2f, 0x25, 0x52, 0xdf, 0x4a, 0xa9, 0xcd, 0xdf, 0x32, 0xa7, 0xc6, 0x5c, 0x74, + 0xcc, 0x3b, 0xc0, 0x29, 0x03, 0x67, 0xc2, 0x97, 0xb3, 0x7c, 0x27, 0x73, 0x6a, 0xcc, 0x45, 0xe3, + 0x43, 0x54, 0x85, 0xe7, 0x21, 0xd8, 0x93, 0x1e, 0xaf, 0x27, 0xf4, 0x74, 0xcc, 0x4e, 0x66, 0xce, + 0x8c, 0x4c, 0x64, 0xe3, 0x0a, 0xe1, 0xc5, 0x26, 0xe2, 0x2d, 0x54, 0xec, 0xc3, 0x28, 0xb9, 0xf2, + 0x2f, 0x8d, 0xf8, 0x13, 0x1f, 0xa1, 0xf2, 0xd0, 0xf4, 0x22, 0x90, 0xb3, 0xd8, 0x7a, 0xcc, 0x2c, + 0xfe, 0x4d, 0x07, 0x60, 0xa4, 0xd8, 0xaf, 0x6b, 0x87, 0x8a, 0xbe, 0x7b, 0x7d, 0xaf, 0x16, 0x6e, + 0xee, 0xd5, 0xc2, 0xdb, 0x7b, 0xb5, 0xf0, 0x62, 0xac, 0x2a, 0xd7, 0x63, 0x55, 0xb9, 0x19, 0xab, + 0xca, 0xdd, 0x58, 0x55, 0x5e, 0xbe, 0x57, 0x0b, 0x97, 0x5f, 0xc8, 0x2b, 0xff, 0x18, 0x00, 0x00, + 0xff, 0xff, 0xfa, 0x95, 0xd6, 0xdd, 0x37, 0x08, 0x00, 0x00, } diff --git a/pkg/apis/policy/v1beta1/generated.proto b/pkg/apis/policy/v1beta1/generated.proto index 560850ea4cc..c274ee4f776 100644 --- a/pkg/apis/policy/v1beta1/generated.proto +++ b/pkg/apis/policy/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.policy.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -55,7 +55,7 @@ message PodDisruptionBudget { // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. message PodDisruptionBudgetList { - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; repeated PodDisruptionBudget items = 2; } @@ -70,7 +70,7 @@ message PodDisruptionBudgetSpec { // Label query over pods whose evictions are managed by the disruption // budget. - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; } // PodDisruptionBudgetStatus represents information about the status of a @@ -92,7 +92,7 @@ message PodDisruptionBudgetStatus { // the list automatically by PodDisruptionBudget controller after some time. // If everything goes smooth this map should be empty for the most of the time. // Large number of entries in the map may indicate problems with pod deletions. - map disruptedPods = 2; + map disruptedPods = 2; // Number of pod disruptions that are currently allowed. optional int32 disruptionsAllowed = 3; diff --git a/pkg/apis/policy/v1beta1/register.go b/pkg/apis/policy/v1beta1/register.go index af7cbfd4ffd..f36029170aa 100644 --- a/pkg/apis/policy/v1beta1/register.go +++ b/pkg/apis/policy/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/policy/v1beta1/types.generated.go b/pkg/apis/policy/v1beta1/types.generated.go index c5355112ffd..8044367f614 100644 --- a/pkg/apis/policy/v1beta1/types.generated.go +++ b/pkg/apis/policy/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg4_types "k8s.io/kubernetes/pkg/types" pkg1_intstr "k8s.io/kubernetes/pkg/util/intstr" "reflect" @@ -64,8 +64,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_unversioned.LabelSelector - var v1 pkg3_v1.ObjectMeta + var v0 pkg3_v1.ObjectMeta + var v1 pkg2_v1.LabelSelector var v2 pkg4_types.UID var v3 pkg1_intstr.IntOrString var v4 time.Time @@ -256,7 +256,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym17 := z.DecBinary() _ = yym17 @@ -322,7 +322,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym22 := z.DecBinary() _ = yym22 @@ -413,7 +413,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym29 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } else { @@ -427,7 +427,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym30 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } @@ -583,7 +583,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromMap(l int, d *codec1978.D _ = yym48 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv47), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv47), d) } } case "disruptionsAllowed": @@ -659,7 +659,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromArray(l int, d *codec1978 _ = yym56 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv55), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv55), d) } } yyj53++ @@ -1299,7 +1299,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv113 := &x.ListMeta yym114 := z.DecBinary() @@ -1380,7 +1380,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv120 := &x.ListMeta yym121 := z.DecBinary() @@ -1744,7 +1744,7 @@ func (x *Eviction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversioned.Time, e *codec1978.Encoder) { +func (x codecSelfer1234) encMapstringv1_Time(v map[string]pkg2_v1.Time, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -1774,7 +1774,7 @@ func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversio z.EncSendContainerState(codecSelfer_containerMapEnd1234) } -func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversioned.Time, d *codec1978.Decoder) { +func (x codecSelfer1234) decMapstringv1_Time(v *map[string]pkg2_v1.Time, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -1784,11 +1784,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi yybh152 := z.DecBasicHandle() if yyv152 == nil { yyrl152, _ := z.DecInferLen(yyl152, yybh152.MaxInitLen, 40) - yyv152 = make(map[string]pkg2_unversioned.Time, yyrl152) + yyv152 = make(map[string]pkg2_v1.Time, yyrl152) *v = yyv152 } var yymk152 string - var yymv152 pkg2_unversioned.Time + var yymv152 pkg2_v1.Time var yymg152 bool if yybh152.MapValueReset { yymg152 = true @@ -1805,11 +1805,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv154 := &yymv152 yym155 := z.DecBinary() @@ -1841,11 +1841,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv157 := &yymv152 yym158 := z.DecBinary() diff --git a/pkg/apis/policy/v1beta1/types.go b/pkg/apis/policy/v1beta1/types.go index 5a8eda46b4c..99409203943 100644 --- a/pkg/apis/policy/v1beta1/types.go +++ b/pkg/apis/policy/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/intstr" ) @@ -74,7 +74,7 @@ type PodDisruptionBudgetStatus struct { // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods type PodDisruptionBudget struct { metav1.TypeMeta `json:",inline"` - v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Specification of the desired behavior of the PodDisruptionBudget. Spec PodDisruptionBudgetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` @@ -86,7 +86,7 @@ type PodDisruptionBudget struct { type PodDisruptionBudgetList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` - Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` + Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` } // Eviction evicts a pod from its node subject to certain policies and safety constraints. diff --git a/pkg/apis/policy/validation/validation.go b/pkg/apis/policy/validation/validation.go index cfc073a52e1..aed4af6a923 100644 --- a/pkg/apis/policy/validation/validation.go +++ b/pkg/apis/policy/validation/validation.go @@ -19,9 +19,9 @@ package validation import ( "reflect" - unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" apivalidation "k8s.io/kubernetes/pkg/api/validation" extensionsvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" + unversionedvalidation "k8s.io/kubernetes/pkg/apis/meta/v1/validation" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/util/validation/field" ) diff --git a/pkg/apis/rbac/v1alpha1/generated.pb.go b/pkg/apis/rbac/v1alpha1/generated.pb.go index ca02dda62ea..af85840b293 100644 --- a/pkg/apis/rbac/v1alpha1/generated.pb.go +++ b/pkg/apis/rbac/v1alpha1/generated.pb.go @@ -939,7 +939,7 @@ func (this *ClusterRoleBindingList) String() string { return "nil" } s := strings.Join([]string{`&ClusterRoleBindingList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRoleBinding", "ClusterRoleBinding", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -950,7 +950,7 @@ func (this *ClusterRoleList) String() string { return "nil" } s := strings.Join([]string{`&ClusterRoleList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRole", "ClusterRole", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1009,7 +1009,7 @@ func (this *RoleBindingList) String() string { return "nil" } s := strings.Join([]string{`&RoleBindingList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "RoleBinding", "RoleBinding", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1020,7 +1020,7 @@ func (this *RoleList) String() string { return "nil" } s := strings.Join([]string{`&RoleList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Role", "Role", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -2801,61 +2801,60 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 886 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x55, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0xc4, 0x36, 0xb1, 0x5f, 0x88, 0x42, 0x06, 0x15, 0x2d, 0x96, 0xb0, 0x23, 0x9f, 0x2c, - 0xda, 0xee, 0xca, 0x51, 0x2b, 0x7a, 0x80, 0x43, 0x16, 0x21, 0x14, 0x51, 0x42, 0x34, 0x15, 0x15, - 0x54, 0x20, 0x34, 0x5e, 0x4f, 0x9d, 0xc1, 0xeb, 0xdd, 0xd5, 0xcc, 0xac, 0x01, 0x21, 0xa4, 0x8a, - 0x13, 0x47, 0xfe, 0x8a, 0xde, 0xb8, 0x70, 0x45, 0xe2, 0xc0, 0x29, 0x07, 0x0e, 0x3d, 0x22, 0x0e, - 0x16, 0x31, 0xff, 0x08, 0xda, 0xdd, 0xd9, 0x1f, 0xc9, 0xae, 0x5b, 0x37, 0x88, 0x48, 0x48, 0x3d, - 0xd9, 0xfb, 0xde, 0xf7, 0x7d, 0xf3, 0xbe, 0x79, 0x33, 0x6f, 0xe0, 0xce, 0xf4, 0x8e, 0x34, 0xb9, - 0x6f, 0x4d, 0xc3, 0x11, 0x13, 0x1e, 0x53, 0x4c, 0x5a, 0xc1, 0x74, 0x62, 0xd1, 0x80, 0x4b, 0x4b, - 0x8c, 0xa8, 0x63, 0xcd, 0x87, 0xd4, 0x0d, 0x4e, 0xe8, 0xd0, 0x9a, 0x30, 0x8f, 0x09, 0xaa, 0xd8, - 0xd8, 0x0c, 0x84, 0xaf, 0x7c, 0x3c, 0x48, 0x98, 0x66, 0xce, 0x34, 0x83, 0xe9, 0xc4, 0x8c, 0x98, - 0x66, 0xc4, 0x34, 0x53, 0x66, 0xe7, 0xe6, 0x84, 0xab, 0x93, 0x70, 0x64, 0x3a, 0xfe, 0xcc, 0x9a, - 0xf8, 0x13, 0xdf, 0x8a, 0x05, 0x46, 0xe1, 0xc3, 0xf8, 0x2b, 0xfe, 0x88, 0xff, 0x25, 0xc2, 0x9d, - 0xfd, 0x95, 0x25, 0x59, 0x82, 0x49, 0x3f, 0x14, 0x0e, 0xbb, 0x58, 0x4c, 0xe7, 0xf6, 0x6a, 0x4e, - 0xe8, 0xcd, 0x99, 0x90, 0xdc, 0xf7, 0xd8, 0xb8, 0x44, 0xbb, 0xb1, 0x9a, 0x36, 0x2f, 0x39, 0xee, - 0xdc, 0xac, 0x46, 0x8b, 0xd0, 0x53, 0x7c, 0x56, 0xae, 0xe9, 0xd6, 0xd3, 0xe1, 0xd2, 0x39, 0x61, - 0x33, 0x5a, 0x62, 0x0d, 0xab, 0x59, 0xa1, 0xe2, 0xae, 0xc5, 0x3d, 0x25, 0x95, 0xb8, 0x48, 0xe9, - 0xff, 0x86, 0x60, 0xeb, 0x5d, 0x37, 0x94, 0x8a, 0x09, 0xe2, 0xbb, 0x0c, 0x7f, 0x02, 0xad, 0x19, - 0x53, 0x74, 0x4c, 0x15, 0x35, 0xd0, 0x1e, 0x1a, 0x6c, 0xed, 0x0f, 0xcc, 0x95, 0xcd, 0x32, 0xe7, - 0x43, 0xf3, 0xa3, 0xd1, 0x97, 0xcc, 0x51, 0x1f, 0x32, 0x45, 0x6d, 0x7c, 0xba, 0xe8, 0xd5, 0x96, - 0x8b, 0x1e, 0xe4, 0x31, 0x92, 0xa9, 0xe1, 0x4f, 0xa1, 0x29, 0x42, 0x97, 0x49, 0x63, 0x63, 0xaf, - 0x3e, 0xd8, 0xda, 0xbf, 0x65, 0xae, 0x7b, 0x06, 0xcc, 0x63, 0xdf, 0xe5, 0xce, 0x37, 0x24, 0x74, - 0x99, 0xbd, 0xad, 0x97, 0x68, 0x46, 0x5f, 0x92, 0x24, 0x8a, 0xfd, 0x9f, 0x36, 0x00, 0x17, 0x4c, - 0xd8, 0xdc, 0x1b, 0x73, 0x6f, 0xf2, 0x1f, 0x7a, 0xf9, 0x02, 0x5a, 0x32, 0x8c, 0x13, 0xa9, 0x9d, - 0xe1, 0xfa, 0x76, 0xee, 0x25, 0x4c, 0xfb, 0x15, 0xbd, 0x44, 0x4b, 0x07, 0x24, 0xc9, 0x44, 0xf1, - 0x67, 0xb0, 0x29, 0x7c, 0x97, 0x11, 0xf6, 0xd0, 0xa8, 0xc7, 0x95, 0x3f, 0x87, 0x3e, 0x49, 0x88, - 0xf6, 0x8e, 0xd6, 0xdf, 0xd4, 0x01, 0x92, 0x4a, 0xf6, 0x1f, 0x23, 0x78, 0xbd, 0xbc, 0x5f, 0x76, - 0xc8, 0xdd, 0x31, 0x13, 0xf8, 0x07, 0x04, 0xd8, 0x29, 0x65, 0xf5, 0x0e, 0xbe, 0xbd, 0x7e, 0x1d, - 0x15, 0x2b, 0x74, 0x74, 0x49, 0x15, 0xdd, 0x22, 0x15, 0x6b, 0xf6, 0xff, 0x44, 0xf0, 0x5a, 0x19, - 0x7a, 0x97, 0x4b, 0x85, 0x3f, 0x2f, 0x35, 0xd7, 0x7a, 0x4a, 0x73, 0x0b, 0x17, 0xd9, 0x8c, 0xe8, - 0x71, 0x8f, 0xb3, 0x06, 0xa4, 0x91, 0x42, 0x87, 0x29, 0x34, 0xb9, 0x62, 0xb3, 0xb4, 0xbd, 0xff, - 0xce, 0x76, 0x76, 0x6a, 0x0f, 0x23, 0x49, 0x92, 0x28, 0xf7, 0x7f, 0x47, 0xb0, 0x53, 0x00, 0x5f, - 0x85, 0xab, 0x07, 0xe7, 0x5d, 0xdd, 0xbe, 0x9c, 0xab, 0x6a, 0x3b, 0xdf, 0xd7, 0x01, 0xf2, 0x9b, - 0x8a, 0x7b, 0xd0, 0x9c, 0x33, 0x31, 0x92, 0x06, 0xda, 0xab, 0x0f, 0xda, 0x76, 0x3b, 0xc2, 0xdf, - 0x8f, 0x02, 0x24, 0x89, 0xe3, 0x47, 0x08, 0xae, 0x51, 0xa5, 0x04, 0x1f, 0x85, 0x8a, 0x11, 0x26, - 0x95, 0xe0, 0x8e, 0xe2, 0xbe, 0x17, 0x15, 0x17, 0x19, 0xbf, 0xbe, 0xa2, 0x38, 0x3d, 0x03, 0x4d, - 0x42, 0xbf, 0x7a, 0xef, 0x6b, 0xc5, 0xbc, 0xc8, 0xbf, 0xfd, 0x86, 0x2e, 0xe9, 0xda, 0x41, 0x95, - 0x22, 0xa9, 0x5e, 0x08, 0x5f, 0x87, 0x36, 0x0d, 0xf8, 0xfb, 0xc2, 0x0f, 0x03, 0x69, 0xd4, 0xe3, - 0x3a, 0xb7, 0x97, 0x8b, 0x5e, 0xfb, 0xe0, 0xf8, 0x30, 0x09, 0x92, 0x3c, 0x1f, 0x81, 0xd3, 0x27, - 0x44, 0x1a, 0x8d, 0x1c, 0x4c, 0xd2, 0x20, 0xc9, 0xf3, 0xf8, 0x2d, 0xd8, 0x4e, 0x3f, 0x8e, 0xe8, - 0x8c, 0x49, 0xa3, 0x19, 0x13, 0x76, 0x97, 0x8b, 0xde, 0x36, 0x29, 0x26, 0xc8, 0x79, 0x1c, 0x7e, - 0x07, 0x76, 0x3c, 0xdf, 0x4b, 0x21, 0x1f, 0x93, 0xbb, 0xd2, 0x78, 0x29, 0xa6, 0xbe, 0xba, 0x5c, - 0xf4, 0x76, 0x8e, 0xce, 0xa7, 0xc8, 0x45, 0x6c, 0xff, 0x3b, 0xd8, 0x2d, 0x4c, 0x4b, 0x7d, 0xa1, - 0x4f, 0x00, 0x82, 0x2c, 0xa8, 0x8f, 0xd5, 0xe5, 0xc6, 0x6f, 0x36, 0x15, 0xf3, 0x18, 0x29, 0x68, - 0xf7, 0x7f, 0x41, 0xd0, 0xf8, 0xff, 0x3e, 0x23, 0x8f, 0x37, 0x60, 0xeb, 0xc5, 0xfb, 0xb1, 0xc6, - 0xfb, 0x11, 0x4d, 0xae, 0x2b, 0x9e, 0xc7, 0x97, 0x9f, 0x5c, 0xcf, 0x1e, 0xc4, 0xbf, 0x22, 0x68, - 0x5d, 0xd5, 0x04, 0xbe, 0x77, 0xde, 0x87, 0xf9, 0x9c, 0x3e, 0xaa, 0x0d, 0x7c, 0x0b, 0x69, 0x8f, - 0xf0, 0x0d, 0x68, 0xa5, 0x23, 0x2b, 0x2e, 0xbf, 0x9d, 0x57, 0x93, 0x4e, 0x35, 0x92, 0x21, 0xf0, - 0x1e, 0x34, 0xa6, 0xdc, 0x1b, 0xc7, 0x13, 0xb7, 0x6d, 0xbf, 0xac, 0x91, 0x8d, 0x0f, 0xb8, 0x37, - 0x26, 0x71, 0x26, 0x42, 0x78, 0x74, 0xc6, 0xe2, 0x53, 0x54, 0x40, 0x44, 0xc3, 0x8a, 0xc4, 0x99, - 0xfe, 0xcf, 0x08, 0x36, 0xf5, 0x09, 0xcc, 0xf4, 0xd0, 0x4a, 0xbd, 0x7d, 0x00, 0x1a, 0xf0, 0xfb, - 0xc9, 0xa6, 0xe9, 0x75, 0xb3, 0xbb, 0x72, 0x70, 0x7c, 0xa8, 0x33, 0xa4, 0x80, 0x7a, 0x76, 0x0d, - 0xd8, 0x82, 0x76, 0xf4, 0x2b, 0x03, 0xea, 0x30, 0xa3, 0x11, 0xc3, 0x76, 0x35, 0xac, 0x7d, 0x94, - 0x26, 0x48, 0x8e, 0xb1, 0xdf, 0x3c, 0x3d, 0xeb, 0xd6, 0x9e, 0x9c, 0x75, 0x6b, 0x7f, 0x9c, 0x75, - 0x6b, 0x8f, 0x96, 0x5d, 0x74, 0xba, 0xec, 0xa2, 0x27, 0xcb, 0x2e, 0xfa, 0x6b, 0xd9, 0x45, 0x3f, - 0xfe, 0xdd, 0xad, 0x3d, 0x68, 0xa5, 0x1b, 0xff, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x90, 0xdd, - 0x28, 0xaf, 0xe7, 0x0c, 0x00, 0x00, + // 879 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x55, 0x41, 0x6f, 0x23, 0x35, + 0x14, 0x8e, 0x9b, 0x84, 0x26, 0xaf, 0x54, 0xa5, 0x46, 0x8b, 0x86, 0x4a, 0x24, 0x55, 0x4e, 0x11, + 0xdb, 0x9d, 0x51, 0xaa, 0x45, 0xec, 0x01, 0x0e, 0x1d, 0x84, 0x50, 0xc5, 0x52, 0x2a, 0xaf, 0x58, + 0x41, 0x85, 0x84, 0x9c, 0x89, 0x37, 0x35, 0x99, 0xcc, 0x8c, 0x6c, 0x4f, 0x01, 0x21, 0xa4, 0x15, + 0x27, 0x8e, 0xfc, 0x8a, 0xbd, 0x71, 0xe1, 0xba, 0x37, 0x4e, 0xe5, 0xb6, 0x37, 0x38, 0x45, 0x34, + 0xfc, 0x11, 0x64, 0xc7, 0x33, 0x93, 0x36, 0x93, 0x6e, 0xb7, 0x68, 0x2b, 0x21, 0x71, 0x4a, 0xfc, + 0xde, 0xf7, 0x3d, 0x7f, 0xcf, 0xcf, 0xf3, 0x19, 0xee, 0x8d, 0xee, 0x49, 0x97, 0xc7, 0xde, 0x28, + 0xed, 0x33, 0x11, 0x31, 0xc5, 0xa4, 0x97, 0x8c, 0x86, 0x1e, 0x4d, 0xb8, 0xf4, 0x44, 0x9f, 0x06, + 0xde, 0x49, 0x8f, 0x86, 0xc9, 0x31, 0xed, 0x79, 0x43, 0x16, 0x31, 0x41, 0x15, 0x1b, 0xb8, 0x89, + 0x88, 0x55, 0x8c, 0xbb, 0x33, 0xa6, 0x5b, 0x30, 0xdd, 0x64, 0x34, 0x74, 0x35, 0xd3, 0xd5, 0x4c, + 0x37, 0x63, 0x6e, 0xdd, 0x19, 0x72, 0x75, 0x9c, 0xf6, 0xdd, 0x20, 0x1e, 0x7b, 0xc3, 0x78, 0x18, + 0x7b, 0xa6, 0x40, 0x3f, 0x7d, 0x64, 0x56, 0x66, 0x61, 0xfe, 0xcd, 0x0a, 0x6f, 0xed, 0x2e, 0x95, + 0xe4, 0x09, 0x26, 0xe3, 0x54, 0x04, 0xec, 0xa2, 0x98, 0xad, 0x9d, 0xe5, 0x9c, 0x93, 0x05, 0xe9, + 0x97, 0xec, 0x20, 0xbd, 0x31, 0x53, 0xb4, 0x8c, 0x73, 0xa7, 0x9c, 0x23, 0xd2, 0x48, 0xf1, 0xf1, + 0xa2, 0xa0, 0xbb, 0x97, 0xc3, 0x65, 0x70, 0xcc, 0xc6, 0x74, 0x81, 0xd5, 0x2b, 0x67, 0xa5, 0x8a, + 0x87, 0x1e, 0x8f, 0x94, 0x54, 0xe2, 0x22, 0xa5, 0xf3, 0x1b, 0x82, 0xb5, 0x0f, 0xc2, 0x54, 0x2a, + 0x26, 0x48, 0x1c, 0x32, 0xfc, 0x39, 0x34, 0x74, 0x0b, 0x03, 0xaa, 0xa8, 0x83, 0xb6, 0x51, 0x77, + 0x6d, 0xb7, 0xeb, 0x2e, 0x9d, 0x94, 0x7b, 0xd2, 0x73, 0x3f, 0xed, 0x7f, 0xcd, 0x02, 0xf5, 0x09, + 0x53, 0xd4, 0xc7, 0xa7, 0x93, 0x76, 0x65, 0x3a, 0x69, 0x43, 0x11, 0x23, 0x79, 0x35, 0xfc, 0x05, + 0xd4, 0x45, 0x1a, 0x32, 0xe9, 0xac, 0x6c, 0x57, 0xbb, 0x6b, 0xbb, 0x77, 0xdd, 0xab, 0x5e, 0x00, + 0xf7, 0x30, 0x0e, 0x79, 0xf0, 0x1d, 0x49, 0x43, 0xe6, 0xaf, 0xdb, 0x2d, 0xea, 0x7a, 0x25, 0xc9, + 0xac, 0x62, 0xe7, 0x97, 0x15, 0xc0, 0x73, 0x4d, 0xf8, 0x3c, 0x1a, 0xf0, 0x68, 0xf8, 0x12, 0x7b, + 0xf9, 0x0a, 0x1a, 0x32, 0x35, 0x89, 0xac, 0x9d, 0xde, 0xd5, 0xdb, 0x79, 0x30, 0x63, 0xfa, 0xaf, + 0xd9, 0x2d, 0x1a, 0x36, 0x20, 0x49, 0x5e, 0x14, 0x7f, 0x09, 0xab, 0x22, 0x0e, 0x19, 0x61, 0x8f, + 0x9c, 0xaa, 0x51, 0xfe, 0x02, 0xf5, 0xc9, 0x8c, 0xe8, 0x6f, 0xd8, 0xfa, 0xab, 0x36, 0x40, 0xb2, + 0x92, 0x9d, 0x27, 0x08, 0xde, 0x5c, 0x3c, 0x2f, 0x3f, 0xe5, 0xe1, 0x80, 0x09, 0xfc, 0x13, 0x02, + 0x1c, 0x2c, 0x64, 0xed, 0x09, 0xbe, 0x77, 0x75, 0x1d, 0x25, 0x3b, 0x6c, 0x59, 0x49, 0x25, 0xd3, + 0x22, 0x25, 0x7b, 0x76, 0xfe, 0x40, 0xf0, 0xc6, 0x22, 0xf4, 0x3e, 0x97, 0x0a, 0x1f, 0x2d, 0x0c, + 0x77, 0xe7, 0x32, 0x69, 0x1a, 0xab, 0x47, 0xac, 0xb9, 0x66, 0xc0, 0xf9, 0xe9, 0x67, 0x91, 0xb9, + 0xf1, 0x52, 0xa8, 0x73, 0xc5, 0xc6, 0xd9, 0x6c, 0xff, 0x5d, 0xcf, 0xf9, 0x95, 0xdd, 0xd7, 0x25, + 0xc9, 0xac, 0x72, 0xe7, 0x77, 0x04, 0x1b, 0x73, 0xe0, 0x97, 0xde, 0xd2, 0xd1, 0xf9, 0x96, 0xde, + 0xb9, 0x5e, 0x4b, 0xe5, 0xbd, 0xfc, 0x58, 0x05, 0x28, 0xbe, 0x51, 0xdc, 0x86, 0xfa, 0x09, 0x13, + 0x7d, 0xe9, 0xa0, 0xed, 0x6a, 0xb7, 0xe9, 0x37, 0x35, 0xfe, 0xa1, 0x0e, 0x90, 0x59, 0x1c, 0x3f, + 0x46, 0x70, 0x8b, 0x2a, 0x25, 0x78, 0x3f, 0x55, 0x8c, 0x30, 0xa9, 0x04, 0x0f, 0x14, 0x8f, 0x23, + 0x2d, 0x4e, 0x77, 0x7d, 0x7b, 0x89, 0x38, 0xeb, 0x7e, 0x2e, 0xa1, 0xdf, 0x7c, 0xf8, 0xad, 0x62, + 0x91, 0xe4, 0x71, 0xe4, 0xbf, 0x65, 0x25, 0xdd, 0xda, 0x2b, 0xab, 0x48, 0xca, 0x37, 0xc2, 0xb7, + 0xa1, 0x49, 0x13, 0xfe, 0x91, 0x88, 0xd3, 0x44, 0x3a, 0x55, 0xa3, 0x73, 0x7d, 0x3a, 0x69, 0x37, + 0xf7, 0x0e, 0xf7, 0x67, 0x41, 0x52, 0xe4, 0x35, 0x38, 0x7b, 0x39, 0xa4, 0x53, 0x2b, 0xc0, 0x24, + 0x0b, 0x92, 0x22, 0x8f, 0xdf, 0x85, 0xf5, 0x6c, 0x71, 0x40, 0xc7, 0x4c, 0x3a, 0x75, 0x43, 0xd8, + 0x9c, 0x4e, 0xda, 0xeb, 0x64, 0x3e, 0x41, 0xce, 0xe3, 0xf0, 0xfb, 0xb0, 0x11, 0xc5, 0x51, 0x06, + 0xf9, 0x8c, 0xdc, 0x97, 0xce, 0x2b, 0x86, 0xfa, 0xfa, 0x74, 0xd2, 0xde, 0x38, 0x38, 0x9f, 0x22, + 0x17, 0xb1, 0x9d, 0x1f, 0x60, 0x73, 0xce, 0x27, 0xed, 0xa7, 0x7c, 0x0c, 0x90, 0xe4, 0x41, 0x7b, + 0xa7, 0xae, 0x67, 0xbc, 0xb9, 0x1f, 0x16, 0x31, 0x32, 0x57, 0xbb, 0xf3, 0x14, 0x41, 0xed, 0xbf, + 0xfb, 0x80, 0x3c, 0x59, 0x81, 0xb5, 0xff, 0x5f, 0x8e, 0x2b, 0xbc, 0x1c, 0xda, 0xb6, 0x6e, 0xd2, + 0x89, 0xaf, 0x6f, 0x5b, 0xcf, 0xb7, 0xe0, 0xa7, 0x08, 0x1a, 0x37, 0xe2, 0xbd, 0x0f, 0xce, 0x37, + 0xe1, 0xbe, 0x60, 0x13, 0xe5, 0xea, 0xbf, 0x87, 0x6c, 0x3a, 0x78, 0x07, 0x1a, 0x99, 0x59, 0x19, + 0xed, 0xcd, 0x42, 0x4d, 0xe6, 0x67, 0x24, 0x47, 0xe0, 0x6d, 0xa8, 0x8d, 0x78, 0x34, 0x30, 0x5e, + 0xdb, 0xf4, 0x5f, 0xb5, 0xc8, 0xda, 0xc7, 0x3c, 0x1a, 0x10, 0x93, 0xd1, 0x88, 0x88, 0x8e, 0x99, + 0xb9, 0x3f, 0x73, 0x08, 0x6d, 0x53, 0xc4, 0x64, 0x3a, 0xbf, 0x22, 0x58, 0xb5, 0x77, 0x2f, 0xaf, + 0x87, 0x96, 0xd6, 0xdb, 0x05, 0xa0, 0x09, 0x7f, 0xc8, 0x84, 0x36, 0x6c, 0xbb, 0x6f, 0xfe, 0x95, + 0xec, 0x1d, 0xee, 0xdb, 0x0c, 0x99, 0x43, 0x3d, 0x5f, 0x03, 0xf6, 0xa0, 0xa9, 0x7f, 0x65, 0x42, + 0x03, 0xe6, 0xd4, 0x0c, 0x6c, 0xd3, 0xc2, 0x9a, 0x07, 0x59, 0x82, 0x14, 0x18, 0xff, 0xed, 0xd3, + 0xb3, 0x56, 0xe5, 0xd9, 0x59, 0xab, 0xf2, 0xe7, 0x59, 0xab, 0xf2, 0x78, 0xda, 0x42, 0xa7, 0xd3, + 0x16, 0x7a, 0x36, 0x6d, 0xa1, 0xbf, 0xa6, 0x2d, 0xf4, 0xf3, 0xdf, 0xad, 0xca, 0x51, 0x23, 0x3b, + 0xf8, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x24, 0x96, 0xf9, 0x34, 0xd8, 0x0c, 0x00, 0x00, } diff --git a/pkg/apis/rbac/v1alpha1/generated.proto b/pkg/apis/rbac/v1alpha1/generated.proto index c265441f965..63ec41b9c1b 100644 --- a/pkg/apis/rbac/v1alpha1/generated.proto +++ b/pkg/apis/rbac/v1alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.rbac.v1alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -68,7 +68,7 @@ message ClusterRoleBindingBuilder { message ClusterRoleBindingList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of ClusterRoleBindings repeated ClusterRoleBinding items = 2; @@ -78,7 +78,7 @@ message ClusterRoleBindingList { message ClusterRoleList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of ClusterRoles repeated ClusterRole items = 2; @@ -154,7 +154,7 @@ message RoleBinding { message RoleBindingList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of RoleBindings repeated RoleBinding items = 2; @@ -164,7 +164,7 @@ message RoleBindingList { message RoleList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of Roles repeated Role items = 2; diff --git a/pkg/apis/rbac/v1alpha1/register.go b/pkg/apis/rbac/v1alpha1/register.go index 261662554a6..f2cd91d8c5d 100644 --- a/pkg/apis/rbac/v1alpha1/register.go +++ b/pkg/apis/rbac/v1alpha1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/rbac/v1alpha1/types.generated.go b/pkg/apis/rbac/v1alpha1/types.generated.go index 30a5c8f7d23..188610876b4 100644 --- a/pkg/apis/rbac/v1alpha1/types.generated.go +++ b/pkg/apis/rbac/v1alpha1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg2_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg1_runtime "k8s.io/kubernetes/pkg/runtime" pkg4_types "k8s.io/kubernetes/pkg/types" "reflect" @@ -64,8 +64,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_unversioned.TypeMeta - var v1 pkg3_v1.ObjectMeta + var v0 pkg3_v1.ObjectMeta + var v1 pkg2_v1.TypeMeta var v2 pkg1_runtime.RawExtension var v3 pkg4_types.UID var v4 time.Time @@ -2033,7 +2033,7 @@ func (x *RoleBindingList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv180 := &x.ListMeta yym181 := z.DecBinary() @@ -2114,7 +2114,7 @@ func (x *RoleBindingList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv187 := &x.ListMeta yym188 := z.DecBinary() @@ -2377,7 +2377,7 @@ func (x *RoleList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv212 := &x.ListMeta yym213 := z.DecBinary() @@ -2458,7 +2458,7 @@ func (x *RoleList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv219 := &x.ListMeta yym220 := z.DecBinary() @@ -3396,7 +3396,7 @@ func (x *ClusterRoleBindingList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv305 := &x.ListMeta yym306 := z.DecBinary() @@ -3477,7 +3477,7 @@ func (x *ClusterRoleBindingList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv312 := &x.ListMeta yym313 := z.DecBinary() @@ -3740,7 +3740,7 @@ func (x *ClusterRoleList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv337 := &x.ListMeta yym338 := z.DecBinary() @@ -3821,7 +3821,7 @@ func (x *ClusterRoleList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv344 := &x.ListMeta yym345 := z.DecBinary() diff --git a/pkg/apis/rbac/v1alpha1/types.go b/pkg/apis/rbac/v1alpha1/types.go index 85bdd61f256..756d8800c8c 100644 --- a/pkg/apis/rbac/v1alpha1/types.go +++ b/pkg/apis/rbac/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/apis/storage/types.generated.go b/pkg/apis/storage/types.generated.go index 65dc2dd1a47..5df21c3baf7 100644 --- a/pkg/apis/storage/types.generated.go +++ b/pkg/apis/storage/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -653,7 +653,7 @@ func (x *StorageClassList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() @@ -734,7 +734,7 @@ func (x *StorageClassList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv62 := &x.ListMeta yym63 := z.DecBinary() diff --git a/pkg/apis/storage/v1beta1/generated.pb.go b/pkg/apis/storage/v1beta1/generated.pb.go index 0dd6295c712..603219fbd37 100644 --- a/pkg/apis/storage/v1beta1/generated.pb.go +++ b/pkg/apis/storage/v1beta1/generated.pb.go @@ -245,7 +245,7 @@ func (this *StorageClassList) String() string { return "nil" } s := strings.Join([]string{`&StorageClassList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StorageClass", "StorageClass", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -696,35 +696,35 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 472 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0x41, 0x8b, 0xd3, 0x40, - 0x14, 0xc7, 0x3b, 0x2d, 0xc5, 0xdd, 0xa9, 0x62, 0x89, 0x1e, 0x4a, 0x0e, 0xd9, 0xb2, 0xa7, 0x2a, - 0xee, 0x0c, 0x2d, 0x2e, 0x94, 0x05, 0x2f, 0x15, 0x41, 0x41, 0x71, 0x89, 0x17, 0x11, 0xf6, 0x30, - 0x69, 0x9f, 0xd9, 0x31, 0x4d, 0x26, 0xcc, 0xbc, 0x04, 0x16, 0x3c, 0xf8, 0x11, 0xfc, 0x58, 0x3d, - 0xf6, 0xe8, 0x41, 0x16, 0x1b, 0xbf, 0x88, 0x34, 0x89, 0x9b, 0xd0, 0x6c, 0x17, 0xf1, 0x96, 0x37, - 0xf3, 0x7e, 0xff, 0xf7, 0x7f, 0xff, 0x0c, 0x3d, 0x0b, 0xa6, 0x86, 0x49, 0xc5, 0x83, 0xc4, 0x03, - 0x1d, 0x01, 0x82, 0xe1, 0x71, 0xe0, 0x73, 0x11, 0x4b, 0xc3, 0x0d, 0x2a, 0x2d, 0x7c, 0xe0, 0xe9, - 0xd8, 0x03, 0x14, 0x63, 0xee, 0x43, 0x04, 0x5a, 0x20, 0x2c, 0x58, 0xac, 0x15, 0x2a, 0xeb, 0x69, - 0xc1, 0xb2, 0x8a, 0x65, 0x71, 0xe0, 0xb3, 0x2d, 0xcb, 0x4a, 0x96, 0x95, 0xac, 0x7d, 0xe2, 0x4b, - 0xbc, 0x4c, 0x3c, 0x36, 0x57, 0x21, 0xf7, 0x95, 0xaf, 0x78, 0x2e, 0xe1, 0x25, 0x9f, 0xf3, 0x2a, - 0x2f, 0xf2, 0xaf, 0x42, 0xda, 0x9e, 0xec, 0xb5, 0xc5, 0x35, 0x18, 0x95, 0xe8, 0x39, 0xec, 0xda, - 0xb1, 0x4f, 0xf7, 0x33, 0x49, 0x94, 0x82, 0x36, 0x52, 0x45, 0xb0, 0x68, 0x60, 0xcf, 0xf6, 0x63, - 0x69, 0x63, 0x67, 0xfb, 0xe4, 0xf6, 0x6e, 0x9d, 0x44, 0x28, 0xc3, 0xa6, 0xa7, 0xe7, 0x77, 0xb7, - 0x9b, 0xf9, 0x25, 0x84, 0xa2, 0x41, 0x8d, 0x6f, 0xa7, 0x12, 0x94, 0x4b, 0x2e, 0x23, 0x34, 0xa8, - 0x77, 0x91, 0xe3, 0x9f, 0x6d, 0x7a, 0xff, 0x43, 0x91, 0xf9, 0xcb, 0xa5, 0x30, 0xc6, 0xfa, 0x48, - 0x0f, 0x42, 0x40, 0xb1, 0x10, 0x28, 0x06, 0x64, 0x48, 0x46, 0xbd, 0xc9, 0x88, 0xed, 0xfd, 0x5f, - 0x2c, 0x1d, 0xb3, 0xf7, 0xde, 0x17, 0x98, 0xe3, 0x3b, 0x40, 0x31, 0xb3, 0x56, 0xd7, 0x47, 0xad, - 0xec, 0xfa, 0x88, 0x56, 0x67, 0xee, 0x8d, 0x9a, 0x75, 0x4a, 0x7b, 0xb1, 0x56, 0xa9, 0xcc, 0xf3, - 0xd4, 0x83, 0xf6, 0x90, 0x8c, 0x0e, 0x67, 0x8f, 0x4a, 0xa4, 0x77, 0x5e, 0x5d, 0xb9, 0xf5, 0x3e, - 0xeb, 0x2b, 0xa5, 0xb1, 0xd0, 0x22, 0x04, 0x04, 0x6d, 0x06, 0x9d, 0x61, 0x67, 0xd4, 0x9b, 0xbc, - 0x66, 0xff, 0xfe, 0x84, 0x58, 0x7d, 0x3d, 0x76, 0x7e, 0x23, 0xf5, 0x2a, 0x42, 0x7d, 0x55, 0x59, - 0xae, 0x2e, 0xdc, 0xda, 0x3c, 0xfb, 0x05, 0x7d, 0xb8, 0x83, 0x58, 0x7d, 0xda, 0x09, 0xe0, 0x2a, - 0x0f, 0xe7, 0xd0, 0xdd, 0x7e, 0x5a, 0x8f, 0x69, 0x37, 0x15, 0xcb, 0x04, 0x8a, 0x9d, 0xdc, 0xa2, - 0x38, 0x6b, 0x4f, 0xc9, 0xf1, 0x9a, 0xd0, 0x7e, 0x7d, 0xfe, 0x5b, 0x69, 0xd0, 0xba, 0x68, 0x44, - 0xcc, 0xef, 0x88, 0xb8, 0xf6, 0x06, 0xd9, 0x16, 0xcf, 0x93, 0xee, 0x97, 0xb6, 0x0f, 0xfe, 0x9e, - 0xd4, 0x72, 0xbe, 0xa0, 0x5d, 0x89, 0x10, 0x9a, 0x41, 0x3b, 0xcf, 0x6a, 0xfa, 0xbf, 0x59, 0xcd, - 0x1e, 0x94, 0x43, 0xba, 0x6f, 0xb6, 0x72, 0x6e, 0xa1, 0x3a, 0x7b, 0xb2, 0xda, 0x38, 0xad, 0xf5, - 0xc6, 0x69, 0xfd, 0xd8, 0x38, 0xad, 0x6f, 0x99, 0x43, 0x56, 0x99, 0x43, 0xd6, 0x99, 0x43, 0x7e, - 0x65, 0x0e, 0xf9, 0xfe, 0xdb, 0x69, 0x7d, 0xba, 0x57, 0xaa, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, - 0x0a, 0x07, 0x46, 0xe4, 0x25, 0x04, 0x00, 0x00, + // 471 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0x4f, 0x8b, 0xd3, 0x4e, + 0x18, 0xc7, 0x33, 0x2d, 0xe5, 0xb7, 0x3b, 0xfd, 0x89, 0x25, 0x7a, 0x28, 0x3d, 0x64, 0xcb, 0x9e, + 0xaa, 0xec, 0xce, 0xd0, 0xa2, 0x50, 0x16, 0xbc, 0x54, 0x04, 0x05, 0xc5, 0x25, 0x5e, 0x64, 0xc1, + 0xc3, 0xa4, 0xfb, 0x98, 0x1d, 0xd3, 0x64, 0xc2, 0xcc, 0x93, 0xc0, 0x82, 0x07, 0x5f, 0x82, 0x2f, + 0xab, 0x17, 0x61, 0x8f, 0x1e, 0x64, 0xb1, 0xf1, 0x8d, 0x48, 0xfe, 0xb8, 0x09, 0xfd, 0x87, 0x78, + 0x9b, 0x67, 0xe6, 0xf9, 0x7c, 0x9f, 0xef, 0xf3, 0x4d, 0xe8, 0x59, 0x30, 0x35, 0x4c, 0x2a, 0x1e, + 0x24, 0x1e, 0xe8, 0x08, 0x10, 0x0c, 0x8f, 0x03, 0x9f, 0x8b, 0x58, 0x1a, 0x6e, 0x50, 0x69, 0xe1, + 0x03, 0x4f, 0xc7, 0x1e, 0xa0, 0x18, 0x73, 0x1f, 0x22, 0xd0, 0x02, 0xe1, 0x92, 0xc5, 0x5a, 0xa1, + 0xb2, 0x1f, 0x97, 0x2c, 0xab, 0x59, 0x16, 0x07, 0x3e, 0xcb, 0x59, 0x56, 0xb1, 0xac, 0x62, 0x07, + 0xa7, 0xbe, 0xc4, 0xab, 0xc4, 0x63, 0x73, 0x15, 0x72, 0x5f, 0xf9, 0x8a, 0x17, 0x12, 0x5e, 0xf2, + 0xb1, 0xa8, 0x8a, 0xa2, 0x38, 0x95, 0xd2, 0x83, 0xc9, 0x4e, 0x5b, 0x5c, 0x83, 0x51, 0x89, 0x9e, + 0xc3, 0xba, 0x9d, 0xc1, 0xc9, 0x6e, 0x26, 0xdd, 0x30, 0xbf, 0x67, 0x82, 0xe1, 0x21, 0xa0, 0xd8, + 0xc6, 0x9c, 0x6e, 0x67, 0x74, 0x12, 0xa1, 0x0c, 0x37, 0x0d, 0x3d, 0xd9, 0xdf, 0x6e, 0xe6, 0x57, + 0x10, 0x8a, 0x0d, 0x6a, 0xbc, 0x9d, 0x4a, 0x50, 0x2e, 0xb8, 0x8c, 0xd0, 0xa0, 0x5e, 0x47, 0x8e, + 0x7f, 0xb4, 0xe8, 0xff, 0xef, 0xca, 0xc0, 0x9f, 0x2f, 0x84, 0x31, 0xf6, 0x7b, 0x7a, 0x90, 0xef, + 0x70, 0x29, 0x50, 0xf4, 0xc9, 0x90, 0x8c, 0xba, 0x93, 0x11, 0xdb, 0xf9, 0xb1, 0x58, 0x3a, 0x66, + 0x6f, 0xbd, 0x4f, 0x30, 0xc7, 0x37, 0x80, 0x62, 0x66, 0x2f, 0x6f, 0x8f, 0xac, 0xec, 0xf6, 0x88, + 0xd6, 0x77, 0xee, 0x9d, 0x9a, 0xfd, 0x94, 0x76, 0x63, 0xad, 0x52, 0x69, 0xa4, 0x8a, 0x40, 0xf7, + 0x5b, 0x43, 0x32, 0x3a, 0x9c, 0x3d, 0xa8, 0x90, 0xee, 0x79, 0xfd, 0xe4, 0x36, 0xfb, 0xec, 0xcf, + 0x94, 0xc6, 0x42, 0x8b, 0x10, 0x10, 0xb4, 0xe9, 0xb7, 0x87, 0xed, 0x51, 0x77, 0xf2, 0x92, 0xfd, + 0xfd, 0xff, 0xc3, 0x9a, 0xeb, 0xb1, 0xf3, 0x3b, 0xa9, 0x17, 0x11, 0xea, 0xeb, 0xda, 0x72, 0xfd, + 0xe0, 0x36, 0xe6, 0x0d, 0x9e, 0xd1, 0xfb, 0x6b, 0x88, 0xdd, 0xa3, 0xed, 0x00, 0xae, 0x8b, 0x70, + 0x0e, 0xdd, 0xfc, 0x68, 0x3f, 0xa4, 0x9d, 0x54, 0x2c, 0x12, 0x28, 0x77, 0x72, 0xcb, 0xe2, 0xac, + 0x35, 0x25, 0xc7, 0xdf, 0x08, 0xed, 0x35, 0xe7, 0xbf, 0x96, 0x06, 0xed, 0x8b, 0x8d, 0x88, 0x4f, + 0xf6, 0xed, 0x93, 0xf7, 0xe6, 0x41, 0xe7, 0x6c, 0x11, 0x73, 0xaf, 0xf2, 0x7c, 0xf0, 0xe7, 0xa6, + 0x11, 0xf2, 0x07, 0xda, 0x91, 0x08, 0xa1, 0xe9, 0xb7, 0x8a, 0xa0, 0xa6, 0xff, 0x1a, 0xd4, 0xec, + 0x5e, 0x35, 0xa4, 0xf3, 0x2a, 0x97, 0x73, 0x4b, 0xd5, 0xd9, 0xa3, 0xe5, 0xca, 0xb1, 0x6e, 0x56, + 0x8e, 0xf5, 0x7d, 0xe5, 0x58, 0x5f, 0x32, 0x87, 0x2c, 0x33, 0x87, 0xdc, 0x64, 0x0e, 0xf9, 0x99, + 0x39, 0xe4, 0xeb, 0x2f, 0xc7, 0xba, 0xf8, 0xaf, 0x52, 0xfb, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xc5, + 0xf0, 0x27, 0x65, 0x1f, 0x04, 0x00, 0x00, } diff --git a/pkg/apis/storage/v1beta1/generated.proto b/pkg/apis/storage/v1beta1/generated.proto index efc3b806d3f..497ea99954e 100644 --- a/pkg/apis/storage/v1beta1/generated.proto +++ b/pkg/apis/storage/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.storage.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -56,7 +56,7 @@ message StorageClassList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of StorageClasses repeated StorageClass items = 2; diff --git a/pkg/apis/storage/v1beta1/register.go b/pkg/apis/storage/v1beta1/register.go index 87a347e7a69..59717557c5d 100644 --- a/pkg/apis/storage/v1beta1/register.go +++ b/pkg/apis/storage/v1beta1/register.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" versionedwatch "k8s.io/kubernetes/pkg/watch/versioned" diff --git a/pkg/apis/storage/v1beta1/types.generated.go b/pkg/apis/storage/v1beta1/types.generated.go index 993cee3f3f6..9b235bca2af 100644 --- a/pkg/apis/storage/v1beta1/types.generated.go +++ b/pkg/apis/storage/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -653,7 +653,7 @@ func (x *StorageClassList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() @@ -734,7 +734,7 @@ func (x *StorageClassList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv62 := &x.ListMeta yym63 := z.DecBinary() diff --git a/pkg/apis/storage/v1beta1/types.go b/pkg/apis/storage/v1beta1/types.go index c97ba423afc..92d619ffdd6 100644 --- a/pkg/apis/storage/v1beta1/types.go +++ b/pkg/apis/storage/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // +genclient=true diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go index 17652022d58..9db4e80eb62 100644 --- a/pkg/apiserver/api_installer.go +++ b/pkg/apiserver/api_installer.go @@ -31,8 +31,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver/metrics" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go index bfcfec8bd9e..3c73db845da 100644 --- a/pkg/apiserver/apiserver_test.go +++ b/pkg/apiserver/apiserver_test.go @@ -38,8 +38,8 @@ import ( apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver/filters" "k8s.io/kubernetes/pkg/apiserver/request" apiservertesting "k8s.io/kubernetes/pkg/apiserver/testing" @@ -122,13 +122,13 @@ func newMapper() *meta.DefaultRESTMapper { func addGrouplessTypes() { type ListOptions struct { - Object runtime.Object + Object runtime.Object metav1.TypeMeta `json:",inline"` - LabelSelector string `json:"labelSelector,omitempty"` - FieldSelector string `json:"fieldSelector,omitempty"` - Watch bool `json:"watch,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` - TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` + LabelSelector string `json:"labelSelector,omitempty"` + FieldSelector string `json:"fieldSelector,omitempty"` + Watch bool `json:"watch,omitempty"` + ResourceVersion string `json:"resourceVersion,omitempty"` + TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } api.Scheme.AddKnownTypes(grouplessGroupVersion, &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{}, @@ -140,13 +140,13 @@ func addGrouplessTypes() { func addTestTypes() { type ListOptions struct { - Object runtime.Object + Object runtime.Object metav1.TypeMeta `json:",inline"` - LabelSelector string `json:"labelSelector,omitempty"` - FieldSelector string `json:"fieldSelector,omitempty"` - Watch bool `json:"watch,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` - TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` + LabelSelector string `json:"labelSelector,omitempty"` + FieldSelector string `json:"fieldSelector,omitempty"` + Watch bool `json:"watch,omitempty"` + ResourceVersion string `json:"resourceVersion,omitempty"` + TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } api.Scheme.AddKnownTypes(testGroupVersion, &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{}, @@ -168,13 +168,13 @@ func addTestTypes() { func addNewTestTypes() { type ListOptions struct { - Object runtime.Object + Object runtime.Object metav1.TypeMeta `json:",inline"` - LabelSelector string `json:"labelSelector,omitempty"` - FieldSelector string `json:"fieldSelector,omitempty"` - Watch bool `json:"watch,omitempty"` - ResourceVersion string `json:"resourceVersion,omitempty"` - TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` + LabelSelector string `json:"labelSelector,omitempty"` + FieldSelector string `json:"fieldSelector,omitempty"` + Watch bool `json:"watch,omitempty"` + ResourceVersion string `json:"resourceVersion,omitempty"` + TimeoutSeconds *int64 `json:"timeoutSeconds,omitempty"` } api.Scheme.AddKnownTypes(newGroupVersion, &apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{}, @@ -3250,9 +3250,9 @@ func TestUpdateChecksAPIVersion(t *testing.T) { // same group as its parent resource. type SimpleXGSubresource struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` - SubresourceInfo string `json:"subresourceInfo,omitempty"` - Labels map[string]string `json:"labels,omitempty"` + api.ObjectMeta `json:"metadata"` + SubresourceInfo string `json:"subresourceInfo,omitempty"` + Labels map[string]string `json:"labels,omitempty"` } func (obj *SimpleXGSubresource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } diff --git a/pkg/apiserver/resthandler_test.go b/pkg/apiserver/resthandler_test.go index 0ffb5af49b5..17ffdf61191 100644 --- a/pkg/apiserver/resthandler_test.go +++ b/pkg/apiserver/resthandler_test.go @@ -30,8 +30,8 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/apiserver/testing/types.generated.go b/pkg/apiserver/testing/types.generated.go index a468170ac71..d0df5318756 100644 --- a/pkg/apiserver/testing/types.generated.go +++ b/pkg/apiserver/testing/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1361,7 +1361,7 @@ func (x *SimpleList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv119 := &x.ListMeta yym120 := z.DecBinary() @@ -1442,7 +1442,7 @@ func (x *SimpleList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv126 := &x.ListMeta yym127 := z.DecBinary() diff --git a/pkg/apiserver/testing/types.go b/pkg/apiserver/testing/types.go index ca34d3084fa..ef6efa3a4e0 100644 --- a/pkg/apiserver/testing/types.go +++ b/pkg/apiserver/testing/types.go @@ -24,7 +24,7 @@ import ( type Simple struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` + api.ObjectMeta `json:"metadata"` // +optional Other string `json:"other,omitempty"` // +optional @@ -35,7 +35,7 @@ func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } type SimpleRoot struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` + api.ObjectMeta `json:"metadata"` // +optional Other string `json:"other,omitempty"` // +optional @@ -46,9 +46,9 @@ func (obj *SimpleRoot) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta type SimpleGetOptions struct { metav1.TypeMeta `json:",inline"` - Param1 string `json:"param1"` - Param2 string `json:"param2"` - Path string `json:"atAPath"` + Param1 string `json:"param1"` + Param2 string `json:"param2"` + Path string `json:"atAPath"` } func (SimpleGetOptions) SwaggerDoc() map[string]string { diff --git a/pkg/client/cache/listers.go b/pkg/client/cache/listers.go index 92079a0dc1b..cefa5b34dd5 100644 --- a/pkg/client/cache/listers.go +++ b/pkg/client/cache/listers.go @@ -22,11 +22,11 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" storageinternal "k8s.io/kubernetes/pkg/apis/storage" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" diff --git a/pkg/client/cache/listers_extensions.go b/pkg/client/cache/listers_extensions.go index f0b81d86c0d..3b50ae9954a 100644 --- a/pkg/client/cache/listers_extensions.go +++ b/pkg/client/cache/listers_extensions.go @@ -20,10 +20,10 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/client/cache/listers_test.go b/pkg/client/cache/listers_test.go index 3498e9942d8..b002d05a992 100644 --- a/pkg/client/cache/listers_test.go +++ b/pkg/client/cache/listers_test.go @@ -20,9 +20,9 @@ import ( "testing" apierrors "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index 87636162181..144ea27024b 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/pkg/client/cache/listwatch_test.go @@ -23,9 +23,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/client/cache/reflector_test.go b/pkg/client/cache/reflector_test.go index 85230a7b948..33a3298d4aa 100644 --- a/pkg/client/cache/reflector_test.go +++ b/pkg/client/cache/reflector_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/watch" diff --git a/pkg/client/leaderelection/leaderelection.go b/pkg/client/leaderelection/leaderelection.go index 81bdf0119ae..daeb4859af2 100644 --- a/pkg/client/leaderelection/leaderelection.go +++ b/pkg/client/leaderelection/leaderelection.go @@ -54,8 +54,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" rl "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/wait" diff --git a/pkg/client/leaderelection/leaderelection_test.go b/pkg/client/leaderelection/leaderelection_test.go index 1a5908d8aa9..865e474dc54 100644 --- a/pkg/client/leaderelection/leaderelection_test.go +++ b/pkg/client/leaderelection/leaderelection_test.go @@ -27,8 +27,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" rl "k8s.io/kubernetes/pkg/client/leaderelection/resourcelock" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/client/leaderelection/resourcelock/interface.go b/pkg/client/leaderelection/resourcelock/interface.go index eccfb339e7f..7ace562362f 100644 --- a/pkg/client/leaderelection/resourcelock/interface.go +++ b/pkg/client/leaderelection/resourcelock/interface.go @@ -30,11 +30,11 @@ const ( // with a random string (e.g. UUID) with only slight modification of this code. // TODO(mikedanese): this should potentially be versioned type LeaderElectionRecord struct { - HolderIdentity string `json:"holderIdentity"` - LeaseDurationSeconds int `json:"leaseDurationSeconds"` + HolderIdentity string `json:"holderIdentity"` + LeaseDurationSeconds int `json:"leaseDurationSeconds"` AcquireTime metav1.Time `json:"acquireTime"` RenewTime metav1.Time `json:"renewTime"` - LeaderTransitions int `json:"leaderTransitions"` + LeaderTransitions int `json:"leaderTransitions"` } // ResourceLockConfig common data that exists across different diff --git a/pkg/client/listers/batch/internalversion/job_expansion.go b/pkg/client/listers/batch/internalversion/job_expansion.go index 646aa66cd5b..9c665bc4c31 100644 --- a/pkg/client/listers/batch/internalversion/job_expansion.go +++ b/pkg/client/listers/batch/internalversion/job_expansion.go @@ -20,8 +20,8 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/client/listers/batch/internalversion/job_test.go b/pkg/client/listers/batch/internalversion/job_test.go index abefa6f9c02..982364f13f4 100644 --- a/pkg/client/listers/batch/internalversion/job_test.go +++ b/pkg/client/listers/batch/internalversion/job_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" diff --git a/pkg/client/listers/batch/v1/job_expansion.go b/pkg/client/listers/batch/v1/job_expansion.go index 51d2a457794..d77048714e8 100644 --- a/pkg/client/listers/batch/v1/job_expansion.go +++ b/pkg/client/listers/batch/v1/job_expansion.go @@ -19,9 +19,9 @@ package v1 import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/client/record/event.go b/pkg/client/record/event.go index 337c3324133..3a4e156f867 100644 --- a/pkg/client/record/event.go +++ b/pkg/client/record/event.go @@ -22,8 +22,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/clock" diff --git a/pkg/client/record/event_test.go b/pkg/client/record/event_test.go index d646dc2ba4a..32a7c74ae04 100644 --- a/pkg/client/record/event_test.go +++ b/pkg/client/record/event_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" _ "k8s.io/kubernetes/pkg/api/install" // To register api.Pod used in tests below - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" k8sruntime "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/clock" diff --git a/pkg/client/record/events_cache.go b/pkg/client/record/events_cache.go index 07ee61b5658..349366e27d4 100644 --- a/pkg/client/record/events_cache.go +++ b/pkg/client/record/events_cache.go @@ -25,8 +25,8 @@ import ( "github.com/golang/groupcache/lru" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/clock" "k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/strategicpatch" diff --git a/pkg/client/record/events_cache_test.go b/pkg/client/record/events_cache_test.go index a285a8b0523..112f53b177f 100644 --- a/pkg/client/record/events_cache_test.go +++ b/pkg/client/record/events_cache_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/clock" "k8s.io/kubernetes/pkg/util/diff" ) diff --git a/pkg/client/restclient/client_test.go b/pkg/client/restclient/client_test.go index 3db16117188..3101a111909 100644 --- a/pkg/client/restclient/client_test.go +++ b/pkg/client/restclient/client_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/diff" diff --git a/pkg/client/restclient/request.go b/pkg/client/restclient/request.go index 4e76dac83ae..7c6fcc091dc 100644 --- a/pkg/client/restclient/request.go +++ b/pkg/client/restclient/request.go @@ -33,9 +33,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" pathvalidation "k8s.io/kubernetes/pkg/api/validation/path" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/metrics" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/client/restclient/request_test.go b/pkg/client/restclient/request_test.go index 9d82538ba91..4493537a88c 100755 --- a/pkg/client/restclient/request_test.go +++ b/pkg/client/restclient/request_test.go @@ -34,9 +34,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/testing/core/fixture.go b/pkg/client/testing/core/fixture.go index 5f674bbff05..cdc00b5388f 100644 --- a/pkg/client/testing/core/fixture.go +++ b/pkg/client/testing/core/fixture.go @@ -22,8 +22,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/typed/discovery/discovery_client.go b/pkg/client/typed/discovery/discovery_client.go index ec971efb48e..dfc9031d524 100644 --- a/pkg/client/typed/discovery/discovery_client.go +++ b/pkg/client/typed/discovery/discovery_client.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/typed/discovery/discovery_client_test.go b/pkg/client/typed/discovery/discovery_client_test.go index c1f2557fe01..a707399c195 100644 --- a/pkg/client/typed/discovery/discovery_client_test.go +++ b/pkg/client/typed/discovery/discovery_client_test.go @@ -25,8 +25,8 @@ import ( "github.com/emicklei/go-restful/swagger" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/version" diff --git a/pkg/client/typed/discovery/fake/discovery.go b/pkg/client/typed/discovery/fake/discovery.go index 058db8ceb16..5ccea68c9b6 100644 --- a/pkg/client/typed/discovery/fake/discovery.go +++ b/pkg/client/typed/discovery/fake/discovery.go @@ -18,8 +18,8 @@ package fake import ( "github.com/emicklei/go-restful/swagger" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/typed/discovery/helper_blackbox_test.go b/pkg/client/typed/discovery/helper_blackbox_test.go index 9541ca37a10..035214a5157 100644 --- a/pkg/client/typed/discovery/helper_blackbox_test.go +++ b/pkg/client/typed/discovery/helper_blackbox_test.go @@ -28,8 +28,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - uapi "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + uapi "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/discovery" diff --git a/pkg/client/typed/discovery/restmapper_test.go b/pkg/client/typed/discovery/restmapper_test.go index a712de09763..82f33870aaa 100644 --- a/pkg/client/typed/discovery/restmapper_test.go +++ b/pkg/client/typed/discovery/restmapper_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/typed/dynamic/client.go b/pkg/client/typed/dynamic/client.go index 863645bd510..d965bcbb36f 100644 --- a/pkg/client/typed/dynamic/client.go +++ b/pkg/client/typed/dynamic/client.go @@ -27,8 +27,8 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/conversion/queryparams" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/client/typed/dynamic/client_test.go b/pkg/client/typed/dynamic/client_test.go index bb4f0856655..09902b92626 100644 --- a/pkg/client/typed/dynamic/client_test.go +++ b/pkg/client/typed/dynamic/client_test.go @@ -26,8 +26,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/unversioned/helper_test.go b/pkg/client/unversioned/helper_test.go index 2a3cef14ba6..ef32bc37702 100644 --- a/pkg/client/unversioned/helper_test.go +++ b/pkg/client/unversioned/helper_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" diff --git a/pkg/client/unversioned/testclient/simple/simple_testclient.go b/pkg/client/unversioned/testclient/simple/simple_testclient.go index e02629ca767..b3d4547bfb4 100644 --- a/pkg/client/unversioned/testclient/simple/simple_testclient.go +++ b/pkg/client/unversioned/testclient/simple/simple_testclient.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 92cfa5f6d46..f5cc7063385 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -41,9 +41,9 @@ import ( "github.com/aws/aws-sdk-go/service/elb" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/service" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/cloudprovider" awscredentials "k8s.io/kubernetes/pkg/credentialprovider/aws" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/cloudprovider/providers/aws/aws_test.go b/pkg/cloudprovider/providers/aws/aws_test.go index 350d2253a36..1ef2890d3d0 100644 --- a/pkg/cloudprovider/providers/aws/aws_test.go +++ b/pkg/cloudprovider/providers/aws/aws_test.go @@ -28,8 +28,8 @@ import ( "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/sets" "github.com/stretchr/testify/assert" diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index 2c2ed11ab59..2d87eac7652 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -30,9 +30,9 @@ import ( "gopkg.in/gcfg.v1" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apiservice "k8s.io/kubernetes/pkg/api/v1/service" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/types" utilerrors "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 3933d45d58e..21ce04df305 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -25,10 +25,10 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index ff60f2dd950..a71c2566f46 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/controller/cronjob/controller.go b/pkg/controller/cronjob/controller.go index f6389eed8fe..4c72b552733 100644 --- a/pkg/controller/cronjob/controller.go +++ b/pkg/controller/cronjob/controller.go @@ -35,9 +35,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/controller/cronjob/controller_test.go b/pkg/controller/cronjob/controller_test.go index 8b33a997178..5716d9020bc 100644 --- a/pkg/controller/cronjob/controller_test.go +++ b/pkg/controller/cronjob/controller_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/controller/cronjob/utils_test.go b/pkg/controller/cronjob/utils_test.go index 76ed9e4c52a..46ce0496778 100644 --- a/pkg/controller/cronjob/utils_test.go +++ b/pkg/controller/cronjob/utils_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/types" //"k8s.io/kubernetes/pkg/controller" // "k8s.io/kubernetes/pkg/util/rand" diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index 71a79ee9e77..3cd2e2ade69 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -23,9 +23,9 @@ import ( "sync" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/daemon/daemoncontroller_test.go b/pkg/controller/daemon/daemoncontroller_test.go index 9dbf8ed0e72..d96ad441073 100644 --- a/pkg/controller/daemon/daemoncontroller_test.go +++ b/pkg/controller/daemon/daemoncontroller_test.go @@ -22,10 +22,10 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 362b9a2d12f..e90429a1d53 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -28,9 +28,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index 8ddc8f331a1..a4cf6a01118 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/pkg/controller/deployment/deployment_controller_test.go @@ -20,10 +20,10 @@ import ( "fmt" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/controller/deployment/sync.go b/pkg/controller/deployment/sync.go index 05362472186..87d839c87ee 100644 --- a/pkg/controller/deployment/sync.go +++ b/pkg/controller/deployment/sync.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/deployment/sync_test.go b/pkg/controller/deployment/sync_test.go index b4e0263feec..96ed173822b 100644 --- a/pkg/controller/deployment/sync_test.go +++ b/pkg/controller/deployment/sync_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" testclient "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/controller/deployment/util/deployment_util.go b/pkg/controller/deployment/util/deployment_util.go index 84fa25d3a6c..873ecdf0008 100644 --- a/pkg/controller/deployment/util/deployment_util.go +++ b/pkg/controller/deployment/util/deployment_util.go @@ -28,10 +28,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/annotations" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" internalextensions "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/deployment/util/deployment_util_test.go b/pkg/controller/deployment/util/deployment_util_test.go index d51aeda86c9..a9016262ca7 100644 --- a/pkg/controller/deployment/util/deployment_util_test.go +++ b/pkg/controller/deployment/util/deployment_util_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index 48ab2e1917c..017b5f8ca4a 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -22,9 +22,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index 0024e9657f9..09f61e87d6b 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_test.go @@ -24,10 +24,10 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 7555196d30d..b6f6d5b305e 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -23,11 +23,11 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" endptspkg "k8s.io/kubernetes/pkg/api/v1/endpoints" "k8s.io/kubernetes/pkg/apimachinery/registered" _ "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/controller/garbagecollector/garbagecollector.go b/pkg/controller/garbagecollector/garbagecollector.go index 6a60c768106..115237cfc37 100644 --- a/pkg/controller/garbagecollector/garbagecollector.go +++ b/pkg/controller/garbagecollector/garbagecollector.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta/metatypes" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly" diff --git a/pkg/controller/garbagecollector/garbagecollector_test.go b/pkg/controller/garbagecollector/garbagecollector_test.go index 4f7a7186437..0dba2b1daa5 100644 --- a/pkg/controller/garbagecollector/garbagecollector_test.go +++ b/pkg/controller/garbagecollector/garbagecollector_test.go @@ -28,9 +28,9 @@ import ( _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/meta/metatypes" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly" diff --git a/pkg/controller/garbagecollector/metaonly/metaonly_test.go b/pkg/controller/garbagecollector/metaonly/metaonly_test.go index 89818e0b534..d41b3d20d51 100644 --- a/pkg/controller/garbagecollector/metaonly/metaonly_test.go +++ b/pkg/controller/garbagecollector/metaonly/metaonly_test.go @@ -23,8 +23,8 @@ import ( _ "k8s.io/kubernetes/pkg/api/install" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/runtime/serializer" diff --git a/pkg/controller/garbagecollector/metaonly/types.generated.go b/pkg/controller/garbagecollector/metaonly/types.generated.go index e7d5d9ec398..fd0c22e5a2f 100644 --- a/pkg/controller/garbagecollector/metaonly/types.generated.go +++ b/pkg/controller/garbagecollector/metaonly/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" pkg2_v1 "k8s.io/kubernetes/pkg/api/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -544,7 +544,7 @@ func (x *MetadataOnlyObjectList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv43 := &x.ListMeta yym44 := z.DecBinary() @@ -625,7 +625,7 @@ func (x *MetadataOnlyObjectList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv50 := &x.ListMeta yym51 := z.DecBinary() diff --git a/pkg/controller/garbagecollector/metaonly/types.go b/pkg/controller/garbagecollector/metaonly/types.go index 020ea6723d1..c83cf630b58 100644 --- a/pkg/controller/garbagecollector/metaonly/types.go +++ b/pkg/controller/garbagecollector/metaonly/types.go @@ -17,8 +17,8 @@ limitations under the License. package metaonly import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) // MetadataOnlyObject allows decoding only the apiVersion, kind, and metadata fields of diff --git a/pkg/controller/job/jobcontroller.go b/pkg/controller/job/jobcontroller.go index b4efca0c10f..90201bc20b2 100644 --- a/pkg/controller/job/jobcontroller.go +++ b/pkg/controller/job/jobcontroller.go @@ -24,9 +24,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/job/jobcontroller_test.go b/pkg/controller/job/jobcontroller_test.go index aba09f0d865..a09a76770b3 100644 --- a/pkg/controller/job/jobcontroller_test.go +++ b/pkg/controller/job/jobcontroller_test.go @@ -22,10 +22,10 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" batch "k8s.io/kubernetes/pkg/apis/batch/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index 47745a91510..3d06f8f5cb1 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/controller/namespace/namespace_controller_utils.go b/pkg/controller/namespace/namespace_controller_utils.go index 2f121f8d34a..c7a2560a4e8 100644 --- a/pkg/controller/namespace/namespace_controller_utils.go +++ b/pkg/controller/namespace/namespace_controller_utils.go @@ -23,8 +23,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/typed/dynamic" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 8ac1a7b2832..bb9501335b0 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 40ceb240580..59ad62e06ea 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -24,9 +24,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" diff --git a/pkg/controller/node/test_utils.go b/pkg/controller/node/test_utils.go index 1d92d275e2c..11daa1ea48f 100644 --- a/pkg/controller/node/test_utils.go +++ b/pkg/controller/node/test_utils.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/petset/fakes.go b/pkg/controller/petset/fakes.go index 721b7ebf16f..03b2cec1af9 100644 --- a/pkg/controller/petset/fakes.go +++ b/pkg/controller/petset/fakes.go @@ -23,10 +23,10 @@ import ( inf "gopkg.in/inf.v0" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apipod "k8s.io/kubernetes/pkg/api/v1/pod" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/sets" diff --git a/pkg/controller/petset/pet_set.go b/pkg/controller/petset/pet_set.go index bbbfdedf343..0ba45f847c7 100644 --- a/pkg/controller/petset/pet_set.go +++ b/pkg/controller/petset/pet_set.go @@ -22,9 +22,9 @@ import ( "sort" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/podautoscaler/BUILD b/pkg/controller/podautoscaler/BUILD index c9522cb3b91..692056d285c 100644 --- a/pkg/controller/podautoscaler/BUILD +++ b/pkg/controller/podautoscaler/BUILD @@ -49,6 +49,7 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index 1bf20cb5f7b..890f2c474b2 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -24,10 +24,10 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" unversionedautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 879756e2e55..fe695ecd71c 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -28,11 +28,12 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apimachinery/registered" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/client/record" @@ -308,7 +309,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: namespace, }, - Timestamp: metav1.Time{Time: time.Now()}, + Timestamp: unversioned.Time{Time: time.Now()}, Containers: []metricsapi.ContainerMetrics{ { Name: "container", diff --git a/pkg/controller/podautoscaler/metrics/BUILD b/pkg/controller/podautoscaler/metrics/BUILD index 52d30749973..6d663f224ed 100644 --- a/pkg/controller/podautoscaler/metrics/BUILD +++ b/pkg/controller/podautoscaler/metrics/BUILD @@ -35,9 +35,9 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api/resource:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", - "//pkg/apis/meta/v1:go_default_library", "//pkg/client/clientset_generated/release_1_5/fake:go_default_library", "//pkg/client/restclient:go_default_library", "//pkg/client/testing/core:go_default_library", diff --git a/pkg/controller/podautoscaler/metrics/metrics_client_test.go b/pkg/controller/podautoscaler/metrics/metrics_client_test.go index 5e89f90ce06..1a892bab81c 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/metrics_client_test.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" @@ -110,7 +110,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *fake.Clientset { Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: namespace, }, - Timestamp: metav1.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, + Timestamp: unversioned.Time{Time: fixedTimestamp.Add(time.Duration(tc.targetTimestamp) * time.Minute)}, Containers: []metricsapi.ContainerMetrics{}, } for j, cpu := range containers { diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index 394e2921aed..8f9d779f22b 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -26,9 +26,10 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/v1" _ "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/testing/core" @@ -138,7 +139,7 @@ func (tc *replicaCalcTestCase) prepareTestClient(t *testing.T) *fake.Clientset { Name: fmt.Sprintf("%s-%d", podNamePrefix, i), Namespace: testNamespace, }, - Timestamp: metav1.Time{Time: tc.timestamp}, + Timestamp: unversioned.Time{Time: tc.timestamp}, Containers: []metricsapi.ContainerMetrics{ { Name: "container1", diff --git a/pkg/controller/podgc/gc_controller_test.go b/pkg/controller/podgc/gc_controller_test.go index 2194cf8d585..0521a1885f9 100644 --- a/pkg/controller/podgc/gc_controller_test.go +++ b/pkg/controller/podgc/gc_controller_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index 50319dbae29..0bbb9491f36 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -27,10 +27,10 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index 4c8bf54e4b4..7f85a57c173 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -30,10 +30,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" diff --git a/pkg/controller/replicaset/replica_set_utils.go b/pkg/controller/replicaset/replica_set_utils.go index 6067deeb8c6..7001595eb48 100644 --- a/pkg/controller/replicaset/replica_set_utils.go +++ b/pkg/controller/replicaset/replica_set_utils.go @@ -25,9 +25,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index 9e8ed414adb..dbcc369094c 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" diff --git a/pkg/controller/replication/replication_controller_utils.go b/pkg/controller/replication/replication_controller_utils.go index 2364199f8ee..dc07177fded 100644 --- a/pkg/controller/replication/replication_controller_utils.go +++ b/pkg/controller/replication/replication_controller_utils.go @@ -23,8 +23,8 @@ import ( "reflect" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index 755b9953e2d..521e6f86df0 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/cloudprovider" diff --git a/pkg/controller/volume/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go index 17d8d9d47e2..b00944dcb8c 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/controller/volume/persistentvolume/index.go b/pkg/controller/volume/persistentvolume/index.go index 219e36ebe3a..b95572a61aa 100644 --- a/pkg/controller/volume/persistentvolume/index.go +++ b/pkg/controller/volume/persistentvolume/index.go @@ -20,8 +20,8 @@ import ( "fmt" "sort" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/volume/persistentvolume/index_test.go b/pkg/controller/volume/persistentvolume/index_test.go index 3f72901048e..54a09503294 100644 --- a/pkg/controller/volume/persistentvolume/index_test.go +++ b/pkg/controller/volume/persistentvolume/index_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" ) diff --git a/pkg/controller/volume/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go index b59da31bb2e..f2b16e83f9c 100644 --- a/pkg/controller/volume/persistentvolume/provision_test.go +++ b/pkg/controller/volume/persistentvolume/provision_test.go @@ -20,8 +20,8 @@ import ( "errors" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" ) diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go index 8ff07d43062..056b7a57317 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -22,8 +22,8 @@ import ( "strings" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" "k8s.io/kubernetes/pkg/client/cache" diff --git a/pkg/conversion/queryparams/convert_test.go b/pkg/conversion/queryparams/convert_test.go index fc2b6506031..506bbbefb9e 100644 --- a/pkg/conversion/queryparams/convert_test.go +++ b/pkg/conversion/queryparams/convert_test.go @@ -66,10 +66,10 @@ func (obj *baz) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKin // childStructs tests some of the types we serialize to query params for log API calls // notably, the nested time struct type childStructs struct { - Container string `json:"container,omitempty"` - Follow bool `json:"follow,omitempty"` - Previous bool `json:"previous,omitempty"` - SinceSeconds *int64 `json:"sinceSeconds,omitempty"` + Container string `json:"container,omitempty"` + Follow bool `json:"follow,omitempty"` + Previous bool `json:"previous,omitempty"` + SinceSeconds *int64 `json:"sinceSeconds,omitempty"` SinceTime *metav1.Time `json:"sinceTime,omitempty"` EmptyTime *metav1.Time `json:"emptyTime"` } diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go index 4add22f5227..88d74fc96bf 100644 --- a/pkg/dns/dns.go +++ b/pkg/dns/dns.go @@ -27,9 +27,9 @@ import ( etcd "github.com/coreos/etcd/client" "github.com/miekg/dns" skymsg "github.com/skynetservices/skydns/msg" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/endpoints" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kcache "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/dns/config" diff --git a/pkg/dns/dns_test.go b/pkg/dns/dns_test.go index 0ce3ff61dbd..1f8ae057892 100644 --- a/pkg/dns/dns_test.go +++ b/pkg/dns/dns_test.go @@ -32,9 +32,9 @@ import ( skyserver "github.com/skynetservices/skydns/server" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" endpointsapi "k8s.io/kubernetes/pkg/api/v1/endpoints" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" fake "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/dns/config" diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index 864c8925ac1..4f86fd2247c 100644 --- a/pkg/genericapiserver/config.go +++ b/pkg/genericapiserver/config.go @@ -37,8 +37,8 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiserverauthenticator "k8s.io/kubernetes/pkg/apiserver/authenticator" apiserverfilters "k8s.io/kubernetes/pkg/apiserver/filters" apiserveropenapi "k8s.io/kubernetes/pkg/apiserver/openapi" diff --git a/pkg/genericapiserver/genericapiserver.go b/pkg/genericapiserver/genericapiserver.go index 84674e376f8..af95c8f65c5 100644 --- a/pkg/genericapiserver/genericapiserver.go +++ b/pkg/genericapiserver/genericapiserver.go @@ -32,9 +32,9 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/client/restclient" genericmux "k8s.io/kubernetes/pkg/genericapiserver/mux" diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go index 924d52cbb67..e7d983b7f72 100644 --- a/pkg/genericapiserver/genericapiserver_test.go +++ b/pkg/genericapiserver/genericapiserver_test.go @@ -30,9 +30,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/user" openapigen "k8s.io/kubernetes/pkg/generated/openapi" diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 1bcc87ec783..454b4db5d8e 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -176,6 +176,7 @@ go_test( "//pkg/api/resource:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", + "//pkg/api/unversioned:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/apimachinery/registered:go_default_library", "//pkg/apis/batch:go_default_library", diff --git a/pkg/kubectl/cmd/certificates.go b/pkg/kubectl/cmd/certificates.go index f87080863c8..12e9af67aa2 100644 --- a/pkg/kubectl/cmd/certificates.go +++ b/pkg/kubectl/cmd/certificates.go @@ -20,8 +20,8 @@ import ( "fmt" "io" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/certificates" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index 7e63fe0b32a..2d25e0e45b5 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/kubectl" diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete_test.go index d6174c70a91..4c80e84c424 100644 --- a/pkg/kubectl/cmd/delete_test.go +++ b/pkg/kubectl/cmd/delete_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/client/typed/dynamic" diff --git a/pkg/kubectl/cmd/drain_test.go b/pkg/kubectl/cmd/drain_test.go index c8a023ebd69..71b971dd058 100644 --- a/pkg/kubectl/cmd/drain_test.go +++ b/pkg/kubectl/cmd/drain_test.go @@ -36,9 +36,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/conversion" diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index 6a9fd75ae2c..e8a278fdb8a 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" diff --git a/pkg/kubectl/cmd/logs.go b/pkg/kubectl/cmd/logs.go index 64660ef3c4b..fc030727336 100644 --- a/pkg/kubectl/cmd/logs.go +++ b/pkg/kubectl/cmd/logs.go @@ -26,8 +26,8 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index d66d36e473a..61ca97436f3 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" conditions "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubectl" diff --git a/pkg/kubectl/cmd/testing/fake.go b/pkg/kubectl/cmd/testing/fake.go index c82c42b9f0e..a08a37a1fe1 100644 --- a/pkg/kubectl/cmd/testing/fake.go +++ b/pkg/kubectl/cmd/testing/fake.go @@ -28,9 +28,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient/fake" diff --git a/pkg/kubectl/cmd/top_test.go b/pkg/kubectl/cmd/top_test.go index 117c59804cf..a1e9a130eb4 100644 --- a/pkg/kubectl/cmd/top_test.go +++ b/pkg/kubectl/cmd/top_test.go @@ -28,8 +28,9 @@ import ( metricsapi "k8s.io/heapster/metrics/apis/metrics/v1alpha1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" + "k8s.io/kubernetes/pkg/api/unversioned" v1 "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" ) @@ -61,13 +62,13 @@ func marshallBody(metrics interface{}) (io.ReadCloser, error) { func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { metrics := &metricsapi.NodeMetricsList{ - ListMeta: metav1.ListMeta{ + ListMeta: unversioned.ListMeta{ ResourceVersion: "1", }, Items: []metricsapi.NodeMetrics{ { ObjectMeta: v1.ObjectMeta{Name: "node1", ResourceVersion: "10"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Usage: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(1, resource.DecimalSI), v1.ResourceMemory: *resource.NewQuantity(2*(1024*1024), resource.DecimalSI), @@ -76,7 +77,7 @@ func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { }, { ObjectMeta: v1.ObjectMeta{Name: "node2", ResourceVersion: "11"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Usage: v1.ResourceList{ v1.ResourceCPU: *resource.NewMilliQuantity(5, resource.DecimalSI), v1.ResourceMemory: *resource.NewQuantity(6*(1024*1024), resource.DecimalSI), @@ -117,13 +118,13 @@ func testNodeMetricsData() (*metricsapi.NodeMetricsList, *api.NodeList) { func testPodMetricsData() *metricsapi.PodMetricsList { return &metricsapi.PodMetricsList{ - ListMeta: metav1.ListMeta{ + ListMeta: unversioned.ListMeta{ ResourceVersion: "2", }, Items: []metricsapi.PodMetrics{ { ObjectMeta: v1.ObjectMeta{Name: "pod1", Namespace: "test", ResourceVersion: "10"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container1-1", @@ -145,7 +146,7 @@ func testPodMetricsData() *metricsapi.PodMetricsList { }, { ObjectMeta: v1.ObjectMeta{Name: "pod2", Namespace: "test", ResourceVersion: "11"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container2-1", @@ -175,7 +176,7 @@ func testPodMetricsData() *metricsapi.PodMetricsList { }, { ObjectMeta: v1.ObjectMeta{Name: "pod3", Namespace: "test", ResourceVersion: "12"}, - Window: metav1.Duration{Duration: time.Minute}, + Window: unversioned.Duration{Duration: time.Minute}, Containers: []metricsapi.ContainerMetrics{ { Name: "container3-1", diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index cdb927c4d1c..5bad47bef51 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -41,13 +41,13 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/service" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index a7ddfc7deb3..22f1fe5961b 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -34,11 +34,11 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" manualfake "k8s.io/kubernetes/pkg/client/restclient/fake" testcore "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go index c057f678f80..7491586b32b 100644 --- a/pkg/kubectl/cmd/util/helpers.go +++ b/pkg/kubectl/cmd/util/helpers.go @@ -31,9 +31,9 @@ import ( "k8s.io/kubernetes/pkg/api" kerrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/resource" diff --git a/pkg/kubectl/cmd/util/helpers_test.go b/pkg/kubectl/cmd/util/helpers_test.go index 8ca600b1179..256bbb6497f 100644 --- a/pkg/kubectl/cmd/util/helpers_test.go +++ b/pkg/kubectl/cmd/util/helpers_test.go @@ -31,10 +31,10 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" uexec "k8s.io/kubernetes/pkg/util/exec" diff --git a/pkg/kubectl/custom_column_printer_test.go b/pkg/kubectl/custom_column_printer_test.go index 372906831a7..8373ecc566a 100644 --- a/pkg/kubectl/custom_column_printer_test.go +++ b/pkg/kubectl/custom_column_printer_test.go @@ -23,8 +23,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/deployment.go b/pkg/kubectl/deployment.go index f5f709cd042..c167702fb3e 100644 --- a/pkg/kubectl/deployment.go +++ b/pkg/kubectl/deployment.go @@ -21,8 +21,8 @@ import ( "strings" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/deployment_test.go b/pkg/kubectl/deployment_test.go index 9a3875a0489..1d905be9262 100644 --- a/pkg/kubectl/deployment_test.go +++ b/pkg/kubectl/deployment_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestDeploymentGenerate(t *testing.T) { diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index 99e1fde3f24..da369ebc07f 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -34,13 +34,13 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/events" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/extensions" versionedextension "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/storage" storageutil "k8s.io/kubernetes/pkg/apis/storage/util" diff --git a/pkg/kubectl/describe_test.go b/pkg/kubectl/describe_test.go index 70dc1fb01b2..616a5f5aff4 100644 --- a/pkg/kubectl/describe_test.go +++ b/pkg/kubectl/describe_test.go @@ -29,10 +29,10 @@ import ( fedfake "k8s.io/kubernetes/federation/client/clientset_generated/federation_internalclientset/fake" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index db84f5ff44c..15b928d2117 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/serializer/streaming" diff --git a/pkg/kubectl/resource/helper_test.go b/pkg/kubectl/resource/helper_test.go index 117744edcb1..c3613153b9d 100644 --- a/pkg/kubectl/resource/helper_test.go +++ b/pkg/kubectl/resource/helper_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient/fake" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/kubectl/resource/result.go b/pkg/kubectl/resource/result.go index 2bc343b159d..f703af06c60 100644 --- a/pkg/kubectl/resource/result.go +++ b/pkg/kubectl/resource/result.go @@ -22,9 +22,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" utilerrors "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 63fafaade1e..92fb978bcde 100644 --- a/pkg/kubectl/resource_printer.go +++ b/pkg/kubectl/resource_printer.go @@ -34,12 +34,12 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/events" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/apis/storage" diff --git a/pkg/kubectl/resource_printer_test.go b/pkg/kubectl/resource_printer_test.go index 2f2426813a6..f2634b59abd 100644 --- a/pkg/kubectl/resource_printer_test.go +++ b/pkg/kubectl/resource_printer_test.go @@ -28,11 +28,11 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/policy" kubectltesting "k8s.io/kubernetes/pkg/kubectl/testing" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 5b44b6afe57..e1e2af81e69 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" "k8s.io/kubernetes/pkg/client/retry" client "k8s.io/kubernetes/pkg/client/unversioned" diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index abb4332306c..3eac8b3f582 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/kubectl/run.go b/pkg/kubectl/run.go index 717f00a1854..cc06c1efb54 100644 --- a/pkg/kubectl/run.go +++ b/pkg/kubectl/run.go @@ -23,12 +23,12 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/batch" batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/validation" ) diff --git a/pkg/kubectl/run_test.go b/pkg/kubectl/run_test.go index b104ea54934..5822a83f2d5 100644 --- a/pkg/kubectl/run_test.go +++ b/pkg/kubectl/run_test.go @@ -22,9 +22,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestGenerate(t *testing.T) { diff --git a/pkg/kubectl/sorting_printer.go b/pkg/kubectl/sorting_printer.go index 606edb88d85..3c1e2e37d51 100644 --- a/pkg/kubectl/sorting_printer.go +++ b/pkg/kubectl/sorting_printer.go @@ -23,8 +23,8 @@ import ( "sort" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/integer" "k8s.io/kubernetes/pkg/util/jsonpath" diff --git a/pkg/kubectl/sorting_printer_test.go b/pkg/kubectl/sorting_printer_test.go index 07dd209c344..9c17f42e3f8 100644 --- a/pkg/kubectl/sorting_printer_test.go +++ b/pkg/kubectl/sorting_printer_test.go @@ -21,8 +21,8 @@ import ( "testing" internal "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" api "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index 0e70ef07534..a90e12df92e 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -24,10 +24,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" appsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion" batchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion" diff --git a/pkg/kubectl/stop_test.go b/pkg/kubectl/stop_test.go index dbef9d1a1bb..7d16fdbb90b 100644 --- a/pkg/kubectl/stop_test.go +++ b/pkg/kubectl/stop_test.go @@ -25,9 +25,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" testcore "k8s.io/kubernetes/pkg/client/testing/core" diff --git a/pkg/kubectl/testing/types.generated.go b/pkg/kubectl/testing/types.generated.go index d4c0db20f74..d9944eabf12 100644 --- a/pkg/kubectl/testing/types.generated.go +++ b/pkg/kubectl/testing/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/kubelet/active_deadline_test.go b/pkg/kubelet/active_deadline_test.go index 2b676df058a..a859422313a 100644 --- a/pkg/kubelet/active_deadline_test.go +++ b/pkg/kubelet/active_deadline_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/clock" diff --git a/pkg/kubelet/config/common_test.go b/pkg/kubelet/config/common_test.go index c714ffd208a..dc815b9e461 100644 --- a/pkg/kubelet/config/common_test.go +++ b/pkg/kubelet/config/common_test.go @@ -22,9 +22,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/securitycontext" ) diff --git a/pkg/kubelet/config/config_test.go b/pkg/kubelet/config/config_test.go index 098cc156bca..99d8066f046 100644 --- a/pkg/kubelet/config/config_test.go +++ b/pkg/kubelet/config/config_test.go @@ -25,8 +25,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/conversion" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/pkg/kubelet/config/file_linux_test.go b/pkg/kubelet/config/file_linux_test.go index 044be0ccfeb..c0af7e5de94 100644 --- a/pkg/kubelet/config/file_linux_test.go +++ b/pkg/kubelet/config/file_linux_test.go @@ -31,9 +31,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/securitycontext" diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index 3a42169edd0..ebc79dc8620 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index 33a5f2c8b8a..66fdc284fca 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -25,8 +25,8 @@ import ( "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/util/format" diff --git a/pkg/kubelet/container/ref_test.go b/pkg/kubelet/container/ref_test.go index 14ef351c5f9..2e8e1627aec 100644 --- a/pkg/kubelet/container/ref_test.go +++ b/pkg/kubelet/container/ref_test.go @@ -19,9 +19,9 @@ package container import ( "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestFieldPath(t *testing.T) { diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go index 30ea7a108d7..804f9156e4e 100644 --- a/pkg/kubelet/dockertools/docker_manager.go +++ b/pkg/kubelet/dockertools/docker_manager.go @@ -44,8 +44,8 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/eviction/helpers_test.go b/pkg/kubelet/eviction/helpers_test.go index fb710711d29..f99b4822ff7 100644 --- a/pkg/kubelet/eviction/helpers_test.go +++ b/pkg/kubelet/eviction/helpers_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/pkg/quota" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/kubelet/eviction/types.go b/pkg/kubelet/eviction/types.go index 8a68663fc6c..f601dc5f2de 100644 --- a/pkg/kubelet/eviction/types.go +++ b/pkg/kubelet/eviction/types.go @@ -20,8 +20,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" statsapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" ) diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index b5f202c5d6e..4c938fb4a83 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -28,8 +28,8 @@ import ( "github.com/golang/glog" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet/cadvisor" diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index b741674a81c..4a870380a22 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/testing/core" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go index 28d597cf49b..2aa495bed9a 100644 --- a/pkg/kubelet/kubelet_pods.go +++ b/pkg/kubelet/kubelet_pods.go @@ -33,10 +33,10 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" utilpod "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/api/v1/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/kubelet/cm" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 86b5bb40467..085a03d2118 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -29,9 +29,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_container.go b/pkg/kubelet/kuberuntime/kuberuntime_container.go index 9118bff417d..73070c113d0 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_container.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_container.go @@ -29,8 +29,8 @@ import ( "time" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/events" diff --git a/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go b/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go index 3683bb6b90a..e228929ba22 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_logs_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestLogOptions(t *testing.T) { diff --git a/pkg/kubelet/network/exec/exec.go b/pkg/kubelet/network/exec/exec.go index 0335872bdd7..2695830f4f5 100644 --- a/pkg/kubelet/network/exec/exec.go +++ b/pkg/kubelet/network/exec/exec.go @@ -65,8 +65,8 @@ import ( "strings" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/network" utilexec "k8s.io/kubernetes/pkg/util/exec" diff --git a/pkg/kubelet/network/plugins.go b/pkg/kubelet/network/plugins.go index 4220f083fdf..e1aec26502f 100644 --- a/pkg/kubelet/network/plugins.go +++ b/pkg/kubelet/network/plugins.go @@ -24,9 +24,9 @@ import ( clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/componentconfig" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" utilerrors "k8s.io/kubernetes/pkg/util/errors" utilexec "k8s.io/kubernetes/pkg/util/exec" diff --git a/pkg/kubelet/oom_watcher.go b/pkg/kubelet/oom_watcher.go index 692ecbfd779..268ae4b0427 100644 --- a/pkg/kubelet/oom_watcher.go +++ b/pkg/kubelet/oom_watcher.go @@ -20,8 +20,8 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/events" cadvisorapi "github.com/google/cadvisor/info/v1" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/util/runtime" diff --git a/pkg/kubelet/prober/common_test.go b/pkg/kubelet/prober/common_test.go index 88e50633606..c2f7aad1dc4 100644 --- a/pkg/kubelet/prober/common_test.go +++ b/pkg/kubelet/prober/common_test.go @@ -20,8 +20,8 @@ import ( "reflect" "sync" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/prober/worker_test.go b/pkg/kubelet/prober/worker_test.go index d786edaedb6..a2ba16b45af 100644 --- a/pkg/kubelet/prober/worker_test.go +++ b/pkg/kubelet/prober/worker_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/rkt/log.go b/pkg/kubelet/rkt/log.go index 3ceee625f33..ec67decb977 100644 --- a/pkg/kubelet/rkt/log.go +++ b/pkg/kubelet/rkt/log.go @@ -26,8 +26,8 @@ import ( "golang.org/x/net/context" rktapi "github.com/coreos/rkt/api/v1alpha" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/util/format" ) diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index e8062da1db3..6335d73c583 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -37,9 +37,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/healthz" diff --git a/pkg/kubelet/server/stats/summary.go b/pkg/kubelet/server/stats/summary.go index 43c10c5fbae..3c313a2aff1 100644 --- a/pkg/kubelet/server/stats/summary.go +++ b/pkg/kubelet/server/stats/summary.go @@ -21,8 +21,8 @@ import ( "strings" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/server/stats/summary_test.go b/pkg/kubelet/server/stats/summary_test.go index fa94b7d1e89..c0ae4a3ed52 100644 --- a/pkg/kubelet/server/stats/summary_test.go +++ b/pkg/kubelet/server/stats/summary_test.go @@ -25,8 +25,8 @@ import ( fuzz "github.com/google/gofuzz" "github.com/stretchr/testify/assert" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" k8sv1 "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubestats "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go index f7ccd51af48..c8cd617cf2c 100644 --- a/pkg/kubelet/status/status_manager.go +++ b/pkg/kubelet/status/status_manager.go @@ -26,9 +26,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/pkg/kubelet/status/status_manager_test.go b/pkg/kubelet/status/status_manager_test.go index ccc3ad449ef..ed710fcaa6c 100644 --- a/pkg/kubelet/status/status_manager_test.go +++ b/pkg/kubelet/status/status_manager_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubepod "k8s.io/kubernetes/pkg/kubelet/pod" podtest "k8s.io/kubernetes/pkg/kubelet/pod/testing" diff --git a/pkg/kubelet/util/csr/csr.go b/pkg/kubelet/util/csr/csr.go index 284a7ef4aee..3fc7fc1dccb 100644 --- a/pkg/kubelet/util/csr/csr.go +++ b/pkg/kubelet/util/csr/csr.go @@ -20,9 +20,9 @@ import ( "crypto/x509/pkix" "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" certificates "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" unversionedcertificates "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/certificates/v1alpha1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 29e532343ee..87b324c1f2b 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -28,7 +28,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/apps" @@ -41,6 +40,7 @@ import ( "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/extensions" extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/fake" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 402841bffd9..ba773cff7d7 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/genericapiserver" extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest" diff --git a/pkg/registry/apps/petset/etcd/etcd_test.go b/pkg/registry/apps/petset/etcd/etcd_test.go index 7af467a9632..ea5499234e5 100644 --- a/pkg/registry/apps/petset/etcd/etcd_test.go +++ b/pkg/registry/apps/petset/etcd/etcd_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/apps/petset/strategy_test.go b/pkg/registry/apps/petset/strategy_test.go index 67c3a59ac6a..6ad401b189e 100644 --- a/pkg/registry/apps/petset/strategy_test.go +++ b/pkg/registry/apps/petset/strategy_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/apps" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestStatefulSetStrategy(t *testing.T) { diff --git a/pkg/registry/batch/cronjob/strategy_test.go b/pkg/registry/batch/cronjob/strategy_test.go index d72147ffdbe..9f72a630d3e 100644 --- a/pkg/registry/batch/cronjob/strategy_test.go +++ b/pkg/registry/batch/cronjob/strategy_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func newBool(a bool) *bool { diff --git a/pkg/registry/batch/job/etcd/etcd_test.go b/pkg/registry/batch/job/etcd/etcd_test.go index 25f0ca1a21d..0835551a4c9 100644 --- a/pkg/registry/batch/job/etcd/etcd_test.go +++ b/pkg/registry/batch/job/etcd/etcd_test.go @@ -20,9 +20,9 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/batch/job/strategy.go b/pkg/registry/batch/job/strategy.go index cbfebfa3f67..e3231de6bf7 100644 --- a/pkg/registry/batch/job/strategy.go +++ b/pkg/registry/batch/job/strategy.go @@ -21,9 +21,9 @@ import ( "strconv" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/batch/job/strategy_test.go b/pkg/registry/batch/job/strategy_test.go index b8e6a8ca555..40d3d5baeb2 100644 --- a/pkg/registry/batch/job/strategy_test.go +++ b/pkg/registry/batch/job/strategy_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/batch" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/registry/core/namespace/strategy_test.go b/pkg/registry/core/namespace/strategy_test.go index aa0cb735db9..a3389aac03d 100644 --- a/pkg/registry/core/namespace/strategy_test.go +++ b/pkg/registry/core/namespace/strategy_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" apitesting "k8s.io/kubernetes/pkg/api/testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestNamespaceStrategy(t *testing.T) { diff --git a/pkg/registry/core/pod/etcd/etcd.go b/pkg/registry/core/pod/etcd/etcd.go index 0c94ab426d5..06e616210d4 100644 --- a/pkg/registry/core/pod/etcd/etcd.go +++ b/pkg/registry/core/pod/etcd/etcd.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/cachesize" diff --git a/pkg/registry/core/service/rest.go b/pkg/registry/core/service/rest.go index 68e69ed9c0f..5b3fb1d1abe 100644 --- a/pkg/registry/core/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -29,8 +29,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" apiservice "k8s.io/kubernetes/pkg/api/service" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/core/endpoint" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/core/service/portallocator" diff --git a/pkg/registry/extensions/controller/etcd/etcd_test.go b/pkg/registry/extensions/controller/etcd/etcd_test.go index 82877e11815..856bbfcf86c 100644 --- a/pkg/registry/extensions/controller/etcd/etcd_test.go +++ b/pkg/registry/extensions/controller/etcd/etcd_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/storage" diff --git a/pkg/registry/extensions/daemonset/etcd/etcd_test.go b/pkg/registry/extensions/daemonset/etcd/etcd_test.go index aa93f081454..254aefa46a2 100644 --- a/pkg/registry/extensions/daemonset/etcd/etcd_test.go +++ b/pkg/registry/extensions/daemonset/etcd/etcd_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/deployment/etcd/etcd.go b/pkg/registry/extensions/deployment/etcd/etcd.go index 464ee4f089a..ec07eca7c91 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd.go +++ b/pkg/registry/extensions/deployment/etcd/etcd.go @@ -24,9 +24,9 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/extensions/deployment" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/deployment/etcd/etcd_test.go b/pkg/registry/extensions/deployment/etcd/etcd_test.go index b98754301c8..774438839c8 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd_test.go +++ b/pkg/registry/extensions/deployment/etcd/etcd_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api/errors" storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/deployment/strategy.go b/pkg/registry/extensions/deployment/strategy.go index 7dd958edbb6..10c09a6b694 100644 --- a/pkg/registry/extensions/deployment/strategy.go +++ b/pkg/registry/extensions/deployment/strategy.go @@ -22,9 +22,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/validation" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go b/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go index b5dc11c5cfc..b7097e6db8c 100644 --- a/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go +++ b/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/networkpolicy/strategy_test.go b/pkg/registry/extensions/networkpolicy/strategy_test.go index b130fda0bc5..f957cfa53db 100644 --- a/pkg/registry/extensions/networkpolicy/strategy_test.go +++ b/pkg/registry/extensions/networkpolicy/strategy_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestNetworkPolicyStrategy(t *testing.T) { diff --git a/pkg/registry/extensions/replicaset/etcd/etcd_test.go b/pkg/registry/extensions/replicaset/etcd/etcd_test.go index aa8e249ef4e..a39a38c1de9 100644 --- a/pkg/registry/extensions/replicaset/etcd/etcd_test.go +++ b/pkg/registry/extensions/replicaset/etcd/etcd_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/extensions/replicaset/strategy_test.go b/pkg/registry/extensions/replicaset/strategy_test.go index 19187622557..3a5a1c7224c 100644 --- a/pkg/registry/extensions/replicaset/strategy_test.go +++ b/pkg/registry/extensions/replicaset/strategy_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestReplicaSetStrategy(t *testing.T) { diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go index f1fc5307bdf..e2791f6e1b6 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec.go @@ -26,12 +26,12 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiutil "k8s.io/kubernetes/pkg/api/util" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/util/yaml" diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go index 9fca372a00e..e2e7477ac5a 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/watch/versioned" @@ -36,7 +36,7 @@ import ( type Foo struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` + api.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` SomeField string `json:"someField"` OtherField int `json:"otherField"` @@ -270,10 +270,10 @@ func TestThirdPartyResourceDataListEncoding(t *testing.T) { } targetOutput := struct { - Kind string `json:"kind,omitempty"` - Items []json.RawMessage `json:"items"` - Metadata metav1.ListMeta `json:"metadata,omitempty"` - APIVersion string `json:"apiVersion,omitempty"` + Kind string `json:"kind,omitempty"` + Items []json.RawMessage `json:"items"` + Metadata metav1.ListMeta `json:"metadata,omitempty"` + APIVersion string `json:"apiVersion,omitempty"` }{} err = json.Unmarshal(buf.Bytes(), &targetOutput) diff --git a/pkg/registry/generic/registry/store.go b/pkg/registry/generic/registry/store.go index 98dd7522c4b..d61d2835c4a 100644 --- a/pkg/registry/generic/registry/store.go +++ b/pkg/registry/generic/registry/store.go @@ -28,8 +28,8 @@ import ( storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/rest" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation/path" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/runtime/generated.proto b/pkg/runtime/generated.proto index 136ab0b5e3c..bd0e893ba14 100644 --- a/pkg/runtime/generated.proto +++ b/pkg/runtime/generated.proto @@ -85,7 +85,7 @@ message RawExtension { // runtime.TypeMeta `json:",inline"` // ... // other fields // } -// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *unversioned.GroupVersionKind) { unversioned.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind +// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind // // TypeMeta is provided here for convenience. You may use it directly from this package or define // your own with the same fields. diff --git a/pkg/runtime/unstructured_test.go b/pkg/runtime/unstructured_test.go index 261ff2c3bdc..40c5423c15f 100644 --- a/pkg/runtime/unstructured_test.go +++ b/pkg/runtime/unstructured_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta/metatypes" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/validation" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/runtime/unversioned_test.go b/pkg/runtime/unversioned_test.go index b39d530bdd5..fd837b09949 100644 --- a/pkg/runtime/unversioned_test.go +++ b/pkg/runtime/unversioned_test.go @@ -25,8 +25,8 @@ import ( // pkg/conversion/test/... instead of importing pkg/api here. "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/extensions" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/storage/cacher.go b/pkg/storage/cacher.go index 54fce231aee..d495d90c4e6 100644 --- a/pkg/storage/cacher.go +++ b/pkg/storage/cacher.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/storage/testing/types.generated.go b/pkg/storage/testing/types.generated.go index 9a81c068782..e37fe8e1d89 100644 --- a/pkg/storage/testing/types.generated.go +++ b/pkg/storage/testing/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/kubernetes/pkg/api" - pkg1_unversioned "k8s.io/kubernetes/pkg/apis/meta/v1" + pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1" pkg3_types "k8s.io/kubernetes/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/pkg/storage/testing/types.go b/pkg/storage/testing/types.go index b938928383b..e1276795c65 100644 --- a/pkg/storage/testing/types.go +++ b/pkg/storage/testing/types.go @@ -24,8 +24,8 @@ import ( type TestResource struct { metav1.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata"` - Value int `json:"value"` + api.ObjectMeta `json:"metadata"` + Value int `json:"value"` } func (obj *TestResource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta } diff --git a/pkg/storage/watch_cache_test.go b/pkg/storage/watch_cache_test.go index 0dbe006647d..581f8749a96 100644 --- a/pkg/storage/watch_cache_test.go +++ b/pkg/storage/watch_cache_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/util/node/node.go b/pkg/util/node/node.go index 313a21a9d35..7a5eb57775a 100644 --- a/pkg/util/node/node.go +++ b/pkg/util/node/node.go @@ -26,8 +26,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/util/node/node_test.go b/pkg/util/node/node_test.go index 66ef5f65d7b..0db3cc2bb85 100644 --- a/pkg/util/node/node_test.go +++ b/pkg/util/node/node_test.go @@ -19,8 +19,8 @@ package node import ( "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" ) func TestGetPreferredAddress(t *testing.T) { diff --git a/pkg/util/replicaset/replicaset.go b/pkg/util/replicaset/replicaset.go index cc039162ce6..7a9ff81accc 100644 --- a/pkg/util/replicaset/replicaset.go +++ b/pkg/util/replicaset/replicaset.go @@ -22,9 +22,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" "k8s.io/kubernetes/pkg/labels" errorsutil "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/volume/flocker/flocker_volume_test.go b/pkg/volume/flocker/flocker_volume_test.go index 0fb933470d5..2e7d9a69628 100644 --- a/pkg/volume/flocker/flocker_volume_test.go +++ b/pkg/volume/flocker/flocker_volume_test.go @@ -20,8 +20,8 @@ import ( "fmt" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" utiltesting "k8s.io/kubernetes/pkg/util/testing" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" diff --git a/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go b/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go index 9d7f2cf7dea..541bdb78f1c 100644 --- a/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go +++ b/plugin/pkg/auth/authenticator/token/webhook/webhook_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" ) diff --git a/plugin/pkg/auth/authorizer/webhook/webhook_test.go b/plugin/pkg/auth/authorizer/webhook/webhook_test.go index 703bace5005..6ad1e650be4 100644 --- a/plugin/pkg/auth/authorizer/webhook/webhook_test.go +++ b/plugin/pkg/auth/authorizer/webhook/webhook_test.go @@ -32,8 +32,8 @@ import ( "text/template" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/user" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" diff --git a/plugin/pkg/scheduler/algorithm/listers.go b/plugin/pkg/scheduler/algorithm/listers.go index 041cbf3d28a..854b5708c40 100644 --- a/plugin/pkg/scheduler/algorithm/listers.go +++ b/plugin/pkg/scheduler/algorithm/listers.go @@ -19,9 +19,9 @@ package algorithm import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" ) diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index f880f823a87..f87bc0c893d 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -24,8 +24,8 @@ import ( "time" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/kubelet/qos" "k8s.io/kubernetes/pkg/labels" diff --git a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go b/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go index de34802e579..cf812a426f1 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go +++ b/plugin/pkg/scheduler/algorithm/priorities/interpod_affinity_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go index a50015ea79c..e9dd548bc56 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading.go @@ -20,8 +20,8 @@ import ( "sync" "github.com/golang/glog" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" utilnode "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/workqueue" diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go index 93726ece7f6..37f9783a1fc 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go @@ -21,9 +21,9 @@ import ( "sort" "testing" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" diff --git a/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go b/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go index 9824222f52a..171daf3e20d 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go +++ b/plugin/pkg/scheduler/algorithm/priorities/util/topologies.go @@ -17,8 +17,8 @@ limitations under the License. package util import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/plugin/pkg/scheduler/api/types.go b/plugin/pkg/scheduler/api/types.go index 055c19f1870..f5d795ddb35 100644 --- a/plugin/pkg/scheduler/api/types.go +++ b/plugin/pkg/scheduler/api/types.go @@ -19,8 +19,8 @@ package api import ( "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" ) diff --git a/plugin/pkg/scheduler/api/v1/types.go b/plugin/pkg/scheduler/api/v1/types.go index ee0aa8a67ec..6474fe1f431 100644 --- a/plugin/pkg/scheduler/api/v1/types.go +++ b/plugin/pkg/scheduler/api/v1/types.go @@ -19,8 +19,8 @@ package v1 import ( "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" apiv1 "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/restclient" ) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 64a09569b7b..6b35a0ba74d 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -211,6 +211,7 @@ go_library( "//vendor:k8s.io/client-go/kubernetes", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/extensions/v1beta1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1", "//vendor:k8s.io/client-go/pkg/util/intstr", ], diff --git a/test/e2e/common/empty_dir.go b/test/e2e/common/empty_dir.go index 12b22ecb8e9..76b4480ff76 100644 --- a/test/e2e/common/empty_dir.go +++ b/test/e2e/common/empty_dir.go @@ -20,9 +20,9 @@ import ( "fmt" "path" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/common/host_path.go b/test/e2e/common/host_path.go index 08f57e90500..59942f6bd0f 100644 --- a/test/e2e/common/host_path.go +++ b/test/e2e/common/host_path.go @@ -21,9 +21,9 @@ import ( "os" "path" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/common/volumes.go b/test/e2e/common/volumes.go index 9ffbbd3df6f..94156b696e6 100644 --- a/test/e2e/common/volumes.go +++ b/test/e2e/common/volumes.go @@ -48,8 +48,8 @@ import ( "time" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index ca14d6eca02..b5cda9b3573 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -24,11 +24,11 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/density.go b/test/e2e/density.go index 34c3c30ff32..a69b0822912 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 2b09f4f884a..4c3efe7d70f 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -27,10 +27,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/annotations" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/extensions/v1beta1" diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go index 15c6c55ad38..f5b2cc4b8cd 100644 --- a/test/e2e/disruption.go +++ b/test/e2e/disruption.go @@ -23,9 +23,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/client-go/kubernetes" - metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/api/v1" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" policy "k8s.io/client-go/pkg/apis/policy/v1beta1" "k8s.io/client-go/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/dns.go b/test/e2e/dns.go index 43aef508389..50cf871707f 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -24,10 +24,10 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/uuid" diff --git a/test/e2e/dns_configmap.go b/test/e2e/dns_configmap.go index 31ec4e10012..57b094d7335 100644 --- a/test/e2e/dns_configmap.go +++ b/test/e2e/dns_configmap.go @@ -21,8 +21,8 @@ import ( "strings" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" fed "k8s.io/kubernetes/pkg/dns/federation" "k8s.io/kubernetes/pkg/fields" diff --git a/test/e2e/federation-deployment.go b/test/e2e/federation-deployment.go index 3c7d1a84567..de4b8379b00 100644 --- a/test/e2e/federation-deployment.go +++ b/test/e2e/federation-deployment.go @@ -24,9 +24,9 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/federation-replicaset.go b/test/e2e/federation-replicaset.go index 5bdca8d0876..7e6b547c3e5 100644 --- a/test/e2e/federation-replicaset.go +++ b/test/e2e/federation-replicaset.go @@ -24,9 +24,9 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/framework/networking_utils.go b/test/e2e/framework/networking_utils.go index b8a2bcd2b1c..80e8d2f2fab 100644 --- a/test/e2e/framework/networking_utils.go +++ b/test/e2e/framework/networking_utils.go @@ -24,9 +24,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" coreclientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index a2ff5b2801c..d6faaf569cf 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -44,13 +44,13 @@ import ( "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_5" "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" batch "k8s.io/kubernetes/pkg/apis/batch/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/conditions" diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index 14a33d5a05b..7eab78fe671 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -20,8 +20,8 @@ import ( "fmt" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/metrics" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/gke_local_ssd.go b/test/e2e/gke_local_ssd.go index 79ae9f9c73a..586763f2489 100644 --- a/test/e2e/gke_local_ssd.go +++ b/test/e2e/gke_local_ssd.go @@ -20,9 +20,9 @@ import ( "fmt" "os/exec" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 422f14a0422..5333641c69e 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -44,8 +44,8 @@ import ( "k8s.io/kubernetes/pkg/api/annotations" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/test/e2e/mesos.go b/test/e2e/mesos.go index dd0381aea80..1e30a4f25a8 100644 --- a/test/e2e/mesos.go +++ b/test/e2e/mesos.go @@ -19,8 +19,8 @@ package e2e import ( "fmt" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 5e661298d1d..8c93ce7830d 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -31,9 +31,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" awscloud "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 07cf961873a..18caf9ac386 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -24,9 +24,9 @@ import ( . "github.com/onsi/gomega" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/volume/util/volumehelper" diff --git a/test/e2e/petset.go b/test/e2e/petset.go index 6ada2f1a992..8b979306b32 100644 --- a/test/e2e/petset.go +++ b/test/e2e/petset.go @@ -31,9 +31,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/controller/petset" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/replica_set.go b/test/e2e/replica_set.go index 683b2c3ec82..34fb536cb51 100644 --- a/test/e2e/replica_set.go +++ b/test/e2e/replica_set.go @@ -21,9 +21,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/controller/replicaset" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/uuid" diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 5119a9c36bc..7f084774fd6 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -24,9 +24,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/third-party.go b/test/e2e/third-party.go index 1a852ba167f..fc6837c4bdd 100644 --- a/test/e2e/third-party.go +++ b/test/e2e/third-party.go @@ -23,10 +23,10 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" @@ -46,7 +46,7 @@ var data = `{ type Foo struct { metav1.TypeMeta `json:",inline"` - v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` + v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` SomeField string `json:"someField"` OtherField int `json:"otherField"` diff --git a/test/e2e/ubernetes_lite.go b/test/e2e/ubernetes_lite.go index 3b4589228c7..fd14b563bfd 100644 --- a/test/e2e/ubernetes_lite.go +++ b/test/e2e/ubernetes_lite.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/intstr" diff --git a/test/e2e/volume_provisioning.go b/test/e2e/volume_provisioning.go index 7a21da2004f..05c51b944ff 100644 --- a/test/e2e/volume_provisioning.go +++ b/test/e2e/volume_provisioning.go @@ -20,8 +20,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index c138fe8f272..ea877128191 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -47,8 +47,8 @@ import ( "time" apierrs "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index 8f49e316880..5bcccd37442 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -25,8 +25,8 @@ import ( "sync" "time" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" kubemetrics "k8s.io/kubernetes/pkg/kubelet/metrics" diff --git a/test/e2e_node/kubelet_test.go b/test/e2e_node/kubelet_test.go index 68594a0be24..cdb6bfdbecf 100644 --- a/test/e2e_node/kubelet_test.go +++ b/test/e2e_node/kubelet_test.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - apiunversioned "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + apiunversioned "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_node/simple_mount.go b/test/e2e_node/simple_mount.go index 1e7f512a270..57be1241969 100644 --- a/test/e2e_node/simple_mount.go +++ b/test/e2e_node/simple_mount.go @@ -17,8 +17,8 @@ limitations under the License. package e2e_node import ( - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go index 3a9480761ba..d6071fbde60 100644 --- a/test/e2e_node/summary_test.go +++ b/test/e2e_node/summary_test.go @@ -21,8 +21,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/stats" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/integration/client/client_test.go b/test/integration/client/client_test.go index 9619b17d8d9..6de1092efd2 100644 --- a/test/integration/client/client_test.go +++ b/test/integration/client/client_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/labels" diff --git a/test/integration/client/dynamic_client_test.go b/test/integration/client/dynamic_client_test.go index 61f5ede9f0f..12708769661 100644 --- a/test/integration/client/dynamic_client_test.go +++ b/test/integration/client/dynamic_client_test.go @@ -23,9 +23,9 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/testapi" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/dynamic" diff --git a/test/integration/federation/server_test.go b/test/integration/federation/server_test.go index b153730178f..0543a6a2803 100644 --- a/test/integration/federation/server_test.go +++ b/test/integration/federation/server_test.go @@ -31,9 +31,9 @@ import ( fed_v1b1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app" "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" ext_v1b1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/runtime/schema" ) diff --git a/test/integration/garbagecollector/garbage_collector_test.go b/test/integration/garbagecollector/garbage_collector_test.go index 564a879251e..ef6348278e9 100644 --- a/test/integration/garbagecollector/garbage_collector_test.go +++ b/test/integration/garbagecollector/garbage_collector_test.go @@ -30,9 +30,9 @@ import ( "github.com/golang/glog" dto "github.com/prometheus/client_model/go" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/typed/dynamic" diff --git a/test/integration/persistentvolumes/persistent_volumes_test.go b/test/integration/persistentvolumes/persistent_volumes_test.go index 41ee3c9b0c9..54fcf852977 100644 --- a/test/integration/persistentvolumes/persistent_volumes_test.go +++ b/test/integration/persistentvolumes/persistent_volumes_test.go @@ -28,9 +28,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/test/integration/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go index 37b21e17693..9633156d587 100644 --- a/test/integration/replicaset/replicaset_test.go +++ b/test/integration/replicaset/replicaset_test.go @@ -26,9 +26,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/test/integration/replicationcontroller/replicationcontroller_test.go b/test/integration/replicationcontroller/replicationcontroller_test.go index 9679b38d083..0cbfc0b3a1a 100644 --- a/test/integration/replicationcontroller/replicationcontroller_test.go +++ b/test/integration/replicationcontroller/replicationcontroller_test.go @@ -26,8 +26,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go index 3c49466fbcc..ab8c27000a6 100644 --- a/test/integration/scheduler/extender_test.go +++ b/test/integration/scheduler/extender_test.go @@ -30,9 +30,9 @@ import ( "time" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" "k8s.io/kubernetes/pkg/client/record" diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index fcb552ad9a3..daf5a572f42 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/core/v1" diff --git a/test/integration/storageclasses/storage_classes_test.go b/test/integration/storageclasses/storage_classes_test.go index d132e4e3fea..b12ba870f2f 100644 --- a/test/integration/storageclasses/storage_classes_test.go +++ b/test/integration/storageclasses/storage_classes_test.go @@ -24,9 +24,9 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apimachinery/registered" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" diff --git a/test/integration/thirdparty/thirdparty_test.go b/test/integration/thirdparty/thirdparty_test.go index 392f05b893e..69d9c091863 100644 --- a/test/integration/thirdparty/thirdparty_test.go +++ b/test/integration/thirdparty/thirdparty_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/runtime/schema" @@ -65,7 +65,7 @@ var versionsToTest = []string{"v1"} type Foo struct { metav1.TypeMeta `json:",inline"` - v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` + v1.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` SomeField string `json:"someField"` OtherField int `json:"otherField"` diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index 22c39da042f..f4ccf2d2bde 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -32,8 +32,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" diff --git a/test/utils/runners.go b/test/utils/runners.go index 9fef997b5c3..68d0a8eb04f 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/kubernetes/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5" "k8s.io/kubernetes/pkg/fields" diff --git a/vendor/BUILD b/vendor/BUILD index 723e6509941..aac6d8115c0 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -8575,8 +8575,8 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", "//vendor:k8s.io/client-go/pkg/api/meta", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/runtime/serializer", @@ -8593,8 +8593,8 @@ go_library( tags = ["automanaged"], deps = [ "//vendor:github.com/emicklei/go-restful/swagger", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/version", "//vendor:k8s.io/client-go/rest", @@ -8613,8 +8613,8 @@ go_library( deps = [ "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/meta", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion/queryparams", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9218,6 +9218,7 @@ go_library( "k8s.io/client-go/pkg/api/resource_helpers.go", "k8s.io/client-go/pkg/api/types.generated.go", "k8s.io/client-go/pkg/api/types.go", + "k8s.io/client-go/pkg/api/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -9228,7 +9229,7 @@ go_library( "//vendor:k8s.io/client-go/pkg/api/meta", "//vendor:k8s.io/client-go/pkg/api/meta/metatypes", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/auth/user", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/fields", @@ -9255,7 +9256,7 @@ go_library( ], tags = ["automanaged"], deps = [ - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/util/validation/field", @@ -9297,7 +9298,7 @@ go_library( deps = [ "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/api/meta/metatypes", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9376,35 +9377,6 @@ go_library( ], ) -go_library( - name = "k8s.io/client-go/pkg/api/unversioned", - srcs = [ - "k8s.io/client-go/pkg/api/unversioned/doc.go", - "k8s.io/client-go/pkg/api/unversioned/duration.go", - "k8s.io/client-go/pkg/api/unversioned/generated.pb.go", - "k8s.io/client-go/pkg/api/unversioned/group_version.go", - "k8s.io/client-go/pkg/api/unversioned/helpers.go", - "k8s.io/client-go/pkg/api/unversioned/meta.go", - "k8s.io/client-go/pkg/api/unversioned/register.go", - "k8s.io/client-go/pkg/api/unversioned/time.go", - "k8s.io/client-go/pkg/api/unversioned/time_proto.go", - "k8s.io/client-go/pkg/api/unversioned/types.go", - "k8s.io/client-go/pkg/api/unversioned/types_swagger_doc_generated.go", - "k8s.io/client-go/pkg/api/unversioned/well_known_labels.go", - ], - tags = ["automanaged"], - deps = [ - "//vendor:github.com/go-openapi/spec", - "//vendor:github.com/gogo/protobuf/proto", - "//vendor:github.com/gogo/protobuf/sortkeys", - "//vendor:github.com/google/gofuzz", - "//vendor:k8s.io/client-go/pkg/genericapiserver/openapi/common", - "//vendor:k8s.io/client-go/pkg/labels", - "//vendor:k8s.io/client-go/pkg/runtime/schema", - "//vendor:k8s.io/client-go/pkg/selection", - ], -) - go_library( name = "k8s.io/client-go/pkg/api/v1", srcs = [ @@ -9422,6 +9394,7 @@ go_library( "k8s.io/client-go/pkg/api/v1/types.go", "k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/api/v1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/api/v1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9433,8 +9406,8 @@ go_library( "//vendor:k8s.io/client-go/pkg/api/meta", "//vendor:k8s.io/client-go/pkg/api/meta/metatypes", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/apis/extensions", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/labels", @@ -9511,13 +9484,15 @@ go_library( "k8s.io/client-go/pkg/apis/apps/register.go", "k8s.io/client-go/pkg/apis/apps/types.generated.go", "k8s.io/client-go/pkg/apis/apps/types.go", + "k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9543,12 +9518,14 @@ go_library( "k8s.io/client-go/pkg/apis/authentication/register.go", "k8s.io/client-go/pkg/apis/authentication/types.generated.go", "k8s.io/client-go/pkg/apis/authentication/types.go", + "k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9579,15 +9556,16 @@ go_library( "k8s.io/client-go/pkg/apis/authentication/v1beta1/types.go", "k8s.io/client-go/pkg/apis/authentication/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/authentication", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9602,12 +9580,14 @@ go_library( "k8s.io/client-go/pkg/apis/authorization/register.go", "k8s.io/client-go/pkg/apis/authorization/types.generated.go", "k8s.io/client-go/pkg/apis/authorization/types.go", + "k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9638,15 +9618,16 @@ go_library( "k8s.io/client-go/pkg/apis/authorization/v1beta1/types.go", "k8s.io/client-go/pkg/apis/authorization/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/authorization", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9662,12 +9643,14 @@ go_library( "k8s.io/client-go/pkg/apis/autoscaling/register.go", "k8s.io/client-go/pkg/apis/autoscaling/types.generated.go", "k8s.io/client-go/pkg/apis/autoscaling/types.go", + "k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9696,15 +9679,16 @@ go_library( "k8s.io/client-go/pkg/apis/autoscaling/v1/types.go", "k8s.io/client-go/pkg/apis/autoscaling/v1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.defaults.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/autoscaling", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9720,13 +9704,15 @@ go_library( "k8s.io/client-go/pkg/apis/batch/register.go", "k8s.io/client-go/pkg/apis/batch/types.generated.go", "k8s.io/client-go/pkg/apis/batch/types.go", + "k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9758,6 +9744,7 @@ go_library( "k8s.io/client-go/pkg/apis/batch/v1/types.go", "k8s.io/client-go/pkg/apis/batch/v1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/batch/v1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9766,9 +9753,9 @@ go_library( "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/batch", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9790,6 +9777,7 @@ go_library( "k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go", "k8s.io/client-go/pkg/apis/batch/v2alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9798,9 +9786,9 @@ go_library( "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/batch", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9817,12 +9805,14 @@ go_library( "k8s.io/client-go/pkg/apis/certificates/register.go", "k8s.io/client-go/pkg/apis/certificates/types.generated.go", "k8s.io/client-go/pkg/apis/certificates/types.go", + "k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9852,15 +9842,16 @@ go_library( "k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/certificates/v1alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/certificates", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -9877,11 +9868,13 @@ go_library( "k8s.io/client-go/pkg/apis/componentconfig/register.go", "k8s.io/client-go/pkg/apis/componentconfig/types.generated.go", "k8s.io/client-go/pkg/apis/componentconfig/types.go", + "k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/util/config", @@ -9908,13 +9901,14 @@ go_library( "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/register.go", "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.defaults.go", ], tags = ["automanaged"], deps = [ "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/apis/componentconfig", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/kubelet/qos", "//vendor:k8s.io/client-go/pkg/kubelet/types", @@ -9933,15 +9927,17 @@ go_library( "k8s.io/client-go/pkg/apis/extensions/register.go", "k8s.io/client-go/pkg/apis/extensions/types.generated.go", "k8s.io/client-go/pkg/apis/extensions/types.go", + "k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/apis/autoscaling", "//vendor:k8s.io/client-go/pkg/apis/batch", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -9973,6 +9969,7 @@ go_library( "k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go", "k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -9982,11 +9979,11 @@ go_library( "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/autoscaling", "//vendor:k8s.io/client-go/pkg/apis/batch", "//vendor:k8s.io/client-go/pkg/apis/extensions", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -10003,12 +10000,14 @@ go_library( "k8s.io/client-go/pkg/apis/imagepolicy/register.go", "k8s.io/client-go/pkg/apis/imagepolicy/types.generated.go", "k8s.io/client-go/pkg/apis/imagepolicy/types.go", + "k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10037,15 +10036,16 @@ go_library( "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/imagepolicy", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -10064,7 +10064,7 @@ go_library( tags = ["automanaged"], deps = [ "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", ], @@ -10095,8 +10095,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", ], @@ -10109,12 +10109,14 @@ go_library( "k8s.io/client-go/pkg/apis/policy/register.go", "k8s.io/client-go/pkg/apis/policy/types.generated.go", "k8s.io/client-go/pkg/apis/policy/types.go", + "k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10142,8 +10144,8 @@ go_library( ], tags = ["automanaged"], deps = [ - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/util/intstr", @@ -10158,11 +10160,13 @@ go_library( "k8s.io/client-go/pkg/apis/rbac/helpers.go", "k8s.io/client-go/pkg/apis/rbac/register.go", "k8s.io/client-go/pkg/apis/rbac/types.go", + "k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/watch/versioned", @@ -10193,14 +10197,15 @@ go_library( "k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.go", "k8s.io/client-go/pkg/apis/rbac/v1alpha1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.defaults.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/rbac", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", @@ -10217,12 +10222,14 @@ go_library( "k8s.io/client-go/pkg/apis/storage/register.go", "k8s.io/client-go/pkg/apis/storage/types.generated.go", "k8s.io/client-go/pkg/apis/storage/types.go", + "k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10251,14 +10258,15 @@ go_library( "k8s.io/client-go/pkg/apis/storage/v1beta1/types.go", "k8s.io/client-go/pkg/apis/storage/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/storage", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", @@ -10306,12 +10314,14 @@ go_library( "k8s.io/client-go/pkg/federation/apis/federation/register.go", "k8s.io/client-go/pkg/federation/apis/federation/types.generated.go", "k8s.io/client-go/pkg/federation/apis/federation/types.go", + "k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", + "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", "//vendor:k8s.io/client-go/pkg/types", @@ -10348,14 +10358,15 @@ go_library( "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.go", "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/federation/apis/federation", "//vendor:k8s.io/client-go/pkg/runtime", @@ -10482,13 +10493,14 @@ go_library( "k8s.io/client-go/pkg/runtime/types.go", "k8s.io/client-go/pkg/runtime/types_proto.go", "k8s.io/client-go/pkg/runtime/unstructured.go", + "k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ "//vendor:github.com/gogo/protobuf/proto", "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/api/meta/metatypes", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/conversion/queryparams", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -10739,7 +10751,7 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", - "//vendor:k8s.io/client-go/pkg/api/unversioned", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/third_party/forked/golang/netutil", "//vendor:k8s.io/client-go/pkg/util/httpstream", "//vendor:k8s.io/client-go/pkg/util/runtime", @@ -10762,6 +10774,7 @@ go_library( deps = [ "//vendor:github.com/go-openapi/spec", "//vendor:github.com/gogo/protobuf/proto", + "//vendor:github.com/golang/glog", "//vendor:github.com/google/gofuzz", "//vendor:k8s.io/client-go/pkg/genericapiserver/openapi/common", ], @@ -10780,7 +10793,7 @@ go_library( "k8s.io/client-go/pkg/util/labels/labels.go", ], tags = ["automanaged"], - deps = ["//vendor:k8s.io/client-go/pkg/api/unversioned"], + deps = ["//vendor:k8s.io/client-go/pkg/apis/meta/v1"], ) go_library( @@ -10840,7 +10853,6 @@ go_library( deps = [ "//vendor:github.com/davecgh/go-spew/spew", "//vendor:github.com/ghodss/yaml", - "//vendor:k8s.io/client-go/discovery", "//vendor:k8s.io/client-go/pkg/third_party/forked/golang/json", "//vendor:k8s.io/client-go/pkg/util/json", ], @@ -11024,9 +11036,9 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/api/validation/path", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/labels", "//vendor:k8s.io/client-go/pkg/runtime", @@ -11072,9 +11084,9 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", "//vendor:k8s.io/client-go/pkg/api/meta", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apimachinery/registered", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/fields", "//vendor:k8s.io/client-go/pkg/labels", "//vendor:k8s.io/client-go/pkg/runtime", @@ -11121,12 +11133,12 @@ go_library( "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/errors", "//vendor:k8s.io/client-go/pkg/api/meta", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/apps/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/certificates/v1alpha1", "//vendor:k8s.io/client-go/pkg/apis/extensions", "//vendor:k8s.io/client-go/pkg/apis/extensions/v1beta1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/policy/v1beta1", "//vendor:k8s.io/client-go/pkg/apis/rbac", "//vendor:k8s.io/client-go/pkg/apis/storage", @@ -11268,8 +11280,8 @@ go_library( "//vendor:github.com/golang/glog", "//vendor:github.com/golang/groupcache/lru", "//vendor:k8s.io/client-go/pkg/api/errors", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/util/clock", "//vendor:k8s.io/client-go/pkg/util/runtime", @@ -11655,6 +11667,7 @@ go_library( "k8s.io/client-go/pkg/apis/apps/v1beta1/types.go", "k8s.io/client-go/pkg/apis/apps/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.defaults.go", ], tags = ["automanaged"], @@ -11663,9 +11676,9 @@ go_library( "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/pkg/api/resource", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/pkg/apis/apps", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime/schema", @@ -11685,6 +11698,7 @@ go_library( "k8s.io/client-go/pkg/apis/policy/v1beta1/types.go", "k8s.io/client-go/pkg/apis/policy/v1beta1/types_swagger_doc_generated.go", "k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go", + "k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go", ], tags = ["automanaged"], deps = [ @@ -11692,8 +11706,8 @@ go_library( "//vendor:github.com/gogo/protobuf/sortkeys", "//vendor:github.com/ugorji/go/codec", "//vendor:k8s.io/client-go/pkg/api", - "//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/v1", + "//vendor:k8s.io/client-go/pkg/apis/meta/v1", "//vendor:k8s.io/client-go/pkg/apis/policy", "//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/runtime", @@ -11741,3 +11755,34 @@ go_library( tags = ["automanaged"], deps = ["//vendor:github.com/gogo/protobuf/proto"], ) + +go_library( + name = "k8s.io/client-go/pkg/apis/meta/v1", + srcs = [ + "k8s.io/client-go/pkg/apis/meta/v1/doc.go", + "k8s.io/client-go/pkg/apis/meta/v1/duration.go", + "k8s.io/client-go/pkg/apis/meta/v1/generated.pb.go", + "k8s.io/client-go/pkg/apis/meta/v1/group_version.go", + "k8s.io/client-go/pkg/apis/meta/v1/helpers.go", + "k8s.io/client-go/pkg/apis/meta/v1/meta.go", + "k8s.io/client-go/pkg/apis/meta/v1/register.go", + "k8s.io/client-go/pkg/apis/meta/v1/time.go", + "k8s.io/client-go/pkg/apis/meta/v1/time_proto.go", + "k8s.io/client-go/pkg/apis/meta/v1/types.go", + "k8s.io/client-go/pkg/apis/meta/v1/types_swagger_doc_generated.go", + "k8s.io/client-go/pkg/apis/meta/v1/well_known_labels.go", + "k8s.io/client-go/pkg/apis/meta/v1/zz_generated.deepcopy.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/go-openapi/spec", + "//vendor:github.com/gogo/protobuf/proto", + "//vendor:github.com/gogo/protobuf/sortkeys", + "//vendor:github.com/google/gofuzz", + "//vendor:k8s.io/client-go/pkg/conversion", + "//vendor:k8s.io/client-go/pkg/genericapiserver/openapi/common", + "//vendor:k8s.io/client-go/pkg/labels", + "//vendor:k8s.io/client-go/pkg/runtime/schema", + "//vendor:k8s.io/client-go/pkg/selection", + ], +) From 17e3d661cf9564f8fa90c00e6547db32b8ce0b33 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 3 Dec 2016 13:58:18 -0500 Subject: [PATCH 7/7] generated: staging update --- .../src/k8s.io/client-go/Godeps/Godeps.json | 2 +- .../_vendor/github.com/spf13/pflag/flag.go | 6 +- .../github.com/spf13/pflag/string_array.go | 3 +- .../github.com/spf13/pflag/string_slice.go | 2 +- .../client-go/discovery/discovery_client.go | 38 +- .../discovery/discovery_client_test.go | 104 +- .../client-go/discovery/fake/discovery.go | 8 +- .../src/k8s.io/client-go/discovery/helper.go | 4 +- .../discovery/helper_blackbox_test.go | 2 +- .../k8s.io/client-go/discovery/restmapper.go | 8 +- .../client-go/discovery/restmapper_test.go | 42 +- .../src/k8s.io/client-go/dynamic/client.go | 10 +- .../k8s.io/client-go/dynamic/client_test.go | 30 +- .../k8s.io/client-go/dynamic/dynamic_util.go | 6 +- .../client-go/dynamic/dynamic_util_test.go | 6 +- staging/src/k8s.io/client-go/pkg/api/OWNERS | 52 +- .../k8s.io/client-go/pkg/api/conversion.go | 20 +- .../k8s.io/client-go/pkg/api/errors/OWNERS | 28 + .../k8s.io/client-go/pkg/api/errors/errors.go | 180 +- .../src/k8s.io/client-go/pkg/api/helpers.go | 12 +- .../k8s.io/client-go/pkg/api/install/OWNERS | 11 + staging/src/k8s.io/client-go/pkg/api/meta.go | 40 +- .../src/k8s.io/client-go/pkg/api/meta/OWNERS | 26 + .../client-go/pkg/api/meta/interfaces.go | 14 +- .../src/k8s.io/client-go/pkg/api/meta/meta.go | 20 +- .../src/k8s.io/client-go/pkg/api/register.go | 15 +- .../k8s.io/client-go/pkg/api/resource/OWNERS | 17 + .../client-go/pkg/api/resource_helpers.go | 6 +- .../k8s.io/client-go/pkg/api/testapi/OWNERS | 21 + .../client-go/pkg/api/types.generated.go | 16581 +++++++-------- staging/src/k8s.io/client-go/pkg/api/types.go | 175 +- .../src/k8s.io/client-go/pkg/api/v1/OWNERS | 41 + .../client-go/pkg/api/v1/generated.pb.go | 1716 +- .../client-go/pkg/api/v1/generated.proto | 81 +- .../src/k8s.io/client-go/pkg/api/v1/meta.go | 34 +- .../k8s.io/client-go/pkg/api/v1/register.go | 11 +- .../client-go/pkg/api/v1/resource_helpers.go | 6 +- .../client-go/pkg/api/v1/types.generated.go | 17495 ++++++++-------- .../src/k8s.io/client-go/pkg/api/v1/types.go | 174 +- .../pkg/api/v1/types_swagger_doc_generated.go | 12 +- .../pkg/api/v1/zz_generated.conversion.go | 44 +- .../pkg/api/v1/zz_generated.deepcopy.go | 3775 ++++ .../pkg/api/zz_generated.deepcopy.go | 3792 ++++ .../src/k8s.io/client-go/pkg/apis/apps/OWNERS | 21 + .../pkg/apis/apps/types.generated.go | 12 +- .../k8s.io/client-go/pkg/apis/apps/types.go | 12 +- .../pkg/apis/apps/v1beta1/conversion.go | 6 +- .../pkg/apis/apps/v1beta1/defaults.go | 4 +- .../pkg/apis/apps/v1beta1/generated.pb.go | 90 +- .../pkg/apis/apps/v1beta1/generated.proto | 6 +- .../pkg/apis/apps/v1beta1/register.go | 8 +- .../pkg/apis/apps/v1beta1/types.generated.go | 14 +- .../client-go/pkg/apis/apps/v1beta1/types.go | 12 +- .../apps/v1beta1/zz_generated.conversion.go | 14 +- .../apps/v1beta1/zz_generated.deepcopy.go | 138 + .../pkg/apis/apps/zz_generated.deepcopy.go | 132 + .../client-go/pkg/apis/authentication/OWNERS | 8 + .../pkg/apis/authentication/register.go | 3 +- .../apis/authentication/types.generated.go | 16 +- .../pkg/apis/authentication/types.go | 4 +- .../authentication/v1beta1/generated.pb.go | 84 +- .../authentication/v1beta1/generated.proto | 2 +- .../apis/authentication/v1beta1/register.go | 8 +- .../authentication/v1beta1/types.generated.go | 6 +- .../pkg/apis/authentication/v1beta1/types.go | 4 +- .../v1beta1/zz_generated.deepcopy.go | 111 + .../authentication/zz_generated.deepcopy.go | 111 + .../client-go/pkg/apis/authorization/OWNERS | 17 + .../pkg/apis/authorization/types.generated.go | 40 +- .../client-go/pkg/apis/authorization/types.go | 8 +- .../authorization/v1beta1/generated.pb.go | 113 +- .../authorization/v1beta1/generated.proto | 2 +- .../apis/authorization/v1beta1/register.go | 8 +- .../authorization/v1beta1/types.generated.go | 6 +- .../pkg/apis/authorization/v1beta1/types.go | 8 +- .../v1beta1/zz_generated.deepcopy.go | 196 + .../authorization/zz_generated.deepcopy.go | 196 + .../client-go/pkg/apis/autoscaling/OWNERS | 20 + .../pkg/apis/autoscaling/types.generated.go | 12 +- .../client-go/pkg/apis/autoscaling/types.go | 12 +- .../pkg/apis/autoscaling/v1/generated.pb.go | 116 +- .../pkg/apis/autoscaling/v1/generated.proto | 6 +- .../pkg/apis/autoscaling/v1/register.go | 8 +- .../apis/autoscaling/v1/types.generated.go | 14 +- .../pkg/apis/autoscaling/v1/types.go | 12 +- .../autoscaling/v1/zz_generated.conversion.go | 6 +- .../autoscaling/v1/zz_generated.deepcopy.go | 186 + .../apis/autoscaling/zz_generated.deepcopy.go | 186 + .../k8s.io/client-go/pkg/apis/batch/OWNERS | 19 + .../pkg/apis/batch/types.generated.go | 36 +- .../k8s.io/client-go/pkg/apis/batch/types.go | 28 +- .../pkg/apis/batch/v1/generated.pb.go | 131 +- .../pkg/apis/batch/v1/generated.proto | 14 +- .../client-go/pkg/apis/batch/v1/register.go | 8 +- .../pkg/apis/batch/v1/types.generated.go | 30 +- .../client-go/pkg/apis/batch/v1/types.go | 18 +- .../apis/batch/v1/zz_generated.conversion.go | 14 +- .../apis/batch/v1/zz_generated.deepcopy.go | 182 + .../pkg/apis/batch/v2alpha1/generated.pb.go | 172 +- .../pkg/apis/batch/v2alpha1/generated.proto | 18 +- .../pkg/apis/batch/v2alpha1/register.go | 5 + .../apis/batch/v2alpha1/types.generated.go | 38 +- .../pkg/apis/batch/v2alpha1/types.go | 28 +- .../batch/v2alpha1/zz_generated.conversion.go | 28 +- .../batch/v2alpha1/zz_generated.deepcopy.go | 307 + .../pkg/apis/batch/zz_generated.deepcopy.go | 307 + .../client-go/pkg/apis/certificates/OWNERS | 14 + .../pkg/apis/certificates/types.generated.go | 12 +- .../client-go/pkg/apis/certificates/types.go | 10 +- .../certificates/v1alpha1/generated.pb.go | 94 +- .../certificates/v1alpha1/generated.proto | 6 +- .../apis/certificates/v1alpha1/register.go | 3 +- .../certificates/v1alpha1/types.generated.go | 14 +- .../pkg/apis/certificates/v1alpha1/types.go | 10 +- .../v1alpha1/zz_generated.deepcopy.go | 145 + .../certificates/zz_generated.deepcopy.go | 145 + .../client-go/pkg/apis/componentconfig/OWNERS | 41 + .../apis/componentconfig/types.generated.go | 3249 +-- .../pkg/apis/componentconfig/types.go | 84 +- .../apis/componentconfig/v1alpha1/defaults.go | 50 +- .../apis/componentconfig/v1alpha1/types.go | 56 +- .../v1alpha1/zz_generated.conversion.go | 2 + .../v1alpha1/zz_generated.deepcopy.go | 521 + .../componentconfig/zz_generated.deepcopy.go | 482 + .../client-go/pkg/apis/extensions/OWNERS | 41 + .../client-go/pkg/apis/extensions/register.go | 3 +- .../pkg/apis/extensions/types.generated.go | 76 +- .../client-go/pkg/apis/extensions/types.go | 80 +- .../pkg/apis/extensions/v1beta1/conversion.go | 8 +- .../pkg/apis/extensions/v1beta1/defaults.go | 10 +- .../apis/extensions/v1beta1/generated.pb.go | 808 +- .../apis/extensions/v1beta1/generated.proto | 63 +- .../pkg/apis/extensions/v1beta1/register.go | 8 +- .../extensions/v1beta1/types.generated.go | 7951 ++++--- .../pkg/apis/extensions/v1beta1/types.go | 109 +- .../v1beta1/types_swagger_doc_generated.go | 12 +- .../v1beta1/zz_generated.conversion.go | 98 +- .../v1beta1/zz_generated.deepcopy.go | 1436 ++ .../apis/extensions/zz_generated.deepcopy.go | 1146 + .../client-go/pkg/apis/imagepolicy/OWNERS | 4 + .../pkg/apis/imagepolicy/register.go | 3 +- .../pkg/apis/imagepolicy/types.generated.go | 16 +- .../client-go/pkg/apis/imagepolicy/types.go | 4 +- .../apis/imagepolicy/v1alpha1/generated.pb.go | 76 +- .../apis/imagepolicy/v1alpha1/generated.proto | 2 +- .../pkg/apis/imagepolicy/v1alpha1/register.go | 8 +- .../imagepolicy/v1alpha1/types.generated.go | 6 +- .../pkg/apis/imagepolicy/v1alpha1/types.go | 4 +- .../v1alpha1/zz_generated.deepcopy.go | 105 + .../apis/imagepolicy/zz_generated.deepcopy.go | 105 + .../k8s.io/client-go/pkg/apis/kubeadm/env.go | 2 + .../client-go/pkg/apis/kubeadm/register.go | 3 +- .../client-go/pkg/apis/kubeadm/types.go | 11 +- .../pkg/apis/kubeadm/v1alpha1/defaults.go | 11 +- .../pkg/apis/kubeadm/v1alpha1/register.go | 3 +- .../pkg/apis/kubeadm/v1alpha1/types.go | 10 +- .../k8s.io/client-go/pkg/apis/meta/v1/OWNERS | 33 + .../{api/unversioned => apis/meta/v1}/doc.go | 3 +- .../unversioned => apis/meta/v1}/duration.go | 2 +- .../meta/v1}/generated.pb.go | 234 +- .../meta/v1}/generated.proto | 8 +- .../meta/v1}/group_version.go | 2 +- .../unversioned => apis/meta/v1}/helpers.go | 2 +- .../{api/unversioned => apis/meta/v1}/meta.go | 2 +- .../unversioned => apis/meta/v1}/register.go | 5 +- .../{api/unversioned => apis/meta/v1}/time.go | 2 +- .../meta/v1}/time_proto.go | 2 +- .../unversioned => apis/meta/v1}/types.go | 6 +- .../meta/v1}/types_swagger_doc_generated.go | 6 +- .../meta/v1}/well_known_labels.go | 2 +- .../pkg/apis/meta/v1/zz_generated.deepcopy.go | 390 + .../k8s.io/client-go/pkg/apis/policy/OWNERS | 14 + .../pkg/apis/policy/types.generated.go | 36 +- .../k8s.io/client-go/pkg/apis/policy/types.go | 16 +- .../pkg/apis/policy/v1alpha1/register.go | 8 +- .../pkg/apis/policy/v1alpha1/types.go | 14 +- .../pkg/apis/policy/v1beta1/generated.pb.go | 112 +- .../pkg/apis/policy/v1beta1/generated.proto | 8 +- .../pkg/apis/policy/v1beta1/register.go | 8 +- .../apis/policy/v1beta1/types.generated.go | 38 +- .../pkg/apis/policy/v1beta1/types.go | 18 +- .../policy/v1beta1/zz_generated.conversion.go | 10 +- .../policy/v1beta1/zz_generated.deepcopy.go | 145 + .../pkg/apis/policy/zz_generated.deepcopy.go | 145 + .../src/k8s.io/client-go/pkg/apis/rbac/OWNERS | 16 + .../k8s.io/client-go/pkg/apis/rbac/helpers.go | 26 + .../client-go/pkg/apis/rbac/register.go | 3 +- .../k8s.io/client-go/pkg/apis/rbac/types.go | 26 +- .../pkg/apis/rbac/v1alpha1/generated.pb.go | 121 +- .../pkg/apis/rbac/v1alpha1/generated.proto | 10 +- .../pkg/apis/rbac/v1alpha1/register.go | 8 +- .../pkg/apis/rbac/v1alpha1/types.generated.go | 22 +- .../client-go/pkg/apis/rbac/v1alpha1/types.go | 26 +- .../rbac/v1alpha1/zz_generated.deepcopy.go | 293 + .../pkg/apis/rbac/zz_generated.deepcopy.go | 297 + .../k8s.io/client-go/pkg/apis/storage/OWNERS | 3 + .../client-go/pkg/apis/storage/register.go | 3 +- .../pkg/apis/storage/types.generated.go | 8 +- .../client-go/pkg/apis/storage/types.go | 8 +- .../pkg/apis/storage/v1beta1/generated.pb.go | 64 +- .../pkg/apis/storage/v1beta1/generated.proto | 4 +- .../pkg/apis/storage/v1beta1/register.go | 8 +- .../apis/storage/v1beta1/types.generated.go | 10 +- .../pkg/apis/storage/v1beta1/types.go | 8 +- .../storage/v1beta1/zz_generated.deepcopy.go | 84 + .../pkg/apis/storage/zz_generated.deepcopy.go | 84 + .../apis/federation/types.generated.go | 16 +- .../pkg/federation/apis/federation/types.go | 12 +- .../apis/federation/v1beta1/generated.pb.go | 108 +- .../apis/federation/v1beta1/generated.proto | 8 +- .../apis/federation/v1beta1/register.go | 3 +- .../federation/v1beta1/types.generated.go | 18 +- .../apis/federation/v1beta1/types.go | 12 +- .../v1beta1/zz_generated.deepcopy.go | 159 + .../apis/federation/zz_generated.deepcopy.go | 200 + .../client-go/pkg/runtime/generated.proto | 2 +- .../src/k8s.io/client-go/pkg/runtime/types.go | 2 +- .../client-go/pkg/runtime/unstructured.go | 14 +- .../pkg/runtime/zz_generated.deepcopy.go | 75 + .../src/k8s.io/client-go/pkg/util/cert/io.go | 23 +- .../pkg/util/httpstream/spdy/roundtripper.go | 11 +- .../client-go/pkg/util/intstr/intstr.go | 15 + .../client-go/pkg/util/labels/labels.go | 12 +- .../src/k8s.io/client-go/pkg/util/net/http.go | 6 + .../k8s.io/client-go/pkg/util/rand/rand.go | 12 +- .../pkg/util/strategicpatch/patch.go | 282 +- .../pkg/util/validation/validation.go | 3 +- .../src/k8s.io/client-go/rest/client_test.go | 28 +- staging/src/k8s.io/client-go/rest/config.go | 4 +- staging/src/k8s.io/client-go/rest/request.go | 22 +- .../src/k8s.io/client-go/rest/request_test.go | 22 +- staging/src/k8s.io/client-go/rest/versions.go | 6 +- staging/src/k8s.io/client-go/testing/fake.go | 10 +- .../src/k8s.io/client-go/testing/fixture.go | 8 +- .../k8s.io/client-go/tools/cache/listers.go | 8 +- .../tools/cache/listers_extensions.go | 8 +- .../client-go/tools/cache/listers_test.go | 14 +- .../client-go/tools/cache/reflector_test.go | 12 +- .../k8s.io/client-go/tools/clientcmd/doc.go | 2 +- .../k8s.io/client-go/tools/record/event.go | 12 +- .../client-go/tools/record/event_test.go | 6 +- .../client-go/tools/record/events_cache.go | 14 +- .../tools/record/events_cache_test.go | 8 +- .../src/k8s.io/client-go/tools/record/fake.go | 4 +- 244 files changed, 41757 insertions(+), 27038 deletions(-) create mode 100755 staging/src/k8s.io/client-go/pkg/api/errors/OWNERS create mode 100755 staging/src/k8s.io/client-go/pkg/api/install/OWNERS create mode 100755 staging/src/k8s.io/client-go/pkg/api/meta/OWNERS create mode 100755 staging/src/k8s.io/client-go/pkg/api/resource/OWNERS create mode 100755 staging/src/k8s.io/client-go/pkg/api/testapi/OWNERS create mode 100755 staging/src/k8s.io/client-go/pkg/api/v1/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/api/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/apps/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/authentication/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/authorization/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/autoscaling/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/batch/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/certificates/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/componentconfig/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/extensions/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/imagepolicy/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/meta/v1/OWNERS rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/doc.go (94%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/duration.go (98%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/generated.pb.go (91%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/generated.proto (99%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/group_version.go (99%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/helpers.go (99%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/meta.go (99%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/register.go (91%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/time.go (99%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/time_proto.go (99%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/types.go (99%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/types_swagger_doc_generated.go (99%) rename staging/src/k8s.io/client-go/pkg/{api/unversioned => apis/meta/v1}/well_known_labels.go (99%) create mode 100644 staging/src/k8s.io/client-go/pkg/apis/meta/v1/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/policy/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/rbac/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go create mode 100755 staging/src/k8s.io/client-go/pkg/apis/storage/OWNERS create mode 100644 staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go diff --git a/staging/src/k8s.io/client-go/Godeps/Godeps.json b/staging/src/k8s.io/client-go/Godeps/Godeps.json index 2f3ea8f061c..9429c7149e9 100644 --- a/staging/src/k8s.io/client-go/Godeps/Godeps.json +++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json @@ -183,7 +183,7 @@ }, { "ImportPath": "github.com/spf13/pflag", - "Rev": "c7e63cf4530bcd3ba943729cee0efeff2ebea63f" + "Rev": "5ccb023bc27df288a957c5e994cd44fd19619465" }, { "ImportPath": "github.com/stretchr/testify/assert", diff --git a/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/flag.go b/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/flag.go index b0b0d46f7ff..fa815642ed0 100644 --- a/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/flag.go +++ b/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/flag.go @@ -416,7 +416,7 @@ func Set(name, value string) error { // otherwise, the default values of all defined flags in the set. func (f *FlagSet) PrintDefaults() { usages := f.FlagUsages() - fmt.Fprintf(f.out(), "%s", usages) + fmt.Fprint(f.out(), usages) } // defaultIsZeroValue returns true if the default value for this flag represents @@ -514,7 +514,7 @@ func (f *FlagSet) FlagUsages() string { if len(flag.NoOptDefVal) > 0 { switch flag.Value.Type() { case "string": - line += fmt.Sprintf("[=%q]", flag.NoOptDefVal) + line += fmt.Sprintf("[=\"%s\"]", flag.NoOptDefVal) case "bool": if flag.NoOptDefVal != "true" { line += fmt.Sprintf("[=%s]", flag.NoOptDefVal) @@ -534,7 +534,7 @@ func (f *FlagSet) FlagUsages() string { line += usage if !flag.defaultIsZeroValue() { if flag.Value.Type() == "string" { - line += fmt.Sprintf(" (default %q)", flag.DefValue) + line += fmt.Sprintf(" (default \"%s\")", flag.DefValue) } else { line += fmt.Sprintf(" (default %s)", flag.DefValue) } diff --git a/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/string_array.go b/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/string_array.go index f320f2ece36..93b4e43290a 100644 --- a/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/string_array.go +++ b/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/string_array.go @@ -2,7 +2,6 @@ package pflag import ( "fmt" - "strings" ) var _ = fmt.Fprint @@ -40,7 +39,7 @@ func (s *stringArrayValue) String() string { } func stringArrayConv(sval string) (interface{}, error) { - sval = strings.Trim(sval, "[]") + sval = sval[1 : len(sval)-1] // An empty string would cause a array with one (empty) string if len(sval) == 0 { return []string{}, nil diff --git a/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/string_slice.go b/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/string_slice.go index 51e3c5d2238..7829cfafb29 100644 --- a/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/string_slice.go +++ b/staging/src/k8s.io/client-go/_vendor/github.com/spf13/pflag/string_slice.go @@ -66,7 +66,7 @@ func (s *stringSliceValue) String() string { } func stringSliceConv(sval string) (interface{}, error) { - sval = strings.Trim(sval, "[]") + sval = sval[1 : len(sval)-1] // An empty string would cause a slice with one (empty) string if len(sval) == 0 { return []string{}, nil diff --git a/staging/src/k8s.io/client-go/discovery/discovery_client.go b/staging/src/k8s.io/client-go/discovery/discovery_client.go index e9438fff830..954b70d7c3a 100644 --- a/staging/src/k8s.io/client-go/discovery/discovery_client.go +++ b/staging/src/k8s.io/client-go/discovery/discovery_client.go @@ -27,8 +27,8 @@ import ( "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/errors" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/serializer" @@ -59,15 +59,15 @@ type CachedDiscoveryInterface interface { type ServerGroupsInterface interface { // ServerGroups returns the supported groups, with information like supported versions and the // preferred version. - ServerGroups() (*unversioned.APIGroupList, error) + ServerGroups() (*metav1.APIGroupList, error) } // ServerResourcesInterface has methods for obtaining supported resources on the API server type ServerResourcesInterface interface { // ServerResourcesForGroupVersion returns the supported resources for a group and version. - ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) + ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) // ServerResources returns the supported resources for all groups and versions. - ServerResources() (map[string]*unversioned.APIResourceList, error) + ServerResources() (map[string]*metav1.APIResourceList, error) // ServerPreferredResources returns the supported resources with the version preferred by the // server. ServerPreferredResources() ([]schema.GroupVersionResource, error) @@ -96,12 +96,12 @@ type DiscoveryClient struct { LegacyPrefix string } -// Convert unversioned.APIVersions to unversioned.APIGroup. APIVersions is used by legacy v1, so +// Convert metav1.APIVersions to metav1.APIGroup. APIVersions is used by legacy v1, so // group would be "". -func apiVersionsToAPIGroup(apiVersions *unversioned.APIVersions) (apiGroup unversioned.APIGroup) { - groupVersions := []unversioned.GroupVersionForDiscovery{} +func apiVersionsToAPIGroup(apiVersions *metav1.APIVersions) (apiGroup metav1.APIGroup) { + groupVersions := []metav1.GroupVersionForDiscovery{} for _, version := range apiVersions.Versions { - groupVersion := unversioned.GroupVersionForDiscovery{ + groupVersion := metav1.GroupVersionForDiscovery{ GroupVersion: version, Version: version, } @@ -115,11 +115,11 @@ func apiVersionsToAPIGroup(apiVersions *unversioned.APIVersions) (apiGroup unver // ServerGroups returns the supported groups, with information like supported versions and the // preferred version. -func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList, err error) { +func (d *DiscoveryClient) ServerGroups() (apiGroupList *metav1.APIGroupList, err error) { // Get the groupVersions exposed at /api - v := &unversioned.APIVersions{} + v := &metav1.APIVersions{} err = d.restClient.Get().AbsPath(d.LegacyPrefix).Do().Into(v) - apiGroup := unversioned.APIGroup{} + apiGroup := metav1.APIGroup{} if err == nil { apiGroup = apiVersionsToAPIGroup(v) } @@ -128,14 +128,14 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList } // Get the groupVersions exposed at /apis - apiGroupList = &unversioned.APIGroupList{} + apiGroupList = &metav1.APIGroupList{} err = d.restClient.Get().AbsPath("/apis").Do().Into(apiGroupList) if err != nil && !errors.IsNotFound(err) && !errors.IsForbidden(err) { return nil, err } // to be compatible with a v1.0 server, if it's a 403 or 404, ignore and return whatever we got from /api if err != nil && (errors.IsNotFound(err) || errors.IsForbidden(err)) { - apiGroupList = &unversioned.APIGroupList{} + apiGroupList = &metav1.APIGroupList{} } // append the group retrieved from /api to the list @@ -144,7 +144,7 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *unversioned.APIGroupList } // ServerResourcesForGroupVersion returns the supported resources for a group and version. -func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (resources *unversioned.APIResourceList, err error) { +func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (resources *metav1.APIResourceList, err error) { url := url.URL{} if len(groupVersion) == 0 { return nil, fmt.Errorf("groupVersion shouldn't be empty") @@ -154,7 +154,7 @@ func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (r } else { url.Path = "/apis/" + groupVersion } - resources = &unversioned.APIResourceList{} + resources = &metav1.APIResourceList{} err = d.restClient.Get().AbsPath(url.String()).Do().Into(resources) if err != nil { // ignore 403 or 404 error to be compatible with an v1.0 server. @@ -167,13 +167,13 @@ func (d *DiscoveryClient) ServerResourcesForGroupVersion(groupVersion string) (r } // ServerResources returns the supported resources for all groups and versions. -func (d *DiscoveryClient) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (d *DiscoveryClient) ServerResources() (map[string]*metav1.APIResourceList, error) { apiGroups, err := d.ServerGroups() if err != nil { return nil, err } - groupVersions := unversioned.ExtractGroupVersions(apiGroups) - result := map[string]*unversioned.APIResourceList{} + groupVersions := metav1.ExtractGroupVersions(apiGroups) + result := map[string]*metav1.APIResourceList{} for _, groupVersion := range groupVersions { resources, err := d.ServerResourcesForGroupVersion(groupVersion) if err != nil { @@ -305,7 +305,7 @@ func (d *DiscoveryClient) SwaggerSchema(version schema.GroupVersion) (*swagger.A if err != nil { return nil, err } - groupVersions := unversioned.ExtractGroupVersions(groupList) + groupVersions := metav1.ExtractGroupVersions(groupList) // This check also takes care the case that kubectl is newer than the running endpoint if stringDoesntExistIn(version.String(), groupVersions) { return nil, fmt.Errorf("API version: %v is not supported by the server. Use one of: %v", version, groupVersions) diff --git a/staging/src/k8s.io/client-go/discovery/discovery_client_test.go b/staging/src/k8s.io/client-go/discovery/discovery_client_test.go index 20e378416ed..d760fab78fd 100644 --- a/staging/src/k8s.io/client-go/discovery/discovery_client_test.go +++ b/staging/src/k8s.io/client-go/discovery/discovery_client_test.go @@ -25,8 +25,8 @@ import ( "github.com/emicklei/go-restful/swagger" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/version" "k8s.io/client-go/rest" @@ -65,7 +65,7 @@ func TestGetServerGroupsWithV1Server(t *testing.T) { var obj interface{} switch req.URL.Path { case "/api": - obj = &unversioned.APIVersions{ + obj = &metav1.APIVersions{ Versions: []string{ "v1", }, @@ -90,7 +90,7 @@ func TestGetServerGroupsWithV1Server(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - groupVersions := unversioned.ExtractGroupVersions(apiGroupList) + groupVersions := metav1.ExtractGroupVersions(apiGroupList) if !reflect.DeepEqual(groupVersions, []string{"v1"}) { t.Errorf("expected: %q, got: %q", []string{"v1"}, groupVersions) } @@ -108,7 +108,7 @@ func TestGetServerGroupsWithBrokenServer(t *testing.T) { if err != nil { t.Fatalf("unexpected error: %v", err) } - groupVersions := unversioned.ExtractGroupVersions(apiGroupList) + groupVersions := metav1.ExtractGroupVersions(apiGroupList) if len(groupVersions) != 0 { t.Errorf("expected empty list, got: %q", groupVersions) } @@ -120,7 +120,7 @@ func TestGetServerResourcesWithV1Server(t *testing.T) { var obj interface{} switch req.URL.Path { case "/api": - obj = &unversioned.APIVersions{ + obj = &metav1.APIVersions{ Versions: []string{ "v1", }, @@ -152,24 +152,24 @@ func TestGetServerResourcesWithV1Server(t *testing.T) { } func TestGetServerResources(t *testing.T) { - stable := unversioned.APIResourceList{ + stable := metav1.APIResourceList{ GroupVersion: "v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "services", Namespaced: true, Kind: "Service"}, {Name: "namespaces", Namespaced: false, Kind: "Namespace"}, }, } - beta := unversioned.APIResourceList{ + beta := metav1.APIResourceList{ GroupVersion: "extensions/v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "deployments", Namespaced: true, Kind: "Deployment"}, {Name: "ingresses", Namespaced: true, Kind: "Ingress"}, {Name: "jobs", Namespaced: true, Kind: "Job"}, }, } tests := []struct { - resourcesList *unversioned.APIResourceList + resourcesList *metav1.APIResourceList path string request string expectErr bool @@ -201,16 +201,16 @@ func TestGetServerResources(t *testing.T) { case "/apis/extensions/v1beta1": list = &beta case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, } case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, }, @@ -267,7 +267,7 @@ func swaggerSchemaFakeServer() (*httptest.Server, error) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { var resp interface{} if request == 1 { - resp = unversioned.APIVersions{Versions: []string{"v1", "v2", "v3"}} + resp = metav1.APIVersions{Versions: []string{"v1", "v2", "v3"}} request++ } else { resp = swagger.ApiDeclaration{} @@ -323,16 +323,16 @@ func TestGetSwaggerSchemaFail(t *testing.T) { } func TestServerPreferredResources(t *testing.T) { - stable := unversioned.APIResourceList{ + stable := metav1.APIResourceList{ GroupVersion: "v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "services", Namespaced: true, Kind: "Service"}, {Name: "namespaces", Namespaced: false, Kind: "Namespace"}, }, } tests := []struct { - resourcesList *unversioned.APIResourceList + resourcesList *metav1.APIResourceList response func(w http.ResponseWriter, req *http.Request) expectErr func(err error) bool }{ @@ -348,16 +348,16 @@ func TestServerPreferredResources(t *testing.T) { case "/api/v1": list = &stable case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, } case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, }, @@ -390,16 +390,16 @@ func TestServerPreferredResources(t *testing.T) { case "/api/v1": w.WriteHeader(http.StatusInternalServerError) case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, } case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, }, @@ -446,15 +446,15 @@ func TestServerPreferredResources(t *testing.T) { } func TestServerPreferredResourcesRetries(t *testing.T) { - stable := unversioned.APIResourceList{ + stable := metav1.APIResourceList{ GroupVersion: "v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "pods", Namespaced: true, Kind: "Pod"}, }, } - beta := unversioned.APIResourceList{ + beta := metav1.APIResourceList{ GroupVersion: "extensions/v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "deployments", Namespaced: true, Kind: "Deployment"}, }, } @@ -474,20 +474,20 @@ func TestServerPreferredResourcesRetries(t *testing.T) { case "/api/v1": list = &stable case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, } case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "extensions", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "extensions/v1beta1"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{ + PreferredVersion: metav1.GroupVersionForDiscovery{ GroupVersion: "extensions/v1beta1", Version: "v1beta1", }, @@ -545,30 +545,30 @@ func TestServerPreferredResourcesRetries(t *testing.T) { } func TestServerPreferredNamespacedResources(t *testing.T) { - stable := unversioned.APIResourceList{ + stable := metav1.APIResourceList{ GroupVersion: "v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "pods", Namespaced: true, Kind: "Pod"}, {Name: "services", Namespaced: true, Kind: "Service"}, {Name: "namespaces", Namespaced: false, Kind: "Namespace"}, }, } - batchv1 := unversioned.APIResourceList{ + batchv1 := metav1.APIResourceList{ GroupVersion: "batch/v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "jobs", Namespaced: true, Kind: "Job"}, }, } - batchv2alpha1 := unversioned.APIResourceList{ + batchv2alpha1 := metav1.APIResourceList{ GroupVersion: "batch/v2alpha1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "jobs", Namespaced: true, Kind: "Job"}, {Name: "cronjobs", Namespaced: true, Kind: "CronJob"}, }, } - batchv3alpha1 := unversioned.APIResourceList{ + batchv3alpha1 := metav1.APIResourceList{ GroupVersion: "batch/v3alpha1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ {Name: "jobs", Namespaced: true, Kind: "Job"}, {Name: "cronjobs", Namespaced: true, Kind: "CronJob"}, }, @@ -584,7 +584,7 @@ func TestServerPreferredNamespacedResources(t *testing.T) { case "/api/v1": list = &stable case "/api": - list = &unversioned.APIVersions{ + list = &metav1.APIVersions{ Versions: []string{ "v1", }, @@ -613,16 +613,16 @@ func TestServerPreferredNamespacedResources(t *testing.T) { var list interface{} switch req.URL.Path { case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "batch", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "batch/v1", Version: "v1"}, {GroupVersion: "batch/v2alpha1", Version: "v2alpha1"}, {GroupVersion: "batch/v3alpha1", Version: "v3alpha1"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{GroupVersion: "batch/v1", Version: "v1"}, + PreferredVersion: metav1.GroupVersionForDiscovery{GroupVersion: "batch/v1", Version: "v1"}, }, }, } @@ -656,16 +656,16 @@ func TestServerPreferredNamespacedResources(t *testing.T) { var list interface{} switch req.URL.Path { case "/apis": - list = &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + list = &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "batch", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {GroupVersion: "batch/v1", Version: "v1"}, {GroupVersion: "batch/v2alpha1", Version: "v2alpha1"}, {GroupVersion: "batch/v3alpha1", Version: "v3alpha1"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{GroupVersion: "batch/v2alpha", Version: "v2alpha1"}, + PreferredVersion: metav1.GroupVersionForDiscovery{GroupVersion: "batch/v2alpha", Version: "v2alpha1"}, }, }, } diff --git a/staging/src/k8s.io/client-go/discovery/fake/discovery.go b/staging/src/k8s.io/client-go/discovery/fake/discovery.go index 42dd7512ebb..5415a8e3d6c 100644 --- a/staging/src/k8s.io/client-go/discovery/fake/discovery.go +++ b/staging/src/k8s.io/client-go/discovery/fake/discovery.go @@ -18,8 +18,8 @@ package fake import ( "github.com/emicklei/go-restful/swagger" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/version" "k8s.io/client-go/rest" @@ -30,7 +30,7 @@ type FakeDiscovery struct { *testing.Fake } -func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { +func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { action := testing.ActionImpl{ Verb: "get", Resource: schema.GroupVersionResource{Resource: "resource"}, @@ -39,7 +39,7 @@ func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*un return c.Resources[groupVersion], nil } -func (c *FakeDiscovery) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (c *FakeDiscovery) ServerResources() (map[string]*metav1.APIResourceList, error) { action := testing.ActionImpl{ Verb: "get", Resource: schema.GroupVersionResource{Resource: "resource"}, @@ -56,7 +56,7 @@ func (c *FakeDiscovery) ServerPreferredNamespacedResources() ([]schema.GroupVers return nil, nil } -func (c *FakeDiscovery) ServerGroups() (*unversioned.APIGroupList, error) { +func (c *FakeDiscovery) ServerGroups() (*metav1.APIGroupList, error) { return nil, nil } diff --git a/staging/src/k8s.io/client-go/discovery/helper.go b/staging/src/k8s.io/client-go/discovery/helper.go index 41359d09e6f..3c1dc6d394a 100644 --- a/staging/src/k8s.io/client-go/discovery/helper.go +++ b/staging/src/k8s.io/client-go/discovery/helper.go @@ -19,7 +19,7 @@ package discovery import ( "fmt" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/util/sets" "k8s.io/client-go/pkg/version" @@ -61,7 +61,7 @@ func NegotiateVersion(client DiscoveryInterface, requiredGV *schema.GroupVersion // not a negotiation specific error. return nil, err } - versions := unversioned.ExtractGroupVersions(groups) + versions := metav1.ExtractGroupVersions(groups) serverVersions := sets.String{} for _, v := range versions { serverVersions.Insert(v) diff --git a/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go b/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go index 5faac7521ec..7f27bc34d3f 100644 --- a/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go +++ b/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/testapi" - uapi "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/apimachinery/registered" + uapi "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/rest" diff --git a/staging/src/k8s.io/client-go/discovery/restmapper.go b/staging/src/k8s.io/client-go/discovery/restmapper.go index 7d86348ee53..9c6f7f09e40 100644 --- a/staging/src/k8s.io/client-go/discovery/restmapper.go +++ b/staging/src/k8s.io/client-go/discovery/restmapper.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/pkg/api/errors" "k8s.io/client-go/pkg/api/meta" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime/schema" "github.com/golang/glog" @@ -31,10 +31,10 @@ import ( // APIGroupResources is an API group with a mapping of versions to // resources. type APIGroupResources struct { - Group unversioned.APIGroup + Group metav1.APIGroup // A mapping of version string to a slice of APIResources for // that version. - VersionedResources map[string][]unversioned.APIResource + VersionedResources map[string][]metav1.APIResource } // NewRESTMapper returns a PriorityRESTMapper based on the discovered @@ -121,7 +121,7 @@ func GetAPIGroupResources(cl DiscoveryInterface) ([]*APIGroupResources, error) { for _, group := range apiGroups.Groups { groupResources := &APIGroupResources{ Group: group, - VersionedResources: make(map[string][]unversioned.APIResource), + VersionedResources: make(map[string][]metav1.APIResource), } for _, version := range group.Versions { resources, err := cl.ServerResourcesForGroupVersion(version.GroupVersion) diff --git a/staging/src/k8s.io/client-go/discovery/restmapper_test.go b/staging/src/k8s.io/client-go/discovery/restmapper_test.go index 8d56b25fc2f..63029da4469 100644 --- a/staging/src/k8s.io/client-go/discovery/restmapper_test.go +++ b/staging/src/k8s.io/client-go/discovery/restmapper_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/client-go/pkg/api/errors" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/apimachinery/registered" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/version" "k8s.io/client-go/rest" @@ -35,14 +35,14 @@ import ( func TestRESTMapper(t *testing.T) { resources := []*APIGroupResources{ { - Group: unversioned.APIGroup{ - Versions: []unversioned.GroupVersionForDiscovery{ + Group: metav1.APIGroup{ + Versions: []metav1.GroupVersionForDiscovery{ {Version: "v1"}, {Version: "v2"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{Version: "v1"}, + PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1"}, }, - VersionedResources: map[string][]unversioned.APIResource{ + VersionedResources: map[string][]metav1.APIResource{ "v1": { {Name: "pods", Namespaced: true, Kind: "Pod"}, }, @@ -52,14 +52,14 @@ func TestRESTMapper(t *testing.T) { }, }, { - Group: unversioned.APIGroup{ + Group: metav1.APIGroup{ Name: "extensions", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ {Version: "v1beta"}, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{Version: "v1beta"}, + PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1beta"}, }, - VersionedResources: map[string][]unversioned.APIResource{ + VersionedResources: map[string][]metav1.APIResource{ "v1beta": { {Name: "jobs", Namespaced: true, Kind: "Job"}, }, @@ -250,19 +250,19 @@ func (c *fakeCachedDiscoveryInterface) RESTClient() rest.Interface { return &fake.RESTClient{} } -func (c *fakeCachedDiscoveryInterface) ServerGroups() (*unversioned.APIGroupList, error) { +func (c *fakeCachedDiscoveryInterface) ServerGroups() (*metav1.APIGroupList, error) { if c.enabledA { - return &unversioned.APIGroupList{ - Groups: []unversioned.APIGroup{ + return &metav1.APIGroupList{ + Groups: []metav1.APIGroup{ { Name: "a", - Versions: []unversioned.GroupVersionForDiscovery{ + Versions: []metav1.GroupVersionForDiscovery{ { GroupVersion: "a/v1", Version: "v1", }, }, - PreferredVersion: unversioned.GroupVersionForDiscovery{ + PreferredVersion: metav1.GroupVersionForDiscovery{ GroupVersion: "a/v1", Version: "v1", }, @@ -270,14 +270,14 @@ func (c *fakeCachedDiscoveryInterface) ServerGroups() (*unversioned.APIGroupList }, }, nil } - return &unversioned.APIGroupList{}, nil + return &metav1.APIGroupList{}, nil } -func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { +func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { if c.enabledA && groupVersion == "a/v1" { - return &unversioned.APIResourceList{ + return &metav1.APIResourceList{ GroupVersion: "a/v1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ { Name: "foo", Kind: "Foo", @@ -290,14 +290,14 @@ func (c *fakeCachedDiscoveryInterface) ServerResourcesForGroupVersion(groupVersi return nil, errors.NewNotFound(schema.GroupResource{}, "") } -func (c *fakeCachedDiscoveryInterface) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (c *fakeCachedDiscoveryInterface) ServerResources() (map[string]*metav1.APIResourceList, error) { if c.enabledA { av1, _ := c.ServerResourcesForGroupVersion("a/v1") - return map[string]*unversioned.APIResourceList{ + return map[string]*metav1.APIResourceList{ "a/v1": av1, }, nil } - return map[string]*unversioned.APIResourceList{}, nil + return map[string]*metav1.APIResourceList{}, nil } func (c *fakeCachedDiscoveryInterface) ServerPreferredResources() ([]schema.GroupVersionResource, error) { diff --git a/staging/src/k8s.io/client-go/dynamic/client.go b/staging/src/k8s.io/client-go/dynamic/client.go index 94eb03ffe8f..4184371c5ef 100644 --- a/staging/src/k8s.io/client-go/dynamic/client.go +++ b/staging/src/k8s.io/client-go/dynamic/client.go @@ -27,8 +27,8 @@ import ( "strings" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/conversion/queryparams" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" @@ -83,7 +83,7 @@ func (c *Client) GetRateLimiter() flowcontrol.RateLimiter { // Resource returns an API interface to the specified resource for this client's // group and version. If resource is not a namespaced resource, then namespace // is ignored. The ResourceClient inherits the parameter codec of c. -func (c *Client) Resource(resource *unversioned.APIResource, namespace string) *ResourceClient { +func (c *Client) Resource(resource *metav1.APIResource, namespace string) *ResourceClient { return &ResourceClient{ cl: c.cl, resource: resource, @@ -104,7 +104,7 @@ func (c *Client) ParameterCodec(parameterCodec runtime.ParameterCodec) *Client { // dynamic client. type ResourceClient struct { cl *rest.RESTClient - resource *unversioned.APIResource + resource *metav1.APIResource ns string parameterCodec runtime.ParameterCodec } @@ -225,8 +225,8 @@ func (dynamicCodec) Decode(data []byte, gvk *schema.GroupVersionKind, obj runtim return nil, nil, err } - if _, ok := obj.(*unversioned.Status); !ok && strings.ToLower(gvk.Kind) == "status" { - obj = &unversioned.Status{} + if _, ok := obj.(*metav1.Status); !ok && strings.ToLower(gvk.Kind) == "status" { + obj = &metav1.Status{} err := json.Unmarshal(data, obj) if err != nil { return nil, nil, err diff --git a/staging/src/k8s.io/client-go/dynamic/client_test.go b/staging/src/k8s.io/client-go/dynamic/client_test.go index 7d6338c417b..490d8f4f8cd 100644 --- a/staging/src/k8s.io/client-go/dynamic/client_test.go +++ b/staging/src/k8s.io/client-go/dynamic/client_test.go @@ -26,8 +26,8 @@ import ( "testing" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/serializer/streaming" @@ -117,7 +117,7 @@ func TestList(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "GET" { t.Errorf("List(%q) got HTTP method %s. wanted GET", tc.name, r.Method) @@ -172,7 +172,7 @@ func TestGet(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "GET" { t.Errorf("Get(%q) got HTTP method %s. wanted GET", tc.name, r.Method) @@ -204,9 +204,9 @@ func TestGet(t *testing.T) { } func TestDelete(t *testing.T) { - statusOK := &unversioned.Status{ - TypeMeta: unversioned.TypeMeta{Kind: "Status"}, - Status: unversioned.StatusSuccess, + statusOK := &metav1.Status{ + TypeMeta: metav1.TypeMeta{Kind: "Status"}, + Status: metav1.StatusSuccess, } tcs := []struct { namespace string @@ -225,7 +225,7 @@ func TestDelete(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "DELETE" { t.Errorf("Delete(%q) got HTTP method %s. wanted DELETE", tc.name, r.Method) @@ -253,9 +253,9 @@ func TestDelete(t *testing.T) { } func TestDeleteCollection(t *testing.T) { - statusOK := &unversioned.Status{ - TypeMeta: unversioned.TypeMeta{Kind: "Status"}, - Status: unversioned.StatusSuccess, + statusOK := &metav1.Status{ + TypeMeta: metav1.TypeMeta{Kind: "Status"}, + Status: metav1.StatusSuccess, } tcs := []struct { namespace string @@ -274,7 +274,7 @@ func TestDeleteCollection(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "DELETE" { t.Errorf("DeleteCollection(%q) got HTTP method %s. wanted DELETE", tc.name, r.Method) @@ -322,7 +322,7 @@ func TestCreate(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "POST" { t.Errorf("Create(%q) got HTTP method %s. wanted POST", tc.name, r.Method) @@ -381,7 +381,7 @@ func TestUpdate(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "PUT" { t.Errorf("Update(%q) got HTTP method %s. wanted PUT", tc.name, r.Method) @@ -448,7 +448,7 @@ func TestWatch(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "GET" { t.Errorf("Watch(%q) got HTTP method %s. wanted GET", tc.name, r.Method) @@ -508,7 +508,7 @@ func TestPatch(t *testing.T) { } for _, tc := range tcs { gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"} - resource := &unversioned.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} + resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0} cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) { if r.Method != "PATCH" { t.Errorf("Patch(%q) got HTTP method %s. wanted PATCH", tc.name, r.Method) diff --git a/staging/src/k8s.io/client-go/dynamic/dynamic_util.go b/staging/src/k8s.io/client-go/dynamic/dynamic_util.go index 314102baf08..779ebc280a8 100644 --- a/staging/src/k8s.io/client-go/dynamic/dynamic_util.go +++ b/staging/src/k8s.io/client-go/dynamic/dynamic_util.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/client-go/pkg/api/meta" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" ) @@ -35,7 +35,7 @@ func VersionInterfaces(schema.GroupVersion) (*meta.VersionInterfaces, error) { } // NewDiscoveryRESTMapper returns a RESTMapper based on discovery information. -func NewDiscoveryRESTMapper(resources []*unversioned.APIResourceList, versionFunc meta.VersionInterfacesFunc) (*meta.DefaultRESTMapper, error) { +func NewDiscoveryRESTMapper(resources []*metav1.APIResourceList, versionFunc meta.VersionInterfacesFunc) (*meta.DefaultRESTMapper, error) { rm := meta.NewDefaultRESTMapper(nil, versionFunc) for _, resourceList := range resources { gv, err := schema.ParseGroupVersion(resourceList.GroupVersion) @@ -62,7 +62,7 @@ type ObjectTyper struct { } // NewObjectTyper constructs an ObjectTyper from discovery information. -func NewObjectTyper(resources []*unversioned.APIResourceList) (runtime.ObjectTyper, error) { +func NewObjectTyper(resources []*metav1.APIResourceList) (runtime.ObjectTyper, error) { ot := &ObjectTyper{registered: make(map[schema.GroupVersionKind]bool)} for _, resourceList := range resources { gv, err := schema.ParseGroupVersion(resourceList.GroupVersion) diff --git a/staging/src/k8s.io/client-go/dynamic/dynamic_util_test.go b/staging/src/k8s.io/client-go/dynamic/dynamic_util_test.go index d8b9999b9bf..bf503bcc74f 100644 --- a/staging/src/k8s.io/client-go/dynamic/dynamic_util_test.go +++ b/staging/src/k8s.io/client-go/dynamic/dynamic_util_test.go @@ -19,15 +19,15 @@ package dynamic import ( "testing" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime/schema" ) func TestDiscoveryRESTMapper(t *testing.T) { - resources := []*unversioned.APIResourceList{ + resources := []*metav1.APIResourceList{ { GroupVersion: "test/beta1", - APIResources: []unversioned.APIResource{ + APIResources: []metav1.APIResource{ { Name: "test_kinds", Namespaced: true, diff --git a/staging/src/k8s.io/client-go/pkg/api/OWNERS b/staging/src/k8s.io/client-go/pkg/api/OWNERS index d28472e0fd9..569ba5b5d93 100644 --- a/staging/src/k8s.io/client-go/pkg/api/OWNERS +++ b/staging/src/k8s.io/client-go/pkg/api/OWNERS @@ -1,6 +1,46 @@ -assignees: - - bgrant0607 - - erictune - - lavalamp - - smarterclayton - - thockin +approvers: +- bgrant0607 +- erictune +- lavalamp +- smarterclayton +- thockin +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- bgrant0607 +- deads2k +- yujuhong +- brendandburns +- derekwaynecarr +- caesarxuchao +- vishh +- mikedanese +- liggitt +- nikhiljindal +- bprashanth +- gmarek +- erictune +- davidopp +- pmorie +- sttts +- kargakis +- dchen1107 +- saad-ali +- zmerlynn +- luxas +- janetkuo +- justinsb +- pwittrock +- roberthbailey +- ncdc +- timstclair +- yifan-gu +- eparis +- mwielgus +- timothysc +- soltysh +- piosz +- jsafrane +- jbeda diff --git a/staging/src/k8s.io/client-go/pkg/api/conversion.go b/staging/src/k8s.io/client-go/pkg/api/conversion.go index 3ff0a158254..849076ef6eb 100644 --- a/staging/src/k8s.io/client-go/pkg/api/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/api/conversion.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/client-go/pkg/api/resource" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/fields" "k8s.io/client-go/pkg/labels" @@ -32,7 +32,7 @@ import ( func addConversionFuncs(scheme *runtime.Scheme) error { return scheme.AddConversionFuncs( - Convert_unversioned_TypeMeta_To_unversioned_TypeMeta, + Convert_v1_TypeMeta_To_v1_TypeMeta, Convert_unversioned_ListMeta_To_unversioned_ListMeta, @@ -154,7 +154,7 @@ func Convert_bool_To_Pointer_bool(in *bool, out **bool, s conversion.Scope) erro } // +k8s:conversion-fn=drop -func Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(in, out *unversioned.TypeMeta, s conversion.Scope) error { +func Convert_v1_TypeMeta_To_v1_TypeMeta(in, out *metav1.TypeMeta, s conversion.Scope) error { // These values are explicitly not copied //out.APIVersion = in.APIVersion //out.Kind = in.Kind @@ -162,7 +162,7 @@ func Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(in, out *unversioned.T } // +k8s:conversion-fn=copy-only -func Convert_unversioned_ListMeta_To_unversioned_ListMeta(in, out *unversioned.ListMeta, s conversion.Scope) error { +func Convert_unversioned_ListMeta_To_unversioned_ListMeta(in, out *metav1.ListMeta, s conversion.Scope) error { *out = *in return nil } @@ -174,14 +174,14 @@ func Convert_intstr_IntOrString_To_intstr_IntOrString(in, out *intstr.IntOrStrin } // +k8s:conversion-fn=copy-only -func Convert_unversioned_Time_To_unversioned_Time(in *unversioned.Time, out *unversioned.Time, s conversion.Scope) error { +func Convert_unversioned_Time_To_unversioned_Time(in *metav1.Time, out *metav1.Time, s conversion.Scope) error { // Cannot deep copy these, because time.Time has unexported fields. *out = *in return nil } // Convert_Slice_string_To_unversioned_Time allows converting a URL query parameter value -func Convert_Slice_string_To_unversioned_Time(input *[]string, out *unversioned.Time, s conversion.Scope) error { +func Convert_Slice_string_To_unversioned_Time(input *[]string, out *metav1.Time, s conversion.Scope) error { str := "" if len(*input) > 0 { str = (*input)[0] @@ -229,20 +229,20 @@ func Convert_resource_Quantity_To_resource_Quantity(in *resource.Quantity, out * return nil } -func Convert_map_to_unversioned_LabelSelector(in *map[string]string, out *unversioned.LabelSelector, s conversion.Scope) error { +func Convert_map_to_unversioned_LabelSelector(in *map[string]string, out *metav1.LabelSelector, s conversion.Scope) error { if in == nil { return nil } - out = new(unversioned.LabelSelector) + out = new(metav1.LabelSelector) for labelKey, labelValue := range *in { utillabels.AddLabelToSelector(out, labelKey, labelValue) } return nil } -func Convert_unversioned_LabelSelector_to_map(in *unversioned.LabelSelector, out *map[string]string, s conversion.Scope) error { +func Convert_unversioned_LabelSelector_to_map(in *metav1.LabelSelector, out *map[string]string, s conversion.Scope) error { var err error - *out, err = unversioned.LabelSelectorAsMap(in) + *out, err = metav1.LabelSelectorAsMap(in) if err != nil { err = field.Invalid(field.NewPath("labelSelector"), *in, fmt.Sprintf("cannot convert to old selector: %v", err)) } diff --git a/staging/src/k8s.io/client-go/pkg/api/errors/OWNERS b/staging/src/k8s.io/client-go/pkg/api/errors/OWNERS new file mode 100755 index 00000000000..155e203d6cf --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/api/errors/OWNERS @@ -0,0 +1,28 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- bgrant0607 +- deads2k +- brendandburns +- derekwaynecarr +- caesarxuchao +- mikedanese +- liggitt +- nikhiljindal +- gmarek +- erictune +- saad-ali +- janetkuo +- timstclair +- eparis +- timothysc +- dims +- spxtr +- hongchaodeng +- krousey +- satnam6502 +- cjcullen +- david-mcmahon +- goltermann diff --git a/staging/src/k8s.io/client-go/pkg/api/errors/errors.go b/staging/src/k8s.io/client-go/pkg/api/errors/errors.go index 9d3ba62a90e..815e180464a 100644 --- a/staging/src/k8s.io/client-go/pkg/api/errors/errors.go +++ b/staging/src/k8s.io/client-go/pkg/api/errors/errors.go @@ -22,7 +22,7 @@ import ( "net/http" "strings" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/util/validation/field" @@ -41,13 +41,13 @@ const ( // StatusError is an error intended for consumption by a REST API server; it can also be // reconstructed by clients from a REST response. Public to allow easy type switches. type StatusError struct { - ErrStatus unversioned.Status + ErrStatus metav1.Status } // APIStatus is exposed by errors that can be converted to an api.Status object // for finer grained details. type APIStatus interface { - Status() unversioned.Status + Status() metav1.Status } var _ error = &StatusError{} @@ -59,7 +59,7 @@ func (e *StatusError) Error() string { // Status allows access to e's status without having to know the detailed workings // of StatusError. Used by pkg/apiserver. -func (e *StatusError) Status() unversioned.Status { +func (e *StatusError) Status() metav1.Status { return e.ErrStatus } @@ -81,11 +81,11 @@ func (u *UnexpectedObjectError) Error() string { return fmt.Sprintf("unexpected object: %v", u.Object) } -// FromObject generates an StatusError from an unversioned.Status, if that is the type of obj; otherwise, +// FromObject generates an StatusError from an metav1.Status, if that is the type of obj; otherwise, // returns an UnexpecteObjectError. func FromObject(obj runtime.Object) error { switch t := obj.(type) { - case *unversioned.Status: + case *metav1.Status: return &StatusError{*t} } return &UnexpectedObjectError{obj} @@ -93,11 +93,11 @@ func FromObject(obj runtime.Object) error { // NewNotFound returns a new error which indicates that the resource of the kind and the name was not found. func NewNotFound(qualifiedResource schema.GroupResource, name string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusNotFound, - Reason: unversioned.StatusReasonNotFound, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonNotFound, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -108,11 +108,11 @@ func NewNotFound(qualifiedResource schema.GroupResource, name string) *StatusErr // NewAlreadyExists returns an error indicating the item requested exists by that identifier. func NewAlreadyExists(qualifiedResource schema.GroupResource, name string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusConflict, - Reason: unversioned.StatusReasonAlreadyExists, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonAlreadyExists, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -128,21 +128,21 @@ func NewUnauthorized(reason string) *StatusError { if len(message) == 0 { message = "not authorized" } - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusUnauthorized, - Reason: unversioned.StatusReasonUnauthorized, + Reason: metav1.StatusReasonUnauthorized, Message: message, }} } // NewForbidden returns an error indicating the requested action was forbidden func NewForbidden(qualifiedResource schema.GroupResource, name string, err error) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusForbidden, - Reason: unversioned.StatusReasonForbidden, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonForbidden, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -153,11 +153,11 @@ func NewForbidden(qualifiedResource schema.GroupResource, name string, err error // NewConflict returns an error indicating the item can't be updated as provided. func NewConflict(qualifiedResource schema.GroupResource, name string, err error) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusConflict, - Reason: unversioned.StatusReasonConflict, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonConflict, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -168,30 +168,30 @@ func NewConflict(qualifiedResource schema.GroupResource, name string, err error) // NewGone returns an error indicating the item no longer available at the server and no forwarding address is known. func NewGone(message string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusGone, - Reason: unversioned.StatusReasonGone, + Reason: metav1.StatusReasonGone, Message: message, }} } // NewInvalid returns an error indicating the item is invalid and cannot be processed. func NewInvalid(qualifiedKind schema.GroupKind, name string, errs field.ErrorList) *StatusError { - causes := make([]unversioned.StatusCause, 0, len(errs)) + causes := make([]metav1.StatusCause, 0, len(errs)) for i := range errs { err := errs[i] - causes = append(causes, unversioned.StatusCause{ - Type: unversioned.CauseType(err.Type), + causes = append(causes, metav1.StatusCause{ + Type: metav1.CauseType(err.Type), Message: err.ErrorBody(), Field: err.Field, }) } - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: StatusUnprocessableEntity, // RFC 4918: StatusUnprocessableEntity - Reason: unversioned.StatusReasonInvalid, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonInvalid, + Details: &metav1.StatusDetails{ Group: qualifiedKind.Group, Kind: qualifiedKind.Kind, Name: name, @@ -203,31 +203,31 @@ func NewInvalid(qualifiedKind schema.GroupKind, name string, errs field.ErrorLis // NewBadRequest creates an error that indicates that the request is invalid and can not be processed. func NewBadRequest(reason string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusBadRequest, - Reason: unversioned.StatusReasonBadRequest, + Reason: metav1.StatusReasonBadRequest, Message: reason, }} } // NewServiceUnavailable creates an error that indicates that the requested service is unavailable. func NewServiceUnavailable(reason string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusServiceUnavailable, - Reason: unversioned.StatusReasonServiceUnavailable, + Reason: metav1.StatusReasonServiceUnavailable, Message: reason, }} } // NewMethodNotSupported returns an error indicating the requested action is not supported on this kind. func NewMethodNotSupported(qualifiedResource schema.GroupResource, action string) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusMethodNotAllowed, - Reason: unversioned.StatusReasonMethodNotAllowed, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonMethodNotAllowed, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, }, @@ -238,11 +238,11 @@ func NewMethodNotSupported(qualifiedResource schema.GroupResource, action string // NewServerTimeout returns an error indicating the requested action could not be completed due to a // transient error, and the client should try again. func NewServerTimeout(qualifiedResource schema.GroupResource, operation string, retryAfterSeconds int) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusInternalServerError, - Reason: unversioned.StatusReasonServerTimeout, - Details: &unversioned.StatusDetails{ + Reason: metav1.StatusReasonServerTimeout, + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: operation, @@ -260,12 +260,12 @@ func NewServerTimeoutForKind(qualifiedKind schema.GroupKind, operation string, r // NewInternalError returns an error indicating the item is invalid and cannot be processed. func NewInternalError(err error) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: http.StatusInternalServerError, - Reason: unversioned.StatusReasonInternalError, - Details: &unversioned.StatusDetails{ - Causes: []unversioned.StatusCause{{Message: err.Error()}}, + Reason: metav1.StatusReasonInternalError, + Details: &metav1.StatusDetails{ + Causes: []metav1.StatusCause{{Message: err.Error()}}, }, Message: fmt.Sprintf("Internal error occurred: %v", err), }} @@ -274,12 +274,12 @@ func NewInternalError(err error) *StatusError { // NewTimeoutError returns an error indicating that a timeout occurred before the request // could be completed. Clients may retry, but the operation may still complete. func NewTimeoutError(message string, retryAfterSeconds int) *StatusError { - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: StatusServerTimeout, - Reason: unversioned.StatusReasonTimeout, + Reason: metav1.StatusReasonTimeout, Message: fmt.Sprintf("Timeout: %s", message), - Details: &unversioned.StatusDetails{ + Details: &metav1.StatusDetails{ RetryAfterSeconds: int32(retryAfterSeconds), }, }} @@ -287,43 +287,43 @@ func NewTimeoutError(message string, retryAfterSeconds int) *StatusError { // NewGenericServerResponse returns a new error for server responses that are not in a recognizable form. func NewGenericServerResponse(code int, verb string, qualifiedResource schema.GroupResource, name, serverMessage string, retryAfterSeconds int, isUnexpectedResponse bool) *StatusError { - reason := unversioned.StatusReasonUnknown + reason := metav1.StatusReasonUnknown message := fmt.Sprintf("the server responded with the status code %d but did not return more information", code) switch code { case http.StatusConflict: if verb == "POST" { - reason = unversioned.StatusReasonAlreadyExists + reason = metav1.StatusReasonAlreadyExists } else { - reason = unversioned.StatusReasonConflict + reason = metav1.StatusReasonConflict } message = "the server reported a conflict" case http.StatusNotFound: - reason = unversioned.StatusReasonNotFound + reason = metav1.StatusReasonNotFound message = "the server could not find the requested resource" case http.StatusBadRequest: - reason = unversioned.StatusReasonBadRequest + reason = metav1.StatusReasonBadRequest message = "the server rejected our request for an unknown reason" case http.StatusUnauthorized: - reason = unversioned.StatusReasonUnauthorized + reason = metav1.StatusReasonUnauthorized message = "the server has asked for the client to provide credentials" case http.StatusForbidden: - reason = unversioned.StatusReasonForbidden + reason = metav1.StatusReasonForbidden message = "the server does not allow access to the requested resource" case http.StatusMethodNotAllowed: - reason = unversioned.StatusReasonMethodNotAllowed + reason = metav1.StatusReasonMethodNotAllowed message = "the server does not allow this method on the requested resource" case StatusUnprocessableEntity: - reason = unversioned.StatusReasonInvalid + reason = metav1.StatusReasonInvalid message = "the server rejected our request due to an error in our request" case StatusServerTimeout: - reason = unversioned.StatusReasonServerTimeout + reason = metav1.StatusReasonServerTimeout message = "the server cannot complete the requested operation at this time, try again later" case StatusTooManyRequests: - reason = unversioned.StatusReasonTimeout + reason = metav1.StatusReasonTimeout message = "the server has received too many requests and has asked us to try again later" default: if code >= 500 { - reason = unversioned.StatusReasonInternalError + reason = metav1.StatusReasonInternalError message = fmt.Sprintf("an error on the server (%q) has prevented the request from succeeding", serverMessage) } } @@ -333,22 +333,22 @@ func NewGenericServerResponse(code int, verb string, qualifiedResource schema.Gr case !qualifiedResource.Empty(): message = fmt.Sprintf("%s (%s %s)", message, strings.ToLower(verb), qualifiedResource.String()) } - var causes []unversioned.StatusCause + var causes []metav1.StatusCause if isUnexpectedResponse { - causes = []unversioned.StatusCause{ + causes = []metav1.StatusCause{ { - Type: unversioned.CauseTypeUnexpectedServerResponse, + Type: metav1.CauseTypeUnexpectedServerResponse, Message: serverMessage, }, } } else { causes = nil } - return &StatusError{unversioned.Status{ - Status: unversioned.StatusFailure, + return &StatusError{metav1.Status{ + Status: metav1.StatusFailure, Code: int32(code), Reason: reason, - Details: &unversioned.StatusDetails{ + Details: &metav1.StatusDetails{ Group: qualifiedResource.Group, Kind: qualifiedResource.Resource, Name: name, @@ -362,56 +362,56 @@ func NewGenericServerResponse(code int, verb string, qualifiedResource schema.Gr // IsNotFound returns true if the specified error was created by NewNotFound. func IsNotFound(err error) bool { - return reasonForError(err) == unversioned.StatusReasonNotFound + return reasonForError(err) == metav1.StatusReasonNotFound } // IsAlreadyExists determines if the err is an error which indicates that a specified resource already exists. func IsAlreadyExists(err error) bool { - return reasonForError(err) == unversioned.StatusReasonAlreadyExists + return reasonForError(err) == metav1.StatusReasonAlreadyExists } // IsConflict determines if the err is an error which indicates the provided update conflicts. func IsConflict(err error) bool { - return reasonForError(err) == unversioned.StatusReasonConflict + return reasonForError(err) == metav1.StatusReasonConflict } // IsInvalid determines if the err is an error which indicates the provided resource is not valid. func IsInvalid(err error) bool { - return reasonForError(err) == unversioned.StatusReasonInvalid + return reasonForError(err) == metav1.StatusReasonInvalid } // IsMethodNotSupported determines if the err is an error which indicates the provided action could not // be performed because it is not supported by the server. func IsMethodNotSupported(err error) bool { - return reasonForError(err) == unversioned.StatusReasonMethodNotAllowed + return reasonForError(err) == metav1.StatusReasonMethodNotAllowed } // IsBadRequest determines if err is an error which indicates that the request is invalid. func IsBadRequest(err error) bool { - return reasonForError(err) == unversioned.StatusReasonBadRequest + return reasonForError(err) == metav1.StatusReasonBadRequest } // IsUnauthorized determines if err is an error which indicates that the request is unauthorized and // requires authentication by the user. func IsUnauthorized(err error) bool { - return reasonForError(err) == unversioned.StatusReasonUnauthorized + return reasonForError(err) == metav1.StatusReasonUnauthorized } // IsForbidden determines if err is an error which indicates that the request is forbidden and cannot // be completed as requested. func IsForbidden(err error) bool { - return reasonForError(err) == unversioned.StatusReasonForbidden + return reasonForError(err) == metav1.StatusReasonForbidden } // IsServerTimeout determines if err is an error which indicates that the request needs to be retried // by the client. func IsServerTimeout(err error) bool { - return reasonForError(err) == unversioned.StatusReasonServerTimeout + return reasonForError(err) == metav1.StatusReasonServerTimeout } // IsInternalError determines if err is an error which indicates an internal server error. func IsInternalError(err error) bool { - return reasonForError(err) == unversioned.StatusReasonInternalError + return reasonForError(err) == metav1.StatusReasonInternalError } // IsTooManyRequests determines if err is an error which indicates that there are too many requests @@ -432,7 +432,7 @@ func IsUnexpectedServerError(err error) bool { case APIStatus: if d := t.Status().Details; d != nil { for _, cause := range d.Causes { - if cause.Type == unversioned.CauseTypeUnexpectedServerResponse { + if cause.Type == metav1.CauseTypeUnexpectedServerResponse { return true } } @@ -454,7 +454,7 @@ func SuggestsClientDelay(err error) (int, bool) { case APIStatus: if t.Status().Details != nil { switch t.Status().Reason { - case unversioned.StatusReasonServerTimeout, unversioned.StatusReasonTimeout: + case metav1.StatusReasonServerTimeout, metav1.StatusReasonTimeout: return int(t.Status().Details.RetryAfterSeconds), true } } @@ -462,10 +462,10 @@ func SuggestsClientDelay(err error) (int, bool) { return 0, false } -func reasonForError(err error) unversioned.StatusReason { +func reasonForError(err error) metav1.StatusReason { switch t := err.(type) { case APIStatus: return t.Status().Reason } - return unversioned.StatusReasonUnknown + return metav1.StatusReasonUnknown } diff --git a/staging/src/k8s.io/client-go/pkg/api/helpers.go b/staging/src/k8s.io/client-go/pkg/api/helpers.go index 8f494c19478..f85e79c9004 100644 --- a/staging/src/k8s.io/client-go/pkg/api/helpers.go +++ b/staging/src/k8s.io/client-go/pkg/api/helpers.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/client-go/pkg/api/resource" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/fields" "k8s.io/client-go/pkg/labels" @@ -61,7 +61,7 @@ var Semantic = conversion.EqualitiesOrDie( // Uninitialized quantities are equivalent to 0 quantities. return a.Cmp(b) == 0 }, - func(a, b unversioned.Time) bool { + func(a, b metav1.Time) bool { return a.UTC() == b.UTC() }, func(a, b labels.Selector) bool { @@ -397,15 +397,15 @@ func containsAccessMode(modes []PersistentVolumeAccessMode, mode PersistentVolum } // ParseRFC3339 parses an RFC3339 date in either RFC3339Nano or RFC3339 format. -func ParseRFC3339(s string, nowFn func() unversioned.Time) (unversioned.Time, error) { +func ParseRFC3339(s string, nowFn func() metav1.Time) (metav1.Time, error) { if t, timeErr := time.Parse(time.RFC3339Nano, s); timeErr == nil { - return unversioned.Time{Time: t}, nil + return metav1.Time{Time: t}, nil } t, err := time.Parse(time.RFC3339, s) if err != nil { - return unversioned.Time{}, err + return metav1.Time{}, err } - return unversioned.Time{Time: t}, nil + return metav1.Time{Time: t}, nil } // NodeSelectorRequirementsAsSelector converts the []NodeSelectorRequirement api type into a struct that implements diff --git a/staging/src/k8s.io/client-go/pkg/api/install/OWNERS b/staging/src/k8s.io/client-go/pkg/api/install/OWNERS new file mode 100755 index 00000000000..01d6b37021f --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/api/install/OWNERS @@ -0,0 +1,11 @@ +reviewers: +- lavalamp +- smarterclayton +- deads2k +- caesarxuchao +- liggitt +- nikhiljindal +- dims +- krousey +- david-mcmahon +- feihujiang diff --git a/staging/src/k8s.io/client-go/pkg/api/meta.go b/staging/src/k8s.io/client-go/pkg/api/meta.go index 0f76d946a50..83be6ccb847 100644 --- a/staging/src/k8s.io/client-go/pkg/api/meta.go +++ b/staging/src/k8s.io/client-go/pkg/api/meta.go @@ -19,7 +19,7 @@ package api import ( "k8s.io/client-go/pkg/api/meta" "k8s.io/client-go/pkg/api/meta/metatypes" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/types" @@ -28,7 +28,7 @@ import ( // FillObjectMetaSystemFields populates fields that are managed by the system on ObjectMeta. func FillObjectMetaSystemFields(ctx Context, meta *ObjectMeta) { - meta.CreationTimestamp = unversioned.Now() + meta.CreationTimestamp = metav1.Now() // allows admission controllers to assign a UID earlier in the request processing // to support tracking resources pending creation. uid, found := UIDFrom(ctx) @@ -61,12 +61,12 @@ func ObjectMetaFor(obj runtime.Object) (*ObjectMeta, error) { // ListMetaFor returns a pointer to a provided object's ListMeta, // or an error if the object does not have that pointer. // TODO: allow runtime.Unknown to extract this object -func ListMetaFor(obj runtime.Object) (*unversioned.ListMeta, error) { +func ListMetaFor(obj runtime.Object) (*metav1.ListMeta, error) { v, err := conversion.EnforcePtr(obj) if err != nil { return nil, err } - var meta *unversioned.ListMeta + var meta *metav1.ListMeta err = runtime.FieldPtr(v, "ListMeta", &meta) return meta, err } @@ -75,24 +75,24 @@ func (obj *ObjectMeta) GetObjectMeta() meta.Object { return obj } // Namespace implements meta.Object for any object with an ObjectMeta typed field. Allows // fast, direct access to metadata fields for API objects. -func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } -func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } -func (meta *ObjectMeta) GetName() string { return meta.Name } -func (meta *ObjectMeta) SetName(name string) { meta.Name = name } -func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } -func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } -func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } -func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } -func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } -func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } -func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } -func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } -func (meta *ObjectMeta) GetCreationTimestamp() unversioned.Time { return meta.CreationTimestamp } -func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp unversioned.Time) { +func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } +func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } +func (meta *ObjectMeta) GetName() string { return meta.Name } +func (meta *ObjectMeta) SetName(name string) { meta.Name = name } +func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } +func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } +func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } +func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } +func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } +func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } +func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } +func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } +func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } +func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) { meta.CreationTimestamp = creationTimestamp } -func (meta *ObjectMeta) GetDeletionTimestamp() *unversioned.Time { return meta.DeletionTimestamp } -func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *unversioned.Time) { +func (meta *ObjectMeta) GetDeletionTimestamp() *metav1.Time { return meta.DeletionTimestamp } +func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *metav1.Time) { meta.DeletionTimestamp = deletionTimestamp } func (meta *ObjectMeta) GetLabels() map[string]string { return meta.Labels } diff --git a/staging/src/k8s.io/client-go/pkg/api/meta/OWNERS b/staging/src/k8s.io/client-go/pkg/api/meta/OWNERS new file mode 100755 index 00000000000..6044c031edc --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/api/meta/OWNERS @@ -0,0 +1,26 @@ +reviewers: +- thockin +- smarterclayton +- wojtek-t +- deads2k +- brendandburns +- derekwaynecarr +- caesarxuchao +- mikedanese +- liggitt +- nikhiljindal +- gmarek +- kargakis +- janetkuo +- ncdc +- eparis +- dims +- krousey +- markturansky +- fabioy +- resouer +- david-mcmahon +- mfojtik +- jianhuiz +- feihujiang +- ghodss diff --git a/staging/src/k8s.io/client-go/pkg/api/meta/interfaces.go b/staging/src/k8s.io/client-go/pkg/api/meta/interfaces.go index 6a8cf679a5a..fb084f2e7ef 100644 --- a/staging/src/k8s.io/client-go/pkg/api/meta/interfaces.go +++ b/staging/src/k8s.io/client-go/pkg/api/meta/interfaces.go @@ -18,7 +18,7 @@ package meta import ( "k8s.io/client-go/pkg/api/meta/metatypes" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/types" @@ -51,10 +51,10 @@ type Object interface { SetResourceVersion(version string) GetSelfLink() string SetSelfLink(selfLink string) - GetCreationTimestamp() unversioned.Time - SetCreationTimestamp(timestamp unversioned.Time) - GetDeletionTimestamp() *unversioned.Time - SetDeletionTimestamp(timestamp *unversioned.Time) + GetCreationTimestamp() metav1.Time + SetCreationTimestamp(timestamp metav1.Time) + GetDeletionTimestamp() *metav1.Time + SetDeletionTimestamp(timestamp *metav1.Time) GetLabels() map[string]string SetLabels(labels map[string]string) GetAnnotations() map[string]string @@ -76,10 +76,10 @@ type ListMetaAccessor interface { // List lets you work with list metadata from any of the versioned or // internal API objects. Attempting to set or retrieve a field on an object that does // not support that field will be a no-op and return a default value. -type List unversioned.List +type List metav1.List // Type exposes the type and APIVersion of versioned or internal API objects. -type Type unversioned.Type +type Type metav1.Type // MetadataAccessor lets you work with object and list metadata from any of the versioned or // internal API objects. Attempting to set or retrieve a field on an object that does diff --git a/staging/src/k8s.io/client-go/pkg/api/meta/meta.go b/staging/src/k8s.io/client-go/pkg/api/meta/meta.go index dcfa64fd05c..bcf4e2ff504 100644 --- a/staging/src/k8s.io/client-go/pkg/api/meta/meta.go +++ b/staging/src/k8s.io/client-go/pkg/api/meta/meta.go @@ -21,7 +21,7 @@ import ( "reflect" "k8s.io/client-go/pkg/api/meta/metatypes" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" @@ -43,14 +43,14 @@ func ListAccessor(obj interface{}) (List, error) { switch t := obj.(type) { case List: return t, nil - case unversioned.List: + case metav1.List: return t, nil case ListMetaAccessor: if m := t.GetListMeta(); m != nil { return m, nil } return nil, errNotList - case unversioned.ListMetaAccessor: + case metav1.ListMetaAccessor: if m := t.GetListMeta(); m != nil { return m, nil } @@ -85,7 +85,7 @@ func Accessor(obj interface{}) (Object, error) { return m, nil } return nil, errNotObject - case List, unversioned.List, ListMetaAccessor, unversioned.ListMetaAccessor: + case List, metav1.List, ListMetaAccessor, metav1.ListMetaAccessor: return nil, errNotObject default: return nil, errNotObject @@ -372,8 +372,8 @@ type genericAccessor struct { kind *string resourceVersion *string selfLink *string - creationTimestamp *unversioned.Time - deletionTimestamp **unversioned.Time + creationTimestamp *metav1.Time + deletionTimestamp **metav1.Time labels *map[string]string annotations *map[string]string ownerReferences reflect.Value @@ -468,19 +468,19 @@ func (a genericAccessor) SetSelfLink(selfLink string) { *a.selfLink = selfLink } -func (a genericAccessor) GetCreationTimestamp() unversioned.Time { +func (a genericAccessor) GetCreationTimestamp() metav1.Time { return *a.creationTimestamp } -func (a genericAccessor) SetCreationTimestamp(timestamp unversioned.Time) { +func (a genericAccessor) SetCreationTimestamp(timestamp metav1.Time) { *a.creationTimestamp = timestamp } -func (a genericAccessor) GetDeletionTimestamp() *unversioned.Time { +func (a genericAccessor) GetDeletionTimestamp() *metav1.Time { return *a.deletionTimestamp } -func (a genericAccessor) SetDeletionTimestamp(timestamp *unversioned.Time) { +func (a genericAccessor) SetDeletionTimestamp(timestamp *metav1.Time) { *a.deletionTimestamp = timestamp } diff --git a/staging/src/k8s.io/client-go/pkg/api/register.go b/staging/src/k8s.io/client-go/pkg/api/register.go index 08628791287..cdf038a67c2 100644 --- a/staging/src/k8s.io/client-go/pkg/api/register.go +++ b/staging/src/k8s.io/client-go/pkg/api/register.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/runtime/serializer" @@ -76,7 +76,7 @@ func init() { } func addKnownTypes(scheme *runtime.Scheme) error { - if err := scheme.AddIgnoredConversionType(&unversioned.TypeMeta{}, &unversioned.TypeMeta{}); err != nil { + if err := scheme.AddIgnoredConversionType(&metav1.TypeMeta{}, &metav1.TypeMeta{}); err != nil { return err } scheme.AddKnownTypes(SchemeGroupVersion, @@ -129,12 +129,11 @@ func addKnownTypes(scheme *runtime.Scheme) error { // Register Unversioned types under their own special group scheme.AddUnversionedTypes(Unversioned, - &unversioned.ExportOptions{}, - &unversioned.Status{}, - &unversioned.APIVersions{}, - &unversioned.APIGroupList{}, - &unversioned.APIGroup{}, - &unversioned.APIResourceList{}, + &metav1.Status{}, + &metav1.APIVersions{}, + &metav1.APIGroupList{}, + &metav1.APIGroup{}, + &metav1.APIResourceList{}, ) return nil } diff --git a/staging/src/k8s.io/client-go/pkg/api/resource/OWNERS b/staging/src/k8s.io/client-go/pkg/api/resource/OWNERS new file mode 100755 index 00000000000..b905e57f0f6 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/api/resource/OWNERS @@ -0,0 +1,17 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- derekwaynecarr +- mikedanese +- saad-ali +- janetkuo +- timstclair +- eparis +- timothysc +- jbeda +- xiang90 +- mbohlool +- david-mcmahon +- goltermann diff --git a/staging/src/k8s.io/client-go/pkg/api/resource_helpers.go b/staging/src/k8s.io/client-go/pkg/api/resource_helpers.go index 3d78fc892a7..91555b5b2ea 100644 --- a/staging/src/k8s.io/client-go/pkg/api/resource_helpers.go +++ b/staging/src/k8s.io/client-go/pkg/api/resource_helpers.go @@ -20,7 +20,7 @@ import ( "time" "k8s.io/client-go/pkg/api/resource" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // Returns string version of ResourceName. @@ -81,7 +81,7 @@ func GetExistingContainerStatus(statuses []ContainerStatus, name string) Contain // of that, there are two cases when a pod can be considered available: // 1. minReadySeconds == 0, or // 2. LastTransitionTime (is set) + minReadySeconds < current time -func IsPodAvailable(pod *Pod, minReadySeconds int32, now unversioned.Time) bool { +func IsPodAvailable(pod *Pod, minReadySeconds int32, now metav1.Time) bool { if !IsPodReady(pod) { return false } @@ -144,7 +144,7 @@ func GetNodeCondition(status *NodeStatus, conditionType NodeConditionType) (int, // status has changed. // Returns true if pod condition has changed or has been added. func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool { - condition.LastTransitionTime = unversioned.Now() + condition.LastTransitionTime = metav1.Now() // Try to find this pod condition. conditionIndex, oldCondition := GetPodCondition(status, condition.Type) diff --git a/staging/src/k8s.io/client-go/pkg/api/testapi/OWNERS b/staging/src/k8s.io/client-go/pkg/api/testapi/OWNERS new file mode 100755 index 00000000000..1703ec89061 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/api/testapi/OWNERS @@ -0,0 +1,21 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- deads2k +- caesarxuchao +- mikedanese +- liggitt +- nikhiljindal +- bprashanth +- erictune +- timstclair +- eparis +- soltysh +- madhusudancs +- markturansky +- mml +- david-mcmahon +- ericchiang +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/api/types.generated.go b/staging/src/k8s.io/client-go/pkg/api/types.generated.go index 2cc36139e8c..9866626adcc 100644 --- a/staging/src/k8s.io/client-go/pkg/api/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/api/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_resource "k8s.io/client-go/pkg/api/resource" - pkg2_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg2_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg6_fields "k8s.io/client-go/pkg/fields" pkg5_labels "k8s.io/client-go/pkg/labels" pkg7_runtime "k8s.io/client-go/pkg/runtime" @@ -68,7 +68,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg3_resource.Quantity - var v1 pkg2_unversioned.Time + var v1 pkg2_v1.Time var v2 pkg6_fields.Selector var v3 pkg5_labels.Selector var v4 pkg7_runtime.Object @@ -678,7 +678,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv62 := &x.CreationTimestamp yym63 := z.DecBinary() @@ -700,7 +700,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym65 := z.DecBinary() _ = yym65 @@ -922,7 +922,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv85 := &x.CreationTimestamp yym86 := z.DecBinary() @@ -954,7 +954,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym88 := z.DecBinary() _ = yym88 @@ -8170,7 +8170,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv474 := &x.ListMeta yym475 := z.DecBinary() @@ -8251,7 +8251,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv481 := &x.ListMeta yym482 := z.DecBinary() @@ -8857,7 +8857,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv537 := &x.ListMeta yym538 := z.DecBinary() @@ -8938,7 +8938,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv544 := &x.ListMeta yym545 := z.DecBinary() @@ -9211,7 +9211,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromMap(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym568 := z.DecBinary() _ = yym568 @@ -9287,7 +9287,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromArray(l int, d *codec1978 } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym575 := z.DecBinary() _ = yym575 @@ -23240,7 +23240,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromMap(l int, d *codec1978.Decod switch yys1684 { case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1685 := &x.StartedAt yym1686 := z.DecBinary() @@ -23281,7 +23281,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1688 := &x.StartedAt yym1689 := z.DecBinary() @@ -23628,7 +23628,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1724 := &x.StartedAt yym1725 := z.DecBinary() @@ -23645,7 +23645,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "finishedAt": if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1726 := &x.FinishedAt yym1727 := z.DecBinary() @@ -23756,7 +23756,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1734 := &x.StartedAt yym1735 := z.DecBinary() @@ -23783,7 +23783,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1736 := &x.FinishedAt yym1737 := z.DecBinary() @@ -24880,7 +24880,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1829 := &x.LastProbeTime yym1830 := z.DecBinary() @@ -24897,7 +24897,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1831 := &x.LastTransitionTime yym1832 := z.DecBinary() @@ -24982,7 +24982,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1838 := &x.LastProbeTime yym1839 := z.DecBinary() @@ -25009,7 +25009,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1840 := &x.LastTransitionTime yym1841 := z.DecBinary() @@ -25312,7 +25312,7 @@ func (x *PodList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv1867 := &x.ListMeta yym1868 := z.DecBinary() @@ -25393,7 +25393,7 @@ func (x *PodList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv1874 := &x.ListMeta yym1875 := z.DecBinary() @@ -27306,7 +27306,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym2015 := z.DecBinary() _ = yym2015 @@ -27365,7 +27365,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym2021 := z.DecBinary() _ = yym2021 @@ -30507,7 +30507,7 @@ func (x *PodStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2292 := z.DecBinary() _ = yym2292 @@ -30666,7 +30666,7 @@ func (x *PodStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2304 := z.DecBinary() _ = yym2304 @@ -32082,7 +32082,7 @@ func (x *PodTemplateList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2427 := &x.ListMeta yym2428 := z.DecBinary() @@ -32163,7 +32163,7 @@ func (x *PodTemplateList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2434 := &x.ListMeta yym2435 := z.DecBinary() @@ -33200,7 +33200,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromMap(l int, d *codec1 } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2524 := &x.LastTransitionTime yym2525 := z.DecBinary() @@ -33285,7 +33285,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromArray(l int, d *code } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2531 := &x.LastTransitionTime yym2532 := z.DecBinary() @@ -33905,7 +33905,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2587 := &x.ListMeta yym2588 := z.DecBinary() @@ -33986,7 +33986,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2594 := &x.ListMeta yym2595 := z.DecBinary() @@ -34249,7 +34249,7 @@ func (x *ServiceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2619 := &x.ListMeta yym2620 := z.DecBinary() @@ -34330,7 +34330,7 @@ func (x *ServiceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2626 := &x.ListMeta yym2627 := z.DecBinary() @@ -36879,7 +36879,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2849 := &x.ListMeta yym2850 := z.DecBinary() @@ -36960,7 +36960,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromArray(l int, d *codec1978.Decode } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2856 := &x.ListMeta yym2857 := z.DecBinary() @@ -38418,7 +38418,7 @@ func (x *EndpointsList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2983 := &x.ListMeta yym2984 := z.DecBinary() @@ -38499,7 +38499,7 @@ func (x *EndpointsList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2990 := &x.ListMeta yym2991 := z.DecBinary() @@ -41005,7 +41005,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "evictionTime": if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3207 := &x.EvictionTime yym3208 := z.DecBinary() @@ -41075,7 +41075,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3213 := &x.EvictionTime yym3214 := z.DecBinary() @@ -41848,7 +41848,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastHeartbeatTime": if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3273 := &x.LastHeartbeatTime yym3274 := z.DecBinary() @@ -41865,7 +41865,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3275 := &x.LastTransitionTime yym3276 := z.DecBinary() @@ -41950,7 +41950,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3282 := &x.LastHeartbeatTime yym3283 := z.DecBinary() @@ -41977,7 +41977,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3284 := &x.LastTransitionTime yym3285 := z.DecBinary() @@ -43041,7 +43041,7 @@ func (x *NodeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3369 := &x.ListMeta yym3370 := z.DecBinary() @@ -43122,7 +43122,7 @@ func (x *NodeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3376 := &x.ListMeta yym3377 := z.DecBinary() @@ -44121,7 +44121,7 @@ func (x *NamespaceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3458 := &x.ListMeta yym3459 := z.DecBinary() @@ -44202,7 +44202,7 @@ func (x *NamespaceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3465 := &x.ListMeta yym3466 := z.DecBinary() @@ -45177,7 +45177,7 @@ func (x *DeleteOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x *ExportOptions) CodecEncodeSelf(e *codec1978.Encoder) { +func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -45191,16 +45191,16 @@ func (x *ExportOptions) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep3548 := !z.EncBinary() yy2arr3548 := z.EncBasicHandle().StructToArray - var yyq3548 [4]bool + var yyq3548 [7]bool _, _, _ = yysep3548, yyq3548, yy2arr3548 const yyr3548 bool = false yyq3548[0] = x.Kind != "" yyq3548[1] = x.APIVersion != "" var yynn3548 int if yyr3548 || yy2arr3548 { - r.EncodeArrayStart(4) + r.EncodeArrayStart(7) } else { - yynn3548 = 2 + yynn3548 = 5 for _, b := range yyq3548 { if b { yynn3548++ @@ -45260,311 +45260,12 @@ func (x *ExportOptions) CodecEncodeSelf(e *codec1978.Encoder) { } } if yyr3548 || yy2arr3548 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3556 := z.EncBinary() - _ = yym3556 - if false { - } else { - r.EncodeBool(bool(x.Export)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("export")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3557 := z.EncBinary() - _ = yym3557 - if false { - } else { - r.EncodeBool(bool(x.Export)) - } - } - if yyr3548 || yy2arr3548 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3559 := z.EncBinary() - _ = yym3559 - if false { - } else { - r.EncodeBool(bool(x.Exact)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("exact")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3560 := z.EncBinary() - _ = yym3560 - if false { - } else { - r.EncodeBool(bool(x.Exact)) - } - } - if yyr3548 || yy2arr3548 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *ExportOptions) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym3561 := z.DecBinary() - _ = yym3561 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct3562 := r.ContainerType() - if yyct3562 == codecSelferValueTypeMap1234 { - yyl3562 := r.ReadMapStart() - if yyl3562 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl3562, d) - } - } else if yyct3562 == codecSelferValueTypeArray1234 { - yyl3562 := r.ReadArrayStart() - if yyl3562 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl3562, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *ExportOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys3563Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3563Slc - var yyhl3563 bool = l >= 0 - for yyj3563 := 0; ; yyj3563++ { - if yyhl3563 { - if yyj3563 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3563Slc = r.DecodeBytes(yys3563Slc, true, true) - yys3563 := string(yys3563Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3563 { - case "kind": - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - case "apiVersion": - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - case "export": - if r.TryDecodeAsNil() { - x.Export = false - } else { - x.Export = bool(r.DecodeBool()) - } - case "exact": - if r.TryDecodeAsNil() { - x.Exact = false - } else { - x.Exact = bool(r.DecodeBool()) - } - default: - z.DecStructFieldNotFound(-1, yys3563) - } // end switch yys3563 - } // end for yyj3563 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *ExportOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj3568 int - var yyb3568 bool - var yyhl3568 bool = l >= 0 - yyj3568++ - if yyhl3568 { - yyb3568 = yyj3568 > l - } else { - yyb3568 = r.CheckBreak() - } - if yyb3568 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - yyj3568++ - if yyhl3568 { - yyb3568 = yyj3568 > l - } else { - yyb3568 = r.CheckBreak() - } - if yyb3568 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - yyj3568++ - if yyhl3568 { - yyb3568 = yyj3568 > l - } else { - yyb3568 = r.CheckBreak() - } - if yyb3568 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Export = false - } else { - x.Export = bool(r.DecodeBool()) - } - yyj3568++ - if yyhl3568 { - yyb3568 = yyj3568 > l - } else { - yyb3568 = r.CheckBreak() - } - if yyb3568 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Exact = false - } else { - x.Exact = bool(r.DecodeBool()) - } - for { - yyj3568++ - if yyhl3568 { - yyb3568 = yyj3568 > l - } else { - yyb3568 = r.CheckBreak() - } - if yyb3568 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3568-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym3573 := z.EncBinary() - _ = yym3573 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep3574 := !z.EncBinary() - yy2arr3574 := z.EncBasicHandle().StructToArray - var yyq3574 [7]bool - _, _, _ = yysep3574, yyq3574, yy2arr3574 - const yyr3574 bool = false - yyq3574[0] = x.Kind != "" - yyq3574[1] = x.APIVersion != "" - var yynn3574 int - if yyr3574 || yy2arr3574 { - r.EncodeArrayStart(7) - } else { - yynn3574 = 5 - for _, b := range yyq3574 { - if b { - yynn3574++ - } - } - r.EncodeMapStart(yynn3574) - yynn3574 = 0 - } - if yyr3574 || yy2arr3574 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3574[0] { - yym3576 := z.EncBinary() - _ = yym3576 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq3574[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kind")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3577 := z.EncBinary() - _ = yym3577 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } - } - if yyr3574 || yy2arr3574 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3574[1] { - yym3579 := z.EncBinary() - _ = yym3579 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq3574[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3580 := z.EncBinary() - _ = yym3580 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } - } - if yyr3574 || yy2arr3574 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.LabelSelector == nil { r.EncodeNil() } else { - yym3582 := z.EncBinary() - _ = yym3582 + yym3556 := z.EncBinary() + _ = yym3556 if false { } else if z.HasExtensions() && z.EncExt(x.LabelSelector) { } else { @@ -45578,8 +45279,8 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.LabelSelector == nil { r.EncodeNil() } else { - yym3583 := z.EncBinary() - _ = yym3583 + yym3557 := z.EncBinary() + _ = yym3557 if false { } else if z.HasExtensions() && z.EncExt(x.LabelSelector) { } else { @@ -45587,13 +45288,13 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3574 || yy2arr3574 { + if yyr3548 || yy2arr3548 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.FieldSelector == nil { r.EncodeNil() } else { - yym3585 := z.EncBinary() - _ = yym3585 + yym3559 := z.EncBinary() + _ = yym3559 if false { } else if z.HasExtensions() && z.EncExt(x.FieldSelector) { } else { @@ -45607,8 +45308,8 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.FieldSelector == nil { r.EncodeNil() } else { - yym3586 := z.EncBinary() - _ = yym3586 + yym3560 := z.EncBinary() + _ = yym3560 if false { } else if z.HasExtensions() && z.EncExt(x.FieldSelector) { } else { @@ -45616,10 +45317,10 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3574 || yy2arr3574 { + if yyr3548 || yy2arr3548 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3588 := z.EncBinary() - _ = yym3588 + yym3562 := z.EncBinary() + _ = yym3562 if false { } else { r.EncodeBool(bool(x.Watch)) @@ -45628,17 +45329,17 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Watch")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3589 := z.EncBinary() - _ = yym3589 + yym3563 := z.EncBinary() + _ = yym3563 if false { } else { r.EncodeBool(bool(x.Watch)) } } - if yyr3574 || yy2arr3574 { + if yyr3548 || yy2arr3548 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3591 := z.EncBinary() - _ = yym3591 + yym3565 := z.EncBinary() + _ = yym3565 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) @@ -45647,24 +45348,24 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("ResourceVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3592 := z.EncBinary() - _ = yym3592 + yym3566 := z.EncBinary() + _ = yym3566 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) } } - if yyr3574 || yy2arr3574 { + if yyr3548 || yy2arr3548 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.TimeoutSeconds == nil { r.EncodeNil() } else { - yy3594 := *x.TimeoutSeconds - yym3595 := z.EncBinary() - _ = yym3595 + yy3568 := *x.TimeoutSeconds + yym3569 := z.EncBinary() + _ = yym3569 if false { } else { - r.EncodeInt(int64(yy3594)) + r.EncodeInt(int64(yy3568)) } } } else { @@ -45674,16 +45375,16 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.TimeoutSeconds == nil { r.EncodeNil() } else { - yy3596 := *x.TimeoutSeconds - yym3597 := z.EncBinary() - _ = yym3597 + yy3570 := *x.TimeoutSeconds + yym3571 := z.EncBinary() + _ = yym3571 if false { } else { - r.EncodeInt(int64(yy3596)) + r.EncodeInt(int64(yy3570)) } } } - if yyr3574 || yy2arr3574 { + if yyr3548 || yy2arr3548 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -45696,25 +45397,25 @@ func (x *ListOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3598 := z.DecBinary() - _ = yym3598 + yym3572 := z.DecBinary() + _ = yym3572 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3599 := r.ContainerType() - if yyct3599 == codecSelferValueTypeMap1234 { - yyl3599 := r.ReadMapStart() - if yyl3599 == 0 { + yyct3573 := r.ContainerType() + if yyct3573 == codecSelferValueTypeMap1234 { + yyl3573 := r.ReadMapStart() + if yyl3573 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3599, d) + x.codecDecodeSelfFromMap(yyl3573, d) } - } else if yyct3599 == codecSelferValueTypeArray1234 { - yyl3599 := r.ReadArrayStart() - if yyl3599 == 0 { + } else if yyct3573 == codecSelferValueTypeArray1234 { + yyl3573 := r.ReadArrayStart() + if yyl3573 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3599, d) + x.codecDecodeSelfFromArray(yyl3573, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -45726,12 +45427,12 @@ func (x *ListOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3600Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3600Slc - var yyhl3600 bool = l >= 0 - for yyj3600 := 0; ; yyj3600++ { - if yyhl3600 { - if yyj3600 >= l { + var yys3574Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3574Slc + var yyhl3574 bool = l >= 0 + for yyj3574 := 0; ; yyj3574++ { + if yyhl3574 { + if yyj3574 >= l { break } } else { @@ -45740,10 +45441,10 @@ func (x *ListOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3600Slc = r.DecodeBytes(yys3600Slc, true, true) - yys3600 := string(yys3600Slc) + yys3574Slc = r.DecodeBytes(yys3574Slc, true, true) + yys3574 := string(yys3574Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3600 { + switch yys3574 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -45760,26 +45461,26 @@ func (x *ListOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.LabelSelector = nil } else { - yyv3603 := &x.LabelSelector - yym3604 := z.DecBinary() - _ = yym3604 + yyv3577 := &x.LabelSelector + yym3578 := z.DecBinary() + _ = yym3578 if false { - } else if z.HasExtensions() && z.DecExt(yyv3603) { + } else if z.HasExtensions() && z.DecExt(yyv3577) { } else { - z.DecFallback(yyv3603, true) + z.DecFallback(yyv3577, true) } } case "FieldSelector": if r.TryDecodeAsNil() { x.FieldSelector = nil } else { - yyv3605 := &x.FieldSelector - yym3606 := z.DecBinary() - _ = yym3606 + yyv3579 := &x.FieldSelector + yym3580 := z.DecBinary() + _ = yym3580 if false { - } else if z.HasExtensions() && z.DecExt(yyv3605) { + } else if z.HasExtensions() && z.DecExt(yyv3579) { } else { - z.DecFallback(yyv3605, true) + z.DecFallback(yyv3579, true) } } case "Watch": @@ -45803,17 +45504,17 @@ func (x *ListOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.TimeoutSeconds == nil { x.TimeoutSeconds = new(int64) } - yym3610 := z.DecBinary() - _ = yym3610 + yym3584 := z.DecBinary() + _ = yym3584 if false { } else { *((*int64)(x.TimeoutSeconds)) = int64(r.DecodeInt(64)) } } default: - z.DecStructFieldNotFound(-1, yys3600) - } // end switch yys3600 - } // end for yyj3600 + z.DecStructFieldNotFound(-1, yys3574) + } // end switch yys3574 + } // end for yyj3574 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -45821,16 +45522,16 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3611 int - var yyb3611 bool - var yyhl3611 bool = l >= 0 - yyj3611++ - if yyhl3611 { - yyb3611 = yyj3611 > l + var yyj3585 int + var yyb3585 bool + var yyhl3585 bool = l >= 0 + yyj3585++ + if yyhl3585 { + yyb3585 = yyj3585 > l } else { - yyb3611 = r.CheckBreak() + yyb3585 = r.CheckBreak() } - if yyb3611 { + if yyb3585 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45840,13 +45541,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3611++ - if yyhl3611 { - yyb3611 = yyj3611 > l + yyj3585++ + if yyhl3585 { + yyb3585 = yyj3585 > l } else { - yyb3611 = r.CheckBreak() + yyb3585 = r.CheckBreak() } - if yyb3611 { + if yyb3585 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45856,13 +45557,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3611++ - if yyhl3611 { - yyb3611 = yyj3611 > l + yyj3585++ + if yyhl3585 { + yyb3585 = yyj3585 > l } else { - yyb3611 = r.CheckBreak() + yyb3585 = r.CheckBreak() } - if yyb3611 { + if yyb3585 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45870,22 +45571,22 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.LabelSelector = nil } else { - yyv3614 := &x.LabelSelector - yym3615 := z.DecBinary() - _ = yym3615 + yyv3588 := &x.LabelSelector + yym3589 := z.DecBinary() + _ = yym3589 if false { - } else if z.HasExtensions() && z.DecExt(yyv3614) { + } else if z.HasExtensions() && z.DecExt(yyv3588) { } else { - z.DecFallback(yyv3614, true) + z.DecFallback(yyv3588, true) } } - yyj3611++ - if yyhl3611 { - yyb3611 = yyj3611 > l + yyj3585++ + if yyhl3585 { + yyb3585 = yyj3585 > l } else { - yyb3611 = r.CheckBreak() + yyb3585 = r.CheckBreak() } - if yyb3611 { + if yyb3585 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45893,22 +45594,22 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.FieldSelector = nil } else { - yyv3616 := &x.FieldSelector - yym3617 := z.DecBinary() - _ = yym3617 + yyv3590 := &x.FieldSelector + yym3591 := z.DecBinary() + _ = yym3591 if false { - } else if z.HasExtensions() && z.DecExt(yyv3616) { + } else if z.HasExtensions() && z.DecExt(yyv3590) { } else { - z.DecFallback(yyv3616, true) + z.DecFallback(yyv3590, true) } } - yyj3611++ - if yyhl3611 { - yyb3611 = yyj3611 > l + yyj3585++ + if yyhl3585 { + yyb3585 = yyj3585 > l } else { - yyb3611 = r.CheckBreak() + yyb3585 = r.CheckBreak() } - if yyb3611 { + if yyb3585 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45918,13 +45619,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Watch = bool(r.DecodeBool()) } - yyj3611++ - if yyhl3611 { - yyb3611 = yyj3611 > l + yyj3585++ + if yyhl3585 { + yyb3585 = yyj3585 > l } else { - yyb3611 = r.CheckBreak() + yyb3585 = r.CheckBreak() } - if yyb3611 { + if yyb3585 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45934,13 +45635,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.ResourceVersion = string(r.DecodeString()) } - yyj3611++ - if yyhl3611 { - yyb3611 = yyj3611 > l + yyj3585++ + if yyhl3585 { + yyb3585 = yyj3585 > l } else { - yyb3611 = r.CheckBreak() + yyb3585 = r.CheckBreak() } - if yyb3611 { + if yyb3585 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45953,25 +45654,25 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.TimeoutSeconds == nil { x.TimeoutSeconds = new(int64) } - yym3621 := z.DecBinary() - _ = yym3621 + yym3595 := z.DecBinary() + _ = yym3595 if false { } else { *((*int64)(x.TimeoutSeconds)) = int64(r.DecodeInt(64)) } } for { - yyj3611++ - if yyhl3611 { - yyb3611 = yyj3611 > l + yyj3585++ + if yyhl3585 { + yyb3585 = yyj3585 > l } else { - yyb3611 = r.CheckBreak() + yyb3585 = r.CheckBreak() } - if yyb3611 { + if yyb3585 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3611-1, "") + z.DecStructFieldNotFound(yyj3585-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45983,36 +45684,36 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3622 := z.EncBinary() - _ = yym3622 + yym3596 := z.EncBinary() + _ = yym3596 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3623 := !z.EncBinary() - yy2arr3623 := z.EncBasicHandle().StructToArray - var yyq3623 [10]bool - _, _, _ = yysep3623, yyq3623, yy2arr3623 - const yyr3623 bool = false - yyq3623[0] = x.Kind != "" - yyq3623[1] = x.APIVersion != "" - var yynn3623 int - if yyr3623 || yy2arr3623 { + yysep3597 := !z.EncBinary() + yy2arr3597 := z.EncBasicHandle().StructToArray + var yyq3597 [10]bool + _, _, _ = yysep3597, yyq3597, yy2arr3597 + const yyr3597 bool = false + yyq3597[0] = x.Kind != "" + yyq3597[1] = x.APIVersion != "" + var yynn3597 int + if yyr3597 || yy2arr3597 { r.EncodeArrayStart(10) } else { - yynn3623 = 8 - for _, b := range yyq3623 { + yynn3597 = 8 + for _, b := range yyq3597 { if b { - yynn3623++ + yynn3597++ } } - r.EncodeMapStart(yynn3623) - yynn3623 = 0 + r.EncodeMapStart(yynn3597) + yynn3597 = 0 } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3623[0] { - yym3625 := z.EncBinary() - _ = yym3625 + if yyq3597[0] { + yym3599 := z.EncBinary() + _ = yym3599 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -46021,23 +45722,23 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3623[0] { + if yyq3597[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3626 := z.EncBinary() - _ = yym3626 + yym3600 := z.EncBinary() + _ = yym3600 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3623[1] { - yym3628 := z.EncBinary() - _ = yym3628 + if yyq3597[1] { + yym3602 := z.EncBinary() + _ = yym3602 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -46046,22 +45747,22 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3623[1] { + if yyq3597[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3629 := z.EncBinary() - _ = yym3629 + yym3603 := z.EncBinary() + _ = yym3603 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3631 := z.EncBinary() - _ = yym3631 + yym3605 := z.EncBinary() + _ = yym3605 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) @@ -46070,17 +45771,17 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Container")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3632 := z.EncBinary() - _ = yym3632 + yym3606 := z.EncBinary() + _ = yym3606 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3634 := z.EncBinary() - _ = yym3634 + yym3608 := z.EncBinary() + _ = yym3608 if false { } else { r.EncodeBool(bool(x.Follow)) @@ -46089,17 +45790,17 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Follow")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3635 := z.EncBinary() - _ = yym3635 + yym3609 := z.EncBinary() + _ = yym3609 if false { } else { r.EncodeBool(bool(x.Follow)) } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3637 := z.EncBinary() - _ = yym3637 + yym3611 := z.EncBinary() + _ = yym3611 if false { } else { r.EncodeBool(bool(x.Previous)) @@ -46108,24 +45809,24 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Previous")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3638 := z.EncBinary() - _ = yym3638 + yym3612 := z.EncBinary() + _ = yym3612 if false { } else { r.EncodeBool(bool(x.Previous)) } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.SinceSeconds == nil { r.EncodeNil() } else { - yy3640 := *x.SinceSeconds - yym3641 := z.EncBinary() - _ = yym3641 + yy3614 := *x.SinceSeconds + yym3615 := z.EncBinary() + _ = yym3615 if false { } else { - r.EncodeInt(int64(yy3640)) + r.EncodeInt(int64(yy3614)) } } } else { @@ -46135,27 +45836,27 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.SinceSeconds == nil { r.EncodeNil() } else { - yy3642 := *x.SinceSeconds - yym3643 := z.EncBinary() - _ = yym3643 + yy3616 := *x.SinceSeconds + yym3617 := z.EncBinary() + _ = yym3617 if false { } else { - r.EncodeInt(int64(yy3642)) + r.EncodeInt(int64(yy3616)) } } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.SinceTime == nil { r.EncodeNil() } else { - yym3645 := z.EncBinary() - _ = yym3645 + yym3619 := z.EncBinary() + _ = yym3619 if false { } else if z.HasExtensions() && z.EncExt(x.SinceTime) { - } else if yym3645 { + } else if yym3619 { z.EncBinaryMarshal(x.SinceTime) - } else if !yym3645 && z.IsJSONHandle() { + } else if !yym3619 && z.IsJSONHandle() { z.EncJSONMarshal(x.SinceTime) } else { z.EncFallback(x.SinceTime) @@ -46168,23 +45869,23 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.SinceTime == nil { r.EncodeNil() } else { - yym3646 := z.EncBinary() - _ = yym3646 + yym3620 := z.EncBinary() + _ = yym3620 if false { } else if z.HasExtensions() && z.EncExt(x.SinceTime) { - } else if yym3646 { + } else if yym3620 { z.EncBinaryMarshal(x.SinceTime) - } else if !yym3646 && z.IsJSONHandle() { + } else if !yym3620 && z.IsJSONHandle() { z.EncJSONMarshal(x.SinceTime) } else { z.EncFallback(x.SinceTime) } } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3648 := z.EncBinary() - _ = yym3648 + yym3622 := z.EncBinary() + _ = yym3622 if false { } else { r.EncodeBool(bool(x.Timestamps)) @@ -46193,24 +45894,24 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Timestamps")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3649 := z.EncBinary() - _ = yym3649 + yym3623 := z.EncBinary() + _ = yym3623 if false { } else { r.EncodeBool(bool(x.Timestamps)) } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.TailLines == nil { r.EncodeNil() } else { - yy3651 := *x.TailLines - yym3652 := z.EncBinary() - _ = yym3652 + yy3625 := *x.TailLines + yym3626 := z.EncBinary() + _ = yym3626 if false { } else { - r.EncodeInt(int64(yy3651)) + r.EncodeInt(int64(yy3625)) } } } else { @@ -46220,26 +45921,26 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.TailLines == nil { r.EncodeNil() } else { - yy3653 := *x.TailLines - yym3654 := z.EncBinary() - _ = yym3654 + yy3627 := *x.TailLines + yym3628 := z.EncBinary() + _ = yym3628 if false { } else { - r.EncodeInt(int64(yy3653)) + r.EncodeInt(int64(yy3627)) } } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.LimitBytes == nil { r.EncodeNil() } else { - yy3656 := *x.LimitBytes - yym3657 := z.EncBinary() - _ = yym3657 + yy3630 := *x.LimitBytes + yym3631 := z.EncBinary() + _ = yym3631 if false { } else { - r.EncodeInt(int64(yy3656)) + r.EncodeInt(int64(yy3630)) } } } else { @@ -46249,16 +45950,16 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.LimitBytes == nil { r.EncodeNil() } else { - yy3658 := *x.LimitBytes - yym3659 := z.EncBinary() - _ = yym3659 + yy3632 := *x.LimitBytes + yym3633 := z.EncBinary() + _ = yym3633 if false { } else { - r.EncodeInt(int64(yy3658)) + r.EncodeInt(int64(yy3632)) } } } - if yyr3623 || yy2arr3623 { + if yyr3597 || yy2arr3597 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -46271,25 +45972,25 @@ func (x *PodLogOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3660 := z.DecBinary() - _ = yym3660 + yym3634 := z.DecBinary() + _ = yym3634 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3661 := r.ContainerType() - if yyct3661 == codecSelferValueTypeMap1234 { - yyl3661 := r.ReadMapStart() - if yyl3661 == 0 { + yyct3635 := r.ContainerType() + if yyct3635 == codecSelferValueTypeMap1234 { + yyl3635 := r.ReadMapStart() + if yyl3635 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3661, d) + x.codecDecodeSelfFromMap(yyl3635, d) } - } else if yyct3661 == codecSelferValueTypeArray1234 { - yyl3661 := r.ReadArrayStart() - if yyl3661 == 0 { + } else if yyct3635 == codecSelferValueTypeArray1234 { + yyl3635 := r.ReadArrayStart() + if yyl3635 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3661, d) + x.codecDecodeSelfFromArray(yyl3635, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -46301,12 +46002,12 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3662Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3662Slc - var yyhl3662 bool = l >= 0 - for yyj3662 := 0; ; yyj3662++ { - if yyhl3662 { - if yyj3662 >= l { + var yys3636Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3636Slc + var yyhl3636 bool = l >= 0 + for yyj3636 := 0; ; yyj3636++ { + if yyhl3636 { + if yyj3636 >= l { break } } else { @@ -46315,10 +46016,10 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3662Slc = r.DecodeBytes(yys3662Slc, true, true) - yys3662 := string(yys3662Slc) + yys3636Slc = r.DecodeBytes(yys3636Slc, true, true) + yys3636 := string(yys3636Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3662 { + switch yys3636 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -46358,8 +46059,8 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.SinceSeconds == nil { x.SinceSeconds = new(int64) } - yym3669 := z.DecBinary() - _ = yym3669 + yym3643 := z.DecBinary() + _ = yym3643 if false { } else { *((*int64)(x.SinceSeconds)) = int64(r.DecodeInt(64)) @@ -46372,15 +46073,15 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } - yym3671 := z.DecBinary() - _ = yym3671 + yym3645 := z.DecBinary() + _ = yym3645 if false { } else if z.HasExtensions() && z.DecExt(x.SinceTime) { - } else if yym3671 { + } else if yym3645 { z.DecBinaryUnmarshal(x.SinceTime) - } else if !yym3671 && z.IsJSONHandle() { + } else if !yym3645 && z.IsJSONHandle() { z.DecJSONUnmarshal(x.SinceTime) } else { z.DecFallback(x.SinceTime, false) @@ -46401,8 +46102,8 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.TailLines == nil { x.TailLines = new(int64) } - yym3674 := z.DecBinary() - _ = yym3674 + yym3648 := z.DecBinary() + _ = yym3648 if false { } else { *((*int64)(x.TailLines)) = int64(r.DecodeInt(64)) @@ -46417,17 +46118,17 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.LimitBytes == nil { x.LimitBytes = new(int64) } - yym3676 := z.DecBinary() - _ = yym3676 + yym3650 := z.DecBinary() + _ = yym3650 if false { } else { *((*int64)(x.LimitBytes)) = int64(r.DecodeInt(64)) } } default: - z.DecStructFieldNotFound(-1, yys3662) - } // end switch yys3662 - } // end for yyj3662 + z.DecStructFieldNotFound(-1, yys3636) + } // end switch yys3636 + } // end for yyj3636 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -46435,16 +46136,16 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3677 int - var yyb3677 bool - var yyhl3677 bool = l >= 0 - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + var yyj3651 int + var yyb3651 bool + var yyhl3651 bool = l >= 0 + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46454,13 +46155,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46470,13 +46171,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46486,13 +46187,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Container = string(r.DecodeString()) } - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46502,13 +46203,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Follow = bool(r.DecodeBool()) } - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46518,13 +46219,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Previous = bool(r.DecodeBool()) } - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46537,20 +46238,20 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.SinceSeconds == nil { x.SinceSeconds = new(int64) } - yym3684 := z.DecBinary() - _ = yym3684 + yym3658 := z.DecBinary() + _ = yym3658 if false { } else { *((*int64)(x.SinceSeconds)) = int64(r.DecodeInt(64)) } } - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46561,27 +46262,27 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } - yym3686 := z.DecBinary() - _ = yym3686 + yym3660 := z.DecBinary() + _ = yym3660 if false { } else if z.HasExtensions() && z.DecExt(x.SinceTime) { - } else if yym3686 { + } else if yym3660 { z.DecBinaryUnmarshal(x.SinceTime) - } else if !yym3686 && z.IsJSONHandle() { + } else if !yym3660 && z.IsJSONHandle() { z.DecJSONUnmarshal(x.SinceTime) } else { z.DecFallback(x.SinceTime, false) } } - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46591,13 +46292,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Timestamps = bool(r.DecodeBool()) } - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46610,20 +46311,20 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.TailLines == nil { x.TailLines = new(int64) } - yym3689 := z.DecBinary() - _ = yym3689 + yym3663 := z.DecBinary() + _ = yym3663 if false { } else { *((*int64)(x.TailLines)) = int64(r.DecodeInt(64)) } } - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46636,25 +46337,25 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.LimitBytes == nil { x.LimitBytes = new(int64) } - yym3691 := z.DecBinary() - _ = yym3691 + yym3665 := z.DecBinary() + _ = yym3665 if false { } else { *((*int64)(x.LimitBytes)) = int64(r.DecodeInt(64)) } } for { - yyj3677++ - if yyhl3677 { - yyb3677 = yyj3677 > l + yyj3651++ + if yyhl3651 { + yyb3651 = yyj3651 > l } else { - yyb3677 = r.CheckBreak() + yyb3651 = r.CheckBreak() } - if yyb3677 { + if yyb3651 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3677-1, "") + z.DecStructFieldNotFound(yyj3651-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -46666,41 +46367,41 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3692 := z.EncBinary() - _ = yym3692 + yym3666 := z.EncBinary() + _ = yym3666 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3693 := !z.EncBinary() - yy2arr3693 := z.EncBasicHandle().StructToArray - var yyq3693 [7]bool - _, _, _ = yysep3693, yyq3693, yy2arr3693 - const yyr3693 bool = false - yyq3693[0] = x.Kind != "" - yyq3693[1] = x.APIVersion != "" - yyq3693[2] = x.Stdin != false - yyq3693[3] = x.Stdout != false - yyq3693[4] = x.Stderr != false - yyq3693[5] = x.TTY != false - yyq3693[6] = x.Container != "" - var yynn3693 int - if yyr3693 || yy2arr3693 { + yysep3667 := !z.EncBinary() + yy2arr3667 := z.EncBasicHandle().StructToArray + var yyq3667 [7]bool + _, _, _ = yysep3667, yyq3667, yy2arr3667 + const yyr3667 bool = false + yyq3667[0] = x.Kind != "" + yyq3667[1] = x.APIVersion != "" + yyq3667[2] = x.Stdin != false + yyq3667[3] = x.Stdout != false + yyq3667[4] = x.Stderr != false + yyq3667[5] = x.TTY != false + yyq3667[6] = x.Container != "" + var yynn3667 int + if yyr3667 || yy2arr3667 { r.EncodeArrayStart(7) } else { - yynn3693 = 0 - for _, b := range yyq3693 { + yynn3667 = 0 + for _, b := range yyq3667 { if b { - yynn3693++ + yynn3667++ } } - r.EncodeMapStart(yynn3693) - yynn3693 = 0 + r.EncodeMapStart(yynn3667) + yynn3667 = 0 } - if yyr3693 || yy2arr3693 { + if yyr3667 || yy2arr3667 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3693[0] { - yym3695 := z.EncBinary() - _ = yym3695 + if yyq3667[0] { + yym3669 := z.EncBinary() + _ = yym3669 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -46709,23 +46410,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3693[0] { + if yyq3667[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3696 := z.EncBinary() - _ = yym3696 + yym3670 := z.EncBinary() + _ = yym3670 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3693 || yy2arr3693 { + if yyr3667 || yy2arr3667 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3693[1] { - yym3698 := z.EncBinary() - _ = yym3698 + if yyq3667[1] { + yym3672 := z.EncBinary() + _ = yym3672 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -46734,23 +46435,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3693[1] { + if yyq3667[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3699 := z.EncBinary() - _ = yym3699 + yym3673 := z.EncBinary() + _ = yym3673 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3693 || yy2arr3693 { + if yyr3667 || yy2arr3667 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3693[2] { - yym3701 := z.EncBinary() - _ = yym3701 + if yyq3667[2] { + yym3675 := z.EncBinary() + _ = yym3675 if false { } else { r.EncodeBool(bool(x.Stdin)) @@ -46759,23 +46460,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3693[2] { + if yyq3667[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stdin")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3702 := z.EncBinary() - _ = yym3702 + yym3676 := z.EncBinary() + _ = yym3676 if false { } else { r.EncodeBool(bool(x.Stdin)) } } } - if yyr3693 || yy2arr3693 { + if yyr3667 || yy2arr3667 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3693[3] { - yym3704 := z.EncBinary() - _ = yym3704 + if yyq3667[3] { + yym3678 := z.EncBinary() + _ = yym3678 if false { } else { r.EncodeBool(bool(x.Stdout)) @@ -46784,23 +46485,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3693[3] { + if yyq3667[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stdout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3705 := z.EncBinary() - _ = yym3705 + yym3679 := z.EncBinary() + _ = yym3679 if false { } else { r.EncodeBool(bool(x.Stdout)) } } } - if yyr3693 || yy2arr3693 { + if yyr3667 || yy2arr3667 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3693[4] { - yym3707 := z.EncBinary() - _ = yym3707 + if yyq3667[4] { + yym3681 := z.EncBinary() + _ = yym3681 if false { } else { r.EncodeBool(bool(x.Stderr)) @@ -46809,23 +46510,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3693[4] { + if yyq3667[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stderr")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3708 := z.EncBinary() - _ = yym3708 + yym3682 := z.EncBinary() + _ = yym3682 if false { } else { r.EncodeBool(bool(x.Stderr)) } } } - if yyr3693 || yy2arr3693 { + if yyr3667 || yy2arr3667 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3693[5] { - yym3710 := z.EncBinary() - _ = yym3710 + if yyq3667[5] { + yym3684 := z.EncBinary() + _ = yym3684 if false { } else { r.EncodeBool(bool(x.TTY)) @@ -46834,23 +46535,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3693[5] { + if yyq3667[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("tty")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3711 := z.EncBinary() - _ = yym3711 + yym3685 := z.EncBinary() + _ = yym3685 if false { } else { r.EncodeBool(bool(x.TTY)) } } } - if yyr3693 || yy2arr3693 { + if yyr3667 || yy2arr3667 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3693[6] { - yym3713 := z.EncBinary() - _ = yym3713 + if yyq3667[6] { + yym3687 := z.EncBinary() + _ = yym3687 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) @@ -46859,19 +46560,19 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3693[6] { + if yyq3667[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("container")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3714 := z.EncBinary() - _ = yym3714 + yym3688 := z.EncBinary() + _ = yym3688 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) } } } - if yyr3693 || yy2arr3693 { + if yyr3667 || yy2arr3667 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -46884,25 +46585,25 @@ func (x *PodAttachOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3715 := z.DecBinary() - _ = yym3715 + yym3689 := z.DecBinary() + _ = yym3689 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3716 := r.ContainerType() - if yyct3716 == codecSelferValueTypeMap1234 { - yyl3716 := r.ReadMapStart() - if yyl3716 == 0 { + yyct3690 := r.ContainerType() + if yyct3690 == codecSelferValueTypeMap1234 { + yyl3690 := r.ReadMapStart() + if yyl3690 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3716, d) + x.codecDecodeSelfFromMap(yyl3690, d) } - } else if yyct3716 == codecSelferValueTypeArray1234 { - yyl3716 := r.ReadArrayStart() - if yyl3716 == 0 { + } else if yyct3690 == codecSelferValueTypeArray1234 { + yyl3690 := r.ReadArrayStart() + if yyl3690 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3716, d) + x.codecDecodeSelfFromArray(yyl3690, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -46914,12 +46615,12 @@ func (x *PodAttachOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3717Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3717Slc - var yyhl3717 bool = l >= 0 - for yyj3717 := 0; ; yyj3717++ { - if yyhl3717 { - if yyj3717 >= l { + var yys3691Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3691Slc + var yyhl3691 bool = l >= 0 + for yyj3691 := 0; ; yyj3691++ { + if yyhl3691 { + if yyj3691 >= l { break } } else { @@ -46928,10 +46629,10 @@ func (x *PodAttachOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3717Slc = r.DecodeBytes(yys3717Slc, true, true) - yys3717 := string(yys3717Slc) + yys3691Slc = r.DecodeBytes(yys3691Slc, true, true) + yys3691 := string(yys3691Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3717 { + switch yys3691 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -46975,9 +46676,9 @@ func (x *PodAttachOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Container = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3717) - } // end switch yys3717 - } // end for yyj3717 + z.DecStructFieldNotFound(-1, yys3691) + } // end switch yys3691 + } // end for yyj3691 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -46985,16 +46686,16 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3725 int - var yyb3725 bool - var yyhl3725 bool = l >= 0 - yyj3725++ - if yyhl3725 { - yyb3725 = yyj3725 > l + var yyj3699 int + var yyb3699 bool + var yyhl3699 bool = l >= 0 + yyj3699++ + if yyhl3699 { + yyb3699 = yyj3699 > l } else { - yyb3725 = r.CheckBreak() + yyb3699 = r.CheckBreak() } - if yyb3725 { + if yyb3699 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47004,13 +46705,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3725++ - if yyhl3725 { - yyb3725 = yyj3725 > l + yyj3699++ + if yyhl3699 { + yyb3699 = yyj3699 > l } else { - yyb3725 = r.CheckBreak() + yyb3699 = r.CheckBreak() } - if yyb3725 { + if yyb3699 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47020,13 +46721,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3725++ - if yyhl3725 { - yyb3725 = yyj3725 > l + yyj3699++ + if yyhl3699 { + yyb3699 = yyj3699 > l } else { - yyb3725 = r.CheckBreak() + yyb3699 = r.CheckBreak() } - if yyb3725 { + if yyb3699 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47036,13 +46737,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Stdin = bool(r.DecodeBool()) } - yyj3725++ - if yyhl3725 { - yyb3725 = yyj3725 > l + yyj3699++ + if yyhl3699 { + yyb3699 = yyj3699 > l } else { - yyb3725 = r.CheckBreak() + yyb3699 = r.CheckBreak() } - if yyb3725 { + if yyb3699 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47052,13 +46753,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Stdout = bool(r.DecodeBool()) } - yyj3725++ - if yyhl3725 { - yyb3725 = yyj3725 > l + yyj3699++ + if yyhl3699 { + yyb3699 = yyj3699 > l } else { - yyb3725 = r.CheckBreak() + yyb3699 = r.CheckBreak() } - if yyb3725 { + if yyb3699 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47068,13 +46769,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Stderr = bool(r.DecodeBool()) } - yyj3725++ - if yyhl3725 { - yyb3725 = yyj3725 > l + yyj3699++ + if yyhl3699 { + yyb3699 = yyj3699 > l } else { - yyb3725 = r.CheckBreak() + yyb3699 = r.CheckBreak() } - if yyb3725 { + if yyb3699 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47084,13 +46785,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.TTY = bool(r.DecodeBool()) } - yyj3725++ - if yyhl3725 { - yyb3725 = yyj3725 > l + yyj3699++ + if yyhl3699 { + yyb3699 = yyj3699 > l } else { - yyb3725 = r.CheckBreak() + yyb3699 = r.CheckBreak() } - if yyb3725 { + if yyb3699 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47101,17 +46802,17 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.Container = string(r.DecodeString()) } for { - yyj3725++ - if yyhl3725 { - yyb3725 = yyj3725 > l + yyj3699++ + if yyhl3699 { + yyb3699 = yyj3699 > l } else { - yyb3725 = r.CheckBreak() + yyb3699 = r.CheckBreak() } - if yyb3725 { + if yyb3699 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3725-1, "") + z.DecStructFieldNotFound(yyj3699-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -47123,36 +46824,36 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3733 := z.EncBinary() - _ = yym3733 + yym3707 := z.EncBinary() + _ = yym3707 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3734 := !z.EncBinary() - yy2arr3734 := z.EncBasicHandle().StructToArray - var yyq3734 [8]bool - _, _, _ = yysep3734, yyq3734, yy2arr3734 - const yyr3734 bool = false - yyq3734[0] = x.Kind != "" - yyq3734[1] = x.APIVersion != "" - var yynn3734 int - if yyr3734 || yy2arr3734 { + yysep3708 := !z.EncBinary() + yy2arr3708 := z.EncBasicHandle().StructToArray + var yyq3708 [8]bool + _, _, _ = yysep3708, yyq3708, yy2arr3708 + const yyr3708 bool = false + yyq3708[0] = x.Kind != "" + yyq3708[1] = x.APIVersion != "" + var yynn3708 int + if yyr3708 || yy2arr3708 { r.EncodeArrayStart(8) } else { - yynn3734 = 6 - for _, b := range yyq3734 { + yynn3708 = 6 + for _, b := range yyq3708 { if b { - yynn3734++ + yynn3708++ } } - r.EncodeMapStart(yynn3734) - yynn3734 = 0 + r.EncodeMapStart(yynn3708) + yynn3708 = 0 } - if yyr3734 || yy2arr3734 { + if yyr3708 || yy2arr3708 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3734[0] { - yym3736 := z.EncBinary() - _ = yym3736 + if yyq3708[0] { + yym3710 := z.EncBinary() + _ = yym3710 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -47161,23 +46862,23 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3734[0] { + if yyq3708[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3737 := z.EncBinary() - _ = yym3737 + yym3711 := z.EncBinary() + _ = yym3711 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3734 || yy2arr3734 { + if yyr3708 || yy2arr3708 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3734[1] { - yym3739 := z.EncBinary() - _ = yym3739 + if yyq3708[1] { + yym3713 := z.EncBinary() + _ = yym3713 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -47186,22 +46887,22 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3734[1] { + if yyq3708[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3740 := z.EncBinary() - _ = yym3740 + yym3714 := z.EncBinary() + _ = yym3714 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3734 || yy2arr3734 { + if yyr3708 || yy2arr3708 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3742 := z.EncBinary() - _ = yym3742 + yym3716 := z.EncBinary() + _ = yym3716 if false { } else { r.EncodeBool(bool(x.Stdin)) @@ -47210,17 +46911,17 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Stdin")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3743 := z.EncBinary() - _ = yym3743 + yym3717 := z.EncBinary() + _ = yym3717 if false { } else { r.EncodeBool(bool(x.Stdin)) } } - if yyr3734 || yy2arr3734 { + if yyr3708 || yy2arr3708 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3745 := z.EncBinary() - _ = yym3745 + yym3719 := z.EncBinary() + _ = yym3719 if false { } else { r.EncodeBool(bool(x.Stdout)) @@ -47229,17 +46930,17 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Stdout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3746 := z.EncBinary() - _ = yym3746 + yym3720 := z.EncBinary() + _ = yym3720 if false { } else { r.EncodeBool(bool(x.Stdout)) } } - if yyr3734 || yy2arr3734 { + if yyr3708 || yy2arr3708 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3748 := z.EncBinary() - _ = yym3748 + yym3722 := z.EncBinary() + _ = yym3722 if false { } else { r.EncodeBool(bool(x.Stderr)) @@ -47248,17 +46949,17 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Stderr")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3749 := z.EncBinary() - _ = yym3749 + yym3723 := z.EncBinary() + _ = yym3723 if false { } else { r.EncodeBool(bool(x.Stderr)) } } - if yyr3734 || yy2arr3734 { + if yyr3708 || yy2arr3708 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3751 := z.EncBinary() - _ = yym3751 + yym3725 := z.EncBinary() + _ = yym3725 if false { } else { r.EncodeBool(bool(x.TTY)) @@ -47267,17 +46968,17 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("TTY")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3752 := z.EncBinary() - _ = yym3752 + yym3726 := z.EncBinary() + _ = yym3726 if false { } else { r.EncodeBool(bool(x.TTY)) } } - if yyr3734 || yy2arr3734 { + if yyr3708 || yy2arr3708 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3754 := z.EncBinary() - _ = yym3754 + yym3728 := z.EncBinary() + _ = yym3728 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) @@ -47286,20 +46987,20 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Container")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3755 := z.EncBinary() - _ = yym3755 + yym3729 := z.EncBinary() + _ = yym3729 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) } } - if yyr3734 || yy2arr3734 { + if yyr3708 || yy2arr3708 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Command == nil { r.EncodeNil() } else { - yym3757 := z.EncBinary() - _ = yym3757 + yym3731 := z.EncBinary() + _ = yym3731 if false { } else { z.F.EncSliceStringV(x.Command, false, e) @@ -47312,15 +47013,15 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.Command == nil { r.EncodeNil() } else { - yym3758 := z.EncBinary() - _ = yym3758 + yym3732 := z.EncBinary() + _ = yym3732 if false { } else { z.F.EncSliceStringV(x.Command, false, e) } } } - if yyr3734 || yy2arr3734 { + if yyr3708 || yy2arr3708 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -47333,25 +47034,25 @@ func (x *PodExecOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3759 := z.DecBinary() - _ = yym3759 + yym3733 := z.DecBinary() + _ = yym3733 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3760 := r.ContainerType() - if yyct3760 == codecSelferValueTypeMap1234 { - yyl3760 := r.ReadMapStart() - if yyl3760 == 0 { + yyct3734 := r.ContainerType() + if yyct3734 == codecSelferValueTypeMap1234 { + yyl3734 := r.ReadMapStart() + if yyl3734 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3760, d) + x.codecDecodeSelfFromMap(yyl3734, d) } - } else if yyct3760 == codecSelferValueTypeArray1234 { - yyl3760 := r.ReadArrayStart() - if yyl3760 == 0 { + } else if yyct3734 == codecSelferValueTypeArray1234 { + yyl3734 := r.ReadArrayStart() + if yyl3734 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3760, d) + x.codecDecodeSelfFromArray(yyl3734, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -47363,12 +47064,12 @@ func (x *PodExecOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3761Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3761Slc - var yyhl3761 bool = l >= 0 - for yyj3761 := 0; ; yyj3761++ { - if yyhl3761 { - if yyj3761 >= l { + var yys3735Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3735Slc + var yyhl3735 bool = l >= 0 + for yyj3735 := 0; ; yyj3735++ { + if yyhl3735 { + if yyj3735 >= l { break } } else { @@ -47377,10 +47078,10 @@ func (x *PodExecOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3761Slc = r.DecodeBytes(yys3761Slc, true, true) - yys3761 := string(yys3761Slc) + yys3735Slc = r.DecodeBytes(yys3735Slc, true, true) + yys3735 := string(yys3735Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3761 { + switch yys3735 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -47427,18 +47128,18 @@ func (x *PodExecOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Command = nil } else { - yyv3769 := &x.Command - yym3770 := z.DecBinary() - _ = yym3770 + yyv3743 := &x.Command + yym3744 := z.DecBinary() + _ = yym3744 if false { } else { - z.F.DecSliceStringX(yyv3769, false, d) + z.F.DecSliceStringX(yyv3743, false, d) } } default: - z.DecStructFieldNotFound(-1, yys3761) - } // end switch yys3761 - } // end for yyj3761 + z.DecStructFieldNotFound(-1, yys3735) + } // end switch yys3735 + } // end for yyj3735 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -47446,16 +47147,16 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3771 int - var yyb3771 bool - var yyhl3771 bool = l >= 0 - yyj3771++ - if yyhl3771 { - yyb3771 = yyj3771 > l + var yyj3745 int + var yyb3745 bool + var yyhl3745 bool = l >= 0 + yyj3745++ + if yyhl3745 { + yyb3745 = yyj3745 > l } else { - yyb3771 = r.CheckBreak() + yyb3745 = r.CheckBreak() } - if yyb3771 { + if yyb3745 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47465,13 +47166,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3771++ - if yyhl3771 { - yyb3771 = yyj3771 > l + yyj3745++ + if yyhl3745 { + yyb3745 = yyj3745 > l } else { - yyb3771 = r.CheckBreak() + yyb3745 = r.CheckBreak() } - if yyb3771 { + if yyb3745 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47481,13 +47182,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3771++ - if yyhl3771 { - yyb3771 = yyj3771 > l + yyj3745++ + if yyhl3745 { + yyb3745 = yyj3745 > l } else { - yyb3771 = r.CheckBreak() + yyb3745 = r.CheckBreak() } - if yyb3771 { + if yyb3745 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47497,13 +47198,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Stdin = bool(r.DecodeBool()) } - yyj3771++ - if yyhl3771 { - yyb3771 = yyj3771 > l + yyj3745++ + if yyhl3745 { + yyb3745 = yyj3745 > l } else { - yyb3771 = r.CheckBreak() + yyb3745 = r.CheckBreak() } - if yyb3771 { + if yyb3745 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47513,13 +47214,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Stdout = bool(r.DecodeBool()) } - yyj3771++ - if yyhl3771 { - yyb3771 = yyj3771 > l + yyj3745++ + if yyhl3745 { + yyb3745 = yyj3745 > l } else { - yyb3771 = r.CheckBreak() + yyb3745 = r.CheckBreak() } - if yyb3771 { + if yyb3745 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47529,13 +47230,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Stderr = bool(r.DecodeBool()) } - yyj3771++ - if yyhl3771 { - yyb3771 = yyj3771 > l + yyj3745++ + if yyhl3745 { + yyb3745 = yyj3745 > l } else { - yyb3771 = r.CheckBreak() + yyb3745 = r.CheckBreak() } - if yyb3771 { + if yyb3745 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47545,13 +47246,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.TTY = bool(r.DecodeBool()) } - yyj3771++ - if yyhl3771 { - yyb3771 = yyj3771 > l + yyj3745++ + if yyhl3745 { + yyb3745 = yyj3745 > l } else { - yyb3771 = r.CheckBreak() + yyb3745 = r.CheckBreak() } - if yyb3771 { + if yyb3745 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47561,13 +47262,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Container = string(r.DecodeString()) } - yyj3771++ - if yyhl3771 { - yyb3771 = yyj3771 > l + yyj3745++ + if yyhl3745 { + yyb3745 = yyj3745 > l } else { - yyb3771 = r.CheckBreak() + yyb3745 = r.CheckBreak() } - if yyb3771 { + if yyb3745 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47575,26 +47276,26 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Command = nil } else { - yyv3779 := &x.Command - yym3780 := z.DecBinary() - _ = yym3780 + yyv3753 := &x.Command + yym3754 := z.DecBinary() + _ = yym3754 if false { } else { - z.F.DecSliceStringX(yyv3779, false, d) + z.F.DecSliceStringX(yyv3753, false, d) } } for { - yyj3771++ - if yyhl3771 { - yyb3771 = yyj3771 > l + yyj3745++ + if yyhl3745 { + yyb3745 = yyj3745 > l } else { - yyb3771 = r.CheckBreak() + yyb3745 = r.CheckBreak() } - if yyb3771 { + if yyb3745 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3771-1, "") + z.DecStructFieldNotFound(yyj3745-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -47606,36 +47307,36 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3781 := z.EncBinary() - _ = yym3781 + yym3755 := z.EncBinary() + _ = yym3755 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3782 := !z.EncBinary() - yy2arr3782 := z.EncBasicHandle().StructToArray - var yyq3782 [3]bool - _, _, _ = yysep3782, yyq3782, yy2arr3782 - const yyr3782 bool = false - yyq3782[0] = x.Kind != "" - yyq3782[1] = x.APIVersion != "" - var yynn3782 int - if yyr3782 || yy2arr3782 { + yysep3756 := !z.EncBinary() + yy2arr3756 := z.EncBasicHandle().StructToArray + var yyq3756 [3]bool + _, _, _ = yysep3756, yyq3756, yy2arr3756 + const yyr3756 bool = false + yyq3756[0] = x.Kind != "" + yyq3756[1] = x.APIVersion != "" + var yynn3756 int + if yyr3756 || yy2arr3756 { r.EncodeArrayStart(3) } else { - yynn3782 = 1 - for _, b := range yyq3782 { + yynn3756 = 1 + for _, b := range yyq3756 { if b { - yynn3782++ + yynn3756++ } } - r.EncodeMapStart(yynn3782) - yynn3782 = 0 + r.EncodeMapStart(yynn3756) + yynn3756 = 0 } - if yyr3782 || yy2arr3782 { + if yyr3756 || yy2arr3756 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3782[0] { - yym3784 := z.EncBinary() - _ = yym3784 + if yyq3756[0] { + yym3758 := z.EncBinary() + _ = yym3758 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -47644,23 +47345,23 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3782[0] { + if yyq3756[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3785 := z.EncBinary() - _ = yym3785 + yym3759 := z.EncBinary() + _ = yym3759 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3782 || yy2arr3782 { + if yyr3756 || yy2arr3756 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3782[1] { - yym3787 := z.EncBinary() - _ = yym3787 + if yyq3756[1] { + yym3761 := z.EncBinary() + _ = yym3761 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -47669,22 +47370,22 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3782[1] { + if yyq3756[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3788 := z.EncBinary() - _ = yym3788 + yym3762 := z.EncBinary() + _ = yym3762 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3782 || yy2arr3782 { + if yyr3756 || yy2arr3756 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3790 := z.EncBinary() - _ = yym3790 + yym3764 := z.EncBinary() + _ = yym3764 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) @@ -47693,14 +47394,14 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Path")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3791 := z.EncBinary() - _ = yym3791 + yym3765 := z.EncBinary() + _ = yym3765 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) } } - if yyr3782 || yy2arr3782 { + if yyr3756 || yy2arr3756 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -47713,25 +47414,25 @@ func (x *PodProxyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3792 := z.DecBinary() - _ = yym3792 + yym3766 := z.DecBinary() + _ = yym3766 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3793 := r.ContainerType() - if yyct3793 == codecSelferValueTypeMap1234 { - yyl3793 := r.ReadMapStart() - if yyl3793 == 0 { + yyct3767 := r.ContainerType() + if yyct3767 == codecSelferValueTypeMap1234 { + yyl3767 := r.ReadMapStart() + if yyl3767 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3793, d) + x.codecDecodeSelfFromMap(yyl3767, d) } - } else if yyct3793 == codecSelferValueTypeArray1234 { - yyl3793 := r.ReadArrayStart() - if yyl3793 == 0 { + } else if yyct3767 == codecSelferValueTypeArray1234 { + yyl3767 := r.ReadArrayStart() + if yyl3767 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3793, d) + x.codecDecodeSelfFromArray(yyl3767, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -47743,12 +47444,12 @@ func (x *PodProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3794Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3794Slc - var yyhl3794 bool = l >= 0 - for yyj3794 := 0; ; yyj3794++ { - if yyhl3794 { - if yyj3794 >= l { + var yys3768Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3768Slc + var yyhl3768 bool = l >= 0 + for yyj3768 := 0; ; yyj3768++ { + if yyhl3768 { + if yyj3768 >= l { break } } else { @@ -47757,10 +47458,10 @@ func (x *PodProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3794Slc = r.DecodeBytes(yys3794Slc, true, true) - yys3794 := string(yys3794Slc) + yys3768Slc = r.DecodeBytes(yys3768Slc, true, true) + yys3768 := string(yys3768Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3794 { + switch yys3768 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -47780,9 +47481,9 @@ func (x *PodProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Path = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3794) - } // end switch yys3794 - } // end for yyj3794 + z.DecStructFieldNotFound(-1, yys3768) + } // end switch yys3768 + } // end for yyj3768 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -47790,16 +47491,16 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3798 int - var yyb3798 bool - var yyhl3798 bool = l >= 0 - yyj3798++ - if yyhl3798 { - yyb3798 = yyj3798 > l + var yyj3772 int + var yyb3772 bool + var yyhl3772 bool = l >= 0 + yyj3772++ + if yyhl3772 { + yyb3772 = yyj3772 > l } else { - yyb3798 = r.CheckBreak() + yyb3772 = r.CheckBreak() } - if yyb3798 { + if yyb3772 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47809,13 +47510,13 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3798++ - if yyhl3798 { - yyb3798 = yyj3798 > l + yyj3772++ + if yyhl3772 { + yyb3772 = yyj3772 > l } else { - yyb3798 = r.CheckBreak() + yyb3772 = r.CheckBreak() } - if yyb3798 { + if yyb3772 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47825,13 +47526,13 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3798++ - if yyhl3798 { - yyb3798 = yyj3798 > l + yyj3772++ + if yyhl3772 { + yyb3772 = yyj3772 > l } else { - yyb3798 = r.CheckBreak() + yyb3772 = r.CheckBreak() } - if yyb3798 { + if yyb3772 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47842,17 +47543,17 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.Path = string(r.DecodeString()) } for { - yyj3798++ - if yyhl3798 { - yyb3798 = yyj3798 > l + yyj3772++ + if yyhl3772 { + yyb3772 = yyj3772 > l } else { - yyb3798 = r.CheckBreak() + yyb3772 = r.CheckBreak() } - if yyb3798 { + if yyb3772 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3798-1, "") + z.DecStructFieldNotFound(yyj3772-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -47864,36 +47565,36 @@ func (x *NodeProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3802 := z.EncBinary() - _ = yym3802 + yym3776 := z.EncBinary() + _ = yym3776 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3803 := !z.EncBinary() - yy2arr3803 := z.EncBasicHandle().StructToArray - var yyq3803 [3]bool - _, _, _ = yysep3803, yyq3803, yy2arr3803 - const yyr3803 bool = false - yyq3803[0] = x.Kind != "" - yyq3803[1] = x.APIVersion != "" - var yynn3803 int - if yyr3803 || yy2arr3803 { + yysep3777 := !z.EncBinary() + yy2arr3777 := z.EncBasicHandle().StructToArray + var yyq3777 [3]bool + _, _, _ = yysep3777, yyq3777, yy2arr3777 + const yyr3777 bool = false + yyq3777[0] = x.Kind != "" + yyq3777[1] = x.APIVersion != "" + var yynn3777 int + if yyr3777 || yy2arr3777 { r.EncodeArrayStart(3) } else { - yynn3803 = 1 - for _, b := range yyq3803 { + yynn3777 = 1 + for _, b := range yyq3777 { if b { - yynn3803++ + yynn3777++ } } - r.EncodeMapStart(yynn3803) - yynn3803 = 0 + r.EncodeMapStart(yynn3777) + yynn3777 = 0 } - if yyr3803 || yy2arr3803 { + if yyr3777 || yy2arr3777 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3803[0] { - yym3805 := z.EncBinary() - _ = yym3805 + if yyq3777[0] { + yym3779 := z.EncBinary() + _ = yym3779 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -47902,23 +47603,23 @@ func (x *NodeProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3803[0] { + if yyq3777[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3806 := z.EncBinary() - _ = yym3806 + yym3780 := z.EncBinary() + _ = yym3780 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3803 || yy2arr3803 { + if yyr3777 || yy2arr3777 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3803[1] { - yym3808 := z.EncBinary() - _ = yym3808 + if yyq3777[1] { + yym3782 := z.EncBinary() + _ = yym3782 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -47927,22 +47628,22 @@ func (x *NodeProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3803[1] { + if yyq3777[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3809 := z.EncBinary() - _ = yym3809 + yym3783 := z.EncBinary() + _ = yym3783 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3803 || yy2arr3803 { + if yyr3777 || yy2arr3777 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3811 := z.EncBinary() - _ = yym3811 + yym3785 := z.EncBinary() + _ = yym3785 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) @@ -47951,14 +47652,14 @@ func (x *NodeProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Path")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3812 := z.EncBinary() - _ = yym3812 + yym3786 := z.EncBinary() + _ = yym3786 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) } } - if yyr3803 || yy2arr3803 { + if yyr3777 || yy2arr3777 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -47971,25 +47672,25 @@ func (x *NodeProxyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3813 := z.DecBinary() - _ = yym3813 + yym3787 := z.DecBinary() + _ = yym3787 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3814 := r.ContainerType() - if yyct3814 == codecSelferValueTypeMap1234 { - yyl3814 := r.ReadMapStart() - if yyl3814 == 0 { + yyct3788 := r.ContainerType() + if yyct3788 == codecSelferValueTypeMap1234 { + yyl3788 := r.ReadMapStart() + if yyl3788 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3814, d) + x.codecDecodeSelfFromMap(yyl3788, d) } - } else if yyct3814 == codecSelferValueTypeArray1234 { - yyl3814 := r.ReadArrayStart() - if yyl3814 == 0 { + } else if yyct3788 == codecSelferValueTypeArray1234 { + yyl3788 := r.ReadArrayStart() + if yyl3788 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3814, d) + x.codecDecodeSelfFromArray(yyl3788, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -48001,12 +47702,12 @@ func (x *NodeProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3815Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3815Slc - var yyhl3815 bool = l >= 0 - for yyj3815 := 0; ; yyj3815++ { - if yyhl3815 { - if yyj3815 >= l { + var yys3789Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3789Slc + var yyhl3789 bool = l >= 0 + for yyj3789 := 0; ; yyj3789++ { + if yyhl3789 { + if yyj3789 >= l { break } } else { @@ -48015,10 +47716,10 @@ func (x *NodeProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3815Slc = r.DecodeBytes(yys3815Slc, true, true) - yys3815 := string(yys3815Slc) + yys3789Slc = r.DecodeBytes(yys3789Slc, true, true) + yys3789 := string(yys3789Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3815 { + switch yys3789 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -48038,9 +47739,9 @@ func (x *NodeProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Path = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3815) - } // end switch yys3815 - } // end for yyj3815 + z.DecStructFieldNotFound(-1, yys3789) + } // end switch yys3789 + } // end for yyj3789 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -48048,16 +47749,16 @@ func (x *NodeProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3819 int - var yyb3819 bool - var yyhl3819 bool = l >= 0 - yyj3819++ - if yyhl3819 { - yyb3819 = yyj3819 > l + var yyj3793 int + var yyb3793 bool + var yyhl3793 bool = l >= 0 + yyj3793++ + if yyhl3793 { + yyb3793 = yyj3793 > l } else { - yyb3819 = r.CheckBreak() + yyb3793 = r.CheckBreak() } - if yyb3819 { + if yyb3793 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48067,13 +47768,13 @@ func (x *NodeProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3819++ - if yyhl3819 { - yyb3819 = yyj3819 > l + yyj3793++ + if yyhl3793 { + yyb3793 = yyj3793 > l } else { - yyb3819 = r.CheckBreak() + yyb3793 = r.CheckBreak() } - if yyb3819 { + if yyb3793 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48083,13 +47784,13 @@ func (x *NodeProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3819++ - if yyhl3819 { - yyb3819 = yyj3819 > l + yyj3793++ + if yyhl3793 { + yyb3793 = yyj3793 > l } else { - yyb3819 = r.CheckBreak() + yyb3793 = r.CheckBreak() } - if yyb3819 { + if yyb3793 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48100,17 +47801,17 @@ func (x *NodeProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.Path = string(r.DecodeString()) } for { - yyj3819++ - if yyhl3819 { - yyb3819 = yyj3819 > l + yyj3793++ + if yyhl3793 { + yyb3793 = yyj3793 > l } else { - yyb3819 = r.CheckBreak() + yyb3793 = r.CheckBreak() } - if yyb3819 { + if yyb3793 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3819-1, "") + z.DecStructFieldNotFound(yyj3793-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -48122,36 +47823,36 @@ func (x *ServiceProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3823 := z.EncBinary() - _ = yym3823 + yym3797 := z.EncBinary() + _ = yym3797 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3824 := !z.EncBinary() - yy2arr3824 := z.EncBasicHandle().StructToArray - var yyq3824 [3]bool - _, _, _ = yysep3824, yyq3824, yy2arr3824 - const yyr3824 bool = false - yyq3824[0] = x.Kind != "" - yyq3824[1] = x.APIVersion != "" - var yynn3824 int - if yyr3824 || yy2arr3824 { + yysep3798 := !z.EncBinary() + yy2arr3798 := z.EncBasicHandle().StructToArray + var yyq3798 [3]bool + _, _, _ = yysep3798, yyq3798, yy2arr3798 + const yyr3798 bool = false + yyq3798[0] = x.Kind != "" + yyq3798[1] = x.APIVersion != "" + var yynn3798 int + if yyr3798 || yy2arr3798 { r.EncodeArrayStart(3) } else { - yynn3824 = 1 - for _, b := range yyq3824 { + yynn3798 = 1 + for _, b := range yyq3798 { if b { - yynn3824++ + yynn3798++ } } - r.EncodeMapStart(yynn3824) - yynn3824 = 0 + r.EncodeMapStart(yynn3798) + yynn3798 = 0 } - if yyr3824 || yy2arr3824 { + if yyr3798 || yy2arr3798 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3824[0] { - yym3826 := z.EncBinary() - _ = yym3826 + if yyq3798[0] { + yym3800 := z.EncBinary() + _ = yym3800 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -48160,23 +47861,23 @@ func (x *ServiceProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3824[0] { + if yyq3798[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3827 := z.EncBinary() - _ = yym3827 + yym3801 := z.EncBinary() + _ = yym3801 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3824 || yy2arr3824 { + if yyr3798 || yy2arr3798 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3824[1] { - yym3829 := z.EncBinary() - _ = yym3829 + if yyq3798[1] { + yym3803 := z.EncBinary() + _ = yym3803 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -48185,22 +47886,22 @@ func (x *ServiceProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3824[1] { + if yyq3798[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3830 := z.EncBinary() - _ = yym3830 + yym3804 := z.EncBinary() + _ = yym3804 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3824 || yy2arr3824 { + if yyr3798 || yy2arr3798 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3832 := z.EncBinary() - _ = yym3832 + yym3806 := z.EncBinary() + _ = yym3806 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) @@ -48209,14 +47910,14 @@ func (x *ServiceProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Path")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3833 := z.EncBinary() - _ = yym3833 + yym3807 := z.EncBinary() + _ = yym3807 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) } } - if yyr3824 || yy2arr3824 { + if yyr3798 || yy2arr3798 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -48229,25 +47930,25 @@ func (x *ServiceProxyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3834 := z.DecBinary() - _ = yym3834 + yym3808 := z.DecBinary() + _ = yym3808 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3835 := r.ContainerType() - if yyct3835 == codecSelferValueTypeMap1234 { - yyl3835 := r.ReadMapStart() - if yyl3835 == 0 { + yyct3809 := r.ContainerType() + if yyct3809 == codecSelferValueTypeMap1234 { + yyl3809 := r.ReadMapStart() + if yyl3809 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3835, d) + x.codecDecodeSelfFromMap(yyl3809, d) } - } else if yyct3835 == codecSelferValueTypeArray1234 { - yyl3835 := r.ReadArrayStart() - if yyl3835 == 0 { + } else if yyct3809 == codecSelferValueTypeArray1234 { + yyl3809 := r.ReadArrayStart() + if yyl3809 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3835, d) + x.codecDecodeSelfFromArray(yyl3809, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -48259,12 +47960,12 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3836Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3836Slc - var yyhl3836 bool = l >= 0 - for yyj3836 := 0; ; yyj3836++ { - if yyhl3836 { - if yyj3836 >= l { + var yys3810Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3810Slc + var yyhl3810 bool = l >= 0 + for yyj3810 := 0; ; yyj3810++ { + if yyhl3810 { + if yyj3810 >= l { break } } else { @@ -48273,10 +47974,10 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3836Slc = r.DecodeBytes(yys3836Slc, true, true) - yys3836 := string(yys3836Slc) + yys3810Slc = r.DecodeBytes(yys3810Slc, true, true) + yys3810 := string(yys3810Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3836 { + switch yys3810 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -48296,9 +47997,9 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder x.Path = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3836) - } // end switch yys3836 - } // end for yyj3836 + z.DecStructFieldNotFound(-1, yys3810) + } // end switch yys3810 + } // end for yyj3810 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -48306,16 +48007,16 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3840 int - var yyb3840 bool - var yyhl3840 bool = l >= 0 - yyj3840++ - if yyhl3840 { - yyb3840 = yyj3840 > l + var yyj3814 int + var yyb3814 bool + var yyhl3814 bool = l >= 0 + yyj3814++ + if yyhl3814 { + yyb3814 = yyj3814 > l } else { - yyb3840 = r.CheckBreak() + yyb3814 = r.CheckBreak() } - if yyb3840 { + if yyb3814 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48325,13 +48026,13 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Kind = string(r.DecodeString()) } - yyj3840++ - if yyhl3840 { - yyb3840 = yyj3840 > l + yyj3814++ + if yyhl3814 { + yyb3814 = yyj3814 > l } else { - yyb3840 = r.CheckBreak() + yyb3814 = r.CheckBreak() } - if yyb3840 { + if yyb3814 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48341,13 +48042,13 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.APIVersion = string(r.DecodeString()) } - yyj3840++ - if yyhl3840 { - yyb3840 = yyj3840 > l + yyj3814++ + if yyhl3814 { + yyb3814 = yyj3814 > l } else { - yyb3840 = r.CheckBreak() + yyb3814 = r.CheckBreak() } - if yyb3840 { + if yyb3814 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48358,17 +48059,17 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decod x.Path = string(r.DecodeString()) } for { - yyj3840++ - if yyhl3840 { - yyb3840 = yyj3840 > l + yyj3814++ + if yyhl3814 { + yyb3814 = yyj3814 > l } else { - yyb3840 = r.CheckBreak() + yyb3814 = r.CheckBreak() } - if yyb3840 { + if yyb3814 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3840-1, "") + z.DecStructFieldNotFound(yyj3814-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -48380,34 +48081,34 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3844 := z.EncBinary() - _ = yym3844 + yym3818 := z.EncBinary() + _ = yym3818 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3845 := !z.EncBinary() - yy2arr3845 := z.EncBasicHandle().StructToArray - var yyq3845 [5]bool - _, _, _ = yysep3845, yyq3845, yy2arr3845 - const yyr3845 bool = false - yyq3845[4] = x.Controller != nil - var yynn3845 int - if yyr3845 || yy2arr3845 { + yysep3819 := !z.EncBinary() + yy2arr3819 := z.EncBasicHandle().StructToArray + var yyq3819 [5]bool + _, _, _ = yysep3819, yyq3819, yy2arr3819 + const yyr3819 bool = false + yyq3819[4] = x.Controller != nil + var yynn3819 int + if yyr3819 || yy2arr3819 { r.EncodeArrayStart(5) } else { - yynn3845 = 4 - for _, b := range yyq3845 { + yynn3819 = 4 + for _, b := range yyq3819 { if b { - yynn3845++ + yynn3819++ } } - r.EncodeMapStart(yynn3845) - yynn3845 = 0 + r.EncodeMapStart(yynn3819) + yynn3819 = 0 } - if yyr3845 || yy2arr3845 { + if yyr3819 || yy2arr3819 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3847 := z.EncBinary() - _ = yym3847 + yym3821 := z.EncBinary() + _ = yym3821 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -48416,17 +48117,17 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3848 := z.EncBinary() - _ = yym3848 + yym3822 := z.EncBinary() + _ = yym3822 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } - if yyr3845 || yy2arr3845 { + if yyr3819 || yy2arr3819 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3850 := z.EncBinary() - _ = yym3850 + yym3824 := z.EncBinary() + _ = yym3824 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -48435,17 +48136,17 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3851 := z.EncBinary() - _ = yym3851 + yym3825 := z.EncBinary() + _ = yym3825 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } - if yyr3845 || yy2arr3845 { + if yyr3819 || yy2arr3819 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3853 := z.EncBinary() - _ = yym3853 + yym3827 := z.EncBinary() + _ = yym3827 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) @@ -48454,17 +48155,17 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("name")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3854 := z.EncBinary() - _ = yym3854 + yym3828 := z.EncBinary() + _ = yym3828 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) } } - if yyr3845 || yy2arr3845 { + if yyr3819 || yy2arr3819 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3856 := z.EncBinary() - _ = yym3856 + yym3830 := z.EncBinary() + _ = yym3830 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { @@ -48474,50 +48175,50 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("uid")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3857 := z.EncBinary() - _ = yym3857 + yym3831 := z.EncBinary() + _ = yym3831 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { r.EncodeString(codecSelferC_UTF81234, string(x.UID)) } } - if yyr3845 || yy2arr3845 { + if yyr3819 || yy2arr3819 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3845[4] { + if yyq3819[4] { if x.Controller == nil { r.EncodeNil() } else { - yy3859 := *x.Controller - yym3860 := z.EncBinary() - _ = yym3860 + yy3833 := *x.Controller + yym3834 := z.EncBinary() + _ = yym3834 if false { } else { - r.EncodeBool(bool(yy3859)) + r.EncodeBool(bool(yy3833)) } } } else { r.EncodeNil() } } else { - if yyq3845[4] { + if yyq3819[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("controller")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Controller == nil { r.EncodeNil() } else { - yy3861 := *x.Controller - yym3862 := z.EncBinary() - _ = yym3862 + yy3835 := *x.Controller + yym3836 := z.EncBinary() + _ = yym3836 if false { } else { - r.EncodeBool(bool(yy3861)) + r.EncodeBool(bool(yy3835)) } } } } - if yyr3845 || yy2arr3845 { + if yyr3819 || yy2arr3819 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -48530,25 +48231,25 @@ func (x *OwnerReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3863 := z.DecBinary() - _ = yym3863 + yym3837 := z.DecBinary() + _ = yym3837 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3864 := r.ContainerType() - if yyct3864 == codecSelferValueTypeMap1234 { - yyl3864 := r.ReadMapStart() - if yyl3864 == 0 { + yyct3838 := r.ContainerType() + if yyct3838 == codecSelferValueTypeMap1234 { + yyl3838 := r.ReadMapStart() + if yyl3838 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3864, d) + x.codecDecodeSelfFromMap(yyl3838, d) } - } else if yyct3864 == codecSelferValueTypeArray1234 { - yyl3864 := r.ReadArrayStart() - if yyl3864 == 0 { + } else if yyct3838 == codecSelferValueTypeArray1234 { + yyl3838 := r.ReadArrayStart() + if yyl3838 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3864, d) + x.codecDecodeSelfFromArray(yyl3838, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -48560,12 +48261,12 @@ func (x *OwnerReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3865Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3865Slc - var yyhl3865 bool = l >= 0 - for yyj3865 := 0; ; yyj3865++ { - if yyhl3865 { - if yyj3865 >= l { + var yys3839Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3839Slc + var yyhl3839 bool = l >= 0 + for yyj3839 := 0; ; yyj3839++ { + if yyhl3839 { + if yyj3839 >= l { break } } else { @@ -48574,10 +48275,10 @@ func (x *OwnerReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3865Slc = r.DecodeBytes(yys3865Slc, true, true) - yys3865 := string(yys3865Slc) + yys3839Slc = r.DecodeBytes(yys3839Slc, true, true) + yys3839 := string(yys3839Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3865 { + switch yys3839 { case "apiVersion": if r.TryDecodeAsNil() { x.APIVersion = "" @@ -48611,17 +48312,17 @@ func (x *OwnerReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.Controller == nil { x.Controller = new(bool) } - yym3871 := z.DecBinary() - _ = yym3871 + yym3845 := z.DecBinary() + _ = yym3845 if false { } else { *((*bool)(x.Controller)) = r.DecodeBool() } } default: - z.DecStructFieldNotFound(-1, yys3865) - } // end switch yys3865 - } // end for yyj3865 + z.DecStructFieldNotFound(-1, yys3839) + } // end switch yys3839 + } // end for yyj3839 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -48629,16 +48330,16 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3872 int - var yyb3872 bool - var yyhl3872 bool = l >= 0 - yyj3872++ - if yyhl3872 { - yyb3872 = yyj3872 > l + var yyj3846 int + var yyb3846 bool + var yyhl3846 bool = l >= 0 + yyj3846++ + if yyhl3846 { + yyb3846 = yyj3846 > l } else { - yyb3872 = r.CheckBreak() + yyb3846 = r.CheckBreak() } - if yyb3872 { + if yyb3846 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48648,13 +48349,13 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3872++ - if yyhl3872 { - yyb3872 = yyj3872 > l + yyj3846++ + if yyhl3846 { + yyb3846 = yyj3846 > l } else { - yyb3872 = r.CheckBreak() + yyb3846 = r.CheckBreak() } - if yyb3872 { + if yyb3846 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48664,13 +48365,13 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3872++ - if yyhl3872 { - yyb3872 = yyj3872 > l + yyj3846++ + if yyhl3846 { + yyb3846 = yyj3846 > l } else { - yyb3872 = r.CheckBreak() + yyb3846 = r.CheckBreak() } - if yyb3872 { + if yyb3846 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48680,13 +48381,13 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Name = string(r.DecodeString()) } - yyj3872++ - if yyhl3872 { - yyb3872 = yyj3872 > l + yyj3846++ + if yyhl3846 { + yyb3846 = yyj3846 > l } else { - yyb3872 = r.CheckBreak() + yyb3846 = r.CheckBreak() } - if yyb3872 { + if yyb3846 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48696,13 +48397,13 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.UID = pkg1_types.UID(r.DecodeString()) } - yyj3872++ - if yyhl3872 { - yyb3872 = yyj3872 > l + yyj3846++ + if yyhl3846 { + yyb3846 = yyj3846 > l } else { - yyb3872 = r.CheckBreak() + yyb3846 = r.CheckBreak() } - if yyb3872 { + if yyb3846 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48715,25 +48416,25 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.Controller == nil { x.Controller = new(bool) } - yym3878 := z.DecBinary() - _ = yym3878 + yym3852 := z.DecBinary() + _ = yym3852 if false { } else { *((*bool)(x.Controller)) = r.DecodeBool() } } for { - yyj3872++ - if yyhl3872 { - yyb3872 = yyj3872 > l + yyj3846++ + if yyhl3846 { + yyb3846 = yyj3846 > l } else { - yyb3872 = r.CheckBreak() + yyb3846 = r.CheckBreak() } - if yyb3872 { + if yyb3846 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3872-1, "") + z.DecStructFieldNotFound(yyj3846-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -48745,41 +48446,41 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3879 := z.EncBinary() - _ = yym3879 + yym3853 := z.EncBinary() + _ = yym3853 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3880 := !z.EncBinary() - yy2arr3880 := z.EncBasicHandle().StructToArray - var yyq3880 [7]bool - _, _, _ = yysep3880, yyq3880, yy2arr3880 - const yyr3880 bool = false - yyq3880[0] = x.Kind != "" - yyq3880[1] = x.Namespace != "" - yyq3880[2] = x.Name != "" - yyq3880[3] = x.UID != "" - yyq3880[4] = x.APIVersion != "" - yyq3880[5] = x.ResourceVersion != "" - yyq3880[6] = x.FieldPath != "" - var yynn3880 int - if yyr3880 || yy2arr3880 { + yysep3854 := !z.EncBinary() + yy2arr3854 := z.EncBasicHandle().StructToArray + var yyq3854 [7]bool + _, _, _ = yysep3854, yyq3854, yy2arr3854 + const yyr3854 bool = false + yyq3854[0] = x.Kind != "" + yyq3854[1] = x.Namespace != "" + yyq3854[2] = x.Name != "" + yyq3854[3] = x.UID != "" + yyq3854[4] = x.APIVersion != "" + yyq3854[5] = x.ResourceVersion != "" + yyq3854[6] = x.FieldPath != "" + var yynn3854 int + if yyr3854 || yy2arr3854 { r.EncodeArrayStart(7) } else { - yynn3880 = 0 - for _, b := range yyq3880 { + yynn3854 = 0 + for _, b := range yyq3854 { if b { - yynn3880++ + yynn3854++ } } - r.EncodeMapStart(yynn3880) - yynn3880 = 0 + r.EncodeMapStart(yynn3854) + yynn3854 = 0 } - if yyr3880 || yy2arr3880 { + if yyr3854 || yy2arr3854 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3880[0] { - yym3882 := z.EncBinary() - _ = yym3882 + if yyq3854[0] { + yym3856 := z.EncBinary() + _ = yym3856 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -48788,23 +48489,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3880[0] { + if yyq3854[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3883 := z.EncBinary() - _ = yym3883 + yym3857 := z.EncBinary() + _ = yym3857 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3880 || yy2arr3880 { + if yyr3854 || yy2arr3854 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3880[1] { - yym3885 := z.EncBinary() - _ = yym3885 + if yyq3854[1] { + yym3859 := z.EncBinary() + _ = yym3859 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Namespace)) @@ -48813,23 +48514,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3880[1] { + if yyq3854[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("namespace")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3886 := z.EncBinary() - _ = yym3886 + yym3860 := z.EncBinary() + _ = yym3860 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Namespace)) } } } - if yyr3880 || yy2arr3880 { + if yyr3854 || yy2arr3854 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3880[2] { - yym3888 := z.EncBinary() - _ = yym3888 + if yyq3854[2] { + yym3862 := z.EncBinary() + _ = yym3862 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) @@ -48838,23 +48539,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3880[2] { + if yyq3854[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("name")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3889 := z.EncBinary() - _ = yym3889 + yym3863 := z.EncBinary() + _ = yym3863 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) } } } - if yyr3880 || yy2arr3880 { + if yyr3854 || yy2arr3854 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3880[3] { - yym3891 := z.EncBinary() - _ = yym3891 + if yyq3854[3] { + yym3865 := z.EncBinary() + _ = yym3865 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { @@ -48864,12 +48565,12 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3880[3] { + if yyq3854[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("uid")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3892 := z.EncBinary() - _ = yym3892 + yym3866 := z.EncBinary() + _ = yym3866 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { @@ -48877,11 +48578,11 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3880 || yy2arr3880 { + if yyr3854 || yy2arr3854 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3880[4] { - yym3894 := z.EncBinary() - _ = yym3894 + if yyq3854[4] { + yym3868 := z.EncBinary() + _ = yym3868 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -48890,23 +48591,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3880[4] { + if yyq3854[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3895 := z.EncBinary() - _ = yym3895 + yym3869 := z.EncBinary() + _ = yym3869 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3880 || yy2arr3880 { + if yyr3854 || yy2arr3854 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3880[5] { - yym3897 := z.EncBinary() - _ = yym3897 + if yyq3854[5] { + yym3871 := z.EncBinary() + _ = yym3871 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) @@ -48915,23 +48616,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3880[5] { + if yyq3854[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resourceVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3898 := z.EncBinary() - _ = yym3898 + yym3872 := z.EncBinary() + _ = yym3872 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) } } } - if yyr3880 || yy2arr3880 { + if yyr3854 || yy2arr3854 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3880[6] { - yym3900 := z.EncBinary() - _ = yym3900 + if yyq3854[6] { + yym3874 := z.EncBinary() + _ = yym3874 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FieldPath)) @@ -48940,19 +48641,19 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3880[6] { + if yyq3854[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("fieldPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3901 := z.EncBinary() - _ = yym3901 + yym3875 := z.EncBinary() + _ = yym3875 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FieldPath)) } } } - if yyr3880 || yy2arr3880 { + if yyr3854 || yy2arr3854 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -48965,25 +48666,25 @@ func (x *ObjectReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3902 := z.DecBinary() - _ = yym3902 + yym3876 := z.DecBinary() + _ = yym3876 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3903 := r.ContainerType() - if yyct3903 == codecSelferValueTypeMap1234 { - yyl3903 := r.ReadMapStart() - if yyl3903 == 0 { + yyct3877 := r.ContainerType() + if yyct3877 == codecSelferValueTypeMap1234 { + yyl3877 := r.ReadMapStart() + if yyl3877 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3903, d) + x.codecDecodeSelfFromMap(yyl3877, d) } - } else if yyct3903 == codecSelferValueTypeArray1234 { - yyl3903 := r.ReadArrayStart() - if yyl3903 == 0 { + } else if yyct3877 == codecSelferValueTypeArray1234 { + yyl3877 := r.ReadArrayStart() + if yyl3877 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3903, d) + x.codecDecodeSelfFromArray(yyl3877, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -48995,12 +48696,12 @@ func (x *ObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3904Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3904Slc - var yyhl3904 bool = l >= 0 - for yyj3904 := 0; ; yyj3904++ { - if yyhl3904 { - if yyj3904 >= l { + var yys3878Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3878Slc + var yyhl3878 bool = l >= 0 + for yyj3878 := 0; ; yyj3878++ { + if yyhl3878 { + if yyj3878 >= l { break } } else { @@ -49009,10 +48710,10 @@ func (x *ObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3904Slc = r.DecodeBytes(yys3904Slc, true, true) - yys3904 := string(yys3904Slc) + yys3878Slc = r.DecodeBytes(yys3878Slc, true, true) + yys3878 := string(yys3878Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3904 { + switch yys3878 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -49056,9 +48757,9 @@ func (x *ObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.FieldPath = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3904) - } // end switch yys3904 - } // end for yyj3904 + z.DecStructFieldNotFound(-1, yys3878) + } // end switch yys3878 + } // end for yyj3878 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -49066,16 +48767,16 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3912 int - var yyb3912 bool - var yyhl3912 bool = l >= 0 - yyj3912++ - if yyhl3912 { - yyb3912 = yyj3912 > l + var yyj3886 int + var yyb3886 bool + var yyhl3886 bool = l >= 0 + yyj3886++ + if yyhl3886 { + yyb3886 = yyj3886 > l } else { - yyb3912 = r.CheckBreak() + yyb3886 = r.CheckBreak() } - if yyb3912 { + if yyb3886 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49085,13 +48786,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3912++ - if yyhl3912 { - yyb3912 = yyj3912 > l + yyj3886++ + if yyhl3886 { + yyb3886 = yyj3886 > l } else { - yyb3912 = r.CheckBreak() + yyb3886 = r.CheckBreak() } - if yyb3912 { + if yyb3886 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49101,13 +48802,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Namespace = string(r.DecodeString()) } - yyj3912++ - if yyhl3912 { - yyb3912 = yyj3912 > l + yyj3886++ + if yyhl3886 { + yyb3886 = yyj3886 > l } else { - yyb3912 = r.CheckBreak() + yyb3886 = r.CheckBreak() } - if yyb3912 { + if yyb3886 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49117,13 +48818,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Name = string(r.DecodeString()) } - yyj3912++ - if yyhl3912 { - yyb3912 = yyj3912 > l + yyj3886++ + if yyhl3886 { + yyb3886 = yyj3886 > l } else { - yyb3912 = r.CheckBreak() + yyb3886 = r.CheckBreak() } - if yyb3912 { + if yyb3886 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49133,13 +48834,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.UID = pkg1_types.UID(r.DecodeString()) } - yyj3912++ - if yyhl3912 { - yyb3912 = yyj3912 > l + yyj3886++ + if yyhl3886 { + yyb3886 = yyj3886 > l } else { - yyb3912 = r.CheckBreak() + yyb3886 = r.CheckBreak() } - if yyb3912 { + if yyb3886 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49149,13 +48850,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3912++ - if yyhl3912 { - yyb3912 = yyj3912 > l + yyj3886++ + if yyhl3886 { + yyb3886 = yyj3886 > l } else { - yyb3912 = r.CheckBreak() + yyb3886 = r.CheckBreak() } - if yyb3912 { + if yyb3886 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49165,13 +48866,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.ResourceVersion = string(r.DecodeString()) } - yyj3912++ - if yyhl3912 { - yyb3912 = yyj3912 > l + yyj3886++ + if yyhl3886 { + yyb3886 = yyj3886 > l } else { - yyb3912 = r.CheckBreak() + yyb3886 = r.CheckBreak() } - if yyb3912 { + if yyb3886 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49182,17 +48883,17 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.FieldPath = string(r.DecodeString()) } for { - yyj3912++ - if yyhl3912 { - yyb3912 = yyj3912 > l + yyj3886++ + if yyhl3886 { + yyb3886 = yyj3886 > l } else { - yyb3912 = r.CheckBreak() + yyb3886 = r.CheckBreak() } - if yyb3912 { + if yyb3886 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3912-1, "") + z.DecStructFieldNotFound(yyj3886-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -49204,33 +48905,33 @@ func (x *LocalObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3920 := z.EncBinary() - _ = yym3920 + yym3894 := z.EncBinary() + _ = yym3894 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3921 := !z.EncBinary() - yy2arr3921 := z.EncBasicHandle().StructToArray - var yyq3921 [1]bool - _, _, _ = yysep3921, yyq3921, yy2arr3921 - const yyr3921 bool = false - var yynn3921 int - if yyr3921 || yy2arr3921 { + yysep3895 := !z.EncBinary() + yy2arr3895 := z.EncBasicHandle().StructToArray + var yyq3895 [1]bool + _, _, _ = yysep3895, yyq3895, yy2arr3895 + const yyr3895 bool = false + var yynn3895 int + if yyr3895 || yy2arr3895 { r.EncodeArrayStart(1) } else { - yynn3921 = 1 - for _, b := range yyq3921 { + yynn3895 = 1 + for _, b := range yyq3895 { if b { - yynn3921++ + yynn3895++ } } - r.EncodeMapStart(yynn3921) - yynn3921 = 0 + r.EncodeMapStart(yynn3895) + yynn3895 = 0 } - if yyr3921 || yy2arr3921 { + if yyr3895 || yy2arr3895 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3923 := z.EncBinary() - _ = yym3923 + yym3897 := z.EncBinary() + _ = yym3897 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) @@ -49239,14 +48940,14 @@ func (x *LocalObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("Name")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3924 := z.EncBinary() - _ = yym3924 + yym3898 := z.EncBinary() + _ = yym3898 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) } } - if yyr3921 || yy2arr3921 { + if yyr3895 || yy2arr3895 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -49259,25 +48960,25 @@ func (x *LocalObjectReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3925 := z.DecBinary() - _ = yym3925 + yym3899 := z.DecBinary() + _ = yym3899 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3926 := r.ContainerType() - if yyct3926 == codecSelferValueTypeMap1234 { - yyl3926 := r.ReadMapStart() - if yyl3926 == 0 { + yyct3900 := r.ContainerType() + if yyct3900 == codecSelferValueTypeMap1234 { + yyl3900 := r.ReadMapStart() + if yyl3900 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3926, d) + x.codecDecodeSelfFromMap(yyl3900, d) } - } else if yyct3926 == codecSelferValueTypeArray1234 { - yyl3926 := r.ReadArrayStart() - if yyl3926 == 0 { + } else if yyct3900 == codecSelferValueTypeArray1234 { + yyl3900 := r.ReadArrayStart() + if yyl3900 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3926, d) + x.codecDecodeSelfFromArray(yyl3900, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -49289,12 +48990,12 @@ func (x *LocalObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3927Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3927Slc - var yyhl3927 bool = l >= 0 - for yyj3927 := 0; ; yyj3927++ { - if yyhl3927 { - if yyj3927 >= l { + var yys3901Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3901Slc + var yyhl3901 bool = l >= 0 + for yyj3901 := 0; ; yyj3901++ { + if yyhl3901 { + if yyj3901 >= l { break } } else { @@ -49303,10 +49004,10 @@ func (x *LocalObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3927Slc = r.DecodeBytes(yys3927Slc, true, true) - yys3927 := string(yys3927Slc) + yys3901Slc = r.DecodeBytes(yys3901Slc, true, true) + yys3901 := string(yys3901Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3927 { + switch yys3901 { case "Name": if r.TryDecodeAsNil() { x.Name = "" @@ -49314,9 +49015,9 @@ func (x *LocalObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.Name = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3927) - } // end switch yys3927 - } // end for yyj3927 + z.DecStructFieldNotFound(-1, yys3901) + } // end switch yys3901 + } // end for yyj3901 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -49324,16 +49025,16 @@ func (x *LocalObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3929 int - var yyb3929 bool - var yyhl3929 bool = l >= 0 - yyj3929++ - if yyhl3929 { - yyb3929 = yyj3929 > l + var yyj3903 int + var yyb3903 bool + var yyhl3903 bool = l >= 0 + yyj3903++ + if yyhl3903 { + yyb3903 = yyj3903 > l } else { - yyb3929 = r.CheckBreak() + yyb3903 = r.CheckBreak() } - if yyb3929 { + if yyb3903 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49344,17 +49045,17 @@ func (x *LocalObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Deco x.Name = string(r.DecodeString()) } for { - yyj3929++ - if yyhl3929 { - yyb3929 = yyj3929 > l + yyj3903++ + if yyhl3903 { + yyb3903 = yyj3903 > l } else { - yyb3929 = r.CheckBreak() + yyb3903 = r.CheckBreak() } - if yyb3929 { + if yyb3903 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3929-1, "") + z.DecStructFieldNotFound(yyj3903-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -49366,37 +49067,37 @@ func (x *SerializedReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3931 := z.EncBinary() - _ = yym3931 + yym3905 := z.EncBinary() + _ = yym3905 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3932 := !z.EncBinary() - yy2arr3932 := z.EncBasicHandle().StructToArray - var yyq3932 [3]bool - _, _, _ = yysep3932, yyq3932, yy2arr3932 - const yyr3932 bool = false - yyq3932[0] = x.Kind != "" - yyq3932[1] = x.APIVersion != "" - yyq3932[2] = true - var yynn3932 int - if yyr3932 || yy2arr3932 { + yysep3906 := !z.EncBinary() + yy2arr3906 := z.EncBasicHandle().StructToArray + var yyq3906 [3]bool + _, _, _ = yysep3906, yyq3906, yy2arr3906 + const yyr3906 bool = false + yyq3906[0] = x.Kind != "" + yyq3906[1] = x.APIVersion != "" + yyq3906[2] = true + var yynn3906 int + if yyr3906 || yy2arr3906 { r.EncodeArrayStart(3) } else { - yynn3932 = 0 - for _, b := range yyq3932 { + yynn3906 = 0 + for _, b := range yyq3906 { if b { - yynn3932++ + yynn3906++ } } - r.EncodeMapStart(yynn3932) - yynn3932 = 0 + r.EncodeMapStart(yynn3906) + yynn3906 = 0 } - if yyr3932 || yy2arr3932 { + if yyr3906 || yy2arr3906 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3932[0] { - yym3934 := z.EncBinary() - _ = yym3934 + if yyq3906[0] { + yym3908 := z.EncBinary() + _ = yym3908 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -49405,23 +49106,23 @@ func (x *SerializedReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3932[0] { + if yyq3906[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3935 := z.EncBinary() - _ = yym3935 + yym3909 := z.EncBinary() + _ = yym3909 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3932 || yy2arr3932 { + if yyr3906 || yy2arr3906 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3932[1] { - yym3937 := z.EncBinary() - _ = yym3937 + if yyq3906[1] { + yym3911 := z.EncBinary() + _ = yym3911 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -49430,36 +49131,36 @@ func (x *SerializedReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3932[1] { + if yyq3906[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3938 := z.EncBinary() - _ = yym3938 + yym3912 := z.EncBinary() + _ = yym3912 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3932 || yy2arr3932 { + if yyr3906 || yy2arr3906 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3932[2] { - yy3940 := &x.Reference - yy3940.CodecEncodeSelf(e) + if yyq3906[2] { + yy3914 := &x.Reference + yy3914.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3932[2] { + if yyq3906[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reference")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3941 := &x.Reference - yy3941.CodecEncodeSelf(e) + yy3915 := &x.Reference + yy3915.CodecEncodeSelf(e) } } - if yyr3932 || yy2arr3932 { + if yyr3906 || yy2arr3906 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -49472,25 +49173,25 @@ func (x *SerializedReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3942 := z.DecBinary() - _ = yym3942 + yym3916 := z.DecBinary() + _ = yym3916 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3943 := r.ContainerType() - if yyct3943 == codecSelferValueTypeMap1234 { - yyl3943 := r.ReadMapStart() - if yyl3943 == 0 { + yyct3917 := r.ContainerType() + if yyct3917 == codecSelferValueTypeMap1234 { + yyl3917 := r.ReadMapStart() + if yyl3917 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3943, d) + x.codecDecodeSelfFromMap(yyl3917, d) } - } else if yyct3943 == codecSelferValueTypeArray1234 { - yyl3943 := r.ReadArrayStart() - if yyl3943 == 0 { + } else if yyct3917 == codecSelferValueTypeArray1234 { + yyl3917 := r.ReadArrayStart() + if yyl3917 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3943, d) + x.codecDecodeSelfFromArray(yyl3917, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -49502,12 +49203,12 @@ func (x *SerializedReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3944Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3944Slc - var yyhl3944 bool = l >= 0 - for yyj3944 := 0; ; yyj3944++ { - if yyhl3944 { - if yyj3944 >= l { + var yys3918Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3918Slc + var yyhl3918 bool = l >= 0 + for yyj3918 := 0; ; yyj3918++ { + if yyhl3918 { + if yyj3918 >= l { break } } else { @@ -49516,10 +49217,10 @@ func (x *SerializedReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3944Slc = r.DecodeBytes(yys3944Slc, true, true) - yys3944 := string(yys3944Slc) + yys3918Slc = r.DecodeBytes(yys3918Slc, true, true) + yys3918 := string(yys3918Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3944 { + switch yys3918 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -49536,13 +49237,13 @@ func (x *SerializedReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Reference = ObjectReference{} } else { - yyv3947 := &x.Reference - yyv3947.CodecDecodeSelf(d) + yyv3921 := &x.Reference + yyv3921.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3944) - } // end switch yys3944 - } // end for yyj3944 + z.DecStructFieldNotFound(-1, yys3918) + } // end switch yys3918 + } // end for yyj3918 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -49550,16 +49251,16 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3948 int - var yyb3948 bool - var yyhl3948 bool = l >= 0 - yyj3948++ - if yyhl3948 { - yyb3948 = yyj3948 > l + var yyj3922 int + var yyb3922 bool + var yyhl3922 bool = l >= 0 + yyj3922++ + if yyhl3922 { + yyb3922 = yyj3922 > l } else { - yyb3948 = r.CheckBreak() + yyb3922 = r.CheckBreak() } - if yyb3948 { + if yyb3922 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49569,13 +49270,13 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Kind = string(r.DecodeString()) } - yyj3948++ - if yyhl3948 { - yyb3948 = yyj3948 > l + yyj3922++ + if yyhl3922 { + yyb3922 = yyj3922 > l } else { - yyb3948 = r.CheckBreak() + yyb3922 = r.CheckBreak() } - if yyb3948 { + if yyb3922 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49585,13 +49286,13 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.APIVersion = string(r.DecodeString()) } - yyj3948++ - if yyhl3948 { - yyb3948 = yyj3948 > l + yyj3922++ + if yyhl3922 { + yyb3922 = yyj3922 > l } else { - yyb3948 = r.CheckBreak() + yyb3922 = r.CheckBreak() } - if yyb3948 { + if yyb3922 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49599,21 +49300,21 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Reference = ObjectReference{} } else { - yyv3951 := &x.Reference - yyv3951.CodecDecodeSelf(d) + yyv3925 := &x.Reference + yyv3925.CodecDecodeSelf(d) } for { - yyj3948++ - if yyhl3948 { - yyb3948 = yyj3948 > l + yyj3922++ + if yyhl3922 { + yyb3922 = yyj3922 > l } else { - yyb3948 = r.CheckBreak() + yyb3922 = r.CheckBreak() } - if yyb3948 { + if yyb3922 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3948-1, "") + z.DecStructFieldNotFound(yyj3922-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -49625,36 +49326,36 @@ func (x *EventSource) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3952 := z.EncBinary() - _ = yym3952 + yym3926 := z.EncBinary() + _ = yym3926 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3953 := !z.EncBinary() - yy2arr3953 := z.EncBasicHandle().StructToArray - var yyq3953 [2]bool - _, _, _ = yysep3953, yyq3953, yy2arr3953 - const yyr3953 bool = false - yyq3953[0] = x.Component != "" - yyq3953[1] = x.Host != "" - var yynn3953 int - if yyr3953 || yy2arr3953 { + yysep3927 := !z.EncBinary() + yy2arr3927 := z.EncBasicHandle().StructToArray + var yyq3927 [2]bool + _, _, _ = yysep3927, yyq3927, yy2arr3927 + const yyr3927 bool = false + yyq3927[0] = x.Component != "" + yyq3927[1] = x.Host != "" + var yynn3927 int + if yyr3927 || yy2arr3927 { r.EncodeArrayStart(2) } else { - yynn3953 = 0 - for _, b := range yyq3953 { + yynn3927 = 0 + for _, b := range yyq3927 { if b { - yynn3953++ + yynn3927++ } } - r.EncodeMapStart(yynn3953) - yynn3953 = 0 + r.EncodeMapStart(yynn3927) + yynn3927 = 0 } - if yyr3953 || yy2arr3953 { + if yyr3927 || yy2arr3927 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3953[0] { - yym3955 := z.EncBinary() - _ = yym3955 + if yyq3927[0] { + yym3929 := z.EncBinary() + _ = yym3929 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Component)) @@ -49663,23 +49364,23 @@ func (x *EventSource) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3953[0] { + if yyq3927[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("component")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3956 := z.EncBinary() - _ = yym3956 + yym3930 := z.EncBinary() + _ = yym3930 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Component)) } } } - if yyr3953 || yy2arr3953 { + if yyr3927 || yy2arr3927 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3953[1] { - yym3958 := z.EncBinary() - _ = yym3958 + if yyq3927[1] { + yym3932 := z.EncBinary() + _ = yym3932 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Host)) @@ -49688,19 +49389,19 @@ func (x *EventSource) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3953[1] { + if yyq3927[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("host")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3959 := z.EncBinary() - _ = yym3959 + yym3933 := z.EncBinary() + _ = yym3933 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Host)) } } } - if yyr3953 || yy2arr3953 { + if yyr3927 || yy2arr3927 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -49713,25 +49414,25 @@ func (x *EventSource) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3960 := z.DecBinary() - _ = yym3960 + yym3934 := z.DecBinary() + _ = yym3934 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3961 := r.ContainerType() - if yyct3961 == codecSelferValueTypeMap1234 { - yyl3961 := r.ReadMapStart() - if yyl3961 == 0 { + yyct3935 := r.ContainerType() + if yyct3935 == codecSelferValueTypeMap1234 { + yyl3935 := r.ReadMapStart() + if yyl3935 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3961, d) + x.codecDecodeSelfFromMap(yyl3935, d) } - } else if yyct3961 == codecSelferValueTypeArray1234 { - yyl3961 := r.ReadArrayStart() - if yyl3961 == 0 { + } else if yyct3935 == codecSelferValueTypeArray1234 { + yyl3935 := r.ReadArrayStart() + if yyl3935 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3961, d) + x.codecDecodeSelfFromArray(yyl3935, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -49743,12 +49444,12 @@ func (x *EventSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3962Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3962Slc - var yyhl3962 bool = l >= 0 - for yyj3962 := 0; ; yyj3962++ { - if yyhl3962 { - if yyj3962 >= l { + var yys3936Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3936Slc + var yyhl3936 bool = l >= 0 + for yyj3936 := 0; ; yyj3936++ { + if yyhl3936 { + if yyj3936 >= l { break } } else { @@ -49757,10 +49458,10 @@ func (x *EventSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3962Slc = r.DecodeBytes(yys3962Slc, true, true) - yys3962 := string(yys3962Slc) + yys3936Slc = r.DecodeBytes(yys3936Slc, true, true) + yys3936 := string(yys3936Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3962 { + switch yys3936 { case "component": if r.TryDecodeAsNil() { x.Component = "" @@ -49774,9 +49475,9 @@ func (x *EventSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Host = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3962) - } // end switch yys3962 - } // end for yyj3962 + z.DecStructFieldNotFound(-1, yys3936) + } // end switch yys3936 + } // end for yyj3936 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -49784,16 +49485,16 @@ func (x *EventSource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3965 int - var yyb3965 bool - var yyhl3965 bool = l >= 0 - yyj3965++ - if yyhl3965 { - yyb3965 = yyj3965 > l + var yyj3939 int + var yyb3939 bool + var yyhl3939 bool = l >= 0 + yyj3939++ + if yyhl3939 { + yyb3939 = yyj3939 > l } else { - yyb3965 = r.CheckBreak() + yyb3939 = r.CheckBreak() } - if yyb3965 { + if yyb3939 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49803,13 +49504,13 @@ func (x *EventSource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Component = string(r.DecodeString()) } - yyj3965++ - if yyhl3965 { - yyb3965 = yyj3965 > l + yyj3939++ + if yyhl3939 { + yyb3939 = yyj3939 > l } else { - yyb3965 = r.CheckBreak() + yyb3939 = r.CheckBreak() } - if yyb3965 { + if yyb3939 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49820,17 +49521,17 @@ func (x *EventSource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Host = string(r.DecodeString()) } for { - yyj3965++ - if yyhl3965 { - yyb3965 = yyj3965 > l + yyj3939++ + if yyhl3939 { + yyb3939 = yyj3939 > l } else { - yyb3965 = r.CheckBreak() + yyb3939 = r.CheckBreak() } - if yyb3965 { + if yyb3939 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3965-1, "") + z.DecStructFieldNotFound(yyj3939-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -49842,45 +49543,45 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3968 := z.EncBinary() - _ = yym3968 + yym3942 := z.EncBinary() + _ = yym3942 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3969 := !z.EncBinary() - yy2arr3969 := z.EncBasicHandle().StructToArray - var yyq3969 [11]bool - _, _, _ = yysep3969, yyq3969, yy2arr3969 - const yyr3969 bool = false - yyq3969[0] = x.Kind != "" - yyq3969[1] = x.APIVersion != "" - yyq3969[2] = true - yyq3969[3] = true - yyq3969[4] = x.Reason != "" - yyq3969[5] = x.Message != "" - yyq3969[6] = true - yyq3969[7] = true - yyq3969[8] = true - yyq3969[9] = x.Count != 0 - yyq3969[10] = x.Type != "" - var yynn3969 int - if yyr3969 || yy2arr3969 { + yysep3943 := !z.EncBinary() + yy2arr3943 := z.EncBasicHandle().StructToArray + var yyq3943 [11]bool + _, _, _ = yysep3943, yyq3943, yy2arr3943 + const yyr3943 bool = false + yyq3943[0] = x.Kind != "" + yyq3943[1] = x.APIVersion != "" + yyq3943[2] = true + yyq3943[3] = true + yyq3943[4] = x.Reason != "" + yyq3943[5] = x.Message != "" + yyq3943[6] = true + yyq3943[7] = true + yyq3943[8] = true + yyq3943[9] = x.Count != 0 + yyq3943[10] = x.Type != "" + var yynn3943 int + if yyr3943 || yy2arr3943 { r.EncodeArrayStart(11) } else { - yynn3969 = 0 - for _, b := range yyq3969 { + yynn3943 = 0 + for _, b := range yyq3943 { if b { - yynn3969++ + yynn3943++ } } - r.EncodeMapStart(yynn3969) - yynn3969 = 0 + r.EncodeMapStart(yynn3943) + yynn3943 = 0 } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[0] { - yym3971 := z.EncBinary() - _ = yym3971 + if yyq3943[0] { + yym3945 := z.EncBinary() + _ = yym3945 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -49889,23 +49590,23 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3969[0] { + if yyq3943[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3972 := z.EncBinary() - _ = yym3972 + yym3946 := z.EncBinary() + _ = yym3946 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[1] { - yym3974 := z.EncBinary() - _ = yym3974 + if yyq3943[1] { + yym3948 := z.EncBinary() + _ = yym3948 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -49914,57 +49615,57 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3969[1] { + if yyq3943[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3975 := z.EncBinary() - _ = yym3975 + yym3949 := z.EncBinary() + _ = yym3949 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[2] { - yy3977 := &x.ObjectMeta - yy3977.CodecEncodeSelf(e) + if yyq3943[2] { + yy3951 := &x.ObjectMeta + yy3951.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3969[2] { + if yyq3943[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3978 := &x.ObjectMeta - yy3978.CodecEncodeSelf(e) + yy3952 := &x.ObjectMeta + yy3952.CodecEncodeSelf(e) } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[3] { - yy3980 := &x.InvolvedObject - yy3980.CodecEncodeSelf(e) + if yyq3943[3] { + yy3954 := &x.InvolvedObject + yy3954.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3969[3] { + if yyq3943[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("involvedObject")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3981 := &x.InvolvedObject - yy3981.CodecEncodeSelf(e) + yy3955 := &x.InvolvedObject + yy3955.CodecEncodeSelf(e) } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[4] { - yym3983 := z.EncBinary() - _ = yym3983 + if yyq3943[4] { + yym3957 := z.EncBinary() + _ = yym3957 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Reason)) @@ -49973,23 +49674,23 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3969[4] { + if yyq3943[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reason")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3984 := z.EncBinary() - _ = yym3984 + yym3958 := z.EncBinary() + _ = yym3958 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Reason)) } } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[5] { - yym3986 := z.EncBinary() - _ = yym3986 + if yyq3943[5] { + yym3960 := z.EncBinary() + _ = yym3960 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) @@ -49998,114 +49699,114 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3969[5] { + if yyq3943[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("message")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3987 := z.EncBinary() - _ = yym3987 + yym3961 := z.EncBinary() + _ = yym3961 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) } } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[6] { - yy3989 := &x.Source - yy3989.CodecEncodeSelf(e) + if yyq3943[6] { + yy3963 := &x.Source + yy3963.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3969[6] { + if yyq3943[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("source")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3990 := &x.Source - yy3990.CodecEncodeSelf(e) + yy3964 := &x.Source + yy3964.CodecEncodeSelf(e) } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[7] { - yy3992 := &x.FirstTimestamp - yym3993 := z.EncBinary() - _ = yym3993 + if yyq3943[7] { + yy3966 := &x.FirstTimestamp + yym3967 := z.EncBinary() + _ = yym3967 if false { - } else if z.HasExtensions() && z.EncExt(yy3992) { - } else if yym3993 { - z.EncBinaryMarshal(yy3992) - } else if !yym3993 && z.IsJSONHandle() { - z.EncJSONMarshal(yy3992) + } else if z.HasExtensions() && z.EncExt(yy3966) { + } else if yym3967 { + z.EncBinaryMarshal(yy3966) + } else if !yym3967 && z.IsJSONHandle() { + z.EncJSONMarshal(yy3966) } else { - z.EncFallback(yy3992) + z.EncFallback(yy3966) } } else { r.EncodeNil() } } else { - if yyq3969[7] { + if yyq3943[7] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("firstTimestamp")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3994 := &x.FirstTimestamp - yym3995 := z.EncBinary() - _ = yym3995 + yy3968 := &x.FirstTimestamp + yym3969 := z.EncBinary() + _ = yym3969 if false { - } else if z.HasExtensions() && z.EncExt(yy3994) { - } else if yym3995 { - z.EncBinaryMarshal(yy3994) - } else if !yym3995 && z.IsJSONHandle() { - z.EncJSONMarshal(yy3994) + } else if z.HasExtensions() && z.EncExt(yy3968) { + } else if yym3969 { + z.EncBinaryMarshal(yy3968) + } else if !yym3969 && z.IsJSONHandle() { + z.EncJSONMarshal(yy3968) } else { - z.EncFallback(yy3994) + z.EncFallback(yy3968) } } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[8] { - yy3997 := &x.LastTimestamp - yym3998 := z.EncBinary() - _ = yym3998 + if yyq3943[8] { + yy3971 := &x.LastTimestamp + yym3972 := z.EncBinary() + _ = yym3972 if false { - } else if z.HasExtensions() && z.EncExt(yy3997) { - } else if yym3998 { - z.EncBinaryMarshal(yy3997) - } else if !yym3998 && z.IsJSONHandle() { - z.EncJSONMarshal(yy3997) + } else if z.HasExtensions() && z.EncExt(yy3971) { + } else if yym3972 { + z.EncBinaryMarshal(yy3971) + } else if !yym3972 && z.IsJSONHandle() { + z.EncJSONMarshal(yy3971) } else { - z.EncFallback(yy3997) + z.EncFallback(yy3971) } } else { r.EncodeNil() } } else { - if yyq3969[8] { + if yyq3943[8] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lastTimestamp")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3999 := &x.LastTimestamp - yym4000 := z.EncBinary() - _ = yym4000 + yy3973 := &x.LastTimestamp + yym3974 := z.EncBinary() + _ = yym3974 if false { - } else if z.HasExtensions() && z.EncExt(yy3999) { - } else if yym4000 { - z.EncBinaryMarshal(yy3999) - } else if !yym4000 && z.IsJSONHandle() { - z.EncJSONMarshal(yy3999) + } else if z.HasExtensions() && z.EncExt(yy3973) { + } else if yym3974 { + z.EncBinaryMarshal(yy3973) + } else if !yym3974 && z.IsJSONHandle() { + z.EncJSONMarshal(yy3973) } else { - z.EncFallback(yy3999) + z.EncFallback(yy3973) } } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[9] { - yym4002 := z.EncBinary() - _ = yym4002 + if yyq3943[9] { + yym3976 := z.EncBinary() + _ = yym3976 if false { } else { r.EncodeInt(int64(x.Count)) @@ -50114,23 +49815,23 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq3969[9] { + if yyq3943[9] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("count")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4003 := z.EncBinary() - _ = yym4003 + yym3977 := z.EncBinary() + _ = yym3977 if false { } else { r.EncodeInt(int64(x.Count)) } } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3969[10] { - yym4005 := z.EncBinary() - _ = yym4005 + if yyq3943[10] { + yym3979 := z.EncBinary() + _ = yym3979 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) @@ -50139,19 +49840,19 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3969[10] { + if yyq3943[10] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4006 := z.EncBinary() - _ = yym4006 + yym3980 := z.EncBinary() + _ = yym3980 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) } } } - if yyr3969 || yy2arr3969 { + if yyr3943 || yy2arr3943 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -50164,25 +49865,25 @@ func (x *Event) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4007 := z.DecBinary() - _ = yym4007 + yym3981 := z.DecBinary() + _ = yym3981 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4008 := r.ContainerType() - if yyct4008 == codecSelferValueTypeMap1234 { - yyl4008 := r.ReadMapStart() - if yyl4008 == 0 { + yyct3982 := r.ContainerType() + if yyct3982 == codecSelferValueTypeMap1234 { + yyl3982 := r.ReadMapStart() + if yyl3982 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4008, d) + x.codecDecodeSelfFromMap(yyl3982, d) } - } else if yyct4008 == codecSelferValueTypeArray1234 { - yyl4008 := r.ReadArrayStart() - if yyl4008 == 0 { + } else if yyct3982 == codecSelferValueTypeArray1234 { + yyl3982 := r.ReadArrayStart() + if yyl3982 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4008, d) + x.codecDecodeSelfFromArray(yyl3982, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -50194,12 +49895,12 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4009Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4009Slc - var yyhl4009 bool = l >= 0 - for yyj4009 := 0; ; yyj4009++ { - if yyhl4009 { - if yyj4009 >= l { + var yys3983Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3983Slc + var yyhl3983 bool = l >= 0 + for yyj3983 := 0; ; yyj3983++ { + if yyhl3983 { + if yyj3983 >= l { break } } else { @@ -50208,10 +49909,10 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4009Slc = r.DecodeBytes(yys4009Slc, true, true) - yys4009 := string(yys4009Slc) + yys3983Slc = r.DecodeBytes(yys3983Slc, true, true) + yys3983 := string(yys3983Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4009 { + switch yys3983 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -50228,15 +49929,15 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4012 := &x.ObjectMeta - yyv4012.CodecDecodeSelf(d) + yyv3986 := &x.ObjectMeta + yyv3986.CodecDecodeSelf(d) } case "involvedObject": if r.TryDecodeAsNil() { x.InvolvedObject = ObjectReference{} } else { - yyv4013 := &x.InvolvedObject - yyv4013.CodecDecodeSelf(d) + yyv3987 := &x.InvolvedObject + yyv3987.CodecDecodeSelf(d) } case "reason": if r.TryDecodeAsNil() { @@ -50254,41 +49955,41 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Source = EventSource{} } else { - yyv4016 := &x.Source - yyv4016.CodecDecodeSelf(d) + yyv3990 := &x.Source + yyv3990.CodecDecodeSelf(d) } case "firstTimestamp": if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { - yyv4017 := &x.FirstTimestamp - yym4018 := z.DecBinary() - _ = yym4018 + yyv3991 := &x.FirstTimestamp + yym3992 := z.DecBinary() + _ = yym3992 if false { - } else if z.HasExtensions() && z.DecExt(yyv4017) { - } else if yym4018 { - z.DecBinaryUnmarshal(yyv4017) - } else if !yym4018 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4017) + } else if z.HasExtensions() && z.DecExt(yyv3991) { + } else if yym3992 { + z.DecBinaryUnmarshal(yyv3991) + } else if !yym3992 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv3991) } else { - z.DecFallback(yyv4017, false) + z.DecFallback(yyv3991, false) } } case "lastTimestamp": if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { - yyv4019 := &x.LastTimestamp - yym4020 := z.DecBinary() - _ = yym4020 + yyv3993 := &x.LastTimestamp + yym3994 := z.DecBinary() + _ = yym3994 if false { - } else if z.HasExtensions() && z.DecExt(yyv4019) { - } else if yym4020 { - z.DecBinaryUnmarshal(yyv4019) - } else if !yym4020 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4019) + } else if z.HasExtensions() && z.DecExt(yyv3993) { + } else if yym3994 { + z.DecBinaryUnmarshal(yyv3993) + } else if !yym3994 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv3993) } else { - z.DecFallback(yyv4019, false) + z.DecFallback(yyv3993, false) } } case "count": @@ -50304,9 +50005,9 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Type = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys4009) - } // end switch yys4009 - } // end for yyj4009 + z.DecStructFieldNotFound(-1, yys3983) + } // end switch yys3983 + } // end for yyj3983 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -50314,16 +50015,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4023 int - var yyb4023 bool - var yyhl4023 bool = l >= 0 - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + var yyj3997 int + var yyb3997 bool + var yyhl3997 bool = l >= 0 + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50333,13 +50034,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50349,13 +50050,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50363,16 +50064,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4026 := &x.ObjectMeta - yyv4026.CodecDecodeSelf(d) + yyv4000 := &x.ObjectMeta + yyv4000.CodecDecodeSelf(d) } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50380,16 +50081,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.InvolvedObject = ObjectReference{} } else { - yyv4027 := &x.InvolvedObject - yyv4027.CodecDecodeSelf(d) + yyv4001 := &x.InvolvedObject + yyv4001.CodecDecodeSelf(d) } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50399,13 +50100,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Reason = string(r.DecodeString()) } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50415,13 +50116,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Message = string(r.DecodeString()) } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50429,70 +50130,70 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Source = EventSource{} } else { - yyv4030 := &x.Source - yyv4030.CodecDecodeSelf(d) + yyv4004 := &x.Source + yyv4004.CodecDecodeSelf(d) } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { - yyv4031 := &x.FirstTimestamp - yym4032 := z.DecBinary() - _ = yym4032 + yyv4005 := &x.FirstTimestamp + yym4006 := z.DecBinary() + _ = yym4006 if false { - } else if z.HasExtensions() && z.DecExt(yyv4031) { - } else if yym4032 { - z.DecBinaryUnmarshal(yyv4031) - } else if !yym4032 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4031) + } else if z.HasExtensions() && z.DecExt(yyv4005) { + } else if yym4006 { + z.DecBinaryUnmarshal(yyv4005) + } else if !yym4006 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv4005) } else { - z.DecFallback(yyv4031, false) + z.DecFallback(yyv4005, false) } } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { - yyv4033 := &x.LastTimestamp - yym4034 := z.DecBinary() - _ = yym4034 + yyv4007 := &x.LastTimestamp + yym4008 := z.DecBinary() + _ = yym4008 if false { - } else if z.HasExtensions() && z.DecExt(yyv4033) { - } else if yym4034 { - z.DecBinaryUnmarshal(yyv4033) - } else if !yym4034 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4033) + } else if z.HasExtensions() && z.DecExt(yyv4007) { + } else if yym4008 { + z.DecBinaryUnmarshal(yyv4007) + } else if !yym4008 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv4007) } else { - z.DecFallback(yyv4033, false) + z.DecFallback(yyv4007, false) } } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50502,13 +50203,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Count = int32(r.DecodeInt(32)) } - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50519,17 +50220,17 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Type = string(r.DecodeString()) } for { - yyj4023++ - if yyhl4023 { - yyb4023 = yyj4023 > l + yyj3997++ + if yyhl3997 { + yyb3997 = yyj3997 > l } else { - yyb4023 = r.CheckBreak() + yyb3997 = r.CheckBreak() } - if yyb4023 { + if yyb3997 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4023-1, "") + z.DecStructFieldNotFound(yyj3997-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -50541,37 +50242,37 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4037 := z.EncBinary() - _ = yym4037 + yym4011 := z.EncBinary() + _ = yym4011 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4038 := !z.EncBinary() - yy2arr4038 := z.EncBasicHandle().StructToArray - var yyq4038 [4]bool - _, _, _ = yysep4038, yyq4038, yy2arr4038 - const yyr4038 bool = false - yyq4038[0] = x.Kind != "" - yyq4038[1] = x.APIVersion != "" - yyq4038[2] = true - var yynn4038 int - if yyr4038 || yy2arr4038 { + yysep4012 := !z.EncBinary() + yy2arr4012 := z.EncBasicHandle().StructToArray + var yyq4012 [4]bool + _, _, _ = yysep4012, yyq4012, yy2arr4012 + const yyr4012 bool = false + yyq4012[0] = x.Kind != "" + yyq4012[1] = x.APIVersion != "" + yyq4012[2] = true + var yynn4012 int + if yyr4012 || yy2arr4012 { r.EncodeArrayStart(4) } else { - yynn4038 = 1 - for _, b := range yyq4038 { + yynn4012 = 1 + for _, b := range yyq4012 { if b { - yynn4038++ + yynn4012++ } } - r.EncodeMapStart(yynn4038) - yynn4038 = 0 + r.EncodeMapStart(yynn4012) + yynn4012 = 0 } - if yyr4038 || yy2arr4038 { + if yyr4012 || yy2arr4012 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4038[0] { - yym4040 := z.EncBinary() - _ = yym4040 + if yyq4012[0] { + yym4014 := z.EncBinary() + _ = yym4014 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -50580,23 +50281,23 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4038[0] { + if yyq4012[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4041 := z.EncBinary() - _ = yym4041 + yym4015 := z.EncBinary() + _ = yym4015 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4038 || yy2arr4038 { + if yyr4012 || yy2arr4012 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4038[1] { - yym4043 := z.EncBinary() - _ = yym4043 + if yyq4012[1] { + yym4017 := z.EncBinary() + _ = yym4017 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -50605,54 +50306,54 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4038[1] { + if yyq4012[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4044 := z.EncBinary() - _ = yym4044 + yym4018 := z.EncBinary() + _ = yym4018 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4038 || yy2arr4038 { + if yyr4012 || yy2arr4012 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4038[2] { - yy4046 := &x.ListMeta - yym4047 := z.EncBinary() - _ = yym4047 + if yyq4012[2] { + yy4020 := &x.ListMeta + yym4021 := z.EncBinary() + _ = yym4021 if false { - } else if z.HasExtensions() && z.EncExt(yy4046) { + } else if z.HasExtensions() && z.EncExt(yy4020) { } else { - z.EncFallback(yy4046) + z.EncFallback(yy4020) } } else { r.EncodeNil() } } else { - if yyq4038[2] { + if yyq4012[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4048 := &x.ListMeta - yym4049 := z.EncBinary() - _ = yym4049 + yy4022 := &x.ListMeta + yym4023 := z.EncBinary() + _ = yym4023 if false { - } else if z.HasExtensions() && z.EncExt(yy4048) { + } else if z.HasExtensions() && z.EncExt(yy4022) { } else { - z.EncFallback(yy4048) + z.EncFallback(yy4022) } } } - if yyr4038 || yy2arr4038 { + if yyr4012 || yy2arr4012 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4051 := z.EncBinary() - _ = yym4051 + yym4025 := z.EncBinary() + _ = yym4025 if false { } else { h.encSliceEvent(([]Event)(x.Items), e) @@ -50665,15 +50366,15 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4052 := z.EncBinary() - _ = yym4052 + yym4026 := z.EncBinary() + _ = yym4026 if false { } else { h.encSliceEvent(([]Event)(x.Items), e) } } } - if yyr4038 || yy2arr4038 { + if yyr4012 || yy2arr4012 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -50686,25 +50387,25 @@ func (x *EventList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4053 := z.DecBinary() - _ = yym4053 + yym4027 := z.DecBinary() + _ = yym4027 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4054 := r.ContainerType() - if yyct4054 == codecSelferValueTypeMap1234 { - yyl4054 := r.ReadMapStart() - if yyl4054 == 0 { + yyct4028 := r.ContainerType() + if yyct4028 == codecSelferValueTypeMap1234 { + yyl4028 := r.ReadMapStart() + if yyl4028 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4054, d) + x.codecDecodeSelfFromMap(yyl4028, d) } - } else if yyct4054 == codecSelferValueTypeArray1234 { - yyl4054 := r.ReadArrayStart() - if yyl4054 == 0 { + } else if yyct4028 == codecSelferValueTypeArray1234 { + yyl4028 := r.ReadArrayStart() + if yyl4028 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4054, d) + x.codecDecodeSelfFromArray(yyl4028, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -50716,12 +50417,12 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4055Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4055Slc - var yyhl4055 bool = l >= 0 - for yyj4055 := 0; ; yyj4055++ { - if yyhl4055 { - if yyj4055 >= l { + var yys4029Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4029Slc + var yyhl4029 bool = l >= 0 + for yyj4029 := 0; ; yyj4029++ { + if yyhl4029 { + if yyj4029 >= l { break } } else { @@ -50730,10 +50431,10 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4055Slc = r.DecodeBytes(yys4055Slc, true, true) - yys4055 := string(yys4055Slc) + yys4029Slc = r.DecodeBytes(yys4029Slc, true, true) + yys4029 := string(yys4029Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4055 { + switch yys4029 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -50748,33 +50449,33 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4058 := &x.ListMeta - yym4059 := z.DecBinary() - _ = yym4059 + yyv4032 := &x.ListMeta + yym4033 := z.DecBinary() + _ = yym4033 if false { - } else if z.HasExtensions() && z.DecExt(yyv4058) { + } else if z.HasExtensions() && z.DecExt(yyv4032) { } else { - z.DecFallback(yyv4058, false) + z.DecFallback(yyv4032, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4060 := &x.Items - yym4061 := z.DecBinary() - _ = yym4061 + yyv4034 := &x.Items + yym4035 := z.DecBinary() + _ = yym4035 if false { } else { - h.decSliceEvent((*[]Event)(yyv4060), d) + h.decSliceEvent((*[]Event)(yyv4034), d) } } default: - z.DecStructFieldNotFound(-1, yys4055) - } // end switch yys4055 - } // end for yyj4055 + z.DecStructFieldNotFound(-1, yys4029) + } // end switch yys4029 + } // end for yyj4029 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -50782,16 +50483,16 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4062 int - var yyb4062 bool - var yyhl4062 bool = l >= 0 - yyj4062++ - if yyhl4062 { - yyb4062 = yyj4062 > l + var yyj4036 int + var yyb4036 bool + var yyhl4036 bool = l >= 0 + yyj4036++ + if yyhl4036 { + yyb4036 = yyj4036 > l } else { - yyb4062 = r.CheckBreak() + yyb4036 = r.CheckBreak() } - if yyb4062 { + if yyb4036 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50801,13 +50502,13 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4062++ - if yyhl4062 { - yyb4062 = yyj4062 > l + yyj4036++ + if yyhl4036 { + yyb4036 = yyj4036 > l } else { - yyb4062 = r.CheckBreak() + yyb4036 = r.CheckBreak() } - if yyb4062 { + if yyb4036 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50817,36 +50518,36 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4062++ - if yyhl4062 { - yyb4062 = yyj4062 > l + yyj4036++ + if yyhl4036 { + yyb4036 = yyj4036 > l } else { - yyb4062 = r.CheckBreak() + yyb4036 = r.CheckBreak() } - if yyb4062 { + if yyb4036 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4065 := &x.ListMeta - yym4066 := z.DecBinary() - _ = yym4066 + yyv4039 := &x.ListMeta + yym4040 := z.DecBinary() + _ = yym4040 if false { - } else if z.HasExtensions() && z.DecExt(yyv4065) { + } else if z.HasExtensions() && z.DecExt(yyv4039) { } else { - z.DecFallback(yyv4065, false) + z.DecFallback(yyv4039, false) } } - yyj4062++ - if yyhl4062 { - yyb4062 = yyj4062 > l + yyj4036++ + if yyhl4036 { + yyb4036 = yyj4036 > l } else { - yyb4062 = r.CheckBreak() + yyb4036 = r.CheckBreak() } - if yyb4062 { + if yyb4036 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50854,26 +50555,26 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4067 := &x.Items - yym4068 := z.DecBinary() - _ = yym4068 + yyv4041 := &x.Items + yym4042 := z.DecBinary() + _ = yym4042 if false { } else { - h.decSliceEvent((*[]Event)(yyv4067), d) + h.decSliceEvent((*[]Event)(yyv4041), d) } } for { - yyj4062++ - if yyhl4062 { - yyb4062 = yyj4062 > l + yyj4036++ + if yyhl4036 { + yyb4036 = yyj4036 > l } else { - yyb4062 = r.CheckBreak() + yyb4036 = r.CheckBreak() } - if yyb4062 { + if yyb4036 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4062-1, "") + z.DecStructFieldNotFound(yyj4036-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -50885,37 +50586,37 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4069 := z.EncBinary() - _ = yym4069 + yym4043 := z.EncBinary() + _ = yym4043 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4070 := !z.EncBinary() - yy2arr4070 := z.EncBasicHandle().StructToArray - var yyq4070 [4]bool - _, _, _ = yysep4070, yyq4070, yy2arr4070 - const yyr4070 bool = false - yyq4070[0] = x.Kind != "" - yyq4070[1] = x.APIVersion != "" - yyq4070[2] = true - var yynn4070 int - if yyr4070 || yy2arr4070 { + yysep4044 := !z.EncBinary() + yy2arr4044 := z.EncBasicHandle().StructToArray + var yyq4044 [4]bool + _, _, _ = yysep4044, yyq4044, yy2arr4044 + const yyr4044 bool = false + yyq4044[0] = x.Kind != "" + yyq4044[1] = x.APIVersion != "" + yyq4044[2] = true + var yynn4044 int + if yyr4044 || yy2arr4044 { r.EncodeArrayStart(4) } else { - yynn4070 = 1 - for _, b := range yyq4070 { + yynn4044 = 1 + for _, b := range yyq4044 { if b { - yynn4070++ + yynn4044++ } } - r.EncodeMapStart(yynn4070) - yynn4070 = 0 + r.EncodeMapStart(yynn4044) + yynn4044 = 0 } - if yyr4070 || yy2arr4070 { + if yyr4044 || yy2arr4044 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4070[0] { - yym4072 := z.EncBinary() - _ = yym4072 + if yyq4044[0] { + yym4046 := z.EncBinary() + _ = yym4046 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -50924,23 +50625,23 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4070[0] { + if yyq4044[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4073 := z.EncBinary() - _ = yym4073 + yym4047 := z.EncBinary() + _ = yym4047 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4070 || yy2arr4070 { + if yyr4044 || yy2arr4044 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4070[1] { - yym4075 := z.EncBinary() - _ = yym4075 + if yyq4044[1] { + yym4049 := z.EncBinary() + _ = yym4049 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -50949,54 +50650,54 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4070[1] { + if yyq4044[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4076 := z.EncBinary() - _ = yym4076 + yym4050 := z.EncBinary() + _ = yym4050 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4070 || yy2arr4070 { + if yyr4044 || yy2arr4044 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4070[2] { - yy4078 := &x.ListMeta - yym4079 := z.EncBinary() - _ = yym4079 + if yyq4044[2] { + yy4052 := &x.ListMeta + yym4053 := z.EncBinary() + _ = yym4053 if false { - } else if z.HasExtensions() && z.EncExt(yy4078) { + } else if z.HasExtensions() && z.EncExt(yy4052) { } else { - z.EncFallback(yy4078) + z.EncFallback(yy4052) } } else { r.EncodeNil() } } else { - if yyq4070[2] { + if yyq4044[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4080 := &x.ListMeta - yym4081 := z.EncBinary() - _ = yym4081 + yy4054 := &x.ListMeta + yym4055 := z.EncBinary() + _ = yym4055 if false { - } else if z.HasExtensions() && z.EncExt(yy4080) { + } else if z.HasExtensions() && z.EncExt(yy4054) { } else { - z.EncFallback(yy4080) + z.EncFallback(yy4054) } } } - if yyr4070 || yy2arr4070 { + if yyr4044 || yy2arr4044 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4083 := z.EncBinary() - _ = yym4083 + yym4057 := z.EncBinary() + _ = yym4057 if false { } else { h.encSliceruntime_Object(([]pkg7_runtime.Object)(x.Items), e) @@ -51009,15 +50710,15 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4084 := z.EncBinary() - _ = yym4084 + yym4058 := z.EncBinary() + _ = yym4058 if false { } else { h.encSliceruntime_Object(([]pkg7_runtime.Object)(x.Items), e) } } } - if yyr4070 || yy2arr4070 { + if yyr4044 || yy2arr4044 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -51027,6 +50728,403 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *List) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym4059 := z.DecBinary() + _ = yym4059 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct4060 := r.ContainerType() + if yyct4060 == codecSelferValueTypeMap1234 { + yyl4060 := r.ReadMapStart() + if yyl4060 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl4060, d) + } + } else if yyct4060 == codecSelferValueTypeArray1234 { + yyl4060 := r.ReadArrayStart() + if yyl4060 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl4060, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys4061Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4061Slc + var yyhl4061 bool = l >= 0 + for yyj4061 := 0; ; yyj4061++ { + if yyhl4061 { + if yyj4061 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys4061Slc = r.DecodeBytes(yys4061Slc, true, true) + yys4061 := string(yys4061Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys4061 { + case "kind": + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + case "apiVersion": + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + case "metadata": + if r.TryDecodeAsNil() { + x.ListMeta = pkg2_v1.ListMeta{} + } else { + yyv4064 := &x.ListMeta + yym4065 := z.DecBinary() + _ = yym4065 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4064) { + } else { + z.DecFallback(yyv4064, false) + } + } + case "items": + if r.TryDecodeAsNil() { + x.Items = nil + } else { + yyv4066 := &x.Items + yym4067 := z.DecBinary() + _ = yym4067 + if false { + } else { + h.decSliceruntime_Object((*[]pkg7_runtime.Object)(yyv4066), d) + } + } + default: + z.DecStructFieldNotFound(-1, yys4061) + } // end switch yys4061 + } // end for yyj4061 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj4068 int + var yyb4068 bool + var yyhl4068 bool = l >= 0 + yyj4068++ + if yyhl4068 { + yyb4068 = yyj4068 > l + } else { + yyb4068 = r.CheckBreak() + } + if yyb4068 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + yyj4068++ + if yyhl4068 { + yyb4068 = yyj4068 > l + } else { + yyb4068 = r.CheckBreak() + } + if yyb4068 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + yyj4068++ + if yyhl4068 { + yyb4068 = yyj4068 > l + } else { + yyb4068 = r.CheckBreak() + } + if yyb4068 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ListMeta = pkg2_v1.ListMeta{} + } else { + yyv4071 := &x.ListMeta + yym4072 := z.DecBinary() + _ = yym4072 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4071) { + } else { + z.DecFallback(yyv4071, false) + } + } + yyj4068++ + if yyhl4068 { + yyb4068 = yyj4068 > l + } else { + yyb4068 = r.CheckBreak() + } + if yyb4068 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Items = nil + } else { + yyv4073 := &x.Items + yym4074 := z.DecBinary() + _ = yym4074 + if false { + } else { + h.decSliceruntime_Object((*[]pkg7_runtime.Object)(yyv4073), d) + } + } + for { + yyj4068++ + if yyhl4068 { + yyb4068 = yyj4068 > l + } else { + yyb4068 = r.CheckBreak() + } + if yyb4068 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj4068-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x LimitType) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + yym4075 := z.EncBinary() + _ = yym4075 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x)) + } +} + +func (x *LimitType) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym4076 := z.DecBinary() + _ = yym4076 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + *((*string)(x)) = r.DecodeString() + } +} + +func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym4077 := z.EncBinary() + _ = yym4077 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep4078 := !z.EncBinary() + yy2arr4078 := z.EncBasicHandle().StructToArray + var yyq4078 [6]bool + _, _, _ = yysep4078, yyq4078, yy2arr4078 + const yyr4078 bool = false + yyq4078[0] = x.Type != "" + yyq4078[1] = len(x.Max) != 0 + yyq4078[2] = len(x.Min) != 0 + yyq4078[3] = len(x.Default) != 0 + yyq4078[4] = len(x.DefaultRequest) != 0 + yyq4078[5] = len(x.MaxLimitRequestRatio) != 0 + var yynn4078 int + if yyr4078 || yy2arr4078 { + r.EncodeArrayStart(6) + } else { + yynn4078 = 0 + for _, b := range yyq4078 { + if b { + yynn4078++ + } + } + r.EncodeMapStart(yynn4078) + yynn4078 = 0 + } + if yyr4078 || yy2arr4078 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4078[0] { + x.Type.CodecEncodeSelf(e) + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4078[0] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("type")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + x.Type.CodecEncodeSelf(e) + } + } + if yyr4078 || yy2arr4078 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4078[1] { + if x.Max == nil { + r.EncodeNil() + } else { + x.Max.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4078[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("max")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Max == nil { + r.EncodeNil() + } else { + x.Max.CodecEncodeSelf(e) + } + } + } + if yyr4078 || yy2arr4078 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4078[2] { + if x.Min == nil { + r.EncodeNil() + } else { + x.Min.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4078[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("min")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Min == nil { + r.EncodeNil() + } else { + x.Min.CodecEncodeSelf(e) + } + } + } + if yyr4078 || yy2arr4078 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4078[3] { + if x.Default == nil { + r.EncodeNil() + } else { + x.Default.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4078[3] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("default")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Default == nil { + r.EncodeNil() + } else { + x.Default.CodecEncodeSelf(e) + } + } + } + if yyr4078 || yy2arr4078 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4078[4] { + if x.DefaultRequest == nil { + r.EncodeNil() + } else { + x.DefaultRequest.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4078[4] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("defaultRequest")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.DefaultRequest == nil { + r.EncodeNil() + } else { + x.DefaultRequest.CodecEncodeSelf(e) + } + } + } + if yyr4078 || yy2arr4078 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4078[5] { + if x.MaxLimitRequestRatio == nil { + r.EncodeNil() + } else { + x.MaxLimitRequestRatio.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4078[5] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("maxLimitRequestRatio")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.MaxLimitRequestRatio == nil { + r.EncodeNil() + } else { + x.MaxLimitRequestRatio.CodecEncodeSelf(e) + } + } + } + if yyr4078 || yy2arr4078 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + +func (x *LimitRangeItem) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -51056,7 +51154,7 @@ func (x *List) CodecDecodeSelf(d *codec1978.Decoder) { } } -func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { +func (x *LimitRangeItem) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -51078,42 +51176,46 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { yys4087 := string(yys4087Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) switch yys4087 { - case "kind": + case "type": if r.TryDecodeAsNil() { - x.Kind = "" + x.Type = "" } else { - x.Kind = string(r.DecodeString()) + x.Type = LimitType(r.DecodeString()) } - case "apiVersion": + case "max": if r.TryDecodeAsNil() { - x.APIVersion = "" + x.Max = nil } else { - x.APIVersion = string(r.DecodeString()) + yyv4089 := &x.Max + yyv4089.CodecDecodeSelf(d) } - case "metadata": + case "min": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.Min = nil } else { - yyv4090 := &x.ListMeta - yym4091 := z.DecBinary() - _ = yym4091 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4090) { - } else { - z.DecFallback(yyv4090, false) - } + yyv4090 := &x.Min + yyv4090.CodecDecodeSelf(d) } - case "items": + case "default": if r.TryDecodeAsNil() { - x.Items = nil + x.Default = nil } else { - yyv4092 := &x.Items - yym4093 := z.DecBinary() - _ = yym4093 - if false { - } else { - h.decSliceruntime_Object((*[]pkg7_runtime.Object)(yyv4092), d) - } + yyv4091 := &x.Default + yyv4091.CodecDecodeSelf(d) + } + case "defaultRequest": + if r.TryDecodeAsNil() { + x.DefaultRequest = nil + } else { + yyv4092 := &x.DefaultRequest + yyv4092.CodecDecodeSelf(d) + } + case "maxLimitRequestRatio": + if r.TryDecodeAsNil() { + x.MaxLimitRequestRatio = nil + } else { + yyv4093 := &x.MaxLimitRequestRatio + yyv4093.CodecDecodeSelf(d) } default: z.DecStructFieldNotFound(-1, yys4087) @@ -51122,7 +51224,7 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } -func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { +func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -51141,9 +51243,9 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Kind = "" + x.Type = "" } else { - x.Kind = string(r.DecodeString()) + x.Type = LimitType(r.DecodeString()) } yyj4094++ if yyhl4094 { @@ -51157,9 +51259,10 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.APIVersion = "" + x.Max = nil } else { - x.APIVersion = string(r.DecodeString()) + yyv4096 := &x.Max + yyv4096.CodecDecodeSelf(d) } yyj4094++ if yyhl4094 { @@ -51173,16 +51276,10 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.Min = nil } else { - yyv4097 := &x.ListMeta - yym4098 := z.DecBinary() - _ = yym4098 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4097) { - } else { - z.DecFallback(yyv4097, false) - } + yyv4097 := &x.Min + yyv4097.CodecDecodeSelf(d) } yyj4094++ if yyhl4094 { @@ -51196,15 +51293,44 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Items = nil + x.Default = nil } else { - yyv4099 := &x.Items - yym4100 := z.DecBinary() - _ = yym4100 - if false { - } else { - h.decSliceruntime_Object((*[]pkg7_runtime.Object)(yyv4099), d) - } + yyv4098 := &x.Default + yyv4098.CodecDecodeSelf(d) + } + yyj4094++ + if yyhl4094 { + yyb4094 = yyj4094 > l + } else { + yyb4094 = r.CheckBreak() + } + if yyb4094 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.DefaultRequest = nil + } else { + yyv4099 := &x.DefaultRequest + yyv4099.CodecDecodeSelf(d) + } + yyj4094++ + if yyhl4094 { + yyb4094 = yyj4094 > l + } else { + yyb4094 = r.CheckBreak() + } + if yyb4094 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.MaxLimitRequestRatio = nil + } else { + yyv4100 := &x.MaxLimitRequestRatio + yyv4100.CodecDecodeSelf(d) } for { yyj4094++ @@ -51222,431 +51348,6 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x LimitType) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - yym4101 := z.EncBinary() - _ = yym4101 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x)) - } -} - -func (x *LimitType) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4102 := z.DecBinary() - _ = yym4102 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - *((*string)(x)) = r.DecodeString() - } -} - -func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym4103 := z.EncBinary() - _ = yym4103 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep4104 := !z.EncBinary() - yy2arr4104 := z.EncBasicHandle().StructToArray - var yyq4104 [6]bool - _, _, _ = yysep4104, yyq4104, yy2arr4104 - const yyr4104 bool = false - yyq4104[0] = x.Type != "" - yyq4104[1] = len(x.Max) != 0 - yyq4104[2] = len(x.Min) != 0 - yyq4104[3] = len(x.Default) != 0 - yyq4104[4] = len(x.DefaultRequest) != 0 - yyq4104[5] = len(x.MaxLimitRequestRatio) != 0 - var yynn4104 int - if yyr4104 || yy2arr4104 { - r.EncodeArrayStart(6) - } else { - yynn4104 = 0 - for _, b := range yyq4104 { - if b { - yynn4104++ - } - } - r.EncodeMapStart(yynn4104) - yynn4104 = 0 - } - if yyr4104 || yy2arr4104 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4104[0] { - x.Type.CodecEncodeSelf(e) - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4104[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("type")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - x.Type.CodecEncodeSelf(e) - } - } - if yyr4104 || yy2arr4104 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4104[1] { - if x.Max == nil { - r.EncodeNil() - } else { - x.Max.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4104[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("max")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Max == nil { - r.EncodeNil() - } else { - x.Max.CodecEncodeSelf(e) - } - } - } - if yyr4104 || yy2arr4104 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4104[2] { - if x.Min == nil { - r.EncodeNil() - } else { - x.Min.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4104[2] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("min")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Min == nil { - r.EncodeNil() - } else { - x.Min.CodecEncodeSelf(e) - } - } - } - if yyr4104 || yy2arr4104 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4104[3] { - if x.Default == nil { - r.EncodeNil() - } else { - x.Default.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4104[3] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("default")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Default == nil { - r.EncodeNil() - } else { - x.Default.CodecEncodeSelf(e) - } - } - } - if yyr4104 || yy2arr4104 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4104[4] { - if x.DefaultRequest == nil { - r.EncodeNil() - } else { - x.DefaultRequest.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4104[4] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("defaultRequest")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.DefaultRequest == nil { - r.EncodeNil() - } else { - x.DefaultRequest.CodecEncodeSelf(e) - } - } - } - if yyr4104 || yy2arr4104 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4104[5] { - if x.MaxLimitRequestRatio == nil { - r.EncodeNil() - } else { - x.MaxLimitRequestRatio.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4104[5] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("maxLimitRequestRatio")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.MaxLimitRequestRatio == nil { - r.EncodeNil() - } else { - x.MaxLimitRequestRatio.CodecEncodeSelf(e) - } - } - } - if yyr4104 || yy2arr4104 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *LimitRangeItem) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4111 := z.DecBinary() - _ = yym4111 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct4112 := r.ContainerType() - if yyct4112 == codecSelferValueTypeMap1234 { - yyl4112 := r.ReadMapStart() - if yyl4112 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl4112, d) - } - } else if yyct4112 == codecSelferValueTypeArray1234 { - yyl4112 := r.ReadArrayStart() - if yyl4112 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl4112, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *LimitRangeItem) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys4113Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4113Slc - var yyhl4113 bool = l >= 0 - for yyj4113 := 0; ; yyj4113++ { - if yyhl4113 { - if yyj4113 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4113Slc = r.DecodeBytes(yys4113Slc, true, true) - yys4113 := string(yys4113Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4113 { - case "type": - if r.TryDecodeAsNil() { - x.Type = "" - } else { - x.Type = LimitType(r.DecodeString()) - } - case "max": - if r.TryDecodeAsNil() { - x.Max = nil - } else { - yyv4115 := &x.Max - yyv4115.CodecDecodeSelf(d) - } - case "min": - if r.TryDecodeAsNil() { - x.Min = nil - } else { - yyv4116 := &x.Min - yyv4116.CodecDecodeSelf(d) - } - case "default": - if r.TryDecodeAsNil() { - x.Default = nil - } else { - yyv4117 := &x.Default - yyv4117.CodecDecodeSelf(d) - } - case "defaultRequest": - if r.TryDecodeAsNil() { - x.DefaultRequest = nil - } else { - yyv4118 := &x.DefaultRequest - yyv4118.CodecDecodeSelf(d) - } - case "maxLimitRequestRatio": - if r.TryDecodeAsNil() { - x.MaxLimitRequestRatio = nil - } else { - yyv4119 := &x.MaxLimitRequestRatio - yyv4119.CodecDecodeSelf(d) - } - default: - z.DecStructFieldNotFound(-1, yys4113) - } // end switch yys4113 - } // end for yyj4113 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj4120 int - var yyb4120 bool - var yyhl4120 bool = l >= 0 - yyj4120++ - if yyhl4120 { - yyb4120 = yyj4120 > l - } else { - yyb4120 = r.CheckBreak() - } - if yyb4120 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Type = "" - } else { - x.Type = LimitType(r.DecodeString()) - } - yyj4120++ - if yyhl4120 { - yyb4120 = yyj4120 > l - } else { - yyb4120 = r.CheckBreak() - } - if yyb4120 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Max = nil - } else { - yyv4122 := &x.Max - yyv4122.CodecDecodeSelf(d) - } - yyj4120++ - if yyhl4120 { - yyb4120 = yyj4120 > l - } else { - yyb4120 = r.CheckBreak() - } - if yyb4120 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Min = nil - } else { - yyv4123 := &x.Min - yyv4123.CodecDecodeSelf(d) - } - yyj4120++ - if yyhl4120 { - yyb4120 = yyj4120 > l - } else { - yyb4120 = r.CheckBreak() - } - if yyb4120 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Default = nil - } else { - yyv4124 := &x.Default - yyv4124.CodecDecodeSelf(d) - } - yyj4120++ - if yyhl4120 { - yyb4120 = yyj4120 > l - } else { - yyb4120 = r.CheckBreak() - } - if yyb4120 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.DefaultRequest = nil - } else { - yyv4125 := &x.DefaultRequest - yyv4125.CodecDecodeSelf(d) - } - yyj4120++ - if yyhl4120 { - yyb4120 = yyj4120 > l - } else { - yyb4120 = r.CheckBreak() - } - if yyb4120 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.MaxLimitRequestRatio = nil - } else { - yyv4126 := &x.MaxLimitRequestRatio - yyv4126.CodecDecodeSelf(d) - } - for { - yyj4120++ - if yyhl4120 { - yyb4120 = yyj4120 > l - } else { - yyb4120 = r.CheckBreak() - } - if yyb4120 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4120-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - func (x *LimitRangeSpec) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) @@ -51654,36 +51355,36 @@ func (x *LimitRangeSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4127 := z.EncBinary() - _ = yym4127 + yym4101 := z.EncBinary() + _ = yym4101 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4128 := !z.EncBinary() - yy2arr4128 := z.EncBasicHandle().StructToArray - var yyq4128 [1]bool - _, _, _ = yysep4128, yyq4128, yy2arr4128 - const yyr4128 bool = false - var yynn4128 int - if yyr4128 || yy2arr4128 { + yysep4102 := !z.EncBinary() + yy2arr4102 := z.EncBasicHandle().StructToArray + var yyq4102 [1]bool + _, _, _ = yysep4102, yyq4102, yy2arr4102 + const yyr4102 bool = false + var yynn4102 int + if yyr4102 || yy2arr4102 { r.EncodeArrayStart(1) } else { - yynn4128 = 1 - for _, b := range yyq4128 { + yynn4102 = 1 + for _, b := range yyq4102 { if b { - yynn4128++ + yynn4102++ } } - r.EncodeMapStart(yynn4128) - yynn4128 = 0 + r.EncodeMapStart(yynn4102) + yynn4102 = 0 } - if yyr4128 || yy2arr4128 { + if yyr4102 || yy2arr4102 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Limits == nil { r.EncodeNil() } else { - yym4130 := z.EncBinary() - _ = yym4130 + yym4104 := z.EncBinary() + _ = yym4104 if false { } else { h.encSliceLimitRangeItem(([]LimitRangeItem)(x.Limits), e) @@ -51696,15 +51397,15 @@ func (x *LimitRangeSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x.Limits == nil { r.EncodeNil() } else { - yym4131 := z.EncBinary() - _ = yym4131 + yym4105 := z.EncBinary() + _ = yym4105 if false { } else { h.encSliceLimitRangeItem(([]LimitRangeItem)(x.Limits), e) } } } - if yyr4128 || yy2arr4128 { + if yyr4102 || yy2arr4102 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -51717,25 +51418,25 @@ func (x *LimitRangeSpec) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4132 := z.DecBinary() - _ = yym4132 + yym4106 := z.DecBinary() + _ = yym4106 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4133 := r.ContainerType() - if yyct4133 == codecSelferValueTypeMap1234 { - yyl4133 := r.ReadMapStart() - if yyl4133 == 0 { + yyct4107 := r.ContainerType() + if yyct4107 == codecSelferValueTypeMap1234 { + yyl4107 := r.ReadMapStart() + if yyl4107 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4133, d) + x.codecDecodeSelfFromMap(yyl4107, d) } - } else if yyct4133 == codecSelferValueTypeArray1234 { - yyl4133 := r.ReadArrayStart() - if yyl4133 == 0 { + } else if yyct4107 == codecSelferValueTypeArray1234 { + yyl4107 := r.ReadArrayStart() + if yyl4107 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4133, d) + x.codecDecodeSelfFromArray(yyl4107, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -51747,12 +51448,12 @@ func (x *LimitRangeSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4134Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4134Slc - var yyhl4134 bool = l >= 0 - for yyj4134 := 0; ; yyj4134++ { - if yyhl4134 { - if yyj4134 >= l { + var yys4108Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4108Slc + var yyhl4108 bool = l >= 0 + for yyj4108 := 0; ; yyj4108++ { + if yyhl4108 { + if yyj4108 >= l { break } } else { @@ -51761,26 +51462,26 @@ func (x *LimitRangeSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4134Slc = r.DecodeBytes(yys4134Slc, true, true) - yys4134 := string(yys4134Slc) + yys4108Slc = r.DecodeBytes(yys4108Slc, true, true) + yys4108 := string(yys4108Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4134 { + switch yys4108 { case "limits": if r.TryDecodeAsNil() { x.Limits = nil } else { - yyv4135 := &x.Limits - yym4136 := z.DecBinary() - _ = yym4136 + yyv4109 := &x.Limits + yym4110 := z.DecBinary() + _ = yym4110 if false { } else { - h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv4135), d) + h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv4109), d) } } default: - z.DecStructFieldNotFound(-1, yys4134) - } // end switch yys4134 - } // end for yyj4134 + z.DecStructFieldNotFound(-1, yys4108) + } // end switch yys4108 + } // end for yyj4108 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -51788,16 +51489,16 @@ func (x *LimitRangeSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4137 int - var yyb4137 bool - var yyhl4137 bool = l >= 0 - yyj4137++ - if yyhl4137 { - yyb4137 = yyj4137 > l + var yyj4111 int + var yyb4111 bool + var yyhl4111 bool = l >= 0 + yyj4111++ + if yyhl4111 { + yyb4111 = yyj4111 > l } else { - yyb4137 = r.CheckBreak() + yyb4111 = r.CheckBreak() } - if yyb4137 { + if yyb4111 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -51805,31 +51506,332 @@ func (x *LimitRangeSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Limits = nil } else { - yyv4138 := &x.Limits - yym4139 := z.DecBinary() - _ = yym4139 + yyv4112 := &x.Limits + yym4113 := z.DecBinary() + _ = yym4113 if false { } else { - h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv4138), d) + h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv4112), d) } } for { - yyj4137++ - if yyhl4137 { - yyb4137 = yyj4137 > l + yyj4111++ + if yyhl4111 { + yyb4111 = yyj4111 > l } else { - yyb4137 = r.CheckBreak() + yyb4111 = r.CheckBreak() } - if yyb4137 { + if yyb4111 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4137-1, "") + z.DecStructFieldNotFound(yyj4111-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym4114 := z.EncBinary() + _ = yym4114 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep4115 := !z.EncBinary() + yy2arr4115 := z.EncBasicHandle().StructToArray + var yyq4115 [4]bool + _, _, _ = yysep4115, yyq4115, yy2arr4115 + const yyr4115 bool = false + yyq4115[0] = x.Kind != "" + yyq4115[1] = x.APIVersion != "" + yyq4115[2] = true + yyq4115[3] = true + var yynn4115 int + if yyr4115 || yy2arr4115 { + r.EncodeArrayStart(4) + } else { + yynn4115 = 0 + for _, b := range yyq4115 { + if b { + yynn4115++ + } + } + r.EncodeMapStart(yynn4115) + yynn4115 = 0 + } + if yyr4115 || yy2arr4115 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4115[0] { + yym4117 := z.EncBinary() + _ = yym4117 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4115[0] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("kind")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym4118 := z.EncBinary() + _ = yym4118 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) + } + } + } + if yyr4115 || yy2arr4115 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4115[1] { + yym4120 := z.EncBinary() + _ = yym4120 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4115[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym4121 := z.EncBinary() + _ = yym4121 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } + } + if yyr4115 || yy2arr4115 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4115[2] { + yy4123 := &x.ObjectMeta + yy4123.CodecEncodeSelf(e) + } else { + r.EncodeNil() + } + } else { + if yyq4115[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("metadata")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy4124 := &x.ObjectMeta + yy4124.CodecEncodeSelf(e) + } + } + if yyr4115 || yy2arr4115 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4115[3] { + yy4126 := &x.Spec + yy4126.CodecEncodeSelf(e) + } else { + r.EncodeNil() + } + } else { + if yyq4115[3] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("spec")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy4127 := &x.Spec + yy4127.CodecEncodeSelf(e) + } + } + if yyr4115 || yy2arr4115 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + +func (x *LimitRange) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym4128 := z.DecBinary() + _ = yym4128 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct4129 := r.ContainerType() + if yyct4129 == codecSelferValueTypeMap1234 { + yyl4129 := r.ReadMapStart() + if yyl4129 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl4129, d) + } + } else if yyct4129 == codecSelferValueTypeArray1234 { + yyl4129 := r.ReadArrayStart() + if yyl4129 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl4129, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *LimitRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys4130Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4130Slc + var yyhl4130 bool = l >= 0 + for yyj4130 := 0; ; yyj4130++ { + if yyhl4130 { + if yyj4130 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys4130Slc = r.DecodeBytes(yys4130Slc, true, true) + yys4130 := string(yys4130Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys4130 { + case "kind": + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + case "apiVersion": + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + case "metadata": + if r.TryDecodeAsNil() { + x.ObjectMeta = ObjectMeta{} + } else { + yyv4133 := &x.ObjectMeta + yyv4133.CodecDecodeSelf(d) + } + case "spec": + if r.TryDecodeAsNil() { + x.Spec = LimitRangeSpec{} + } else { + yyv4134 := &x.Spec + yyv4134.CodecDecodeSelf(d) + } + default: + z.DecStructFieldNotFound(-1, yys4130) + } // end switch yys4130 + } // end for yyj4130 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *LimitRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj4135 int + var yyb4135 bool + var yyhl4135 bool = l >= 0 + yyj4135++ + if yyhl4135 { + yyb4135 = yyj4135 > l + } else { + yyb4135 = r.CheckBreak() + } + if yyb4135 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + yyj4135++ + if yyhl4135 { + yyb4135 = yyj4135 > l + } else { + yyb4135 = r.CheckBreak() + } + if yyb4135 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + yyj4135++ + if yyhl4135 { + yyb4135 = yyj4135 > l + } else { + yyb4135 = r.CheckBreak() + } + if yyb4135 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ObjectMeta = ObjectMeta{} + } else { + yyv4138 := &x.ObjectMeta + yyv4138.CodecDecodeSelf(d) + } + yyj4135++ + if yyhl4135 { + yyb4135 = yyj4135 > l + } else { + yyb4135 = r.CheckBreak() + } + if yyb4135 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Spec = LimitRangeSpec{} + } else { + yyv4139 := &x.Spec + yyv4139.CodecDecodeSelf(d) + } + for { + yyj4135++ + if yyhl4135 { + yyb4135 = yyj4135 > l + } else { + yyb4135 = r.CheckBreak() + } + if yyb4135 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj4135-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -51849,12 +51851,11 @@ func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { yyq4141[0] = x.Kind != "" yyq4141[1] = x.APIVersion != "" yyq4141[2] = true - yyq4141[3] = true var yynn4141 int if yyr4141 || yy2arr4141 { r.EncodeArrayStart(4) } else { - yynn4141 = 0 + yynn4141 = 1 for _, b := range yyq4141 { if b { yynn4141++ @@ -51916,8 +51917,14 @@ func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { if yyr4141 || yy2arr4141 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq4141[2] { - yy4149 := &x.ObjectMeta - yy4149.CodecEncodeSelf(e) + yy4149 := &x.ListMeta + yym4150 := z.EncBinary() + _ = yym4150 + if false { + } else if z.HasExtensions() && z.EncExt(yy4149) { + } else { + z.EncFallback(yy4149) + } } else { r.EncodeNil() } @@ -51926,329 +51933,23 @@ func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4150 := &x.ObjectMeta - yy4150.CodecEncodeSelf(e) + yy4151 := &x.ListMeta + yym4152 := z.EncBinary() + _ = yym4152 + if false { + } else if z.HasExtensions() && z.EncExt(yy4151) { + } else { + z.EncFallback(yy4151) + } } } if yyr4141 || yy2arr4141 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4141[3] { - yy4152 := &x.Spec - yy4152.CodecEncodeSelf(e) - } else { - r.EncodeNil() - } - } else { - if yyq4141[3] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("spec")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4153 := &x.Spec - yy4153.CodecEncodeSelf(e) - } - } - if yyr4141 || yy2arr4141 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *LimitRange) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4154 := z.DecBinary() - _ = yym4154 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct4155 := r.ContainerType() - if yyct4155 == codecSelferValueTypeMap1234 { - yyl4155 := r.ReadMapStart() - if yyl4155 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl4155, d) - } - } else if yyct4155 == codecSelferValueTypeArray1234 { - yyl4155 := r.ReadArrayStart() - if yyl4155 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl4155, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *LimitRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys4156Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4156Slc - var yyhl4156 bool = l >= 0 - for yyj4156 := 0; ; yyj4156++ { - if yyhl4156 { - if yyj4156 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4156Slc = r.DecodeBytes(yys4156Slc, true, true) - yys4156 := string(yys4156Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4156 { - case "kind": - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - case "apiVersion": - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - case "metadata": - if r.TryDecodeAsNil() { - x.ObjectMeta = ObjectMeta{} - } else { - yyv4159 := &x.ObjectMeta - yyv4159.CodecDecodeSelf(d) - } - case "spec": - if r.TryDecodeAsNil() { - x.Spec = LimitRangeSpec{} - } else { - yyv4160 := &x.Spec - yyv4160.CodecDecodeSelf(d) - } - default: - z.DecStructFieldNotFound(-1, yys4156) - } // end switch yys4156 - } // end for yyj4156 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *LimitRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj4161 int - var yyb4161 bool - var yyhl4161 bool = l >= 0 - yyj4161++ - if yyhl4161 { - yyb4161 = yyj4161 > l - } else { - yyb4161 = r.CheckBreak() - } - if yyb4161 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - yyj4161++ - if yyhl4161 { - yyb4161 = yyj4161 > l - } else { - yyb4161 = r.CheckBreak() - } - if yyb4161 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - yyj4161++ - if yyhl4161 { - yyb4161 = yyj4161 > l - } else { - yyb4161 = r.CheckBreak() - } - if yyb4161 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ObjectMeta = ObjectMeta{} - } else { - yyv4164 := &x.ObjectMeta - yyv4164.CodecDecodeSelf(d) - } - yyj4161++ - if yyhl4161 { - yyb4161 = yyj4161 > l - } else { - yyb4161 = r.CheckBreak() - } - if yyb4161 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Spec = LimitRangeSpec{} - } else { - yyv4165 := &x.Spec - yyv4165.CodecDecodeSelf(d) - } - for { - yyj4161++ - if yyhl4161 { - yyb4161 = yyj4161 > l - } else { - yyb4161 = r.CheckBreak() - } - if yyb4161 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4161-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym4166 := z.EncBinary() - _ = yym4166 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep4167 := !z.EncBinary() - yy2arr4167 := z.EncBasicHandle().StructToArray - var yyq4167 [4]bool - _, _, _ = yysep4167, yyq4167, yy2arr4167 - const yyr4167 bool = false - yyq4167[0] = x.Kind != "" - yyq4167[1] = x.APIVersion != "" - yyq4167[2] = true - var yynn4167 int - if yyr4167 || yy2arr4167 { - r.EncodeArrayStart(4) - } else { - yynn4167 = 1 - for _, b := range yyq4167 { - if b { - yynn4167++ - } - } - r.EncodeMapStart(yynn4167) - yynn4167 = 0 - } - if yyr4167 || yy2arr4167 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4167[0] { - yym4169 := z.EncBinary() - _ = yym4169 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4167[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kind")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4170 := z.EncBinary() - _ = yym4170 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } - } - if yyr4167 || yy2arr4167 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4167[1] { - yym4172 := z.EncBinary() - _ = yym4172 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4167[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4173 := z.EncBinary() - _ = yym4173 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } - } - if yyr4167 || yy2arr4167 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4167[2] { - yy4175 := &x.ListMeta - yym4176 := z.EncBinary() - _ = yym4176 - if false { - } else if z.HasExtensions() && z.EncExt(yy4175) { - } else { - z.EncFallback(yy4175) - } - } else { - r.EncodeNil() - } - } else { - if yyq4167[2] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("metadata")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4177 := &x.ListMeta - yym4178 := z.EncBinary() - _ = yym4178 - if false { - } else if z.HasExtensions() && z.EncExt(yy4177) { - } else { - z.EncFallback(yy4177) - } - } - } - if yyr4167 || yy2arr4167 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4180 := z.EncBinary() - _ = yym4180 + yym4154 := z.EncBinary() + _ = yym4154 if false { } else { h.encSliceLimitRange(([]LimitRange)(x.Items), e) @@ -52261,15 +51962,15 @@ func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4181 := z.EncBinary() - _ = yym4181 + yym4155 := z.EncBinary() + _ = yym4155 if false { } else { h.encSliceLimitRange(([]LimitRange)(x.Items), e) } } } - if yyr4167 || yy2arr4167 { + if yyr4141 || yy2arr4141 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -52282,25 +51983,25 @@ func (x *LimitRangeList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4182 := z.DecBinary() - _ = yym4182 + yym4156 := z.DecBinary() + _ = yym4156 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4183 := r.ContainerType() - if yyct4183 == codecSelferValueTypeMap1234 { - yyl4183 := r.ReadMapStart() - if yyl4183 == 0 { + yyct4157 := r.ContainerType() + if yyct4157 == codecSelferValueTypeMap1234 { + yyl4157 := r.ReadMapStart() + if yyl4157 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4183, d) + x.codecDecodeSelfFromMap(yyl4157, d) } - } else if yyct4183 == codecSelferValueTypeArray1234 { - yyl4183 := r.ReadArrayStart() - if yyl4183 == 0 { + } else if yyct4157 == codecSelferValueTypeArray1234 { + yyl4157 := r.ReadArrayStart() + if yyl4157 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4183, d) + x.codecDecodeSelfFromArray(yyl4157, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -52312,12 +52013,12 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4184Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4184Slc - var yyhl4184 bool = l >= 0 - for yyj4184 := 0; ; yyj4184++ { - if yyhl4184 { - if yyj4184 >= l { + var yys4158Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4158Slc + var yyhl4158 bool = l >= 0 + for yyj4158 := 0; ; yyj4158++ { + if yyhl4158 { + if yyj4158 >= l { break } } else { @@ -52326,10 +52027,10 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4184Slc = r.DecodeBytes(yys4184Slc, true, true) - yys4184 := string(yys4184Slc) + yys4158Slc = r.DecodeBytes(yys4158Slc, true, true) + yys4158 := string(yys4158Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4184 { + switch yys4158 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -52344,33 +52045,33 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4187 := &x.ListMeta - yym4188 := z.DecBinary() - _ = yym4188 + yyv4161 := &x.ListMeta + yym4162 := z.DecBinary() + _ = yym4162 if false { - } else if z.HasExtensions() && z.DecExt(yyv4187) { + } else if z.HasExtensions() && z.DecExt(yyv4161) { } else { - z.DecFallback(yyv4187, false) + z.DecFallback(yyv4161, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4189 := &x.Items - yym4190 := z.DecBinary() - _ = yym4190 + yyv4163 := &x.Items + yym4164 := z.DecBinary() + _ = yym4164 if false { } else { - h.decSliceLimitRange((*[]LimitRange)(yyv4189), d) + h.decSliceLimitRange((*[]LimitRange)(yyv4163), d) } } default: - z.DecStructFieldNotFound(-1, yys4184) - } // end switch yys4184 - } // end for yyj4184 + z.DecStructFieldNotFound(-1, yys4158) + } // end switch yys4158 + } // end for yyj4158 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -52378,16 +52079,16 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4191 int - var yyb4191 bool - var yyhl4191 bool = l >= 0 - yyj4191++ - if yyhl4191 { - yyb4191 = yyj4191 > l + var yyj4165 int + var yyb4165 bool + var yyhl4165 bool = l >= 0 + yyj4165++ + if yyhl4165 { + yyb4165 = yyj4165 > l } else { - yyb4191 = r.CheckBreak() + yyb4165 = r.CheckBreak() } - if yyb4191 { + if yyb4165 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52397,13 +52098,13 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4191++ - if yyhl4191 { - yyb4191 = yyj4191 > l + yyj4165++ + if yyhl4165 { + yyb4165 = yyj4165 > l } else { - yyb4191 = r.CheckBreak() + yyb4165 = r.CheckBreak() } - if yyb4191 { + if yyb4165 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52413,36 +52114,36 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4191++ - if yyhl4191 { - yyb4191 = yyj4191 > l + yyj4165++ + if yyhl4165 { + yyb4165 = yyj4165 > l } else { - yyb4191 = r.CheckBreak() + yyb4165 = r.CheckBreak() } - if yyb4191 { + if yyb4165 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4194 := &x.ListMeta - yym4195 := z.DecBinary() - _ = yym4195 + yyv4168 := &x.ListMeta + yym4169 := z.DecBinary() + _ = yym4169 if false { - } else if z.HasExtensions() && z.DecExt(yyv4194) { + } else if z.HasExtensions() && z.DecExt(yyv4168) { } else { - z.DecFallback(yyv4194, false) + z.DecFallback(yyv4168, false) } } - yyj4191++ - if yyhl4191 { - yyb4191 = yyj4191 > l + yyj4165++ + if yyhl4165 { + yyb4165 = yyj4165 > l } else { - yyb4191 = r.CheckBreak() + yyb4165 = r.CheckBreak() } - if yyb4191 { + if yyb4165 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52450,26 +52151,26 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4196 := &x.Items - yym4197 := z.DecBinary() - _ = yym4197 + yyv4170 := &x.Items + yym4171 := z.DecBinary() + _ = yym4171 if false { } else { - h.decSliceLimitRange((*[]LimitRange)(yyv4196), d) + h.decSliceLimitRange((*[]LimitRange)(yyv4170), d) } } for { - yyj4191++ - if yyhl4191 { - yyb4191 = yyj4191 > l + yyj4165++ + if yyhl4165 { + yyb4165 = yyj4165 > l } else { - yyb4191 = r.CheckBreak() + yyb4165 = r.CheckBreak() } - if yyb4191 { + if yyb4165 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4191-1, "") + z.DecStructFieldNotFound(yyj4165-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -52478,8 +52179,8 @@ func (x ResourceQuotaScope) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym4198 := z.EncBinary() - _ = yym4198 + yym4172 := z.EncBinary() + _ = yym4172 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -52491,8 +52192,8 @@ func (x *ResourceQuotaScope) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4199 := z.DecBinary() - _ = yym4199 + yym4173 := z.DecBinary() + _ = yym4173 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -52507,34 +52208,34 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4200 := z.EncBinary() - _ = yym4200 + yym4174 := z.EncBinary() + _ = yym4174 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4201 := !z.EncBinary() - yy2arr4201 := z.EncBasicHandle().StructToArray - var yyq4201 [2]bool - _, _, _ = yysep4201, yyq4201, yy2arr4201 - const yyr4201 bool = false - yyq4201[0] = len(x.Hard) != 0 - yyq4201[1] = len(x.Scopes) != 0 - var yynn4201 int - if yyr4201 || yy2arr4201 { + yysep4175 := !z.EncBinary() + yy2arr4175 := z.EncBasicHandle().StructToArray + var yyq4175 [2]bool + _, _, _ = yysep4175, yyq4175, yy2arr4175 + const yyr4175 bool = false + yyq4175[0] = len(x.Hard) != 0 + yyq4175[1] = len(x.Scopes) != 0 + var yynn4175 int + if yyr4175 || yy2arr4175 { r.EncodeArrayStart(2) } else { - yynn4201 = 0 - for _, b := range yyq4201 { + yynn4175 = 0 + for _, b := range yyq4175 { if b { - yynn4201++ + yynn4175++ } } - r.EncodeMapStart(yynn4201) - yynn4201 = 0 + r.EncodeMapStart(yynn4175) + yynn4175 = 0 } - if yyr4201 || yy2arr4201 { + if yyr4175 || yy2arr4175 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4201[0] { + if yyq4175[0] { if x.Hard == nil { r.EncodeNil() } else { @@ -52544,7 +52245,7 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4201[0] { + if yyq4175[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hard")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -52555,14 +52256,14 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4201 || yy2arr4201 { + if yyr4175 || yy2arr4175 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4201[1] { + if yyq4175[1] { if x.Scopes == nil { r.EncodeNil() } else { - yym4204 := z.EncBinary() - _ = yym4204 + yym4178 := z.EncBinary() + _ = yym4178 if false { } else { h.encSliceResourceQuotaScope(([]ResourceQuotaScope)(x.Scopes), e) @@ -52572,15 +52273,15 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4201[1] { + if yyq4175[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("scopes")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Scopes == nil { r.EncodeNil() } else { - yym4205 := z.EncBinary() - _ = yym4205 + yym4179 := z.EncBinary() + _ = yym4179 if false { } else { h.encSliceResourceQuotaScope(([]ResourceQuotaScope)(x.Scopes), e) @@ -52588,7 +52289,7 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4201 || yy2arr4201 { + if yyr4175 || yy2arr4175 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -52601,25 +52302,25 @@ func (x *ResourceQuotaSpec) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4206 := z.DecBinary() - _ = yym4206 + yym4180 := z.DecBinary() + _ = yym4180 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4207 := r.ContainerType() - if yyct4207 == codecSelferValueTypeMap1234 { - yyl4207 := r.ReadMapStart() - if yyl4207 == 0 { + yyct4181 := r.ContainerType() + if yyct4181 == codecSelferValueTypeMap1234 { + yyl4181 := r.ReadMapStart() + if yyl4181 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4207, d) + x.codecDecodeSelfFromMap(yyl4181, d) } - } else if yyct4207 == codecSelferValueTypeArray1234 { - yyl4207 := r.ReadArrayStart() - if yyl4207 == 0 { + } else if yyct4181 == codecSelferValueTypeArray1234 { + yyl4181 := r.ReadArrayStart() + if yyl4181 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4207, d) + x.codecDecodeSelfFromArray(yyl4181, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -52631,12 +52332,12 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4208Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4208Slc - var yyhl4208 bool = l >= 0 - for yyj4208 := 0; ; yyj4208++ { - if yyhl4208 { - if yyj4208 >= l { + var yys4182Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4182Slc + var yyhl4182 bool = l >= 0 + for yyj4182 := 0; ; yyj4182++ { + if yyhl4182 { + if yyj4182 >= l { break } } else { @@ -52645,33 +52346,33 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4208Slc = r.DecodeBytes(yys4208Slc, true, true) - yys4208 := string(yys4208Slc) + yys4182Slc = r.DecodeBytes(yys4182Slc, true, true) + yys4182 := string(yys4182Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4208 { + switch yys4182 { case "hard": if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv4209 := &x.Hard - yyv4209.CodecDecodeSelf(d) + yyv4183 := &x.Hard + yyv4183.CodecDecodeSelf(d) } case "scopes": if r.TryDecodeAsNil() { x.Scopes = nil } else { - yyv4210 := &x.Scopes - yym4211 := z.DecBinary() - _ = yym4211 + yyv4184 := &x.Scopes + yym4185 := z.DecBinary() + _ = yym4185 if false { } else { - h.decSliceResourceQuotaScope((*[]ResourceQuotaScope)(yyv4210), d) + h.decSliceResourceQuotaScope((*[]ResourceQuotaScope)(yyv4184), d) } } default: - z.DecStructFieldNotFound(-1, yys4208) - } // end switch yys4208 - } // end for yyj4208 + z.DecStructFieldNotFound(-1, yys4182) + } // end switch yys4182 + } // end for yyj4182 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -52679,16 +52380,16 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4212 int - var yyb4212 bool - var yyhl4212 bool = l >= 0 - yyj4212++ - if yyhl4212 { - yyb4212 = yyj4212 > l + var yyj4186 int + var yyb4186 bool + var yyhl4186 bool = l >= 0 + yyj4186++ + if yyhl4186 { + yyb4186 = yyj4186 > l } else { - yyb4212 = r.CheckBreak() + yyb4186 = r.CheckBreak() } - if yyb4212 { + if yyb4186 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52696,16 +52397,16 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv4213 := &x.Hard - yyv4213.CodecDecodeSelf(d) + yyv4187 := &x.Hard + yyv4187.CodecDecodeSelf(d) } - yyj4212++ - if yyhl4212 { - yyb4212 = yyj4212 > l + yyj4186++ + if yyhl4186 { + yyb4186 = yyj4186 > l } else { - yyb4212 = r.CheckBreak() + yyb4186 = r.CheckBreak() } - if yyb4212 { + if yyb4186 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52713,26 +52414,26 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Scopes = nil } else { - yyv4214 := &x.Scopes - yym4215 := z.DecBinary() - _ = yym4215 + yyv4188 := &x.Scopes + yym4189 := z.DecBinary() + _ = yym4189 if false { } else { - h.decSliceResourceQuotaScope((*[]ResourceQuotaScope)(yyv4214), d) + h.decSliceResourceQuotaScope((*[]ResourceQuotaScope)(yyv4188), d) } } for { - yyj4212++ - if yyhl4212 { - yyb4212 = yyj4212 > l + yyj4186++ + if yyhl4186 { + yyb4186 = yyj4186 > l } else { - yyb4212 = r.CheckBreak() + yyb4186 = r.CheckBreak() } - if yyb4212 { + if yyb4186 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4212-1, "") + z.DecStructFieldNotFound(yyj4186-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -52744,34 +52445,34 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4216 := z.EncBinary() - _ = yym4216 + yym4190 := z.EncBinary() + _ = yym4190 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4217 := !z.EncBinary() - yy2arr4217 := z.EncBasicHandle().StructToArray - var yyq4217 [2]bool - _, _, _ = yysep4217, yyq4217, yy2arr4217 - const yyr4217 bool = false - yyq4217[0] = len(x.Hard) != 0 - yyq4217[1] = len(x.Used) != 0 - var yynn4217 int - if yyr4217 || yy2arr4217 { + yysep4191 := !z.EncBinary() + yy2arr4191 := z.EncBasicHandle().StructToArray + var yyq4191 [2]bool + _, _, _ = yysep4191, yyq4191, yy2arr4191 + const yyr4191 bool = false + yyq4191[0] = len(x.Hard) != 0 + yyq4191[1] = len(x.Used) != 0 + var yynn4191 int + if yyr4191 || yy2arr4191 { r.EncodeArrayStart(2) } else { - yynn4217 = 0 - for _, b := range yyq4217 { + yynn4191 = 0 + for _, b := range yyq4191 { if b { - yynn4217++ + yynn4191++ } } - r.EncodeMapStart(yynn4217) - yynn4217 = 0 + r.EncodeMapStart(yynn4191) + yynn4191 = 0 } - if yyr4217 || yy2arr4217 { + if yyr4191 || yy2arr4191 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4217[0] { + if yyq4191[0] { if x.Hard == nil { r.EncodeNil() } else { @@ -52781,7 +52482,7 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4217[0] { + if yyq4191[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hard")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -52792,9 +52493,9 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4217 || yy2arr4217 { + if yyr4191 || yy2arr4191 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4217[1] { + if yyq4191[1] { if x.Used == nil { r.EncodeNil() } else { @@ -52804,7 +52505,7 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4217[1] { + if yyq4191[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("used")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -52815,7 +52516,7 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4217 || yy2arr4217 { + if yyr4191 || yy2arr4191 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -52828,25 +52529,25 @@ func (x *ResourceQuotaStatus) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4220 := z.DecBinary() - _ = yym4220 + yym4194 := z.DecBinary() + _ = yym4194 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4221 := r.ContainerType() - if yyct4221 == codecSelferValueTypeMap1234 { - yyl4221 := r.ReadMapStart() - if yyl4221 == 0 { + yyct4195 := r.ContainerType() + if yyct4195 == codecSelferValueTypeMap1234 { + yyl4195 := r.ReadMapStart() + if yyl4195 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4221, d) + x.codecDecodeSelfFromMap(yyl4195, d) } - } else if yyct4221 == codecSelferValueTypeArray1234 { - yyl4221 := r.ReadArrayStart() - if yyl4221 == 0 { + } else if yyct4195 == codecSelferValueTypeArray1234 { + yyl4195 := r.ReadArrayStart() + if yyl4195 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4221, d) + x.codecDecodeSelfFromArray(yyl4195, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -52858,12 +52559,12 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4222Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4222Slc - var yyhl4222 bool = l >= 0 - for yyj4222 := 0; ; yyj4222++ { - if yyhl4222 { - if yyj4222 >= l { + var yys4196Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4196Slc + var yyhl4196 bool = l >= 0 + for yyj4196 := 0; ; yyj4196++ { + if yyhl4196 { + if yyj4196 >= l { break } } else { @@ -52872,28 +52573,28 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4222Slc = r.DecodeBytes(yys4222Slc, true, true) - yys4222 := string(yys4222Slc) + yys4196Slc = r.DecodeBytes(yys4196Slc, true, true) + yys4196 := string(yys4196Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4222 { + switch yys4196 { case "hard": if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv4223 := &x.Hard - yyv4223.CodecDecodeSelf(d) + yyv4197 := &x.Hard + yyv4197.CodecDecodeSelf(d) } case "used": if r.TryDecodeAsNil() { x.Used = nil } else { - yyv4224 := &x.Used - yyv4224.CodecDecodeSelf(d) + yyv4198 := &x.Used + yyv4198.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys4222) - } // end switch yys4222 - } // end for yyj4222 + z.DecStructFieldNotFound(-1, yys4196) + } // end switch yys4196 + } // end for yyj4196 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -52901,16 +52602,16 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4225 int - var yyb4225 bool - var yyhl4225 bool = l >= 0 - yyj4225++ - if yyhl4225 { - yyb4225 = yyj4225 > l + var yyj4199 int + var yyb4199 bool + var yyhl4199 bool = l >= 0 + yyj4199++ + if yyhl4199 { + yyb4199 = yyj4199 > l } else { - yyb4225 = r.CheckBreak() + yyb4199 = r.CheckBreak() } - if yyb4225 { + if yyb4199 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52918,16 +52619,16 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv4226 := &x.Hard - yyv4226.CodecDecodeSelf(d) + yyv4200 := &x.Hard + yyv4200.CodecDecodeSelf(d) } - yyj4225++ - if yyhl4225 { - yyb4225 = yyj4225 > l + yyj4199++ + if yyhl4199 { + yyb4199 = yyj4199 > l } else { - yyb4225 = r.CheckBreak() + yyb4199 = r.CheckBreak() } - if yyb4225 { + if yyb4199 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52935,21 +52636,21 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Used = nil } else { - yyv4227 := &x.Used - yyv4227.CodecDecodeSelf(d) + yyv4201 := &x.Used + yyv4201.CodecDecodeSelf(d) } for { - yyj4225++ - if yyhl4225 { - yyb4225 = yyj4225 > l + yyj4199++ + if yyhl4199 { + yyb4199 = yyj4199 > l } else { - yyb4225 = r.CheckBreak() + yyb4199 = r.CheckBreak() } - if yyb4225 { + if yyb4199 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4225-1, "") + z.DecStructFieldNotFound(yyj4199-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -52961,39 +52662,39 @@ func (x *ResourceQuota) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4228 := z.EncBinary() - _ = yym4228 + yym4202 := z.EncBinary() + _ = yym4202 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4229 := !z.EncBinary() - yy2arr4229 := z.EncBasicHandle().StructToArray - var yyq4229 [5]bool - _, _, _ = yysep4229, yyq4229, yy2arr4229 - const yyr4229 bool = false - yyq4229[0] = x.Kind != "" - yyq4229[1] = x.APIVersion != "" - yyq4229[2] = true - yyq4229[3] = true - yyq4229[4] = true - var yynn4229 int - if yyr4229 || yy2arr4229 { + yysep4203 := !z.EncBinary() + yy2arr4203 := z.EncBasicHandle().StructToArray + var yyq4203 [5]bool + _, _, _ = yysep4203, yyq4203, yy2arr4203 + const yyr4203 bool = false + yyq4203[0] = x.Kind != "" + yyq4203[1] = x.APIVersion != "" + yyq4203[2] = true + yyq4203[3] = true + yyq4203[4] = true + var yynn4203 int + if yyr4203 || yy2arr4203 { r.EncodeArrayStart(5) } else { - yynn4229 = 0 - for _, b := range yyq4229 { + yynn4203 = 0 + for _, b := range yyq4203 { if b { - yynn4229++ + yynn4203++ } } - r.EncodeMapStart(yynn4229) - yynn4229 = 0 + r.EncodeMapStart(yynn4203) + yynn4203 = 0 } - if yyr4229 || yy2arr4229 { + if yyr4203 || yy2arr4203 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4229[0] { - yym4231 := z.EncBinary() - _ = yym4231 + if yyq4203[0] { + yym4205 := z.EncBinary() + _ = yym4205 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -53002,23 +52703,23 @@ func (x *ResourceQuota) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4229[0] { + if yyq4203[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4232 := z.EncBinary() - _ = yym4232 + yym4206 := z.EncBinary() + _ = yym4206 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4229 || yy2arr4229 { + if yyr4203 || yy2arr4203 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4229[1] { - yym4234 := z.EncBinary() - _ = yym4234 + if yyq4203[1] { + yym4208 := z.EncBinary() + _ = yym4208 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -53027,70 +52728,70 @@ func (x *ResourceQuota) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4229[1] { + if yyq4203[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4235 := z.EncBinary() - _ = yym4235 + yym4209 := z.EncBinary() + _ = yym4209 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4229 || yy2arr4229 { + if yyr4203 || yy2arr4203 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4229[2] { - yy4237 := &x.ObjectMeta - yy4237.CodecEncodeSelf(e) + if yyq4203[2] { + yy4211 := &x.ObjectMeta + yy4211.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4229[2] { + if yyq4203[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4238 := &x.ObjectMeta - yy4238.CodecEncodeSelf(e) + yy4212 := &x.ObjectMeta + yy4212.CodecEncodeSelf(e) } } - if yyr4229 || yy2arr4229 { + if yyr4203 || yy2arr4203 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4229[3] { - yy4240 := &x.Spec - yy4240.CodecEncodeSelf(e) + if yyq4203[3] { + yy4214 := &x.Spec + yy4214.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4229[3] { + if yyq4203[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("spec")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4241 := &x.Spec - yy4241.CodecEncodeSelf(e) + yy4215 := &x.Spec + yy4215.CodecEncodeSelf(e) } } - if yyr4229 || yy2arr4229 { + if yyr4203 || yy2arr4203 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4229[4] { - yy4243 := &x.Status - yy4243.CodecEncodeSelf(e) + if yyq4203[4] { + yy4217 := &x.Status + yy4217.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4229[4] { + if yyq4203[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("status")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4244 := &x.Status - yy4244.CodecEncodeSelf(e) + yy4218 := &x.Status + yy4218.CodecEncodeSelf(e) } } - if yyr4229 || yy2arr4229 { + if yyr4203 || yy2arr4203 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -53103,25 +52804,25 @@ func (x *ResourceQuota) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4245 := z.DecBinary() - _ = yym4245 + yym4219 := z.DecBinary() + _ = yym4219 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4246 := r.ContainerType() - if yyct4246 == codecSelferValueTypeMap1234 { - yyl4246 := r.ReadMapStart() - if yyl4246 == 0 { + yyct4220 := r.ContainerType() + if yyct4220 == codecSelferValueTypeMap1234 { + yyl4220 := r.ReadMapStart() + if yyl4220 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4246, d) + x.codecDecodeSelfFromMap(yyl4220, d) } - } else if yyct4246 == codecSelferValueTypeArray1234 { - yyl4246 := r.ReadArrayStart() - if yyl4246 == 0 { + } else if yyct4220 == codecSelferValueTypeArray1234 { + yyl4220 := r.ReadArrayStart() + if yyl4220 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4246, d) + x.codecDecodeSelfFromArray(yyl4220, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -53133,12 +52834,12 @@ func (x *ResourceQuota) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4247Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4247Slc - var yyhl4247 bool = l >= 0 - for yyj4247 := 0; ; yyj4247++ { - if yyhl4247 { - if yyj4247 >= l { + var yys4221Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4221Slc + var yyhl4221 bool = l >= 0 + for yyj4221 := 0; ; yyj4221++ { + if yyhl4221 { + if yyj4221 >= l { break } } else { @@ -53147,10 +52848,10 @@ func (x *ResourceQuota) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4247Slc = r.DecodeBytes(yys4247Slc, true, true) - yys4247 := string(yys4247Slc) + yys4221Slc = r.DecodeBytes(yys4221Slc, true, true) + yys4221 := string(yys4221Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4247 { + switch yys4221 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -53167,27 +52868,27 @@ func (x *ResourceQuota) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4250 := &x.ObjectMeta - yyv4250.CodecDecodeSelf(d) + yyv4224 := &x.ObjectMeta + yyv4224.CodecDecodeSelf(d) } case "spec": if r.TryDecodeAsNil() { x.Spec = ResourceQuotaSpec{} } else { - yyv4251 := &x.Spec - yyv4251.CodecDecodeSelf(d) + yyv4225 := &x.Spec + yyv4225.CodecDecodeSelf(d) } case "status": if r.TryDecodeAsNil() { x.Status = ResourceQuotaStatus{} } else { - yyv4252 := &x.Status - yyv4252.CodecDecodeSelf(d) + yyv4226 := &x.Status + yyv4226.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys4247) - } // end switch yys4247 - } // end for yyj4247 + z.DecStructFieldNotFound(-1, yys4221) + } // end switch yys4221 + } // end for yyj4221 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -53195,16 +52896,16 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4253 int - var yyb4253 bool - var yyhl4253 bool = l >= 0 - yyj4253++ - if yyhl4253 { - yyb4253 = yyj4253 > l + var yyj4227 int + var yyb4227 bool + var yyhl4227 bool = l >= 0 + yyj4227++ + if yyhl4227 { + yyb4227 = yyj4227 > l } else { - yyb4253 = r.CheckBreak() + yyb4227 = r.CheckBreak() } - if yyb4253 { + if yyb4227 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53214,13 +52915,13 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4253++ - if yyhl4253 { - yyb4253 = yyj4253 > l + yyj4227++ + if yyhl4227 { + yyb4227 = yyj4227 > l } else { - yyb4253 = r.CheckBreak() + yyb4227 = r.CheckBreak() } - if yyb4253 { + if yyb4227 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53230,13 +52931,13 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4253++ - if yyhl4253 { - yyb4253 = yyj4253 > l + yyj4227++ + if yyhl4227 { + yyb4227 = yyj4227 > l } else { - yyb4253 = r.CheckBreak() + yyb4227 = r.CheckBreak() } - if yyb4253 { + if yyb4227 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53244,16 +52945,16 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4256 := &x.ObjectMeta - yyv4256.CodecDecodeSelf(d) + yyv4230 := &x.ObjectMeta + yyv4230.CodecDecodeSelf(d) } - yyj4253++ - if yyhl4253 { - yyb4253 = yyj4253 > l + yyj4227++ + if yyhl4227 { + yyb4227 = yyj4227 > l } else { - yyb4253 = r.CheckBreak() + yyb4227 = r.CheckBreak() } - if yyb4253 { + if yyb4227 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53261,16 +52962,16 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Spec = ResourceQuotaSpec{} } else { - yyv4257 := &x.Spec - yyv4257.CodecDecodeSelf(d) + yyv4231 := &x.Spec + yyv4231.CodecDecodeSelf(d) } - yyj4253++ - if yyhl4253 { - yyb4253 = yyj4253 > l + yyj4227++ + if yyhl4227 { + yyb4227 = yyj4227 > l } else { - yyb4253 = r.CheckBreak() + yyb4227 = r.CheckBreak() } - if yyb4253 { + if yyb4227 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53278,21 +52979,21 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Status = ResourceQuotaStatus{} } else { - yyv4258 := &x.Status - yyv4258.CodecDecodeSelf(d) + yyv4232 := &x.Status + yyv4232.CodecDecodeSelf(d) } for { - yyj4253++ - if yyhl4253 { - yyb4253 = yyj4253 > l + yyj4227++ + if yyhl4227 { + yyb4227 = yyj4227 > l } else { - yyb4253 = r.CheckBreak() + yyb4227 = r.CheckBreak() } - if yyb4253 { + if yyb4227 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4253-1, "") + z.DecStructFieldNotFound(yyj4227-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -53304,37 +53005,37 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4259 := z.EncBinary() - _ = yym4259 + yym4233 := z.EncBinary() + _ = yym4233 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4260 := !z.EncBinary() - yy2arr4260 := z.EncBasicHandle().StructToArray - var yyq4260 [4]bool - _, _, _ = yysep4260, yyq4260, yy2arr4260 - const yyr4260 bool = false - yyq4260[0] = x.Kind != "" - yyq4260[1] = x.APIVersion != "" - yyq4260[2] = true - var yynn4260 int - if yyr4260 || yy2arr4260 { + yysep4234 := !z.EncBinary() + yy2arr4234 := z.EncBasicHandle().StructToArray + var yyq4234 [4]bool + _, _, _ = yysep4234, yyq4234, yy2arr4234 + const yyr4234 bool = false + yyq4234[0] = x.Kind != "" + yyq4234[1] = x.APIVersion != "" + yyq4234[2] = true + var yynn4234 int + if yyr4234 || yy2arr4234 { r.EncodeArrayStart(4) } else { - yynn4260 = 1 - for _, b := range yyq4260 { + yynn4234 = 1 + for _, b := range yyq4234 { if b { - yynn4260++ + yynn4234++ } } - r.EncodeMapStart(yynn4260) - yynn4260 = 0 + r.EncodeMapStart(yynn4234) + yynn4234 = 0 } - if yyr4260 || yy2arr4260 { + if yyr4234 || yy2arr4234 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4260[0] { - yym4262 := z.EncBinary() - _ = yym4262 + if yyq4234[0] { + yym4236 := z.EncBinary() + _ = yym4236 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -53343,23 +53044,23 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4260[0] { + if yyq4234[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4263 := z.EncBinary() - _ = yym4263 + yym4237 := z.EncBinary() + _ = yym4237 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4260 || yy2arr4260 { + if yyr4234 || yy2arr4234 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4260[1] { - yym4265 := z.EncBinary() - _ = yym4265 + if yyq4234[1] { + yym4239 := z.EncBinary() + _ = yym4239 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -53368,54 +53069,54 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4260[1] { + if yyq4234[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4266 := z.EncBinary() - _ = yym4266 + yym4240 := z.EncBinary() + _ = yym4240 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4260 || yy2arr4260 { + if yyr4234 || yy2arr4234 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4260[2] { - yy4268 := &x.ListMeta - yym4269 := z.EncBinary() - _ = yym4269 + if yyq4234[2] { + yy4242 := &x.ListMeta + yym4243 := z.EncBinary() + _ = yym4243 if false { - } else if z.HasExtensions() && z.EncExt(yy4268) { + } else if z.HasExtensions() && z.EncExt(yy4242) { } else { - z.EncFallback(yy4268) + z.EncFallback(yy4242) } } else { r.EncodeNil() } } else { - if yyq4260[2] { + if yyq4234[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4270 := &x.ListMeta - yym4271 := z.EncBinary() - _ = yym4271 + yy4244 := &x.ListMeta + yym4245 := z.EncBinary() + _ = yym4245 if false { - } else if z.HasExtensions() && z.EncExt(yy4270) { + } else if z.HasExtensions() && z.EncExt(yy4244) { } else { - z.EncFallback(yy4270) + z.EncFallback(yy4244) } } } - if yyr4260 || yy2arr4260 { + if yyr4234 || yy2arr4234 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4273 := z.EncBinary() - _ = yym4273 + yym4247 := z.EncBinary() + _ = yym4247 if false { } else { h.encSliceResourceQuota(([]ResourceQuota)(x.Items), e) @@ -53428,15 +53129,15 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4274 := z.EncBinary() - _ = yym4274 + yym4248 := z.EncBinary() + _ = yym4248 if false { } else { h.encSliceResourceQuota(([]ResourceQuota)(x.Items), e) } } } - if yyr4260 || yy2arr4260 { + if yyr4234 || yy2arr4234 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -53449,25 +53150,25 @@ func (x *ResourceQuotaList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4275 := z.DecBinary() - _ = yym4275 + yym4249 := z.DecBinary() + _ = yym4249 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4276 := r.ContainerType() - if yyct4276 == codecSelferValueTypeMap1234 { - yyl4276 := r.ReadMapStart() - if yyl4276 == 0 { + yyct4250 := r.ContainerType() + if yyct4250 == codecSelferValueTypeMap1234 { + yyl4250 := r.ReadMapStart() + if yyl4250 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4276, d) + x.codecDecodeSelfFromMap(yyl4250, d) } - } else if yyct4276 == codecSelferValueTypeArray1234 { - yyl4276 := r.ReadArrayStart() - if yyl4276 == 0 { + } else if yyct4250 == codecSelferValueTypeArray1234 { + yyl4250 := r.ReadArrayStart() + if yyl4250 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4276, d) + x.codecDecodeSelfFromArray(yyl4250, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -53479,12 +53180,12 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4277Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4277Slc - var yyhl4277 bool = l >= 0 - for yyj4277 := 0; ; yyj4277++ { - if yyhl4277 { - if yyj4277 >= l { + var yys4251Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4251Slc + var yyhl4251 bool = l >= 0 + for yyj4251 := 0; ; yyj4251++ { + if yyhl4251 { + if yyj4251 >= l { break } } else { @@ -53493,10 +53194,10 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4277Slc = r.DecodeBytes(yys4277Slc, true, true) - yys4277 := string(yys4277Slc) + yys4251Slc = r.DecodeBytes(yys4251Slc, true, true) + yys4251 := string(yys4251Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4277 { + switch yys4251 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -53511,33 +53212,33 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4280 := &x.ListMeta - yym4281 := z.DecBinary() - _ = yym4281 + yyv4254 := &x.ListMeta + yym4255 := z.DecBinary() + _ = yym4255 if false { - } else if z.HasExtensions() && z.DecExt(yyv4280) { + } else if z.HasExtensions() && z.DecExt(yyv4254) { } else { - z.DecFallback(yyv4280, false) + z.DecFallback(yyv4254, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4282 := &x.Items - yym4283 := z.DecBinary() - _ = yym4283 + yyv4256 := &x.Items + yym4257 := z.DecBinary() + _ = yym4257 if false { } else { - h.decSliceResourceQuota((*[]ResourceQuota)(yyv4282), d) + h.decSliceResourceQuota((*[]ResourceQuota)(yyv4256), d) } } default: - z.DecStructFieldNotFound(-1, yys4277) - } // end switch yys4277 - } // end for yyj4277 + z.DecStructFieldNotFound(-1, yys4251) + } // end switch yys4251 + } // end for yyj4251 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -53545,16 +53246,16 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4284 int - var yyb4284 bool - var yyhl4284 bool = l >= 0 - yyj4284++ - if yyhl4284 { - yyb4284 = yyj4284 > l + var yyj4258 int + var yyb4258 bool + var yyhl4258 bool = l >= 0 + yyj4258++ + if yyhl4258 { + yyb4258 = yyj4258 > l } else { - yyb4284 = r.CheckBreak() + yyb4258 = r.CheckBreak() } - if yyb4284 { + if yyb4258 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53564,13 +53265,13 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.Kind = string(r.DecodeString()) } - yyj4284++ - if yyhl4284 { - yyb4284 = yyj4284 > l + yyj4258++ + if yyhl4258 { + yyb4258 = yyj4258 > l } else { - yyb4284 = r.CheckBreak() + yyb4258 = r.CheckBreak() } - if yyb4284 { + if yyb4258 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53580,36 +53281,36 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.APIVersion = string(r.DecodeString()) } - yyj4284++ - if yyhl4284 { - yyb4284 = yyj4284 > l + yyj4258++ + if yyhl4258 { + yyb4258 = yyj4258 > l } else { - yyb4284 = r.CheckBreak() + yyb4258 = r.CheckBreak() } - if yyb4284 { + if yyb4258 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4287 := &x.ListMeta - yym4288 := z.DecBinary() - _ = yym4288 + yyv4261 := &x.ListMeta + yym4262 := z.DecBinary() + _ = yym4262 if false { - } else if z.HasExtensions() && z.DecExt(yyv4287) { + } else if z.HasExtensions() && z.DecExt(yyv4261) { } else { - z.DecFallback(yyv4287, false) + z.DecFallback(yyv4261, false) } } - yyj4284++ - if yyhl4284 { - yyb4284 = yyj4284 > l + yyj4258++ + if yyhl4258 { + yyb4258 = yyj4258 > l } else { - yyb4284 = r.CheckBreak() + yyb4258 = r.CheckBreak() } - if yyb4284 { + if yyb4258 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53617,26 +53318,26 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4289 := &x.Items - yym4290 := z.DecBinary() - _ = yym4290 + yyv4263 := &x.Items + yym4264 := z.DecBinary() + _ = yym4264 if false { } else { - h.decSliceResourceQuota((*[]ResourceQuota)(yyv4289), d) + h.decSliceResourceQuota((*[]ResourceQuota)(yyv4263), d) } } for { - yyj4284++ - if yyhl4284 { - yyb4284 = yyj4284 > l + yyj4258++ + if yyhl4258 { + yyb4258 = yyj4258 > l } else { - yyb4284 = r.CheckBreak() + yyb4258 = r.CheckBreak() } - if yyb4284 { + if yyb4258 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4284-1, "") + z.DecStructFieldNotFound(yyj4258-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -53648,39 +53349,39 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4291 := z.EncBinary() - _ = yym4291 + yym4265 := z.EncBinary() + _ = yym4265 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4292 := !z.EncBinary() - yy2arr4292 := z.EncBasicHandle().StructToArray - var yyq4292 [5]bool - _, _, _ = yysep4292, yyq4292, yy2arr4292 - const yyr4292 bool = false - yyq4292[0] = x.Kind != "" - yyq4292[1] = x.APIVersion != "" - yyq4292[2] = true - yyq4292[3] = len(x.Data) != 0 - yyq4292[4] = x.Type != "" - var yynn4292 int - if yyr4292 || yy2arr4292 { + yysep4266 := !z.EncBinary() + yy2arr4266 := z.EncBasicHandle().StructToArray + var yyq4266 [5]bool + _, _, _ = yysep4266, yyq4266, yy2arr4266 + const yyr4266 bool = false + yyq4266[0] = x.Kind != "" + yyq4266[1] = x.APIVersion != "" + yyq4266[2] = true + yyq4266[3] = len(x.Data) != 0 + yyq4266[4] = x.Type != "" + var yynn4266 int + if yyr4266 || yy2arr4266 { r.EncodeArrayStart(5) } else { - yynn4292 = 0 - for _, b := range yyq4292 { + yynn4266 = 0 + for _, b := range yyq4266 { if b { - yynn4292++ + yynn4266++ } } - r.EncodeMapStart(yynn4292) - yynn4292 = 0 + r.EncodeMapStart(yynn4266) + yynn4266 = 0 } - if yyr4292 || yy2arr4292 { + if yyr4266 || yy2arr4266 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4292[0] { - yym4294 := z.EncBinary() - _ = yym4294 + if yyq4266[0] { + yym4268 := z.EncBinary() + _ = yym4268 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -53689,23 +53390,23 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4292[0] { + if yyq4266[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4295 := z.EncBinary() - _ = yym4295 + yym4269 := z.EncBinary() + _ = yym4269 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4292 || yy2arr4292 { + if yyr4266 || yy2arr4266 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4292[1] { - yym4297 := z.EncBinary() - _ = yym4297 + if yyq4266[1] { + yym4271 := z.EncBinary() + _ = yym4271 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -53714,43 +53415,43 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4292[1] { + if yyq4266[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4298 := z.EncBinary() - _ = yym4298 + yym4272 := z.EncBinary() + _ = yym4272 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4292 || yy2arr4292 { + if yyr4266 || yy2arr4266 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4292[2] { - yy4300 := &x.ObjectMeta - yy4300.CodecEncodeSelf(e) + if yyq4266[2] { + yy4274 := &x.ObjectMeta + yy4274.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4292[2] { + if yyq4266[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4301 := &x.ObjectMeta - yy4301.CodecEncodeSelf(e) + yy4275 := &x.ObjectMeta + yy4275.CodecEncodeSelf(e) } } - if yyr4292 || yy2arr4292 { + if yyr4266 || yy2arr4266 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4292[3] { + if yyq4266[3] { if x.Data == nil { r.EncodeNil() } else { - yym4303 := z.EncBinary() - _ = yym4303 + yym4277 := z.EncBinary() + _ = yym4277 if false { } else { h.encMapstringSliceuint8((map[string][]uint8)(x.Data), e) @@ -53760,15 +53461,15 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4292[3] { + if yyq4266[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("data")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Data == nil { r.EncodeNil() } else { - yym4304 := z.EncBinary() - _ = yym4304 + yym4278 := z.EncBinary() + _ = yym4278 if false { } else { h.encMapstringSliceuint8((map[string][]uint8)(x.Data), e) @@ -53776,22 +53477,22 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4292 || yy2arr4292 { + if yyr4266 || yy2arr4266 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4292[4] { + if yyq4266[4] { x.Type.CodecEncodeSelf(e) } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4292[4] { + if yyq4266[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Type.CodecEncodeSelf(e) } } - if yyr4292 || yy2arr4292 { + if yyr4266 || yy2arr4266 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -53804,25 +53505,25 @@ func (x *Secret) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4306 := z.DecBinary() - _ = yym4306 + yym4280 := z.DecBinary() + _ = yym4280 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4307 := r.ContainerType() - if yyct4307 == codecSelferValueTypeMap1234 { - yyl4307 := r.ReadMapStart() - if yyl4307 == 0 { + yyct4281 := r.ContainerType() + if yyct4281 == codecSelferValueTypeMap1234 { + yyl4281 := r.ReadMapStart() + if yyl4281 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4307, d) + x.codecDecodeSelfFromMap(yyl4281, d) } - } else if yyct4307 == codecSelferValueTypeArray1234 { - yyl4307 := r.ReadArrayStart() - if yyl4307 == 0 { + } else if yyct4281 == codecSelferValueTypeArray1234 { + yyl4281 := r.ReadArrayStart() + if yyl4281 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4307, d) + x.codecDecodeSelfFromArray(yyl4281, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -53834,12 +53535,12 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4308Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4308Slc - var yyhl4308 bool = l >= 0 - for yyj4308 := 0; ; yyj4308++ { - if yyhl4308 { - if yyj4308 >= l { + var yys4282Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4282Slc + var yyhl4282 bool = l >= 0 + for yyj4282 := 0; ; yyj4282++ { + if yyhl4282 { + if yyj4282 >= l { break } } else { @@ -53848,10 +53549,10 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4308Slc = r.DecodeBytes(yys4308Slc, true, true) - yys4308 := string(yys4308Slc) + yys4282Slc = r.DecodeBytes(yys4282Slc, true, true) + yys4282 := string(yys4282Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4308 { + switch yys4282 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -53868,19 +53569,19 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4311 := &x.ObjectMeta - yyv4311.CodecDecodeSelf(d) + yyv4285 := &x.ObjectMeta + yyv4285.CodecDecodeSelf(d) } case "data": if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4312 := &x.Data - yym4313 := z.DecBinary() - _ = yym4313 + yyv4286 := &x.Data + yym4287 := z.DecBinary() + _ = yym4287 if false { } else { - h.decMapstringSliceuint8((*map[string][]uint8)(yyv4312), d) + h.decMapstringSliceuint8((*map[string][]uint8)(yyv4286), d) } } case "type": @@ -53890,9 +53591,9 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Type = SecretType(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys4308) - } // end switch yys4308 - } // end for yyj4308 + z.DecStructFieldNotFound(-1, yys4282) + } // end switch yys4282 + } // end for yyj4282 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -53900,16 +53601,16 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4315 int - var yyb4315 bool - var yyhl4315 bool = l >= 0 - yyj4315++ - if yyhl4315 { - yyb4315 = yyj4315 > l + var yyj4289 int + var yyb4289 bool + var yyhl4289 bool = l >= 0 + yyj4289++ + if yyhl4289 { + yyb4289 = yyj4289 > l } else { - yyb4315 = r.CheckBreak() + yyb4289 = r.CheckBreak() } - if yyb4315 { + if yyb4289 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53919,13 +53620,13 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4315++ - if yyhl4315 { - yyb4315 = yyj4315 > l + yyj4289++ + if yyhl4289 { + yyb4289 = yyj4289 > l } else { - yyb4315 = r.CheckBreak() + yyb4289 = r.CheckBreak() } - if yyb4315 { + if yyb4289 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53935,13 +53636,13 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4315++ - if yyhl4315 { - yyb4315 = yyj4315 > l + yyj4289++ + if yyhl4289 { + yyb4289 = yyj4289 > l } else { - yyb4315 = r.CheckBreak() + yyb4289 = r.CheckBreak() } - if yyb4315 { + if yyb4289 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53949,16 +53650,16 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4318 := &x.ObjectMeta - yyv4318.CodecDecodeSelf(d) + yyv4292 := &x.ObjectMeta + yyv4292.CodecDecodeSelf(d) } - yyj4315++ - if yyhl4315 { - yyb4315 = yyj4315 > l + yyj4289++ + if yyhl4289 { + yyb4289 = yyj4289 > l } else { - yyb4315 = r.CheckBreak() + yyb4289 = r.CheckBreak() } - if yyb4315 { + if yyb4289 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53966,21 +53667,21 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4319 := &x.Data - yym4320 := z.DecBinary() - _ = yym4320 + yyv4293 := &x.Data + yym4294 := z.DecBinary() + _ = yym4294 if false { } else { - h.decMapstringSliceuint8((*map[string][]uint8)(yyv4319), d) + h.decMapstringSliceuint8((*map[string][]uint8)(yyv4293), d) } } - yyj4315++ - if yyhl4315 { - yyb4315 = yyj4315 > l + yyj4289++ + if yyhl4289 { + yyb4289 = yyj4289 > l } else { - yyb4315 = r.CheckBreak() + yyb4289 = r.CheckBreak() } - if yyb4315 { + if yyb4289 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53991,17 +53692,17 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Type = SecretType(r.DecodeString()) } for { - yyj4315++ - if yyhl4315 { - yyb4315 = yyj4315 > l + yyj4289++ + if yyhl4289 { + yyb4289 = yyj4289 > l } else { - yyb4315 = r.CheckBreak() + yyb4289 = r.CheckBreak() } - if yyb4315 { + if yyb4289 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4315-1, "") + z.DecStructFieldNotFound(yyj4289-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -54010,8 +53711,8 @@ func (x SecretType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym4322 := z.EncBinary() - _ = yym4322 + yym4296 := z.EncBinary() + _ = yym4296 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -54023,8 +53724,8 @@ func (x *SecretType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4323 := z.DecBinary() - _ = yym4323 + yym4297 := z.DecBinary() + _ = yym4297 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -54039,37 +53740,37 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4324 := z.EncBinary() - _ = yym4324 + yym4298 := z.EncBinary() + _ = yym4298 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4325 := !z.EncBinary() - yy2arr4325 := z.EncBasicHandle().StructToArray - var yyq4325 [4]bool - _, _, _ = yysep4325, yyq4325, yy2arr4325 - const yyr4325 bool = false - yyq4325[0] = x.Kind != "" - yyq4325[1] = x.APIVersion != "" - yyq4325[2] = true - var yynn4325 int - if yyr4325 || yy2arr4325 { + yysep4299 := !z.EncBinary() + yy2arr4299 := z.EncBasicHandle().StructToArray + var yyq4299 [4]bool + _, _, _ = yysep4299, yyq4299, yy2arr4299 + const yyr4299 bool = false + yyq4299[0] = x.Kind != "" + yyq4299[1] = x.APIVersion != "" + yyq4299[2] = true + var yynn4299 int + if yyr4299 || yy2arr4299 { r.EncodeArrayStart(4) } else { - yynn4325 = 1 - for _, b := range yyq4325 { + yynn4299 = 1 + for _, b := range yyq4299 { if b { - yynn4325++ + yynn4299++ } } - r.EncodeMapStart(yynn4325) - yynn4325 = 0 + r.EncodeMapStart(yynn4299) + yynn4299 = 0 } - if yyr4325 || yy2arr4325 { + if yyr4299 || yy2arr4299 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4325[0] { - yym4327 := z.EncBinary() - _ = yym4327 + if yyq4299[0] { + yym4301 := z.EncBinary() + _ = yym4301 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -54078,23 +53779,23 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4325[0] { + if yyq4299[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4328 := z.EncBinary() - _ = yym4328 + yym4302 := z.EncBinary() + _ = yym4302 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4325 || yy2arr4325 { + if yyr4299 || yy2arr4299 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4325[1] { - yym4330 := z.EncBinary() - _ = yym4330 + if yyq4299[1] { + yym4304 := z.EncBinary() + _ = yym4304 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -54103,54 +53804,54 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4325[1] { + if yyq4299[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4331 := z.EncBinary() - _ = yym4331 + yym4305 := z.EncBinary() + _ = yym4305 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4325 || yy2arr4325 { + if yyr4299 || yy2arr4299 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4325[2] { - yy4333 := &x.ListMeta - yym4334 := z.EncBinary() - _ = yym4334 + if yyq4299[2] { + yy4307 := &x.ListMeta + yym4308 := z.EncBinary() + _ = yym4308 if false { - } else if z.HasExtensions() && z.EncExt(yy4333) { + } else if z.HasExtensions() && z.EncExt(yy4307) { } else { - z.EncFallback(yy4333) + z.EncFallback(yy4307) } } else { r.EncodeNil() } } else { - if yyq4325[2] { + if yyq4299[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4335 := &x.ListMeta - yym4336 := z.EncBinary() - _ = yym4336 + yy4309 := &x.ListMeta + yym4310 := z.EncBinary() + _ = yym4310 if false { - } else if z.HasExtensions() && z.EncExt(yy4335) { + } else if z.HasExtensions() && z.EncExt(yy4309) { } else { - z.EncFallback(yy4335) + z.EncFallback(yy4309) } } } - if yyr4325 || yy2arr4325 { + if yyr4299 || yy2arr4299 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4338 := z.EncBinary() - _ = yym4338 + yym4312 := z.EncBinary() + _ = yym4312 if false { } else { h.encSliceSecret(([]Secret)(x.Items), e) @@ -54163,15 +53864,15 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4339 := z.EncBinary() - _ = yym4339 + yym4313 := z.EncBinary() + _ = yym4313 if false { } else { h.encSliceSecret(([]Secret)(x.Items), e) } } } - if yyr4325 || yy2arr4325 { + if yyr4299 || yy2arr4299 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -54184,25 +53885,25 @@ func (x *SecretList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4340 := z.DecBinary() - _ = yym4340 + yym4314 := z.DecBinary() + _ = yym4314 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4341 := r.ContainerType() - if yyct4341 == codecSelferValueTypeMap1234 { - yyl4341 := r.ReadMapStart() - if yyl4341 == 0 { + yyct4315 := r.ContainerType() + if yyct4315 == codecSelferValueTypeMap1234 { + yyl4315 := r.ReadMapStart() + if yyl4315 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4341, d) + x.codecDecodeSelfFromMap(yyl4315, d) } - } else if yyct4341 == codecSelferValueTypeArray1234 { - yyl4341 := r.ReadArrayStart() - if yyl4341 == 0 { + } else if yyct4315 == codecSelferValueTypeArray1234 { + yyl4315 := r.ReadArrayStart() + if yyl4315 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4341, d) + x.codecDecodeSelfFromArray(yyl4315, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -54214,12 +53915,12 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4342Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4342Slc - var yyhl4342 bool = l >= 0 - for yyj4342 := 0; ; yyj4342++ { - if yyhl4342 { - if yyj4342 >= l { + var yys4316Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4316Slc + var yyhl4316 bool = l >= 0 + for yyj4316 := 0; ; yyj4316++ { + if yyhl4316 { + if yyj4316 >= l { break } } else { @@ -54228,10 +53929,10 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4342Slc = r.DecodeBytes(yys4342Slc, true, true) - yys4342 := string(yys4342Slc) + yys4316Slc = r.DecodeBytes(yys4316Slc, true, true) + yys4316 := string(yys4316Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4342 { + switch yys4316 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -54246,33 +53947,33 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4345 := &x.ListMeta - yym4346 := z.DecBinary() - _ = yym4346 + yyv4319 := &x.ListMeta + yym4320 := z.DecBinary() + _ = yym4320 if false { - } else if z.HasExtensions() && z.DecExt(yyv4345) { + } else if z.HasExtensions() && z.DecExt(yyv4319) { } else { - z.DecFallback(yyv4345, false) + z.DecFallback(yyv4319, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4347 := &x.Items - yym4348 := z.DecBinary() - _ = yym4348 + yyv4321 := &x.Items + yym4322 := z.DecBinary() + _ = yym4322 if false { } else { - h.decSliceSecret((*[]Secret)(yyv4347), d) + h.decSliceSecret((*[]Secret)(yyv4321), d) } } default: - z.DecStructFieldNotFound(-1, yys4342) - } // end switch yys4342 - } // end for yyj4342 + z.DecStructFieldNotFound(-1, yys4316) + } // end switch yys4316 + } // end for yyj4316 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -54280,16 +53981,16 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4349 int - var yyb4349 bool - var yyhl4349 bool = l >= 0 - yyj4349++ - if yyhl4349 { - yyb4349 = yyj4349 > l + var yyj4323 int + var yyb4323 bool + var yyhl4323 bool = l >= 0 + yyj4323++ + if yyhl4323 { + yyb4323 = yyj4323 > l } else { - yyb4349 = r.CheckBreak() + yyb4323 = r.CheckBreak() } - if yyb4349 { + if yyb4323 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54299,13 +54000,13 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4349++ - if yyhl4349 { - yyb4349 = yyj4349 > l + yyj4323++ + if yyhl4323 { + yyb4323 = yyj4323 > l } else { - yyb4349 = r.CheckBreak() + yyb4323 = r.CheckBreak() } - if yyb4349 { + if yyb4323 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54315,36 +54016,36 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4349++ - if yyhl4349 { - yyb4349 = yyj4349 > l + yyj4323++ + if yyhl4323 { + yyb4323 = yyj4323 > l } else { - yyb4349 = r.CheckBreak() + yyb4323 = r.CheckBreak() } - if yyb4349 { + if yyb4323 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4352 := &x.ListMeta - yym4353 := z.DecBinary() - _ = yym4353 + yyv4326 := &x.ListMeta + yym4327 := z.DecBinary() + _ = yym4327 if false { - } else if z.HasExtensions() && z.DecExt(yyv4352) { + } else if z.HasExtensions() && z.DecExt(yyv4326) { } else { - z.DecFallback(yyv4352, false) + z.DecFallback(yyv4326, false) } } - yyj4349++ - if yyhl4349 { - yyb4349 = yyj4349 > l + yyj4323++ + if yyhl4323 { + yyb4323 = yyj4323 > l } else { - yyb4349 = r.CheckBreak() + yyb4323 = r.CheckBreak() } - if yyb4349 { + if yyb4323 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54352,26 +54053,26 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4354 := &x.Items - yym4355 := z.DecBinary() - _ = yym4355 + yyv4328 := &x.Items + yym4329 := z.DecBinary() + _ = yym4329 if false { } else { - h.decSliceSecret((*[]Secret)(yyv4354), d) + h.decSliceSecret((*[]Secret)(yyv4328), d) } } for { - yyj4349++ - if yyhl4349 { - yyb4349 = yyj4349 > l + yyj4323++ + if yyhl4323 { + yyb4323 = yyj4323 > l } else { - yyb4349 = r.CheckBreak() + yyb4323 = r.CheckBreak() } - if yyb4349 { + if yyb4323 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4349-1, "") + z.DecStructFieldNotFound(yyj4323-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -54383,38 +54084,38 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4356 := z.EncBinary() - _ = yym4356 + yym4330 := z.EncBinary() + _ = yym4330 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4357 := !z.EncBinary() - yy2arr4357 := z.EncBasicHandle().StructToArray - var yyq4357 [4]bool - _, _, _ = yysep4357, yyq4357, yy2arr4357 - const yyr4357 bool = false - yyq4357[0] = x.Kind != "" - yyq4357[1] = x.APIVersion != "" - yyq4357[2] = true - yyq4357[3] = len(x.Data) != 0 - var yynn4357 int - if yyr4357 || yy2arr4357 { + yysep4331 := !z.EncBinary() + yy2arr4331 := z.EncBasicHandle().StructToArray + var yyq4331 [4]bool + _, _, _ = yysep4331, yyq4331, yy2arr4331 + const yyr4331 bool = false + yyq4331[0] = x.Kind != "" + yyq4331[1] = x.APIVersion != "" + yyq4331[2] = true + yyq4331[3] = len(x.Data) != 0 + var yynn4331 int + if yyr4331 || yy2arr4331 { r.EncodeArrayStart(4) } else { - yynn4357 = 0 - for _, b := range yyq4357 { + yynn4331 = 0 + for _, b := range yyq4331 { if b { - yynn4357++ + yynn4331++ } } - r.EncodeMapStart(yynn4357) - yynn4357 = 0 + r.EncodeMapStart(yynn4331) + yynn4331 = 0 } - if yyr4357 || yy2arr4357 { + if yyr4331 || yy2arr4331 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4357[0] { - yym4359 := z.EncBinary() - _ = yym4359 + if yyq4331[0] { + yym4333 := z.EncBinary() + _ = yym4333 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -54423,23 +54124,23 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4357[0] { + if yyq4331[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4360 := z.EncBinary() - _ = yym4360 + yym4334 := z.EncBinary() + _ = yym4334 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4357 || yy2arr4357 { + if yyr4331 || yy2arr4331 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4357[1] { - yym4362 := z.EncBinary() - _ = yym4362 + if yyq4331[1] { + yym4336 := z.EncBinary() + _ = yym4336 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -54448,43 +54149,43 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4357[1] { + if yyq4331[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4363 := z.EncBinary() - _ = yym4363 + yym4337 := z.EncBinary() + _ = yym4337 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4357 || yy2arr4357 { + if yyr4331 || yy2arr4331 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4357[2] { - yy4365 := &x.ObjectMeta - yy4365.CodecEncodeSelf(e) + if yyq4331[2] { + yy4339 := &x.ObjectMeta + yy4339.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4357[2] { + if yyq4331[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4366 := &x.ObjectMeta - yy4366.CodecEncodeSelf(e) + yy4340 := &x.ObjectMeta + yy4340.CodecEncodeSelf(e) } } - if yyr4357 || yy2arr4357 { + if yyr4331 || yy2arr4331 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4357[3] { + if yyq4331[3] { if x.Data == nil { r.EncodeNil() } else { - yym4368 := z.EncBinary() - _ = yym4368 + yym4342 := z.EncBinary() + _ = yym4342 if false { } else { z.F.EncMapStringStringV(x.Data, false, e) @@ -54494,15 +54195,15 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4357[3] { + if yyq4331[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("data")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Data == nil { r.EncodeNil() } else { - yym4369 := z.EncBinary() - _ = yym4369 + yym4343 := z.EncBinary() + _ = yym4343 if false { } else { z.F.EncMapStringStringV(x.Data, false, e) @@ -54510,7 +54211,7 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4357 || yy2arr4357 { + if yyr4331 || yy2arr4331 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -54523,25 +54224,25 @@ func (x *ConfigMap) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4370 := z.DecBinary() - _ = yym4370 + yym4344 := z.DecBinary() + _ = yym4344 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4371 := r.ContainerType() - if yyct4371 == codecSelferValueTypeMap1234 { - yyl4371 := r.ReadMapStart() - if yyl4371 == 0 { + yyct4345 := r.ContainerType() + if yyct4345 == codecSelferValueTypeMap1234 { + yyl4345 := r.ReadMapStart() + if yyl4345 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4371, d) + x.codecDecodeSelfFromMap(yyl4345, d) } - } else if yyct4371 == codecSelferValueTypeArray1234 { - yyl4371 := r.ReadArrayStart() - if yyl4371 == 0 { + } else if yyct4345 == codecSelferValueTypeArray1234 { + yyl4345 := r.ReadArrayStart() + if yyl4345 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4371, d) + x.codecDecodeSelfFromArray(yyl4345, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -54553,12 +54254,12 @@ func (x *ConfigMap) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4372Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4372Slc - var yyhl4372 bool = l >= 0 - for yyj4372 := 0; ; yyj4372++ { - if yyhl4372 { - if yyj4372 >= l { + var yys4346Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4346Slc + var yyhl4346 bool = l >= 0 + for yyj4346 := 0; ; yyj4346++ { + if yyhl4346 { + if yyj4346 >= l { break } } else { @@ -54567,10 +54268,10 @@ func (x *ConfigMap) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4372Slc = r.DecodeBytes(yys4372Slc, true, true) - yys4372 := string(yys4372Slc) + yys4346Slc = r.DecodeBytes(yys4346Slc, true, true) + yys4346 := string(yys4346Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4372 { + switch yys4346 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -54587,25 +54288,25 @@ func (x *ConfigMap) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4375 := &x.ObjectMeta - yyv4375.CodecDecodeSelf(d) + yyv4349 := &x.ObjectMeta + yyv4349.CodecDecodeSelf(d) } case "data": if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4376 := &x.Data - yym4377 := z.DecBinary() - _ = yym4377 + yyv4350 := &x.Data + yym4351 := z.DecBinary() + _ = yym4351 if false { } else { - z.F.DecMapStringStringX(yyv4376, false, d) + z.F.DecMapStringStringX(yyv4350, false, d) } } default: - z.DecStructFieldNotFound(-1, yys4372) - } // end switch yys4372 - } // end for yyj4372 + z.DecStructFieldNotFound(-1, yys4346) + } // end switch yys4346 + } // end for yyj4346 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -54613,16 +54314,16 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4378 int - var yyb4378 bool - var yyhl4378 bool = l >= 0 - yyj4378++ - if yyhl4378 { - yyb4378 = yyj4378 > l + var yyj4352 int + var yyb4352 bool + var yyhl4352 bool = l >= 0 + yyj4352++ + if yyhl4352 { + yyb4352 = yyj4352 > l } else { - yyb4378 = r.CheckBreak() + yyb4352 = r.CheckBreak() } - if yyb4378 { + if yyb4352 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54632,13 +54333,13 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4378++ - if yyhl4378 { - yyb4378 = yyj4378 > l + yyj4352++ + if yyhl4352 { + yyb4352 = yyj4352 > l } else { - yyb4378 = r.CheckBreak() + yyb4352 = r.CheckBreak() } - if yyb4378 { + if yyb4352 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54648,13 +54349,13 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4378++ - if yyhl4378 { - yyb4378 = yyj4378 > l + yyj4352++ + if yyhl4352 { + yyb4352 = yyj4352 > l } else { - yyb4378 = r.CheckBreak() + yyb4352 = r.CheckBreak() } - if yyb4378 { + if yyb4352 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54662,16 +54363,16 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4381 := &x.ObjectMeta - yyv4381.CodecDecodeSelf(d) + yyv4355 := &x.ObjectMeta + yyv4355.CodecDecodeSelf(d) } - yyj4378++ - if yyhl4378 { - yyb4378 = yyj4378 > l + yyj4352++ + if yyhl4352 { + yyb4352 = yyj4352 > l } else { - yyb4378 = r.CheckBreak() + yyb4352 = r.CheckBreak() } - if yyb4378 { + if yyb4352 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54679,26 +54380,26 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4382 := &x.Data - yym4383 := z.DecBinary() - _ = yym4383 + yyv4356 := &x.Data + yym4357 := z.DecBinary() + _ = yym4357 if false { } else { - z.F.DecMapStringStringX(yyv4382, false, d) + z.F.DecMapStringStringX(yyv4356, false, d) } } for { - yyj4378++ - if yyhl4378 { - yyb4378 = yyj4378 > l + yyj4352++ + if yyhl4352 { + yyb4352 = yyj4352 > l } else { - yyb4378 = r.CheckBreak() + yyb4352 = r.CheckBreak() } - if yyb4378 { + if yyb4352 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4378-1, "") + z.DecStructFieldNotFound(yyj4352-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -54710,37 +54411,37 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4384 := z.EncBinary() - _ = yym4384 + yym4358 := z.EncBinary() + _ = yym4358 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4385 := !z.EncBinary() - yy2arr4385 := z.EncBasicHandle().StructToArray - var yyq4385 [4]bool - _, _, _ = yysep4385, yyq4385, yy2arr4385 - const yyr4385 bool = false - yyq4385[0] = x.Kind != "" - yyq4385[1] = x.APIVersion != "" - yyq4385[2] = true - var yynn4385 int - if yyr4385 || yy2arr4385 { + yysep4359 := !z.EncBinary() + yy2arr4359 := z.EncBasicHandle().StructToArray + var yyq4359 [4]bool + _, _, _ = yysep4359, yyq4359, yy2arr4359 + const yyr4359 bool = false + yyq4359[0] = x.Kind != "" + yyq4359[1] = x.APIVersion != "" + yyq4359[2] = true + var yynn4359 int + if yyr4359 || yy2arr4359 { r.EncodeArrayStart(4) } else { - yynn4385 = 1 - for _, b := range yyq4385 { + yynn4359 = 1 + for _, b := range yyq4359 { if b { - yynn4385++ + yynn4359++ } } - r.EncodeMapStart(yynn4385) - yynn4385 = 0 + r.EncodeMapStart(yynn4359) + yynn4359 = 0 } - if yyr4385 || yy2arr4385 { + if yyr4359 || yy2arr4359 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4385[0] { - yym4387 := z.EncBinary() - _ = yym4387 + if yyq4359[0] { + yym4361 := z.EncBinary() + _ = yym4361 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -54749,23 +54450,23 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4385[0] { + if yyq4359[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4388 := z.EncBinary() - _ = yym4388 + yym4362 := z.EncBinary() + _ = yym4362 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4385 || yy2arr4385 { + if yyr4359 || yy2arr4359 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4385[1] { - yym4390 := z.EncBinary() - _ = yym4390 + if yyq4359[1] { + yym4364 := z.EncBinary() + _ = yym4364 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -54774,54 +54475,54 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4385[1] { + if yyq4359[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4391 := z.EncBinary() - _ = yym4391 + yym4365 := z.EncBinary() + _ = yym4365 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4385 || yy2arr4385 { + if yyr4359 || yy2arr4359 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4385[2] { - yy4393 := &x.ListMeta - yym4394 := z.EncBinary() - _ = yym4394 + if yyq4359[2] { + yy4367 := &x.ListMeta + yym4368 := z.EncBinary() + _ = yym4368 if false { - } else if z.HasExtensions() && z.EncExt(yy4393) { + } else if z.HasExtensions() && z.EncExt(yy4367) { } else { - z.EncFallback(yy4393) + z.EncFallback(yy4367) } } else { r.EncodeNil() } } else { - if yyq4385[2] { + if yyq4359[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4395 := &x.ListMeta - yym4396 := z.EncBinary() - _ = yym4396 + yy4369 := &x.ListMeta + yym4370 := z.EncBinary() + _ = yym4370 if false { - } else if z.HasExtensions() && z.EncExt(yy4395) { + } else if z.HasExtensions() && z.EncExt(yy4369) { } else { - z.EncFallback(yy4395) + z.EncFallback(yy4369) } } } - if yyr4385 || yy2arr4385 { + if yyr4359 || yy2arr4359 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4398 := z.EncBinary() - _ = yym4398 + yym4372 := z.EncBinary() + _ = yym4372 if false { } else { h.encSliceConfigMap(([]ConfigMap)(x.Items), e) @@ -54834,15 +54535,15 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4399 := z.EncBinary() - _ = yym4399 + yym4373 := z.EncBinary() + _ = yym4373 if false { } else { h.encSliceConfigMap(([]ConfigMap)(x.Items), e) } } } - if yyr4385 || yy2arr4385 { + if yyr4359 || yy2arr4359 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -54855,25 +54556,25 @@ func (x *ConfigMapList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4400 := z.DecBinary() - _ = yym4400 + yym4374 := z.DecBinary() + _ = yym4374 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4401 := r.ContainerType() - if yyct4401 == codecSelferValueTypeMap1234 { - yyl4401 := r.ReadMapStart() - if yyl4401 == 0 { + yyct4375 := r.ContainerType() + if yyct4375 == codecSelferValueTypeMap1234 { + yyl4375 := r.ReadMapStart() + if yyl4375 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4401, d) + x.codecDecodeSelfFromMap(yyl4375, d) } - } else if yyct4401 == codecSelferValueTypeArray1234 { - yyl4401 := r.ReadArrayStart() - if yyl4401 == 0 { + } else if yyct4375 == codecSelferValueTypeArray1234 { + yyl4375 := r.ReadArrayStart() + if yyl4375 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4401, d) + x.codecDecodeSelfFromArray(yyl4375, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -54885,12 +54586,12 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4402Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4402Slc - var yyhl4402 bool = l >= 0 - for yyj4402 := 0; ; yyj4402++ { - if yyhl4402 { - if yyj4402 >= l { + var yys4376Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4376Slc + var yyhl4376 bool = l >= 0 + for yyj4376 := 0; ; yyj4376++ { + if yyhl4376 { + if yyj4376 >= l { break } } else { @@ -54899,10 +54600,10 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4402Slc = r.DecodeBytes(yys4402Slc, true, true) - yys4402 := string(yys4402Slc) + yys4376Slc = r.DecodeBytes(yys4376Slc, true, true) + yys4376 := string(yys4376Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4402 { + switch yys4376 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -54917,33 +54618,33 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4405 := &x.ListMeta - yym4406 := z.DecBinary() - _ = yym4406 + yyv4379 := &x.ListMeta + yym4380 := z.DecBinary() + _ = yym4380 if false { - } else if z.HasExtensions() && z.DecExt(yyv4405) { + } else if z.HasExtensions() && z.DecExt(yyv4379) { } else { - z.DecFallback(yyv4405, false) + z.DecFallback(yyv4379, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4407 := &x.Items - yym4408 := z.DecBinary() - _ = yym4408 + yyv4381 := &x.Items + yym4382 := z.DecBinary() + _ = yym4382 if false { } else { - h.decSliceConfigMap((*[]ConfigMap)(yyv4407), d) + h.decSliceConfigMap((*[]ConfigMap)(yyv4381), d) } } default: - z.DecStructFieldNotFound(-1, yys4402) - } // end switch yys4402 - } // end for yyj4402 + z.DecStructFieldNotFound(-1, yys4376) + } // end switch yys4376 + } // end for yyj4376 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -54951,16 +54652,16 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4409 int - var yyb4409 bool - var yyhl4409 bool = l >= 0 - yyj4409++ - if yyhl4409 { - yyb4409 = yyj4409 > l + var yyj4383 int + var yyb4383 bool + var yyhl4383 bool = l >= 0 + yyj4383++ + if yyhl4383 { + yyb4383 = yyj4383 > l } else { - yyb4409 = r.CheckBreak() + yyb4383 = r.CheckBreak() } - if yyb4409 { + if yyb4383 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54970,13 +54671,13 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4409++ - if yyhl4409 { - yyb4409 = yyj4409 > l + yyj4383++ + if yyhl4383 { + yyb4383 = yyj4383 > l } else { - yyb4409 = r.CheckBreak() + yyb4383 = r.CheckBreak() } - if yyb4409 { + if yyb4383 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54986,36 +54687,36 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4409++ - if yyhl4409 { - yyb4409 = yyj4409 > l + yyj4383++ + if yyhl4383 { + yyb4383 = yyj4383 > l } else { - yyb4409 = r.CheckBreak() + yyb4383 = r.CheckBreak() } - if yyb4409 { + if yyb4383 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4412 := &x.ListMeta - yym4413 := z.DecBinary() - _ = yym4413 + yyv4386 := &x.ListMeta + yym4387 := z.DecBinary() + _ = yym4387 if false { - } else if z.HasExtensions() && z.DecExt(yyv4412) { + } else if z.HasExtensions() && z.DecExt(yyv4386) { } else { - z.DecFallback(yyv4412, false) + z.DecFallback(yyv4386, false) } } - yyj4409++ - if yyhl4409 { - yyb4409 = yyj4409 > l + yyj4383++ + if yyhl4383 { + yyb4383 = yyj4383 > l } else { - yyb4409 = r.CheckBreak() + yyb4383 = r.CheckBreak() } - if yyb4409 { + if yyb4383 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55023,26 +54724,26 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4414 := &x.Items - yym4415 := z.DecBinary() - _ = yym4415 + yyv4388 := &x.Items + yym4389 := z.DecBinary() + _ = yym4389 if false { } else { - h.decSliceConfigMap((*[]ConfigMap)(yyv4414), d) + h.decSliceConfigMap((*[]ConfigMap)(yyv4388), d) } } for { - yyj4409++ - if yyhl4409 { - yyb4409 = yyj4409 > l + yyj4383++ + if yyhl4383 { + yyb4383 = yyj4383 > l } else { - yyb4409 = r.CheckBreak() + yyb4383 = r.CheckBreak() } - if yyb4409 { + if yyb4383 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4409-1, "") + z.DecStructFieldNotFound(yyj4383-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -55051,8 +54752,8 @@ func (x PatchType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym4416 := z.EncBinary() - _ = yym4416 + yym4390 := z.EncBinary() + _ = yym4390 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -55064,8 +54765,8 @@ func (x *PatchType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4417 := z.DecBinary() - _ = yym4417 + yym4391 := z.DecBinary() + _ = yym4391 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -55077,8 +54778,8 @@ func (x ComponentConditionType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym4418 := z.EncBinary() - _ = yym4418 + yym4392 := z.EncBinary() + _ = yym4392 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -55090,8 +54791,8 @@ func (x *ComponentConditionType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4419 := z.DecBinary() - _ = yym4419 + yym4393 := z.DecBinary() + _ = yym4393 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -55106,32 +54807,32 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4420 := z.EncBinary() - _ = yym4420 + yym4394 := z.EncBinary() + _ = yym4394 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4421 := !z.EncBinary() - yy2arr4421 := z.EncBasicHandle().StructToArray - var yyq4421 [4]bool - _, _, _ = yysep4421, yyq4421, yy2arr4421 - const yyr4421 bool = false - yyq4421[2] = x.Message != "" - yyq4421[3] = x.Error != "" - var yynn4421 int - if yyr4421 || yy2arr4421 { + yysep4395 := !z.EncBinary() + yy2arr4395 := z.EncBasicHandle().StructToArray + var yyq4395 [4]bool + _, _, _ = yysep4395, yyq4395, yy2arr4395 + const yyr4395 bool = false + yyq4395[2] = x.Message != "" + yyq4395[3] = x.Error != "" + var yynn4395 int + if yyr4395 || yy2arr4395 { r.EncodeArrayStart(4) } else { - yynn4421 = 2 - for _, b := range yyq4421 { + yynn4395 = 2 + for _, b := range yyq4395 { if b { - yynn4421++ + yynn4395++ } } - r.EncodeMapStart(yynn4421) - yynn4421 = 0 + r.EncodeMapStart(yynn4395) + yynn4395 = 0 } - if yyr4421 || yy2arr4421 { + if yyr4395 || yy2arr4395 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) x.Type.CodecEncodeSelf(e) } else { @@ -55140,7 +54841,7 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Type.CodecEncodeSelf(e) } - if yyr4421 || yy2arr4421 { + if yyr4395 || yy2arr4395 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) x.Status.CodecEncodeSelf(e) } else { @@ -55149,11 +54850,11 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Status.CodecEncodeSelf(e) } - if yyr4421 || yy2arr4421 { + if yyr4395 || yy2arr4395 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4421[2] { - yym4425 := z.EncBinary() - _ = yym4425 + if yyq4395[2] { + yym4399 := z.EncBinary() + _ = yym4399 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) @@ -55162,23 +54863,23 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4421[2] { + if yyq4395[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("message")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4426 := z.EncBinary() - _ = yym4426 + yym4400 := z.EncBinary() + _ = yym4400 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) } } } - if yyr4421 || yy2arr4421 { + if yyr4395 || yy2arr4395 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4421[3] { - yym4428 := z.EncBinary() - _ = yym4428 + if yyq4395[3] { + yym4402 := z.EncBinary() + _ = yym4402 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Error)) @@ -55187,19 +54888,19 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4421[3] { + if yyq4395[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("error")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4429 := z.EncBinary() - _ = yym4429 + yym4403 := z.EncBinary() + _ = yym4403 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Error)) } } } - if yyr4421 || yy2arr4421 { + if yyr4395 || yy2arr4395 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -55209,6 +54910,319 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *ComponentCondition) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym4404 := z.DecBinary() + _ = yym4404 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct4405 := r.ContainerType() + if yyct4405 == codecSelferValueTypeMap1234 { + yyl4405 := r.ReadMapStart() + if yyl4405 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl4405, d) + } + } else if yyct4405 == codecSelferValueTypeArray1234 { + yyl4405 := r.ReadArrayStart() + if yyl4405 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl4405, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *ComponentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys4406Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4406Slc + var yyhl4406 bool = l >= 0 + for yyj4406 := 0; ; yyj4406++ { + if yyhl4406 { + if yyj4406 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys4406Slc = r.DecodeBytes(yys4406Slc, true, true) + yys4406 := string(yys4406Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys4406 { + case "type": + if r.TryDecodeAsNil() { + x.Type = "" + } else { + x.Type = ComponentConditionType(r.DecodeString()) + } + case "status": + if r.TryDecodeAsNil() { + x.Status = "" + } else { + x.Status = ConditionStatus(r.DecodeString()) + } + case "message": + if r.TryDecodeAsNil() { + x.Message = "" + } else { + x.Message = string(r.DecodeString()) + } + case "error": + if r.TryDecodeAsNil() { + x.Error = "" + } else { + x.Error = string(r.DecodeString()) + } + default: + z.DecStructFieldNotFound(-1, yys4406) + } // end switch yys4406 + } // end for yyj4406 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *ComponentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj4411 int + var yyb4411 bool + var yyhl4411 bool = l >= 0 + yyj4411++ + if yyhl4411 { + yyb4411 = yyj4411 > l + } else { + yyb4411 = r.CheckBreak() + } + if yyb4411 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Type = "" + } else { + x.Type = ComponentConditionType(r.DecodeString()) + } + yyj4411++ + if yyhl4411 { + yyb4411 = yyj4411 > l + } else { + yyb4411 = r.CheckBreak() + } + if yyb4411 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Status = "" + } else { + x.Status = ConditionStatus(r.DecodeString()) + } + yyj4411++ + if yyhl4411 { + yyb4411 = yyj4411 > l + } else { + yyb4411 = r.CheckBreak() + } + if yyb4411 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Message = "" + } else { + x.Message = string(r.DecodeString()) + } + yyj4411++ + if yyhl4411 { + yyb4411 = yyj4411 > l + } else { + yyb4411 = r.CheckBreak() + } + if yyb4411 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Error = "" + } else { + x.Error = string(r.DecodeString()) + } + for { + yyj4411++ + if yyhl4411 { + yyb4411 = yyj4411 > l + } else { + yyb4411 = r.CheckBreak() + } + if yyb4411 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj4411-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x *ComponentStatus) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym4416 := z.EncBinary() + _ = yym4416 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep4417 := !z.EncBinary() + yy2arr4417 := z.EncBasicHandle().StructToArray + var yyq4417 [4]bool + _, _, _ = yysep4417, yyq4417, yy2arr4417 + const yyr4417 bool = false + yyq4417[0] = x.Kind != "" + yyq4417[1] = x.APIVersion != "" + yyq4417[2] = true + yyq4417[3] = len(x.Conditions) != 0 + var yynn4417 int + if yyr4417 || yy2arr4417 { + r.EncodeArrayStart(4) + } else { + yynn4417 = 0 + for _, b := range yyq4417 { + if b { + yynn4417++ + } + } + r.EncodeMapStart(yynn4417) + yynn4417 = 0 + } + if yyr4417 || yy2arr4417 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4417[0] { + yym4419 := z.EncBinary() + _ = yym4419 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4417[0] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("kind")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym4420 := z.EncBinary() + _ = yym4420 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) + } + } + } + if yyr4417 || yy2arr4417 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4417[1] { + yym4422 := z.EncBinary() + _ = yym4422 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4417[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym4423 := z.EncBinary() + _ = yym4423 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } + } + if yyr4417 || yy2arr4417 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4417[2] { + yy4425 := &x.ObjectMeta + yy4425.CodecEncodeSelf(e) + } else { + r.EncodeNil() + } + } else { + if yyq4417[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("metadata")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy4426 := &x.ObjectMeta + yy4426.CodecEncodeSelf(e) + } + } + if yyr4417 || yy2arr4417 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4417[3] { + if x.Conditions == nil { + r.EncodeNil() + } else { + yym4428 := z.EncBinary() + _ = yym4428 + if false { + } else { + h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) + } + } + } else { + r.EncodeNil() + } + } else { + if yyq4417[3] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("conditions")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Conditions == nil { + r.EncodeNil() + } else { + yym4429 := z.EncBinary() + _ = yym4429 + if false { + } else { + h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) + } + } + } + } + if yyr4417 || yy2arr4417 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + +func (x *ComponentStatus) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -55238,7 +55252,7 @@ func (x *ComponentCondition) CodecDecodeSelf(d *codec1978.Decoder) { } } -func (x *ComponentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { +func (x *ComponentStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -55260,319 +55274,6 @@ func (x *ComponentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) yys4432 := string(yys4432Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) switch yys4432 { - case "type": - if r.TryDecodeAsNil() { - x.Type = "" - } else { - x.Type = ComponentConditionType(r.DecodeString()) - } - case "status": - if r.TryDecodeAsNil() { - x.Status = "" - } else { - x.Status = ConditionStatus(r.DecodeString()) - } - case "message": - if r.TryDecodeAsNil() { - x.Message = "" - } else { - x.Message = string(r.DecodeString()) - } - case "error": - if r.TryDecodeAsNil() { - x.Error = "" - } else { - x.Error = string(r.DecodeString()) - } - default: - z.DecStructFieldNotFound(-1, yys4432) - } // end switch yys4432 - } // end for yyj4432 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *ComponentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj4437 int - var yyb4437 bool - var yyhl4437 bool = l >= 0 - yyj4437++ - if yyhl4437 { - yyb4437 = yyj4437 > l - } else { - yyb4437 = r.CheckBreak() - } - if yyb4437 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Type = "" - } else { - x.Type = ComponentConditionType(r.DecodeString()) - } - yyj4437++ - if yyhl4437 { - yyb4437 = yyj4437 > l - } else { - yyb4437 = r.CheckBreak() - } - if yyb4437 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Status = "" - } else { - x.Status = ConditionStatus(r.DecodeString()) - } - yyj4437++ - if yyhl4437 { - yyb4437 = yyj4437 > l - } else { - yyb4437 = r.CheckBreak() - } - if yyb4437 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Message = "" - } else { - x.Message = string(r.DecodeString()) - } - yyj4437++ - if yyhl4437 { - yyb4437 = yyj4437 > l - } else { - yyb4437 = r.CheckBreak() - } - if yyb4437 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Error = "" - } else { - x.Error = string(r.DecodeString()) - } - for { - yyj4437++ - if yyhl4437 { - yyb4437 = yyj4437 > l - } else { - yyb4437 = r.CheckBreak() - } - if yyb4437 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4437-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x *ComponentStatus) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym4442 := z.EncBinary() - _ = yym4442 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep4443 := !z.EncBinary() - yy2arr4443 := z.EncBasicHandle().StructToArray - var yyq4443 [4]bool - _, _, _ = yysep4443, yyq4443, yy2arr4443 - const yyr4443 bool = false - yyq4443[0] = x.Kind != "" - yyq4443[1] = x.APIVersion != "" - yyq4443[2] = true - yyq4443[3] = len(x.Conditions) != 0 - var yynn4443 int - if yyr4443 || yy2arr4443 { - r.EncodeArrayStart(4) - } else { - yynn4443 = 0 - for _, b := range yyq4443 { - if b { - yynn4443++ - } - } - r.EncodeMapStart(yynn4443) - yynn4443 = 0 - } - if yyr4443 || yy2arr4443 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4443[0] { - yym4445 := z.EncBinary() - _ = yym4445 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4443[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kind")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4446 := z.EncBinary() - _ = yym4446 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } - } - if yyr4443 || yy2arr4443 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4443[1] { - yym4448 := z.EncBinary() - _ = yym4448 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4443[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4449 := z.EncBinary() - _ = yym4449 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } - } - if yyr4443 || yy2arr4443 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4443[2] { - yy4451 := &x.ObjectMeta - yy4451.CodecEncodeSelf(e) - } else { - r.EncodeNil() - } - } else { - if yyq4443[2] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("metadata")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4452 := &x.ObjectMeta - yy4452.CodecEncodeSelf(e) - } - } - if yyr4443 || yy2arr4443 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4443[3] { - if x.Conditions == nil { - r.EncodeNil() - } else { - yym4454 := z.EncBinary() - _ = yym4454 - if false { - } else { - h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) - } - } - } else { - r.EncodeNil() - } - } else { - if yyq4443[3] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("conditions")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Conditions == nil { - r.EncodeNil() - } else { - yym4455 := z.EncBinary() - _ = yym4455 - if false { - } else { - h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) - } - } - } - } - if yyr4443 || yy2arr4443 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *ComponentStatus) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4456 := z.DecBinary() - _ = yym4456 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct4457 := r.ContainerType() - if yyct4457 == codecSelferValueTypeMap1234 { - yyl4457 := r.ReadMapStart() - if yyl4457 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl4457, d) - } - } else if yyct4457 == codecSelferValueTypeArray1234 { - yyl4457 := r.ReadArrayStart() - if yyl4457 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl4457, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *ComponentStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys4458Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4458Slc - var yyhl4458 bool = l >= 0 - for yyj4458 := 0; ; yyj4458++ { - if yyhl4458 { - if yyj4458 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4458Slc = r.DecodeBytes(yys4458Slc, true, true) - yys4458 := string(yys4458Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4458 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -55589,25 +55290,25 @@ func (x *ComponentStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4461 := &x.ObjectMeta - yyv4461.CodecDecodeSelf(d) + yyv4435 := &x.ObjectMeta + yyv4435.CodecDecodeSelf(d) } case "conditions": if r.TryDecodeAsNil() { x.Conditions = nil } else { - yyv4462 := &x.Conditions - yym4463 := z.DecBinary() - _ = yym4463 + yyv4436 := &x.Conditions + yym4437 := z.DecBinary() + _ = yym4437 if false { } else { - h.decSliceComponentCondition((*[]ComponentCondition)(yyv4462), d) + h.decSliceComponentCondition((*[]ComponentCondition)(yyv4436), d) } } default: - z.DecStructFieldNotFound(-1, yys4458) - } // end switch yys4458 - } // end for yyj4458 + z.DecStructFieldNotFound(-1, yys4432) + } // end switch yys4432 + } // end for yyj4432 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -55615,16 +55316,16 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4464 int - var yyb4464 bool - var yyhl4464 bool = l >= 0 - yyj4464++ - if yyhl4464 { - yyb4464 = yyj4464 > l + var yyj4438 int + var yyb4438 bool + var yyhl4438 bool = l >= 0 + yyj4438++ + if yyhl4438 { + yyb4438 = yyj4438 > l } else { - yyb4464 = r.CheckBreak() + yyb4438 = r.CheckBreak() } - if yyb4464 { + if yyb4438 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55634,13 +55335,13 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj4464++ - if yyhl4464 { - yyb4464 = yyj4464 > l + yyj4438++ + if yyhl4438 { + yyb4438 = yyj4438 > l } else { - yyb4464 = r.CheckBreak() + yyb4438 = r.CheckBreak() } - if yyb4464 { + if yyb4438 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55650,13 +55351,13 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj4464++ - if yyhl4464 { - yyb4464 = yyj4464 > l + yyj4438++ + if yyhl4438 { + yyb4438 = yyj4438 > l } else { - yyb4464 = r.CheckBreak() + yyb4438 = r.CheckBreak() } - if yyb4464 { + if yyb4438 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55664,16 +55365,16 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4467 := &x.ObjectMeta - yyv4467.CodecDecodeSelf(d) + yyv4441 := &x.ObjectMeta + yyv4441.CodecDecodeSelf(d) } - yyj4464++ - if yyhl4464 { - yyb4464 = yyj4464 > l + yyj4438++ + if yyhl4438 { + yyb4438 = yyj4438 > l } else { - yyb4464 = r.CheckBreak() + yyb4438 = r.CheckBreak() } - if yyb4464 { + if yyb4438 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55681,26 +55382,26 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.Conditions = nil } else { - yyv4468 := &x.Conditions - yym4469 := z.DecBinary() - _ = yym4469 + yyv4442 := &x.Conditions + yym4443 := z.DecBinary() + _ = yym4443 if false { } else { - h.decSliceComponentCondition((*[]ComponentCondition)(yyv4468), d) + h.decSliceComponentCondition((*[]ComponentCondition)(yyv4442), d) } } for { - yyj4464++ - if yyhl4464 { - yyb4464 = yyj4464 > l + yyj4438++ + if yyhl4438 { + yyb4438 = yyj4438 > l } else { - yyb4464 = r.CheckBreak() + yyb4438 = r.CheckBreak() } - if yyb4464 { + if yyb4438 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4464-1, "") + z.DecStructFieldNotFound(yyj4438-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -55712,37 +55413,37 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4470 := z.EncBinary() - _ = yym4470 + yym4444 := z.EncBinary() + _ = yym4444 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4471 := !z.EncBinary() - yy2arr4471 := z.EncBasicHandle().StructToArray - var yyq4471 [4]bool - _, _, _ = yysep4471, yyq4471, yy2arr4471 - const yyr4471 bool = false - yyq4471[0] = x.Kind != "" - yyq4471[1] = x.APIVersion != "" - yyq4471[2] = true - var yynn4471 int - if yyr4471 || yy2arr4471 { + yysep4445 := !z.EncBinary() + yy2arr4445 := z.EncBasicHandle().StructToArray + var yyq4445 [4]bool + _, _, _ = yysep4445, yyq4445, yy2arr4445 + const yyr4445 bool = false + yyq4445[0] = x.Kind != "" + yyq4445[1] = x.APIVersion != "" + yyq4445[2] = true + var yynn4445 int + if yyr4445 || yy2arr4445 { r.EncodeArrayStart(4) } else { - yynn4471 = 1 - for _, b := range yyq4471 { + yynn4445 = 1 + for _, b := range yyq4445 { if b { - yynn4471++ + yynn4445++ } } - r.EncodeMapStart(yynn4471) - yynn4471 = 0 + r.EncodeMapStart(yynn4445) + yynn4445 = 0 } - if yyr4471 || yy2arr4471 { + if yyr4445 || yy2arr4445 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4471[0] { - yym4473 := z.EncBinary() - _ = yym4473 + if yyq4445[0] { + yym4447 := z.EncBinary() + _ = yym4447 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -55751,23 +55452,23 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4471[0] { + if yyq4445[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4474 := z.EncBinary() - _ = yym4474 + yym4448 := z.EncBinary() + _ = yym4448 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4471 || yy2arr4471 { + if yyr4445 || yy2arr4445 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4471[1] { - yym4476 := z.EncBinary() - _ = yym4476 + if yyq4445[1] { + yym4450 := z.EncBinary() + _ = yym4450 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -55776,54 +55477,54 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4471[1] { + if yyq4445[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4477 := z.EncBinary() - _ = yym4477 + yym4451 := z.EncBinary() + _ = yym4451 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4471 || yy2arr4471 { + if yyr4445 || yy2arr4445 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4471[2] { - yy4479 := &x.ListMeta - yym4480 := z.EncBinary() - _ = yym4480 + if yyq4445[2] { + yy4453 := &x.ListMeta + yym4454 := z.EncBinary() + _ = yym4454 if false { - } else if z.HasExtensions() && z.EncExt(yy4479) { + } else if z.HasExtensions() && z.EncExt(yy4453) { } else { - z.EncFallback(yy4479) + z.EncFallback(yy4453) } } else { r.EncodeNil() } } else { - if yyq4471[2] { + if yyq4445[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4481 := &x.ListMeta - yym4482 := z.EncBinary() - _ = yym4482 + yy4455 := &x.ListMeta + yym4456 := z.EncBinary() + _ = yym4456 if false { - } else if z.HasExtensions() && z.EncExt(yy4481) { + } else if z.HasExtensions() && z.EncExt(yy4455) { } else { - z.EncFallback(yy4481) + z.EncFallback(yy4455) } } } - if yyr4471 || yy2arr4471 { + if yyr4445 || yy2arr4445 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4484 := z.EncBinary() - _ = yym4484 + yym4458 := z.EncBinary() + _ = yym4458 if false { } else { h.encSliceComponentStatus(([]ComponentStatus)(x.Items), e) @@ -55836,15 +55537,15 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4485 := z.EncBinary() - _ = yym4485 + yym4459 := z.EncBinary() + _ = yym4459 if false { } else { h.encSliceComponentStatus(([]ComponentStatus)(x.Items), e) } } } - if yyr4471 || yy2arr4471 { + if yyr4445 || yy2arr4445 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -55857,25 +55558,25 @@ func (x *ComponentStatusList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4486 := z.DecBinary() - _ = yym4486 + yym4460 := z.DecBinary() + _ = yym4460 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4487 := r.ContainerType() - if yyct4487 == codecSelferValueTypeMap1234 { - yyl4487 := r.ReadMapStart() - if yyl4487 == 0 { + yyct4461 := r.ContainerType() + if yyct4461 == codecSelferValueTypeMap1234 { + yyl4461 := r.ReadMapStart() + if yyl4461 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4487, d) + x.codecDecodeSelfFromMap(yyl4461, d) } - } else if yyct4487 == codecSelferValueTypeArray1234 { - yyl4487 := r.ReadArrayStart() - if yyl4487 == 0 { + } else if yyct4461 == codecSelferValueTypeArray1234 { + yyl4461 := r.ReadArrayStart() + if yyl4461 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4487, d) + x.codecDecodeSelfFromArray(yyl4461, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -55887,12 +55588,12 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4488Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4488Slc - var yyhl4488 bool = l >= 0 - for yyj4488 := 0; ; yyj4488++ { - if yyhl4488 { - if yyj4488 >= l { + var yys4462Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4462Slc + var yyhl4462 bool = l >= 0 + for yyj4462 := 0; ; yyj4462++ { + if yyhl4462 { + if yyj4462 >= l { break } } else { @@ -55901,10 +55602,10 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4488Slc = r.DecodeBytes(yys4488Slc, true, true) - yys4488 := string(yys4488Slc) + yys4462Slc = r.DecodeBytes(yys4462Slc, true, true) + yys4462 := string(yys4462Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4488 { + switch yys4462 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -55919,33 +55620,33 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4491 := &x.ListMeta - yym4492 := z.DecBinary() - _ = yym4492 + yyv4465 := &x.ListMeta + yym4466 := z.DecBinary() + _ = yym4466 if false { - } else if z.HasExtensions() && z.DecExt(yyv4491) { + } else if z.HasExtensions() && z.DecExt(yyv4465) { } else { - z.DecFallback(yyv4491, false) + z.DecFallback(yyv4465, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4493 := &x.Items - yym4494 := z.DecBinary() - _ = yym4494 + yyv4467 := &x.Items + yym4468 := z.DecBinary() + _ = yym4468 if false { } else { - h.decSliceComponentStatus((*[]ComponentStatus)(yyv4493), d) + h.decSliceComponentStatus((*[]ComponentStatus)(yyv4467), d) } } default: - z.DecStructFieldNotFound(-1, yys4488) - } // end switch yys4488 - } // end for yyj4488 + z.DecStructFieldNotFound(-1, yys4462) + } // end switch yys4462 + } // end for yyj4462 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -55953,16 +55654,16 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4495 int - var yyb4495 bool - var yyhl4495 bool = l >= 0 - yyj4495++ - if yyhl4495 { - yyb4495 = yyj4495 > l + var yyj4469 int + var yyb4469 bool + var yyhl4469 bool = l >= 0 + yyj4469++ + if yyhl4469 { + yyb4469 = yyj4469 > l } else { - yyb4495 = r.CheckBreak() + yyb4469 = r.CheckBreak() } - if yyb4495 { + if yyb4469 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55972,13 +55673,13 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Kind = string(r.DecodeString()) } - yyj4495++ - if yyhl4495 { - yyb4495 = yyj4495 > l + yyj4469++ + if yyhl4469 { + yyb4469 = yyj4469 > l } else { - yyb4495 = r.CheckBreak() + yyb4469 = r.CheckBreak() } - if yyb4495 { + if yyb4469 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55988,36 +55689,36 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.APIVersion = string(r.DecodeString()) } - yyj4495++ - if yyhl4495 { - yyb4495 = yyj4495 > l + yyj4469++ + if yyhl4469 { + yyb4469 = yyj4469 > l } else { - yyb4495 = r.CheckBreak() + yyb4469 = r.CheckBreak() } - if yyb4495 { + if yyb4469 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4498 := &x.ListMeta - yym4499 := z.DecBinary() - _ = yym4499 + yyv4472 := &x.ListMeta + yym4473 := z.DecBinary() + _ = yym4473 if false { - } else if z.HasExtensions() && z.DecExt(yyv4498) { + } else if z.HasExtensions() && z.DecExt(yyv4472) { } else { - z.DecFallback(yyv4498, false) + z.DecFallback(yyv4472, false) } } - yyj4495++ - if yyhl4495 { - yyb4495 = yyj4495 > l + yyj4469++ + if yyhl4469 { + yyb4469 = yyj4469 > l } else { - yyb4495 = r.CheckBreak() + yyb4469 = r.CheckBreak() } - if yyb4495 { + if yyb4469 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56025,26 +55726,26 @@ func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4500 := &x.Items - yym4501 := z.DecBinary() - _ = yym4501 + yyv4474 := &x.Items + yym4475 := z.DecBinary() + _ = yym4475 if false { } else { - h.decSliceComponentStatus((*[]ComponentStatus)(yyv4500), d) + h.decSliceComponentStatus((*[]ComponentStatus)(yyv4474), d) } } for { - yyj4495++ - if yyhl4495 { - yyb4495 = yyj4495 > l + yyj4469++ + if yyhl4469 { + yyb4469 = yyj4469 > l } else { - yyb4495 = r.CheckBreak() + yyb4469 = r.CheckBreak() } - if yyb4495 { + if yyb4469 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4495-1, "") + z.DecStructFieldNotFound(yyj4469-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -56056,38 +55757,38 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4502 := z.EncBinary() - _ = yym4502 + yym4476 := z.EncBinary() + _ = yym4476 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4503 := !z.EncBinary() - yy2arr4503 := z.EncBasicHandle().StructToArray - var yyq4503 [6]bool - _, _, _ = yysep4503, yyq4503, yy2arr4503 - const yyr4503 bool = false - yyq4503[0] = x.Capabilities != nil - yyq4503[1] = x.Privileged != nil - yyq4503[2] = x.SELinuxOptions != nil - yyq4503[3] = x.RunAsUser != nil - yyq4503[4] = x.RunAsNonRoot != nil - yyq4503[5] = x.ReadOnlyRootFilesystem != nil - var yynn4503 int - if yyr4503 || yy2arr4503 { + yysep4477 := !z.EncBinary() + yy2arr4477 := z.EncBasicHandle().StructToArray + var yyq4477 [6]bool + _, _, _ = yysep4477, yyq4477, yy2arr4477 + const yyr4477 bool = false + yyq4477[0] = x.Capabilities != nil + yyq4477[1] = x.Privileged != nil + yyq4477[2] = x.SELinuxOptions != nil + yyq4477[3] = x.RunAsUser != nil + yyq4477[4] = x.RunAsNonRoot != nil + yyq4477[5] = x.ReadOnlyRootFilesystem != nil + var yynn4477 int + if yyr4477 || yy2arr4477 { r.EncodeArrayStart(6) } else { - yynn4503 = 0 - for _, b := range yyq4503 { + yynn4477 = 0 + for _, b := range yyq4477 { if b { - yynn4503++ + yynn4477++ } } - r.EncodeMapStart(yynn4503) - yynn4503 = 0 + r.EncodeMapStart(yynn4477) + yynn4477 = 0 } - if yyr4503 || yy2arr4503 { + if yyr4477 || yy2arr4477 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4503[0] { + if yyq4477[0] { if x.Capabilities == nil { r.EncodeNil() } else { @@ -56097,7 +55798,7 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4503[0] { + if yyq4477[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("capabilities")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -56108,44 +55809,44 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4503 || yy2arr4503 { + if yyr4477 || yy2arr4477 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4503[1] { + if yyq4477[1] { if x.Privileged == nil { r.EncodeNil() } else { - yy4506 := *x.Privileged - yym4507 := z.EncBinary() - _ = yym4507 + yy4480 := *x.Privileged + yym4481 := z.EncBinary() + _ = yym4481 if false { } else { - r.EncodeBool(bool(yy4506)) + r.EncodeBool(bool(yy4480)) } } } else { r.EncodeNil() } } else { - if yyq4503[1] { + if yyq4477[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("privileged")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Privileged == nil { r.EncodeNil() } else { - yy4508 := *x.Privileged - yym4509 := z.EncBinary() - _ = yym4509 + yy4482 := *x.Privileged + yym4483 := z.EncBinary() + _ = yym4483 if false { } else { - r.EncodeBool(bool(yy4508)) + r.EncodeBool(bool(yy4482)) } } } } - if yyr4503 || yy2arr4503 { + if yyr4477 || yy2arr4477 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4503[2] { + if yyq4477[2] { if x.SELinuxOptions == nil { r.EncodeNil() } else { @@ -56155,7 +55856,7 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4503[2] { + if yyq4477[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("seLinuxOptions")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -56166,112 +55867,112 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4503 || yy2arr4503 { + if yyr4477 || yy2arr4477 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4503[3] { + if yyq4477[3] { if x.RunAsUser == nil { r.EncodeNil() } else { - yy4512 := *x.RunAsUser - yym4513 := z.EncBinary() - _ = yym4513 + yy4486 := *x.RunAsUser + yym4487 := z.EncBinary() + _ = yym4487 if false { } else { - r.EncodeInt(int64(yy4512)) + r.EncodeInt(int64(yy4486)) } } } else { r.EncodeNil() } } else { - if yyq4503[3] { + if yyq4477[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runAsUser")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.RunAsUser == nil { r.EncodeNil() } else { - yy4514 := *x.RunAsUser - yym4515 := z.EncBinary() - _ = yym4515 + yy4488 := *x.RunAsUser + yym4489 := z.EncBinary() + _ = yym4489 if false { } else { - r.EncodeInt(int64(yy4514)) + r.EncodeInt(int64(yy4488)) } } } } - if yyr4503 || yy2arr4503 { + if yyr4477 || yy2arr4477 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4503[4] { + if yyq4477[4] { if x.RunAsNonRoot == nil { r.EncodeNil() } else { - yy4517 := *x.RunAsNonRoot - yym4518 := z.EncBinary() - _ = yym4518 + yy4491 := *x.RunAsNonRoot + yym4492 := z.EncBinary() + _ = yym4492 if false { } else { - r.EncodeBool(bool(yy4517)) + r.EncodeBool(bool(yy4491)) } } } else { r.EncodeNil() } } else { - if yyq4503[4] { + if yyq4477[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runAsNonRoot")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.RunAsNonRoot == nil { r.EncodeNil() } else { - yy4519 := *x.RunAsNonRoot - yym4520 := z.EncBinary() - _ = yym4520 + yy4493 := *x.RunAsNonRoot + yym4494 := z.EncBinary() + _ = yym4494 if false { } else { - r.EncodeBool(bool(yy4519)) + r.EncodeBool(bool(yy4493)) } } } } - if yyr4503 || yy2arr4503 { + if yyr4477 || yy2arr4477 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4503[5] { + if yyq4477[5] { if x.ReadOnlyRootFilesystem == nil { r.EncodeNil() } else { - yy4522 := *x.ReadOnlyRootFilesystem - yym4523 := z.EncBinary() - _ = yym4523 + yy4496 := *x.ReadOnlyRootFilesystem + yym4497 := z.EncBinary() + _ = yym4497 if false { } else { - r.EncodeBool(bool(yy4522)) + r.EncodeBool(bool(yy4496)) } } } else { r.EncodeNil() } } else { - if yyq4503[5] { + if yyq4477[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("readOnlyRootFilesystem")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.ReadOnlyRootFilesystem == nil { r.EncodeNil() } else { - yy4524 := *x.ReadOnlyRootFilesystem - yym4525 := z.EncBinary() - _ = yym4525 + yy4498 := *x.ReadOnlyRootFilesystem + yym4499 := z.EncBinary() + _ = yym4499 if false { } else { - r.EncodeBool(bool(yy4524)) + r.EncodeBool(bool(yy4498)) } } } } - if yyr4503 || yy2arr4503 { + if yyr4477 || yy2arr4477 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -56284,25 +55985,25 @@ func (x *SecurityContext) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4526 := z.DecBinary() - _ = yym4526 + yym4500 := z.DecBinary() + _ = yym4500 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4527 := r.ContainerType() - if yyct4527 == codecSelferValueTypeMap1234 { - yyl4527 := r.ReadMapStart() - if yyl4527 == 0 { + yyct4501 := r.ContainerType() + if yyct4501 == codecSelferValueTypeMap1234 { + yyl4501 := r.ReadMapStart() + if yyl4501 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4527, d) + x.codecDecodeSelfFromMap(yyl4501, d) } - } else if yyct4527 == codecSelferValueTypeArray1234 { - yyl4527 := r.ReadArrayStart() - if yyl4527 == 0 { + } else if yyct4501 == codecSelferValueTypeArray1234 { + yyl4501 := r.ReadArrayStart() + if yyl4501 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4527, d) + x.codecDecodeSelfFromArray(yyl4501, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -56314,12 +56015,12 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4528Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4528Slc - var yyhl4528 bool = l >= 0 - for yyj4528 := 0; ; yyj4528++ { - if yyhl4528 { - if yyj4528 >= l { + var yys4502Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4502Slc + var yyhl4502 bool = l >= 0 + for yyj4502 := 0; ; yyj4502++ { + if yyhl4502 { + if yyj4502 >= l { break } } else { @@ -56328,10 +56029,10 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4528Slc = r.DecodeBytes(yys4528Slc, true, true) - yys4528 := string(yys4528Slc) + yys4502Slc = r.DecodeBytes(yys4502Slc, true, true) + yys4502 := string(yys4502Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4528 { + switch yys4502 { case "capabilities": if r.TryDecodeAsNil() { if x.Capabilities != nil { @@ -56352,8 +56053,8 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.Privileged == nil { x.Privileged = new(bool) } - yym4531 := z.DecBinary() - _ = yym4531 + yym4505 := z.DecBinary() + _ = yym4505 if false { } else { *((*bool)(x.Privileged)) = r.DecodeBool() @@ -56379,8 +56080,8 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.RunAsUser == nil { x.RunAsUser = new(int64) } - yym4534 := z.DecBinary() - _ = yym4534 + yym4508 := z.DecBinary() + _ = yym4508 if false { } else { *((*int64)(x.RunAsUser)) = int64(r.DecodeInt(64)) @@ -56395,8 +56096,8 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.RunAsNonRoot == nil { x.RunAsNonRoot = new(bool) } - yym4536 := z.DecBinary() - _ = yym4536 + yym4510 := z.DecBinary() + _ = yym4510 if false { } else { *((*bool)(x.RunAsNonRoot)) = r.DecodeBool() @@ -56411,17 +56112,17 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.ReadOnlyRootFilesystem == nil { x.ReadOnlyRootFilesystem = new(bool) } - yym4538 := z.DecBinary() - _ = yym4538 + yym4512 := z.DecBinary() + _ = yym4512 if false { } else { *((*bool)(x.ReadOnlyRootFilesystem)) = r.DecodeBool() } } default: - z.DecStructFieldNotFound(-1, yys4528) - } // end switch yys4528 - } // end for yyj4528 + z.DecStructFieldNotFound(-1, yys4502) + } // end switch yys4502 + } // end for yyj4502 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -56429,16 +56130,16 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4539 int - var yyb4539 bool - var yyhl4539 bool = l >= 0 - yyj4539++ - if yyhl4539 { - yyb4539 = yyj4539 > l + var yyj4513 int + var yyb4513 bool + var yyhl4513 bool = l >= 0 + yyj4513++ + if yyhl4513 { + yyb4513 = yyj4513 > l } else { - yyb4539 = r.CheckBreak() + yyb4513 = r.CheckBreak() } - if yyb4539 { + if yyb4513 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56453,13 +56154,13 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } x.Capabilities.CodecDecodeSelf(d) } - yyj4539++ - if yyhl4539 { - yyb4539 = yyj4539 > l + yyj4513++ + if yyhl4513 { + yyb4513 = yyj4513 > l } else { - yyb4539 = r.CheckBreak() + yyb4513 = r.CheckBreak() } - if yyb4539 { + if yyb4513 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56472,20 +56173,20 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.Privileged == nil { x.Privileged = new(bool) } - yym4542 := z.DecBinary() - _ = yym4542 + yym4516 := z.DecBinary() + _ = yym4516 if false { } else { *((*bool)(x.Privileged)) = r.DecodeBool() } } - yyj4539++ - if yyhl4539 { - yyb4539 = yyj4539 > l + yyj4513++ + if yyhl4513 { + yyb4513 = yyj4513 > l } else { - yyb4539 = r.CheckBreak() + yyb4513 = r.CheckBreak() } - if yyb4539 { + if yyb4513 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56500,13 +56201,13 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } x.SELinuxOptions.CodecDecodeSelf(d) } - yyj4539++ - if yyhl4539 { - yyb4539 = yyj4539 > l + yyj4513++ + if yyhl4513 { + yyb4513 = yyj4513 > l } else { - yyb4539 = r.CheckBreak() + yyb4513 = r.CheckBreak() } - if yyb4539 { + if yyb4513 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56519,20 +56220,20 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.RunAsUser == nil { x.RunAsUser = new(int64) } - yym4545 := z.DecBinary() - _ = yym4545 + yym4519 := z.DecBinary() + _ = yym4519 if false { } else { *((*int64)(x.RunAsUser)) = int64(r.DecodeInt(64)) } } - yyj4539++ - if yyhl4539 { - yyb4539 = yyj4539 > l + yyj4513++ + if yyhl4513 { + yyb4513 = yyj4513 > l } else { - yyb4539 = r.CheckBreak() + yyb4513 = r.CheckBreak() } - if yyb4539 { + if yyb4513 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56545,20 +56246,20 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.RunAsNonRoot == nil { x.RunAsNonRoot = new(bool) } - yym4547 := z.DecBinary() - _ = yym4547 + yym4521 := z.DecBinary() + _ = yym4521 if false { } else { *((*bool)(x.RunAsNonRoot)) = r.DecodeBool() } } - yyj4539++ - if yyhl4539 { - yyb4539 = yyj4539 > l + yyj4513++ + if yyhl4513 { + yyb4513 = yyj4513 > l } else { - yyb4539 = r.CheckBreak() + yyb4513 = r.CheckBreak() } - if yyb4539 { + if yyb4513 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56571,25 +56272,25 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.ReadOnlyRootFilesystem == nil { x.ReadOnlyRootFilesystem = new(bool) } - yym4549 := z.DecBinary() - _ = yym4549 + yym4523 := z.DecBinary() + _ = yym4523 if false { } else { *((*bool)(x.ReadOnlyRootFilesystem)) = r.DecodeBool() } } for { - yyj4539++ - if yyhl4539 { - yyb4539 = yyj4539 > l + yyj4513++ + if yyhl4513 { + yyb4513 = yyj4513 > l } else { - yyb4539 = r.CheckBreak() + yyb4513 = r.CheckBreak() } - if yyb4539 { + if yyb4513 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4539-1, "") + z.DecStructFieldNotFound(yyj4513-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -56601,38 +56302,38 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4550 := z.EncBinary() - _ = yym4550 + yym4524 := z.EncBinary() + _ = yym4524 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4551 := !z.EncBinary() - yy2arr4551 := z.EncBasicHandle().StructToArray - var yyq4551 [4]bool - _, _, _ = yysep4551, yyq4551, yy2arr4551 - const yyr4551 bool = false - yyq4551[0] = x.User != "" - yyq4551[1] = x.Role != "" - yyq4551[2] = x.Type != "" - yyq4551[3] = x.Level != "" - var yynn4551 int - if yyr4551 || yy2arr4551 { + yysep4525 := !z.EncBinary() + yy2arr4525 := z.EncBasicHandle().StructToArray + var yyq4525 [4]bool + _, _, _ = yysep4525, yyq4525, yy2arr4525 + const yyr4525 bool = false + yyq4525[0] = x.User != "" + yyq4525[1] = x.Role != "" + yyq4525[2] = x.Type != "" + yyq4525[3] = x.Level != "" + var yynn4525 int + if yyr4525 || yy2arr4525 { r.EncodeArrayStart(4) } else { - yynn4551 = 0 - for _, b := range yyq4551 { + yynn4525 = 0 + for _, b := range yyq4525 { if b { - yynn4551++ + yynn4525++ } } - r.EncodeMapStart(yynn4551) - yynn4551 = 0 + r.EncodeMapStart(yynn4525) + yynn4525 = 0 } - if yyr4551 || yy2arr4551 { + if yyr4525 || yy2arr4525 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4551[0] { - yym4553 := z.EncBinary() - _ = yym4553 + if yyq4525[0] { + yym4527 := z.EncBinary() + _ = yym4527 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.User)) @@ -56641,23 +56342,23 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4551[0] { + if yyq4525[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("user")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4554 := z.EncBinary() - _ = yym4554 + yym4528 := z.EncBinary() + _ = yym4528 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.User)) } } } - if yyr4551 || yy2arr4551 { + if yyr4525 || yy2arr4525 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4551[1] { - yym4556 := z.EncBinary() - _ = yym4556 + if yyq4525[1] { + yym4530 := z.EncBinary() + _ = yym4530 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Role)) @@ -56666,23 +56367,23 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4551[1] { + if yyq4525[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("role")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4557 := z.EncBinary() - _ = yym4557 + yym4531 := z.EncBinary() + _ = yym4531 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Role)) } } } - if yyr4551 || yy2arr4551 { + if yyr4525 || yy2arr4525 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4551[2] { - yym4559 := z.EncBinary() - _ = yym4559 + if yyq4525[2] { + yym4533 := z.EncBinary() + _ = yym4533 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) @@ -56691,23 +56392,23 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4551[2] { + if yyq4525[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4560 := z.EncBinary() - _ = yym4560 + yym4534 := z.EncBinary() + _ = yym4534 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) } } } - if yyr4551 || yy2arr4551 { + if yyr4525 || yy2arr4525 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4551[3] { - yym4562 := z.EncBinary() - _ = yym4562 + if yyq4525[3] { + yym4536 := z.EncBinary() + _ = yym4536 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Level)) @@ -56716,19 +56417,19 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4551[3] { + if yyq4525[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("level")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4563 := z.EncBinary() - _ = yym4563 + yym4537 := z.EncBinary() + _ = yym4537 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Level)) } } } - if yyr4551 || yy2arr4551 { + if yyr4525 || yy2arr4525 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -56741,25 +56442,25 @@ func (x *SELinuxOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4564 := z.DecBinary() - _ = yym4564 + yym4538 := z.DecBinary() + _ = yym4538 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4565 := r.ContainerType() - if yyct4565 == codecSelferValueTypeMap1234 { - yyl4565 := r.ReadMapStart() - if yyl4565 == 0 { + yyct4539 := r.ContainerType() + if yyct4539 == codecSelferValueTypeMap1234 { + yyl4539 := r.ReadMapStart() + if yyl4539 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4565, d) + x.codecDecodeSelfFromMap(yyl4539, d) } - } else if yyct4565 == codecSelferValueTypeArray1234 { - yyl4565 := r.ReadArrayStart() - if yyl4565 == 0 { + } else if yyct4539 == codecSelferValueTypeArray1234 { + yyl4539 := r.ReadArrayStart() + if yyl4539 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4565, d) + x.codecDecodeSelfFromArray(yyl4539, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -56771,12 +56472,12 @@ func (x *SELinuxOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4566Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4566Slc - var yyhl4566 bool = l >= 0 - for yyj4566 := 0; ; yyj4566++ { - if yyhl4566 { - if yyj4566 >= l { + var yys4540Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4540Slc + var yyhl4540 bool = l >= 0 + for yyj4540 := 0; ; yyj4540++ { + if yyhl4540 { + if yyj4540 >= l { break } } else { @@ -56785,10 +56486,10 @@ func (x *SELinuxOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4566Slc = r.DecodeBytes(yys4566Slc, true, true) - yys4566 := string(yys4566Slc) + yys4540Slc = r.DecodeBytes(yys4540Slc, true, true) + yys4540 := string(yys4540Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4566 { + switch yys4540 { case "user": if r.TryDecodeAsNil() { x.User = "" @@ -56814,9 +56515,9 @@ func (x *SELinuxOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Level = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys4566) - } // end switch yys4566 - } // end for yyj4566 + z.DecStructFieldNotFound(-1, yys4540) + } // end switch yys4540 + } // end for yyj4540 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -56824,16 +56525,16 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4571 int - var yyb4571 bool - var yyhl4571 bool = l >= 0 - yyj4571++ - if yyhl4571 { - yyb4571 = yyj4571 > l + var yyj4545 int + var yyb4545 bool + var yyhl4545 bool = l >= 0 + yyj4545++ + if yyhl4545 { + yyb4545 = yyj4545 > l } else { - yyb4571 = r.CheckBreak() + yyb4545 = r.CheckBreak() } - if yyb4571 { + if yyb4545 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56843,13 +56544,13 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.User = string(r.DecodeString()) } - yyj4571++ - if yyhl4571 { - yyb4571 = yyj4571 > l + yyj4545++ + if yyhl4545 { + yyb4545 = yyj4545 > l } else { - yyb4571 = r.CheckBreak() + yyb4545 = r.CheckBreak() } - if yyb4571 { + if yyb4545 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56859,13 +56560,13 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Role = string(r.DecodeString()) } - yyj4571++ - if yyhl4571 { - yyb4571 = yyj4571 > l + yyj4545++ + if yyhl4545 { + yyb4545 = yyj4545 > l } else { - yyb4571 = r.CheckBreak() + yyb4545 = r.CheckBreak() } - if yyb4571 { + if yyb4545 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56875,13 +56576,13 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Type = string(r.DecodeString()) } - yyj4571++ - if yyhl4571 { - yyb4571 = yyj4571 > l + yyj4545++ + if yyhl4545 { + yyb4545 = yyj4545 > l } else { - yyb4571 = r.CheckBreak() + yyb4545 = r.CheckBreak() } - if yyb4571 { + if yyb4545 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56892,17 +56593,17 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Level = string(r.DecodeString()) } for { - yyj4571++ - if yyhl4571 { - yyb4571 = yyj4571 > l + yyj4545++ + if yyhl4545 { + yyb4545 = yyj4545 > l } else { - yyb4571 = r.CheckBreak() + yyb4545 = r.CheckBreak() } - if yyb4571 { + if yyb4545 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4571-1, "") + z.DecStructFieldNotFound(yyj4545-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -56914,37 +56615,37 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4576 := z.EncBinary() - _ = yym4576 + yym4550 := z.EncBinary() + _ = yym4550 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4577 := !z.EncBinary() - yy2arr4577 := z.EncBasicHandle().StructToArray - var yyq4577 [5]bool - _, _, _ = yysep4577, yyq4577, yy2arr4577 - const yyr4577 bool = false - yyq4577[0] = x.Kind != "" - yyq4577[1] = x.APIVersion != "" - yyq4577[2] = true - var yynn4577 int - if yyr4577 || yy2arr4577 { + yysep4551 := !z.EncBinary() + yy2arr4551 := z.EncBasicHandle().StructToArray + var yyq4551 [5]bool + _, _, _ = yysep4551, yyq4551, yy2arr4551 + const yyr4551 bool = false + yyq4551[0] = x.Kind != "" + yyq4551[1] = x.APIVersion != "" + yyq4551[2] = true + var yynn4551 int + if yyr4551 || yy2arr4551 { r.EncodeArrayStart(5) } else { - yynn4577 = 2 - for _, b := range yyq4577 { + yynn4551 = 2 + for _, b := range yyq4551 { if b { - yynn4577++ + yynn4551++ } } - r.EncodeMapStart(yynn4577) - yynn4577 = 0 + r.EncodeMapStart(yynn4551) + yynn4551 = 0 } - if yyr4577 || yy2arr4577 { + if yyr4551 || yy2arr4551 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4577[0] { - yym4579 := z.EncBinary() - _ = yym4579 + if yyq4551[0] { + yym4553 := z.EncBinary() + _ = yym4553 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -56953,23 +56654,23 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4577[0] { + if yyq4551[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4580 := z.EncBinary() - _ = yym4580 + yym4554 := z.EncBinary() + _ = yym4554 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4577 || yy2arr4577 { + if yyr4551 || yy2arr4551 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4577[1] { - yym4582 := z.EncBinary() - _ = yym4582 + if yyq4551[1] { + yym4556 := z.EncBinary() + _ = yym4556 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -56978,39 +56679,39 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4577[1] { + if yyq4551[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4583 := z.EncBinary() - _ = yym4583 + yym4557 := z.EncBinary() + _ = yym4557 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4577 || yy2arr4577 { + if yyr4551 || yy2arr4551 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4577[2] { - yy4585 := &x.ObjectMeta - yy4585.CodecEncodeSelf(e) + if yyq4551[2] { + yy4559 := &x.ObjectMeta + yy4559.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4577[2] { + if yyq4551[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4586 := &x.ObjectMeta - yy4586.CodecEncodeSelf(e) + yy4560 := &x.ObjectMeta + yy4560.CodecEncodeSelf(e) } } - if yyr4577 || yy2arr4577 { + if yyr4551 || yy2arr4551 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym4588 := z.EncBinary() - _ = yym4588 + yym4562 := z.EncBinary() + _ = yym4562 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Range)) @@ -57019,20 +56720,20 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("range")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4589 := z.EncBinary() - _ = yym4589 + yym4563 := z.EncBinary() + _ = yym4563 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Range)) } } - if yyr4577 || yy2arr4577 { + if yyr4551 || yy2arr4551 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Data == nil { r.EncodeNil() } else { - yym4591 := z.EncBinary() - _ = yym4591 + yym4565 := z.EncBinary() + _ = yym4565 if false { } else { r.EncodeStringBytes(codecSelferC_RAW1234, []byte(x.Data)) @@ -57045,15 +56746,15 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { if x.Data == nil { r.EncodeNil() } else { - yym4592 := z.EncBinary() - _ = yym4592 + yym4566 := z.EncBinary() + _ = yym4566 if false { } else { r.EncodeStringBytes(codecSelferC_RAW1234, []byte(x.Data)) } } } - if yyr4577 || yy2arr4577 { + if yyr4551 || yy2arr4551 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -57066,25 +56767,25 @@ func (x *RangeAllocation) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4593 := z.DecBinary() - _ = yym4593 + yym4567 := z.DecBinary() + _ = yym4567 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4594 := r.ContainerType() - if yyct4594 == codecSelferValueTypeMap1234 { - yyl4594 := r.ReadMapStart() - if yyl4594 == 0 { + yyct4568 := r.ContainerType() + if yyct4568 == codecSelferValueTypeMap1234 { + yyl4568 := r.ReadMapStart() + if yyl4568 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4594, d) + x.codecDecodeSelfFromMap(yyl4568, d) } - } else if yyct4594 == codecSelferValueTypeArray1234 { - yyl4594 := r.ReadArrayStart() - if yyl4594 == 0 { + } else if yyct4568 == codecSelferValueTypeArray1234 { + yyl4568 := r.ReadArrayStart() + if yyl4568 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4594, d) + x.codecDecodeSelfFromArray(yyl4568, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -57096,12 +56797,12 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4595Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4595Slc - var yyhl4595 bool = l >= 0 - for yyj4595 := 0; ; yyj4595++ { - if yyhl4595 { - if yyj4595 >= l { + var yys4569Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4569Slc + var yyhl4569 bool = l >= 0 + for yyj4569 := 0; ; yyj4569++ { + if yyhl4569 { + if yyj4569 >= l { break } } else { @@ -57110,10 +56811,10 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4595Slc = r.DecodeBytes(yys4595Slc, true, true) - yys4595 := string(yys4595Slc) + yys4569Slc = r.DecodeBytes(yys4569Slc, true, true) + yys4569 := string(yys4569Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4595 { + switch yys4569 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -57130,8 +56831,8 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4598 := &x.ObjectMeta - yyv4598.CodecDecodeSelf(d) + yyv4572 := &x.ObjectMeta + yyv4572.CodecDecodeSelf(d) } case "range": if r.TryDecodeAsNil() { @@ -57143,18 +56844,18 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4600 := &x.Data - yym4601 := z.DecBinary() - _ = yym4601 + yyv4574 := &x.Data + yym4575 := z.DecBinary() + _ = yym4575 if false { } else { - *yyv4600 = r.DecodeBytes(*(*[]byte)(yyv4600), false, false) + *yyv4574 = r.DecodeBytes(*(*[]byte)(yyv4574), false, false) } } default: - z.DecStructFieldNotFound(-1, yys4595) - } // end switch yys4595 - } // end for yyj4595 + z.DecStructFieldNotFound(-1, yys4569) + } // end switch yys4569 + } // end for yyj4569 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -57162,16 +56863,16 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4602 int - var yyb4602 bool - var yyhl4602 bool = l >= 0 - yyj4602++ - if yyhl4602 { - yyb4602 = yyj4602 > l + var yyj4576 int + var yyb4576 bool + var yyhl4576 bool = l >= 0 + yyj4576++ + if yyhl4576 { + yyb4576 = yyj4576 > l } else { - yyb4602 = r.CheckBreak() + yyb4576 = r.CheckBreak() } - if yyb4602 { + if yyb4576 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57181,13 +56882,13 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj4602++ - if yyhl4602 { - yyb4602 = yyj4602 > l + yyj4576++ + if yyhl4576 { + yyb4576 = yyj4576 > l } else { - yyb4602 = r.CheckBreak() + yyb4576 = r.CheckBreak() } - if yyb4602 { + if yyb4576 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57197,13 +56898,13 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj4602++ - if yyhl4602 { - yyb4602 = yyj4602 > l + yyj4576++ + if yyhl4576 { + yyb4576 = yyj4576 > l } else { - yyb4602 = r.CheckBreak() + yyb4576 = r.CheckBreak() } - if yyb4602 { + if yyb4576 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57211,16 +56912,16 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4605 := &x.ObjectMeta - yyv4605.CodecDecodeSelf(d) + yyv4579 := &x.ObjectMeta + yyv4579.CodecDecodeSelf(d) } - yyj4602++ - if yyhl4602 { - yyb4602 = yyj4602 > l + yyj4576++ + if yyhl4576 { + yyb4576 = yyj4576 > l } else { - yyb4602 = r.CheckBreak() + yyb4576 = r.CheckBreak() } - if yyb4602 { + if yyb4576 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57230,13 +56931,13 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Range = string(r.DecodeString()) } - yyj4602++ - if yyhl4602 { - yyb4602 = yyj4602 > l + yyj4576++ + if yyhl4576 { + yyb4576 = yyj4576 > l } else { - yyb4602 = r.CheckBreak() + yyb4576 = r.CheckBreak() } - if yyb4602 { + if yyb4576 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57244,26 +56945,26 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4607 := &x.Data - yym4608 := z.DecBinary() - _ = yym4608 + yyv4581 := &x.Data + yym4582 := z.DecBinary() + _ = yym4582 if false { } else { - *yyv4607 = r.DecodeBytes(*(*[]byte)(yyv4607), false, false) + *yyv4581 = r.DecodeBytes(*(*[]byte)(yyv4581), false, false) } } for { - yyj4602++ - if yyhl4602 { - yyb4602 = yyj4602 > l + yyj4576++ + if yyhl4576 { + yyb4576 = yyj4576 > l } else { - yyb4602 = r.CheckBreak() + yyb4576 = r.CheckBreak() } - if yyb4602 { + if yyb4576 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4602-1, "") + z.DecStructFieldNotFound(yyj4576-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57273,10 +56974,10 @@ func (x codecSelfer1234) encSliceOwnerReference(v []OwnerReference, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4609 := range v { + for _, yyv4583 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4610 := &yyv4609 - yy4610.CodecEncodeSelf(e) + yy4584 := &yyv4583 + yy4584.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57286,83 +56987,83 @@ func (x codecSelfer1234) decSliceOwnerReference(v *[]OwnerReference, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4611 := *v - yyh4611, yyl4611 := z.DecSliceHelperStart() - var yyc4611 bool - if yyl4611 == 0 { - if yyv4611 == nil { - yyv4611 = []OwnerReference{} - yyc4611 = true - } else if len(yyv4611) != 0 { - yyv4611 = yyv4611[:0] - yyc4611 = true + yyv4585 := *v + yyh4585, yyl4585 := z.DecSliceHelperStart() + var yyc4585 bool + if yyl4585 == 0 { + if yyv4585 == nil { + yyv4585 = []OwnerReference{} + yyc4585 = true + } else if len(yyv4585) != 0 { + yyv4585 = yyv4585[:0] + yyc4585 = true } - } else if yyl4611 > 0 { - var yyrr4611, yyrl4611 int - var yyrt4611 bool - if yyl4611 > cap(yyv4611) { + } else if yyl4585 > 0 { + var yyrr4585, yyrl4585 int + var yyrt4585 bool + if yyl4585 > cap(yyv4585) { - yyrg4611 := len(yyv4611) > 0 - yyv24611 := yyv4611 - yyrl4611, yyrt4611 = z.DecInferLen(yyl4611, z.DecBasicHandle().MaxInitLen, 72) - if yyrt4611 { - if yyrl4611 <= cap(yyv4611) { - yyv4611 = yyv4611[:yyrl4611] + yyrg4585 := len(yyv4585) > 0 + yyv24585 := yyv4585 + yyrl4585, yyrt4585 = z.DecInferLen(yyl4585, z.DecBasicHandle().MaxInitLen, 72) + if yyrt4585 { + if yyrl4585 <= cap(yyv4585) { + yyv4585 = yyv4585[:yyrl4585] } else { - yyv4611 = make([]OwnerReference, yyrl4611) + yyv4585 = make([]OwnerReference, yyrl4585) } } else { - yyv4611 = make([]OwnerReference, yyrl4611) + yyv4585 = make([]OwnerReference, yyrl4585) } - yyc4611 = true - yyrr4611 = len(yyv4611) - if yyrg4611 { - copy(yyv4611, yyv24611) + yyc4585 = true + yyrr4585 = len(yyv4585) + if yyrg4585 { + copy(yyv4585, yyv24585) } - } else if yyl4611 != len(yyv4611) { - yyv4611 = yyv4611[:yyl4611] - yyc4611 = true + } else if yyl4585 != len(yyv4585) { + yyv4585 = yyv4585[:yyl4585] + yyc4585 = true } - yyj4611 := 0 - for ; yyj4611 < yyrr4611; yyj4611++ { - yyh4611.ElemContainerState(yyj4611) + yyj4585 := 0 + for ; yyj4585 < yyrr4585; yyj4585++ { + yyh4585.ElemContainerState(yyj4585) if r.TryDecodeAsNil() { - yyv4611[yyj4611] = OwnerReference{} + yyv4585[yyj4585] = OwnerReference{} } else { - yyv4612 := &yyv4611[yyj4611] - yyv4612.CodecDecodeSelf(d) + yyv4586 := &yyv4585[yyj4585] + yyv4586.CodecDecodeSelf(d) } } - if yyrt4611 { - for ; yyj4611 < yyl4611; yyj4611++ { - yyv4611 = append(yyv4611, OwnerReference{}) - yyh4611.ElemContainerState(yyj4611) + if yyrt4585 { + for ; yyj4585 < yyl4585; yyj4585++ { + yyv4585 = append(yyv4585, OwnerReference{}) + yyh4585.ElemContainerState(yyj4585) if r.TryDecodeAsNil() { - yyv4611[yyj4611] = OwnerReference{} + yyv4585[yyj4585] = OwnerReference{} } else { - yyv4613 := &yyv4611[yyj4611] - yyv4613.CodecDecodeSelf(d) + yyv4587 := &yyv4585[yyj4585] + yyv4587.CodecDecodeSelf(d) } } } } else { - yyj4611 := 0 - for ; !r.CheckBreak(); yyj4611++ { + yyj4585 := 0 + for ; !r.CheckBreak(); yyj4585++ { - if yyj4611 >= len(yyv4611) { - yyv4611 = append(yyv4611, OwnerReference{}) // var yyz4611 OwnerReference - yyc4611 = true + if yyj4585 >= len(yyv4585) { + yyv4585 = append(yyv4585, OwnerReference{}) // var yyz4585 OwnerReference + yyc4585 = true } - yyh4611.ElemContainerState(yyj4611) - if yyj4611 < len(yyv4611) { + yyh4585.ElemContainerState(yyj4585) + if yyj4585 < len(yyv4585) { if r.TryDecodeAsNil() { - yyv4611[yyj4611] = OwnerReference{} + yyv4585[yyj4585] = OwnerReference{} } else { - yyv4614 := &yyv4611[yyj4611] - yyv4614.CodecDecodeSelf(d) + yyv4588 := &yyv4585[yyj4585] + yyv4588.CodecDecodeSelf(d) } } else { @@ -57370,17 +57071,17 @@ func (x codecSelfer1234) decSliceOwnerReference(v *[]OwnerReference, d *codec197 } } - if yyj4611 < len(yyv4611) { - yyv4611 = yyv4611[:yyj4611] - yyc4611 = true - } else if yyj4611 == 0 && yyv4611 == nil { - yyv4611 = []OwnerReference{} - yyc4611 = true + if yyj4585 < len(yyv4585) { + yyv4585 = yyv4585[:yyj4585] + yyc4585 = true + } else if yyj4585 == 0 && yyv4585 == nil { + yyv4585 = []OwnerReference{} + yyc4585 = true } } - yyh4611.End() - if yyc4611 { - *v = yyv4611 + yyh4585.End() + if yyc4585 { + *v = yyv4585 } } @@ -57389,9 +57090,9 @@ func (x codecSelfer1234) encSlicePersistentVolumeAccessMode(v []PersistentVolume z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4615 := range v { + for _, yyv4589 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4615.CodecEncodeSelf(e) + yyv4589.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57401,75 +57102,75 @@ func (x codecSelfer1234) decSlicePersistentVolumeAccessMode(v *[]PersistentVolum z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4616 := *v - yyh4616, yyl4616 := z.DecSliceHelperStart() - var yyc4616 bool - if yyl4616 == 0 { - if yyv4616 == nil { - yyv4616 = []PersistentVolumeAccessMode{} - yyc4616 = true - } else if len(yyv4616) != 0 { - yyv4616 = yyv4616[:0] - yyc4616 = true + yyv4590 := *v + yyh4590, yyl4590 := z.DecSliceHelperStart() + var yyc4590 bool + if yyl4590 == 0 { + if yyv4590 == nil { + yyv4590 = []PersistentVolumeAccessMode{} + yyc4590 = true + } else if len(yyv4590) != 0 { + yyv4590 = yyv4590[:0] + yyc4590 = true } - } else if yyl4616 > 0 { - var yyrr4616, yyrl4616 int - var yyrt4616 bool - if yyl4616 > cap(yyv4616) { + } else if yyl4590 > 0 { + var yyrr4590, yyrl4590 int + var yyrt4590 bool + if yyl4590 > cap(yyv4590) { - yyrl4616, yyrt4616 = z.DecInferLen(yyl4616, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4616 { - if yyrl4616 <= cap(yyv4616) { - yyv4616 = yyv4616[:yyrl4616] + yyrl4590, yyrt4590 = z.DecInferLen(yyl4590, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4590 { + if yyrl4590 <= cap(yyv4590) { + yyv4590 = yyv4590[:yyrl4590] } else { - yyv4616 = make([]PersistentVolumeAccessMode, yyrl4616) + yyv4590 = make([]PersistentVolumeAccessMode, yyrl4590) } } else { - yyv4616 = make([]PersistentVolumeAccessMode, yyrl4616) + yyv4590 = make([]PersistentVolumeAccessMode, yyrl4590) } - yyc4616 = true - yyrr4616 = len(yyv4616) - } else if yyl4616 != len(yyv4616) { - yyv4616 = yyv4616[:yyl4616] - yyc4616 = true + yyc4590 = true + yyrr4590 = len(yyv4590) + } else if yyl4590 != len(yyv4590) { + yyv4590 = yyv4590[:yyl4590] + yyc4590 = true } - yyj4616 := 0 - for ; yyj4616 < yyrr4616; yyj4616++ { - yyh4616.ElemContainerState(yyj4616) + yyj4590 := 0 + for ; yyj4590 < yyrr4590; yyj4590++ { + yyh4590.ElemContainerState(yyj4590) if r.TryDecodeAsNil() { - yyv4616[yyj4616] = "" + yyv4590[yyj4590] = "" } else { - yyv4616[yyj4616] = PersistentVolumeAccessMode(r.DecodeString()) + yyv4590[yyj4590] = PersistentVolumeAccessMode(r.DecodeString()) } } - if yyrt4616 { - for ; yyj4616 < yyl4616; yyj4616++ { - yyv4616 = append(yyv4616, "") - yyh4616.ElemContainerState(yyj4616) + if yyrt4590 { + for ; yyj4590 < yyl4590; yyj4590++ { + yyv4590 = append(yyv4590, "") + yyh4590.ElemContainerState(yyj4590) if r.TryDecodeAsNil() { - yyv4616[yyj4616] = "" + yyv4590[yyj4590] = "" } else { - yyv4616[yyj4616] = PersistentVolumeAccessMode(r.DecodeString()) + yyv4590[yyj4590] = PersistentVolumeAccessMode(r.DecodeString()) } } } } else { - yyj4616 := 0 - for ; !r.CheckBreak(); yyj4616++ { + yyj4590 := 0 + for ; !r.CheckBreak(); yyj4590++ { - if yyj4616 >= len(yyv4616) { - yyv4616 = append(yyv4616, "") // var yyz4616 PersistentVolumeAccessMode - yyc4616 = true + if yyj4590 >= len(yyv4590) { + yyv4590 = append(yyv4590, "") // var yyz4590 PersistentVolumeAccessMode + yyc4590 = true } - yyh4616.ElemContainerState(yyj4616) - if yyj4616 < len(yyv4616) { + yyh4590.ElemContainerState(yyj4590) + if yyj4590 < len(yyv4590) { if r.TryDecodeAsNil() { - yyv4616[yyj4616] = "" + yyv4590[yyj4590] = "" } else { - yyv4616[yyj4616] = PersistentVolumeAccessMode(r.DecodeString()) + yyv4590[yyj4590] = PersistentVolumeAccessMode(r.DecodeString()) } } else { @@ -57477,17 +57178,17 @@ func (x codecSelfer1234) decSlicePersistentVolumeAccessMode(v *[]PersistentVolum } } - if yyj4616 < len(yyv4616) { - yyv4616 = yyv4616[:yyj4616] - yyc4616 = true - } else if yyj4616 == 0 && yyv4616 == nil { - yyv4616 = []PersistentVolumeAccessMode{} - yyc4616 = true + if yyj4590 < len(yyv4590) { + yyv4590 = yyv4590[:yyj4590] + yyc4590 = true + } else if yyj4590 == 0 && yyv4590 == nil { + yyv4590 = []PersistentVolumeAccessMode{} + yyc4590 = true } } - yyh4616.End() - if yyc4616 { - *v = yyv4616 + yyh4590.End() + if yyc4590 { + *v = yyv4590 } } @@ -57496,10 +57197,10 @@ func (x codecSelfer1234) encSlicePersistentVolume(v []PersistentVolume, e *codec z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4620 := range v { + for _, yyv4594 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4621 := &yyv4620 - yy4621.CodecEncodeSelf(e) + yy4595 := &yyv4594 + yy4595.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57509,83 +57210,83 @@ func (x codecSelfer1234) decSlicePersistentVolume(v *[]PersistentVolume, d *code z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4622 := *v - yyh4622, yyl4622 := z.DecSliceHelperStart() - var yyc4622 bool - if yyl4622 == 0 { - if yyv4622 == nil { - yyv4622 = []PersistentVolume{} - yyc4622 = true - } else if len(yyv4622) != 0 { - yyv4622 = yyv4622[:0] - yyc4622 = true + yyv4596 := *v + yyh4596, yyl4596 := z.DecSliceHelperStart() + var yyc4596 bool + if yyl4596 == 0 { + if yyv4596 == nil { + yyv4596 = []PersistentVolume{} + yyc4596 = true + } else if len(yyv4596) != 0 { + yyv4596 = yyv4596[:0] + yyc4596 = true } - } else if yyl4622 > 0 { - var yyrr4622, yyrl4622 int - var yyrt4622 bool - if yyl4622 > cap(yyv4622) { + } else if yyl4596 > 0 { + var yyrr4596, yyrl4596 int + var yyrt4596 bool + if yyl4596 > cap(yyv4596) { - yyrg4622 := len(yyv4622) > 0 - yyv24622 := yyv4622 - yyrl4622, yyrt4622 = z.DecInferLen(yyl4622, z.DecBasicHandle().MaxInitLen, 496) - if yyrt4622 { - if yyrl4622 <= cap(yyv4622) { - yyv4622 = yyv4622[:yyrl4622] + yyrg4596 := len(yyv4596) > 0 + yyv24596 := yyv4596 + yyrl4596, yyrt4596 = z.DecInferLen(yyl4596, z.DecBasicHandle().MaxInitLen, 496) + if yyrt4596 { + if yyrl4596 <= cap(yyv4596) { + yyv4596 = yyv4596[:yyrl4596] } else { - yyv4622 = make([]PersistentVolume, yyrl4622) + yyv4596 = make([]PersistentVolume, yyrl4596) } } else { - yyv4622 = make([]PersistentVolume, yyrl4622) + yyv4596 = make([]PersistentVolume, yyrl4596) } - yyc4622 = true - yyrr4622 = len(yyv4622) - if yyrg4622 { - copy(yyv4622, yyv24622) + yyc4596 = true + yyrr4596 = len(yyv4596) + if yyrg4596 { + copy(yyv4596, yyv24596) } - } else if yyl4622 != len(yyv4622) { - yyv4622 = yyv4622[:yyl4622] - yyc4622 = true + } else if yyl4596 != len(yyv4596) { + yyv4596 = yyv4596[:yyl4596] + yyc4596 = true } - yyj4622 := 0 - for ; yyj4622 < yyrr4622; yyj4622++ { - yyh4622.ElemContainerState(yyj4622) + yyj4596 := 0 + for ; yyj4596 < yyrr4596; yyj4596++ { + yyh4596.ElemContainerState(yyj4596) if r.TryDecodeAsNil() { - yyv4622[yyj4622] = PersistentVolume{} + yyv4596[yyj4596] = PersistentVolume{} } else { - yyv4623 := &yyv4622[yyj4622] - yyv4623.CodecDecodeSelf(d) + yyv4597 := &yyv4596[yyj4596] + yyv4597.CodecDecodeSelf(d) } } - if yyrt4622 { - for ; yyj4622 < yyl4622; yyj4622++ { - yyv4622 = append(yyv4622, PersistentVolume{}) - yyh4622.ElemContainerState(yyj4622) + if yyrt4596 { + for ; yyj4596 < yyl4596; yyj4596++ { + yyv4596 = append(yyv4596, PersistentVolume{}) + yyh4596.ElemContainerState(yyj4596) if r.TryDecodeAsNil() { - yyv4622[yyj4622] = PersistentVolume{} + yyv4596[yyj4596] = PersistentVolume{} } else { - yyv4624 := &yyv4622[yyj4622] - yyv4624.CodecDecodeSelf(d) + yyv4598 := &yyv4596[yyj4596] + yyv4598.CodecDecodeSelf(d) } } } } else { - yyj4622 := 0 - for ; !r.CheckBreak(); yyj4622++ { + yyj4596 := 0 + for ; !r.CheckBreak(); yyj4596++ { - if yyj4622 >= len(yyv4622) { - yyv4622 = append(yyv4622, PersistentVolume{}) // var yyz4622 PersistentVolume - yyc4622 = true + if yyj4596 >= len(yyv4596) { + yyv4596 = append(yyv4596, PersistentVolume{}) // var yyz4596 PersistentVolume + yyc4596 = true } - yyh4622.ElemContainerState(yyj4622) - if yyj4622 < len(yyv4622) { + yyh4596.ElemContainerState(yyj4596) + if yyj4596 < len(yyv4596) { if r.TryDecodeAsNil() { - yyv4622[yyj4622] = PersistentVolume{} + yyv4596[yyj4596] = PersistentVolume{} } else { - yyv4625 := &yyv4622[yyj4622] - yyv4625.CodecDecodeSelf(d) + yyv4599 := &yyv4596[yyj4596] + yyv4599.CodecDecodeSelf(d) } } else { @@ -57593,17 +57294,17 @@ func (x codecSelfer1234) decSlicePersistentVolume(v *[]PersistentVolume, d *code } } - if yyj4622 < len(yyv4622) { - yyv4622 = yyv4622[:yyj4622] - yyc4622 = true - } else if yyj4622 == 0 && yyv4622 == nil { - yyv4622 = []PersistentVolume{} - yyc4622 = true + if yyj4596 < len(yyv4596) { + yyv4596 = yyv4596[:yyj4596] + yyc4596 = true + } else if yyj4596 == 0 && yyv4596 == nil { + yyv4596 = []PersistentVolume{} + yyc4596 = true } } - yyh4622.End() - if yyc4622 { - *v = yyv4622 + yyh4596.End() + if yyc4596 { + *v = yyv4596 } } @@ -57612,10 +57313,10 @@ func (x codecSelfer1234) encSlicePersistentVolumeClaim(v []PersistentVolumeClaim z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4626 := range v { + for _, yyv4600 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4627 := &yyv4626 - yy4627.CodecEncodeSelf(e) + yy4601 := &yyv4600 + yy4601.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57625,83 +57326,83 @@ func (x codecSelfer1234) decSlicePersistentVolumeClaim(v *[]PersistentVolumeClai z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4628 := *v - yyh4628, yyl4628 := z.DecSliceHelperStart() - var yyc4628 bool - if yyl4628 == 0 { - if yyv4628 == nil { - yyv4628 = []PersistentVolumeClaim{} - yyc4628 = true - } else if len(yyv4628) != 0 { - yyv4628 = yyv4628[:0] - yyc4628 = true + yyv4602 := *v + yyh4602, yyl4602 := z.DecSliceHelperStart() + var yyc4602 bool + if yyl4602 == 0 { + if yyv4602 == nil { + yyv4602 = []PersistentVolumeClaim{} + yyc4602 = true + } else if len(yyv4602) != 0 { + yyv4602 = yyv4602[:0] + yyc4602 = true } - } else if yyl4628 > 0 { - var yyrr4628, yyrl4628 int - var yyrt4628 bool - if yyl4628 > cap(yyv4628) { + } else if yyl4602 > 0 { + var yyrr4602, yyrl4602 int + var yyrt4602 bool + if yyl4602 > cap(yyv4602) { - yyrg4628 := len(yyv4628) > 0 - yyv24628 := yyv4628 - yyrl4628, yyrt4628 = z.DecInferLen(yyl4628, z.DecBasicHandle().MaxInitLen, 368) - if yyrt4628 { - if yyrl4628 <= cap(yyv4628) { - yyv4628 = yyv4628[:yyrl4628] + yyrg4602 := len(yyv4602) > 0 + yyv24602 := yyv4602 + yyrl4602, yyrt4602 = z.DecInferLen(yyl4602, z.DecBasicHandle().MaxInitLen, 368) + if yyrt4602 { + if yyrl4602 <= cap(yyv4602) { + yyv4602 = yyv4602[:yyrl4602] } else { - yyv4628 = make([]PersistentVolumeClaim, yyrl4628) + yyv4602 = make([]PersistentVolumeClaim, yyrl4602) } } else { - yyv4628 = make([]PersistentVolumeClaim, yyrl4628) + yyv4602 = make([]PersistentVolumeClaim, yyrl4602) } - yyc4628 = true - yyrr4628 = len(yyv4628) - if yyrg4628 { - copy(yyv4628, yyv24628) + yyc4602 = true + yyrr4602 = len(yyv4602) + if yyrg4602 { + copy(yyv4602, yyv24602) } - } else if yyl4628 != len(yyv4628) { - yyv4628 = yyv4628[:yyl4628] - yyc4628 = true + } else if yyl4602 != len(yyv4602) { + yyv4602 = yyv4602[:yyl4602] + yyc4602 = true } - yyj4628 := 0 - for ; yyj4628 < yyrr4628; yyj4628++ { - yyh4628.ElemContainerState(yyj4628) + yyj4602 := 0 + for ; yyj4602 < yyrr4602; yyj4602++ { + yyh4602.ElemContainerState(yyj4602) if r.TryDecodeAsNil() { - yyv4628[yyj4628] = PersistentVolumeClaim{} + yyv4602[yyj4602] = PersistentVolumeClaim{} } else { - yyv4629 := &yyv4628[yyj4628] - yyv4629.CodecDecodeSelf(d) + yyv4603 := &yyv4602[yyj4602] + yyv4603.CodecDecodeSelf(d) } } - if yyrt4628 { - for ; yyj4628 < yyl4628; yyj4628++ { - yyv4628 = append(yyv4628, PersistentVolumeClaim{}) - yyh4628.ElemContainerState(yyj4628) + if yyrt4602 { + for ; yyj4602 < yyl4602; yyj4602++ { + yyv4602 = append(yyv4602, PersistentVolumeClaim{}) + yyh4602.ElemContainerState(yyj4602) if r.TryDecodeAsNil() { - yyv4628[yyj4628] = PersistentVolumeClaim{} + yyv4602[yyj4602] = PersistentVolumeClaim{} } else { - yyv4630 := &yyv4628[yyj4628] - yyv4630.CodecDecodeSelf(d) + yyv4604 := &yyv4602[yyj4602] + yyv4604.CodecDecodeSelf(d) } } } } else { - yyj4628 := 0 - for ; !r.CheckBreak(); yyj4628++ { + yyj4602 := 0 + for ; !r.CheckBreak(); yyj4602++ { - if yyj4628 >= len(yyv4628) { - yyv4628 = append(yyv4628, PersistentVolumeClaim{}) // var yyz4628 PersistentVolumeClaim - yyc4628 = true + if yyj4602 >= len(yyv4602) { + yyv4602 = append(yyv4602, PersistentVolumeClaim{}) // var yyz4602 PersistentVolumeClaim + yyc4602 = true } - yyh4628.ElemContainerState(yyj4628) - if yyj4628 < len(yyv4628) { + yyh4602.ElemContainerState(yyj4602) + if yyj4602 < len(yyv4602) { if r.TryDecodeAsNil() { - yyv4628[yyj4628] = PersistentVolumeClaim{} + yyv4602[yyj4602] = PersistentVolumeClaim{} } else { - yyv4631 := &yyv4628[yyj4628] - yyv4631.CodecDecodeSelf(d) + yyv4605 := &yyv4602[yyj4602] + yyv4605.CodecDecodeSelf(d) } } else { @@ -57709,17 +57410,17 @@ func (x codecSelfer1234) decSlicePersistentVolumeClaim(v *[]PersistentVolumeClai } } - if yyj4628 < len(yyv4628) { - yyv4628 = yyv4628[:yyj4628] - yyc4628 = true - } else if yyj4628 == 0 && yyv4628 == nil { - yyv4628 = []PersistentVolumeClaim{} - yyc4628 = true + if yyj4602 < len(yyv4602) { + yyv4602 = yyv4602[:yyj4602] + yyc4602 = true + } else if yyj4602 == 0 && yyv4602 == nil { + yyv4602 = []PersistentVolumeClaim{} + yyc4602 = true } } - yyh4628.End() - if yyc4628 { - *v = yyv4628 + yyh4602.End() + if yyc4602 { + *v = yyv4602 } } @@ -57728,10 +57429,10 @@ func (x codecSelfer1234) encSliceKeyToPath(v []KeyToPath, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4632 := range v { + for _, yyv4606 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4633 := &yyv4632 - yy4633.CodecEncodeSelf(e) + yy4607 := &yyv4606 + yy4607.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57741,83 +57442,83 @@ func (x codecSelfer1234) decSliceKeyToPath(v *[]KeyToPath, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4634 := *v - yyh4634, yyl4634 := z.DecSliceHelperStart() - var yyc4634 bool - if yyl4634 == 0 { - if yyv4634 == nil { - yyv4634 = []KeyToPath{} - yyc4634 = true - } else if len(yyv4634) != 0 { - yyv4634 = yyv4634[:0] - yyc4634 = true + yyv4608 := *v + yyh4608, yyl4608 := z.DecSliceHelperStart() + var yyc4608 bool + if yyl4608 == 0 { + if yyv4608 == nil { + yyv4608 = []KeyToPath{} + yyc4608 = true + } else if len(yyv4608) != 0 { + yyv4608 = yyv4608[:0] + yyc4608 = true } - } else if yyl4634 > 0 { - var yyrr4634, yyrl4634 int - var yyrt4634 bool - if yyl4634 > cap(yyv4634) { + } else if yyl4608 > 0 { + var yyrr4608, yyrl4608 int + var yyrt4608 bool + if yyl4608 > cap(yyv4608) { - yyrg4634 := len(yyv4634) > 0 - yyv24634 := yyv4634 - yyrl4634, yyrt4634 = z.DecInferLen(yyl4634, z.DecBasicHandle().MaxInitLen, 40) - if yyrt4634 { - if yyrl4634 <= cap(yyv4634) { - yyv4634 = yyv4634[:yyrl4634] + yyrg4608 := len(yyv4608) > 0 + yyv24608 := yyv4608 + yyrl4608, yyrt4608 = z.DecInferLen(yyl4608, z.DecBasicHandle().MaxInitLen, 40) + if yyrt4608 { + if yyrl4608 <= cap(yyv4608) { + yyv4608 = yyv4608[:yyrl4608] } else { - yyv4634 = make([]KeyToPath, yyrl4634) + yyv4608 = make([]KeyToPath, yyrl4608) } } else { - yyv4634 = make([]KeyToPath, yyrl4634) + yyv4608 = make([]KeyToPath, yyrl4608) } - yyc4634 = true - yyrr4634 = len(yyv4634) - if yyrg4634 { - copy(yyv4634, yyv24634) + yyc4608 = true + yyrr4608 = len(yyv4608) + if yyrg4608 { + copy(yyv4608, yyv24608) } - } else if yyl4634 != len(yyv4634) { - yyv4634 = yyv4634[:yyl4634] - yyc4634 = true + } else if yyl4608 != len(yyv4608) { + yyv4608 = yyv4608[:yyl4608] + yyc4608 = true } - yyj4634 := 0 - for ; yyj4634 < yyrr4634; yyj4634++ { - yyh4634.ElemContainerState(yyj4634) + yyj4608 := 0 + for ; yyj4608 < yyrr4608; yyj4608++ { + yyh4608.ElemContainerState(yyj4608) if r.TryDecodeAsNil() { - yyv4634[yyj4634] = KeyToPath{} + yyv4608[yyj4608] = KeyToPath{} } else { - yyv4635 := &yyv4634[yyj4634] - yyv4635.CodecDecodeSelf(d) + yyv4609 := &yyv4608[yyj4608] + yyv4609.CodecDecodeSelf(d) } } - if yyrt4634 { - for ; yyj4634 < yyl4634; yyj4634++ { - yyv4634 = append(yyv4634, KeyToPath{}) - yyh4634.ElemContainerState(yyj4634) + if yyrt4608 { + for ; yyj4608 < yyl4608; yyj4608++ { + yyv4608 = append(yyv4608, KeyToPath{}) + yyh4608.ElemContainerState(yyj4608) if r.TryDecodeAsNil() { - yyv4634[yyj4634] = KeyToPath{} + yyv4608[yyj4608] = KeyToPath{} } else { - yyv4636 := &yyv4634[yyj4634] - yyv4636.CodecDecodeSelf(d) + yyv4610 := &yyv4608[yyj4608] + yyv4610.CodecDecodeSelf(d) } } } } else { - yyj4634 := 0 - for ; !r.CheckBreak(); yyj4634++ { + yyj4608 := 0 + for ; !r.CheckBreak(); yyj4608++ { - if yyj4634 >= len(yyv4634) { - yyv4634 = append(yyv4634, KeyToPath{}) // var yyz4634 KeyToPath - yyc4634 = true + if yyj4608 >= len(yyv4608) { + yyv4608 = append(yyv4608, KeyToPath{}) // var yyz4608 KeyToPath + yyc4608 = true } - yyh4634.ElemContainerState(yyj4634) - if yyj4634 < len(yyv4634) { + yyh4608.ElemContainerState(yyj4608) + if yyj4608 < len(yyv4608) { if r.TryDecodeAsNil() { - yyv4634[yyj4634] = KeyToPath{} + yyv4608[yyj4608] = KeyToPath{} } else { - yyv4637 := &yyv4634[yyj4634] - yyv4637.CodecDecodeSelf(d) + yyv4611 := &yyv4608[yyj4608] + yyv4611.CodecDecodeSelf(d) } } else { @@ -57825,17 +57526,17 @@ func (x codecSelfer1234) decSliceKeyToPath(v *[]KeyToPath, d *codec1978.Decoder) } } - if yyj4634 < len(yyv4634) { - yyv4634 = yyv4634[:yyj4634] - yyc4634 = true - } else if yyj4634 == 0 && yyv4634 == nil { - yyv4634 = []KeyToPath{} - yyc4634 = true + if yyj4608 < len(yyv4608) { + yyv4608 = yyv4608[:yyj4608] + yyc4608 = true + } else if yyj4608 == 0 && yyv4608 == nil { + yyv4608 = []KeyToPath{} + yyc4608 = true } } - yyh4634.End() - if yyc4634 { - *v = yyv4634 + yyh4608.End() + if yyc4608 { + *v = yyv4608 } } @@ -57844,10 +57545,10 @@ func (x codecSelfer1234) encSliceDownwardAPIVolumeFile(v []DownwardAPIVolumeFile z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4638 := range v { + for _, yyv4612 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4639 := &yyv4638 - yy4639.CodecEncodeSelf(e) + yy4613 := &yyv4612 + yy4613.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57857,83 +57558,83 @@ func (x codecSelfer1234) decSliceDownwardAPIVolumeFile(v *[]DownwardAPIVolumeFil z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4640 := *v - yyh4640, yyl4640 := z.DecSliceHelperStart() - var yyc4640 bool - if yyl4640 == 0 { - if yyv4640 == nil { - yyv4640 = []DownwardAPIVolumeFile{} - yyc4640 = true - } else if len(yyv4640) != 0 { - yyv4640 = yyv4640[:0] - yyc4640 = true + yyv4614 := *v + yyh4614, yyl4614 := z.DecSliceHelperStart() + var yyc4614 bool + if yyl4614 == 0 { + if yyv4614 == nil { + yyv4614 = []DownwardAPIVolumeFile{} + yyc4614 = true + } else if len(yyv4614) != 0 { + yyv4614 = yyv4614[:0] + yyc4614 = true } - } else if yyl4640 > 0 { - var yyrr4640, yyrl4640 int - var yyrt4640 bool - if yyl4640 > cap(yyv4640) { + } else if yyl4614 > 0 { + var yyrr4614, yyrl4614 int + var yyrt4614 bool + if yyl4614 > cap(yyv4614) { - yyrg4640 := len(yyv4640) > 0 - yyv24640 := yyv4640 - yyrl4640, yyrt4640 = z.DecInferLen(yyl4640, z.DecBasicHandle().MaxInitLen, 40) - if yyrt4640 { - if yyrl4640 <= cap(yyv4640) { - yyv4640 = yyv4640[:yyrl4640] + yyrg4614 := len(yyv4614) > 0 + yyv24614 := yyv4614 + yyrl4614, yyrt4614 = z.DecInferLen(yyl4614, z.DecBasicHandle().MaxInitLen, 40) + if yyrt4614 { + if yyrl4614 <= cap(yyv4614) { + yyv4614 = yyv4614[:yyrl4614] } else { - yyv4640 = make([]DownwardAPIVolumeFile, yyrl4640) + yyv4614 = make([]DownwardAPIVolumeFile, yyrl4614) } } else { - yyv4640 = make([]DownwardAPIVolumeFile, yyrl4640) + yyv4614 = make([]DownwardAPIVolumeFile, yyrl4614) } - yyc4640 = true - yyrr4640 = len(yyv4640) - if yyrg4640 { - copy(yyv4640, yyv24640) + yyc4614 = true + yyrr4614 = len(yyv4614) + if yyrg4614 { + copy(yyv4614, yyv24614) } - } else if yyl4640 != len(yyv4640) { - yyv4640 = yyv4640[:yyl4640] - yyc4640 = true + } else if yyl4614 != len(yyv4614) { + yyv4614 = yyv4614[:yyl4614] + yyc4614 = true } - yyj4640 := 0 - for ; yyj4640 < yyrr4640; yyj4640++ { - yyh4640.ElemContainerState(yyj4640) + yyj4614 := 0 + for ; yyj4614 < yyrr4614; yyj4614++ { + yyh4614.ElemContainerState(yyj4614) if r.TryDecodeAsNil() { - yyv4640[yyj4640] = DownwardAPIVolumeFile{} + yyv4614[yyj4614] = DownwardAPIVolumeFile{} } else { - yyv4641 := &yyv4640[yyj4640] - yyv4641.CodecDecodeSelf(d) + yyv4615 := &yyv4614[yyj4614] + yyv4615.CodecDecodeSelf(d) } } - if yyrt4640 { - for ; yyj4640 < yyl4640; yyj4640++ { - yyv4640 = append(yyv4640, DownwardAPIVolumeFile{}) - yyh4640.ElemContainerState(yyj4640) + if yyrt4614 { + for ; yyj4614 < yyl4614; yyj4614++ { + yyv4614 = append(yyv4614, DownwardAPIVolumeFile{}) + yyh4614.ElemContainerState(yyj4614) if r.TryDecodeAsNil() { - yyv4640[yyj4640] = DownwardAPIVolumeFile{} + yyv4614[yyj4614] = DownwardAPIVolumeFile{} } else { - yyv4642 := &yyv4640[yyj4640] - yyv4642.CodecDecodeSelf(d) + yyv4616 := &yyv4614[yyj4614] + yyv4616.CodecDecodeSelf(d) } } } } else { - yyj4640 := 0 - for ; !r.CheckBreak(); yyj4640++ { + yyj4614 := 0 + for ; !r.CheckBreak(); yyj4614++ { - if yyj4640 >= len(yyv4640) { - yyv4640 = append(yyv4640, DownwardAPIVolumeFile{}) // var yyz4640 DownwardAPIVolumeFile - yyc4640 = true + if yyj4614 >= len(yyv4614) { + yyv4614 = append(yyv4614, DownwardAPIVolumeFile{}) // var yyz4614 DownwardAPIVolumeFile + yyc4614 = true } - yyh4640.ElemContainerState(yyj4640) - if yyj4640 < len(yyv4640) { + yyh4614.ElemContainerState(yyj4614) + if yyj4614 < len(yyv4614) { if r.TryDecodeAsNil() { - yyv4640[yyj4640] = DownwardAPIVolumeFile{} + yyv4614[yyj4614] = DownwardAPIVolumeFile{} } else { - yyv4643 := &yyv4640[yyj4640] - yyv4643.CodecDecodeSelf(d) + yyv4617 := &yyv4614[yyj4614] + yyv4617.CodecDecodeSelf(d) } } else { @@ -57941,17 +57642,17 @@ func (x codecSelfer1234) decSliceDownwardAPIVolumeFile(v *[]DownwardAPIVolumeFil } } - if yyj4640 < len(yyv4640) { - yyv4640 = yyv4640[:yyj4640] - yyc4640 = true - } else if yyj4640 == 0 && yyv4640 == nil { - yyv4640 = []DownwardAPIVolumeFile{} - yyc4640 = true + if yyj4614 < len(yyv4614) { + yyv4614 = yyv4614[:yyj4614] + yyc4614 = true + } else if yyj4614 == 0 && yyv4614 == nil { + yyv4614 = []DownwardAPIVolumeFile{} + yyc4614 = true } } - yyh4640.End() - if yyc4640 { - *v = yyv4640 + yyh4614.End() + if yyc4614 { + *v = yyv4614 } } @@ -57960,10 +57661,10 @@ func (x codecSelfer1234) encSliceHTTPHeader(v []HTTPHeader, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4644 := range v { + for _, yyv4618 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4645 := &yyv4644 - yy4645.CodecEncodeSelf(e) + yy4619 := &yyv4618 + yy4619.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57973,83 +57674,83 @@ func (x codecSelfer1234) decSliceHTTPHeader(v *[]HTTPHeader, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4646 := *v - yyh4646, yyl4646 := z.DecSliceHelperStart() - var yyc4646 bool - if yyl4646 == 0 { - if yyv4646 == nil { - yyv4646 = []HTTPHeader{} - yyc4646 = true - } else if len(yyv4646) != 0 { - yyv4646 = yyv4646[:0] - yyc4646 = true + yyv4620 := *v + yyh4620, yyl4620 := z.DecSliceHelperStart() + var yyc4620 bool + if yyl4620 == 0 { + if yyv4620 == nil { + yyv4620 = []HTTPHeader{} + yyc4620 = true + } else if len(yyv4620) != 0 { + yyv4620 = yyv4620[:0] + yyc4620 = true } - } else if yyl4646 > 0 { - var yyrr4646, yyrl4646 int - var yyrt4646 bool - if yyl4646 > cap(yyv4646) { + } else if yyl4620 > 0 { + var yyrr4620, yyrl4620 int + var yyrt4620 bool + if yyl4620 > cap(yyv4620) { - yyrg4646 := len(yyv4646) > 0 - yyv24646 := yyv4646 - yyrl4646, yyrt4646 = z.DecInferLen(yyl4646, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4646 { - if yyrl4646 <= cap(yyv4646) { - yyv4646 = yyv4646[:yyrl4646] + yyrg4620 := len(yyv4620) > 0 + yyv24620 := yyv4620 + yyrl4620, yyrt4620 = z.DecInferLen(yyl4620, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4620 { + if yyrl4620 <= cap(yyv4620) { + yyv4620 = yyv4620[:yyrl4620] } else { - yyv4646 = make([]HTTPHeader, yyrl4646) + yyv4620 = make([]HTTPHeader, yyrl4620) } } else { - yyv4646 = make([]HTTPHeader, yyrl4646) + yyv4620 = make([]HTTPHeader, yyrl4620) } - yyc4646 = true - yyrr4646 = len(yyv4646) - if yyrg4646 { - copy(yyv4646, yyv24646) + yyc4620 = true + yyrr4620 = len(yyv4620) + if yyrg4620 { + copy(yyv4620, yyv24620) } - } else if yyl4646 != len(yyv4646) { - yyv4646 = yyv4646[:yyl4646] - yyc4646 = true + } else if yyl4620 != len(yyv4620) { + yyv4620 = yyv4620[:yyl4620] + yyc4620 = true } - yyj4646 := 0 - for ; yyj4646 < yyrr4646; yyj4646++ { - yyh4646.ElemContainerState(yyj4646) + yyj4620 := 0 + for ; yyj4620 < yyrr4620; yyj4620++ { + yyh4620.ElemContainerState(yyj4620) if r.TryDecodeAsNil() { - yyv4646[yyj4646] = HTTPHeader{} + yyv4620[yyj4620] = HTTPHeader{} } else { - yyv4647 := &yyv4646[yyj4646] - yyv4647.CodecDecodeSelf(d) + yyv4621 := &yyv4620[yyj4620] + yyv4621.CodecDecodeSelf(d) } } - if yyrt4646 { - for ; yyj4646 < yyl4646; yyj4646++ { - yyv4646 = append(yyv4646, HTTPHeader{}) - yyh4646.ElemContainerState(yyj4646) + if yyrt4620 { + for ; yyj4620 < yyl4620; yyj4620++ { + yyv4620 = append(yyv4620, HTTPHeader{}) + yyh4620.ElemContainerState(yyj4620) if r.TryDecodeAsNil() { - yyv4646[yyj4646] = HTTPHeader{} + yyv4620[yyj4620] = HTTPHeader{} } else { - yyv4648 := &yyv4646[yyj4646] - yyv4648.CodecDecodeSelf(d) + yyv4622 := &yyv4620[yyj4620] + yyv4622.CodecDecodeSelf(d) } } } } else { - yyj4646 := 0 - for ; !r.CheckBreak(); yyj4646++ { + yyj4620 := 0 + for ; !r.CheckBreak(); yyj4620++ { - if yyj4646 >= len(yyv4646) { - yyv4646 = append(yyv4646, HTTPHeader{}) // var yyz4646 HTTPHeader - yyc4646 = true + if yyj4620 >= len(yyv4620) { + yyv4620 = append(yyv4620, HTTPHeader{}) // var yyz4620 HTTPHeader + yyc4620 = true } - yyh4646.ElemContainerState(yyj4646) - if yyj4646 < len(yyv4646) { + yyh4620.ElemContainerState(yyj4620) + if yyj4620 < len(yyv4620) { if r.TryDecodeAsNil() { - yyv4646[yyj4646] = HTTPHeader{} + yyv4620[yyj4620] = HTTPHeader{} } else { - yyv4649 := &yyv4646[yyj4646] - yyv4649.CodecDecodeSelf(d) + yyv4623 := &yyv4620[yyj4620] + yyv4623.CodecDecodeSelf(d) } } else { @@ -58057,17 +57758,17 @@ func (x codecSelfer1234) decSliceHTTPHeader(v *[]HTTPHeader, d *codec1978.Decode } } - if yyj4646 < len(yyv4646) { - yyv4646 = yyv4646[:yyj4646] - yyc4646 = true - } else if yyj4646 == 0 && yyv4646 == nil { - yyv4646 = []HTTPHeader{} - yyc4646 = true + if yyj4620 < len(yyv4620) { + yyv4620 = yyv4620[:yyj4620] + yyc4620 = true + } else if yyj4620 == 0 && yyv4620 == nil { + yyv4620 = []HTTPHeader{} + yyc4620 = true } } - yyh4646.End() - if yyc4646 { - *v = yyv4646 + yyh4620.End() + if yyc4620 { + *v = yyv4620 } } @@ -58076,9 +57777,9 @@ func (x codecSelfer1234) encSliceCapability(v []Capability, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4650 := range v { + for _, yyv4624 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4650.CodecEncodeSelf(e) + yyv4624.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58088,75 +57789,75 @@ func (x codecSelfer1234) decSliceCapability(v *[]Capability, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4651 := *v - yyh4651, yyl4651 := z.DecSliceHelperStart() - var yyc4651 bool - if yyl4651 == 0 { - if yyv4651 == nil { - yyv4651 = []Capability{} - yyc4651 = true - } else if len(yyv4651) != 0 { - yyv4651 = yyv4651[:0] - yyc4651 = true + yyv4625 := *v + yyh4625, yyl4625 := z.DecSliceHelperStart() + var yyc4625 bool + if yyl4625 == 0 { + if yyv4625 == nil { + yyv4625 = []Capability{} + yyc4625 = true + } else if len(yyv4625) != 0 { + yyv4625 = yyv4625[:0] + yyc4625 = true } - } else if yyl4651 > 0 { - var yyrr4651, yyrl4651 int - var yyrt4651 bool - if yyl4651 > cap(yyv4651) { + } else if yyl4625 > 0 { + var yyrr4625, yyrl4625 int + var yyrt4625 bool + if yyl4625 > cap(yyv4625) { - yyrl4651, yyrt4651 = z.DecInferLen(yyl4651, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4651 { - if yyrl4651 <= cap(yyv4651) { - yyv4651 = yyv4651[:yyrl4651] + yyrl4625, yyrt4625 = z.DecInferLen(yyl4625, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4625 { + if yyrl4625 <= cap(yyv4625) { + yyv4625 = yyv4625[:yyrl4625] } else { - yyv4651 = make([]Capability, yyrl4651) + yyv4625 = make([]Capability, yyrl4625) } } else { - yyv4651 = make([]Capability, yyrl4651) + yyv4625 = make([]Capability, yyrl4625) } - yyc4651 = true - yyrr4651 = len(yyv4651) - } else if yyl4651 != len(yyv4651) { - yyv4651 = yyv4651[:yyl4651] - yyc4651 = true + yyc4625 = true + yyrr4625 = len(yyv4625) + } else if yyl4625 != len(yyv4625) { + yyv4625 = yyv4625[:yyl4625] + yyc4625 = true } - yyj4651 := 0 - for ; yyj4651 < yyrr4651; yyj4651++ { - yyh4651.ElemContainerState(yyj4651) + yyj4625 := 0 + for ; yyj4625 < yyrr4625; yyj4625++ { + yyh4625.ElemContainerState(yyj4625) if r.TryDecodeAsNil() { - yyv4651[yyj4651] = "" + yyv4625[yyj4625] = "" } else { - yyv4651[yyj4651] = Capability(r.DecodeString()) + yyv4625[yyj4625] = Capability(r.DecodeString()) } } - if yyrt4651 { - for ; yyj4651 < yyl4651; yyj4651++ { - yyv4651 = append(yyv4651, "") - yyh4651.ElemContainerState(yyj4651) + if yyrt4625 { + for ; yyj4625 < yyl4625; yyj4625++ { + yyv4625 = append(yyv4625, "") + yyh4625.ElemContainerState(yyj4625) if r.TryDecodeAsNil() { - yyv4651[yyj4651] = "" + yyv4625[yyj4625] = "" } else { - yyv4651[yyj4651] = Capability(r.DecodeString()) + yyv4625[yyj4625] = Capability(r.DecodeString()) } } } } else { - yyj4651 := 0 - for ; !r.CheckBreak(); yyj4651++ { + yyj4625 := 0 + for ; !r.CheckBreak(); yyj4625++ { - if yyj4651 >= len(yyv4651) { - yyv4651 = append(yyv4651, "") // var yyz4651 Capability - yyc4651 = true + if yyj4625 >= len(yyv4625) { + yyv4625 = append(yyv4625, "") // var yyz4625 Capability + yyc4625 = true } - yyh4651.ElemContainerState(yyj4651) - if yyj4651 < len(yyv4651) { + yyh4625.ElemContainerState(yyj4625) + if yyj4625 < len(yyv4625) { if r.TryDecodeAsNil() { - yyv4651[yyj4651] = "" + yyv4625[yyj4625] = "" } else { - yyv4651[yyj4651] = Capability(r.DecodeString()) + yyv4625[yyj4625] = Capability(r.DecodeString()) } } else { @@ -58164,17 +57865,17 @@ func (x codecSelfer1234) decSliceCapability(v *[]Capability, d *codec1978.Decode } } - if yyj4651 < len(yyv4651) { - yyv4651 = yyv4651[:yyj4651] - yyc4651 = true - } else if yyj4651 == 0 && yyv4651 == nil { - yyv4651 = []Capability{} - yyc4651 = true + if yyj4625 < len(yyv4625) { + yyv4625 = yyv4625[:yyj4625] + yyc4625 = true + } else if yyj4625 == 0 && yyv4625 == nil { + yyv4625 = []Capability{} + yyc4625 = true } } - yyh4651.End() - if yyc4651 { - *v = yyv4651 + yyh4625.End() + if yyc4625 { + *v = yyv4625 } } @@ -58183,10 +57884,10 @@ func (x codecSelfer1234) encSliceContainerPort(v []ContainerPort, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4655 := range v { + for _, yyv4629 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4656 := &yyv4655 - yy4656.CodecEncodeSelf(e) + yy4630 := &yyv4629 + yy4630.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58196,83 +57897,83 @@ func (x codecSelfer1234) decSliceContainerPort(v *[]ContainerPort, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4657 := *v - yyh4657, yyl4657 := z.DecSliceHelperStart() - var yyc4657 bool - if yyl4657 == 0 { - if yyv4657 == nil { - yyv4657 = []ContainerPort{} - yyc4657 = true - } else if len(yyv4657) != 0 { - yyv4657 = yyv4657[:0] - yyc4657 = true + yyv4631 := *v + yyh4631, yyl4631 := z.DecSliceHelperStart() + var yyc4631 bool + if yyl4631 == 0 { + if yyv4631 == nil { + yyv4631 = []ContainerPort{} + yyc4631 = true + } else if len(yyv4631) != 0 { + yyv4631 = yyv4631[:0] + yyc4631 = true } - } else if yyl4657 > 0 { - var yyrr4657, yyrl4657 int - var yyrt4657 bool - if yyl4657 > cap(yyv4657) { + } else if yyl4631 > 0 { + var yyrr4631, yyrl4631 int + var yyrt4631 bool + if yyl4631 > cap(yyv4631) { - yyrg4657 := len(yyv4657) > 0 - yyv24657 := yyv4657 - yyrl4657, yyrt4657 = z.DecInferLen(yyl4657, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4657 { - if yyrl4657 <= cap(yyv4657) { - yyv4657 = yyv4657[:yyrl4657] + yyrg4631 := len(yyv4631) > 0 + yyv24631 := yyv4631 + yyrl4631, yyrt4631 = z.DecInferLen(yyl4631, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4631 { + if yyrl4631 <= cap(yyv4631) { + yyv4631 = yyv4631[:yyrl4631] } else { - yyv4657 = make([]ContainerPort, yyrl4657) + yyv4631 = make([]ContainerPort, yyrl4631) } } else { - yyv4657 = make([]ContainerPort, yyrl4657) + yyv4631 = make([]ContainerPort, yyrl4631) } - yyc4657 = true - yyrr4657 = len(yyv4657) - if yyrg4657 { - copy(yyv4657, yyv24657) + yyc4631 = true + yyrr4631 = len(yyv4631) + if yyrg4631 { + copy(yyv4631, yyv24631) } - } else if yyl4657 != len(yyv4657) { - yyv4657 = yyv4657[:yyl4657] - yyc4657 = true + } else if yyl4631 != len(yyv4631) { + yyv4631 = yyv4631[:yyl4631] + yyc4631 = true } - yyj4657 := 0 - for ; yyj4657 < yyrr4657; yyj4657++ { - yyh4657.ElemContainerState(yyj4657) + yyj4631 := 0 + for ; yyj4631 < yyrr4631; yyj4631++ { + yyh4631.ElemContainerState(yyj4631) if r.TryDecodeAsNil() { - yyv4657[yyj4657] = ContainerPort{} + yyv4631[yyj4631] = ContainerPort{} } else { - yyv4658 := &yyv4657[yyj4657] - yyv4658.CodecDecodeSelf(d) + yyv4632 := &yyv4631[yyj4631] + yyv4632.CodecDecodeSelf(d) } } - if yyrt4657 { - for ; yyj4657 < yyl4657; yyj4657++ { - yyv4657 = append(yyv4657, ContainerPort{}) - yyh4657.ElemContainerState(yyj4657) + if yyrt4631 { + for ; yyj4631 < yyl4631; yyj4631++ { + yyv4631 = append(yyv4631, ContainerPort{}) + yyh4631.ElemContainerState(yyj4631) if r.TryDecodeAsNil() { - yyv4657[yyj4657] = ContainerPort{} + yyv4631[yyj4631] = ContainerPort{} } else { - yyv4659 := &yyv4657[yyj4657] - yyv4659.CodecDecodeSelf(d) + yyv4633 := &yyv4631[yyj4631] + yyv4633.CodecDecodeSelf(d) } } } } else { - yyj4657 := 0 - for ; !r.CheckBreak(); yyj4657++ { + yyj4631 := 0 + for ; !r.CheckBreak(); yyj4631++ { - if yyj4657 >= len(yyv4657) { - yyv4657 = append(yyv4657, ContainerPort{}) // var yyz4657 ContainerPort - yyc4657 = true + if yyj4631 >= len(yyv4631) { + yyv4631 = append(yyv4631, ContainerPort{}) // var yyz4631 ContainerPort + yyc4631 = true } - yyh4657.ElemContainerState(yyj4657) - if yyj4657 < len(yyv4657) { + yyh4631.ElemContainerState(yyj4631) + if yyj4631 < len(yyv4631) { if r.TryDecodeAsNil() { - yyv4657[yyj4657] = ContainerPort{} + yyv4631[yyj4631] = ContainerPort{} } else { - yyv4660 := &yyv4657[yyj4657] - yyv4660.CodecDecodeSelf(d) + yyv4634 := &yyv4631[yyj4631] + yyv4634.CodecDecodeSelf(d) } } else { @@ -58280,17 +57981,17 @@ func (x codecSelfer1234) decSliceContainerPort(v *[]ContainerPort, d *codec1978. } } - if yyj4657 < len(yyv4657) { - yyv4657 = yyv4657[:yyj4657] - yyc4657 = true - } else if yyj4657 == 0 && yyv4657 == nil { - yyv4657 = []ContainerPort{} - yyc4657 = true + if yyj4631 < len(yyv4631) { + yyv4631 = yyv4631[:yyj4631] + yyc4631 = true + } else if yyj4631 == 0 && yyv4631 == nil { + yyv4631 = []ContainerPort{} + yyc4631 = true } } - yyh4657.End() - if yyc4657 { - *v = yyv4657 + yyh4631.End() + if yyc4631 { + *v = yyv4631 } } @@ -58299,10 +58000,10 @@ func (x codecSelfer1234) encSliceEnvVar(v []EnvVar, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4661 := range v { + for _, yyv4635 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4662 := &yyv4661 - yy4662.CodecEncodeSelf(e) + yy4636 := &yyv4635 + yy4636.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58312,83 +58013,83 @@ func (x codecSelfer1234) decSliceEnvVar(v *[]EnvVar, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4663 := *v - yyh4663, yyl4663 := z.DecSliceHelperStart() - var yyc4663 bool - if yyl4663 == 0 { - if yyv4663 == nil { - yyv4663 = []EnvVar{} - yyc4663 = true - } else if len(yyv4663) != 0 { - yyv4663 = yyv4663[:0] - yyc4663 = true + yyv4637 := *v + yyh4637, yyl4637 := z.DecSliceHelperStart() + var yyc4637 bool + if yyl4637 == 0 { + if yyv4637 == nil { + yyv4637 = []EnvVar{} + yyc4637 = true + } else if len(yyv4637) != 0 { + yyv4637 = yyv4637[:0] + yyc4637 = true } - } else if yyl4663 > 0 { - var yyrr4663, yyrl4663 int - var yyrt4663 bool - if yyl4663 > cap(yyv4663) { + } else if yyl4637 > 0 { + var yyrr4637, yyrl4637 int + var yyrt4637 bool + if yyl4637 > cap(yyv4637) { - yyrg4663 := len(yyv4663) > 0 - yyv24663 := yyv4663 - yyrl4663, yyrt4663 = z.DecInferLen(yyl4663, z.DecBasicHandle().MaxInitLen, 40) - if yyrt4663 { - if yyrl4663 <= cap(yyv4663) { - yyv4663 = yyv4663[:yyrl4663] + yyrg4637 := len(yyv4637) > 0 + yyv24637 := yyv4637 + yyrl4637, yyrt4637 = z.DecInferLen(yyl4637, z.DecBasicHandle().MaxInitLen, 40) + if yyrt4637 { + if yyrl4637 <= cap(yyv4637) { + yyv4637 = yyv4637[:yyrl4637] } else { - yyv4663 = make([]EnvVar, yyrl4663) + yyv4637 = make([]EnvVar, yyrl4637) } } else { - yyv4663 = make([]EnvVar, yyrl4663) + yyv4637 = make([]EnvVar, yyrl4637) } - yyc4663 = true - yyrr4663 = len(yyv4663) - if yyrg4663 { - copy(yyv4663, yyv24663) + yyc4637 = true + yyrr4637 = len(yyv4637) + if yyrg4637 { + copy(yyv4637, yyv24637) } - } else if yyl4663 != len(yyv4663) { - yyv4663 = yyv4663[:yyl4663] - yyc4663 = true + } else if yyl4637 != len(yyv4637) { + yyv4637 = yyv4637[:yyl4637] + yyc4637 = true } - yyj4663 := 0 - for ; yyj4663 < yyrr4663; yyj4663++ { - yyh4663.ElemContainerState(yyj4663) + yyj4637 := 0 + for ; yyj4637 < yyrr4637; yyj4637++ { + yyh4637.ElemContainerState(yyj4637) if r.TryDecodeAsNil() { - yyv4663[yyj4663] = EnvVar{} + yyv4637[yyj4637] = EnvVar{} } else { - yyv4664 := &yyv4663[yyj4663] - yyv4664.CodecDecodeSelf(d) + yyv4638 := &yyv4637[yyj4637] + yyv4638.CodecDecodeSelf(d) } } - if yyrt4663 { - for ; yyj4663 < yyl4663; yyj4663++ { - yyv4663 = append(yyv4663, EnvVar{}) - yyh4663.ElemContainerState(yyj4663) + if yyrt4637 { + for ; yyj4637 < yyl4637; yyj4637++ { + yyv4637 = append(yyv4637, EnvVar{}) + yyh4637.ElemContainerState(yyj4637) if r.TryDecodeAsNil() { - yyv4663[yyj4663] = EnvVar{} + yyv4637[yyj4637] = EnvVar{} } else { - yyv4665 := &yyv4663[yyj4663] - yyv4665.CodecDecodeSelf(d) + yyv4639 := &yyv4637[yyj4637] + yyv4639.CodecDecodeSelf(d) } } } } else { - yyj4663 := 0 - for ; !r.CheckBreak(); yyj4663++ { + yyj4637 := 0 + for ; !r.CheckBreak(); yyj4637++ { - if yyj4663 >= len(yyv4663) { - yyv4663 = append(yyv4663, EnvVar{}) // var yyz4663 EnvVar - yyc4663 = true + if yyj4637 >= len(yyv4637) { + yyv4637 = append(yyv4637, EnvVar{}) // var yyz4637 EnvVar + yyc4637 = true } - yyh4663.ElemContainerState(yyj4663) - if yyj4663 < len(yyv4663) { + yyh4637.ElemContainerState(yyj4637) + if yyj4637 < len(yyv4637) { if r.TryDecodeAsNil() { - yyv4663[yyj4663] = EnvVar{} + yyv4637[yyj4637] = EnvVar{} } else { - yyv4666 := &yyv4663[yyj4663] - yyv4666.CodecDecodeSelf(d) + yyv4640 := &yyv4637[yyj4637] + yyv4640.CodecDecodeSelf(d) } } else { @@ -58396,17 +58097,17 @@ func (x codecSelfer1234) decSliceEnvVar(v *[]EnvVar, d *codec1978.Decoder) { } } - if yyj4663 < len(yyv4663) { - yyv4663 = yyv4663[:yyj4663] - yyc4663 = true - } else if yyj4663 == 0 && yyv4663 == nil { - yyv4663 = []EnvVar{} - yyc4663 = true + if yyj4637 < len(yyv4637) { + yyv4637 = yyv4637[:yyj4637] + yyc4637 = true + } else if yyj4637 == 0 && yyv4637 == nil { + yyv4637 = []EnvVar{} + yyc4637 = true } } - yyh4663.End() - if yyc4663 { - *v = yyv4663 + yyh4637.End() + if yyc4637 { + *v = yyv4637 } } @@ -58415,10 +58116,10 @@ func (x codecSelfer1234) encSliceVolumeMount(v []VolumeMount, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4667 := range v { + for _, yyv4641 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4668 := &yyv4667 - yy4668.CodecEncodeSelf(e) + yy4642 := &yyv4641 + yy4642.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58428,83 +58129,83 @@ func (x codecSelfer1234) decSliceVolumeMount(v *[]VolumeMount, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4669 := *v - yyh4669, yyl4669 := z.DecSliceHelperStart() - var yyc4669 bool - if yyl4669 == 0 { - if yyv4669 == nil { - yyv4669 = []VolumeMount{} - yyc4669 = true - } else if len(yyv4669) != 0 { - yyv4669 = yyv4669[:0] - yyc4669 = true + yyv4643 := *v + yyh4643, yyl4643 := z.DecSliceHelperStart() + var yyc4643 bool + if yyl4643 == 0 { + if yyv4643 == nil { + yyv4643 = []VolumeMount{} + yyc4643 = true + } else if len(yyv4643) != 0 { + yyv4643 = yyv4643[:0] + yyc4643 = true } - } else if yyl4669 > 0 { - var yyrr4669, yyrl4669 int - var yyrt4669 bool - if yyl4669 > cap(yyv4669) { + } else if yyl4643 > 0 { + var yyrr4643, yyrl4643 int + var yyrt4643 bool + if yyl4643 > cap(yyv4643) { - yyrg4669 := len(yyv4669) > 0 - yyv24669 := yyv4669 - yyrl4669, yyrt4669 = z.DecInferLen(yyl4669, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4669 { - if yyrl4669 <= cap(yyv4669) { - yyv4669 = yyv4669[:yyrl4669] + yyrg4643 := len(yyv4643) > 0 + yyv24643 := yyv4643 + yyrl4643, yyrt4643 = z.DecInferLen(yyl4643, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4643 { + if yyrl4643 <= cap(yyv4643) { + yyv4643 = yyv4643[:yyrl4643] } else { - yyv4669 = make([]VolumeMount, yyrl4669) + yyv4643 = make([]VolumeMount, yyrl4643) } } else { - yyv4669 = make([]VolumeMount, yyrl4669) + yyv4643 = make([]VolumeMount, yyrl4643) } - yyc4669 = true - yyrr4669 = len(yyv4669) - if yyrg4669 { - copy(yyv4669, yyv24669) + yyc4643 = true + yyrr4643 = len(yyv4643) + if yyrg4643 { + copy(yyv4643, yyv24643) } - } else if yyl4669 != len(yyv4669) { - yyv4669 = yyv4669[:yyl4669] - yyc4669 = true + } else if yyl4643 != len(yyv4643) { + yyv4643 = yyv4643[:yyl4643] + yyc4643 = true } - yyj4669 := 0 - for ; yyj4669 < yyrr4669; yyj4669++ { - yyh4669.ElemContainerState(yyj4669) + yyj4643 := 0 + for ; yyj4643 < yyrr4643; yyj4643++ { + yyh4643.ElemContainerState(yyj4643) if r.TryDecodeAsNil() { - yyv4669[yyj4669] = VolumeMount{} + yyv4643[yyj4643] = VolumeMount{} } else { - yyv4670 := &yyv4669[yyj4669] - yyv4670.CodecDecodeSelf(d) + yyv4644 := &yyv4643[yyj4643] + yyv4644.CodecDecodeSelf(d) } } - if yyrt4669 { - for ; yyj4669 < yyl4669; yyj4669++ { - yyv4669 = append(yyv4669, VolumeMount{}) - yyh4669.ElemContainerState(yyj4669) + if yyrt4643 { + for ; yyj4643 < yyl4643; yyj4643++ { + yyv4643 = append(yyv4643, VolumeMount{}) + yyh4643.ElemContainerState(yyj4643) if r.TryDecodeAsNil() { - yyv4669[yyj4669] = VolumeMount{} + yyv4643[yyj4643] = VolumeMount{} } else { - yyv4671 := &yyv4669[yyj4669] - yyv4671.CodecDecodeSelf(d) + yyv4645 := &yyv4643[yyj4643] + yyv4645.CodecDecodeSelf(d) } } } } else { - yyj4669 := 0 - for ; !r.CheckBreak(); yyj4669++ { + yyj4643 := 0 + for ; !r.CheckBreak(); yyj4643++ { - if yyj4669 >= len(yyv4669) { - yyv4669 = append(yyv4669, VolumeMount{}) // var yyz4669 VolumeMount - yyc4669 = true + if yyj4643 >= len(yyv4643) { + yyv4643 = append(yyv4643, VolumeMount{}) // var yyz4643 VolumeMount + yyc4643 = true } - yyh4669.ElemContainerState(yyj4669) - if yyj4669 < len(yyv4669) { + yyh4643.ElemContainerState(yyj4643) + if yyj4643 < len(yyv4643) { if r.TryDecodeAsNil() { - yyv4669[yyj4669] = VolumeMount{} + yyv4643[yyj4643] = VolumeMount{} } else { - yyv4672 := &yyv4669[yyj4669] - yyv4672.CodecDecodeSelf(d) + yyv4646 := &yyv4643[yyj4643] + yyv4646.CodecDecodeSelf(d) } } else { @@ -58512,17 +58213,17 @@ func (x codecSelfer1234) decSliceVolumeMount(v *[]VolumeMount, d *codec1978.Deco } } - if yyj4669 < len(yyv4669) { - yyv4669 = yyv4669[:yyj4669] - yyc4669 = true - } else if yyj4669 == 0 && yyv4669 == nil { - yyv4669 = []VolumeMount{} - yyc4669 = true + if yyj4643 < len(yyv4643) { + yyv4643 = yyv4643[:yyj4643] + yyc4643 = true + } else if yyj4643 == 0 && yyv4643 == nil { + yyv4643 = []VolumeMount{} + yyc4643 = true } } - yyh4669.End() - if yyc4669 { - *v = yyv4669 + yyh4643.End() + if yyc4643 { + *v = yyv4643 } } @@ -58531,10 +58232,10 @@ func (x codecSelfer1234) encSlicePod(v []Pod, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4673 := range v { + for _, yyv4647 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4674 := &yyv4673 - yy4674.CodecEncodeSelf(e) + yy4648 := &yyv4647 + yy4648.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58544,83 +58245,83 @@ func (x codecSelfer1234) decSlicePod(v *[]Pod, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4675 := *v - yyh4675, yyl4675 := z.DecSliceHelperStart() - var yyc4675 bool - if yyl4675 == 0 { - if yyv4675 == nil { - yyv4675 = []Pod{} - yyc4675 = true - } else if len(yyv4675) != 0 { - yyv4675 = yyv4675[:0] - yyc4675 = true + yyv4649 := *v + yyh4649, yyl4649 := z.DecSliceHelperStart() + var yyc4649 bool + if yyl4649 == 0 { + if yyv4649 == nil { + yyv4649 = []Pod{} + yyc4649 = true + } else if len(yyv4649) != 0 { + yyv4649 = yyv4649[:0] + yyc4649 = true } - } else if yyl4675 > 0 { - var yyrr4675, yyrl4675 int - var yyrt4675 bool - if yyl4675 > cap(yyv4675) { + } else if yyl4649 > 0 { + var yyrr4649, yyrl4649 int + var yyrt4649 bool + if yyl4649 > cap(yyv4649) { - yyrg4675 := len(yyv4675) > 0 - yyv24675 := yyv4675 - yyrl4675, yyrt4675 = z.DecInferLen(yyl4675, z.DecBasicHandle().MaxInitLen, 640) - if yyrt4675 { - if yyrl4675 <= cap(yyv4675) { - yyv4675 = yyv4675[:yyrl4675] + yyrg4649 := len(yyv4649) > 0 + yyv24649 := yyv4649 + yyrl4649, yyrt4649 = z.DecInferLen(yyl4649, z.DecBasicHandle().MaxInitLen, 640) + if yyrt4649 { + if yyrl4649 <= cap(yyv4649) { + yyv4649 = yyv4649[:yyrl4649] } else { - yyv4675 = make([]Pod, yyrl4675) + yyv4649 = make([]Pod, yyrl4649) } } else { - yyv4675 = make([]Pod, yyrl4675) + yyv4649 = make([]Pod, yyrl4649) } - yyc4675 = true - yyrr4675 = len(yyv4675) - if yyrg4675 { - copy(yyv4675, yyv24675) + yyc4649 = true + yyrr4649 = len(yyv4649) + if yyrg4649 { + copy(yyv4649, yyv24649) } - } else if yyl4675 != len(yyv4675) { - yyv4675 = yyv4675[:yyl4675] - yyc4675 = true + } else if yyl4649 != len(yyv4649) { + yyv4649 = yyv4649[:yyl4649] + yyc4649 = true } - yyj4675 := 0 - for ; yyj4675 < yyrr4675; yyj4675++ { - yyh4675.ElemContainerState(yyj4675) + yyj4649 := 0 + for ; yyj4649 < yyrr4649; yyj4649++ { + yyh4649.ElemContainerState(yyj4649) if r.TryDecodeAsNil() { - yyv4675[yyj4675] = Pod{} + yyv4649[yyj4649] = Pod{} } else { - yyv4676 := &yyv4675[yyj4675] - yyv4676.CodecDecodeSelf(d) + yyv4650 := &yyv4649[yyj4649] + yyv4650.CodecDecodeSelf(d) } } - if yyrt4675 { - for ; yyj4675 < yyl4675; yyj4675++ { - yyv4675 = append(yyv4675, Pod{}) - yyh4675.ElemContainerState(yyj4675) + if yyrt4649 { + for ; yyj4649 < yyl4649; yyj4649++ { + yyv4649 = append(yyv4649, Pod{}) + yyh4649.ElemContainerState(yyj4649) if r.TryDecodeAsNil() { - yyv4675[yyj4675] = Pod{} + yyv4649[yyj4649] = Pod{} } else { - yyv4677 := &yyv4675[yyj4675] - yyv4677.CodecDecodeSelf(d) + yyv4651 := &yyv4649[yyj4649] + yyv4651.CodecDecodeSelf(d) } } } } else { - yyj4675 := 0 - for ; !r.CheckBreak(); yyj4675++ { + yyj4649 := 0 + for ; !r.CheckBreak(); yyj4649++ { - if yyj4675 >= len(yyv4675) { - yyv4675 = append(yyv4675, Pod{}) // var yyz4675 Pod - yyc4675 = true + if yyj4649 >= len(yyv4649) { + yyv4649 = append(yyv4649, Pod{}) // var yyz4649 Pod + yyc4649 = true } - yyh4675.ElemContainerState(yyj4675) - if yyj4675 < len(yyv4675) { + yyh4649.ElemContainerState(yyj4649) + if yyj4649 < len(yyv4649) { if r.TryDecodeAsNil() { - yyv4675[yyj4675] = Pod{} + yyv4649[yyj4649] = Pod{} } else { - yyv4678 := &yyv4675[yyj4675] - yyv4678.CodecDecodeSelf(d) + yyv4652 := &yyv4649[yyj4649] + yyv4652.CodecDecodeSelf(d) } } else { @@ -58628,17 +58329,17 @@ func (x codecSelfer1234) decSlicePod(v *[]Pod, d *codec1978.Decoder) { } } - if yyj4675 < len(yyv4675) { - yyv4675 = yyv4675[:yyj4675] - yyc4675 = true - } else if yyj4675 == 0 && yyv4675 == nil { - yyv4675 = []Pod{} - yyc4675 = true + if yyj4649 < len(yyv4649) { + yyv4649 = yyv4649[:yyj4649] + yyc4649 = true + } else if yyj4649 == 0 && yyv4649 == nil { + yyv4649 = []Pod{} + yyc4649 = true } } - yyh4675.End() - if yyc4675 { - *v = yyv4675 + yyh4649.End() + if yyc4649 { + *v = yyv4649 } } @@ -58647,10 +58348,10 @@ func (x codecSelfer1234) encSliceNodeSelectorTerm(v []NodeSelectorTerm, e *codec z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4679 := range v { + for _, yyv4653 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4680 := &yyv4679 - yy4680.CodecEncodeSelf(e) + yy4654 := &yyv4653 + yy4654.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58660,83 +58361,83 @@ func (x codecSelfer1234) decSliceNodeSelectorTerm(v *[]NodeSelectorTerm, d *code z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4681 := *v - yyh4681, yyl4681 := z.DecSliceHelperStart() - var yyc4681 bool - if yyl4681 == 0 { - if yyv4681 == nil { - yyv4681 = []NodeSelectorTerm{} - yyc4681 = true - } else if len(yyv4681) != 0 { - yyv4681 = yyv4681[:0] - yyc4681 = true + yyv4655 := *v + yyh4655, yyl4655 := z.DecSliceHelperStart() + var yyc4655 bool + if yyl4655 == 0 { + if yyv4655 == nil { + yyv4655 = []NodeSelectorTerm{} + yyc4655 = true + } else if len(yyv4655) != 0 { + yyv4655 = yyv4655[:0] + yyc4655 = true } - } else if yyl4681 > 0 { - var yyrr4681, yyrl4681 int - var yyrt4681 bool - if yyl4681 > cap(yyv4681) { + } else if yyl4655 > 0 { + var yyrr4655, yyrl4655 int + var yyrt4655 bool + if yyl4655 > cap(yyv4655) { - yyrg4681 := len(yyv4681) > 0 - yyv24681 := yyv4681 - yyrl4681, yyrt4681 = z.DecInferLen(yyl4681, z.DecBasicHandle().MaxInitLen, 24) - if yyrt4681 { - if yyrl4681 <= cap(yyv4681) { - yyv4681 = yyv4681[:yyrl4681] + yyrg4655 := len(yyv4655) > 0 + yyv24655 := yyv4655 + yyrl4655, yyrt4655 = z.DecInferLen(yyl4655, z.DecBasicHandle().MaxInitLen, 24) + if yyrt4655 { + if yyrl4655 <= cap(yyv4655) { + yyv4655 = yyv4655[:yyrl4655] } else { - yyv4681 = make([]NodeSelectorTerm, yyrl4681) + yyv4655 = make([]NodeSelectorTerm, yyrl4655) } } else { - yyv4681 = make([]NodeSelectorTerm, yyrl4681) + yyv4655 = make([]NodeSelectorTerm, yyrl4655) } - yyc4681 = true - yyrr4681 = len(yyv4681) - if yyrg4681 { - copy(yyv4681, yyv24681) + yyc4655 = true + yyrr4655 = len(yyv4655) + if yyrg4655 { + copy(yyv4655, yyv24655) } - } else if yyl4681 != len(yyv4681) { - yyv4681 = yyv4681[:yyl4681] - yyc4681 = true + } else if yyl4655 != len(yyv4655) { + yyv4655 = yyv4655[:yyl4655] + yyc4655 = true } - yyj4681 := 0 - for ; yyj4681 < yyrr4681; yyj4681++ { - yyh4681.ElemContainerState(yyj4681) + yyj4655 := 0 + for ; yyj4655 < yyrr4655; yyj4655++ { + yyh4655.ElemContainerState(yyj4655) if r.TryDecodeAsNil() { - yyv4681[yyj4681] = NodeSelectorTerm{} + yyv4655[yyj4655] = NodeSelectorTerm{} } else { - yyv4682 := &yyv4681[yyj4681] - yyv4682.CodecDecodeSelf(d) + yyv4656 := &yyv4655[yyj4655] + yyv4656.CodecDecodeSelf(d) } } - if yyrt4681 { - for ; yyj4681 < yyl4681; yyj4681++ { - yyv4681 = append(yyv4681, NodeSelectorTerm{}) - yyh4681.ElemContainerState(yyj4681) + if yyrt4655 { + for ; yyj4655 < yyl4655; yyj4655++ { + yyv4655 = append(yyv4655, NodeSelectorTerm{}) + yyh4655.ElemContainerState(yyj4655) if r.TryDecodeAsNil() { - yyv4681[yyj4681] = NodeSelectorTerm{} + yyv4655[yyj4655] = NodeSelectorTerm{} } else { - yyv4683 := &yyv4681[yyj4681] - yyv4683.CodecDecodeSelf(d) + yyv4657 := &yyv4655[yyj4655] + yyv4657.CodecDecodeSelf(d) } } } } else { - yyj4681 := 0 - for ; !r.CheckBreak(); yyj4681++ { + yyj4655 := 0 + for ; !r.CheckBreak(); yyj4655++ { - if yyj4681 >= len(yyv4681) { - yyv4681 = append(yyv4681, NodeSelectorTerm{}) // var yyz4681 NodeSelectorTerm - yyc4681 = true + if yyj4655 >= len(yyv4655) { + yyv4655 = append(yyv4655, NodeSelectorTerm{}) // var yyz4655 NodeSelectorTerm + yyc4655 = true } - yyh4681.ElemContainerState(yyj4681) - if yyj4681 < len(yyv4681) { + yyh4655.ElemContainerState(yyj4655) + if yyj4655 < len(yyv4655) { if r.TryDecodeAsNil() { - yyv4681[yyj4681] = NodeSelectorTerm{} + yyv4655[yyj4655] = NodeSelectorTerm{} } else { - yyv4684 := &yyv4681[yyj4681] - yyv4684.CodecDecodeSelf(d) + yyv4658 := &yyv4655[yyj4655] + yyv4658.CodecDecodeSelf(d) } } else { @@ -58744,17 +58445,17 @@ func (x codecSelfer1234) decSliceNodeSelectorTerm(v *[]NodeSelectorTerm, d *code } } - if yyj4681 < len(yyv4681) { - yyv4681 = yyv4681[:yyj4681] - yyc4681 = true - } else if yyj4681 == 0 && yyv4681 == nil { - yyv4681 = []NodeSelectorTerm{} - yyc4681 = true + if yyj4655 < len(yyv4655) { + yyv4655 = yyv4655[:yyj4655] + yyc4655 = true + } else if yyj4655 == 0 && yyv4655 == nil { + yyv4655 = []NodeSelectorTerm{} + yyc4655 = true } } - yyh4681.End() - if yyc4681 { - *v = yyv4681 + yyh4655.End() + if yyc4655 { + *v = yyv4655 } } @@ -58763,10 +58464,10 @@ func (x codecSelfer1234) encSliceNodeSelectorRequirement(v []NodeSelectorRequire z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4685 := range v { + for _, yyv4659 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4686 := &yyv4685 - yy4686.CodecEncodeSelf(e) + yy4660 := &yyv4659 + yy4660.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58776,83 +58477,83 @@ func (x codecSelfer1234) decSliceNodeSelectorRequirement(v *[]NodeSelectorRequir z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4687 := *v - yyh4687, yyl4687 := z.DecSliceHelperStart() - var yyc4687 bool - if yyl4687 == 0 { - if yyv4687 == nil { - yyv4687 = []NodeSelectorRequirement{} - yyc4687 = true - } else if len(yyv4687) != 0 { - yyv4687 = yyv4687[:0] - yyc4687 = true + yyv4661 := *v + yyh4661, yyl4661 := z.DecSliceHelperStart() + var yyc4661 bool + if yyl4661 == 0 { + if yyv4661 == nil { + yyv4661 = []NodeSelectorRequirement{} + yyc4661 = true + } else if len(yyv4661) != 0 { + yyv4661 = yyv4661[:0] + yyc4661 = true } - } else if yyl4687 > 0 { - var yyrr4687, yyrl4687 int - var yyrt4687 bool - if yyl4687 > cap(yyv4687) { + } else if yyl4661 > 0 { + var yyrr4661, yyrl4661 int + var yyrt4661 bool + if yyl4661 > cap(yyv4661) { - yyrg4687 := len(yyv4687) > 0 - yyv24687 := yyv4687 - yyrl4687, yyrt4687 = z.DecInferLen(yyl4687, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4687 { - if yyrl4687 <= cap(yyv4687) { - yyv4687 = yyv4687[:yyrl4687] + yyrg4661 := len(yyv4661) > 0 + yyv24661 := yyv4661 + yyrl4661, yyrt4661 = z.DecInferLen(yyl4661, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4661 { + if yyrl4661 <= cap(yyv4661) { + yyv4661 = yyv4661[:yyrl4661] } else { - yyv4687 = make([]NodeSelectorRequirement, yyrl4687) + yyv4661 = make([]NodeSelectorRequirement, yyrl4661) } } else { - yyv4687 = make([]NodeSelectorRequirement, yyrl4687) + yyv4661 = make([]NodeSelectorRequirement, yyrl4661) } - yyc4687 = true - yyrr4687 = len(yyv4687) - if yyrg4687 { - copy(yyv4687, yyv24687) + yyc4661 = true + yyrr4661 = len(yyv4661) + if yyrg4661 { + copy(yyv4661, yyv24661) } - } else if yyl4687 != len(yyv4687) { - yyv4687 = yyv4687[:yyl4687] - yyc4687 = true + } else if yyl4661 != len(yyv4661) { + yyv4661 = yyv4661[:yyl4661] + yyc4661 = true } - yyj4687 := 0 - for ; yyj4687 < yyrr4687; yyj4687++ { - yyh4687.ElemContainerState(yyj4687) + yyj4661 := 0 + for ; yyj4661 < yyrr4661; yyj4661++ { + yyh4661.ElemContainerState(yyj4661) if r.TryDecodeAsNil() { - yyv4687[yyj4687] = NodeSelectorRequirement{} + yyv4661[yyj4661] = NodeSelectorRequirement{} } else { - yyv4688 := &yyv4687[yyj4687] - yyv4688.CodecDecodeSelf(d) + yyv4662 := &yyv4661[yyj4661] + yyv4662.CodecDecodeSelf(d) } } - if yyrt4687 { - for ; yyj4687 < yyl4687; yyj4687++ { - yyv4687 = append(yyv4687, NodeSelectorRequirement{}) - yyh4687.ElemContainerState(yyj4687) + if yyrt4661 { + for ; yyj4661 < yyl4661; yyj4661++ { + yyv4661 = append(yyv4661, NodeSelectorRequirement{}) + yyh4661.ElemContainerState(yyj4661) if r.TryDecodeAsNil() { - yyv4687[yyj4687] = NodeSelectorRequirement{} + yyv4661[yyj4661] = NodeSelectorRequirement{} } else { - yyv4689 := &yyv4687[yyj4687] - yyv4689.CodecDecodeSelf(d) + yyv4663 := &yyv4661[yyj4661] + yyv4663.CodecDecodeSelf(d) } } } } else { - yyj4687 := 0 - for ; !r.CheckBreak(); yyj4687++ { + yyj4661 := 0 + for ; !r.CheckBreak(); yyj4661++ { - if yyj4687 >= len(yyv4687) { - yyv4687 = append(yyv4687, NodeSelectorRequirement{}) // var yyz4687 NodeSelectorRequirement - yyc4687 = true + if yyj4661 >= len(yyv4661) { + yyv4661 = append(yyv4661, NodeSelectorRequirement{}) // var yyz4661 NodeSelectorRequirement + yyc4661 = true } - yyh4687.ElemContainerState(yyj4687) - if yyj4687 < len(yyv4687) { + yyh4661.ElemContainerState(yyj4661) + if yyj4661 < len(yyv4661) { if r.TryDecodeAsNil() { - yyv4687[yyj4687] = NodeSelectorRequirement{} + yyv4661[yyj4661] = NodeSelectorRequirement{} } else { - yyv4690 := &yyv4687[yyj4687] - yyv4690.CodecDecodeSelf(d) + yyv4664 := &yyv4661[yyj4661] + yyv4664.CodecDecodeSelf(d) } } else { @@ -58860,17 +58561,17 @@ func (x codecSelfer1234) decSliceNodeSelectorRequirement(v *[]NodeSelectorRequir } } - if yyj4687 < len(yyv4687) { - yyv4687 = yyv4687[:yyj4687] - yyc4687 = true - } else if yyj4687 == 0 && yyv4687 == nil { - yyv4687 = []NodeSelectorRequirement{} - yyc4687 = true + if yyj4661 < len(yyv4661) { + yyv4661 = yyv4661[:yyj4661] + yyc4661 = true + } else if yyj4661 == 0 && yyv4661 == nil { + yyv4661 = []NodeSelectorRequirement{} + yyc4661 = true } } - yyh4687.End() - if yyc4687 { - *v = yyv4687 + yyh4661.End() + if yyc4661 { + *v = yyv4661 } } @@ -58879,10 +58580,10 @@ func (x codecSelfer1234) encSlicePodAffinityTerm(v []PodAffinityTerm, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4691 := range v { + for _, yyv4665 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4692 := &yyv4691 - yy4692.CodecEncodeSelf(e) + yy4666 := &yyv4665 + yy4666.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58892,83 +58593,83 @@ func (x codecSelfer1234) decSlicePodAffinityTerm(v *[]PodAffinityTerm, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4693 := *v - yyh4693, yyl4693 := z.DecSliceHelperStart() - var yyc4693 bool - if yyl4693 == 0 { - if yyv4693 == nil { - yyv4693 = []PodAffinityTerm{} - yyc4693 = true - } else if len(yyv4693) != 0 { - yyv4693 = yyv4693[:0] - yyc4693 = true + yyv4667 := *v + yyh4667, yyl4667 := z.DecSliceHelperStart() + var yyc4667 bool + if yyl4667 == 0 { + if yyv4667 == nil { + yyv4667 = []PodAffinityTerm{} + yyc4667 = true + } else if len(yyv4667) != 0 { + yyv4667 = yyv4667[:0] + yyc4667 = true } - } else if yyl4693 > 0 { - var yyrr4693, yyrl4693 int - var yyrt4693 bool - if yyl4693 > cap(yyv4693) { + } else if yyl4667 > 0 { + var yyrr4667, yyrl4667 int + var yyrt4667 bool + if yyl4667 > cap(yyv4667) { - yyrg4693 := len(yyv4693) > 0 - yyv24693 := yyv4693 - yyrl4693, yyrt4693 = z.DecInferLen(yyl4693, z.DecBasicHandle().MaxInitLen, 48) - if yyrt4693 { - if yyrl4693 <= cap(yyv4693) { - yyv4693 = yyv4693[:yyrl4693] + yyrg4667 := len(yyv4667) > 0 + yyv24667 := yyv4667 + yyrl4667, yyrt4667 = z.DecInferLen(yyl4667, z.DecBasicHandle().MaxInitLen, 48) + if yyrt4667 { + if yyrl4667 <= cap(yyv4667) { + yyv4667 = yyv4667[:yyrl4667] } else { - yyv4693 = make([]PodAffinityTerm, yyrl4693) + yyv4667 = make([]PodAffinityTerm, yyrl4667) } } else { - yyv4693 = make([]PodAffinityTerm, yyrl4693) + yyv4667 = make([]PodAffinityTerm, yyrl4667) } - yyc4693 = true - yyrr4693 = len(yyv4693) - if yyrg4693 { - copy(yyv4693, yyv24693) + yyc4667 = true + yyrr4667 = len(yyv4667) + if yyrg4667 { + copy(yyv4667, yyv24667) } - } else if yyl4693 != len(yyv4693) { - yyv4693 = yyv4693[:yyl4693] - yyc4693 = true + } else if yyl4667 != len(yyv4667) { + yyv4667 = yyv4667[:yyl4667] + yyc4667 = true } - yyj4693 := 0 - for ; yyj4693 < yyrr4693; yyj4693++ { - yyh4693.ElemContainerState(yyj4693) + yyj4667 := 0 + for ; yyj4667 < yyrr4667; yyj4667++ { + yyh4667.ElemContainerState(yyj4667) if r.TryDecodeAsNil() { - yyv4693[yyj4693] = PodAffinityTerm{} + yyv4667[yyj4667] = PodAffinityTerm{} } else { - yyv4694 := &yyv4693[yyj4693] - yyv4694.CodecDecodeSelf(d) + yyv4668 := &yyv4667[yyj4667] + yyv4668.CodecDecodeSelf(d) } } - if yyrt4693 { - for ; yyj4693 < yyl4693; yyj4693++ { - yyv4693 = append(yyv4693, PodAffinityTerm{}) - yyh4693.ElemContainerState(yyj4693) + if yyrt4667 { + for ; yyj4667 < yyl4667; yyj4667++ { + yyv4667 = append(yyv4667, PodAffinityTerm{}) + yyh4667.ElemContainerState(yyj4667) if r.TryDecodeAsNil() { - yyv4693[yyj4693] = PodAffinityTerm{} + yyv4667[yyj4667] = PodAffinityTerm{} } else { - yyv4695 := &yyv4693[yyj4693] - yyv4695.CodecDecodeSelf(d) + yyv4669 := &yyv4667[yyj4667] + yyv4669.CodecDecodeSelf(d) } } } } else { - yyj4693 := 0 - for ; !r.CheckBreak(); yyj4693++ { + yyj4667 := 0 + for ; !r.CheckBreak(); yyj4667++ { - if yyj4693 >= len(yyv4693) { - yyv4693 = append(yyv4693, PodAffinityTerm{}) // var yyz4693 PodAffinityTerm - yyc4693 = true + if yyj4667 >= len(yyv4667) { + yyv4667 = append(yyv4667, PodAffinityTerm{}) // var yyz4667 PodAffinityTerm + yyc4667 = true } - yyh4693.ElemContainerState(yyj4693) - if yyj4693 < len(yyv4693) { + yyh4667.ElemContainerState(yyj4667) + if yyj4667 < len(yyv4667) { if r.TryDecodeAsNil() { - yyv4693[yyj4693] = PodAffinityTerm{} + yyv4667[yyj4667] = PodAffinityTerm{} } else { - yyv4696 := &yyv4693[yyj4693] - yyv4696.CodecDecodeSelf(d) + yyv4670 := &yyv4667[yyj4667] + yyv4670.CodecDecodeSelf(d) } } else { @@ -58976,17 +58677,17 @@ func (x codecSelfer1234) decSlicePodAffinityTerm(v *[]PodAffinityTerm, d *codec1 } } - if yyj4693 < len(yyv4693) { - yyv4693 = yyv4693[:yyj4693] - yyc4693 = true - } else if yyj4693 == 0 && yyv4693 == nil { - yyv4693 = []PodAffinityTerm{} - yyc4693 = true + if yyj4667 < len(yyv4667) { + yyv4667 = yyv4667[:yyj4667] + yyc4667 = true + } else if yyj4667 == 0 && yyv4667 == nil { + yyv4667 = []PodAffinityTerm{} + yyc4667 = true } } - yyh4693.End() - if yyc4693 { - *v = yyv4693 + yyh4667.End() + if yyc4667 { + *v = yyv4667 } } @@ -58995,10 +58696,10 @@ func (x codecSelfer1234) encSliceWeightedPodAffinityTerm(v []WeightedPodAffinity z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4697 := range v { + for _, yyv4671 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4698 := &yyv4697 - yy4698.CodecEncodeSelf(e) + yy4672 := &yyv4671 + yy4672.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59008,83 +58709,83 @@ func (x codecSelfer1234) decSliceWeightedPodAffinityTerm(v *[]WeightedPodAffinit z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4699 := *v - yyh4699, yyl4699 := z.DecSliceHelperStart() - var yyc4699 bool - if yyl4699 == 0 { - if yyv4699 == nil { - yyv4699 = []WeightedPodAffinityTerm{} - yyc4699 = true - } else if len(yyv4699) != 0 { - yyv4699 = yyv4699[:0] - yyc4699 = true + yyv4673 := *v + yyh4673, yyl4673 := z.DecSliceHelperStart() + var yyc4673 bool + if yyl4673 == 0 { + if yyv4673 == nil { + yyv4673 = []WeightedPodAffinityTerm{} + yyc4673 = true + } else if len(yyv4673) != 0 { + yyv4673 = yyv4673[:0] + yyc4673 = true } - } else if yyl4699 > 0 { - var yyrr4699, yyrl4699 int - var yyrt4699 bool - if yyl4699 > cap(yyv4699) { + } else if yyl4673 > 0 { + var yyrr4673, yyrl4673 int + var yyrt4673 bool + if yyl4673 > cap(yyv4673) { - yyrg4699 := len(yyv4699) > 0 - yyv24699 := yyv4699 - yyrl4699, yyrt4699 = z.DecInferLen(yyl4699, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4699 { - if yyrl4699 <= cap(yyv4699) { - yyv4699 = yyv4699[:yyrl4699] + yyrg4673 := len(yyv4673) > 0 + yyv24673 := yyv4673 + yyrl4673, yyrt4673 = z.DecInferLen(yyl4673, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4673 { + if yyrl4673 <= cap(yyv4673) { + yyv4673 = yyv4673[:yyrl4673] } else { - yyv4699 = make([]WeightedPodAffinityTerm, yyrl4699) + yyv4673 = make([]WeightedPodAffinityTerm, yyrl4673) } } else { - yyv4699 = make([]WeightedPodAffinityTerm, yyrl4699) + yyv4673 = make([]WeightedPodAffinityTerm, yyrl4673) } - yyc4699 = true - yyrr4699 = len(yyv4699) - if yyrg4699 { - copy(yyv4699, yyv24699) + yyc4673 = true + yyrr4673 = len(yyv4673) + if yyrg4673 { + copy(yyv4673, yyv24673) } - } else if yyl4699 != len(yyv4699) { - yyv4699 = yyv4699[:yyl4699] - yyc4699 = true + } else if yyl4673 != len(yyv4673) { + yyv4673 = yyv4673[:yyl4673] + yyc4673 = true } - yyj4699 := 0 - for ; yyj4699 < yyrr4699; yyj4699++ { - yyh4699.ElemContainerState(yyj4699) + yyj4673 := 0 + for ; yyj4673 < yyrr4673; yyj4673++ { + yyh4673.ElemContainerState(yyj4673) if r.TryDecodeAsNil() { - yyv4699[yyj4699] = WeightedPodAffinityTerm{} + yyv4673[yyj4673] = WeightedPodAffinityTerm{} } else { - yyv4700 := &yyv4699[yyj4699] - yyv4700.CodecDecodeSelf(d) + yyv4674 := &yyv4673[yyj4673] + yyv4674.CodecDecodeSelf(d) } } - if yyrt4699 { - for ; yyj4699 < yyl4699; yyj4699++ { - yyv4699 = append(yyv4699, WeightedPodAffinityTerm{}) - yyh4699.ElemContainerState(yyj4699) + if yyrt4673 { + for ; yyj4673 < yyl4673; yyj4673++ { + yyv4673 = append(yyv4673, WeightedPodAffinityTerm{}) + yyh4673.ElemContainerState(yyj4673) if r.TryDecodeAsNil() { - yyv4699[yyj4699] = WeightedPodAffinityTerm{} + yyv4673[yyj4673] = WeightedPodAffinityTerm{} } else { - yyv4701 := &yyv4699[yyj4699] - yyv4701.CodecDecodeSelf(d) + yyv4675 := &yyv4673[yyj4673] + yyv4675.CodecDecodeSelf(d) } } } } else { - yyj4699 := 0 - for ; !r.CheckBreak(); yyj4699++ { + yyj4673 := 0 + for ; !r.CheckBreak(); yyj4673++ { - if yyj4699 >= len(yyv4699) { - yyv4699 = append(yyv4699, WeightedPodAffinityTerm{}) // var yyz4699 WeightedPodAffinityTerm - yyc4699 = true + if yyj4673 >= len(yyv4673) { + yyv4673 = append(yyv4673, WeightedPodAffinityTerm{}) // var yyz4673 WeightedPodAffinityTerm + yyc4673 = true } - yyh4699.ElemContainerState(yyj4699) - if yyj4699 < len(yyv4699) { + yyh4673.ElemContainerState(yyj4673) + if yyj4673 < len(yyv4673) { if r.TryDecodeAsNil() { - yyv4699[yyj4699] = WeightedPodAffinityTerm{} + yyv4673[yyj4673] = WeightedPodAffinityTerm{} } else { - yyv4702 := &yyv4699[yyj4699] - yyv4702.CodecDecodeSelf(d) + yyv4676 := &yyv4673[yyj4673] + yyv4676.CodecDecodeSelf(d) } } else { @@ -59092,17 +58793,17 @@ func (x codecSelfer1234) decSliceWeightedPodAffinityTerm(v *[]WeightedPodAffinit } } - if yyj4699 < len(yyv4699) { - yyv4699 = yyv4699[:yyj4699] - yyc4699 = true - } else if yyj4699 == 0 && yyv4699 == nil { - yyv4699 = []WeightedPodAffinityTerm{} - yyc4699 = true + if yyj4673 < len(yyv4673) { + yyv4673 = yyv4673[:yyj4673] + yyc4673 = true + } else if yyj4673 == 0 && yyv4673 == nil { + yyv4673 = []WeightedPodAffinityTerm{} + yyc4673 = true } } - yyh4699.End() - if yyc4699 { - *v = yyv4699 + yyh4673.End() + if yyc4673 { + *v = yyv4673 } } @@ -59111,10 +58812,10 @@ func (x codecSelfer1234) encSlicePreferredSchedulingTerm(v []PreferredScheduling z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4703 := range v { + for _, yyv4677 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4704 := &yyv4703 - yy4704.CodecEncodeSelf(e) + yy4678 := &yyv4677 + yy4678.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59124,83 +58825,83 @@ func (x codecSelfer1234) decSlicePreferredSchedulingTerm(v *[]PreferredSchedulin z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4705 := *v - yyh4705, yyl4705 := z.DecSliceHelperStart() - var yyc4705 bool - if yyl4705 == 0 { - if yyv4705 == nil { - yyv4705 = []PreferredSchedulingTerm{} - yyc4705 = true - } else if len(yyv4705) != 0 { - yyv4705 = yyv4705[:0] - yyc4705 = true + yyv4679 := *v + yyh4679, yyl4679 := z.DecSliceHelperStart() + var yyc4679 bool + if yyl4679 == 0 { + if yyv4679 == nil { + yyv4679 = []PreferredSchedulingTerm{} + yyc4679 = true + } else if len(yyv4679) != 0 { + yyv4679 = yyv4679[:0] + yyc4679 = true } - } else if yyl4705 > 0 { - var yyrr4705, yyrl4705 int - var yyrt4705 bool - if yyl4705 > cap(yyv4705) { + } else if yyl4679 > 0 { + var yyrr4679, yyrl4679 int + var yyrt4679 bool + if yyl4679 > cap(yyv4679) { - yyrg4705 := len(yyv4705) > 0 - yyv24705 := yyv4705 - yyrl4705, yyrt4705 = z.DecInferLen(yyl4705, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4705 { - if yyrl4705 <= cap(yyv4705) { - yyv4705 = yyv4705[:yyrl4705] + yyrg4679 := len(yyv4679) > 0 + yyv24679 := yyv4679 + yyrl4679, yyrt4679 = z.DecInferLen(yyl4679, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4679 { + if yyrl4679 <= cap(yyv4679) { + yyv4679 = yyv4679[:yyrl4679] } else { - yyv4705 = make([]PreferredSchedulingTerm, yyrl4705) + yyv4679 = make([]PreferredSchedulingTerm, yyrl4679) } } else { - yyv4705 = make([]PreferredSchedulingTerm, yyrl4705) + yyv4679 = make([]PreferredSchedulingTerm, yyrl4679) } - yyc4705 = true - yyrr4705 = len(yyv4705) - if yyrg4705 { - copy(yyv4705, yyv24705) + yyc4679 = true + yyrr4679 = len(yyv4679) + if yyrg4679 { + copy(yyv4679, yyv24679) } - } else if yyl4705 != len(yyv4705) { - yyv4705 = yyv4705[:yyl4705] - yyc4705 = true + } else if yyl4679 != len(yyv4679) { + yyv4679 = yyv4679[:yyl4679] + yyc4679 = true } - yyj4705 := 0 - for ; yyj4705 < yyrr4705; yyj4705++ { - yyh4705.ElemContainerState(yyj4705) + yyj4679 := 0 + for ; yyj4679 < yyrr4679; yyj4679++ { + yyh4679.ElemContainerState(yyj4679) if r.TryDecodeAsNil() { - yyv4705[yyj4705] = PreferredSchedulingTerm{} + yyv4679[yyj4679] = PreferredSchedulingTerm{} } else { - yyv4706 := &yyv4705[yyj4705] - yyv4706.CodecDecodeSelf(d) + yyv4680 := &yyv4679[yyj4679] + yyv4680.CodecDecodeSelf(d) } } - if yyrt4705 { - for ; yyj4705 < yyl4705; yyj4705++ { - yyv4705 = append(yyv4705, PreferredSchedulingTerm{}) - yyh4705.ElemContainerState(yyj4705) + if yyrt4679 { + for ; yyj4679 < yyl4679; yyj4679++ { + yyv4679 = append(yyv4679, PreferredSchedulingTerm{}) + yyh4679.ElemContainerState(yyj4679) if r.TryDecodeAsNil() { - yyv4705[yyj4705] = PreferredSchedulingTerm{} + yyv4679[yyj4679] = PreferredSchedulingTerm{} } else { - yyv4707 := &yyv4705[yyj4705] - yyv4707.CodecDecodeSelf(d) + yyv4681 := &yyv4679[yyj4679] + yyv4681.CodecDecodeSelf(d) } } } } else { - yyj4705 := 0 - for ; !r.CheckBreak(); yyj4705++ { + yyj4679 := 0 + for ; !r.CheckBreak(); yyj4679++ { - if yyj4705 >= len(yyv4705) { - yyv4705 = append(yyv4705, PreferredSchedulingTerm{}) // var yyz4705 PreferredSchedulingTerm - yyc4705 = true + if yyj4679 >= len(yyv4679) { + yyv4679 = append(yyv4679, PreferredSchedulingTerm{}) // var yyz4679 PreferredSchedulingTerm + yyc4679 = true } - yyh4705.ElemContainerState(yyj4705) - if yyj4705 < len(yyv4705) { + yyh4679.ElemContainerState(yyj4679) + if yyj4679 < len(yyv4679) { if r.TryDecodeAsNil() { - yyv4705[yyj4705] = PreferredSchedulingTerm{} + yyv4679[yyj4679] = PreferredSchedulingTerm{} } else { - yyv4708 := &yyv4705[yyj4705] - yyv4708.CodecDecodeSelf(d) + yyv4682 := &yyv4679[yyj4679] + yyv4682.CodecDecodeSelf(d) } } else { @@ -59208,17 +58909,17 @@ func (x codecSelfer1234) decSlicePreferredSchedulingTerm(v *[]PreferredSchedulin } } - if yyj4705 < len(yyv4705) { - yyv4705 = yyv4705[:yyj4705] - yyc4705 = true - } else if yyj4705 == 0 && yyv4705 == nil { - yyv4705 = []PreferredSchedulingTerm{} - yyc4705 = true + if yyj4679 < len(yyv4679) { + yyv4679 = yyv4679[:yyj4679] + yyc4679 = true + } else if yyj4679 == 0 && yyv4679 == nil { + yyv4679 = []PreferredSchedulingTerm{} + yyc4679 = true } } - yyh4705.End() - if yyc4705 { - *v = yyv4705 + yyh4679.End() + if yyc4679 { + *v = yyv4679 } } @@ -59227,10 +58928,10 @@ func (x codecSelfer1234) encSliceVolume(v []Volume, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4709 := range v { + for _, yyv4683 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4710 := &yyv4709 - yy4710.CodecEncodeSelf(e) + yy4684 := &yyv4683 + yy4684.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59240,83 +58941,83 @@ func (x codecSelfer1234) decSliceVolume(v *[]Volume, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4711 := *v - yyh4711, yyl4711 := z.DecSliceHelperStart() - var yyc4711 bool - if yyl4711 == 0 { - if yyv4711 == nil { - yyv4711 = []Volume{} - yyc4711 = true - } else if len(yyv4711) != 0 { - yyv4711 = yyv4711[:0] - yyc4711 = true + yyv4685 := *v + yyh4685, yyl4685 := z.DecSliceHelperStart() + var yyc4685 bool + if yyl4685 == 0 { + if yyv4685 == nil { + yyv4685 = []Volume{} + yyc4685 = true + } else if len(yyv4685) != 0 { + yyv4685 = yyv4685[:0] + yyc4685 = true } - } else if yyl4711 > 0 { - var yyrr4711, yyrl4711 int - var yyrt4711 bool - if yyl4711 > cap(yyv4711) { + } else if yyl4685 > 0 { + var yyrr4685, yyrl4685 int + var yyrt4685 bool + if yyl4685 > cap(yyv4685) { - yyrg4711 := len(yyv4711) > 0 - yyv24711 := yyv4711 - yyrl4711, yyrt4711 = z.DecInferLen(yyl4711, z.DecBasicHandle().MaxInitLen, 200) - if yyrt4711 { - if yyrl4711 <= cap(yyv4711) { - yyv4711 = yyv4711[:yyrl4711] + yyrg4685 := len(yyv4685) > 0 + yyv24685 := yyv4685 + yyrl4685, yyrt4685 = z.DecInferLen(yyl4685, z.DecBasicHandle().MaxInitLen, 200) + if yyrt4685 { + if yyrl4685 <= cap(yyv4685) { + yyv4685 = yyv4685[:yyrl4685] } else { - yyv4711 = make([]Volume, yyrl4711) + yyv4685 = make([]Volume, yyrl4685) } } else { - yyv4711 = make([]Volume, yyrl4711) + yyv4685 = make([]Volume, yyrl4685) } - yyc4711 = true - yyrr4711 = len(yyv4711) - if yyrg4711 { - copy(yyv4711, yyv24711) + yyc4685 = true + yyrr4685 = len(yyv4685) + if yyrg4685 { + copy(yyv4685, yyv24685) } - } else if yyl4711 != len(yyv4711) { - yyv4711 = yyv4711[:yyl4711] - yyc4711 = true + } else if yyl4685 != len(yyv4685) { + yyv4685 = yyv4685[:yyl4685] + yyc4685 = true } - yyj4711 := 0 - for ; yyj4711 < yyrr4711; yyj4711++ { - yyh4711.ElemContainerState(yyj4711) + yyj4685 := 0 + for ; yyj4685 < yyrr4685; yyj4685++ { + yyh4685.ElemContainerState(yyj4685) if r.TryDecodeAsNil() { - yyv4711[yyj4711] = Volume{} + yyv4685[yyj4685] = Volume{} } else { - yyv4712 := &yyv4711[yyj4711] - yyv4712.CodecDecodeSelf(d) + yyv4686 := &yyv4685[yyj4685] + yyv4686.CodecDecodeSelf(d) } } - if yyrt4711 { - for ; yyj4711 < yyl4711; yyj4711++ { - yyv4711 = append(yyv4711, Volume{}) - yyh4711.ElemContainerState(yyj4711) + if yyrt4685 { + for ; yyj4685 < yyl4685; yyj4685++ { + yyv4685 = append(yyv4685, Volume{}) + yyh4685.ElemContainerState(yyj4685) if r.TryDecodeAsNil() { - yyv4711[yyj4711] = Volume{} + yyv4685[yyj4685] = Volume{} } else { - yyv4713 := &yyv4711[yyj4711] - yyv4713.CodecDecodeSelf(d) + yyv4687 := &yyv4685[yyj4685] + yyv4687.CodecDecodeSelf(d) } } } } else { - yyj4711 := 0 - for ; !r.CheckBreak(); yyj4711++ { + yyj4685 := 0 + for ; !r.CheckBreak(); yyj4685++ { - if yyj4711 >= len(yyv4711) { - yyv4711 = append(yyv4711, Volume{}) // var yyz4711 Volume - yyc4711 = true + if yyj4685 >= len(yyv4685) { + yyv4685 = append(yyv4685, Volume{}) // var yyz4685 Volume + yyc4685 = true } - yyh4711.ElemContainerState(yyj4711) - if yyj4711 < len(yyv4711) { + yyh4685.ElemContainerState(yyj4685) + if yyj4685 < len(yyv4685) { if r.TryDecodeAsNil() { - yyv4711[yyj4711] = Volume{} + yyv4685[yyj4685] = Volume{} } else { - yyv4714 := &yyv4711[yyj4711] - yyv4714.CodecDecodeSelf(d) + yyv4688 := &yyv4685[yyj4685] + yyv4688.CodecDecodeSelf(d) } } else { @@ -59324,17 +59025,17 @@ func (x codecSelfer1234) decSliceVolume(v *[]Volume, d *codec1978.Decoder) { } } - if yyj4711 < len(yyv4711) { - yyv4711 = yyv4711[:yyj4711] - yyc4711 = true - } else if yyj4711 == 0 && yyv4711 == nil { - yyv4711 = []Volume{} - yyc4711 = true + if yyj4685 < len(yyv4685) { + yyv4685 = yyv4685[:yyj4685] + yyc4685 = true + } else if yyj4685 == 0 && yyv4685 == nil { + yyv4685 = []Volume{} + yyc4685 = true } } - yyh4711.End() - if yyc4711 { - *v = yyv4711 + yyh4685.End() + if yyc4685 { + *v = yyv4685 } } @@ -59343,10 +59044,10 @@ func (x codecSelfer1234) encSliceContainer(v []Container, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4715 := range v { + for _, yyv4689 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4716 := &yyv4715 - yy4716.CodecEncodeSelf(e) + yy4690 := &yyv4689 + yy4690.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59356,83 +59057,83 @@ func (x codecSelfer1234) decSliceContainer(v *[]Container, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4717 := *v - yyh4717, yyl4717 := z.DecSliceHelperStart() - var yyc4717 bool - if yyl4717 == 0 { - if yyv4717 == nil { - yyv4717 = []Container{} - yyc4717 = true - } else if len(yyv4717) != 0 { - yyv4717 = yyv4717[:0] - yyc4717 = true + yyv4691 := *v + yyh4691, yyl4691 := z.DecSliceHelperStart() + var yyc4691 bool + if yyl4691 == 0 { + if yyv4691 == nil { + yyv4691 = []Container{} + yyc4691 = true + } else if len(yyv4691) != 0 { + yyv4691 = yyv4691[:0] + yyc4691 = true } - } else if yyl4717 > 0 { - var yyrr4717, yyrl4717 int - var yyrt4717 bool - if yyl4717 > cap(yyv4717) { + } else if yyl4691 > 0 { + var yyrr4691, yyrl4691 int + var yyrt4691 bool + if yyl4691 > cap(yyv4691) { - yyrg4717 := len(yyv4717) > 0 - yyv24717 := yyv4717 - yyrl4717, yyrt4717 = z.DecInferLen(yyl4717, z.DecBasicHandle().MaxInitLen, 256) - if yyrt4717 { - if yyrl4717 <= cap(yyv4717) { - yyv4717 = yyv4717[:yyrl4717] + yyrg4691 := len(yyv4691) > 0 + yyv24691 := yyv4691 + yyrl4691, yyrt4691 = z.DecInferLen(yyl4691, z.DecBasicHandle().MaxInitLen, 256) + if yyrt4691 { + if yyrl4691 <= cap(yyv4691) { + yyv4691 = yyv4691[:yyrl4691] } else { - yyv4717 = make([]Container, yyrl4717) + yyv4691 = make([]Container, yyrl4691) } } else { - yyv4717 = make([]Container, yyrl4717) + yyv4691 = make([]Container, yyrl4691) } - yyc4717 = true - yyrr4717 = len(yyv4717) - if yyrg4717 { - copy(yyv4717, yyv24717) + yyc4691 = true + yyrr4691 = len(yyv4691) + if yyrg4691 { + copy(yyv4691, yyv24691) } - } else if yyl4717 != len(yyv4717) { - yyv4717 = yyv4717[:yyl4717] - yyc4717 = true + } else if yyl4691 != len(yyv4691) { + yyv4691 = yyv4691[:yyl4691] + yyc4691 = true } - yyj4717 := 0 - for ; yyj4717 < yyrr4717; yyj4717++ { - yyh4717.ElemContainerState(yyj4717) + yyj4691 := 0 + for ; yyj4691 < yyrr4691; yyj4691++ { + yyh4691.ElemContainerState(yyj4691) if r.TryDecodeAsNil() { - yyv4717[yyj4717] = Container{} + yyv4691[yyj4691] = Container{} } else { - yyv4718 := &yyv4717[yyj4717] - yyv4718.CodecDecodeSelf(d) + yyv4692 := &yyv4691[yyj4691] + yyv4692.CodecDecodeSelf(d) } } - if yyrt4717 { - for ; yyj4717 < yyl4717; yyj4717++ { - yyv4717 = append(yyv4717, Container{}) - yyh4717.ElemContainerState(yyj4717) + if yyrt4691 { + for ; yyj4691 < yyl4691; yyj4691++ { + yyv4691 = append(yyv4691, Container{}) + yyh4691.ElemContainerState(yyj4691) if r.TryDecodeAsNil() { - yyv4717[yyj4717] = Container{} + yyv4691[yyj4691] = Container{} } else { - yyv4719 := &yyv4717[yyj4717] - yyv4719.CodecDecodeSelf(d) + yyv4693 := &yyv4691[yyj4691] + yyv4693.CodecDecodeSelf(d) } } } } else { - yyj4717 := 0 - for ; !r.CheckBreak(); yyj4717++ { + yyj4691 := 0 + for ; !r.CheckBreak(); yyj4691++ { - if yyj4717 >= len(yyv4717) { - yyv4717 = append(yyv4717, Container{}) // var yyz4717 Container - yyc4717 = true + if yyj4691 >= len(yyv4691) { + yyv4691 = append(yyv4691, Container{}) // var yyz4691 Container + yyc4691 = true } - yyh4717.ElemContainerState(yyj4717) - if yyj4717 < len(yyv4717) { + yyh4691.ElemContainerState(yyj4691) + if yyj4691 < len(yyv4691) { if r.TryDecodeAsNil() { - yyv4717[yyj4717] = Container{} + yyv4691[yyj4691] = Container{} } else { - yyv4720 := &yyv4717[yyj4717] - yyv4720.CodecDecodeSelf(d) + yyv4694 := &yyv4691[yyj4691] + yyv4694.CodecDecodeSelf(d) } } else { @@ -59440,17 +59141,17 @@ func (x codecSelfer1234) decSliceContainer(v *[]Container, d *codec1978.Decoder) } } - if yyj4717 < len(yyv4717) { - yyv4717 = yyv4717[:yyj4717] - yyc4717 = true - } else if yyj4717 == 0 && yyv4717 == nil { - yyv4717 = []Container{} - yyc4717 = true + if yyj4691 < len(yyv4691) { + yyv4691 = yyv4691[:yyj4691] + yyc4691 = true + } else if yyj4691 == 0 && yyv4691 == nil { + yyv4691 = []Container{} + yyc4691 = true } } - yyh4717.End() - if yyc4717 { - *v = yyv4717 + yyh4691.End() + if yyc4691 { + *v = yyv4691 } } @@ -59459,10 +59160,10 @@ func (x codecSelfer1234) encSliceLocalObjectReference(v []LocalObjectReference, z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4721 := range v { + for _, yyv4695 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4722 := &yyv4721 - yy4722.CodecEncodeSelf(e) + yy4696 := &yyv4695 + yy4696.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59472,83 +59173,83 @@ func (x codecSelfer1234) decSliceLocalObjectReference(v *[]LocalObjectReference, z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4723 := *v - yyh4723, yyl4723 := z.DecSliceHelperStart() - var yyc4723 bool - if yyl4723 == 0 { - if yyv4723 == nil { - yyv4723 = []LocalObjectReference{} - yyc4723 = true - } else if len(yyv4723) != 0 { - yyv4723 = yyv4723[:0] - yyc4723 = true + yyv4697 := *v + yyh4697, yyl4697 := z.DecSliceHelperStart() + var yyc4697 bool + if yyl4697 == 0 { + if yyv4697 == nil { + yyv4697 = []LocalObjectReference{} + yyc4697 = true + } else if len(yyv4697) != 0 { + yyv4697 = yyv4697[:0] + yyc4697 = true } - } else if yyl4723 > 0 { - var yyrr4723, yyrl4723 int - var yyrt4723 bool - if yyl4723 > cap(yyv4723) { + } else if yyl4697 > 0 { + var yyrr4697, yyrl4697 int + var yyrt4697 bool + if yyl4697 > cap(yyv4697) { - yyrg4723 := len(yyv4723) > 0 - yyv24723 := yyv4723 - yyrl4723, yyrt4723 = z.DecInferLen(yyl4723, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4723 { - if yyrl4723 <= cap(yyv4723) { - yyv4723 = yyv4723[:yyrl4723] + yyrg4697 := len(yyv4697) > 0 + yyv24697 := yyv4697 + yyrl4697, yyrt4697 = z.DecInferLen(yyl4697, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4697 { + if yyrl4697 <= cap(yyv4697) { + yyv4697 = yyv4697[:yyrl4697] } else { - yyv4723 = make([]LocalObjectReference, yyrl4723) + yyv4697 = make([]LocalObjectReference, yyrl4697) } } else { - yyv4723 = make([]LocalObjectReference, yyrl4723) + yyv4697 = make([]LocalObjectReference, yyrl4697) } - yyc4723 = true - yyrr4723 = len(yyv4723) - if yyrg4723 { - copy(yyv4723, yyv24723) + yyc4697 = true + yyrr4697 = len(yyv4697) + if yyrg4697 { + copy(yyv4697, yyv24697) } - } else if yyl4723 != len(yyv4723) { - yyv4723 = yyv4723[:yyl4723] - yyc4723 = true + } else if yyl4697 != len(yyv4697) { + yyv4697 = yyv4697[:yyl4697] + yyc4697 = true } - yyj4723 := 0 - for ; yyj4723 < yyrr4723; yyj4723++ { - yyh4723.ElemContainerState(yyj4723) + yyj4697 := 0 + for ; yyj4697 < yyrr4697; yyj4697++ { + yyh4697.ElemContainerState(yyj4697) if r.TryDecodeAsNil() { - yyv4723[yyj4723] = LocalObjectReference{} + yyv4697[yyj4697] = LocalObjectReference{} } else { - yyv4724 := &yyv4723[yyj4723] - yyv4724.CodecDecodeSelf(d) + yyv4698 := &yyv4697[yyj4697] + yyv4698.CodecDecodeSelf(d) } } - if yyrt4723 { - for ; yyj4723 < yyl4723; yyj4723++ { - yyv4723 = append(yyv4723, LocalObjectReference{}) - yyh4723.ElemContainerState(yyj4723) + if yyrt4697 { + for ; yyj4697 < yyl4697; yyj4697++ { + yyv4697 = append(yyv4697, LocalObjectReference{}) + yyh4697.ElemContainerState(yyj4697) if r.TryDecodeAsNil() { - yyv4723[yyj4723] = LocalObjectReference{} + yyv4697[yyj4697] = LocalObjectReference{} } else { - yyv4725 := &yyv4723[yyj4723] - yyv4725.CodecDecodeSelf(d) + yyv4699 := &yyv4697[yyj4697] + yyv4699.CodecDecodeSelf(d) } } } } else { - yyj4723 := 0 - for ; !r.CheckBreak(); yyj4723++ { + yyj4697 := 0 + for ; !r.CheckBreak(); yyj4697++ { - if yyj4723 >= len(yyv4723) { - yyv4723 = append(yyv4723, LocalObjectReference{}) // var yyz4723 LocalObjectReference - yyc4723 = true + if yyj4697 >= len(yyv4697) { + yyv4697 = append(yyv4697, LocalObjectReference{}) // var yyz4697 LocalObjectReference + yyc4697 = true } - yyh4723.ElemContainerState(yyj4723) - if yyj4723 < len(yyv4723) { + yyh4697.ElemContainerState(yyj4697) + if yyj4697 < len(yyv4697) { if r.TryDecodeAsNil() { - yyv4723[yyj4723] = LocalObjectReference{} + yyv4697[yyj4697] = LocalObjectReference{} } else { - yyv4726 := &yyv4723[yyj4723] - yyv4726.CodecDecodeSelf(d) + yyv4700 := &yyv4697[yyj4697] + yyv4700.CodecDecodeSelf(d) } } else { @@ -59556,17 +59257,17 @@ func (x codecSelfer1234) decSliceLocalObjectReference(v *[]LocalObjectReference, } } - if yyj4723 < len(yyv4723) { - yyv4723 = yyv4723[:yyj4723] - yyc4723 = true - } else if yyj4723 == 0 && yyv4723 == nil { - yyv4723 = []LocalObjectReference{} - yyc4723 = true + if yyj4697 < len(yyv4697) { + yyv4697 = yyv4697[:yyj4697] + yyc4697 = true + } else if yyj4697 == 0 && yyv4697 == nil { + yyv4697 = []LocalObjectReference{} + yyc4697 = true } } - yyh4723.End() - if yyc4723 { - *v = yyv4723 + yyh4697.End() + if yyc4697 { + *v = yyv4697 } } @@ -59575,10 +59276,10 @@ func (x codecSelfer1234) encSlicePodCondition(v []PodCondition, e *codec1978.Enc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4727 := range v { + for _, yyv4701 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4728 := &yyv4727 - yy4728.CodecEncodeSelf(e) + yy4702 := &yyv4701 + yy4702.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59588,83 +59289,83 @@ func (x codecSelfer1234) decSlicePodCondition(v *[]PodCondition, d *codec1978.De z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4729 := *v - yyh4729, yyl4729 := z.DecSliceHelperStart() - var yyc4729 bool - if yyl4729 == 0 { - if yyv4729 == nil { - yyv4729 = []PodCondition{} - yyc4729 = true - } else if len(yyv4729) != 0 { - yyv4729 = yyv4729[:0] - yyc4729 = true + yyv4703 := *v + yyh4703, yyl4703 := z.DecSliceHelperStart() + var yyc4703 bool + if yyl4703 == 0 { + if yyv4703 == nil { + yyv4703 = []PodCondition{} + yyc4703 = true + } else if len(yyv4703) != 0 { + yyv4703 = yyv4703[:0] + yyc4703 = true } - } else if yyl4729 > 0 { - var yyrr4729, yyrl4729 int - var yyrt4729 bool - if yyl4729 > cap(yyv4729) { + } else if yyl4703 > 0 { + var yyrr4703, yyrl4703 int + var yyrt4703 bool + if yyl4703 > cap(yyv4703) { - yyrg4729 := len(yyv4729) > 0 - yyv24729 := yyv4729 - yyrl4729, yyrt4729 = z.DecInferLen(yyl4729, z.DecBasicHandle().MaxInitLen, 112) - if yyrt4729 { - if yyrl4729 <= cap(yyv4729) { - yyv4729 = yyv4729[:yyrl4729] + yyrg4703 := len(yyv4703) > 0 + yyv24703 := yyv4703 + yyrl4703, yyrt4703 = z.DecInferLen(yyl4703, z.DecBasicHandle().MaxInitLen, 112) + if yyrt4703 { + if yyrl4703 <= cap(yyv4703) { + yyv4703 = yyv4703[:yyrl4703] } else { - yyv4729 = make([]PodCondition, yyrl4729) + yyv4703 = make([]PodCondition, yyrl4703) } } else { - yyv4729 = make([]PodCondition, yyrl4729) + yyv4703 = make([]PodCondition, yyrl4703) } - yyc4729 = true - yyrr4729 = len(yyv4729) - if yyrg4729 { - copy(yyv4729, yyv24729) + yyc4703 = true + yyrr4703 = len(yyv4703) + if yyrg4703 { + copy(yyv4703, yyv24703) } - } else if yyl4729 != len(yyv4729) { - yyv4729 = yyv4729[:yyl4729] - yyc4729 = true + } else if yyl4703 != len(yyv4703) { + yyv4703 = yyv4703[:yyl4703] + yyc4703 = true } - yyj4729 := 0 - for ; yyj4729 < yyrr4729; yyj4729++ { - yyh4729.ElemContainerState(yyj4729) + yyj4703 := 0 + for ; yyj4703 < yyrr4703; yyj4703++ { + yyh4703.ElemContainerState(yyj4703) if r.TryDecodeAsNil() { - yyv4729[yyj4729] = PodCondition{} + yyv4703[yyj4703] = PodCondition{} } else { - yyv4730 := &yyv4729[yyj4729] - yyv4730.CodecDecodeSelf(d) + yyv4704 := &yyv4703[yyj4703] + yyv4704.CodecDecodeSelf(d) } } - if yyrt4729 { - for ; yyj4729 < yyl4729; yyj4729++ { - yyv4729 = append(yyv4729, PodCondition{}) - yyh4729.ElemContainerState(yyj4729) + if yyrt4703 { + for ; yyj4703 < yyl4703; yyj4703++ { + yyv4703 = append(yyv4703, PodCondition{}) + yyh4703.ElemContainerState(yyj4703) if r.TryDecodeAsNil() { - yyv4729[yyj4729] = PodCondition{} + yyv4703[yyj4703] = PodCondition{} } else { - yyv4731 := &yyv4729[yyj4729] - yyv4731.CodecDecodeSelf(d) + yyv4705 := &yyv4703[yyj4703] + yyv4705.CodecDecodeSelf(d) } } } } else { - yyj4729 := 0 - for ; !r.CheckBreak(); yyj4729++ { + yyj4703 := 0 + for ; !r.CheckBreak(); yyj4703++ { - if yyj4729 >= len(yyv4729) { - yyv4729 = append(yyv4729, PodCondition{}) // var yyz4729 PodCondition - yyc4729 = true + if yyj4703 >= len(yyv4703) { + yyv4703 = append(yyv4703, PodCondition{}) // var yyz4703 PodCondition + yyc4703 = true } - yyh4729.ElemContainerState(yyj4729) - if yyj4729 < len(yyv4729) { + yyh4703.ElemContainerState(yyj4703) + if yyj4703 < len(yyv4703) { if r.TryDecodeAsNil() { - yyv4729[yyj4729] = PodCondition{} + yyv4703[yyj4703] = PodCondition{} } else { - yyv4732 := &yyv4729[yyj4729] - yyv4732.CodecDecodeSelf(d) + yyv4706 := &yyv4703[yyj4703] + yyv4706.CodecDecodeSelf(d) } } else { @@ -59672,17 +59373,17 @@ func (x codecSelfer1234) decSlicePodCondition(v *[]PodCondition, d *codec1978.De } } - if yyj4729 < len(yyv4729) { - yyv4729 = yyv4729[:yyj4729] - yyc4729 = true - } else if yyj4729 == 0 && yyv4729 == nil { - yyv4729 = []PodCondition{} - yyc4729 = true + if yyj4703 < len(yyv4703) { + yyv4703 = yyv4703[:yyj4703] + yyc4703 = true + } else if yyj4703 == 0 && yyv4703 == nil { + yyv4703 = []PodCondition{} + yyc4703 = true } } - yyh4729.End() - if yyc4729 { - *v = yyv4729 + yyh4703.End() + if yyc4703 { + *v = yyv4703 } } @@ -59691,10 +59392,10 @@ func (x codecSelfer1234) encSliceContainerStatus(v []ContainerStatus, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4733 := range v { + for _, yyv4707 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4734 := &yyv4733 - yy4734.CodecEncodeSelf(e) + yy4708 := &yyv4707 + yy4708.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59704,83 +59405,83 @@ func (x codecSelfer1234) decSliceContainerStatus(v *[]ContainerStatus, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4735 := *v - yyh4735, yyl4735 := z.DecSliceHelperStart() - var yyc4735 bool - if yyl4735 == 0 { - if yyv4735 == nil { - yyv4735 = []ContainerStatus{} - yyc4735 = true - } else if len(yyv4735) != 0 { - yyv4735 = yyv4735[:0] - yyc4735 = true + yyv4709 := *v + yyh4709, yyl4709 := z.DecSliceHelperStart() + var yyc4709 bool + if yyl4709 == 0 { + if yyv4709 == nil { + yyv4709 = []ContainerStatus{} + yyc4709 = true + } else if len(yyv4709) != 0 { + yyv4709 = yyv4709[:0] + yyc4709 = true } - } else if yyl4735 > 0 { - var yyrr4735, yyrl4735 int - var yyrt4735 bool - if yyl4735 > cap(yyv4735) { + } else if yyl4709 > 0 { + var yyrr4709, yyrl4709 int + var yyrt4709 bool + if yyl4709 > cap(yyv4709) { - yyrg4735 := len(yyv4735) > 0 - yyv24735 := yyv4735 - yyrl4735, yyrt4735 = z.DecInferLen(yyl4735, z.DecBasicHandle().MaxInitLen, 120) - if yyrt4735 { - if yyrl4735 <= cap(yyv4735) { - yyv4735 = yyv4735[:yyrl4735] + yyrg4709 := len(yyv4709) > 0 + yyv24709 := yyv4709 + yyrl4709, yyrt4709 = z.DecInferLen(yyl4709, z.DecBasicHandle().MaxInitLen, 120) + if yyrt4709 { + if yyrl4709 <= cap(yyv4709) { + yyv4709 = yyv4709[:yyrl4709] } else { - yyv4735 = make([]ContainerStatus, yyrl4735) + yyv4709 = make([]ContainerStatus, yyrl4709) } } else { - yyv4735 = make([]ContainerStatus, yyrl4735) + yyv4709 = make([]ContainerStatus, yyrl4709) } - yyc4735 = true - yyrr4735 = len(yyv4735) - if yyrg4735 { - copy(yyv4735, yyv24735) + yyc4709 = true + yyrr4709 = len(yyv4709) + if yyrg4709 { + copy(yyv4709, yyv24709) } - } else if yyl4735 != len(yyv4735) { - yyv4735 = yyv4735[:yyl4735] - yyc4735 = true + } else if yyl4709 != len(yyv4709) { + yyv4709 = yyv4709[:yyl4709] + yyc4709 = true } - yyj4735 := 0 - for ; yyj4735 < yyrr4735; yyj4735++ { - yyh4735.ElemContainerState(yyj4735) + yyj4709 := 0 + for ; yyj4709 < yyrr4709; yyj4709++ { + yyh4709.ElemContainerState(yyj4709) if r.TryDecodeAsNil() { - yyv4735[yyj4735] = ContainerStatus{} + yyv4709[yyj4709] = ContainerStatus{} } else { - yyv4736 := &yyv4735[yyj4735] - yyv4736.CodecDecodeSelf(d) + yyv4710 := &yyv4709[yyj4709] + yyv4710.CodecDecodeSelf(d) } } - if yyrt4735 { - for ; yyj4735 < yyl4735; yyj4735++ { - yyv4735 = append(yyv4735, ContainerStatus{}) - yyh4735.ElemContainerState(yyj4735) + if yyrt4709 { + for ; yyj4709 < yyl4709; yyj4709++ { + yyv4709 = append(yyv4709, ContainerStatus{}) + yyh4709.ElemContainerState(yyj4709) if r.TryDecodeAsNil() { - yyv4735[yyj4735] = ContainerStatus{} + yyv4709[yyj4709] = ContainerStatus{} } else { - yyv4737 := &yyv4735[yyj4735] - yyv4737.CodecDecodeSelf(d) + yyv4711 := &yyv4709[yyj4709] + yyv4711.CodecDecodeSelf(d) } } } } else { - yyj4735 := 0 - for ; !r.CheckBreak(); yyj4735++ { + yyj4709 := 0 + for ; !r.CheckBreak(); yyj4709++ { - if yyj4735 >= len(yyv4735) { - yyv4735 = append(yyv4735, ContainerStatus{}) // var yyz4735 ContainerStatus - yyc4735 = true + if yyj4709 >= len(yyv4709) { + yyv4709 = append(yyv4709, ContainerStatus{}) // var yyz4709 ContainerStatus + yyc4709 = true } - yyh4735.ElemContainerState(yyj4735) - if yyj4735 < len(yyv4735) { + yyh4709.ElemContainerState(yyj4709) + if yyj4709 < len(yyv4709) { if r.TryDecodeAsNil() { - yyv4735[yyj4735] = ContainerStatus{} + yyv4709[yyj4709] = ContainerStatus{} } else { - yyv4738 := &yyv4735[yyj4735] - yyv4738.CodecDecodeSelf(d) + yyv4712 := &yyv4709[yyj4709] + yyv4712.CodecDecodeSelf(d) } } else { @@ -59788,17 +59489,17 @@ func (x codecSelfer1234) decSliceContainerStatus(v *[]ContainerStatus, d *codec1 } } - if yyj4735 < len(yyv4735) { - yyv4735 = yyv4735[:yyj4735] - yyc4735 = true - } else if yyj4735 == 0 && yyv4735 == nil { - yyv4735 = []ContainerStatus{} - yyc4735 = true + if yyj4709 < len(yyv4709) { + yyv4709 = yyv4709[:yyj4709] + yyc4709 = true + } else if yyj4709 == 0 && yyv4709 == nil { + yyv4709 = []ContainerStatus{} + yyc4709 = true } } - yyh4735.End() - if yyc4735 { - *v = yyv4735 + yyh4709.End() + if yyc4709 { + *v = yyv4709 } } @@ -59807,10 +59508,10 @@ func (x codecSelfer1234) encSlicePodTemplate(v []PodTemplate, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4739 := range v { + for _, yyv4713 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4740 := &yyv4739 - yy4740.CodecEncodeSelf(e) + yy4714 := &yyv4713 + yy4714.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59820,83 +59521,83 @@ func (x codecSelfer1234) decSlicePodTemplate(v *[]PodTemplate, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4741 := *v - yyh4741, yyl4741 := z.DecSliceHelperStart() - var yyc4741 bool - if yyl4741 == 0 { - if yyv4741 == nil { - yyv4741 = []PodTemplate{} - yyc4741 = true - } else if len(yyv4741) != 0 { - yyv4741 = yyv4741[:0] - yyc4741 = true + yyv4715 := *v + yyh4715, yyl4715 := z.DecSliceHelperStart() + var yyc4715 bool + if yyl4715 == 0 { + if yyv4715 == nil { + yyv4715 = []PodTemplate{} + yyc4715 = true + } else if len(yyv4715) != 0 { + yyv4715 = yyv4715[:0] + yyc4715 = true } - } else if yyl4741 > 0 { - var yyrr4741, yyrl4741 int - var yyrt4741 bool - if yyl4741 > cap(yyv4741) { + } else if yyl4715 > 0 { + var yyrr4715, yyrl4715 int + var yyrt4715 bool + if yyl4715 > cap(yyv4715) { - yyrg4741 := len(yyv4741) > 0 - yyv24741 := yyv4741 - yyrl4741, yyrt4741 = z.DecInferLen(yyl4741, z.DecBasicHandle().MaxInitLen, 704) - if yyrt4741 { - if yyrl4741 <= cap(yyv4741) { - yyv4741 = yyv4741[:yyrl4741] + yyrg4715 := len(yyv4715) > 0 + yyv24715 := yyv4715 + yyrl4715, yyrt4715 = z.DecInferLen(yyl4715, z.DecBasicHandle().MaxInitLen, 704) + if yyrt4715 { + if yyrl4715 <= cap(yyv4715) { + yyv4715 = yyv4715[:yyrl4715] } else { - yyv4741 = make([]PodTemplate, yyrl4741) + yyv4715 = make([]PodTemplate, yyrl4715) } } else { - yyv4741 = make([]PodTemplate, yyrl4741) + yyv4715 = make([]PodTemplate, yyrl4715) } - yyc4741 = true - yyrr4741 = len(yyv4741) - if yyrg4741 { - copy(yyv4741, yyv24741) + yyc4715 = true + yyrr4715 = len(yyv4715) + if yyrg4715 { + copy(yyv4715, yyv24715) } - } else if yyl4741 != len(yyv4741) { - yyv4741 = yyv4741[:yyl4741] - yyc4741 = true + } else if yyl4715 != len(yyv4715) { + yyv4715 = yyv4715[:yyl4715] + yyc4715 = true } - yyj4741 := 0 - for ; yyj4741 < yyrr4741; yyj4741++ { - yyh4741.ElemContainerState(yyj4741) + yyj4715 := 0 + for ; yyj4715 < yyrr4715; yyj4715++ { + yyh4715.ElemContainerState(yyj4715) if r.TryDecodeAsNil() { - yyv4741[yyj4741] = PodTemplate{} + yyv4715[yyj4715] = PodTemplate{} } else { - yyv4742 := &yyv4741[yyj4741] - yyv4742.CodecDecodeSelf(d) + yyv4716 := &yyv4715[yyj4715] + yyv4716.CodecDecodeSelf(d) } } - if yyrt4741 { - for ; yyj4741 < yyl4741; yyj4741++ { - yyv4741 = append(yyv4741, PodTemplate{}) - yyh4741.ElemContainerState(yyj4741) + if yyrt4715 { + for ; yyj4715 < yyl4715; yyj4715++ { + yyv4715 = append(yyv4715, PodTemplate{}) + yyh4715.ElemContainerState(yyj4715) if r.TryDecodeAsNil() { - yyv4741[yyj4741] = PodTemplate{} + yyv4715[yyj4715] = PodTemplate{} } else { - yyv4743 := &yyv4741[yyj4741] - yyv4743.CodecDecodeSelf(d) + yyv4717 := &yyv4715[yyj4715] + yyv4717.CodecDecodeSelf(d) } } } } else { - yyj4741 := 0 - for ; !r.CheckBreak(); yyj4741++ { + yyj4715 := 0 + for ; !r.CheckBreak(); yyj4715++ { - if yyj4741 >= len(yyv4741) { - yyv4741 = append(yyv4741, PodTemplate{}) // var yyz4741 PodTemplate - yyc4741 = true + if yyj4715 >= len(yyv4715) { + yyv4715 = append(yyv4715, PodTemplate{}) // var yyz4715 PodTemplate + yyc4715 = true } - yyh4741.ElemContainerState(yyj4741) - if yyj4741 < len(yyv4741) { + yyh4715.ElemContainerState(yyj4715) + if yyj4715 < len(yyv4715) { if r.TryDecodeAsNil() { - yyv4741[yyj4741] = PodTemplate{} + yyv4715[yyj4715] = PodTemplate{} } else { - yyv4744 := &yyv4741[yyj4741] - yyv4744.CodecDecodeSelf(d) + yyv4718 := &yyv4715[yyj4715] + yyv4718.CodecDecodeSelf(d) } } else { @@ -59904,17 +59605,17 @@ func (x codecSelfer1234) decSlicePodTemplate(v *[]PodTemplate, d *codec1978.Deco } } - if yyj4741 < len(yyv4741) { - yyv4741 = yyv4741[:yyj4741] - yyc4741 = true - } else if yyj4741 == 0 && yyv4741 == nil { - yyv4741 = []PodTemplate{} - yyc4741 = true + if yyj4715 < len(yyv4715) { + yyv4715 = yyv4715[:yyj4715] + yyc4715 = true + } else if yyj4715 == 0 && yyv4715 == nil { + yyv4715 = []PodTemplate{} + yyc4715 = true } } - yyh4741.End() - if yyc4741 { - *v = yyv4741 + yyh4715.End() + if yyc4715 { + *v = yyv4715 } } @@ -59923,10 +59624,10 @@ func (x codecSelfer1234) encSliceReplicationControllerCondition(v []ReplicationC z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4745 := range v { + for _, yyv4719 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4746 := &yyv4745 - yy4746.CodecEncodeSelf(e) + yy4720 := &yyv4719 + yy4720.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59936,83 +59637,83 @@ func (x codecSelfer1234) decSliceReplicationControllerCondition(v *[]Replication z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4747 := *v - yyh4747, yyl4747 := z.DecSliceHelperStart() - var yyc4747 bool - if yyl4747 == 0 { - if yyv4747 == nil { - yyv4747 = []ReplicationControllerCondition{} - yyc4747 = true - } else if len(yyv4747) != 0 { - yyv4747 = yyv4747[:0] - yyc4747 = true + yyv4721 := *v + yyh4721, yyl4721 := z.DecSliceHelperStart() + var yyc4721 bool + if yyl4721 == 0 { + if yyv4721 == nil { + yyv4721 = []ReplicationControllerCondition{} + yyc4721 = true + } else if len(yyv4721) != 0 { + yyv4721 = yyv4721[:0] + yyc4721 = true } - } else if yyl4747 > 0 { - var yyrr4747, yyrl4747 int - var yyrt4747 bool - if yyl4747 > cap(yyv4747) { + } else if yyl4721 > 0 { + var yyrr4721, yyrl4721 int + var yyrt4721 bool + if yyl4721 > cap(yyv4721) { - yyrg4747 := len(yyv4747) > 0 - yyv24747 := yyv4747 - yyrl4747, yyrt4747 = z.DecInferLen(yyl4747, z.DecBasicHandle().MaxInitLen, 88) - if yyrt4747 { - if yyrl4747 <= cap(yyv4747) { - yyv4747 = yyv4747[:yyrl4747] + yyrg4721 := len(yyv4721) > 0 + yyv24721 := yyv4721 + yyrl4721, yyrt4721 = z.DecInferLen(yyl4721, z.DecBasicHandle().MaxInitLen, 88) + if yyrt4721 { + if yyrl4721 <= cap(yyv4721) { + yyv4721 = yyv4721[:yyrl4721] } else { - yyv4747 = make([]ReplicationControllerCondition, yyrl4747) + yyv4721 = make([]ReplicationControllerCondition, yyrl4721) } } else { - yyv4747 = make([]ReplicationControllerCondition, yyrl4747) + yyv4721 = make([]ReplicationControllerCondition, yyrl4721) } - yyc4747 = true - yyrr4747 = len(yyv4747) - if yyrg4747 { - copy(yyv4747, yyv24747) + yyc4721 = true + yyrr4721 = len(yyv4721) + if yyrg4721 { + copy(yyv4721, yyv24721) } - } else if yyl4747 != len(yyv4747) { - yyv4747 = yyv4747[:yyl4747] - yyc4747 = true + } else if yyl4721 != len(yyv4721) { + yyv4721 = yyv4721[:yyl4721] + yyc4721 = true } - yyj4747 := 0 - for ; yyj4747 < yyrr4747; yyj4747++ { - yyh4747.ElemContainerState(yyj4747) + yyj4721 := 0 + for ; yyj4721 < yyrr4721; yyj4721++ { + yyh4721.ElemContainerState(yyj4721) if r.TryDecodeAsNil() { - yyv4747[yyj4747] = ReplicationControllerCondition{} + yyv4721[yyj4721] = ReplicationControllerCondition{} } else { - yyv4748 := &yyv4747[yyj4747] - yyv4748.CodecDecodeSelf(d) + yyv4722 := &yyv4721[yyj4721] + yyv4722.CodecDecodeSelf(d) } } - if yyrt4747 { - for ; yyj4747 < yyl4747; yyj4747++ { - yyv4747 = append(yyv4747, ReplicationControllerCondition{}) - yyh4747.ElemContainerState(yyj4747) + if yyrt4721 { + for ; yyj4721 < yyl4721; yyj4721++ { + yyv4721 = append(yyv4721, ReplicationControllerCondition{}) + yyh4721.ElemContainerState(yyj4721) if r.TryDecodeAsNil() { - yyv4747[yyj4747] = ReplicationControllerCondition{} + yyv4721[yyj4721] = ReplicationControllerCondition{} } else { - yyv4749 := &yyv4747[yyj4747] - yyv4749.CodecDecodeSelf(d) + yyv4723 := &yyv4721[yyj4721] + yyv4723.CodecDecodeSelf(d) } } } } else { - yyj4747 := 0 - for ; !r.CheckBreak(); yyj4747++ { + yyj4721 := 0 + for ; !r.CheckBreak(); yyj4721++ { - if yyj4747 >= len(yyv4747) { - yyv4747 = append(yyv4747, ReplicationControllerCondition{}) // var yyz4747 ReplicationControllerCondition - yyc4747 = true + if yyj4721 >= len(yyv4721) { + yyv4721 = append(yyv4721, ReplicationControllerCondition{}) // var yyz4721 ReplicationControllerCondition + yyc4721 = true } - yyh4747.ElemContainerState(yyj4747) - if yyj4747 < len(yyv4747) { + yyh4721.ElemContainerState(yyj4721) + if yyj4721 < len(yyv4721) { if r.TryDecodeAsNil() { - yyv4747[yyj4747] = ReplicationControllerCondition{} + yyv4721[yyj4721] = ReplicationControllerCondition{} } else { - yyv4750 := &yyv4747[yyj4747] - yyv4750.CodecDecodeSelf(d) + yyv4724 := &yyv4721[yyj4721] + yyv4724.CodecDecodeSelf(d) } } else { @@ -60020,17 +59721,17 @@ func (x codecSelfer1234) decSliceReplicationControllerCondition(v *[]Replication } } - if yyj4747 < len(yyv4747) { - yyv4747 = yyv4747[:yyj4747] - yyc4747 = true - } else if yyj4747 == 0 && yyv4747 == nil { - yyv4747 = []ReplicationControllerCondition{} - yyc4747 = true + if yyj4721 < len(yyv4721) { + yyv4721 = yyv4721[:yyj4721] + yyc4721 = true + } else if yyj4721 == 0 && yyv4721 == nil { + yyv4721 = []ReplicationControllerCondition{} + yyc4721 = true } } - yyh4747.End() - if yyc4747 { - *v = yyv4747 + yyh4721.End() + if yyc4721 { + *v = yyv4721 } } @@ -60039,10 +59740,10 @@ func (x codecSelfer1234) encSliceReplicationController(v []ReplicationController z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4751 := range v { + for _, yyv4725 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4752 := &yyv4751 - yy4752.CodecEncodeSelf(e) + yy4726 := &yyv4725 + yy4726.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60052,83 +59753,83 @@ func (x codecSelfer1234) decSliceReplicationController(v *[]ReplicationControlle z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4753 := *v - yyh4753, yyl4753 := z.DecSliceHelperStart() - var yyc4753 bool - if yyl4753 == 0 { - if yyv4753 == nil { - yyv4753 = []ReplicationController{} - yyc4753 = true - } else if len(yyv4753) != 0 { - yyv4753 = yyv4753[:0] - yyc4753 = true + yyv4727 := *v + yyh4727, yyl4727 := z.DecSliceHelperStart() + var yyc4727 bool + if yyl4727 == 0 { + if yyv4727 == nil { + yyv4727 = []ReplicationController{} + yyc4727 = true + } else if len(yyv4727) != 0 { + yyv4727 = yyv4727[:0] + yyc4727 = true } - } else if yyl4753 > 0 { - var yyrr4753, yyrl4753 int - var yyrt4753 bool - if yyl4753 > cap(yyv4753) { + } else if yyl4727 > 0 { + var yyrr4727, yyrl4727 int + var yyrt4727 bool + if yyl4727 > cap(yyv4727) { - yyrg4753 := len(yyv4753) > 0 - yyv24753 := yyv4753 - yyrl4753, yyrt4753 = z.DecInferLen(yyl4753, z.DecBasicHandle().MaxInitLen, 328) - if yyrt4753 { - if yyrl4753 <= cap(yyv4753) { - yyv4753 = yyv4753[:yyrl4753] + yyrg4727 := len(yyv4727) > 0 + yyv24727 := yyv4727 + yyrl4727, yyrt4727 = z.DecInferLen(yyl4727, z.DecBasicHandle().MaxInitLen, 328) + if yyrt4727 { + if yyrl4727 <= cap(yyv4727) { + yyv4727 = yyv4727[:yyrl4727] } else { - yyv4753 = make([]ReplicationController, yyrl4753) + yyv4727 = make([]ReplicationController, yyrl4727) } } else { - yyv4753 = make([]ReplicationController, yyrl4753) + yyv4727 = make([]ReplicationController, yyrl4727) } - yyc4753 = true - yyrr4753 = len(yyv4753) - if yyrg4753 { - copy(yyv4753, yyv24753) + yyc4727 = true + yyrr4727 = len(yyv4727) + if yyrg4727 { + copy(yyv4727, yyv24727) } - } else if yyl4753 != len(yyv4753) { - yyv4753 = yyv4753[:yyl4753] - yyc4753 = true + } else if yyl4727 != len(yyv4727) { + yyv4727 = yyv4727[:yyl4727] + yyc4727 = true } - yyj4753 := 0 - for ; yyj4753 < yyrr4753; yyj4753++ { - yyh4753.ElemContainerState(yyj4753) + yyj4727 := 0 + for ; yyj4727 < yyrr4727; yyj4727++ { + yyh4727.ElemContainerState(yyj4727) if r.TryDecodeAsNil() { - yyv4753[yyj4753] = ReplicationController{} + yyv4727[yyj4727] = ReplicationController{} } else { - yyv4754 := &yyv4753[yyj4753] - yyv4754.CodecDecodeSelf(d) + yyv4728 := &yyv4727[yyj4727] + yyv4728.CodecDecodeSelf(d) } } - if yyrt4753 { - for ; yyj4753 < yyl4753; yyj4753++ { - yyv4753 = append(yyv4753, ReplicationController{}) - yyh4753.ElemContainerState(yyj4753) + if yyrt4727 { + for ; yyj4727 < yyl4727; yyj4727++ { + yyv4727 = append(yyv4727, ReplicationController{}) + yyh4727.ElemContainerState(yyj4727) if r.TryDecodeAsNil() { - yyv4753[yyj4753] = ReplicationController{} + yyv4727[yyj4727] = ReplicationController{} } else { - yyv4755 := &yyv4753[yyj4753] - yyv4755.CodecDecodeSelf(d) + yyv4729 := &yyv4727[yyj4727] + yyv4729.CodecDecodeSelf(d) } } } } else { - yyj4753 := 0 - for ; !r.CheckBreak(); yyj4753++ { + yyj4727 := 0 + for ; !r.CheckBreak(); yyj4727++ { - if yyj4753 >= len(yyv4753) { - yyv4753 = append(yyv4753, ReplicationController{}) // var yyz4753 ReplicationController - yyc4753 = true + if yyj4727 >= len(yyv4727) { + yyv4727 = append(yyv4727, ReplicationController{}) // var yyz4727 ReplicationController + yyc4727 = true } - yyh4753.ElemContainerState(yyj4753) - if yyj4753 < len(yyv4753) { + yyh4727.ElemContainerState(yyj4727) + if yyj4727 < len(yyv4727) { if r.TryDecodeAsNil() { - yyv4753[yyj4753] = ReplicationController{} + yyv4727[yyj4727] = ReplicationController{} } else { - yyv4756 := &yyv4753[yyj4753] - yyv4756.CodecDecodeSelf(d) + yyv4730 := &yyv4727[yyj4727] + yyv4730.CodecDecodeSelf(d) } } else { @@ -60136,17 +59837,17 @@ func (x codecSelfer1234) decSliceReplicationController(v *[]ReplicationControlle } } - if yyj4753 < len(yyv4753) { - yyv4753 = yyv4753[:yyj4753] - yyc4753 = true - } else if yyj4753 == 0 && yyv4753 == nil { - yyv4753 = []ReplicationController{} - yyc4753 = true + if yyj4727 < len(yyv4727) { + yyv4727 = yyv4727[:yyj4727] + yyc4727 = true + } else if yyj4727 == 0 && yyv4727 == nil { + yyv4727 = []ReplicationController{} + yyc4727 = true } } - yyh4753.End() - if yyc4753 { - *v = yyv4753 + yyh4727.End() + if yyc4727 { + *v = yyv4727 } } @@ -60155,10 +59856,10 @@ func (x codecSelfer1234) encSliceService(v []Service, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4757 := range v { + for _, yyv4731 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4758 := &yyv4757 - yy4758.CodecEncodeSelf(e) + yy4732 := &yyv4731 + yy4732.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60168,83 +59869,83 @@ func (x codecSelfer1234) decSliceService(v *[]Service, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4759 := *v - yyh4759, yyl4759 := z.DecSliceHelperStart() - var yyc4759 bool - if yyl4759 == 0 { - if yyv4759 == nil { - yyv4759 = []Service{} - yyc4759 = true - } else if len(yyv4759) != 0 { - yyv4759 = yyv4759[:0] - yyc4759 = true + yyv4733 := *v + yyh4733, yyl4733 := z.DecSliceHelperStart() + var yyc4733 bool + if yyl4733 == 0 { + if yyv4733 == nil { + yyv4733 = []Service{} + yyc4733 = true + } else if len(yyv4733) != 0 { + yyv4733 = yyv4733[:0] + yyc4733 = true } - } else if yyl4759 > 0 { - var yyrr4759, yyrl4759 int - var yyrt4759 bool - if yyl4759 > cap(yyv4759) { + } else if yyl4733 > 0 { + var yyrr4733, yyrl4733 int + var yyrt4733 bool + if yyl4733 > cap(yyv4733) { - yyrg4759 := len(yyv4759) > 0 - yyv24759 := yyv4759 - yyrl4759, yyrt4759 = z.DecInferLen(yyl4759, z.DecBasicHandle().MaxInitLen, 440) - if yyrt4759 { - if yyrl4759 <= cap(yyv4759) { - yyv4759 = yyv4759[:yyrl4759] + yyrg4733 := len(yyv4733) > 0 + yyv24733 := yyv4733 + yyrl4733, yyrt4733 = z.DecInferLen(yyl4733, z.DecBasicHandle().MaxInitLen, 440) + if yyrt4733 { + if yyrl4733 <= cap(yyv4733) { + yyv4733 = yyv4733[:yyrl4733] } else { - yyv4759 = make([]Service, yyrl4759) + yyv4733 = make([]Service, yyrl4733) } } else { - yyv4759 = make([]Service, yyrl4759) + yyv4733 = make([]Service, yyrl4733) } - yyc4759 = true - yyrr4759 = len(yyv4759) - if yyrg4759 { - copy(yyv4759, yyv24759) + yyc4733 = true + yyrr4733 = len(yyv4733) + if yyrg4733 { + copy(yyv4733, yyv24733) } - } else if yyl4759 != len(yyv4759) { - yyv4759 = yyv4759[:yyl4759] - yyc4759 = true + } else if yyl4733 != len(yyv4733) { + yyv4733 = yyv4733[:yyl4733] + yyc4733 = true } - yyj4759 := 0 - for ; yyj4759 < yyrr4759; yyj4759++ { - yyh4759.ElemContainerState(yyj4759) + yyj4733 := 0 + for ; yyj4733 < yyrr4733; yyj4733++ { + yyh4733.ElemContainerState(yyj4733) if r.TryDecodeAsNil() { - yyv4759[yyj4759] = Service{} + yyv4733[yyj4733] = Service{} } else { - yyv4760 := &yyv4759[yyj4759] - yyv4760.CodecDecodeSelf(d) + yyv4734 := &yyv4733[yyj4733] + yyv4734.CodecDecodeSelf(d) } } - if yyrt4759 { - for ; yyj4759 < yyl4759; yyj4759++ { - yyv4759 = append(yyv4759, Service{}) - yyh4759.ElemContainerState(yyj4759) + if yyrt4733 { + for ; yyj4733 < yyl4733; yyj4733++ { + yyv4733 = append(yyv4733, Service{}) + yyh4733.ElemContainerState(yyj4733) if r.TryDecodeAsNil() { - yyv4759[yyj4759] = Service{} + yyv4733[yyj4733] = Service{} } else { - yyv4761 := &yyv4759[yyj4759] - yyv4761.CodecDecodeSelf(d) + yyv4735 := &yyv4733[yyj4733] + yyv4735.CodecDecodeSelf(d) } } } } else { - yyj4759 := 0 - for ; !r.CheckBreak(); yyj4759++ { + yyj4733 := 0 + for ; !r.CheckBreak(); yyj4733++ { - if yyj4759 >= len(yyv4759) { - yyv4759 = append(yyv4759, Service{}) // var yyz4759 Service - yyc4759 = true + if yyj4733 >= len(yyv4733) { + yyv4733 = append(yyv4733, Service{}) // var yyz4733 Service + yyc4733 = true } - yyh4759.ElemContainerState(yyj4759) - if yyj4759 < len(yyv4759) { + yyh4733.ElemContainerState(yyj4733) + if yyj4733 < len(yyv4733) { if r.TryDecodeAsNil() { - yyv4759[yyj4759] = Service{} + yyv4733[yyj4733] = Service{} } else { - yyv4762 := &yyv4759[yyj4759] - yyv4762.CodecDecodeSelf(d) + yyv4736 := &yyv4733[yyj4733] + yyv4736.CodecDecodeSelf(d) } } else { @@ -60252,17 +59953,17 @@ func (x codecSelfer1234) decSliceService(v *[]Service, d *codec1978.Decoder) { } } - if yyj4759 < len(yyv4759) { - yyv4759 = yyv4759[:yyj4759] - yyc4759 = true - } else if yyj4759 == 0 && yyv4759 == nil { - yyv4759 = []Service{} - yyc4759 = true + if yyj4733 < len(yyv4733) { + yyv4733 = yyv4733[:yyj4733] + yyc4733 = true + } else if yyj4733 == 0 && yyv4733 == nil { + yyv4733 = []Service{} + yyc4733 = true } } - yyh4759.End() - if yyc4759 { - *v = yyv4759 + yyh4733.End() + if yyc4733 { + *v = yyv4733 } } @@ -60271,10 +59972,10 @@ func (x codecSelfer1234) encSliceLoadBalancerIngress(v []LoadBalancerIngress, e z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4763 := range v { + for _, yyv4737 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4764 := &yyv4763 - yy4764.CodecEncodeSelf(e) + yy4738 := &yyv4737 + yy4738.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60284,83 +59985,83 @@ func (x codecSelfer1234) decSliceLoadBalancerIngress(v *[]LoadBalancerIngress, d z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4765 := *v - yyh4765, yyl4765 := z.DecSliceHelperStart() - var yyc4765 bool - if yyl4765 == 0 { - if yyv4765 == nil { - yyv4765 = []LoadBalancerIngress{} - yyc4765 = true - } else if len(yyv4765) != 0 { - yyv4765 = yyv4765[:0] - yyc4765 = true + yyv4739 := *v + yyh4739, yyl4739 := z.DecSliceHelperStart() + var yyc4739 bool + if yyl4739 == 0 { + if yyv4739 == nil { + yyv4739 = []LoadBalancerIngress{} + yyc4739 = true + } else if len(yyv4739) != 0 { + yyv4739 = yyv4739[:0] + yyc4739 = true } - } else if yyl4765 > 0 { - var yyrr4765, yyrl4765 int - var yyrt4765 bool - if yyl4765 > cap(yyv4765) { + } else if yyl4739 > 0 { + var yyrr4739, yyrl4739 int + var yyrt4739 bool + if yyl4739 > cap(yyv4739) { - yyrg4765 := len(yyv4765) > 0 - yyv24765 := yyv4765 - yyrl4765, yyrt4765 = z.DecInferLen(yyl4765, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4765 { - if yyrl4765 <= cap(yyv4765) { - yyv4765 = yyv4765[:yyrl4765] + yyrg4739 := len(yyv4739) > 0 + yyv24739 := yyv4739 + yyrl4739, yyrt4739 = z.DecInferLen(yyl4739, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4739 { + if yyrl4739 <= cap(yyv4739) { + yyv4739 = yyv4739[:yyrl4739] } else { - yyv4765 = make([]LoadBalancerIngress, yyrl4765) + yyv4739 = make([]LoadBalancerIngress, yyrl4739) } } else { - yyv4765 = make([]LoadBalancerIngress, yyrl4765) + yyv4739 = make([]LoadBalancerIngress, yyrl4739) } - yyc4765 = true - yyrr4765 = len(yyv4765) - if yyrg4765 { - copy(yyv4765, yyv24765) + yyc4739 = true + yyrr4739 = len(yyv4739) + if yyrg4739 { + copy(yyv4739, yyv24739) } - } else if yyl4765 != len(yyv4765) { - yyv4765 = yyv4765[:yyl4765] - yyc4765 = true + } else if yyl4739 != len(yyv4739) { + yyv4739 = yyv4739[:yyl4739] + yyc4739 = true } - yyj4765 := 0 - for ; yyj4765 < yyrr4765; yyj4765++ { - yyh4765.ElemContainerState(yyj4765) + yyj4739 := 0 + for ; yyj4739 < yyrr4739; yyj4739++ { + yyh4739.ElemContainerState(yyj4739) if r.TryDecodeAsNil() { - yyv4765[yyj4765] = LoadBalancerIngress{} + yyv4739[yyj4739] = LoadBalancerIngress{} } else { - yyv4766 := &yyv4765[yyj4765] - yyv4766.CodecDecodeSelf(d) + yyv4740 := &yyv4739[yyj4739] + yyv4740.CodecDecodeSelf(d) } } - if yyrt4765 { - for ; yyj4765 < yyl4765; yyj4765++ { - yyv4765 = append(yyv4765, LoadBalancerIngress{}) - yyh4765.ElemContainerState(yyj4765) + if yyrt4739 { + for ; yyj4739 < yyl4739; yyj4739++ { + yyv4739 = append(yyv4739, LoadBalancerIngress{}) + yyh4739.ElemContainerState(yyj4739) if r.TryDecodeAsNil() { - yyv4765[yyj4765] = LoadBalancerIngress{} + yyv4739[yyj4739] = LoadBalancerIngress{} } else { - yyv4767 := &yyv4765[yyj4765] - yyv4767.CodecDecodeSelf(d) + yyv4741 := &yyv4739[yyj4739] + yyv4741.CodecDecodeSelf(d) } } } } else { - yyj4765 := 0 - for ; !r.CheckBreak(); yyj4765++ { + yyj4739 := 0 + for ; !r.CheckBreak(); yyj4739++ { - if yyj4765 >= len(yyv4765) { - yyv4765 = append(yyv4765, LoadBalancerIngress{}) // var yyz4765 LoadBalancerIngress - yyc4765 = true + if yyj4739 >= len(yyv4739) { + yyv4739 = append(yyv4739, LoadBalancerIngress{}) // var yyz4739 LoadBalancerIngress + yyc4739 = true } - yyh4765.ElemContainerState(yyj4765) - if yyj4765 < len(yyv4765) { + yyh4739.ElemContainerState(yyj4739) + if yyj4739 < len(yyv4739) { if r.TryDecodeAsNil() { - yyv4765[yyj4765] = LoadBalancerIngress{} + yyv4739[yyj4739] = LoadBalancerIngress{} } else { - yyv4768 := &yyv4765[yyj4765] - yyv4768.CodecDecodeSelf(d) + yyv4742 := &yyv4739[yyj4739] + yyv4742.CodecDecodeSelf(d) } } else { @@ -60368,17 +60069,17 @@ func (x codecSelfer1234) decSliceLoadBalancerIngress(v *[]LoadBalancerIngress, d } } - if yyj4765 < len(yyv4765) { - yyv4765 = yyv4765[:yyj4765] - yyc4765 = true - } else if yyj4765 == 0 && yyv4765 == nil { - yyv4765 = []LoadBalancerIngress{} - yyc4765 = true + if yyj4739 < len(yyv4739) { + yyv4739 = yyv4739[:yyj4739] + yyc4739 = true + } else if yyj4739 == 0 && yyv4739 == nil { + yyv4739 = []LoadBalancerIngress{} + yyc4739 = true } } - yyh4765.End() - if yyc4765 { - *v = yyv4765 + yyh4739.End() + if yyc4739 { + *v = yyv4739 } } @@ -60387,10 +60088,10 @@ func (x codecSelfer1234) encSliceServicePort(v []ServicePort, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4769 := range v { + for _, yyv4743 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4770 := &yyv4769 - yy4770.CodecEncodeSelf(e) + yy4744 := &yyv4743 + yy4744.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60400,83 +60101,83 @@ func (x codecSelfer1234) decSliceServicePort(v *[]ServicePort, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4771 := *v - yyh4771, yyl4771 := z.DecSliceHelperStart() - var yyc4771 bool - if yyl4771 == 0 { - if yyv4771 == nil { - yyv4771 = []ServicePort{} - yyc4771 = true - } else if len(yyv4771) != 0 { - yyv4771 = yyv4771[:0] - yyc4771 = true + yyv4745 := *v + yyh4745, yyl4745 := z.DecSliceHelperStart() + var yyc4745 bool + if yyl4745 == 0 { + if yyv4745 == nil { + yyv4745 = []ServicePort{} + yyc4745 = true + } else if len(yyv4745) != 0 { + yyv4745 = yyv4745[:0] + yyc4745 = true } - } else if yyl4771 > 0 { - var yyrr4771, yyrl4771 int - var yyrt4771 bool - if yyl4771 > cap(yyv4771) { + } else if yyl4745 > 0 { + var yyrr4745, yyrl4745 int + var yyrt4745 bool + if yyl4745 > cap(yyv4745) { - yyrg4771 := len(yyv4771) > 0 - yyv24771 := yyv4771 - yyrl4771, yyrt4771 = z.DecInferLen(yyl4771, z.DecBasicHandle().MaxInitLen, 80) - if yyrt4771 { - if yyrl4771 <= cap(yyv4771) { - yyv4771 = yyv4771[:yyrl4771] + yyrg4745 := len(yyv4745) > 0 + yyv24745 := yyv4745 + yyrl4745, yyrt4745 = z.DecInferLen(yyl4745, z.DecBasicHandle().MaxInitLen, 80) + if yyrt4745 { + if yyrl4745 <= cap(yyv4745) { + yyv4745 = yyv4745[:yyrl4745] } else { - yyv4771 = make([]ServicePort, yyrl4771) + yyv4745 = make([]ServicePort, yyrl4745) } } else { - yyv4771 = make([]ServicePort, yyrl4771) + yyv4745 = make([]ServicePort, yyrl4745) } - yyc4771 = true - yyrr4771 = len(yyv4771) - if yyrg4771 { - copy(yyv4771, yyv24771) + yyc4745 = true + yyrr4745 = len(yyv4745) + if yyrg4745 { + copy(yyv4745, yyv24745) } - } else if yyl4771 != len(yyv4771) { - yyv4771 = yyv4771[:yyl4771] - yyc4771 = true + } else if yyl4745 != len(yyv4745) { + yyv4745 = yyv4745[:yyl4745] + yyc4745 = true } - yyj4771 := 0 - for ; yyj4771 < yyrr4771; yyj4771++ { - yyh4771.ElemContainerState(yyj4771) + yyj4745 := 0 + for ; yyj4745 < yyrr4745; yyj4745++ { + yyh4745.ElemContainerState(yyj4745) if r.TryDecodeAsNil() { - yyv4771[yyj4771] = ServicePort{} + yyv4745[yyj4745] = ServicePort{} } else { - yyv4772 := &yyv4771[yyj4771] - yyv4772.CodecDecodeSelf(d) + yyv4746 := &yyv4745[yyj4745] + yyv4746.CodecDecodeSelf(d) } } - if yyrt4771 { - for ; yyj4771 < yyl4771; yyj4771++ { - yyv4771 = append(yyv4771, ServicePort{}) - yyh4771.ElemContainerState(yyj4771) + if yyrt4745 { + for ; yyj4745 < yyl4745; yyj4745++ { + yyv4745 = append(yyv4745, ServicePort{}) + yyh4745.ElemContainerState(yyj4745) if r.TryDecodeAsNil() { - yyv4771[yyj4771] = ServicePort{} + yyv4745[yyj4745] = ServicePort{} } else { - yyv4773 := &yyv4771[yyj4771] - yyv4773.CodecDecodeSelf(d) + yyv4747 := &yyv4745[yyj4745] + yyv4747.CodecDecodeSelf(d) } } } } else { - yyj4771 := 0 - for ; !r.CheckBreak(); yyj4771++ { + yyj4745 := 0 + for ; !r.CheckBreak(); yyj4745++ { - if yyj4771 >= len(yyv4771) { - yyv4771 = append(yyv4771, ServicePort{}) // var yyz4771 ServicePort - yyc4771 = true + if yyj4745 >= len(yyv4745) { + yyv4745 = append(yyv4745, ServicePort{}) // var yyz4745 ServicePort + yyc4745 = true } - yyh4771.ElemContainerState(yyj4771) - if yyj4771 < len(yyv4771) { + yyh4745.ElemContainerState(yyj4745) + if yyj4745 < len(yyv4745) { if r.TryDecodeAsNil() { - yyv4771[yyj4771] = ServicePort{} + yyv4745[yyj4745] = ServicePort{} } else { - yyv4774 := &yyv4771[yyj4771] - yyv4774.CodecDecodeSelf(d) + yyv4748 := &yyv4745[yyj4745] + yyv4748.CodecDecodeSelf(d) } } else { @@ -60484,17 +60185,17 @@ func (x codecSelfer1234) decSliceServicePort(v *[]ServicePort, d *codec1978.Deco } } - if yyj4771 < len(yyv4771) { - yyv4771 = yyv4771[:yyj4771] - yyc4771 = true - } else if yyj4771 == 0 && yyv4771 == nil { - yyv4771 = []ServicePort{} - yyc4771 = true + if yyj4745 < len(yyv4745) { + yyv4745 = yyv4745[:yyj4745] + yyc4745 = true + } else if yyj4745 == 0 && yyv4745 == nil { + yyv4745 = []ServicePort{} + yyc4745 = true } } - yyh4771.End() - if yyc4771 { - *v = yyv4771 + yyh4745.End() + if yyc4745 { + *v = yyv4745 } } @@ -60503,10 +60204,10 @@ func (x codecSelfer1234) encSliceObjectReference(v []ObjectReference, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4775 := range v { + for _, yyv4749 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4776 := &yyv4775 - yy4776.CodecEncodeSelf(e) + yy4750 := &yyv4749 + yy4750.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60516,83 +60217,83 @@ func (x codecSelfer1234) decSliceObjectReference(v *[]ObjectReference, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4777 := *v - yyh4777, yyl4777 := z.DecSliceHelperStart() - var yyc4777 bool - if yyl4777 == 0 { - if yyv4777 == nil { - yyv4777 = []ObjectReference{} - yyc4777 = true - } else if len(yyv4777) != 0 { - yyv4777 = yyv4777[:0] - yyc4777 = true + yyv4751 := *v + yyh4751, yyl4751 := z.DecSliceHelperStart() + var yyc4751 bool + if yyl4751 == 0 { + if yyv4751 == nil { + yyv4751 = []ObjectReference{} + yyc4751 = true + } else if len(yyv4751) != 0 { + yyv4751 = yyv4751[:0] + yyc4751 = true } - } else if yyl4777 > 0 { - var yyrr4777, yyrl4777 int - var yyrt4777 bool - if yyl4777 > cap(yyv4777) { + } else if yyl4751 > 0 { + var yyrr4751, yyrl4751 int + var yyrt4751 bool + if yyl4751 > cap(yyv4751) { - yyrg4777 := len(yyv4777) > 0 - yyv24777 := yyv4777 - yyrl4777, yyrt4777 = z.DecInferLen(yyl4777, z.DecBasicHandle().MaxInitLen, 112) - if yyrt4777 { - if yyrl4777 <= cap(yyv4777) { - yyv4777 = yyv4777[:yyrl4777] + yyrg4751 := len(yyv4751) > 0 + yyv24751 := yyv4751 + yyrl4751, yyrt4751 = z.DecInferLen(yyl4751, z.DecBasicHandle().MaxInitLen, 112) + if yyrt4751 { + if yyrl4751 <= cap(yyv4751) { + yyv4751 = yyv4751[:yyrl4751] } else { - yyv4777 = make([]ObjectReference, yyrl4777) + yyv4751 = make([]ObjectReference, yyrl4751) } } else { - yyv4777 = make([]ObjectReference, yyrl4777) + yyv4751 = make([]ObjectReference, yyrl4751) } - yyc4777 = true - yyrr4777 = len(yyv4777) - if yyrg4777 { - copy(yyv4777, yyv24777) + yyc4751 = true + yyrr4751 = len(yyv4751) + if yyrg4751 { + copy(yyv4751, yyv24751) } - } else if yyl4777 != len(yyv4777) { - yyv4777 = yyv4777[:yyl4777] - yyc4777 = true + } else if yyl4751 != len(yyv4751) { + yyv4751 = yyv4751[:yyl4751] + yyc4751 = true } - yyj4777 := 0 - for ; yyj4777 < yyrr4777; yyj4777++ { - yyh4777.ElemContainerState(yyj4777) + yyj4751 := 0 + for ; yyj4751 < yyrr4751; yyj4751++ { + yyh4751.ElemContainerState(yyj4751) if r.TryDecodeAsNil() { - yyv4777[yyj4777] = ObjectReference{} + yyv4751[yyj4751] = ObjectReference{} } else { - yyv4778 := &yyv4777[yyj4777] - yyv4778.CodecDecodeSelf(d) + yyv4752 := &yyv4751[yyj4751] + yyv4752.CodecDecodeSelf(d) } } - if yyrt4777 { - for ; yyj4777 < yyl4777; yyj4777++ { - yyv4777 = append(yyv4777, ObjectReference{}) - yyh4777.ElemContainerState(yyj4777) + if yyrt4751 { + for ; yyj4751 < yyl4751; yyj4751++ { + yyv4751 = append(yyv4751, ObjectReference{}) + yyh4751.ElemContainerState(yyj4751) if r.TryDecodeAsNil() { - yyv4777[yyj4777] = ObjectReference{} + yyv4751[yyj4751] = ObjectReference{} } else { - yyv4779 := &yyv4777[yyj4777] - yyv4779.CodecDecodeSelf(d) + yyv4753 := &yyv4751[yyj4751] + yyv4753.CodecDecodeSelf(d) } } } } else { - yyj4777 := 0 - for ; !r.CheckBreak(); yyj4777++ { + yyj4751 := 0 + for ; !r.CheckBreak(); yyj4751++ { - if yyj4777 >= len(yyv4777) { - yyv4777 = append(yyv4777, ObjectReference{}) // var yyz4777 ObjectReference - yyc4777 = true + if yyj4751 >= len(yyv4751) { + yyv4751 = append(yyv4751, ObjectReference{}) // var yyz4751 ObjectReference + yyc4751 = true } - yyh4777.ElemContainerState(yyj4777) - if yyj4777 < len(yyv4777) { + yyh4751.ElemContainerState(yyj4751) + if yyj4751 < len(yyv4751) { if r.TryDecodeAsNil() { - yyv4777[yyj4777] = ObjectReference{} + yyv4751[yyj4751] = ObjectReference{} } else { - yyv4780 := &yyv4777[yyj4777] - yyv4780.CodecDecodeSelf(d) + yyv4754 := &yyv4751[yyj4751] + yyv4754.CodecDecodeSelf(d) } } else { @@ -60600,17 +60301,17 @@ func (x codecSelfer1234) decSliceObjectReference(v *[]ObjectReference, d *codec1 } } - if yyj4777 < len(yyv4777) { - yyv4777 = yyv4777[:yyj4777] - yyc4777 = true - } else if yyj4777 == 0 && yyv4777 == nil { - yyv4777 = []ObjectReference{} - yyc4777 = true + if yyj4751 < len(yyv4751) { + yyv4751 = yyv4751[:yyj4751] + yyc4751 = true + } else if yyj4751 == 0 && yyv4751 == nil { + yyv4751 = []ObjectReference{} + yyc4751 = true } } - yyh4777.End() - if yyc4777 { - *v = yyv4777 + yyh4751.End() + if yyc4751 { + *v = yyv4751 } } @@ -60619,10 +60320,10 @@ func (x codecSelfer1234) encSliceServiceAccount(v []ServiceAccount, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4781 := range v { + for _, yyv4755 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4782 := &yyv4781 - yy4782.CodecEncodeSelf(e) + yy4756 := &yyv4755 + yy4756.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60632,83 +60333,83 @@ func (x codecSelfer1234) decSliceServiceAccount(v *[]ServiceAccount, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4783 := *v - yyh4783, yyl4783 := z.DecSliceHelperStart() - var yyc4783 bool - if yyl4783 == 0 { - if yyv4783 == nil { - yyv4783 = []ServiceAccount{} - yyc4783 = true - } else if len(yyv4783) != 0 { - yyv4783 = yyv4783[:0] - yyc4783 = true + yyv4757 := *v + yyh4757, yyl4757 := z.DecSliceHelperStart() + var yyc4757 bool + if yyl4757 == 0 { + if yyv4757 == nil { + yyv4757 = []ServiceAccount{} + yyc4757 = true + } else if len(yyv4757) != 0 { + yyv4757 = yyv4757[:0] + yyc4757 = true } - } else if yyl4783 > 0 { - var yyrr4783, yyrl4783 int - var yyrt4783 bool - if yyl4783 > cap(yyv4783) { + } else if yyl4757 > 0 { + var yyrr4757, yyrl4757 int + var yyrt4757 bool + if yyl4757 > cap(yyv4757) { - yyrg4783 := len(yyv4783) > 0 - yyv24783 := yyv4783 - yyrl4783, yyrt4783 = z.DecInferLen(yyl4783, z.DecBasicHandle().MaxInitLen, 304) - if yyrt4783 { - if yyrl4783 <= cap(yyv4783) { - yyv4783 = yyv4783[:yyrl4783] + yyrg4757 := len(yyv4757) > 0 + yyv24757 := yyv4757 + yyrl4757, yyrt4757 = z.DecInferLen(yyl4757, z.DecBasicHandle().MaxInitLen, 304) + if yyrt4757 { + if yyrl4757 <= cap(yyv4757) { + yyv4757 = yyv4757[:yyrl4757] } else { - yyv4783 = make([]ServiceAccount, yyrl4783) + yyv4757 = make([]ServiceAccount, yyrl4757) } } else { - yyv4783 = make([]ServiceAccount, yyrl4783) + yyv4757 = make([]ServiceAccount, yyrl4757) } - yyc4783 = true - yyrr4783 = len(yyv4783) - if yyrg4783 { - copy(yyv4783, yyv24783) + yyc4757 = true + yyrr4757 = len(yyv4757) + if yyrg4757 { + copy(yyv4757, yyv24757) } - } else if yyl4783 != len(yyv4783) { - yyv4783 = yyv4783[:yyl4783] - yyc4783 = true + } else if yyl4757 != len(yyv4757) { + yyv4757 = yyv4757[:yyl4757] + yyc4757 = true } - yyj4783 := 0 - for ; yyj4783 < yyrr4783; yyj4783++ { - yyh4783.ElemContainerState(yyj4783) + yyj4757 := 0 + for ; yyj4757 < yyrr4757; yyj4757++ { + yyh4757.ElemContainerState(yyj4757) if r.TryDecodeAsNil() { - yyv4783[yyj4783] = ServiceAccount{} + yyv4757[yyj4757] = ServiceAccount{} } else { - yyv4784 := &yyv4783[yyj4783] - yyv4784.CodecDecodeSelf(d) + yyv4758 := &yyv4757[yyj4757] + yyv4758.CodecDecodeSelf(d) } } - if yyrt4783 { - for ; yyj4783 < yyl4783; yyj4783++ { - yyv4783 = append(yyv4783, ServiceAccount{}) - yyh4783.ElemContainerState(yyj4783) + if yyrt4757 { + for ; yyj4757 < yyl4757; yyj4757++ { + yyv4757 = append(yyv4757, ServiceAccount{}) + yyh4757.ElemContainerState(yyj4757) if r.TryDecodeAsNil() { - yyv4783[yyj4783] = ServiceAccount{} + yyv4757[yyj4757] = ServiceAccount{} } else { - yyv4785 := &yyv4783[yyj4783] - yyv4785.CodecDecodeSelf(d) + yyv4759 := &yyv4757[yyj4757] + yyv4759.CodecDecodeSelf(d) } } } } else { - yyj4783 := 0 - for ; !r.CheckBreak(); yyj4783++ { + yyj4757 := 0 + for ; !r.CheckBreak(); yyj4757++ { - if yyj4783 >= len(yyv4783) { - yyv4783 = append(yyv4783, ServiceAccount{}) // var yyz4783 ServiceAccount - yyc4783 = true + if yyj4757 >= len(yyv4757) { + yyv4757 = append(yyv4757, ServiceAccount{}) // var yyz4757 ServiceAccount + yyc4757 = true } - yyh4783.ElemContainerState(yyj4783) - if yyj4783 < len(yyv4783) { + yyh4757.ElemContainerState(yyj4757) + if yyj4757 < len(yyv4757) { if r.TryDecodeAsNil() { - yyv4783[yyj4783] = ServiceAccount{} + yyv4757[yyj4757] = ServiceAccount{} } else { - yyv4786 := &yyv4783[yyj4783] - yyv4786.CodecDecodeSelf(d) + yyv4760 := &yyv4757[yyj4757] + yyv4760.CodecDecodeSelf(d) } } else { @@ -60716,17 +60417,17 @@ func (x codecSelfer1234) decSliceServiceAccount(v *[]ServiceAccount, d *codec197 } } - if yyj4783 < len(yyv4783) { - yyv4783 = yyv4783[:yyj4783] - yyc4783 = true - } else if yyj4783 == 0 && yyv4783 == nil { - yyv4783 = []ServiceAccount{} - yyc4783 = true + if yyj4757 < len(yyv4757) { + yyv4757 = yyv4757[:yyj4757] + yyc4757 = true + } else if yyj4757 == 0 && yyv4757 == nil { + yyv4757 = []ServiceAccount{} + yyc4757 = true } } - yyh4783.End() - if yyc4783 { - *v = yyv4783 + yyh4757.End() + if yyc4757 { + *v = yyv4757 } } @@ -60735,10 +60436,10 @@ func (x codecSelfer1234) encSliceEndpointSubset(v []EndpointSubset, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4787 := range v { + for _, yyv4761 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4788 := &yyv4787 - yy4788.CodecEncodeSelf(e) + yy4762 := &yyv4761 + yy4762.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60748,83 +60449,83 @@ func (x codecSelfer1234) decSliceEndpointSubset(v *[]EndpointSubset, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4789 := *v - yyh4789, yyl4789 := z.DecSliceHelperStart() - var yyc4789 bool - if yyl4789 == 0 { - if yyv4789 == nil { - yyv4789 = []EndpointSubset{} - yyc4789 = true - } else if len(yyv4789) != 0 { - yyv4789 = yyv4789[:0] - yyc4789 = true + yyv4763 := *v + yyh4763, yyl4763 := z.DecSliceHelperStart() + var yyc4763 bool + if yyl4763 == 0 { + if yyv4763 == nil { + yyv4763 = []EndpointSubset{} + yyc4763 = true + } else if len(yyv4763) != 0 { + yyv4763 = yyv4763[:0] + yyc4763 = true } - } else if yyl4789 > 0 { - var yyrr4789, yyrl4789 int - var yyrt4789 bool - if yyl4789 > cap(yyv4789) { + } else if yyl4763 > 0 { + var yyrr4763, yyrl4763 int + var yyrt4763 bool + if yyl4763 > cap(yyv4763) { - yyrg4789 := len(yyv4789) > 0 - yyv24789 := yyv4789 - yyrl4789, yyrt4789 = z.DecInferLen(yyl4789, z.DecBasicHandle().MaxInitLen, 72) - if yyrt4789 { - if yyrl4789 <= cap(yyv4789) { - yyv4789 = yyv4789[:yyrl4789] + yyrg4763 := len(yyv4763) > 0 + yyv24763 := yyv4763 + yyrl4763, yyrt4763 = z.DecInferLen(yyl4763, z.DecBasicHandle().MaxInitLen, 72) + if yyrt4763 { + if yyrl4763 <= cap(yyv4763) { + yyv4763 = yyv4763[:yyrl4763] } else { - yyv4789 = make([]EndpointSubset, yyrl4789) + yyv4763 = make([]EndpointSubset, yyrl4763) } } else { - yyv4789 = make([]EndpointSubset, yyrl4789) + yyv4763 = make([]EndpointSubset, yyrl4763) } - yyc4789 = true - yyrr4789 = len(yyv4789) - if yyrg4789 { - copy(yyv4789, yyv24789) + yyc4763 = true + yyrr4763 = len(yyv4763) + if yyrg4763 { + copy(yyv4763, yyv24763) } - } else if yyl4789 != len(yyv4789) { - yyv4789 = yyv4789[:yyl4789] - yyc4789 = true + } else if yyl4763 != len(yyv4763) { + yyv4763 = yyv4763[:yyl4763] + yyc4763 = true } - yyj4789 := 0 - for ; yyj4789 < yyrr4789; yyj4789++ { - yyh4789.ElemContainerState(yyj4789) + yyj4763 := 0 + for ; yyj4763 < yyrr4763; yyj4763++ { + yyh4763.ElemContainerState(yyj4763) if r.TryDecodeAsNil() { - yyv4789[yyj4789] = EndpointSubset{} + yyv4763[yyj4763] = EndpointSubset{} } else { - yyv4790 := &yyv4789[yyj4789] - yyv4790.CodecDecodeSelf(d) + yyv4764 := &yyv4763[yyj4763] + yyv4764.CodecDecodeSelf(d) } } - if yyrt4789 { - for ; yyj4789 < yyl4789; yyj4789++ { - yyv4789 = append(yyv4789, EndpointSubset{}) - yyh4789.ElemContainerState(yyj4789) + if yyrt4763 { + for ; yyj4763 < yyl4763; yyj4763++ { + yyv4763 = append(yyv4763, EndpointSubset{}) + yyh4763.ElemContainerState(yyj4763) if r.TryDecodeAsNil() { - yyv4789[yyj4789] = EndpointSubset{} + yyv4763[yyj4763] = EndpointSubset{} } else { - yyv4791 := &yyv4789[yyj4789] - yyv4791.CodecDecodeSelf(d) + yyv4765 := &yyv4763[yyj4763] + yyv4765.CodecDecodeSelf(d) } } } } else { - yyj4789 := 0 - for ; !r.CheckBreak(); yyj4789++ { + yyj4763 := 0 + for ; !r.CheckBreak(); yyj4763++ { - if yyj4789 >= len(yyv4789) { - yyv4789 = append(yyv4789, EndpointSubset{}) // var yyz4789 EndpointSubset - yyc4789 = true + if yyj4763 >= len(yyv4763) { + yyv4763 = append(yyv4763, EndpointSubset{}) // var yyz4763 EndpointSubset + yyc4763 = true } - yyh4789.ElemContainerState(yyj4789) - if yyj4789 < len(yyv4789) { + yyh4763.ElemContainerState(yyj4763) + if yyj4763 < len(yyv4763) { if r.TryDecodeAsNil() { - yyv4789[yyj4789] = EndpointSubset{} + yyv4763[yyj4763] = EndpointSubset{} } else { - yyv4792 := &yyv4789[yyj4789] - yyv4792.CodecDecodeSelf(d) + yyv4766 := &yyv4763[yyj4763] + yyv4766.CodecDecodeSelf(d) } } else { @@ -60832,17 +60533,17 @@ func (x codecSelfer1234) decSliceEndpointSubset(v *[]EndpointSubset, d *codec197 } } - if yyj4789 < len(yyv4789) { - yyv4789 = yyv4789[:yyj4789] - yyc4789 = true - } else if yyj4789 == 0 && yyv4789 == nil { - yyv4789 = []EndpointSubset{} - yyc4789 = true + if yyj4763 < len(yyv4763) { + yyv4763 = yyv4763[:yyj4763] + yyc4763 = true + } else if yyj4763 == 0 && yyv4763 == nil { + yyv4763 = []EndpointSubset{} + yyc4763 = true } } - yyh4789.End() - if yyc4789 { - *v = yyv4789 + yyh4763.End() + if yyc4763 { + *v = yyv4763 } } @@ -60851,10 +60552,10 @@ func (x codecSelfer1234) encSliceEndpointAddress(v []EndpointAddress, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4793 := range v { + for _, yyv4767 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4794 := &yyv4793 - yy4794.CodecEncodeSelf(e) + yy4768 := &yyv4767 + yy4768.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60864,83 +60565,83 @@ func (x codecSelfer1234) decSliceEndpointAddress(v *[]EndpointAddress, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4795 := *v - yyh4795, yyl4795 := z.DecSliceHelperStart() - var yyc4795 bool - if yyl4795 == 0 { - if yyv4795 == nil { - yyv4795 = []EndpointAddress{} - yyc4795 = true - } else if len(yyv4795) != 0 { - yyv4795 = yyv4795[:0] - yyc4795 = true + yyv4769 := *v + yyh4769, yyl4769 := z.DecSliceHelperStart() + var yyc4769 bool + if yyl4769 == 0 { + if yyv4769 == nil { + yyv4769 = []EndpointAddress{} + yyc4769 = true + } else if len(yyv4769) != 0 { + yyv4769 = yyv4769[:0] + yyc4769 = true } - } else if yyl4795 > 0 { - var yyrr4795, yyrl4795 int - var yyrt4795 bool - if yyl4795 > cap(yyv4795) { + } else if yyl4769 > 0 { + var yyrr4769, yyrl4769 int + var yyrt4769 bool + if yyl4769 > cap(yyv4769) { - yyrg4795 := len(yyv4795) > 0 - yyv24795 := yyv4795 - yyrl4795, yyrt4795 = z.DecInferLen(yyl4795, z.DecBasicHandle().MaxInitLen, 48) - if yyrt4795 { - if yyrl4795 <= cap(yyv4795) { - yyv4795 = yyv4795[:yyrl4795] + yyrg4769 := len(yyv4769) > 0 + yyv24769 := yyv4769 + yyrl4769, yyrt4769 = z.DecInferLen(yyl4769, z.DecBasicHandle().MaxInitLen, 48) + if yyrt4769 { + if yyrl4769 <= cap(yyv4769) { + yyv4769 = yyv4769[:yyrl4769] } else { - yyv4795 = make([]EndpointAddress, yyrl4795) + yyv4769 = make([]EndpointAddress, yyrl4769) } } else { - yyv4795 = make([]EndpointAddress, yyrl4795) + yyv4769 = make([]EndpointAddress, yyrl4769) } - yyc4795 = true - yyrr4795 = len(yyv4795) - if yyrg4795 { - copy(yyv4795, yyv24795) + yyc4769 = true + yyrr4769 = len(yyv4769) + if yyrg4769 { + copy(yyv4769, yyv24769) } - } else if yyl4795 != len(yyv4795) { - yyv4795 = yyv4795[:yyl4795] - yyc4795 = true + } else if yyl4769 != len(yyv4769) { + yyv4769 = yyv4769[:yyl4769] + yyc4769 = true } - yyj4795 := 0 - for ; yyj4795 < yyrr4795; yyj4795++ { - yyh4795.ElemContainerState(yyj4795) + yyj4769 := 0 + for ; yyj4769 < yyrr4769; yyj4769++ { + yyh4769.ElemContainerState(yyj4769) if r.TryDecodeAsNil() { - yyv4795[yyj4795] = EndpointAddress{} + yyv4769[yyj4769] = EndpointAddress{} } else { - yyv4796 := &yyv4795[yyj4795] - yyv4796.CodecDecodeSelf(d) + yyv4770 := &yyv4769[yyj4769] + yyv4770.CodecDecodeSelf(d) } } - if yyrt4795 { - for ; yyj4795 < yyl4795; yyj4795++ { - yyv4795 = append(yyv4795, EndpointAddress{}) - yyh4795.ElemContainerState(yyj4795) + if yyrt4769 { + for ; yyj4769 < yyl4769; yyj4769++ { + yyv4769 = append(yyv4769, EndpointAddress{}) + yyh4769.ElemContainerState(yyj4769) if r.TryDecodeAsNil() { - yyv4795[yyj4795] = EndpointAddress{} + yyv4769[yyj4769] = EndpointAddress{} } else { - yyv4797 := &yyv4795[yyj4795] - yyv4797.CodecDecodeSelf(d) + yyv4771 := &yyv4769[yyj4769] + yyv4771.CodecDecodeSelf(d) } } } } else { - yyj4795 := 0 - for ; !r.CheckBreak(); yyj4795++ { + yyj4769 := 0 + for ; !r.CheckBreak(); yyj4769++ { - if yyj4795 >= len(yyv4795) { - yyv4795 = append(yyv4795, EndpointAddress{}) // var yyz4795 EndpointAddress - yyc4795 = true + if yyj4769 >= len(yyv4769) { + yyv4769 = append(yyv4769, EndpointAddress{}) // var yyz4769 EndpointAddress + yyc4769 = true } - yyh4795.ElemContainerState(yyj4795) - if yyj4795 < len(yyv4795) { + yyh4769.ElemContainerState(yyj4769) + if yyj4769 < len(yyv4769) { if r.TryDecodeAsNil() { - yyv4795[yyj4795] = EndpointAddress{} + yyv4769[yyj4769] = EndpointAddress{} } else { - yyv4798 := &yyv4795[yyj4795] - yyv4798.CodecDecodeSelf(d) + yyv4772 := &yyv4769[yyj4769] + yyv4772.CodecDecodeSelf(d) } } else { @@ -60948,17 +60649,17 @@ func (x codecSelfer1234) decSliceEndpointAddress(v *[]EndpointAddress, d *codec1 } } - if yyj4795 < len(yyv4795) { - yyv4795 = yyv4795[:yyj4795] - yyc4795 = true - } else if yyj4795 == 0 && yyv4795 == nil { - yyv4795 = []EndpointAddress{} - yyc4795 = true + if yyj4769 < len(yyv4769) { + yyv4769 = yyv4769[:yyj4769] + yyc4769 = true + } else if yyj4769 == 0 && yyv4769 == nil { + yyv4769 = []EndpointAddress{} + yyc4769 = true } } - yyh4795.End() - if yyc4795 { - *v = yyv4795 + yyh4769.End() + if yyc4769 { + *v = yyv4769 } } @@ -60967,10 +60668,10 @@ func (x codecSelfer1234) encSliceEndpointPort(v []EndpointPort, e *codec1978.Enc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4799 := range v { + for _, yyv4773 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4800 := &yyv4799 - yy4800.CodecEncodeSelf(e) + yy4774 := &yyv4773 + yy4774.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60980,83 +60681,83 @@ func (x codecSelfer1234) decSliceEndpointPort(v *[]EndpointPort, d *codec1978.De z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4801 := *v - yyh4801, yyl4801 := z.DecSliceHelperStart() - var yyc4801 bool - if yyl4801 == 0 { - if yyv4801 == nil { - yyv4801 = []EndpointPort{} - yyc4801 = true - } else if len(yyv4801) != 0 { - yyv4801 = yyv4801[:0] - yyc4801 = true + yyv4775 := *v + yyh4775, yyl4775 := z.DecSliceHelperStart() + var yyc4775 bool + if yyl4775 == 0 { + if yyv4775 == nil { + yyv4775 = []EndpointPort{} + yyc4775 = true + } else if len(yyv4775) != 0 { + yyv4775 = yyv4775[:0] + yyc4775 = true } - } else if yyl4801 > 0 { - var yyrr4801, yyrl4801 int - var yyrt4801 bool - if yyl4801 > cap(yyv4801) { + } else if yyl4775 > 0 { + var yyrr4775, yyrl4775 int + var yyrt4775 bool + if yyl4775 > cap(yyv4775) { - yyrg4801 := len(yyv4801) > 0 - yyv24801 := yyv4801 - yyrl4801, yyrt4801 = z.DecInferLen(yyl4801, z.DecBasicHandle().MaxInitLen, 40) - if yyrt4801 { - if yyrl4801 <= cap(yyv4801) { - yyv4801 = yyv4801[:yyrl4801] + yyrg4775 := len(yyv4775) > 0 + yyv24775 := yyv4775 + yyrl4775, yyrt4775 = z.DecInferLen(yyl4775, z.DecBasicHandle().MaxInitLen, 40) + if yyrt4775 { + if yyrl4775 <= cap(yyv4775) { + yyv4775 = yyv4775[:yyrl4775] } else { - yyv4801 = make([]EndpointPort, yyrl4801) + yyv4775 = make([]EndpointPort, yyrl4775) } } else { - yyv4801 = make([]EndpointPort, yyrl4801) + yyv4775 = make([]EndpointPort, yyrl4775) } - yyc4801 = true - yyrr4801 = len(yyv4801) - if yyrg4801 { - copy(yyv4801, yyv24801) + yyc4775 = true + yyrr4775 = len(yyv4775) + if yyrg4775 { + copy(yyv4775, yyv24775) } - } else if yyl4801 != len(yyv4801) { - yyv4801 = yyv4801[:yyl4801] - yyc4801 = true + } else if yyl4775 != len(yyv4775) { + yyv4775 = yyv4775[:yyl4775] + yyc4775 = true } - yyj4801 := 0 - for ; yyj4801 < yyrr4801; yyj4801++ { - yyh4801.ElemContainerState(yyj4801) + yyj4775 := 0 + for ; yyj4775 < yyrr4775; yyj4775++ { + yyh4775.ElemContainerState(yyj4775) if r.TryDecodeAsNil() { - yyv4801[yyj4801] = EndpointPort{} + yyv4775[yyj4775] = EndpointPort{} } else { - yyv4802 := &yyv4801[yyj4801] - yyv4802.CodecDecodeSelf(d) + yyv4776 := &yyv4775[yyj4775] + yyv4776.CodecDecodeSelf(d) } } - if yyrt4801 { - for ; yyj4801 < yyl4801; yyj4801++ { - yyv4801 = append(yyv4801, EndpointPort{}) - yyh4801.ElemContainerState(yyj4801) + if yyrt4775 { + for ; yyj4775 < yyl4775; yyj4775++ { + yyv4775 = append(yyv4775, EndpointPort{}) + yyh4775.ElemContainerState(yyj4775) if r.TryDecodeAsNil() { - yyv4801[yyj4801] = EndpointPort{} + yyv4775[yyj4775] = EndpointPort{} } else { - yyv4803 := &yyv4801[yyj4801] - yyv4803.CodecDecodeSelf(d) + yyv4777 := &yyv4775[yyj4775] + yyv4777.CodecDecodeSelf(d) } } } } else { - yyj4801 := 0 - for ; !r.CheckBreak(); yyj4801++ { + yyj4775 := 0 + for ; !r.CheckBreak(); yyj4775++ { - if yyj4801 >= len(yyv4801) { - yyv4801 = append(yyv4801, EndpointPort{}) // var yyz4801 EndpointPort - yyc4801 = true + if yyj4775 >= len(yyv4775) { + yyv4775 = append(yyv4775, EndpointPort{}) // var yyz4775 EndpointPort + yyc4775 = true } - yyh4801.ElemContainerState(yyj4801) - if yyj4801 < len(yyv4801) { + yyh4775.ElemContainerState(yyj4775) + if yyj4775 < len(yyv4775) { if r.TryDecodeAsNil() { - yyv4801[yyj4801] = EndpointPort{} + yyv4775[yyj4775] = EndpointPort{} } else { - yyv4804 := &yyv4801[yyj4801] - yyv4804.CodecDecodeSelf(d) + yyv4778 := &yyv4775[yyj4775] + yyv4778.CodecDecodeSelf(d) } } else { @@ -61064,17 +60765,17 @@ func (x codecSelfer1234) decSliceEndpointPort(v *[]EndpointPort, d *codec1978.De } } - if yyj4801 < len(yyv4801) { - yyv4801 = yyv4801[:yyj4801] - yyc4801 = true - } else if yyj4801 == 0 && yyv4801 == nil { - yyv4801 = []EndpointPort{} - yyc4801 = true + if yyj4775 < len(yyv4775) { + yyv4775 = yyv4775[:yyj4775] + yyc4775 = true + } else if yyj4775 == 0 && yyv4775 == nil { + yyv4775 = []EndpointPort{} + yyc4775 = true } } - yyh4801.End() - if yyc4801 { - *v = yyv4801 + yyh4775.End() + if yyc4775 { + *v = yyv4775 } } @@ -61083,10 +60784,10 @@ func (x codecSelfer1234) encSliceEndpoints(v []Endpoints, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4805 := range v { + for _, yyv4779 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4806 := &yyv4805 - yy4806.CodecEncodeSelf(e) + yy4780 := &yyv4779 + yy4780.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61096,83 +60797,83 @@ func (x codecSelfer1234) decSliceEndpoints(v *[]Endpoints, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4807 := *v - yyh4807, yyl4807 := z.DecSliceHelperStart() - var yyc4807 bool - if yyl4807 == 0 { - if yyv4807 == nil { - yyv4807 = []Endpoints{} - yyc4807 = true - } else if len(yyv4807) != 0 { - yyv4807 = yyv4807[:0] - yyc4807 = true + yyv4781 := *v + yyh4781, yyl4781 := z.DecSliceHelperStart() + var yyc4781 bool + if yyl4781 == 0 { + if yyv4781 == nil { + yyv4781 = []Endpoints{} + yyc4781 = true + } else if len(yyv4781) != 0 { + yyv4781 = yyv4781[:0] + yyc4781 = true } - } else if yyl4807 > 0 { - var yyrr4807, yyrl4807 int - var yyrt4807 bool - if yyl4807 > cap(yyv4807) { + } else if yyl4781 > 0 { + var yyrr4781, yyrl4781 int + var yyrt4781 bool + if yyl4781 > cap(yyv4781) { - yyrg4807 := len(yyv4807) > 0 - yyv24807 := yyv4807 - yyrl4807, yyrt4807 = z.DecInferLen(yyl4807, z.DecBasicHandle().MaxInitLen, 280) - if yyrt4807 { - if yyrl4807 <= cap(yyv4807) { - yyv4807 = yyv4807[:yyrl4807] + yyrg4781 := len(yyv4781) > 0 + yyv24781 := yyv4781 + yyrl4781, yyrt4781 = z.DecInferLen(yyl4781, z.DecBasicHandle().MaxInitLen, 280) + if yyrt4781 { + if yyrl4781 <= cap(yyv4781) { + yyv4781 = yyv4781[:yyrl4781] } else { - yyv4807 = make([]Endpoints, yyrl4807) + yyv4781 = make([]Endpoints, yyrl4781) } } else { - yyv4807 = make([]Endpoints, yyrl4807) + yyv4781 = make([]Endpoints, yyrl4781) } - yyc4807 = true - yyrr4807 = len(yyv4807) - if yyrg4807 { - copy(yyv4807, yyv24807) + yyc4781 = true + yyrr4781 = len(yyv4781) + if yyrg4781 { + copy(yyv4781, yyv24781) } - } else if yyl4807 != len(yyv4807) { - yyv4807 = yyv4807[:yyl4807] - yyc4807 = true + } else if yyl4781 != len(yyv4781) { + yyv4781 = yyv4781[:yyl4781] + yyc4781 = true } - yyj4807 := 0 - for ; yyj4807 < yyrr4807; yyj4807++ { - yyh4807.ElemContainerState(yyj4807) + yyj4781 := 0 + for ; yyj4781 < yyrr4781; yyj4781++ { + yyh4781.ElemContainerState(yyj4781) if r.TryDecodeAsNil() { - yyv4807[yyj4807] = Endpoints{} + yyv4781[yyj4781] = Endpoints{} } else { - yyv4808 := &yyv4807[yyj4807] - yyv4808.CodecDecodeSelf(d) + yyv4782 := &yyv4781[yyj4781] + yyv4782.CodecDecodeSelf(d) } } - if yyrt4807 { - for ; yyj4807 < yyl4807; yyj4807++ { - yyv4807 = append(yyv4807, Endpoints{}) - yyh4807.ElemContainerState(yyj4807) + if yyrt4781 { + for ; yyj4781 < yyl4781; yyj4781++ { + yyv4781 = append(yyv4781, Endpoints{}) + yyh4781.ElemContainerState(yyj4781) if r.TryDecodeAsNil() { - yyv4807[yyj4807] = Endpoints{} + yyv4781[yyj4781] = Endpoints{} } else { - yyv4809 := &yyv4807[yyj4807] - yyv4809.CodecDecodeSelf(d) + yyv4783 := &yyv4781[yyj4781] + yyv4783.CodecDecodeSelf(d) } } } } else { - yyj4807 := 0 - for ; !r.CheckBreak(); yyj4807++ { + yyj4781 := 0 + for ; !r.CheckBreak(); yyj4781++ { - if yyj4807 >= len(yyv4807) { - yyv4807 = append(yyv4807, Endpoints{}) // var yyz4807 Endpoints - yyc4807 = true + if yyj4781 >= len(yyv4781) { + yyv4781 = append(yyv4781, Endpoints{}) // var yyz4781 Endpoints + yyc4781 = true } - yyh4807.ElemContainerState(yyj4807) - if yyj4807 < len(yyv4807) { + yyh4781.ElemContainerState(yyj4781) + if yyj4781 < len(yyv4781) { if r.TryDecodeAsNil() { - yyv4807[yyj4807] = Endpoints{} + yyv4781[yyj4781] = Endpoints{} } else { - yyv4810 := &yyv4807[yyj4807] - yyv4810.CodecDecodeSelf(d) + yyv4784 := &yyv4781[yyj4781] + yyv4784.CodecDecodeSelf(d) } } else { @@ -61180,17 +60881,17 @@ func (x codecSelfer1234) decSliceEndpoints(v *[]Endpoints, d *codec1978.Decoder) } } - if yyj4807 < len(yyv4807) { - yyv4807 = yyv4807[:yyj4807] - yyc4807 = true - } else if yyj4807 == 0 && yyv4807 == nil { - yyv4807 = []Endpoints{} - yyc4807 = true + if yyj4781 < len(yyv4781) { + yyv4781 = yyv4781[:yyj4781] + yyc4781 = true + } else if yyj4781 == 0 && yyv4781 == nil { + yyv4781 = []Endpoints{} + yyc4781 = true } } - yyh4807.End() - if yyc4807 { - *v = yyv4807 + yyh4781.End() + if yyc4781 { + *v = yyv4781 } } @@ -61199,10 +60900,10 @@ func (x codecSelfer1234) encSliceNodeCondition(v []NodeCondition, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4811 := range v { + for _, yyv4785 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4812 := &yyv4811 - yy4812.CodecEncodeSelf(e) + yy4786 := &yyv4785 + yy4786.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61212,83 +60913,83 @@ func (x codecSelfer1234) decSliceNodeCondition(v *[]NodeCondition, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4813 := *v - yyh4813, yyl4813 := z.DecSliceHelperStart() - var yyc4813 bool - if yyl4813 == 0 { - if yyv4813 == nil { - yyv4813 = []NodeCondition{} - yyc4813 = true - } else if len(yyv4813) != 0 { - yyv4813 = yyv4813[:0] - yyc4813 = true + yyv4787 := *v + yyh4787, yyl4787 := z.DecSliceHelperStart() + var yyc4787 bool + if yyl4787 == 0 { + if yyv4787 == nil { + yyv4787 = []NodeCondition{} + yyc4787 = true + } else if len(yyv4787) != 0 { + yyv4787 = yyv4787[:0] + yyc4787 = true } - } else if yyl4813 > 0 { - var yyrr4813, yyrl4813 int - var yyrt4813 bool - if yyl4813 > cap(yyv4813) { + } else if yyl4787 > 0 { + var yyrr4787, yyrl4787 int + var yyrt4787 bool + if yyl4787 > cap(yyv4787) { - yyrg4813 := len(yyv4813) > 0 - yyv24813 := yyv4813 - yyrl4813, yyrt4813 = z.DecInferLen(yyl4813, z.DecBasicHandle().MaxInitLen, 112) - if yyrt4813 { - if yyrl4813 <= cap(yyv4813) { - yyv4813 = yyv4813[:yyrl4813] + yyrg4787 := len(yyv4787) > 0 + yyv24787 := yyv4787 + yyrl4787, yyrt4787 = z.DecInferLen(yyl4787, z.DecBasicHandle().MaxInitLen, 112) + if yyrt4787 { + if yyrl4787 <= cap(yyv4787) { + yyv4787 = yyv4787[:yyrl4787] } else { - yyv4813 = make([]NodeCondition, yyrl4813) + yyv4787 = make([]NodeCondition, yyrl4787) } } else { - yyv4813 = make([]NodeCondition, yyrl4813) + yyv4787 = make([]NodeCondition, yyrl4787) } - yyc4813 = true - yyrr4813 = len(yyv4813) - if yyrg4813 { - copy(yyv4813, yyv24813) + yyc4787 = true + yyrr4787 = len(yyv4787) + if yyrg4787 { + copy(yyv4787, yyv24787) } - } else if yyl4813 != len(yyv4813) { - yyv4813 = yyv4813[:yyl4813] - yyc4813 = true + } else if yyl4787 != len(yyv4787) { + yyv4787 = yyv4787[:yyl4787] + yyc4787 = true } - yyj4813 := 0 - for ; yyj4813 < yyrr4813; yyj4813++ { - yyh4813.ElemContainerState(yyj4813) + yyj4787 := 0 + for ; yyj4787 < yyrr4787; yyj4787++ { + yyh4787.ElemContainerState(yyj4787) if r.TryDecodeAsNil() { - yyv4813[yyj4813] = NodeCondition{} + yyv4787[yyj4787] = NodeCondition{} } else { - yyv4814 := &yyv4813[yyj4813] - yyv4814.CodecDecodeSelf(d) + yyv4788 := &yyv4787[yyj4787] + yyv4788.CodecDecodeSelf(d) } } - if yyrt4813 { - for ; yyj4813 < yyl4813; yyj4813++ { - yyv4813 = append(yyv4813, NodeCondition{}) - yyh4813.ElemContainerState(yyj4813) + if yyrt4787 { + for ; yyj4787 < yyl4787; yyj4787++ { + yyv4787 = append(yyv4787, NodeCondition{}) + yyh4787.ElemContainerState(yyj4787) if r.TryDecodeAsNil() { - yyv4813[yyj4813] = NodeCondition{} + yyv4787[yyj4787] = NodeCondition{} } else { - yyv4815 := &yyv4813[yyj4813] - yyv4815.CodecDecodeSelf(d) + yyv4789 := &yyv4787[yyj4787] + yyv4789.CodecDecodeSelf(d) } } } } else { - yyj4813 := 0 - for ; !r.CheckBreak(); yyj4813++ { + yyj4787 := 0 + for ; !r.CheckBreak(); yyj4787++ { - if yyj4813 >= len(yyv4813) { - yyv4813 = append(yyv4813, NodeCondition{}) // var yyz4813 NodeCondition - yyc4813 = true + if yyj4787 >= len(yyv4787) { + yyv4787 = append(yyv4787, NodeCondition{}) // var yyz4787 NodeCondition + yyc4787 = true } - yyh4813.ElemContainerState(yyj4813) - if yyj4813 < len(yyv4813) { + yyh4787.ElemContainerState(yyj4787) + if yyj4787 < len(yyv4787) { if r.TryDecodeAsNil() { - yyv4813[yyj4813] = NodeCondition{} + yyv4787[yyj4787] = NodeCondition{} } else { - yyv4816 := &yyv4813[yyj4813] - yyv4816.CodecDecodeSelf(d) + yyv4790 := &yyv4787[yyj4787] + yyv4790.CodecDecodeSelf(d) } } else { @@ -61296,17 +60997,17 @@ func (x codecSelfer1234) decSliceNodeCondition(v *[]NodeCondition, d *codec1978. } } - if yyj4813 < len(yyv4813) { - yyv4813 = yyv4813[:yyj4813] - yyc4813 = true - } else if yyj4813 == 0 && yyv4813 == nil { - yyv4813 = []NodeCondition{} - yyc4813 = true + if yyj4787 < len(yyv4787) { + yyv4787 = yyv4787[:yyj4787] + yyc4787 = true + } else if yyj4787 == 0 && yyv4787 == nil { + yyv4787 = []NodeCondition{} + yyc4787 = true } } - yyh4813.End() - if yyc4813 { - *v = yyv4813 + yyh4787.End() + if yyc4787 { + *v = yyv4787 } } @@ -61315,10 +61016,10 @@ func (x codecSelfer1234) encSliceNodeAddress(v []NodeAddress, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4817 := range v { + for _, yyv4791 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4818 := &yyv4817 - yy4818.CodecEncodeSelf(e) + yy4792 := &yyv4791 + yy4792.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61328,83 +61029,83 @@ func (x codecSelfer1234) decSliceNodeAddress(v *[]NodeAddress, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4819 := *v - yyh4819, yyl4819 := z.DecSliceHelperStart() - var yyc4819 bool - if yyl4819 == 0 { - if yyv4819 == nil { - yyv4819 = []NodeAddress{} - yyc4819 = true - } else if len(yyv4819) != 0 { - yyv4819 = yyv4819[:0] - yyc4819 = true + yyv4793 := *v + yyh4793, yyl4793 := z.DecSliceHelperStart() + var yyc4793 bool + if yyl4793 == 0 { + if yyv4793 == nil { + yyv4793 = []NodeAddress{} + yyc4793 = true + } else if len(yyv4793) != 0 { + yyv4793 = yyv4793[:0] + yyc4793 = true } - } else if yyl4819 > 0 { - var yyrr4819, yyrl4819 int - var yyrt4819 bool - if yyl4819 > cap(yyv4819) { + } else if yyl4793 > 0 { + var yyrr4793, yyrl4793 int + var yyrt4793 bool + if yyl4793 > cap(yyv4793) { - yyrg4819 := len(yyv4819) > 0 - yyv24819 := yyv4819 - yyrl4819, yyrt4819 = z.DecInferLen(yyl4819, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4819 { - if yyrl4819 <= cap(yyv4819) { - yyv4819 = yyv4819[:yyrl4819] + yyrg4793 := len(yyv4793) > 0 + yyv24793 := yyv4793 + yyrl4793, yyrt4793 = z.DecInferLen(yyl4793, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4793 { + if yyrl4793 <= cap(yyv4793) { + yyv4793 = yyv4793[:yyrl4793] } else { - yyv4819 = make([]NodeAddress, yyrl4819) + yyv4793 = make([]NodeAddress, yyrl4793) } } else { - yyv4819 = make([]NodeAddress, yyrl4819) + yyv4793 = make([]NodeAddress, yyrl4793) } - yyc4819 = true - yyrr4819 = len(yyv4819) - if yyrg4819 { - copy(yyv4819, yyv24819) + yyc4793 = true + yyrr4793 = len(yyv4793) + if yyrg4793 { + copy(yyv4793, yyv24793) } - } else if yyl4819 != len(yyv4819) { - yyv4819 = yyv4819[:yyl4819] - yyc4819 = true + } else if yyl4793 != len(yyv4793) { + yyv4793 = yyv4793[:yyl4793] + yyc4793 = true } - yyj4819 := 0 - for ; yyj4819 < yyrr4819; yyj4819++ { - yyh4819.ElemContainerState(yyj4819) + yyj4793 := 0 + for ; yyj4793 < yyrr4793; yyj4793++ { + yyh4793.ElemContainerState(yyj4793) if r.TryDecodeAsNil() { - yyv4819[yyj4819] = NodeAddress{} + yyv4793[yyj4793] = NodeAddress{} } else { - yyv4820 := &yyv4819[yyj4819] - yyv4820.CodecDecodeSelf(d) + yyv4794 := &yyv4793[yyj4793] + yyv4794.CodecDecodeSelf(d) } } - if yyrt4819 { - for ; yyj4819 < yyl4819; yyj4819++ { - yyv4819 = append(yyv4819, NodeAddress{}) - yyh4819.ElemContainerState(yyj4819) + if yyrt4793 { + for ; yyj4793 < yyl4793; yyj4793++ { + yyv4793 = append(yyv4793, NodeAddress{}) + yyh4793.ElemContainerState(yyj4793) if r.TryDecodeAsNil() { - yyv4819[yyj4819] = NodeAddress{} + yyv4793[yyj4793] = NodeAddress{} } else { - yyv4821 := &yyv4819[yyj4819] - yyv4821.CodecDecodeSelf(d) + yyv4795 := &yyv4793[yyj4793] + yyv4795.CodecDecodeSelf(d) } } } } else { - yyj4819 := 0 - for ; !r.CheckBreak(); yyj4819++ { + yyj4793 := 0 + for ; !r.CheckBreak(); yyj4793++ { - if yyj4819 >= len(yyv4819) { - yyv4819 = append(yyv4819, NodeAddress{}) // var yyz4819 NodeAddress - yyc4819 = true + if yyj4793 >= len(yyv4793) { + yyv4793 = append(yyv4793, NodeAddress{}) // var yyz4793 NodeAddress + yyc4793 = true } - yyh4819.ElemContainerState(yyj4819) - if yyj4819 < len(yyv4819) { + yyh4793.ElemContainerState(yyj4793) + if yyj4793 < len(yyv4793) { if r.TryDecodeAsNil() { - yyv4819[yyj4819] = NodeAddress{} + yyv4793[yyj4793] = NodeAddress{} } else { - yyv4822 := &yyv4819[yyj4819] - yyv4822.CodecDecodeSelf(d) + yyv4796 := &yyv4793[yyj4793] + yyv4796.CodecDecodeSelf(d) } } else { @@ -61412,17 +61113,17 @@ func (x codecSelfer1234) decSliceNodeAddress(v *[]NodeAddress, d *codec1978.Deco } } - if yyj4819 < len(yyv4819) { - yyv4819 = yyv4819[:yyj4819] - yyc4819 = true - } else if yyj4819 == 0 && yyv4819 == nil { - yyv4819 = []NodeAddress{} - yyc4819 = true + if yyj4793 < len(yyv4793) { + yyv4793 = yyv4793[:yyj4793] + yyc4793 = true + } else if yyj4793 == 0 && yyv4793 == nil { + yyv4793 = []NodeAddress{} + yyc4793 = true } } - yyh4819.End() - if yyc4819 { - *v = yyv4819 + yyh4793.End() + if yyc4793 { + *v = yyv4793 } } @@ -61431,10 +61132,10 @@ func (x codecSelfer1234) encSliceContainerImage(v []ContainerImage, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4823 := range v { + for _, yyv4797 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4824 := &yyv4823 - yy4824.CodecEncodeSelf(e) + yy4798 := &yyv4797 + yy4798.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61444,83 +61145,83 @@ func (x codecSelfer1234) decSliceContainerImage(v *[]ContainerImage, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4825 := *v - yyh4825, yyl4825 := z.DecSliceHelperStart() - var yyc4825 bool - if yyl4825 == 0 { - if yyv4825 == nil { - yyv4825 = []ContainerImage{} - yyc4825 = true - } else if len(yyv4825) != 0 { - yyv4825 = yyv4825[:0] - yyc4825 = true + yyv4799 := *v + yyh4799, yyl4799 := z.DecSliceHelperStart() + var yyc4799 bool + if yyl4799 == 0 { + if yyv4799 == nil { + yyv4799 = []ContainerImage{} + yyc4799 = true + } else if len(yyv4799) != 0 { + yyv4799 = yyv4799[:0] + yyc4799 = true } - } else if yyl4825 > 0 { - var yyrr4825, yyrl4825 int - var yyrt4825 bool - if yyl4825 > cap(yyv4825) { + } else if yyl4799 > 0 { + var yyrr4799, yyrl4799 int + var yyrt4799 bool + if yyl4799 > cap(yyv4799) { - yyrg4825 := len(yyv4825) > 0 - yyv24825 := yyv4825 - yyrl4825, yyrt4825 = z.DecInferLen(yyl4825, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4825 { - if yyrl4825 <= cap(yyv4825) { - yyv4825 = yyv4825[:yyrl4825] + yyrg4799 := len(yyv4799) > 0 + yyv24799 := yyv4799 + yyrl4799, yyrt4799 = z.DecInferLen(yyl4799, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4799 { + if yyrl4799 <= cap(yyv4799) { + yyv4799 = yyv4799[:yyrl4799] } else { - yyv4825 = make([]ContainerImage, yyrl4825) + yyv4799 = make([]ContainerImage, yyrl4799) } } else { - yyv4825 = make([]ContainerImage, yyrl4825) + yyv4799 = make([]ContainerImage, yyrl4799) } - yyc4825 = true - yyrr4825 = len(yyv4825) - if yyrg4825 { - copy(yyv4825, yyv24825) + yyc4799 = true + yyrr4799 = len(yyv4799) + if yyrg4799 { + copy(yyv4799, yyv24799) } - } else if yyl4825 != len(yyv4825) { - yyv4825 = yyv4825[:yyl4825] - yyc4825 = true + } else if yyl4799 != len(yyv4799) { + yyv4799 = yyv4799[:yyl4799] + yyc4799 = true } - yyj4825 := 0 - for ; yyj4825 < yyrr4825; yyj4825++ { - yyh4825.ElemContainerState(yyj4825) + yyj4799 := 0 + for ; yyj4799 < yyrr4799; yyj4799++ { + yyh4799.ElemContainerState(yyj4799) if r.TryDecodeAsNil() { - yyv4825[yyj4825] = ContainerImage{} + yyv4799[yyj4799] = ContainerImage{} } else { - yyv4826 := &yyv4825[yyj4825] - yyv4826.CodecDecodeSelf(d) + yyv4800 := &yyv4799[yyj4799] + yyv4800.CodecDecodeSelf(d) } } - if yyrt4825 { - for ; yyj4825 < yyl4825; yyj4825++ { - yyv4825 = append(yyv4825, ContainerImage{}) - yyh4825.ElemContainerState(yyj4825) + if yyrt4799 { + for ; yyj4799 < yyl4799; yyj4799++ { + yyv4799 = append(yyv4799, ContainerImage{}) + yyh4799.ElemContainerState(yyj4799) if r.TryDecodeAsNil() { - yyv4825[yyj4825] = ContainerImage{} + yyv4799[yyj4799] = ContainerImage{} } else { - yyv4827 := &yyv4825[yyj4825] - yyv4827.CodecDecodeSelf(d) + yyv4801 := &yyv4799[yyj4799] + yyv4801.CodecDecodeSelf(d) } } } } else { - yyj4825 := 0 - for ; !r.CheckBreak(); yyj4825++ { + yyj4799 := 0 + for ; !r.CheckBreak(); yyj4799++ { - if yyj4825 >= len(yyv4825) { - yyv4825 = append(yyv4825, ContainerImage{}) // var yyz4825 ContainerImage - yyc4825 = true + if yyj4799 >= len(yyv4799) { + yyv4799 = append(yyv4799, ContainerImage{}) // var yyz4799 ContainerImage + yyc4799 = true } - yyh4825.ElemContainerState(yyj4825) - if yyj4825 < len(yyv4825) { + yyh4799.ElemContainerState(yyj4799) + if yyj4799 < len(yyv4799) { if r.TryDecodeAsNil() { - yyv4825[yyj4825] = ContainerImage{} + yyv4799[yyj4799] = ContainerImage{} } else { - yyv4828 := &yyv4825[yyj4825] - yyv4828.CodecDecodeSelf(d) + yyv4802 := &yyv4799[yyj4799] + yyv4802.CodecDecodeSelf(d) } } else { @@ -61528,17 +61229,17 @@ func (x codecSelfer1234) decSliceContainerImage(v *[]ContainerImage, d *codec197 } } - if yyj4825 < len(yyv4825) { - yyv4825 = yyv4825[:yyj4825] - yyc4825 = true - } else if yyj4825 == 0 && yyv4825 == nil { - yyv4825 = []ContainerImage{} - yyc4825 = true + if yyj4799 < len(yyv4799) { + yyv4799 = yyv4799[:yyj4799] + yyc4799 = true + } else if yyj4799 == 0 && yyv4799 == nil { + yyv4799 = []ContainerImage{} + yyc4799 = true } } - yyh4825.End() - if yyc4825 { - *v = yyv4825 + yyh4799.End() + if yyc4799 { + *v = yyv4799 } } @@ -61547,9 +61248,9 @@ func (x codecSelfer1234) encSliceUniqueVolumeName(v []UniqueVolumeName, e *codec z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4829 := range v { + for _, yyv4803 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4829.CodecEncodeSelf(e) + yyv4803.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61559,75 +61260,75 @@ func (x codecSelfer1234) decSliceUniqueVolumeName(v *[]UniqueVolumeName, d *code z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4830 := *v - yyh4830, yyl4830 := z.DecSliceHelperStart() - var yyc4830 bool - if yyl4830 == 0 { - if yyv4830 == nil { - yyv4830 = []UniqueVolumeName{} - yyc4830 = true - } else if len(yyv4830) != 0 { - yyv4830 = yyv4830[:0] - yyc4830 = true + yyv4804 := *v + yyh4804, yyl4804 := z.DecSliceHelperStart() + var yyc4804 bool + if yyl4804 == 0 { + if yyv4804 == nil { + yyv4804 = []UniqueVolumeName{} + yyc4804 = true + } else if len(yyv4804) != 0 { + yyv4804 = yyv4804[:0] + yyc4804 = true } - } else if yyl4830 > 0 { - var yyrr4830, yyrl4830 int - var yyrt4830 bool - if yyl4830 > cap(yyv4830) { + } else if yyl4804 > 0 { + var yyrr4804, yyrl4804 int + var yyrt4804 bool + if yyl4804 > cap(yyv4804) { - yyrl4830, yyrt4830 = z.DecInferLen(yyl4830, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4830 { - if yyrl4830 <= cap(yyv4830) { - yyv4830 = yyv4830[:yyrl4830] + yyrl4804, yyrt4804 = z.DecInferLen(yyl4804, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4804 { + if yyrl4804 <= cap(yyv4804) { + yyv4804 = yyv4804[:yyrl4804] } else { - yyv4830 = make([]UniqueVolumeName, yyrl4830) + yyv4804 = make([]UniqueVolumeName, yyrl4804) } } else { - yyv4830 = make([]UniqueVolumeName, yyrl4830) + yyv4804 = make([]UniqueVolumeName, yyrl4804) } - yyc4830 = true - yyrr4830 = len(yyv4830) - } else if yyl4830 != len(yyv4830) { - yyv4830 = yyv4830[:yyl4830] - yyc4830 = true + yyc4804 = true + yyrr4804 = len(yyv4804) + } else if yyl4804 != len(yyv4804) { + yyv4804 = yyv4804[:yyl4804] + yyc4804 = true } - yyj4830 := 0 - for ; yyj4830 < yyrr4830; yyj4830++ { - yyh4830.ElemContainerState(yyj4830) + yyj4804 := 0 + for ; yyj4804 < yyrr4804; yyj4804++ { + yyh4804.ElemContainerState(yyj4804) if r.TryDecodeAsNil() { - yyv4830[yyj4830] = "" + yyv4804[yyj4804] = "" } else { - yyv4830[yyj4830] = UniqueVolumeName(r.DecodeString()) + yyv4804[yyj4804] = UniqueVolumeName(r.DecodeString()) } } - if yyrt4830 { - for ; yyj4830 < yyl4830; yyj4830++ { - yyv4830 = append(yyv4830, "") - yyh4830.ElemContainerState(yyj4830) + if yyrt4804 { + for ; yyj4804 < yyl4804; yyj4804++ { + yyv4804 = append(yyv4804, "") + yyh4804.ElemContainerState(yyj4804) if r.TryDecodeAsNil() { - yyv4830[yyj4830] = "" + yyv4804[yyj4804] = "" } else { - yyv4830[yyj4830] = UniqueVolumeName(r.DecodeString()) + yyv4804[yyj4804] = UniqueVolumeName(r.DecodeString()) } } } } else { - yyj4830 := 0 - for ; !r.CheckBreak(); yyj4830++ { + yyj4804 := 0 + for ; !r.CheckBreak(); yyj4804++ { - if yyj4830 >= len(yyv4830) { - yyv4830 = append(yyv4830, "") // var yyz4830 UniqueVolumeName - yyc4830 = true + if yyj4804 >= len(yyv4804) { + yyv4804 = append(yyv4804, "") // var yyz4804 UniqueVolumeName + yyc4804 = true } - yyh4830.ElemContainerState(yyj4830) - if yyj4830 < len(yyv4830) { + yyh4804.ElemContainerState(yyj4804) + if yyj4804 < len(yyv4804) { if r.TryDecodeAsNil() { - yyv4830[yyj4830] = "" + yyv4804[yyj4804] = "" } else { - yyv4830[yyj4830] = UniqueVolumeName(r.DecodeString()) + yyv4804[yyj4804] = UniqueVolumeName(r.DecodeString()) } } else { @@ -61635,17 +61336,17 @@ func (x codecSelfer1234) decSliceUniqueVolumeName(v *[]UniqueVolumeName, d *code } } - if yyj4830 < len(yyv4830) { - yyv4830 = yyv4830[:yyj4830] - yyc4830 = true - } else if yyj4830 == 0 && yyv4830 == nil { - yyv4830 = []UniqueVolumeName{} - yyc4830 = true + if yyj4804 < len(yyv4804) { + yyv4804 = yyv4804[:yyj4804] + yyc4804 = true + } else if yyj4804 == 0 && yyv4804 == nil { + yyv4804 = []UniqueVolumeName{} + yyc4804 = true } } - yyh4830.End() - if yyc4830 { - *v = yyv4830 + yyh4804.End() + if yyc4804 { + *v = yyv4804 } } @@ -61654,10 +61355,10 @@ func (x codecSelfer1234) encSliceAttachedVolume(v []AttachedVolume, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4834 := range v { + for _, yyv4808 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4835 := &yyv4834 - yy4835.CodecEncodeSelf(e) + yy4809 := &yyv4808 + yy4809.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61667,83 +61368,83 @@ func (x codecSelfer1234) decSliceAttachedVolume(v *[]AttachedVolume, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4836 := *v - yyh4836, yyl4836 := z.DecSliceHelperStart() - var yyc4836 bool - if yyl4836 == 0 { - if yyv4836 == nil { - yyv4836 = []AttachedVolume{} - yyc4836 = true - } else if len(yyv4836) != 0 { - yyv4836 = yyv4836[:0] - yyc4836 = true + yyv4810 := *v + yyh4810, yyl4810 := z.DecSliceHelperStart() + var yyc4810 bool + if yyl4810 == 0 { + if yyv4810 == nil { + yyv4810 = []AttachedVolume{} + yyc4810 = true + } else if len(yyv4810) != 0 { + yyv4810 = yyv4810[:0] + yyc4810 = true } - } else if yyl4836 > 0 { - var yyrr4836, yyrl4836 int - var yyrt4836 bool - if yyl4836 > cap(yyv4836) { + } else if yyl4810 > 0 { + var yyrr4810, yyrl4810 int + var yyrt4810 bool + if yyl4810 > cap(yyv4810) { - yyrg4836 := len(yyv4836) > 0 - yyv24836 := yyv4836 - yyrl4836, yyrt4836 = z.DecInferLen(yyl4836, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4836 { - if yyrl4836 <= cap(yyv4836) { - yyv4836 = yyv4836[:yyrl4836] + yyrg4810 := len(yyv4810) > 0 + yyv24810 := yyv4810 + yyrl4810, yyrt4810 = z.DecInferLen(yyl4810, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4810 { + if yyrl4810 <= cap(yyv4810) { + yyv4810 = yyv4810[:yyrl4810] } else { - yyv4836 = make([]AttachedVolume, yyrl4836) + yyv4810 = make([]AttachedVolume, yyrl4810) } } else { - yyv4836 = make([]AttachedVolume, yyrl4836) + yyv4810 = make([]AttachedVolume, yyrl4810) } - yyc4836 = true - yyrr4836 = len(yyv4836) - if yyrg4836 { - copy(yyv4836, yyv24836) + yyc4810 = true + yyrr4810 = len(yyv4810) + if yyrg4810 { + copy(yyv4810, yyv24810) } - } else if yyl4836 != len(yyv4836) { - yyv4836 = yyv4836[:yyl4836] - yyc4836 = true + } else if yyl4810 != len(yyv4810) { + yyv4810 = yyv4810[:yyl4810] + yyc4810 = true } - yyj4836 := 0 - for ; yyj4836 < yyrr4836; yyj4836++ { - yyh4836.ElemContainerState(yyj4836) + yyj4810 := 0 + for ; yyj4810 < yyrr4810; yyj4810++ { + yyh4810.ElemContainerState(yyj4810) if r.TryDecodeAsNil() { - yyv4836[yyj4836] = AttachedVolume{} + yyv4810[yyj4810] = AttachedVolume{} } else { - yyv4837 := &yyv4836[yyj4836] - yyv4837.CodecDecodeSelf(d) + yyv4811 := &yyv4810[yyj4810] + yyv4811.CodecDecodeSelf(d) } } - if yyrt4836 { - for ; yyj4836 < yyl4836; yyj4836++ { - yyv4836 = append(yyv4836, AttachedVolume{}) - yyh4836.ElemContainerState(yyj4836) + if yyrt4810 { + for ; yyj4810 < yyl4810; yyj4810++ { + yyv4810 = append(yyv4810, AttachedVolume{}) + yyh4810.ElemContainerState(yyj4810) if r.TryDecodeAsNil() { - yyv4836[yyj4836] = AttachedVolume{} + yyv4810[yyj4810] = AttachedVolume{} } else { - yyv4838 := &yyv4836[yyj4836] - yyv4838.CodecDecodeSelf(d) + yyv4812 := &yyv4810[yyj4810] + yyv4812.CodecDecodeSelf(d) } } } } else { - yyj4836 := 0 - for ; !r.CheckBreak(); yyj4836++ { + yyj4810 := 0 + for ; !r.CheckBreak(); yyj4810++ { - if yyj4836 >= len(yyv4836) { - yyv4836 = append(yyv4836, AttachedVolume{}) // var yyz4836 AttachedVolume - yyc4836 = true + if yyj4810 >= len(yyv4810) { + yyv4810 = append(yyv4810, AttachedVolume{}) // var yyz4810 AttachedVolume + yyc4810 = true } - yyh4836.ElemContainerState(yyj4836) - if yyj4836 < len(yyv4836) { + yyh4810.ElemContainerState(yyj4810) + if yyj4810 < len(yyv4810) { if r.TryDecodeAsNil() { - yyv4836[yyj4836] = AttachedVolume{} + yyv4810[yyj4810] = AttachedVolume{} } else { - yyv4839 := &yyv4836[yyj4836] - yyv4839.CodecDecodeSelf(d) + yyv4813 := &yyv4810[yyj4810] + yyv4813.CodecDecodeSelf(d) } } else { @@ -61751,17 +61452,17 @@ func (x codecSelfer1234) decSliceAttachedVolume(v *[]AttachedVolume, d *codec197 } } - if yyj4836 < len(yyv4836) { - yyv4836 = yyv4836[:yyj4836] - yyc4836 = true - } else if yyj4836 == 0 && yyv4836 == nil { - yyv4836 = []AttachedVolume{} - yyc4836 = true + if yyj4810 < len(yyv4810) { + yyv4810 = yyv4810[:yyj4810] + yyc4810 = true + } else if yyj4810 == 0 && yyv4810 == nil { + yyv4810 = []AttachedVolume{} + yyc4810 = true } } - yyh4836.End() - if yyc4836 { - *v = yyv4836 + yyh4810.End() + if yyc4810 { + *v = yyv4810 } } @@ -61770,10 +61471,10 @@ func (x codecSelfer1234) encSlicePreferAvoidPodsEntry(v []PreferAvoidPodsEntry, z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4840 := range v { + for _, yyv4814 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4841 := &yyv4840 - yy4841.CodecEncodeSelf(e) + yy4815 := &yyv4814 + yy4815.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61783,83 +61484,83 @@ func (x codecSelfer1234) decSlicePreferAvoidPodsEntry(v *[]PreferAvoidPodsEntry, z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4842 := *v - yyh4842, yyl4842 := z.DecSliceHelperStart() - var yyc4842 bool - if yyl4842 == 0 { - if yyv4842 == nil { - yyv4842 = []PreferAvoidPodsEntry{} - yyc4842 = true - } else if len(yyv4842) != 0 { - yyv4842 = yyv4842[:0] - yyc4842 = true + yyv4816 := *v + yyh4816, yyl4816 := z.DecSliceHelperStart() + var yyc4816 bool + if yyl4816 == 0 { + if yyv4816 == nil { + yyv4816 = []PreferAvoidPodsEntry{} + yyc4816 = true + } else if len(yyv4816) != 0 { + yyv4816 = yyv4816[:0] + yyc4816 = true } - } else if yyl4842 > 0 { - var yyrr4842, yyrl4842 int - var yyrt4842 bool - if yyl4842 > cap(yyv4842) { + } else if yyl4816 > 0 { + var yyrr4816, yyrl4816 int + var yyrt4816 bool + if yyl4816 > cap(yyv4816) { - yyrg4842 := len(yyv4842) > 0 - yyv24842 := yyv4842 - yyrl4842, yyrt4842 = z.DecInferLen(yyl4842, z.DecBasicHandle().MaxInitLen, 64) - if yyrt4842 { - if yyrl4842 <= cap(yyv4842) { - yyv4842 = yyv4842[:yyrl4842] + yyrg4816 := len(yyv4816) > 0 + yyv24816 := yyv4816 + yyrl4816, yyrt4816 = z.DecInferLen(yyl4816, z.DecBasicHandle().MaxInitLen, 64) + if yyrt4816 { + if yyrl4816 <= cap(yyv4816) { + yyv4816 = yyv4816[:yyrl4816] } else { - yyv4842 = make([]PreferAvoidPodsEntry, yyrl4842) + yyv4816 = make([]PreferAvoidPodsEntry, yyrl4816) } } else { - yyv4842 = make([]PreferAvoidPodsEntry, yyrl4842) + yyv4816 = make([]PreferAvoidPodsEntry, yyrl4816) } - yyc4842 = true - yyrr4842 = len(yyv4842) - if yyrg4842 { - copy(yyv4842, yyv24842) + yyc4816 = true + yyrr4816 = len(yyv4816) + if yyrg4816 { + copy(yyv4816, yyv24816) } - } else if yyl4842 != len(yyv4842) { - yyv4842 = yyv4842[:yyl4842] - yyc4842 = true + } else if yyl4816 != len(yyv4816) { + yyv4816 = yyv4816[:yyl4816] + yyc4816 = true } - yyj4842 := 0 - for ; yyj4842 < yyrr4842; yyj4842++ { - yyh4842.ElemContainerState(yyj4842) + yyj4816 := 0 + for ; yyj4816 < yyrr4816; yyj4816++ { + yyh4816.ElemContainerState(yyj4816) if r.TryDecodeAsNil() { - yyv4842[yyj4842] = PreferAvoidPodsEntry{} + yyv4816[yyj4816] = PreferAvoidPodsEntry{} } else { - yyv4843 := &yyv4842[yyj4842] - yyv4843.CodecDecodeSelf(d) + yyv4817 := &yyv4816[yyj4816] + yyv4817.CodecDecodeSelf(d) } } - if yyrt4842 { - for ; yyj4842 < yyl4842; yyj4842++ { - yyv4842 = append(yyv4842, PreferAvoidPodsEntry{}) - yyh4842.ElemContainerState(yyj4842) + if yyrt4816 { + for ; yyj4816 < yyl4816; yyj4816++ { + yyv4816 = append(yyv4816, PreferAvoidPodsEntry{}) + yyh4816.ElemContainerState(yyj4816) if r.TryDecodeAsNil() { - yyv4842[yyj4842] = PreferAvoidPodsEntry{} + yyv4816[yyj4816] = PreferAvoidPodsEntry{} } else { - yyv4844 := &yyv4842[yyj4842] - yyv4844.CodecDecodeSelf(d) + yyv4818 := &yyv4816[yyj4816] + yyv4818.CodecDecodeSelf(d) } } } } else { - yyj4842 := 0 - for ; !r.CheckBreak(); yyj4842++ { + yyj4816 := 0 + for ; !r.CheckBreak(); yyj4816++ { - if yyj4842 >= len(yyv4842) { - yyv4842 = append(yyv4842, PreferAvoidPodsEntry{}) // var yyz4842 PreferAvoidPodsEntry - yyc4842 = true + if yyj4816 >= len(yyv4816) { + yyv4816 = append(yyv4816, PreferAvoidPodsEntry{}) // var yyz4816 PreferAvoidPodsEntry + yyc4816 = true } - yyh4842.ElemContainerState(yyj4842) - if yyj4842 < len(yyv4842) { + yyh4816.ElemContainerState(yyj4816) + if yyj4816 < len(yyv4816) { if r.TryDecodeAsNil() { - yyv4842[yyj4842] = PreferAvoidPodsEntry{} + yyv4816[yyj4816] = PreferAvoidPodsEntry{} } else { - yyv4845 := &yyv4842[yyj4842] - yyv4845.CodecDecodeSelf(d) + yyv4819 := &yyv4816[yyj4816] + yyv4819.CodecDecodeSelf(d) } } else { @@ -61867,17 +61568,17 @@ func (x codecSelfer1234) decSlicePreferAvoidPodsEntry(v *[]PreferAvoidPodsEntry, } } - if yyj4842 < len(yyv4842) { - yyv4842 = yyv4842[:yyj4842] - yyc4842 = true - } else if yyj4842 == 0 && yyv4842 == nil { - yyv4842 = []PreferAvoidPodsEntry{} - yyc4842 = true + if yyj4816 < len(yyv4816) { + yyv4816 = yyv4816[:yyj4816] + yyc4816 = true + } else if yyj4816 == 0 && yyv4816 == nil { + yyv4816 = []PreferAvoidPodsEntry{} + yyc4816 = true } } - yyh4842.End() - if yyc4842 { - *v = yyv4842 + yyh4816.End() + if yyc4816 { + *v = yyv4816 } } @@ -61886,19 +61587,19 @@ func (x codecSelfer1234) encResourceList(v ResourceList, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeMapStart(len(v)) - for yyk4846, yyv4846 := range v { + for yyk4820, yyv4820 := range v { z.EncSendContainerState(codecSelfer_containerMapKey1234) - yyk4846.CodecEncodeSelf(e) + yyk4820.CodecEncodeSelf(e) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4847 := &yyv4846 - yym4848 := z.EncBinary() - _ = yym4848 + yy4821 := &yyv4820 + yym4822 := z.EncBinary() + _ = yym4822 if false { - } else if z.HasExtensions() && z.EncExt(yy4847) { - } else if !yym4848 && z.IsJSONHandle() { - z.EncJSONMarshal(yy4847) + } else if z.HasExtensions() && z.EncExt(yy4821) { + } else if !yym4822 && z.IsJSONHandle() { + z.EncJSONMarshal(yy4821) } else { - z.EncFallback(yy4847) + z.EncFallback(yy4821) } } z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -61909,86 +61610,86 @@ func (x codecSelfer1234) decResourceList(v *ResourceList, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4849 := *v - yyl4849 := r.ReadMapStart() - yybh4849 := z.DecBasicHandle() - if yyv4849 == nil { - yyrl4849, _ := z.DecInferLen(yyl4849, yybh4849.MaxInitLen, 72) - yyv4849 = make(map[ResourceName]pkg3_resource.Quantity, yyrl4849) - *v = yyv4849 + yyv4823 := *v + yyl4823 := r.ReadMapStart() + yybh4823 := z.DecBasicHandle() + if yyv4823 == nil { + yyrl4823, _ := z.DecInferLen(yyl4823, yybh4823.MaxInitLen, 72) + yyv4823 = make(map[ResourceName]pkg3_resource.Quantity, yyrl4823) + *v = yyv4823 } - var yymk4849 ResourceName - var yymv4849 pkg3_resource.Quantity - var yymg4849 bool - if yybh4849.MapValueReset { - yymg4849 = true + var yymk4823 ResourceName + var yymv4823 pkg3_resource.Quantity + var yymg4823 bool + if yybh4823.MapValueReset { + yymg4823 = true } - if yyl4849 > 0 { - for yyj4849 := 0; yyj4849 < yyl4849; yyj4849++ { + if yyl4823 > 0 { + for yyj4823 := 0; yyj4823 < yyl4823; yyj4823++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk4849 = "" + yymk4823 = "" } else { - yymk4849 = ResourceName(r.DecodeString()) + yymk4823 = ResourceName(r.DecodeString()) } - if yymg4849 { - yymv4849 = yyv4849[yymk4849] + if yymg4823 { + yymv4823 = yyv4823[yymk4823] } else { - yymv4849 = pkg3_resource.Quantity{} + yymv4823 = pkg3_resource.Quantity{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv4849 = pkg3_resource.Quantity{} + yymv4823 = pkg3_resource.Quantity{} } else { - yyv4851 := &yymv4849 - yym4852 := z.DecBinary() - _ = yym4852 + yyv4825 := &yymv4823 + yym4826 := z.DecBinary() + _ = yym4826 if false { - } else if z.HasExtensions() && z.DecExt(yyv4851) { - } else if !yym4852 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4851) + } else if z.HasExtensions() && z.DecExt(yyv4825) { + } else if !yym4826 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv4825) } else { - z.DecFallback(yyv4851, false) + z.DecFallback(yyv4825, false) } } - if yyv4849 != nil { - yyv4849[yymk4849] = yymv4849 + if yyv4823 != nil { + yyv4823[yymk4823] = yymv4823 } } - } else if yyl4849 < 0 { - for yyj4849 := 0; !r.CheckBreak(); yyj4849++ { + } else if yyl4823 < 0 { + for yyj4823 := 0; !r.CheckBreak(); yyj4823++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk4849 = "" + yymk4823 = "" } else { - yymk4849 = ResourceName(r.DecodeString()) + yymk4823 = ResourceName(r.DecodeString()) } - if yymg4849 { - yymv4849 = yyv4849[yymk4849] + if yymg4823 { + yymv4823 = yyv4823[yymk4823] } else { - yymv4849 = pkg3_resource.Quantity{} + yymv4823 = pkg3_resource.Quantity{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv4849 = pkg3_resource.Quantity{} + yymv4823 = pkg3_resource.Quantity{} } else { - yyv4854 := &yymv4849 - yym4855 := z.DecBinary() - _ = yym4855 + yyv4828 := &yymv4823 + yym4829 := z.DecBinary() + _ = yym4829 if false { - } else if z.HasExtensions() && z.DecExt(yyv4854) { - } else if !yym4855 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4854) + } else if z.HasExtensions() && z.DecExt(yyv4828) { + } else if !yym4829 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv4828) } else { - z.DecFallback(yyv4854, false) + z.DecFallback(yyv4828, false) } } - if yyv4849 != nil { - yyv4849[yymk4849] = yymv4849 + if yyv4823 != nil { + yyv4823[yymk4823] = yymv4823 } } } // else len==0: TODO: Should we clear map entries? @@ -62000,10 +61701,10 @@ func (x codecSelfer1234) encSliceNode(v []Node, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4856 := range v { + for _, yyv4830 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4857 := &yyv4856 - yy4857.CodecEncodeSelf(e) + yy4831 := &yyv4830 + yy4831.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -62013,83 +61714,83 @@ func (x codecSelfer1234) decSliceNode(v *[]Node, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4858 := *v - yyh4858, yyl4858 := z.DecSliceHelperStart() - var yyc4858 bool - if yyl4858 == 0 { - if yyv4858 == nil { - yyv4858 = []Node{} - yyc4858 = true - } else if len(yyv4858) != 0 { - yyv4858 = yyv4858[:0] - yyc4858 = true + yyv4832 := *v + yyh4832, yyl4832 := z.DecSliceHelperStart() + var yyc4832 bool + if yyl4832 == 0 { + if yyv4832 == nil { + yyv4832 = []Node{} + yyc4832 = true + } else if len(yyv4832) != 0 { + yyv4832 = yyv4832[:0] + yyc4832 = true } - } else if yyl4858 > 0 { - var yyrr4858, yyrl4858 int - var yyrt4858 bool - if yyl4858 > cap(yyv4858) { + } else if yyl4832 > 0 { + var yyrr4832, yyrl4832 int + var yyrt4832 bool + if yyl4832 > cap(yyv4832) { - yyrg4858 := len(yyv4858) > 0 - yyv24858 := yyv4858 - yyrl4858, yyrt4858 = z.DecInferLen(yyl4858, z.DecBasicHandle().MaxInitLen, 632) - if yyrt4858 { - if yyrl4858 <= cap(yyv4858) { - yyv4858 = yyv4858[:yyrl4858] + yyrg4832 := len(yyv4832) > 0 + yyv24832 := yyv4832 + yyrl4832, yyrt4832 = z.DecInferLen(yyl4832, z.DecBasicHandle().MaxInitLen, 632) + if yyrt4832 { + if yyrl4832 <= cap(yyv4832) { + yyv4832 = yyv4832[:yyrl4832] } else { - yyv4858 = make([]Node, yyrl4858) + yyv4832 = make([]Node, yyrl4832) } } else { - yyv4858 = make([]Node, yyrl4858) + yyv4832 = make([]Node, yyrl4832) } - yyc4858 = true - yyrr4858 = len(yyv4858) - if yyrg4858 { - copy(yyv4858, yyv24858) + yyc4832 = true + yyrr4832 = len(yyv4832) + if yyrg4832 { + copy(yyv4832, yyv24832) } - } else if yyl4858 != len(yyv4858) { - yyv4858 = yyv4858[:yyl4858] - yyc4858 = true + } else if yyl4832 != len(yyv4832) { + yyv4832 = yyv4832[:yyl4832] + yyc4832 = true } - yyj4858 := 0 - for ; yyj4858 < yyrr4858; yyj4858++ { - yyh4858.ElemContainerState(yyj4858) + yyj4832 := 0 + for ; yyj4832 < yyrr4832; yyj4832++ { + yyh4832.ElemContainerState(yyj4832) if r.TryDecodeAsNil() { - yyv4858[yyj4858] = Node{} + yyv4832[yyj4832] = Node{} } else { - yyv4859 := &yyv4858[yyj4858] - yyv4859.CodecDecodeSelf(d) + yyv4833 := &yyv4832[yyj4832] + yyv4833.CodecDecodeSelf(d) } } - if yyrt4858 { - for ; yyj4858 < yyl4858; yyj4858++ { - yyv4858 = append(yyv4858, Node{}) - yyh4858.ElemContainerState(yyj4858) + if yyrt4832 { + for ; yyj4832 < yyl4832; yyj4832++ { + yyv4832 = append(yyv4832, Node{}) + yyh4832.ElemContainerState(yyj4832) if r.TryDecodeAsNil() { - yyv4858[yyj4858] = Node{} + yyv4832[yyj4832] = Node{} } else { - yyv4860 := &yyv4858[yyj4858] - yyv4860.CodecDecodeSelf(d) + yyv4834 := &yyv4832[yyj4832] + yyv4834.CodecDecodeSelf(d) } } } } else { - yyj4858 := 0 - for ; !r.CheckBreak(); yyj4858++ { + yyj4832 := 0 + for ; !r.CheckBreak(); yyj4832++ { - if yyj4858 >= len(yyv4858) { - yyv4858 = append(yyv4858, Node{}) // var yyz4858 Node - yyc4858 = true + if yyj4832 >= len(yyv4832) { + yyv4832 = append(yyv4832, Node{}) // var yyz4832 Node + yyc4832 = true } - yyh4858.ElemContainerState(yyj4858) - if yyj4858 < len(yyv4858) { + yyh4832.ElemContainerState(yyj4832) + if yyj4832 < len(yyv4832) { if r.TryDecodeAsNil() { - yyv4858[yyj4858] = Node{} + yyv4832[yyj4832] = Node{} } else { - yyv4861 := &yyv4858[yyj4858] - yyv4861.CodecDecodeSelf(d) + yyv4835 := &yyv4832[yyj4832] + yyv4835.CodecDecodeSelf(d) } } else { @@ -62097,17 +61798,17 @@ func (x codecSelfer1234) decSliceNode(v *[]Node, d *codec1978.Decoder) { } } - if yyj4858 < len(yyv4858) { - yyv4858 = yyv4858[:yyj4858] - yyc4858 = true - } else if yyj4858 == 0 && yyv4858 == nil { - yyv4858 = []Node{} - yyc4858 = true + if yyj4832 < len(yyv4832) { + yyv4832 = yyv4832[:yyj4832] + yyc4832 = true + } else if yyj4832 == 0 && yyv4832 == nil { + yyv4832 = []Node{} + yyc4832 = true } } - yyh4858.End() - if yyc4858 { - *v = yyv4858 + yyh4832.End() + if yyc4832 { + *v = yyv4832 } } @@ -62116,9 +61817,9 @@ func (x codecSelfer1234) encSliceFinalizerName(v []FinalizerName, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4862 := range v { + for _, yyv4836 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4862.CodecEncodeSelf(e) + yyv4836.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -62128,75 +61829,75 @@ func (x codecSelfer1234) decSliceFinalizerName(v *[]FinalizerName, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4863 := *v - yyh4863, yyl4863 := z.DecSliceHelperStart() - var yyc4863 bool - if yyl4863 == 0 { - if yyv4863 == nil { - yyv4863 = []FinalizerName{} - yyc4863 = true - } else if len(yyv4863) != 0 { - yyv4863 = yyv4863[:0] - yyc4863 = true + yyv4837 := *v + yyh4837, yyl4837 := z.DecSliceHelperStart() + var yyc4837 bool + if yyl4837 == 0 { + if yyv4837 == nil { + yyv4837 = []FinalizerName{} + yyc4837 = true + } else if len(yyv4837) != 0 { + yyv4837 = yyv4837[:0] + yyc4837 = true } - } else if yyl4863 > 0 { - var yyrr4863, yyrl4863 int - var yyrt4863 bool - if yyl4863 > cap(yyv4863) { + } else if yyl4837 > 0 { + var yyrr4837, yyrl4837 int + var yyrt4837 bool + if yyl4837 > cap(yyv4837) { - yyrl4863, yyrt4863 = z.DecInferLen(yyl4863, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4863 { - if yyrl4863 <= cap(yyv4863) { - yyv4863 = yyv4863[:yyrl4863] + yyrl4837, yyrt4837 = z.DecInferLen(yyl4837, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4837 { + if yyrl4837 <= cap(yyv4837) { + yyv4837 = yyv4837[:yyrl4837] } else { - yyv4863 = make([]FinalizerName, yyrl4863) + yyv4837 = make([]FinalizerName, yyrl4837) } } else { - yyv4863 = make([]FinalizerName, yyrl4863) + yyv4837 = make([]FinalizerName, yyrl4837) } - yyc4863 = true - yyrr4863 = len(yyv4863) - } else if yyl4863 != len(yyv4863) { - yyv4863 = yyv4863[:yyl4863] - yyc4863 = true + yyc4837 = true + yyrr4837 = len(yyv4837) + } else if yyl4837 != len(yyv4837) { + yyv4837 = yyv4837[:yyl4837] + yyc4837 = true } - yyj4863 := 0 - for ; yyj4863 < yyrr4863; yyj4863++ { - yyh4863.ElemContainerState(yyj4863) + yyj4837 := 0 + for ; yyj4837 < yyrr4837; yyj4837++ { + yyh4837.ElemContainerState(yyj4837) if r.TryDecodeAsNil() { - yyv4863[yyj4863] = "" + yyv4837[yyj4837] = "" } else { - yyv4863[yyj4863] = FinalizerName(r.DecodeString()) + yyv4837[yyj4837] = FinalizerName(r.DecodeString()) } } - if yyrt4863 { - for ; yyj4863 < yyl4863; yyj4863++ { - yyv4863 = append(yyv4863, "") - yyh4863.ElemContainerState(yyj4863) + if yyrt4837 { + for ; yyj4837 < yyl4837; yyj4837++ { + yyv4837 = append(yyv4837, "") + yyh4837.ElemContainerState(yyj4837) if r.TryDecodeAsNil() { - yyv4863[yyj4863] = "" + yyv4837[yyj4837] = "" } else { - yyv4863[yyj4863] = FinalizerName(r.DecodeString()) + yyv4837[yyj4837] = FinalizerName(r.DecodeString()) } } } } else { - yyj4863 := 0 - for ; !r.CheckBreak(); yyj4863++ { + yyj4837 := 0 + for ; !r.CheckBreak(); yyj4837++ { - if yyj4863 >= len(yyv4863) { - yyv4863 = append(yyv4863, "") // var yyz4863 FinalizerName - yyc4863 = true + if yyj4837 >= len(yyv4837) { + yyv4837 = append(yyv4837, "") // var yyz4837 FinalizerName + yyc4837 = true } - yyh4863.ElemContainerState(yyj4863) - if yyj4863 < len(yyv4863) { + yyh4837.ElemContainerState(yyj4837) + if yyj4837 < len(yyv4837) { if r.TryDecodeAsNil() { - yyv4863[yyj4863] = "" + yyv4837[yyj4837] = "" } else { - yyv4863[yyj4863] = FinalizerName(r.DecodeString()) + yyv4837[yyj4837] = FinalizerName(r.DecodeString()) } } else { @@ -62204,17 +61905,17 @@ func (x codecSelfer1234) decSliceFinalizerName(v *[]FinalizerName, d *codec1978. } } - if yyj4863 < len(yyv4863) { - yyv4863 = yyv4863[:yyj4863] - yyc4863 = true - } else if yyj4863 == 0 && yyv4863 == nil { - yyv4863 = []FinalizerName{} - yyc4863 = true + if yyj4837 < len(yyv4837) { + yyv4837 = yyv4837[:yyj4837] + yyc4837 = true + } else if yyj4837 == 0 && yyv4837 == nil { + yyv4837 = []FinalizerName{} + yyc4837 = true } } - yyh4863.End() - if yyc4863 { - *v = yyv4863 + yyh4837.End() + if yyc4837 { + *v = yyv4837 } } @@ -62223,10 +61924,10 @@ func (x codecSelfer1234) encSliceNamespace(v []Namespace, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4867 := range v { + for _, yyv4841 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4868 := &yyv4867 - yy4868.CodecEncodeSelf(e) + yy4842 := &yyv4841 + yy4842.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -62236,83 +61937,83 @@ func (x codecSelfer1234) decSliceNamespace(v *[]Namespace, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4869 := *v - yyh4869, yyl4869 := z.DecSliceHelperStart() - var yyc4869 bool - if yyl4869 == 0 { - if yyv4869 == nil { - yyv4869 = []Namespace{} - yyc4869 = true - } else if len(yyv4869) != 0 { - yyv4869 = yyv4869[:0] - yyc4869 = true + yyv4843 := *v + yyh4843, yyl4843 := z.DecSliceHelperStart() + var yyc4843 bool + if yyl4843 == 0 { + if yyv4843 == nil { + yyv4843 = []Namespace{} + yyc4843 = true + } else if len(yyv4843) != 0 { + yyv4843 = yyv4843[:0] + yyc4843 = true } - } else if yyl4869 > 0 { - var yyrr4869, yyrl4869 int - var yyrt4869 bool - if yyl4869 > cap(yyv4869) { + } else if yyl4843 > 0 { + var yyrr4843, yyrl4843 int + var yyrt4843 bool + if yyl4843 > cap(yyv4843) { - yyrg4869 := len(yyv4869) > 0 - yyv24869 := yyv4869 - yyrl4869, yyrt4869 = z.DecInferLen(yyl4869, z.DecBasicHandle().MaxInitLen, 296) - if yyrt4869 { - if yyrl4869 <= cap(yyv4869) { - yyv4869 = yyv4869[:yyrl4869] + yyrg4843 := len(yyv4843) > 0 + yyv24843 := yyv4843 + yyrl4843, yyrt4843 = z.DecInferLen(yyl4843, z.DecBasicHandle().MaxInitLen, 296) + if yyrt4843 { + if yyrl4843 <= cap(yyv4843) { + yyv4843 = yyv4843[:yyrl4843] } else { - yyv4869 = make([]Namespace, yyrl4869) + yyv4843 = make([]Namespace, yyrl4843) } } else { - yyv4869 = make([]Namespace, yyrl4869) + yyv4843 = make([]Namespace, yyrl4843) } - yyc4869 = true - yyrr4869 = len(yyv4869) - if yyrg4869 { - copy(yyv4869, yyv24869) + yyc4843 = true + yyrr4843 = len(yyv4843) + if yyrg4843 { + copy(yyv4843, yyv24843) } - } else if yyl4869 != len(yyv4869) { - yyv4869 = yyv4869[:yyl4869] - yyc4869 = true + } else if yyl4843 != len(yyv4843) { + yyv4843 = yyv4843[:yyl4843] + yyc4843 = true } - yyj4869 := 0 - for ; yyj4869 < yyrr4869; yyj4869++ { - yyh4869.ElemContainerState(yyj4869) + yyj4843 := 0 + for ; yyj4843 < yyrr4843; yyj4843++ { + yyh4843.ElemContainerState(yyj4843) if r.TryDecodeAsNil() { - yyv4869[yyj4869] = Namespace{} + yyv4843[yyj4843] = Namespace{} } else { - yyv4870 := &yyv4869[yyj4869] - yyv4870.CodecDecodeSelf(d) + yyv4844 := &yyv4843[yyj4843] + yyv4844.CodecDecodeSelf(d) } } - if yyrt4869 { - for ; yyj4869 < yyl4869; yyj4869++ { - yyv4869 = append(yyv4869, Namespace{}) - yyh4869.ElemContainerState(yyj4869) + if yyrt4843 { + for ; yyj4843 < yyl4843; yyj4843++ { + yyv4843 = append(yyv4843, Namespace{}) + yyh4843.ElemContainerState(yyj4843) if r.TryDecodeAsNil() { - yyv4869[yyj4869] = Namespace{} + yyv4843[yyj4843] = Namespace{} } else { - yyv4871 := &yyv4869[yyj4869] - yyv4871.CodecDecodeSelf(d) + yyv4845 := &yyv4843[yyj4843] + yyv4845.CodecDecodeSelf(d) } } } } else { - yyj4869 := 0 - for ; !r.CheckBreak(); yyj4869++ { + yyj4843 := 0 + for ; !r.CheckBreak(); yyj4843++ { - if yyj4869 >= len(yyv4869) { - yyv4869 = append(yyv4869, Namespace{}) // var yyz4869 Namespace - yyc4869 = true + if yyj4843 >= len(yyv4843) { + yyv4843 = append(yyv4843, Namespace{}) // var yyz4843 Namespace + yyc4843 = true } - yyh4869.ElemContainerState(yyj4869) - if yyj4869 < len(yyv4869) { + yyh4843.ElemContainerState(yyj4843) + if yyj4843 < len(yyv4843) { if r.TryDecodeAsNil() { - yyv4869[yyj4869] = Namespace{} + yyv4843[yyj4843] = Namespace{} } else { - yyv4872 := &yyv4869[yyj4869] - yyv4872.CodecDecodeSelf(d) + yyv4846 := &yyv4843[yyj4843] + yyv4846.CodecDecodeSelf(d) } } else { @@ -62320,17 +62021,17 @@ func (x codecSelfer1234) decSliceNamespace(v *[]Namespace, d *codec1978.Decoder) } } - if yyj4869 < len(yyv4869) { - yyv4869 = yyv4869[:yyj4869] - yyc4869 = true - } else if yyj4869 == 0 && yyv4869 == nil { - yyv4869 = []Namespace{} - yyc4869 = true + if yyj4843 < len(yyv4843) { + yyv4843 = yyv4843[:yyj4843] + yyc4843 = true + } else if yyj4843 == 0 && yyv4843 == nil { + yyv4843 = []Namespace{} + yyc4843 = true } } - yyh4869.End() - if yyc4869 { - *v = yyv4869 + yyh4843.End() + if yyc4843 { + *v = yyv4843 } } @@ -62339,10 +62040,10 @@ func (x codecSelfer1234) encSliceEvent(v []Event, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4873 := range v { + for _, yyv4847 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4874 := &yyv4873 - yy4874.CodecEncodeSelf(e) + yy4848 := &yyv4847 + yy4848.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -62352,83 +62053,83 @@ func (x codecSelfer1234) decSliceEvent(v *[]Event, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4875 := *v - yyh4875, yyl4875 := z.DecSliceHelperStart() - var yyc4875 bool - if yyl4875 == 0 { - if yyv4875 == nil { - yyv4875 = []Event{} - yyc4875 = true - } else if len(yyv4875) != 0 { - yyv4875 = yyv4875[:0] - yyc4875 = true + yyv4849 := *v + yyh4849, yyl4849 := z.DecSliceHelperStart() + var yyc4849 bool + if yyl4849 == 0 { + if yyv4849 == nil { + yyv4849 = []Event{} + yyc4849 = true + } else if len(yyv4849) != 0 { + yyv4849 = yyv4849[:0] + yyc4849 = true } - } else if yyl4875 > 0 { - var yyrr4875, yyrl4875 int - var yyrt4875 bool - if yyl4875 > cap(yyv4875) { + } else if yyl4849 > 0 { + var yyrr4849, yyrl4849 int + var yyrt4849 bool + if yyl4849 > cap(yyv4849) { - yyrg4875 := len(yyv4875) > 0 - yyv24875 := yyv4875 - yyrl4875, yyrt4875 = z.DecInferLen(yyl4875, z.DecBasicHandle().MaxInitLen, 504) - if yyrt4875 { - if yyrl4875 <= cap(yyv4875) { - yyv4875 = yyv4875[:yyrl4875] + yyrg4849 := len(yyv4849) > 0 + yyv24849 := yyv4849 + yyrl4849, yyrt4849 = z.DecInferLen(yyl4849, z.DecBasicHandle().MaxInitLen, 504) + if yyrt4849 { + if yyrl4849 <= cap(yyv4849) { + yyv4849 = yyv4849[:yyrl4849] } else { - yyv4875 = make([]Event, yyrl4875) + yyv4849 = make([]Event, yyrl4849) } } else { - yyv4875 = make([]Event, yyrl4875) + yyv4849 = make([]Event, yyrl4849) } - yyc4875 = true - yyrr4875 = len(yyv4875) - if yyrg4875 { - copy(yyv4875, yyv24875) + yyc4849 = true + yyrr4849 = len(yyv4849) + if yyrg4849 { + copy(yyv4849, yyv24849) } - } else if yyl4875 != len(yyv4875) { - yyv4875 = yyv4875[:yyl4875] - yyc4875 = true + } else if yyl4849 != len(yyv4849) { + yyv4849 = yyv4849[:yyl4849] + yyc4849 = true } - yyj4875 := 0 - for ; yyj4875 < yyrr4875; yyj4875++ { - yyh4875.ElemContainerState(yyj4875) + yyj4849 := 0 + for ; yyj4849 < yyrr4849; yyj4849++ { + yyh4849.ElemContainerState(yyj4849) if r.TryDecodeAsNil() { - yyv4875[yyj4875] = Event{} + yyv4849[yyj4849] = Event{} } else { - yyv4876 := &yyv4875[yyj4875] - yyv4876.CodecDecodeSelf(d) + yyv4850 := &yyv4849[yyj4849] + yyv4850.CodecDecodeSelf(d) } } - if yyrt4875 { - for ; yyj4875 < yyl4875; yyj4875++ { - yyv4875 = append(yyv4875, Event{}) - yyh4875.ElemContainerState(yyj4875) + if yyrt4849 { + for ; yyj4849 < yyl4849; yyj4849++ { + yyv4849 = append(yyv4849, Event{}) + yyh4849.ElemContainerState(yyj4849) if r.TryDecodeAsNil() { - yyv4875[yyj4875] = Event{} + yyv4849[yyj4849] = Event{} } else { - yyv4877 := &yyv4875[yyj4875] - yyv4877.CodecDecodeSelf(d) + yyv4851 := &yyv4849[yyj4849] + yyv4851.CodecDecodeSelf(d) } } } } else { - yyj4875 := 0 - for ; !r.CheckBreak(); yyj4875++ { + yyj4849 := 0 + for ; !r.CheckBreak(); yyj4849++ { - if yyj4875 >= len(yyv4875) { - yyv4875 = append(yyv4875, Event{}) // var yyz4875 Event - yyc4875 = true + if yyj4849 >= len(yyv4849) { + yyv4849 = append(yyv4849, Event{}) // var yyz4849 Event + yyc4849 = true } - yyh4875.ElemContainerState(yyj4875) - if yyj4875 < len(yyv4875) { + yyh4849.ElemContainerState(yyj4849) + if yyj4849 < len(yyv4849) { if r.TryDecodeAsNil() { - yyv4875[yyj4875] = Event{} + yyv4849[yyj4849] = Event{} } else { - yyv4878 := &yyv4875[yyj4875] - yyv4878.CodecDecodeSelf(d) + yyv4852 := &yyv4849[yyj4849] + yyv4852.CodecDecodeSelf(d) } } else { @@ -62436,17 +62137,17 @@ func (x codecSelfer1234) decSliceEvent(v *[]Event, d *codec1978.Decoder) { } } - if yyj4875 < len(yyv4875) { - yyv4875 = yyv4875[:yyj4875] - yyc4875 = true - } else if yyj4875 == 0 && yyv4875 == nil { - yyv4875 = []Event{} - yyc4875 = true + if yyj4849 < len(yyv4849) { + yyv4849 = yyv4849[:yyj4849] + yyc4849 = true + } else if yyj4849 == 0 && yyv4849 == nil { + yyv4849 = []Event{} + yyc4849 = true } } - yyh4875.End() - if yyc4875 { - *v = yyv4875 + yyh4849.End() + if yyc4849 { + *v = yyv4849 } } @@ -62455,17 +62156,17 @@ func (x codecSelfer1234) encSliceruntime_Object(v []pkg7_runtime.Object, e *code z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4879 := range v { + for _, yyv4853 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyv4879 == nil { + if yyv4853 == nil { r.EncodeNil() } else { - yym4880 := z.EncBinary() - _ = yym4880 + yym4854 := z.EncBinary() + _ = yym4854 if false { - } else if z.HasExtensions() && z.EncExt(yyv4879) { + } else if z.HasExtensions() && z.EncExt(yyv4853) { } else { - z.EncFallback(yyv4879) + z.EncFallback(yyv4853) } } } @@ -62477,12 +62178,485 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg7_runtime.Object, d *cod z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r + yyv4855 := *v + yyh4855, yyl4855 := z.DecSliceHelperStart() + var yyc4855 bool + if yyl4855 == 0 { + if yyv4855 == nil { + yyv4855 = []pkg7_runtime.Object{} + yyc4855 = true + } else if len(yyv4855) != 0 { + yyv4855 = yyv4855[:0] + yyc4855 = true + } + } else if yyl4855 > 0 { + var yyrr4855, yyrl4855 int + var yyrt4855 bool + if yyl4855 > cap(yyv4855) { + + yyrg4855 := len(yyv4855) > 0 + yyv24855 := yyv4855 + yyrl4855, yyrt4855 = z.DecInferLen(yyl4855, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4855 { + if yyrl4855 <= cap(yyv4855) { + yyv4855 = yyv4855[:yyrl4855] + } else { + yyv4855 = make([]pkg7_runtime.Object, yyrl4855) + } + } else { + yyv4855 = make([]pkg7_runtime.Object, yyrl4855) + } + yyc4855 = true + yyrr4855 = len(yyv4855) + if yyrg4855 { + copy(yyv4855, yyv24855) + } + } else if yyl4855 != len(yyv4855) { + yyv4855 = yyv4855[:yyl4855] + yyc4855 = true + } + yyj4855 := 0 + for ; yyj4855 < yyrr4855; yyj4855++ { + yyh4855.ElemContainerState(yyj4855) + if r.TryDecodeAsNil() { + yyv4855[yyj4855] = nil + } else { + yyv4856 := &yyv4855[yyj4855] + yym4857 := z.DecBinary() + _ = yym4857 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4856) { + } else { + z.DecFallback(yyv4856, true) + } + } + + } + if yyrt4855 { + for ; yyj4855 < yyl4855; yyj4855++ { + yyv4855 = append(yyv4855, nil) + yyh4855.ElemContainerState(yyj4855) + if r.TryDecodeAsNil() { + yyv4855[yyj4855] = nil + } else { + yyv4858 := &yyv4855[yyj4855] + yym4859 := z.DecBinary() + _ = yym4859 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4858) { + } else { + z.DecFallback(yyv4858, true) + } + } + + } + } + + } else { + yyj4855 := 0 + for ; !r.CheckBreak(); yyj4855++ { + + if yyj4855 >= len(yyv4855) { + yyv4855 = append(yyv4855, nil) // var yyz4855 pkg7_runtime.Object + yyc4855 = true + } + yyh4855.ElemContainerState(yyj4855) + if yyj4855 < len(yyv4855) { + if r.TryDecodeAsNil() { + yyv4855[yyj4855] = nil + } else { + yyv4860 := &yyv4855[yyj4855] + yym4861 := z.DecBinary() + _ = yym4861 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4860) { + } else { + z.DecFallback(yyv4860, true) + } + } + + } else { + z.DecSwallow() + } + + } + if yyj4855 < len(yyv4855) { + yyv4855 = yyv4855[:yyj4855] + yyc4855 = true + } else if yyj4855 == 0 && yyv4855 == nil { + yyv4855 = []pkg7_runtime.Object{} + yyc4855 = true + } + } + yyh4855.End() + if yyc4855 { + *v = yyv4855 + } +} + +func (x codecSelfer1234) encSliceLimitRangeItem(v []LimitRangeItem, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv4862 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy4863 := &yyv4862 + yy4863.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceLimitRangeItem(v *[]LimitRangeItem, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv4864 := *v + yyh4864, yyl4864 := z.DecSliceHelperStart() + var yyc4864 bool + if yyl4864 == 0 { + if yyv4864 == nil { + yyv4864 = []LimitRangeItem{} + yyc4864 = true + } else if len(yyv4864) != 0 { + yyv4864 = yyv4864[:0] + yyc4864 = true + } + } else if yyl4864 > 0 { + var yyrr4864, yyrl4864 int + var yyrt4864 bool + if yyl4864 > cap(yyv4864) { + + yyrg4864 := len(yyv4864) > 0 + yyv24864 := yyv4864 + yyrl4864, yyrt4864 = z.DecInferLen(yyl4864, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4864 { + if yyrl4864 <= cap(yyv4864) { + yyv4864 = yyv4864[:yyrl4864] + } else { + yyv4864 = make([]LimitRangeItem, yyrl4864) + } + } else { + yyv4864 = make([]LimitRangeItem, yyrl4864) + } + yyc4864 = true + yyrr4864 = len(yyv4864) + if yyrg4864 { + copy(yyv4864, yyv24864) + } + } else if yyl4864 != len(yyv4864) { + yyv4864 = yyv4864[:yyl4864] + yyc4864 = true + } + yyj4864 := 0 + for ; yyj4864 < yyrr4864; yyj4864++ { + yyh4864.ElemContainerState(yyj4864) + if r.TryDecodeAsNil() { + yyv4864[yyj4864] = LimitRangeItem{} + } else { + yyv4865 := &yyv4864[yyj4864] + yyv4865.CodecDecodeSelf(d) + } + + } + if yyrt4864 { + for ; yyj4864 < yyl4864; yyj4864++ { + yyv4864 = append(yyv4864, LimitRangeItem{}) + yyh4864.ElemContainerState(yyj4864) + if r.TryDecodeAsNil() { + yyv4864[yyj4864] = LimitRangeItem{} + } else { + yyv4866 := &yyv4864[yyj4864] + yyv4866.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj4864 := 0 + for ; !r.CheckBreak(); yyj4864++ { + + if yyj4864 >= len(yyv4864) { + yyv4864 = append(yyv4864, LimitRangeItem{}) // var yyz4864 LimitRangeItem + yyc4864 = true + } + yyh4864.ElemContainerState(yyj4864) + if yyj4864 < len(yyv4864) { + if r.TryDecodeAsNil() { + yyv4864[yyj4864] = LimitRangeItem{} + } else { + yyv4867 := &yyv4864[yyj4864] + yyv4867.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj4864 < len(yyv4864) { + yyv4864 = yyv4864[:yyj4864] + yyc4864 = true + } else if yyj4864 == 0 && yyv4864 == nil { + yyv4864 = []LimitRangeItem{} + yyc4864 = true + } + } + yyh4864.End() + if yyc4864 { + *v = yyv4864 + } +} + +func (x codecSelfer1234) encSliceLimitRange(v []LimitRange, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv4868 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy4869 := &yyv4868 + yy4869.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceLimitRange(v *[]LimitRange, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv4870 := *v + yyh4870, yyl4870 := z.DecSliceHelperStart() + var yyc4870 bool + if yyl4870 == 0 { + if yyv4870 == nil { + yyv4870 = []LimitRange{} + yyc4870 = true + } else if len(yyv4870) != 0 { + yyv4870 = yyv4870[:0] + yyc4870 = true + } + } else if yyl4870 > 0 { + var yyrr4870, yyrl4870 int + var yyrt4870 bool + if yyl4870 > cap(yyv4870) { + + yyrg4870 := len(yyv4870) > 0 + yyv24870 := yyv4870 + yyrl4870, yyrt4870 = z.DecInferLen(yyl4870, z.DecBasicHandle().MaxInitLen, 280) + if yyrt4870 { + if yyrl4870 <= cap(yyv4870) { + yyv4870 = yyv4870[:yyrl4870] + } else { + yyv4870 = make([]LimitRange, yyrl4870) + } + } else { + yyv4870 = make([]LimitRange, yyrl4870) + } + yyc4870 = true + yyrr4870 = len(yyv4870) + if yyrg4870 { + copy(yyv4870, yyv24870) + } + } else if yyl4870 != len(yyv4870) { + yyv4870 = yyv4870[:yyl4870] + yyc4870 = true + } + yyj4870 := 0 + for ; yyj4870 < yyrr4870; yyj4870++ { + yyh4870.ElemContainerState(yyj4870) + if r.TryDecodeAsNil() { + yyv4870[yyj4870] = LimitRange{} + } else { + yyv4871 := &yyv4870[yyj4870] + yyv4871.CodecDecodeSelf(d) + } + + } + if yyrt4870 { + for ; yyj4870 < yyl4870; yyj4870++ { + yyv4870 = append(yyv4870, LimitRange{}) + yyh4870.ElemContainerState(yyj4870) + if r.TryDecodeAsNil() { + yyv4870[yyj4870] = LimitRange{} + } else { + yyv4872 := &yyv4870[yyj4870] + yyv4872.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj4870 := 0 + for ; !r.CheckBreak(); yyj4870++ { + + if yyj4870 >= len(yyv4870) { + yyv4870 = append(yyv4870, LimitRange{}) // var yyz4870 LimitRange + yyc4870 = true + } + yyh4870.ElemContainerState(yyj4870) + if yyj4870 < len(yyv4870) { + if r.TryDecodeAsNil() { + yyv4870[yyj4870] = LimitRange{} + } else { + yyv4873 := &yyv4870[yyj4870] + yyv4873.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj4870 < len(yyv4870) { + yyv4870 = yyv4870[:yyj4870] + yyc4870 = true + } else if yyj4870 == 0 && yyv4870 == nil { + yyv4870 = []LimitRange{} + yyc4870 = true + } + } + yyh4870.End() + if yyc4870 { + *v = yyv4870 + } +} + +func (x codecSelfer1234) encSliceResourceQuotaScope(v []ResourceQuotaScope, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv4874 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yyv4874.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceResourceQuotaScope(v *[]ResourceQuotaScope, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv4875 := *v + yyh4875, yyl4875 := z.DecSliceHelperStart() + var yyc4875 bool + if yyl4875 == 0 { + if yyv4875 == nil { + yyv4875 = []ResourceQuotaScope{} + yyc4875 = true + } else if len(yyv4875) != 0 { + yyv4875 = yyv4875[:0] + yyc4875 = true + } + } else if yyl4875 > 0 { + var yyrr4875, yyrl4875 int + var yyrt4875 bool + if yyl4875 > cap(yyv4875) { + + yyrl4875, yyrt4875 = z.DecInferLen(yyl4875, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4875 { + if yyrl4875 <= cap(yyv4875) { + yyv4875 = yyv4875[:yyrl4875] + } else { + yyv4875 = make([]ResourceQuotaScope, yyrl4875) + } + } else { + yyv4875 = make([]ResourceQuotaScope, yyrl4875) + } + yyc4875 = true + yyrr4875 = len(yyv4875) + } else if yyl4875 != len(yyv4875) { + yyv4875 = yyv4875[:yyl4875] + yyc4875 = true + } + yyj4875 := 0 + for ; yyj4875 < yyrr4875; yyj4875++ { + yyh4875.ElemContainerState(yyj4875) + if r.TryDecodeAsNil() { + yyv4875[yyj4875] = "" + } else { + yyv4875[yyj4875] = ResourceQuotaScope(r.DecodeString()) + } + + } + if yyrt4875 { + for ; yyj4875 < yyl4875; yyj4875++ { + yyv4875 = append(yyv4875, "") + yyh4875.ElemContainerState(yyj4875) + if r.TryDecodeAsNil() { + yyv4875[yyj4875] = "" + } else { + yyv4875[yyj4875] = ResourceQuotaScope(r.DecodeString()) + } + + } + } + + } else { + yyj4875 := 0 + for ; !r.CheckBreak(); yyj4875++ { + + if yyj4875 >= len(yyv4875) { + yyv4875 = append(yyv4875, "") // var yyz4875 ResourceQuotaScope + yyc4875 = true + } + yyh4875.ElemContainerState(yyj4875) + if yyj4875 < len(yyv4875) { + if r.TryDecodeAsNil() { + yyv4875[yyj4875] = "" + } else { + yyv4875[yyj4875] = ResourceQuotaScope(r.DecodeString()) + } + + } else { + z.DecSwallow() + } + + } + if yyj4875 < len(yyv4875) { + yyv4875 = yyv4875[:yyj4875] + yyc4875 = true + } else if yyj4875 == 0 && yyv4875 == nil { + yyv4875 = []ResourceQuotaScope{} + yyc4875 = true + } + } + yyh4875.End() + if yyc4875 { + *v = yyv4875 + } +} + +func (x codecSelfer1234) encSliceResourceQuota(v []ResourceQuota, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv4879 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy4880 := &yyv4879 + yy4880.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceResourceQuota(v *[]ResourceQuota, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yyv4881 := *v yyh4881, yyl4881 := z.DecSliceHelperStart() var yyc4881 bool if yyl4881 == 0 { if yyv4881 == nil { - yyv4881 = []pkg7_runtime.Object{} + yyv4881 = []ResourceQuota{} yyc4881 = true } else if len(yyv4881) != 0 { yyv4881 = yyv4881[:0] @@ -62495,15 +62669,15 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg7_runtime.Object, d *cod yyrg4881 := len(yyv4881) > 0 yyv24881 := yyv4881 - yyrl4881, yyrt4881 = z.DecInferLen(yyl4881, z.DecBasicHandle().MaxInitLen, 16) + yyrl4881, yyrt4881 = z.DecInferLen(yyl4881, z.DecBasicHandle().MaxInitLen, 304) if yyrt4881 { if yyrl4881 <= cap(yyv4881) { yyv4881 = yyv4881[:yyrl4881] } else { - yyv4881 = make([]pkg7_runtime.Object, yyrl4881) + yyv4881 = make([]ResourceQuota, yyrl4881) } } else { - yyv4881 = make([]pkg7_runtime.Object, yyrl4881) + yyv4881 = make([]ResourceQuota, yyrl4881) } yyc4881 = true yyrr4881 = len(yyv4881) @@ -62518,34 +62692,22 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg7_runtime.Object, d *cod for ; yyj4881 < yyrr4881; yyj4881++ { yyh4881.ElemContainerState(yyj4881) if r.TryDecodeAsNil() { - yyv4881[yyj4881] = nil + yyv4881[yyj4881] = ResourceQuota{} } else { yyv4882 := &yyv4881[yyj4881] - yym4883 := z.DecBinary() - _ = yym4883 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4882) { - } else { - z.DecFallback(yyv4882, true) - } + yyv4882.CodecDecodeSelf(d) } } if yyrt4881 { for ; yyj4881 < yyl4881; yyj4881++ { - yyv4881 = append(yyv4881, nil) + yyv4881 = append(yyv4881, ResourceQuota{}) yyh4881.ElemContainerState(yyj4881) if r.TryDecodeAsNil() { - yyv4881[yyj4881] = nil + yyv4881[yyj4881] = ResourceQuota{} } else { - yyv4884 := &yyv4881[yyj4881] - yym4885 := z.DecBinary() - _ = yym4885 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4884) { - } else { - z.DecFallback(yyv4884, true) - } + yyv4883 := &yyv4881[yyj4881] + yyv4883.CodecDecodeSelf(d) } } @@ -62556,22 +62718,16 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg7_runtime.Object, d *cod for ; !r.CheckBreak(); yyj4881++ { if yyj4881 >= len(yyv4881) { - yyv4881 = append(yyv4881, nil) // var yyz4881 pkg7_runtime.Object + yyv4881 = append(yyv4881, ResourceQuota{}) // var yyz4881 ResourceQuota yyc4881 = true } yyh4881.ElemContainerState(yyj4881) if yyj4881 < len(yyv4881) { if r.TryDecodeAsNil() { - yyv4881[yyj4881] = nil + yyv4881[yyj4881] = ResourceQuota{} } else { - yyv4886 := &yyv4881[yyj4881] - yym4887 := z.DecBinary() - _ = yym4887 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4886) { - } else { - z.DecFallback(yyv4886, true) - } + yyv4884 := &yyv4881[yyj4881] + yyv4884.CodecDecodeSelf(d) } } else { @@ -62583,7 +62739,7 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg7_runtime.Object, d *cod yyv4881 = yyv4881[:yyj4881] yyc4881 = true } else if yyj4881 == 0 && yyv4881 == nil { - yyv4881 = []pkg7_runtime.Object{} + yyv4881 = []ResourceQuota{} yyc4881 = true } } @@ -62593,483 +62749,28 @@ func (x codecSelfer1234) decSliceruntime_Object(v *[]pkg7_runtime.Object, d *cod } } -func (x codecSelfer1234) encSliceLimitRangeItem(v []LimitRangeItem, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv4888 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4889 := &yyv4888 - yy4889.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceLimitRangeItem(v *[]LimitRangeItem, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv4890 := *v - yyh4890, yyl4890 := z.DecSliceHelperStart() - var yyc4890 bool - if yyl4890 == 0 { - if yyv4890 == nil { - yyv4890 = []LimitRangeItem{} - yyc4890 = true - } else if len(yyv4890) != 0 { - yyv4890 = yyv4890[:0] - yyc4890 = true - } - } else if yyl4890 > 0 { - var yyrr4890, yyrl4890 int - var yyrt4890 bool - if yyl4890 > cap(yyv4890) { - - yyrg4890 := len(yyv4890) > 0 - yyv24890 := yyv4890 - yyrl4890, yyrt4890 = z.DecInferLen(yyl4890, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4890 { - if yyrl4890 <= cap(yyv4890) { - yyv4890 = yyv4890[:yyrl4890] - } else { - yyv4890 = make([]LimitRangeItem, yyrl4890) - } - } else { - yyv4890 = make([]LimitRangeItem, yyrl4890) - } - yyc4890 = true - yyrr4890 = len(yyv4890) - if yyrg4890 { - copy(yyv4890, yyv24890) - } - } else if yyl4890 != len(yyv4890) { - yyv4890 = yyv4890[:yyl4890] - yyc4890 = true - } - yyj4890 := 0 - for ; yyj4890 < yyrr4890; yyj4890++ { - yyh4890.ElemContainerState(yyj4890) - if r.TryDecodeAsNil() { - yyv4890[yyj4890] = LimitRangeItem{} - } else { - yyv4891 := &yyv4890[yyj4890] - yyv4891.CodecDecodeSelf(d) - } - - } - if yyrt4890 { - for ; yyj4890 < yyl4890; yyj4890++ { - yyv4890 = append(yyv4890, LimitRangeItem{}) - yyh4890.ElemContainerState(yyj4890) - if r.TryDecodeAsNil() { - yyv4890[yyj4890] = LimitRangeItem{} - } else { - yyv4892 := &yyv4890[yyj4890] - yyv4892.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj4890 := 0 - for ; !r.CheckBreak(); yyj4890++ { - - if yyj4890 >= len(yyv4890) { - yyv4890 = append(yyv4890, LimitRangeItem{}) // var yyz4890 LimitRangeItem - yyc4890 = true - } - yyh4890.ElemContainerState(yyj4890) - if yyj4890 < len(yyv4890) { - if r.TryDecodeAsNil() { - yyv4890[yyj4890] = LimitRangeItem{} - } else { - yyv4893 := &yyv4890[yyj4890] - yyv4893.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj4890 < len(yyv4890) { - yyv4890 = yyv4890[:yyj4890] - yyc4890 = true - } else if yyj4890 == 0 && yyv4890 == nil { - yyv4890 = []LimitRangeItem{} - yyc4890 = true - } - } - yyh4890.End() - if yyc4890 { - *v = yyv4890 - } -} - -func (x codecSelfer1234) encSliceLimitRange(v []LimitRange, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv4894 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4895 := &yyv4894 - yy4895.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceLimitRange(v *[]LimitRange, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv4896 := *v - yyh4896, yyl4896 := z.DecSliceHelperStart() - var yyc4896 bool - if yyl4896 == 0 { - if yyv4896 == nil { - yyv4896 = []LimitRange{} - yyc4896 = true - } else if len(yyv4896) != 0 { - yyv4896 = yyv4896[:0] - yyc4896 = true - } - } else if yyl4896 > 0 { - var yyrr4896, yyrl4896 int - var yyrt4896 bool - if yyl4896 > cap(yyv4896) { - - yyrg4896 := len(yyv4896) > 0 - yyv24896 := yyv4896 - yyrl4896, yyrt4896 = z.DecInferLen(yyl4896, z.DecBasicHandle().MaxInitLen, 280) - if yyrt4896 { - if yyrl4896 <= cap(yyv4896) { - yyv4896 = yyv4896[:yyrl4896] - } else { - yyv4896 = make([]LimitRange, yyrl4896) - } - } else { - yyv4896 = make([]LimitRange, yyrl4896) - } - yyc4896 = true - yyrr4896 = len(yyv4896) - if yyrg4896 { - copy(yyv4896, yyv24896) - } - } else if yyl4896 != len(yyv4896) { - yyv4896 = yyv4896[:yyl4896] - yyc4896 = true - } - yyj4896 := 0 - for ; yyj4896 < yyrr4896; yyj4896++ { - yyh4896.ElemContainerState(yyj4896) - if r.TryDecodeAsNil() { - yyv4896[yyj4896] = LimitRange{} - } else { - yyv4897 := &yyv4896[yyj4896] - yyv4897.CodecDecodeSelf(d) - } - - } - if yyrt4896 { - for ; yyj4896 < yyl4896; yyj4896++ { - yyv4896 = append(yyv4896, LimitRange{}) - yyh4896.ElemContainerState(yyj4896) - if r.TryDecodeAsNil() { - yyv4896[yyj4896] = LimitRange{} - } else { - yyv4898 := &yyv4896[yyj4896] - yyv4898.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj4896 := 0 - for ; !r.CheckBreak(); yyj4896++ { - - if yyj4896 >= len(yyv4896) { - yyv4896 = append(yyv4896, LimitRange{}) // var yyz4896 LimitRange - yyc4896 = true - } - yyh4896.ElemContainerState(yyj4896) - if yyj4896 < len(yyv4896) { - if r.TryDecodeAsNil() { - yyv4896[yyj4896] = LimitRange{} - } else { - yyv4899 := &yyv4896[yyj4896] - yyv4899.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj4896 < len(yyv4896) { - yyv4896 = yyv4896[:yyj4896] - yyc4896 = true - } else if yyj4896 == 0 && yyv4896 == nil { - yyv4896 = []LimitRange{} - yyc4896 = true - } - } - yyh4896.End() - if yyc4896 { - *v = yyv4896 - } -} - -func (x codecSelfer1234) encSliceResourceQuotaScope(v []ResourceQuotaScope, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv4900 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4900.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceResourceQuotaScope(v *[]ResourceQuotaScope, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv4901 := *v - yyh4901, yyl4901 := z.DecSliceHelperStart() - var yyc4901 bool - if yyl4901 == 0 { - if yyv4901 == nil { - yyv4901 = []ResourceQuotaScope{} - yyc4901 = true - } else if len(yyv4901) != 0 { - yyv4901 = yyv4901[:0] - yyc4901 = true - } - } else if yyl4901 > 0 { - var yyrr4901, yyrl4901 int - var yyrt4901 bool - if yyl4901 > cap(yyv4901) { - - yyrl4901, yyrt4901 = z.DecInferLen(yyl4901, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4901 { - if yyrl4901 <= cap(yyv4901) { - yyv4901 = yyv4901[:yyrl4901] - } else { - yyv4901 = make([]ResourceQuotaScope, yyrl4901) - } - } else { - yyv4901 = make([]ResourceQuotaScope, yyrl4901) - } - yyc4901 = true - yyrr4901 = len(yyv4901) - } else if yyl4901 != len(yyv4901) { - yyv4901 = yyv4901[:yyl4901] - yyc4901 = true - } - yyj4901 := 0 - for ; yyj4901 < yyrr4901; yyj4901++ { - yyh4901.ElemContainerState(yyj4901) - if r.TryDecodeAsNil() { - yyv4901[yyj4901] = "" - } else { - yyv4901[yyj4901] = ResourceQuotaScope(r.DecodeString()) - } - - } - if yyrt4901 { - for ; yyj4901 < yyl4901; yyj4901++ { - yyv4901 = append(yyv4901, "") - yyh4901.ElemContainerState(yyj4901) - if r.TryDecodeAsNil() { - yyv4901[yyj4901] = "" - } else { - yyv4901[yyj4901] = ResourceQuotaScope(r.DecodeString()) - } - - } - } - - } else { - yyj4901 := 0 - for ; !r.CheckBreak(); yyj4901++ { - - if yyj4901 >= len(yyv4901) { - yyv4901 = append(yyv4901, "") // var yyz4901 ResourceQuotaScope - yyc4901 = true - } - yyh4901.ElemContainerState(yyj4901) - if yyj4901 < len(yyv4901) { - if r.TryDecodeAsNil() { - yyv4901[yyj4901] = "" - } else { - yyv4901[yyj4901] = ResourceQuotaScope(r.DecodeString()) - } - - } else { - z.DecSwallow() - } - - } - if yyj4901 < len(yyv4901) { - yyv4901 = yyv4901[:yyj4901] - yyc4901 = true - } else if yyj4901 == 0 && yyv4901 == nil { - yyv4901 = []ResourceQuotaScope{} - yyc4901 = true - } - } - yyh4901.End() - if yyc4901 { - *v = yyv4901 - } -} - -func (x codecSelfer1234) encSliceResourceQuota(v []ResourceQuota, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv4905 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4906 := &yyv4905 - yy4906.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceResourceQuota(v *[]ResourceQuota, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv4907 := *v - yyh4907, yyl4907 := z.DecSliceHelperStart() - var yyc4907 bool - if yyl4907 == 0 { - if yyv4907 == nil { - yyv4907 = []ResourceQuota{} - yyc4907 = true - } else if len(yyv4907) != 0 { - yyv4907 = yyv4907[:0] - yyc4907 = true - } - } else if yyl4907 > 0 { - var yyrr4907, yyrl4907 int - var yyrt4907 bool - if yyl4907 > cap(yyv4907) { - - yyrg4907 := len(yyv4907) > 0 - yyv24907 := yyv4907 - yyrl4907, yyrt4907 = z.DecInferLen(yyl4907, z.DecBasicHandle().MaxInitLen, 304) - if yyrt4907 { - if yyrl4907 <= cap(yyv4907) { - yyv4907 = yyv4907[:yyrl4907] - } else { - yyv4907 = make([]ResourceQuota, yyrl4907) - } - } else { - yyv4907 = make([]ResourceQuota, yyrl4907) - } - yyc4907 = true - yyrr4907 = len(yyv4907) - if yyrg4907 { - copy(yyv4907, yyv24907) - } - } else if yyl4907 != len(yyv4907) { - yyv4907 = yyv4907[:yyl4907] - yyc4907 = true - } - yyj4907 := 0 - for ; yyj4907 < yyrr4907; yyj4907++ { - yyh4907.ElemContainerState(yyj4907) - if r.TryDecodeAsNil() { - yyv4907[yyj4907] = ResourceQuota{} - } else { - yyv4908 := &yyv4907[yyj4907] - yyv4908.CodecDecodeSelf(d) - } - - } - if yyrt4907 { - for ; yyj4907 < yyl4907; yyj4907++ { - yyv4907 = append(yyv4907, ResourceQuota{}) - yyh4907.ElemContainerState(yyj4907) - if r.TryDecodeAsNil() { - yyv4907[yyj4907] = ResourceQuota{} - } else { - yyv4909 := &yyv4907[yyj4907] - yyv4909.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj4907 := 0 - for ; !r.CheckBreak(); yyj4907++ { - - if yyj4907 >= len(yyv4907) { - yyv4907 = append(yyv4907, ResourceQuota{}) // var yyz4907 ResourceQuota - yyc4907 = true - } - yyh4907.ElemContainerState(yyj4907) - if yyj4907 < len(yyv4907) { - if r.TryDecodeAsNil() { - yyv4907[yyj4907] = ResourceQuota{} - } else { - yyv4910 := &yyv4907[yyj4907] - yyv4910.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj4907 < len(yyv4907) { - yyv4907 = yyv4907[:yyj4907] - yyc4907 = true - } else if yyj4907 == 0 && yyv4907 == nil { - yyv4907 = []ResourceQuota{} - yyc4907 = true - } - } - yyh4907.End() - if yyc4907 { - *v = yyv4907 - } -} - func (x codecSelfer1234) encMapstringSliceuint8(v map[string][]uint8, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeMapStart(len(v)) - for yyk4911, yyv4911 := range v { + for yyk4885, yyv4885 := range v { z.EncSendContainerState(codecSelfer_containerMapKey1234) - yym4912 := z.EncBinary() - _ = yym4912 + yym4886 := z.EncBinary() + _ = yym4886 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyk4911)) + r.EncodeString(codecSelferC_UTF81234, string(yyk4885)) } z.EncSendContainerState(codecSelfer_containerMapValue1234) - if yyv4911 == nil { + if yyv4885 == nil { r.EncodeNil() } else { - yym4913 := z.EncBinary() - _ = yym4913 + yym4887 := z.EncBinary() + _ = yym4887 if false { } else { - r.EncodeStringBytes(codecSelferC_RAW1234, []byte(yyv4911)) + r.EncodeStringBytes(codecSelferC_RAW1234, []byte(yyv4885)) } } } @@ -63081,80 +62782,80 @@ func (x codecSelfer1234) decMapstringSliceuint8(v *map[string][]uint8, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4914 := *v - yyl4914 := r.ReadMapStart() - yybh4914 := z.DecBasicHandle() - if yyv4914 == nil { - yyrl4914, _ := z.DecInferLen(yyl4914, yybh4914.MaxInitLen, 40) - yyv4914 = make(map[string][]uint8, yyrl4914) - *v = yyv4914 + yyv4888 := *v + yyl4888 := r.ReadMapStart() + yybh4888 := z.DecBasicHandle() + if yyv4888 == nil { + yyrl4888, _ := z.DecInferLen(yyl4888, yybh4888.MaxInitLen, 40) + yyv4888 = make(map[string][]uint8, yyrl4888) + *v = yyv4888 } - var yymk4914 string - var yymv4914 []uint8 - var yymg4914 bool - if yybh4914.MapValueReset { - yymg4914 = true + var yymk4888 string + var yymv4888 []uint8 + var yymg4888 bool + if yybh4888.MapValueReset { + yymg4888 = true } - if yyl4914 > 0 { - for yyj4914 := 0; yyj4914 < yyl4914; yyj4914++ { + if yyl4888 > 0 { + for yyj4888 := 0; yyj4888 < yyl4888; yyj4888++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk4914 = "" + yymk4888 = "" } else { - yymk4914 = string(r.DecodeString()) + yymk4888 = string(r.DecodeString()) } - if yymg4914 { - yymv4914 = yyv4914[yymk4914] + if yymg4888 { + yymv4888 = yyv4888[yymk4888] } else { - yymv4914 = nil + yymv4888 = nil } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv4914 = nil + yymv4888 = nil } else { - yyv4916 := &yymv4914 - yym4917 := z.DecBinary() - _ = yym4917 + yyv4890 := &yymv4888 + yym4891 := z.DecBinary() + _ = yym4891 if false { } else { - *yyv4916 = r.DecodeBytes(*(*[]byte)(yyv4916), false, false) + *yyv4890 = r.DecodeBytes(*(*[]byte)(yyv4890), false, false) } } - if yyv4914 != nil { - yyv4914[yymk4914] = yymv4914 + if yyv4888 != nil { + yyv4888[yymk4888] = yymv4888 } } - } else if yyl4914 < 0 { - for yyj4914 := 0; !r.CheckBreak(); yyj4914++ { + } else if yyl4888 < 0 { + for yyj4888 := 0; !r.CheckBreak(); yyj4888++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk4914 = "" + yymk4888 = "" } else { - yymk4914 = string(r.DecodeString()) + yymk4888 = string(r.DecodeString()) } - if yymg4914 { - yymv4914 = yyv4914[yymk4914] + if yymg4888 { + yymv4888 = yyv4888[yymk4888] } else { - yymv4914 = nil + yymv4888 = nil } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv4914 = nil + yymv4888 = nil } else { - yyv4919 := &yymv4914 - yym4920 := z.DecBinary() - _ = yym4920 + yyv4893 := &yymv4888 + yym4894 := z.DecBinary() + _ = yym4894 if false { } else { - *yyv4919 = r.DecodeBytes(*(*[]byte)(yyv4919), false, false) + *yyv4893 = r.DecodeBytes(*(*[]byte)(yyv4893), false, false) } } - if yyv4914 != nil { - yyv4914[yymk4914] = yymv4914 + if yyv4888 != nil { + yyv4888[yymk4888] = yymv4888 } } } // else len==0: TODO: Should we clear map entries? @@ -63166,10 +62867,10 @@ func (x codecSelfer1234) encSliceSecret(v []Secret, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4921 := range v { + for _, yyv4895 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4922 := &yyv4921 - yy4922.CodecEncodeSelf(e) + yy4896 := &yyv4895 + yy4896.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -63179,83 +62880,83 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4923 := *v - yyh4923, yyl4923 := z.DecSliceHelperStart() - var yyc4923 bool - if yyl4923 == 0 { - if yyv4923 == nil { - yyv4923 = []Secret{} - yyc4923 = true - } else if len(yyv4923) != 0 { - yyv4923 = yyv4923[:0] - yyc4923 = true + yyv4897 := *v + yyh4897, yyl4897 := z.DecSliceHelperStart() + var yyc4897 bool + if yyl4897 == 0 { + if yyv4897 == nil { + yyv4897 = []Secret{} + yyc4897 = true + } else if len(yyv4897) != 0 { + yyv4897 = yyv4897[:0] + yyc4897 = true } - } else if yyl4923 > 0 { - var yyrr4923, yyrl4923 int - var yyrt4923 bool - if yyl4923 > cap(yyv4923) { + } else if yyl4897 > 0 { + var yyrr4897, yyrl4897 int + var yyrt4897 bool + if yyl4897 > cap(yyv4897) { - yyrg4923 := len(yyv4923) > 0 - yyv24923 := yyv4923 - yyrl4923, yyrt4923 = z.DecInferLen(yyl4923, z.DecBasicHandle().MaxInitLen, 280) - if yyrt4923 { - if yyrl4923 <= cap(yyv4923) { - yyv4923 = yyv4923[:yyrl4923] + yyrg4897 := len(yyv4897) > 0 + yyv24897 := yyv4897 + yyrl4897, yyrt4897 = z.DecInferLen(yyl4897, z.DecBasicHandle().MaxInitLen, 280) + if yyrt4897 { + if yyrl4897 <= cap(yyv4897) { + yyv4897 = yyv4897[:yyrl4897] } else { - yyv4923 = make([]Secret, yyrl4923) + yyv4897 = make([]Secret, yyrl4897) } } else { - yyv4923 = make([]Secret, yyrl4923) + yyv4897 = make([]Secret, yyrl4897) } - yyc4923 = true - yyrr4923 = len(yyv4923) - if yyrg4923 { - copy(yyv4923, yyv24923) + yyc4897 = true + yyrr4897 = len(yyv4897) + if yyrg4897 { + copy(yyv4897, yyv24897) } - } else if yyl4923 != len(yyv4923) { - yyv4923 = yyv4923[:yyl4923] - yyc4923 = true + } else if yyl4897 != len(yyv4897) { + yyv4897 = yyv4897[:yyl4897] + yyc4897 = true } - yyj4923 := 0 - for ; yyj4923 < yyrr4923; yyj4923++ { - yyh4923.ElemContainerState(yyj4923) + yyj4897 := 0 + for ; yyj4897 < yyrr4897; yyj4897++ { + yyh4897.ElemContainerState(yyj4897) if r.TryDecodeAsNil() { - yyv4923[yyj4923] = Secret{} + yyv4897[yyj4897] = Secret{} } else { - yyv4924 := &yyv4923[yyj4923] - yyv4924.CodecDecodeSelf(d) + yyv4898 := &yyv4897[yyj4897] + yyv4898.CodecDecodeSelf(d) } } - if yyrt4923 { - for ; yyj4923 < yyl4923; yyj4923++ { - yyv4923 = append(yyv4923, Secret{}) - yyh4923.ElemContainerState(yyj4923) + if yyrt4897 { + for ; yyj4897 < yyl4897; yyj4897++ { + yyv4897 = append(yyv4897, Secret{}) + yyh4897.ElemContainerState(yyj4897) if r.TryDecodeAsNil() { - yyv4923[yyj4923] = Secret{} + yyv4897[yyj4897] = Secret{} } else { - yyv4925 := &yyv4923[yyj4923] - yyv4925.CodecDecodeSelf(d) + yyv4899 := &yyv4897[yyj4897] + yyv4899.CodecDecodeSelf(d) } } } } else { - yyj4923 := 0 - for ; !r.CheckBreak(); yyj4923++ { + yyj4897 := 0 + for ; !r.CheckBreak(); yyj4897++ { - if yyj4923 >= len(yyv4923) { - yyv4923 = append(yyv4923, Secret{}) // var yyz4923 Secret - yyc4923 = true + if yyj4897 >= len(yyv4897) { + yyv4897 = append(yyv4897, Secret{}) // var yyz4897 Secret + yyc4897 = true } - yyh4923.ElemContainerState(yyj4923) - if yyj4923 < len(yyv4923) { + yyh4897.ElemContainerState(yyj4897) + if yyj4897 < len(yyv4897) { if r.TryDecodeAsNil() { - yyv4923[yyj4923] = Secret{} + yyv4897[yyj4897] = Secret{} } else { - yyv4926 := &yyv4923[yyj4923] - yyv4926.CodecDecodeSelf(d) + yyv4900 := &yyv4897[yyj4897] + yyv4900.CodecDecodeSelf(d) } } else { @@ -63263,17 +62964,17 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { } } - if yyj4923 < len(yyv4923) { - yyv4923 = yyv4923[:yyj4923] - yyc4923 = true - } else if yyj4923 == 0 && yyv4923 == nil { - yyv4923 = []Secret{} - yyc4923 = true + if yyj4897 < len(yyv4897) { + yyv4897 = yyv4897[:yyj4897] + yyc4897 = true + } else if yyj4897 == 0 && yyv4897 == nil { + yyv4897 = []Secret{} + yyc4897 = true } } - yyh4923.End() - if yyc4923 { - *v = yyv4923 + yyh4897.End() + if yyc4897 { + *v = yyv4897 } } @@ -63282,10 +62983,10 @@ func (x codecSelfer1234) encSliceConfigMap(v []ConfigMap, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4927 := range v { + for _, yyv4901 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4928 := &yyv4927 - yy4928.CodecEncodeSelf(e) + yy4902 := &yyv4901 + yy4902.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -63295,83 +62996,83 @@ func (x codecSelfer1234) decSliceConfigMap(v *[]ConfigMap, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4929 := *v - yyh4929, yyl4929 := z.DecSliceHelperStart() - var yyc4929 bool - if yyl4929 == 0 { - if yyv4929 == nil { - yyv4929 = []ConfigMap{} - yyc4929 = true - } else if len(yyv4929) != 0 { - yyv4929 = yyv4929[:0] - yyc4929 = true + yyv4903 := *v + yyh4903, yyl4903 := z.DecSliceHelperStart() + var yyc4903 bool + if yyl4903 == 0 { + if yyv4903 == nil { + yyv4903 = []ConfigMap{} + yyc4903 = true + } else if len(yyv4903) != 0 { + yyv4903 = yyv4903[:0] + yyc4903 = true } - } else if yyl4929 > 0 { - var yyrr4929, yyrl4929 int - var yyrt4929 bool - if yyl4929 > cap(yyv4929) { + } else if yyl4903 > 0 { + var yyrr4903, yyrl4903 int + var yyrt4903 bool + if yyl4903 > cap(yyv4903) { - yyrg4929 := len(yyv4929) > 0 - yyv24929 := yyv4929 - yyrl4929, yyrt4929 = z.DecInferLen(yyl4929, z.DecBasicHandle().MaxInitLen, 264) - if yyrt4929 { - if yyrl4929 <= cap(yyv4929) { - yyv4929 = yyv4929[:yyrl4929] + yyrg4903 := len(yyv4903) > 0 + yyv24903 := yyv4903 + yyrl4903, yyrt4903 = z.DecInferLen(yyl4903, z.DecBasicHandle().MaxInitLen, 264) + if yyrt4903 { + if yyrl4903 <= cap(yyv4903) { + yyv4903 = yyv4903[:yyrl4903] } else { - yyv4929 = make([]ConfigMap, yyrl4929) + yyv4903 = make([]ConfigMap, yyrl4903) } } else { - yyv4929 = make([]ConfigMap, yyrl4929) + yyv4903 = make([]ConfigMap, yyrl4903) } - yyc4929 = true - yyrr4929 = len(yyv4929) - if yyrg4929 { - copy(yyv4929, yyv24929) + yyc4903 = true + yyrr4903 = len(yyv4903) + if yyrg4903 { + copy(yyv4903, yyv24903) } - } else if yyl4929 != len(yyv4929) { - yyv4929 = yyv4929[:yyl4929] - yyc4929 = true + } else if yyl4903 != len(yyv4903) { + yyv4903 = yyv4903[:yyl4903] + yyc4903 = true } - yyj4929 := 0 - for ; yyj4929 < yyrr4929; yyj4929++ { - yyh4929.ElemContainerState(yyj4929) + yyj4903 := 0 + for ; yyj4903 < yyrr4903; yyj4903++ { + yyh4903.ElemContainerState(yyj4903) if r.TryDecodeAsNil() { - yyv4929[yyj4929] = ConfigMap{} + yyv4903[yyj4903] = ConfigMap{} } else { - yyv4930 := &yyv4929[yyj4929] - yyv4930.CodecDecodeSelf(d) + yyv4904 := &yyv4903[yyj4903] + yyv4904.CodecDecodeSelf(d) } } - if yyrt4929 { - for ; yyj4929 < yyl4929; yyj4929++ { - yyv4929 = append(yyv4929, ConfigMap{}) - yyh4929.ElemContainerState(yyj4929) + if yyrt4903 { + for ; yyj4903 < yyl4903; yyj4903++ { + yyv4903 = append(yyv4903, ConfigMap{}) + yyh4903.ElemContainerState(yyj4903) if r.TryDecodeAsNil() { - yyv4929[yyj4929] = ConfigMap{} + yyv4903[yyj4903] = ConfigMap{} } else { - yyv4931 := &yyv4929[yyj4929] - yyv4931.CodecDecodeSelf(d) + yyv4905 := &yyv4903[yyj4903] + yyv4905.CodecDecodeSelf(d) } } } } else { - yyj4929 := 0 - for ; !r.CheckBreak(); yyj4929++ { + yyj4903 := 0 + for ; !r.CheckBreak(); yyj4903++ { - if yyj4929 >= len(yyv4929) { - yyv4929 = append(yyv4929, ConfigMap{}) // var yyz4929 ConfigMap - yyc4929 = true + if yyj4903 >= len(yyv4903) { + yyv4903 = append(yyv4903, ConfigMap{}) // var yyz4903 ConfigMap + yyc4903 = true } - yyh4929.ElemContainerState(yyj4929) - if yyj4929 < len(yyv4929) { + yyh4903.ElemContainerState(yyj4903) + if yyj4903 < len(yyv4903) { if r.TryDecodeAsNil() { - yyv4929[yyj4929] = ConfigMap{} + yyv4903[yyj4903] = ConfigMap{} } else { - yyv4932 := &yyv4929[yyj4929] - yyv4932.CodecDecodeSelf(d) + yyv4906 := &yyv4903[yyj4903] + yyv4906.CodecDecodeSelf(d) } } else { @@ -63379,17 +63080,17 @@ func (x codecSelfer1234) decSliceConfigMap(v *[]ConfigMap, d *codec1978.Decoder) } } - if yyj4929 < len(yyv4929) { - yyv4929 = yyv4929[:yyj4929] - yyc4929 = true - } else if yyj4929 == 0 && yyv4929 == nil { - yyv4929 = []ConfigMap{} - yyc4929 = true + if yyj4903 < len(yyv4903) { + yyv4903 = yyv4903[:yyj4903] + yyc4903 = true + } else if yyj4903 == 0 && yyv4903 == nil { + yyv4903 = []ConfigMap{} + yyc4903 = true } } - yyh4929.End() - if yyc4929 { - *v = yyv4929 + yyh4903.End() + if yyc4903 { + *v = yyv4903 } } @@ -63398,10 +63099,10 @@ func (x codecSelfer1234) encSliceComponentCondition(v []ComponentCondition, e *c z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4933 := range v { + for _, yyv4907 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4934 := &yyv4933 - yy4934.CodecEncodeSelf(e) + yy4908 := &yyv4907 + yy4908.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -63411,83 +63112,83 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4935 := *v - yyh4935, yyl4935 := z.DecSliceHelperStart() - var yyc4935 bool - if yyl4935 == 0 { - if yyv4935 == nil { - yyv4935 = []ComponentCondition{} - yyc4935 = true - } else if len(yyv4935) != 0 { - yyv4935 = yyv4935[:0] - yyc4935 = true + yyv4909 := *v + yyh4909, yyl4909 := z.DecSliceHelperStart() + var yyc4909 bool + if yyl4909 == 0 { + if yyv4909 == nil { + yyv4909 = []ComponentCondition{} + yyc4909 = true + } else if len(yyv4909) != 0 { + yyv4909 = yyv4909[:0] + yyc4909 = true } - } else if yyl4935 > 0 { - var yyrr4935, yyrl4935 int - var yyrt4935 bool - if yyl4935 > cap(yyv4935) { + } else if yyl4909 > 0 { + var yyrr4909, yyrl4909 int + var yyrt4909 bool + if yyl4909 > cap(yyv4909) { - yyrg4935 := len(yyv4935) > 0 - yyv24935 := yyv4935 - yyrl4935, yyrt4935 = z.DecInferLen(yyl4935, z.DecBasicHandle().MaxInitLen, 64) - if yyrt4935 { - if yyrl4935 <= cap(yyv4935) { - yyv4935 = yyv4935[:yyrl4935] + yyrg4909 := len(yyv4909) > 0 + yyv24909 := yyv4909 + yyrl4909, yyrt4909 = z.DecInferLen(yyl4909, z.DecBasicHandle().MaxInitLen, 64) + if yyrt4909 { + if yyrl4909 <= cap(yyv4909) { + yyv4909 = yyv4909[:yyrl4909] } else { - yyv4935 = make([]ComponentCondition, yyrl4935) + yyv4909 = make([]ComponentCondition, yyrl4909) } } else { - yyv4935 = make([]ComponentCondition, yyrl4935) + yyv4909 = make([]ComponentCondition, yyrl4909) } - yyc4935 = true - yyrr4935 = len(yyv4935) - if yyrg4935 { - copy(yyv4935, yyv24935) + yyc4909 = true + yyrr4909 = len(yyv4909) + if yyrg4909 { + copy(yyv4909, yyv24909) } - } else if yyl4935 != len(yyv4935) { - yyv4935 = yyv4935[:yyl4935] - yyc4935 = true + } else if yyl4909 != len(yyv4909) { + yyv4909 = yyv4909[:yyl4909] + yyc4909 = true } - yyj4935 := 0 - for ; yyj4935 < yyrr4935; yyj4935++ { - yyh4935.ElemContainerState(yyj4935) + yyj4909 := 0 + for ; yyj4909 < yyrr4909; yyj4909++ { + yyh4909.ElemContainerState(yyj4909) if r.TryDecodeAsNil() { - yyv4935[yyj4935] = ComponentCondition{} + yyv4909[yyj4909] = ComponentCondition{} } else { - yyv4936 := &yyv4935[yyj4935] - yyv4936.CodecDecodeSelf(d) + yyv4910 := &yyv4909[yyj4909] + yyv4910.CodecDecodeSelf(d) } } - if yyrt4935 { - for ; yyj4935 < yyl4935; yyj4935++ { - yyv4935 = append(yyv4935, ComponentCondition{}) - yyh4935.ElemContainerState(yyj4935) + if yyrt4909 { + for ; yyj4909 < yyl4909; yyj4909++ { + yyv4909 = append(yyv4909, ComponentCondition{}) + yyh4909.ElemContainerState(yyj4909) if r.TryDecodeAsNil() { - yyv4935[yyj4935] = ComponentCondition{} + yyv4909[yyj4909] = ComponentCondition{} } else { - yyv4937 := &yyv4935[yyj4935] - yyv4937.CodecDecodeSelf(d) + yyv4911 := &yyv4909[yyj4909] + yyv4911.CodecDecodeSelf(d) } } } } else { - yyj4935 := 0 - for ; !r.CheckBreak(); yyj4935++ { + yyj4909 := 0 + for ; !r.CheckBreak(); yyj4909++ { - if yyj4935 >= len(yyv4935) { - yyv4935 = append(yyv4935, ComponentCondition{}) // var yyz4935 ComponentCondition - yyc4935 = true + if yyj4909 >= len(yyv4909) { + yyv4909 = append(yyv4909, ComponentCondition{}) // var yyz4909 ComponentCondition + yyc4909 = true } - yyh4935.ElemContainerState(yyj4935) - if yyj4935 < len(yyv4935) { + yyh4909.ElemContainerState(yyj4909) + if yyj4909 < len(yyv4909) { if r.TryDecodeAsNil() { - yyv4935[yyj4935] = ComponentCondition{} + yyv4909[yyj4909] = ComponentCondition{} } else { - yyv4938 := &yyv4935[yyj4935] - yyv4938.CodecDecodeSelf(d) + yyv4912 := &yyv4909[yyj4909] + yyv4912.CodecDecodeSelf(d) } } else { @@ -63495,17 +63196,17 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * } } - if yyj4935 < len(yyv4935) { - yyv4935 = yyv4935[:yyj4935] - yyc4935 = true - } else if yyj4935 == 0 && yyv4935 == nil { - yyv4935 = []ComponentCondition{} - yyc4935 = true + if yyj4909 < len(yyv4909) { + yyv4909 = yyv4909[:yyj4909] + yyc4909 = true + } else if yyj4909 == 0 && yyv4909 == nil { + yyv4909 = []ComponentCondition{} + yyc4909 = true } } - yyh4935.End() - if yyc4935 { - *v = yyv4935 + yyh4909.End() + if yyc4909 { + *v = yyv4909 } } @@ -63514,10 +63215,10 @@ func (x codecSelfer1234) encSliceComponentStatus(v []ComponentStatus, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4939 := range v { + for _, yyv4913 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4940 := &yyv4939 - yy4940.CodecEncodeSelf(e) + yy4914 := &yyv4913 + yy4914.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -63527,83 +63228,83 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4941 := *v - yyh4941, yyl4941 := z.DecSliceHelperStart() - var yyc4941 bool - if yyl4941 == 0 { - if yyv4941 == nil { - yyv4941 = []ComponentStatus{} - yyc4941 = true - } else if len(yyv4941) != 0 { - yyv4941 = yyv4941[:0] - yyc4941 = true + yyv4915 := *v + yyh4915, yyl4915 := z.DecSliceHelperStart() + var yyc4915 bool + if yyl4915 == 0 { + if yyv4915 == nil { + yyv4915 = []ComponentStatus{} + yyc4915 = true + } else if len(yyv4915) != 0 { + yyv4915 = yyv4915[:0] + yyc4915 = true } - } else if yyl4941 > 0 { - var yyrr4941, yyrl4941 int - var yyrt4941 bool - if yyl4941 > cap(yyv4941) { + } else if yyl4915 > 0 { + var yyrr4915, yyrl4915 int + var yyrt4915 bool + if yyl4915 > cap(yyv4915) { - yyrg4941 := len(yyv4941) > 0 - yyv24941 := yyv4941 - yyrl4941, yyrt4941 = z.DecInferLen(yyl4941, z.DecBasicHandle().MaxInitLen, 280) - if yyrt4941 { - if yyrl4941 <= cap(yyv4941) { - yyv4941 = yyv4941[:yyrl4941] + yyrg4915 := len(yyv4915) > 0 + yyv24915 := yyv4915 + yyrl4915, yyrt4915 = z.DecInferLen(yyl4915, z.DecBasicHandle().MaxInitLen, 280) + if yyrt4915 { + if yyrl4915 <= cap(yyv4915) { + yyv4915 = yyv4915[:yyrl4915] } else { - yyv4941 = make([]ComponentStatus, yyrl4941) + yyv4915 = make([]ComponentStatus, yyrl4915) } } else { - yyv4941 = make([]ComponentStatus, yyrl4941) + yyv4915 = make([]ComponentStatus, yyrl4915) } - yyc4941 = true - yyrr4941 = len(yyv4941) - if yyrg4941 { - copy(yyv4941, yyv24941) + yyc4915 = true + yyrr4915 = len(yyv4915) + if yyrg4915 { + copy(yyv4915, yyv24915) } - } else if yyl4941 != len(yyv4941) { - yyv4941 = yyv4941[:yyl4941] - yyc4941 = true + } else if yyl4915 != len(yyv4915) { + yyv4915 = yyv4915[:yyl4915] + yyc4915 = true } - yyj4941 := 0 - for ; yyj4941 < yyrr4941; yyj4941++ { - yyh4941.ElemContainerState(yyj4941) + yyj4915 := 0 + for ; yyj4915 < yyrr4915; yyj4915++ { + yyh4915.ElemContainerState(yyj4915) if r.TryDecodeAsNil() { - yyv4941[yyj4941] = ComponentStatus{} + yyv4915[yyj4915] = ComponentStatus{} } else { - yyv4942 := &yyv4941[yyj4941] - yyv4942.CodecDecodeSelf(d) + yyv4916 := &yyv4915[yyj4915] + yyv4916.CodecDecodeSelf(d) } } - if yyrt4941 { - for ; yyj4941 < yyl4941; yyj4941++ { - yyv4941 = append(yyv4941, ComponentStatus{}) - yyh4941.ElemContainerState(yyj4941) + if yyrt4915 { + for ; yyj4915 < yyl4915; yyj4915++ { + yyv4915 = append(yyv4915, ComponentStatus{}) + yyh4915.ElemContainerState(yyj4915) if r.TryDecodeAsNil() { - yyv4941[yyj4941] = ComponentStatus{} + yyv4915[yyj4915] = ComponentStatus{} } else { - yyv4943 := &yyv4941[yyj4941] - yyv4943.CodecDecodeSelf(d) + yyv4917 := &yyv4915[yyj4915] + yyv4917.CodecDecodeSelf(d) } } } } else { - yyj4941 := 0 - for ; !r.CheckBreak(); yyj4941++ { + yyj4915 := 0 + for ; !r.CheckBreak(); yyj4915++ { - if yyj4941 >= len(yyv4941) { - yyv4941 = append(yyv4941, ComponentStatus{}) // var yyz4941 ComponentStatus - yyc4941 = true + if yyj4915 >= len(yyv4915) { + yyv4915 = append(yyv4915, ComponentStatus{}) // var yyz4915 ComponentStatus + yyc4915 = true } - yyh4941.ElemContainerState(yyj4941) - if yyj4941 < len(yyv4941) { + yyh4915.ElemContainerState(yyj4915) + if yyj4915 < len(yyv4915) { if r.TryDecodeAsNil() { - yyv4941[yyj4941] = ComponentStatus{} + yyv4915[yyj4915] = ComponentStatus{} } else { - yyv4944 := &yyv4941[yyj4941] - yyv4944.CodecDecodeSelf(d) + yyv4918 := &yyv4915[yyj4915] + yyv4918.CodecDecodeSelf(d) } } else { @@ -63611,16 +63312,16 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 } } - if yyj4941 < len(yyv4941) { - yyv4941 = yyv4941[:yyj4941] - yyc4941 = true - } else if yyj4941 == 0 && yyv4941 == nil { - yyv4941 = []ComponentStatus{} - yyc4941 = true + if yyj4915 < len(yyv4915) { + yyv4915 = yyv4915[:yyj4915] + yyc4915 = true + } else if yyj4915 == 0 && yyv4915 == nil { + yyv4915 = []ComponentStatus{} + yyc4915 = true } } - yyh4941.End() - if yyc4941 { - *v = yyv4941 + yyh4915.End() + if yyc4915 { + *v = yyv4915 } } diff --git a/staging/src/k8s.io/client-go/pkg/api/types.go b/staging/src/k8s.io/client-go/pkg/api/types.go index a4eaeb9d5ab..fcdbf387aeb 100644 --- a/staging/src/k8s.io/client-go/pkg/api/types.go +++ b/staging/src/k8s.io/client-go/pkg/api/types.go @@ -18,7 +18,7 @@ package api import ( "k8s.io/client-go/pkg/api/resource" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/fields" "k8s.io/client-go/pkg/labels" "k8s.io/client-go/pkg/runtime" @@ -112,7 +112,7 @@ type ObjectMeta struct { // created. It is not guaranteed to be set in happens-before order across separate operations. // Clients may not set this value. It is represented in RFC3339 form and is in UTC. // +optional - CreationTimestamp unversioned.Time `json:"creationTimestamp,omitempty"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty"` // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // field is set by the server when a graceful deletion is requested by the user, and is not @@ -132,7 +132,7 @@ type ObjectMeta struct { // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - DeletionTimestamp *unversioned.Time `json:"deletionTimestamp,omitempty"` + DeletionTimestamp *metav1.Time `json:"deletionTimestamp,omitempty"` // DeletionGracePeriodSeconds records the graceful deletion value set when graceful deletion // was requested. Represents the most recent grace period, and may only be shortened once set. @@ -368,7 +368,7 @@ type PersistentVolumeClaimVolumeSource struct { // +nonNamespaced=true type PersistentVolume struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -429,17 +429,17 @@ type PersistentVolumeStatus struct { } type PersistentVolumeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` - Items []PersistentVolume `json:"items"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []PersistentVolume `json:"items"` } // +genclient=true // PersistentVolumeClaim is a user's request for and claim to a persistent volume type PersistentVolumeClaim struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -453,10 +453,10 @@ type PersistentVolumeClaim struct { } type PersistentVolumeClaimList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` - Items []PersistentVolumeClaim `json:"items"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []PersistentVolumeClaim `json:"items"` } // PersistentVolumeClaimSpec describes the common attributes of storage devices @@ -468,7 +468,7 @@ type PersistentVolumeClaimSpec struct { // A label query over volumes to consider for binding. This selector is // ignored when VolumeName is set // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Resources represents the minimum resources required // +optional Resources ResourceRequirements `json:"resources,omitempty"` @@ -1362,7 +1362,7 @@ type ContainerStateWaiting struct { type ContainerStateRunning struct { // +optional - StartedAt unversioned.Time `json:"startedAt,omitempty"` + StartedAt metav1.Time `json:"startedAt,omitempty"` } type ContainerStateTerminated struct { @@ -1374,9 +1374,9 @@ type ContainerStateTerminated struct { // +optional Message string `json:"message,omitempty"` // +optional - StartedAt unversioned.Time `json:"startedAt,omitempty"` + StartedAt metav1.Time `json:"startedAt,omitempty"` // +optional - FinishedAt unversioned.Time `json:"finishedAt,omitempty"` + FinishedAt metav1.Time `json:"finishedAt,omitempty"` // +optional ContainerID string `json:"containerID,omitempty"` } @@ -1454,9 +1454,9 @@ type PodCondition struct { Type PodConditionType `json:"type"` Status ConditionStatus `json:"status"` // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"` // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // +optional Reason string `json:"reason,omitempty"` // +optional @@ -1477,9 +1477,9 @@ const ( // PodList is a list of Pods. type PodList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Pod `json:"items"` } @@ -1641,7 +1641,7 @@ type WeightedPodAffinityTerm struct { type PodAffinityTerm struct { // A label query over a set of resources, in this case pods. // +optional - LabelSelector *unversioned.LabelSelector `json:"labelSelector,omitempty"` + LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"` // namespaces specifies which namespaces the labelSelector applies to (matches against); // nil list means "this pod's namespace," empty list means "all namespaces" // The json tag here is not "omitempty" since we need to distinguish nil and empty. @@ -1916,7 +1916,7 @@ type PodStatus struct { // Date and time at which the object was acknowledged by the Kubelet. // This is before the Kubelet pulled the container image(s) for the pod. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty"` + StartTime *metav1.Time `json:"startTime,omitempty"` // The list has one entry per init container in the manifest. The most recent successful // init container will have ready = true, the most recently started container will have @@ -1934,7 +1934,7 @@ type PodStatus struct { // PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded type PodStatusResult struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` // Status represents the current information about a pod. This data may not be up @@ -1947,7 +1947,7 @@ type PodStatusResult struct { // Pod is a collection of containers, used as either input (create, update) or as output (list, get). type Pod struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -1976,7 +1976,7 @@ type PodTemplateSpec struct { // PodTemplate describes a template for creating copies of a predefined pod. type PodTemplate struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -1987,9 +1987,9 @@ type PodTemplate struct { // PodTemplateList is a list of PodTemplates. type PodTemplateList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []PodTemplate `json:"items"` } @@ -2068,7 +2068,7 @@ type ReplicationControllerCondition struct { Status ConditionStatus `json:"status"` // The last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // The reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty"` @@ -2081,7 +2081,7 @@ type ReplicationControllerCondition struct { // ReplicationController represents the configuration of a replication controller. type ReplicationController struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2097,9 +2097,9 @@ type ReplicationController struct { // ReplicationControllerList is a collection of replication controllers. type ReplicationControllerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []ReplicationController `json:"items"` } @@ -2112,9 +2112,9 @@ const ( // ServiceList holds a list of services. type ServiceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Service `json:"items"` } @@ -2286,7 +2286,7 @@ type ServicePort struct { // (for example 3306) that the proxy listens on, and the selector that determines which pods // will answer requests sent through the proxy. type Service struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2306,7 +2306,7 @@ type Service struct { // * a principal that can be authenticated and authorized // * a set of secrets type ServiceAccount struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2322,9 +2322,9 @@ type ServiceAccount struct { // ServiceAccountList is a list of ServiceAccount objects type ServiceAccountList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []ServiceAccount `json:"items"` } @@ -2344,7 +2344,7 @@ type ServiceAccountList struct { // }, // ] type Endpoints struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2401,9 +2401,9 @@ type EndpointPort struct { // EndpointsList is a list of endpoints. type EndpointsList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Endpoints `json:"items"` } @@ -2537,7 +2537,7 @@ type PreferAvoidPodsEntry struct { PodSignature PodSignature `json:"podSignature"` // Time at which this entry was added to the list. // +optional - EvictionTime unversioned.Time `json:"evictionTime,omitempty"` + EvictionTime metav1.Time `json:"evictionTime,omitempty"` // (brief) reason why this entry was added to the list. // +optional Reason string `json:"reason,omitempty"` @@ -2598,9 +2598,9 @@ type NodeCondition struct { Type NodeConditionType `json:"type"` Status ConditionStatus `json:"status"` // +optional - LastHeartbeatTime unversioned.Time `json:"lastHeartbeatTime,omitempty"` + LastHeartbeatTime metav1.Time `json:"lastHeartbeatTime,omitempty"` // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // +optional Reason string `json:"reason,omitempty"` // +optional @@ -2666,7 +2666,7 @@ type ResourceList map[ResourceName]resource.Quantity // Node is a worker node in Kubernetes // The name of the node according to etcd is in ObjectMeta.Name. type Node struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2681,9 +2681,9 @@ type Node struct { // NodeList is a list of nodes. type NodeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Node `json:"items"` } @@ -2725,7 +2725,7 @@ const ( // A namespace provides a scope for Names. // Use of multiple namespaces is optional type Namespace struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2740,16 +2740,16 @@ type Namespace struct { // NamespaceList is a list of Namespaces. type NamespaceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Namespace `json:"items"` } // Binding ties one object to another - for example, a pod is bound to a node by a scheduler. type Binding struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // ObjectMeta describes the object that is being bound. // +optional ObjectMeta `json:"metadata,omitempty"` @@ -2767,7 +2767,7 @@ type Preconditions struct { // DeleteOptions may be provided when deleting an API object type DeleteOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Optional duration in seconds before the object should be deleted. Value must be non-negative integer. // The value zero indicates delete immediately. If this value is nil, the default grace period for the @@ -2786,19 +2786,10 @@ type DeleteOptions struct { OrphanDependents *bool `json:"orphanDependents,omitempty"` } -// ExportOptions is the query options to the standard REST get call. -type ExportOptions struct { - unversioned.TypeMeta `json:",inline"` - // Should this value be exported. Export strips fields that a user can not specify. - Export bool `json:"export"` - // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace' - Exact bool `json:"exact"` -} - // ListOptions is the query options to a standard REST list call, and has future support for // watch calls. type ListOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // A selector based on labels LabelSelector labels.Selector @@ -2818,7 +2809,7 @@ type ListOptions struct { // PodLogOptions is the query options for a Pod's logs REST call type PodLogOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Container for which to return logs Container string @@ -2835,7 +2826,7 @@ type PodLogOptions struct { // precedes the time a pod was started, only logs since the pod start will be returned. // If this value is in the future, no logs will be returned. // Only one of sinceSeconds or sinceTime may be specified. - SinceTime *unversioned.Time + SinceTime *metav1.Time // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // of log output. Timestamps bool @@ -2851,7 +2842,7 @@ type PodLogOptions struct { // PodAttachOptions is the query options to a Pod's remote attach call // TODO: merge w/ PodExecOptions below for stdin, stdout, etc type PodAttachOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Stdin if true indicates that stdin is to be redirected for the attach call // +optional @@ -2876,7 +2867,7 @@ type PodAttachOptions struct { // PodExecOptions is the query options to a Pod's remote exec call type PodExecOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Stdin if true indicates that stdin is to be redirected for the exec call Stdin bool @@ -2899,7 +2890,7 @@ type PodExecOptions struct { // PodProxyOptions is the query options to a Pod's proxy call type PodProxyOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Path is the URL path to use for the current proxy request Path string @@ -2907,7 +2898,7 @@ type PodProxyOptions struct { // NodeProxyOptions is the query options to a Node's proxy call type NodeProxyOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Path is the URL path to use for the current proxy request Path string @@ -2915,7 +2906,7 @@ type NodeProxyOptions struct { // ServiceProxyOptions is the query options to a Service's proxy call. type ServiceProxyOptions struct { - unversioned.TypeMeta + metav1.TypeMeta // Path is the part of URLs that include service endpoints, suffixes, // and parameters to use for the current proxy request to service. @@ -2979,7 +2970,7 @@ type LocalObjectReference struct { } type SerializedReference struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional Reference ObjectReference `json:"reference,omitempty"` } @@ -3006,7 +2997,7 @@ const ( // Event is a report of an event somewhere in the cluster. // TODO: Decide whether to store these separately or with the object they apply to. type Event struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3032,11 +3023,11 @@ type Event struct { // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // +optional - FirstTimestamp unversioned.Time `json:"firstTimestamp,omitempty"` + FirstTimestamp metav1.Time `json:"firstTimestamp,omitempty"` // The time at which the most recent occurrence of this event was recorded. // +optional - LastTimestamp unversioned.Time `json:"lastTimestamp,omitempty"` + LastTimestamp metav1.Time `json:"lastTimestamp,omitempty"` // The number of times this event has occurred. // +optional @@ -3049,18 +3040,18 @@ type Event struct { // EventList is a list of events. type EventList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Event `json:"items"` } // List holds a list of objects, which may not be known by the server. type List struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []runtime.Object `json:"items"` } @@ -3109,7 +3100,7 @@ type LimitRangeSpec struct { // LimitRange sets resource usage limits for each kind of resource in a Namespace type LimitRange struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3120,9 +3111,9 @@ type LimitRange struct { // LimitRangeList is a list of LimitRange items. type LimitRangeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is a list of LimitRange objects Items []LimitRange `json:"items"` @@ -3199,7 +3190,7 @@ type ResourceQuotaStatus struct { // ResourceQuota sets aggregate quota restrictions enforced per namespace type ResourceQuota struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3214,9 +3205,9 @@ type ResourceQuota struct { // ResourceQuotaList is a list of ResourceQuota items type ResourceQuotaList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is a list of ResourceQuota objects Items []ResourceQuota `json:"items"` @@ -3227,7 +3218,7 @@ type ResourceQuotaList struct { // Secret holds secret data of a certain type. The total bytes of the values in // the Data field must be less than MaxSecretSize bytes. type Secret struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3328,9 +3319,9 @@ const ( ) type SecretList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []Secret `json:"items"` } @@ -3339,7 +3330,7 @@ type SecretList struct { // ConfigMap holds configuration data for components or applications to consume. type ConfigMap struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3351,9 +3342,9 @@ type ConfigMap struct { // ConfigMapList is a resource containing a list of ConfigMap objects. type ConfigMapList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of ConfigMaps. Items []ConfigMap `json:"items"` @@ -3433,7 +3424,7 @@ type ComponentCondition struct { // ComponentStatus (and ComponentStatusList) holds the cluster validation info. type ComponentStatus struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` @@ -3442,9 +3433,9 @@ type ComponentStatus struct { } type ComponentStatusList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []ComponentStatus `json:"items"` } @@ -3512,7 +3503,7 @@ type SELinuxOptions struct { // data encoding hints). A range allocation should *ALWAYS* be recreatable at any time by observation // of the cluster, thus the object is less strongly typed than most. type RangeAllocation struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional ObjectMeta `json:"metadata,omitempty"` // A string representing a unique label for a range of resources, such as a CIDR "10.0.0.0/8" or @@ -3538,5 +3529,5 @@ const ( // When the --failure-domains scheduler flag is not specified, // DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity. - DefaultFailureDomains string = unversioned.LabelHostname + "," + unversioned.LabelZoneFailureDomain + "," + unversioned.LabelZoneRegion + DefaultFailureDomains string = metav1.LabelHostname + "," + metav1.LabelZoneFailureDomain + "," + metav1.LabelZoneRegion ) diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/OWNERS b/staging/src/k8s.io/client-go/pkg/api/v1/OWNERS new file mode 100755 index 00000000000..fdb84b24a92 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/api/v1/OWNERS @@ -0,0 +1,41 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- deads2k +- yujuhong +- brendandburns +- derekwaynecarr +- caesarxuchao +- vishh +- mikedanese +- liggitt +- nikhiljindal +- bprashanth +- gmarek +- erictune +- davidopp +- pmorie +- sttts +- kargakis +- dchen1107 +- saad-ali +- zmerlynn +- luxas +- janetkuo +- justinsb +- roberthbailey +- ncdc +- timstclair +- eparis +- timothysc +- piosz +- jsafrane +- dims +- errordeveloper +- madhusudancs +- krousey +- jayunit100 +- rootfs +- markturansky diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/api/v1/generated.pb.go index ee4437c8605..374d455f41e 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/generated.pb.go @@ -66,7 +66,6 @@ limitations under the License. EventList EventSource ExecAction - ExportOptions FCVolumeSource FlexVolumeSource FlockerVolumeSource @@ -191,7 +190,7 @@ import fmt "fmt" import math "math" import k8s_io_kubernetes_pkg_api_resource "k8s.io/client-go/pkg/api/resource" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_runtime "k8s.io/client-go/pkg/runtime" import k8s_io_kubernetes_pkg_types "k8s.io/client-go/pkg/types" @@ -381,500 +380,496 @@ func (m *ExecAction) Reset() { *m = ExecAction{} } func (*ExecAction) ProtoMessage() {} func (*ExecAction) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{40} } -func (m *ExportOptions) Reset() { *m = ExportOptions{} } -func (*ExportOptions) ProtoMessage() {} -func (*ExportOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{41} } - func (m *FCVolumeSource) Reset() { *m = FCVolumeSource{} } func (*FCVolumeSource) ProtoMessage() {} -func (*FCVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{42} } +func (*FCVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{41} } func (m *FlexVolumeSource) Reset() { *m = FlexVolumeSource{} } func (*FlexVolumeSource) ProtoMessage() {} -func (*FlexVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{43} } +func (*FlexVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{42} } func (m *FlockerVolumeSource) Reset() { *m = FlockerVolumeSource{} } func (*FlockerVolumeSource) ProtoMessage() {} -func (*FlockerVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{44} } +func (*FlockerVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{43} } func (m *GCEPersistentDiskVolumeSource) Reset() { *m = GCEPersistentDiskVolumeSource{} } func (*GCEPersistentDiskVolumeSource) ProtoMessage() {} func (*GCEPersistentDiskVolumeSource) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{45} + return fileDescriptorGenerated, []int{44} } func (m *GitRepoVolumeSource) Reset() { *m = GitRepoVolumeSource{} } func (*GitRepoVolumeSource) ProtoMessage() {} -func (*GitRepoVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{46} } +func (*GitRepoVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{45} } func (m *GlusterfsVolumeSource) Reset() { *m = GlusterfsVolumeSource{} } func (*GlusterfsVolumeSource) ProtoMessage() {} -func (*GlusterfsVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{47} } +func (*GlusterfsVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{46} } func (m *HTTPGetAction) Reset() { *m = HTTPGetAction{} } func (*HTTPGetAction) ProtoMessage() {} -func (*HTTPGetAction) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{48} } +func (*HTTPGetAction) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{47} } func (m *HTTPHeader) Reset() { *m = HTTPHeader{} } func (*HTTPHeader) ProtoMessage() {} -func (*HTTPHeader) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{49} } +func (*HTTPHeader) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{48} } func (m *Handler) Reset() { *m = Handler{} } func (*Handler) ProtoMessage() {} -func (*Handler) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{50} } +func (*Handler) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{49} } func (m *HostPathVolumeSource) Reset() { *m = HostPathVolumeSource{} } func (*HostPathVolumeSource) ProtoMessage() {} -func (*HostPathVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{51} } +func (*HostPathVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{50} } func (m *ISCSIVolumeSource) Reset() { *m = ISCSIVolumeSource{} } func (*ISCSIVolumeSource) ProtoMessage() {} -func (*ISCSIVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{52} } +func (*ISCSIVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{51} } func (m *KeyToPath) Reset() { *m = KeyToPath{} } func (*KeyToPath) ProtoMessage() {} -func (*KeyToPath) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{53} } +func (*KeyToPath) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{52} } func (m *Lifecycle) Reset() { *m = Lifecycle{} } func (*Lifecycle) ProtoMessage() {} -func (*Lifecycle) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{54} } +func (*Lifecycle) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{53} } func (m *LimitRange) Reset() { *m = LimitRange{} } func (*LimitRange) ProtoMessage() {} -func (*LimitRange) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{55} } +func (*LimitRange) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{54} } func (m *LimitRangeItem) Reset() { *m = LimitRangeItem{} } func (*LimitRangeItem) ProtoMessage() {} -func (*LimitRangeItem) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{56} } +func (*LimitRangeItem) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{55} } func (m *LimitRangeList) Reset() { *m = LimitRangeList{} } func (*LimitRangeList) ProtoMessage() {} -func (*LimitRangeList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{57} } +func (*LimitRangeList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{56} } func (m *LimitRangeSpec) Reset() { *m = LimitRangeSpec{} } func (*LimitRangeSpec) ProtoMessage() {} -func (*LimitRangeSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{58} } +func (*LimitRangeSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{57} } func (m *List) Reset() { *m = List{} } func (*List) ProtoMessage() {} -func (*List) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{59} } +func (*List) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{58} } func (m *ListOptions) Reset() { *m = ListOptions{} } func (*ListOptions) ProtoMessage() {} -func (*ListOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{60} } +func (*ListOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{59} } func (m *LoadBalancerIngress) Reset() { *m = LoadBalancerIngress{} } func (*LoadBalancerIngress) ProtoMessage() {} -func (*LoadBalancerIngress) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{61} } +func (*LoadBalancerIngress) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{60} } func (m *LoadBalancerStatus) Reset() { *m = LoadBalancerStatus{} } func (*LoadBalancerStatus) ProtoMessage() {} -func (*LoadBalancerStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{62} } +func (*LoadBalancerStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{61} } func (m *LocalObjectReference) Reset() { *m = LocalObjectReference{} } func (*LocalObjectReference) ProtoMessage() {} -func (*LocalObjectReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{63} } +func (*LocalObjectReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{62} } func (m *NFSVolumeSource) Reset() { *m = NFSVolumeSource{} } func (*NFSVolumeSource) ProtoMessage() {} -func (*NFSVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{64} } +func (*NFSVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{63} } func (m *Namespace) Reset() { *m = Namespace{} } func (*Namespace) ProtoMessage() {} -func (*Namespace) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{65} } +func (*Namespace) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{64} } func (m *NamespaceList) Reset() { *m = NamespaceList{} } func (*NamespaceList) ProtoMessage() {} -func (*NamespaceList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{66} } +func (*NamespaceList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{65} } func (m *NamespaceSpec) Reset() { *m = NamespaceSpec{} } func (*NamespaceSpec) ProtoMessage() {} -func (*NamespaceSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{67} } +func (*NamespaceSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{66} } func (m *NamespaceStatus) Reset() { *m = NamespaceStatus{} } func (*NamespaceStatus) ProtoMessage() {} -func (*NamespaceStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{68} } +func (*NamespaceStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{67} } func (m *Node) Reset() { *m = Node{} } func (*Node) ProtoMessage() {} -func (*Node) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{69} } +func (*Node) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{68} } func (m *NodeAddress) Reset() { *m = NodeAddress{} } func (*NodeAddress) ProtoMessage() {} -func (*NodeAddress) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{70} } +func (*NodeAddress) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{69} } func (m *NodeAffinity) Reset() { *m = NodeAffinity{} } func (*NodeAffinity) ProtoMessage() {} -func (*NodeAffinity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{71} } +func (*NodeAffinity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{70} } func (m *NodeCondition) Reset() { *m = NodeCondition{} } func (*NodeCondition) ProtoMessage() {} -func (*NodeCondition) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{72} } +func (*NodeCondition) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{71} } func (m *NodeDaemonEndpoints) Reset() { *m = NodeDaemonEndpoints{} } func (*NodeDaemonEndpoints) ProtoMessage() {} -func (*NodeDaemonEndpoints) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{73} } +func (*NodeDaemonEndpoints) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{72} } func (m *NodeList) Reset() { *m = NodeList{} } func (*NodeList) ProtoMessage() {} -func (*NodeList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{74} } +func (*NodeList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{73} } func (m *NodeProxyOptions) Reset() { *m = NodeProxyOptions{} } func (*NodeProxyOptions) ProtoMessage() {} -func (*NodeProxyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{75} } +func (*NodeProxyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{74} } func (m *NodeResources) Reset() { *m = NodeResources{} } func (*NodeResources) ProtoMessage() {} -func (*NodeResources) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{76} } +func (*NodeResources) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{75} } func (m *NodeSelector) Reset() { *m = NodeSelector{} } func (*NodeSelector) ProtoMessage() {} -func (*NodeSelector) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{77} } +func (*NodeSelector) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{76} } func (m *NodeSelectorRequirement) Reset() { *m = NodeSelectorRequirement{} } func (*NodeSelectorRequirement) ProtoMessage() {} func (*NodeSelectorRequirement) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{78} + return fileDescriptorGenerated, []int{77} } func (m *NodeSelectorTerm) Reset() { *m = NodeSelectorTerm{} } func (*NodeSelectorTerm) ProtoMessage() {} -func (*NodeSelectorTerm) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{79} } +func (*NodeSelectorTerm) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{78} } func (m *NodeSpec) Reset() { *m = NodeSpec{} } func (*NodeSpec) ProtoMessage() {} -func (*NodeSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{80} } +func (*NodeSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{79} } func (m *NodeStatus) Reset() { *m = NodeStatus{} } func (*NodeStatus) ProtoMessage() {} -func (*NodeStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{81} } +func (*NodeStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{80} } func (m *NodeSystemInfo) Reset() { *m = NodeSystemInfo{} } func (*NodeSystemInfo) ProtoMessage() {} -func (*NodeSystemInfo) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{82} } +func (*NodeSystemInfo) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{81} } func (m *ObjectFieldSelector) Reset() { *m = ObjectFieldSelector{} } func (*ObjectFieldSelector) ProtoMessage() {} -func (*ObjectFieldSelector) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{83} } +func (*ObjectFieldSelector) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{82} } func (m *ObjectMeta) Reset() { *m = ObjectMeta{} } func (*ObjectMeta) ProtoMessage() {} -func (*ObjectMeta) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{84} } +func (*ObjectMeta) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{83} } func (m *ObjectReference) Reset() { *m = ObjectReference{} } func (*ObjectReference) ProtoMessage() {} -func (*ObjectReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{85} } +func (*ObjectReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{84} } func (m *OwnerReference) Reset() { *m = OwnerReference{} } func (*OwnerReference) ProtoMessage() {} -func (*OwnerReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{86} } +func (*OwnerReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{85} } func (m *PersistentVolume) Reset() { *m = PersistentVolume{} } func (*PersistentVolume) ProtoMessage() {} -func (*PersistentVolume) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{87} } +func (*PersistentVolume) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{86} } func (m *PersistentVolumeClaim) Reset() { *m = PersistentVolumeClaim{} } func (*PersistentVolumeClaim) ProtoMessage() {} -func (*PersistentVolumeClaim) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{88} } +func (*PersistentVolumeClaim) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{87} } func (m *PersistentVolumeClaimList) Reset() { *m = PersistentVolumeClaimList{} } func (*PersistentVolumeClaimList) ProtoMessage() {} func (*PersistentVolumeClaimList) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{89} + return fileDescriptorGenerated, []int{88} } func (m *PersistentVolumeClaimSpec) Reset() { *m = PersistentVolumeClaimSpec{} } func (*PersistentVolumeClaimSpec) ProtoMessage() {} func (*PersistentVolumeClaimSpec) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{90} + return fileDescriptorGenerated, []int{89} } func (m *PersistentVolumeClaimStatus) Reset() { *m = PersistentVolumeClaimStatus{} } func (*PersistentVolumeClaimStatus) ProtoMessage() {} func (*PersistentVolumeClaimStatus) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{91} + return fileDescriptorGenerated, []int{90} } func (m *PersistentVolumeClaimVolumeSource) Reset() { *m = PersistentVolumeClaimVolumeSource{} } func (*PersistentVolumeClaimVolumeSource) ProtoMessage() {} func (*PersistentVolumeClaimVolumeSource) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{92} + return fileDescriptorGenerated, []int{91} } func (m *PersistentVolumeList) Reset() { *m = PersistentVolumeList{} } func (*PersistentVolumeList) ProtoMessage() {} -func (*PersistentVolumeList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{93} } +func (*PersistentVolumeList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{92} } func (m *PersistentVolumeSource) Reset() { *m = PersistentVolumeSource{} } func (*PersistentVolumeSource) ProtoMessage() {} -func (*PersistentVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{94} } +func (*PersistentVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{93} } func (m *PersistentVolumeSpec) Reset() { *m = PersistentVolumeSpec{} } func (*PersistentVolumeSpec) ProtoMessage() {} -func (*PersistentVolumeSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{95} } +func (*PersistentVolumeSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{94} } func (m *PersistentVolumeStatus) Reset() { *m = PersistentVolumeStatus{} } func (*PersistentVolumeStatus) ProtoMessage() {} -func (*PersistentVolumeStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{96} } +func (*PersistentVolumeStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{95} } func (m *PhotonPersistentDiskVolumeSource) Reset() { *m = PhotonPersistentDiskVolumeSource{} } func (*PhotonPersistentDiskVolumeSource) ProtoMessage() {} func (*PhotonPersistentDiskVolumeSource) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{97} + return fileDescriptorGenerated, []int{96} } func (m *Pod) Reset() { *m = Pod{} } func (*Pod) ProtoMessage() {} -func (*Pod) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{98} } +func (*Pod) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{97} } func (m *PodAffinity) Reset() { *m = PodAffinity{} } func (*PodAffinity) ProtoMessage() {} -func (*PodAffinity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{99} } +func (*PodAffinity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{98} } func (m *PodAffinityTerm) Reset() { *m = PodAffinityTerm{} } func (*PodAffinityTerm) ProtoMessage() {} -func (*PodAffinityTerm) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{100} } +func (*PodAffinityTerm) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{99} } func (m *PodAntiAffinity) Reset() { *m = PodAntiAffinity{} } func (*PodAntiAffinity) ProtoMessage() {} -func (*PodAntiAffinity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{101} } +func (*PodAntiAffinity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{100} } func (m *PodAttachOptions) Reset() { *m = PodAttachOptions{} } func (*PodAttachOptions) ProtoMessage() {} -func (*PodAttachOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{102} } +func (*PodAttachOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{101} } func (m *PodCondition) Reset() { *m = PodCondition{} } func (*PodCondition) ProtoMessage() {} -func (*PodCondition) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{103} } +func (*PodCondition) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{102} } func (m *PodExecOptions) Reset() { *m = PodExecOptions{} } func (*PodExecOptions) ProtoMessage() {} -func (*PodExecOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{104} } +func (*PodExecOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{103} } func (m *PodList) Reset() { *m = PodList{} } func (*PodList) ProtoMessage() {} -func (*PodList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{105} } +func (*PodList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{104} } func (m *PodLogOptions) Reset() { *m = PodLogOptions{} } func (*PodLogOptions) ProtoMessage() {} -func (*PodLogOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{106} } +func (*PodLogOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{105} } func (m *PodProxyOptions) Reset() { *m = PodProxyOptions{} } func (*PodProxyOptions) ProtoMessage() {} -func (*PodProxyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{107} } +func (*PodProxyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{106} } func (m *PodSecurityContext) Reset() { *m = PodSecurityContext{} } func (*PodSecurityContext) ProtoMessage() {} -func (*PodSecurityContext) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{108} } +func (*PodSecurityContext) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{107} } func (m *PodSignature) Reset() { *m = PodSignature{} } func (*PodSignature) ProtoMessage() {} -func (*PodSignature) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{109} } +func (*PodSignature) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{108} } func (m *PodSpec) Reset() { *m = PodSpec{} } func (*PodSpec) ProtoMessage() {} -func (*PodSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{110} } +func (*PodSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{109} } func (m *PodStatus) Reset() { *m = PodStatus{} } func (*PodStatus) ProtoMessage() {} -func (*PodStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{111} } +func (*PodStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{110} } func (m *PodStatusResult) Reset() { *m = PodStatusResult{} } func (*PodStatusResult) ProtoMessage() {} -func (*PodStatusResult) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{112} } +func (*PodStatusResult) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{111} } func (m *PodTemplate) Reset() { *m = PodTemplate{} } func (*PodTemplate) ProtoMessage() {} -func (*PodTemplate) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{113} } +func (*PodTemplate) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{112} } func (m *PodTemplateList) Reset() { *m = PodTemplateList{} } func (*PodTemplateList) ProtoMessage() {} -func (*PodTemplateList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{114} } +func (*PodTemplateList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{113} } func (m *PodTemplateSpec) Reset() { *m = PodTemplateSpec{} } func (*PodTemplateSpec) ProtoMessage() {} -func (*PodTemplateSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{115} } +func (*PodTemplateSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{114} } func (m *Preconditions) Reset() { *m = Preconditions{} } func (*Preconditions) ProtoMessage() {} -func (*Preconditions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{116} } +func (*Preconditions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{115} } func (m *PreferAvoidPodsEntry) Reset() { *m = PreferAvoidPodsEntry{} } func (*PreferAvoidPodsEntry) ProtoMessage() {} -func (*PreferAvoidPodsEntry) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{117} } +func (*PreferAvoidPodsEntry) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{116} } func (m *PreferredSchedulingTerm) Reset() { *m = PreferredSchedulingTerm{} } func (*PreferredSchedulingTerm) ProtoMessage() {} func (*PreferredSchedulingTerm) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{118} + return fileDescriptorGenerated, []int{117} } func (m *Probe) Reset() { *m = Probe{} } func (*Probe) ProtoMessage() {} -func (*Probe) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{119} } +func (*Probe) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{118} } func (m *QuobyteVolumeSource) Reset() { *m = QuobyteVolumeSource{} } func (*QuobyteVolumeSource) ProtoMessage() {} -func (*QuobyteVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{120} } +func (*QuobyteVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{119} } func (m *RBDVolumeSource) Reset() { *m = RBDVolumeSource{} } func (*RBDVolumeSource) ProtoMessage() {} -func (*RBDVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{121} } +func (*RBDVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{120} } func (m *RangeAllocation) Reset() { *m = RangeAllocation{} } func (*RangeAllocation) ProtoMessage() {} -func (*RangeAllocation) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{122} } +func (*RangeAllocation) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{121} } func (m *ReplicationController) Reset() { *m = ReplicationController{} } func (*ReplicationController) ProtoMessage() {} -func (*ReplicationController) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{123} } +func (*ReplicationController) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{122} } func (m *ReplicationControllerCondition) Reset() { *m = ReplicationControllerCondition{} } func (*ReplicationControllerCondition) ProtoMessage() {} func (*ReplicationControllerCondition) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{124} + return fileDescriptorGenerated, []int{123} } func (m *ReplicationControllerList) Reset() { *m = ReplicationControllerList{} } func (*ReplicationControllerList) ProtoMessage() {} func (*ReplicationControllerList) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{125} + return fileDescriptorGenerated, []int{124} } func (m *ReplicationControllerSpec) Reset() { *m = ReplicationControllerSpec{} } func (*ReplicationControllerSpec) ProtoMessage() {} func (*ReplicationControllerSpec) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{126} + return fileDescriptorGenerated, []int{125} } func (m *ReplicationControllerStatus) Reset() { *m = ReplicationControllerStatus{} } func (*ReplicationControllerStatus) ProtoMessage() {} func (*ReplicationControllerStatus) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{127} + return fileDescriptorGenerated, []int{126} } func (m *ResourceFieldSelector) Reset() { *m = ResourceFieldSelector{} } func (*ResourceFieldSelector) ProtoMessage() {} -func (*ResourceFieldSelector) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{128} } +func (*ResourceFieldSelector) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{127} } func (m *ResourceQuota) Reset() { *m = ResourceQuota{} } func (*ResourceQuota) ProtoMessage() {} -func (*ResourceQuota) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{129} } +func (*ResourceQuota) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{128} } func (m *ResourceQuotaList) Reset() { *m = ResourceQuotaList{} } func (*ResourceQuotaList) ProtoMessage() {} -func (*ResourceQuotaList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{130} } +func (*ResourceQuotaList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{129} } func (m *ResourceQuotaSpec) Reset() { *m = ResourceQuotaSpec{} } func (*ResourceQuotaSpec) ProtoMessage() {} -func (*ResourceQuotaSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{131} } +func (*ResourceQuotaSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{130} } func (m *ResourceQuotaStatus) Reset() { *m = ResourceQuotaStatus{} } func (*ResourceQuotaStatus) ProtoMessage() {} -func (*ResourceQuotaStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{132} } +func (*ResourceQuotaStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{131} } func (m *ResourceRequirements) Reset() { *m = ResourceRequirements{} } func (*ResourceRequirements) ProtoMessage() {} -func (*ResourceRequirements) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{133} } +func (*ResourceRequirements) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{132} } func (m *SELinuxOptions) Reset() { *m = SELinuxOptions{} } func (*SELinuxOptions) ProtoMessage() {} -func (*SELinuxOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{134} } +func (*SELinuxOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{133} } func (m *Secret) Reset() { *m = Secret{} } func (*Secret) ProtoMessage() {} -func (*Secret) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{135} } +func (*Secret) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{134} } func (m *SecretKeySelector) Reset() { *m = SecretKeySelector{} } func (*SecretKeySelector) ProtoMessage() {} -func (*SecretKeySelector) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{136} } +func (*SecretKeySelector) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{135} } func (m *SecretList) Reset() { *m = SecretList{} } func (*SecretList) ProtoMessage() {} -func (*SecretList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{137} } +func (*SecretList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{136} } func (m *SecretVolumeSource) Reset() { *m = SecretVolumeSource{} } func (*SecretVolumeSource) ProtoMessage() {} -func (*SecretVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{138} } +func (*SecretVolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{137} } func (m *SecurityContext) Reset() { *m = SecurityContext{} } func (*SecurityContext) ProtoMessage() {} -func (*SecurityContext) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{139} } +func (*SecurityContext) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{138} } func (m *SerializedReference) Reset() { *m = SerializedReference{} } func (*SerializedReference) ProtoMessage() {} -func (*SerializedReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{140} } +func (*SerializedReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{139} } func (m *Service) Reset() { *m = Service{} } func (*Service) ProtoMessage() {} -func (*Service) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{141} } +func (*Service) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{140} } func (m *ServiceAccount) Reset() { *m = ServiceAccount{} } func (*ServiceAccount) ProtoMessage() {} -func (*ServiceAccount) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{142} } +func (*ServiceAccount) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{141} } func (m *ServiceAccountList) Reset() { *m = ServiceAccountList{} } func (*ServiceAccountList) ProtoMessage() {} -func (*ServiceAccountList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{143} } +func (*ServiceAccountList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{142} } func (m *ServiceList) Reset() { *m = ServiceList{} } func (*ServiceList) ProtoMessage() {} -func (*ServiceList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{144} } +func (*ServiceList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{143} } func (m *ServicePort) Reset() { *m = ServicePort{} } func (*ServicePort) ProtoMessage() {} -func (*ServicePort) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{145} } +func (*ServicePort) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{144} } func (m *ServiceProxyOptions) Reset() { *m = ServiceProxyOptions{} } func (*ServiceProxyOptions) ProtoMessage() {} -func (*ServiceProxyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{146} } +func (*ServiceProxyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{145} } func (m *ServiceSpec) Reset() { *m = ServiceSpec{} } func (*ServiceSpec) ProtoMessage() {} -func (*ServiceSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{147} } +func (*ServiceSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{146} } func (m *ServiceStatus) Reset() { *m = ServiceStatus{} } func (*ServiceStatus) ProtoMessage() {} -func (*ServiceStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{148} } +func (*ServiceStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{147} } func (m *Sysctl) Reset() { *m = Sysctl{} } func (*Sysctl) ProtoMessage() {} -func (*Sysctl) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{149} } +func (*Sysctl) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{148} } func (m *TCPSocketAction) Reset() { *m = TCPSocketAction{} } func (*TCPSocketAction) ProtoMessage() {} -func (*TCPSocketAction) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{150} } +func (*TCPSocketAction) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{149} } func (m *Taint) Reset() { *m = Taint{} } func (*Taint) ProtoMessage() {} -func (*Taint) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{151} } +func (*Taint) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{150} } func (m *Toleration) Reset() { *m = Toleration{} } func (*Toleration) ProtoMessage() {} -func (*Toleration) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{152} } +func (*Toleration) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{151} } func (m *Volume) Reset() { *m = Volume{} } func (*Volume) ProtoMessage() {} -func (*Volume) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{153} } +func (*Volume) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{152} } func (m *VolumeMount) Reset() { *m = VolumeMount{} } func (*VolumeMount) ProtoMessage() {} -func (*VolumeMount) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{154} } +func (*VolumeMount) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{153} } func (m *VolumeSource) Reset() { *m = VolumeSource{} } func (*VolumeSource) ProtoMessage() {} -func (*VolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{155} } +func (*VolumeSource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{154} } func (m *VsphereVirtualDiskVolumeSource) Reset() { *m = VsphereVirtualDiskVolumeSource{} } func (*VsphereVirtualDiskVolumeSource) ProtoMessage() {} func (*VsphereVirtualDiskVolumeSource) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{156} + return fileDescriptorGenerated, []int{155} } func (m *WeightedPodAffinityTerm) Reset() { *m = WeightedPodAffinityTerm{} } func (*WeightedPodAffinityTerm) ProtoMessage() {} func (*WeightedPodAffinityTerm) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{157} + return fileDescriptorGenerated, []int{156} } func init() { @@ -919,7 +914,6 @@ func init() { proto.RegisterType((*EventList)(nil), "k8s.io.client-go.pkg.api.v1.EventList") proto.RegisterType((*EventSource)(nil), "k8s.io.client-go.pkg.api.v1.EventSource") proto.RegisterType((*ExecAction)(nil), "k8s.io.client-go.pkg.api.v1.ExecAction") - proto.RegisterType((*ExportOptions)(nil), "k8s.io.client-go.pkg.api.v1.ExportOptions") proto.RegisterType((*FCVolumeSource)(nil), "k8s.io.client-go.pkg.api.v1.FCVolumeSource") proto.RegisterType((*FlexVolumeSource)(nil), "k8s.io.client-go.pkg.api.v1.FlexVolumeSource") proto.RegisterType((*FlockerVolumeSource)(nil), "k8s.io.client-go.pkg.api.v1.FlockerVolumeSource") @@ -2803,40 +2797,6 @@ func (m *ExecAction) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *ExportOptions) Marshal() (data []byte, err error) { - size := m.Size() - data = make([]byte, size) - n, err := m.MarshalTo(data) - if err != nil { - return nil, err - } - return data[:n], nil -} - -func (m *ExportOptions) MarshalTo(data []byte) (int, error) { - var i int - _ = i - var l int - _ = l - data[i] = 0x8 - i++ - if m.Export { - data[i] = 1 - } else { - data[i] = 0 - } - i++ - data[i] = 0x10 - i++ - if m.Exact { - data[i] = 1 - } else { - data[i] = 0 - } - i++ - return i, nil -} - func (m *FCVolumeSource) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) @@ -8974,14 +8934,6 @@ func (m *ExecAction) Size() (n int) { return n } -func (m *ExportOptions) Size() (n int) { - var l int - _ = l - n += 2 - n += 2 - return n -} - func (m *FCVolumeSource) Size() (n int) { var l int _ = l @@ -11166,7 +11118,7 @@ func (this *ComponentStatusList) String() string { return "nil" } s := strings.Join([]string{`&ComponentStatusList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ComponentStatus", "ComponentStatus", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11209,7 +11161,7 @@ func (this *ConfigMapList) String() string { return "nil" } s := strings.Join([]string{`&ConfigMapList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ConfigMap", "ConfigMap", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11296,7 +11248,7 @@ func (this *ContainerStateRunning) String() string { return "nil" } s := strings.Join([]string{`&ContainerStateRunning{`, - `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -11310,8 +11262,8 @@ func (this *ContainerStateTerminated) String() string { `Signal:` + fmt.Sprintf("%v", this.Signal) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `FinishedAt:` + strings.Replace(strings.Replace(this.FinishedAt.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `StartedAt:` + strings.Replace(strings.Replace(this.StartedAt.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `FinishedAt:` + strings.Replace(strings.Replace(this.FinishedAt.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, `}`, }, "") @@ -11454,7 +11406,7 @@ func (this *EndpointsList) String() string { return "nil" } s := strings.Join([]string{`&EndpointsList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Endpoints", "Endpoints", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11495,8 +11447,8 @@ func (this *Event) String() string { `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `Source:` + strings.Replace(strings.Replace(this.Source.String(), "EventSource", "EventSource", 1), `&`, ``, 1) + `,`, - `FirstTimestamp:` + strings.Replace(strings.Replace(this.FirstTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTimestamp:` + strings.Replace(strings.Replace(this.LastTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `FirstTimestamp:` + strings.Replace(strings.Replace(this.FirstTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTimestamp:` + strings.Replace(strings.Replace(this.LastTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Count:` + fmt.Sprintf("%v", this.Count) + `,`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `}`, @@ -11508,7 +11460,7 @@ func (this *EventList) String() string { return "nil" } s := strings.Join([]string{`&EventList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Event", "Event", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11535,17 +11487,6 @@ func (this *ExecAction) String() string { }, "") return s } -func (this *ExportOptions) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ExportOptions{`, - `Export:` + fmt.Sprintf("%v", this.Export) + `,`, - `Exact:` + fmt.Sprintf("%v", this.Exact) + `,`, - `}`, - }, "") - return s -} func (this *FCVolumeSource) String() string { if this == nil { return "nil" @@ -11797,7 +11738,7 @@ func (this *LimitRangeList) String() string { return "nil" } s := strings.Join([]string{`&LimitRangeList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "LimitRange", "LimitRange", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11818,7 +11759,7 @@ func (this *List) String() string { return "nil" } s := strings.Join([]string{`&List{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "RawExtension", "k8s_io_kubernetes_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11898,7 +11839,7 @@ func (this *NamespaceList) String() string { return "nil" } s := strings.Join([]string{`&NamespaceList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Namespace", "Namespace", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -11965,8 +11906,8 @@ func (this *NodeCondition) String() string { s := strings.Join([]string{`&NodeCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastHeartbeatTime:` + strings.Replace(strings.Replace(this.LastHeartbeatTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastHeartbeatTime:` + strings.Replace(strings.Replace(this.LastHeartbeatTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -11988,7 +11929,7 @@ func (this *NodeList) String() string { return "nil" } s := strings.Join([]string{`&NodeList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Node", "Node", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12170,8 +12111,8 @@ func (this *ObjectMeta) String() string { `UID:` + fmt.Sprintf("%v", this.UID) + `,`, `ResourceVersion:` + fmt.Sprintf("%v", this.ResourceVersion) + `,`, `Generation:` + fmt.Sprintf("%v", this.Generation) + `,`, - `CreationTimestamp:` + strings.Replace(strings.Replace(this.CreationTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `DeletionTimestamp:` + strings.Replace(fmt.Sprintf("%v", this.DeletionTimestamp), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `CreationTimestamp:` + strings.Replace(strings.Replace(this.CreationTimestamp.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `DeletionTimestamp:` + strings.Replace(fmt.Sprintf("%v", this.DeletionTimestamp), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `DeletionGracePeriodSeconds:` + valueToStringGenerated(this.DeletionGracePeriodSeconds) + `,`, `Labels:` + mapStringForLabels + `,`, `Annotations:` + mapStringForAnnotations + `,`, @@ -12241,7 +12182,7 @@ func (this *PersistentVolumeClaimList) String() string { return "nil" } s := strings.Join([]string{`&PersistentVolumeClaimList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PersistentVolumeClaim", "PersistentVolumeClaim", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12255,7 +12196,7 @@ func (this *PersistentVolumeClaimSpec) String() string { `AccessModes:` + fmt.Sprintf("%v", this.AccessModes) + `,`, `Resources:` + strings.Replace(strings.Replace(this.Resources.String(), "ResourceRequirements", "ResourceRequirements", 1), `&`, ``, 1) + `,`, `VolumeName:` + fmt.Sprintf("%v", this.VolumeName) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") return s @@ -12298,7 +12239,7 @@ func (this *PersistentVolumeList) String() string { return "nil" } s := strings.Join([]string{`&PersistentVolumeList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PersistentVolume", "PersistentVolume", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12405,7 +12346,7 @@ func (this *PodAffinityTerm) String() string { return "nil" } s := strings.Join([]string{`&PodAffinityTerm{`, - `LabelSelector:` + strings.Replace(fmt.Sprintf("%v", this.LabelSelector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `LabelSelector:` + strings.Replace(fmt.Sprintf("%v", this.LabelSelector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Namespaces:` + fmt.Sprintf("%v", this.Namespaces) + `,`, `TopologyKey:` + fmt.Sprintf("%v", this.TopologyKey) + `,`, `}`, @@ -12444,8 +12385,8 @@ func (this *PodCondition) String() string { s := strings.Join([]string{`&PodCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -12472,7 +12413,7 @@ func (this *PodList) String() string { return "nil" } s := strings.Join([]string{`&PodList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Pod", "Pod", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12487,7 +12428,7 @@ func (this *PodLogOptions) String() string { `Follow:` + fmt.Sprintf("%v", this.Follow) + `,`, `Previous:` + fmt.Sprintf("%v", this.Previous) + `,`, `SinceSeconds:` + valueToStringGenerated(this.SinceSeconds) + `,`, - `SinceTime:` + strings.Replace(fmt.Sprintf("%v", this.SinceTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `SinceTime:` + strings.Replace(fmt.Sprintf("%v", this.SinceTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Timestamps:` + fmt.Sprintf("%v", this.Timestamps) + `,`, `TailLines:` + valueToStringGenerated(this.TailLines) + `,`, `LimitBytes:` + valueToStringGenerated(this.LimitBytes) + `,`, @@ -12576,7 +12517,7 @@ func (this *PodStatus) String() string { `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `HostIP:` + fmt.Sprintf("%v", this.HostIP) + `,`, `PodIP:` + fmt.Sprintf("%v", this.PodIP) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `ContainerStatuses:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ContainerStatuses), "ContainerStatus", "ContainerStatus", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12609,7 +12550,7 @@ func (this *PodTemplateList) String() string { return "nil" } s := strings.Join([]string{`&PodTemplateList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodTemplate", "PodTemplate", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12642,7 +12583,7 @@ func (this *PreferAvoidPodsEntry) String() string { } s := strings.Join([]string{`&PreferAvoidPodsEntry{`, `PodSignature:` + strings.Replace(strings.Replace(this.PodSignature.String(), "PodSignature", "PodSignature", 1), `&`, ``, 1) + `,`, - `EvictionTime:` + strings.Replace(strings.Replace(this.EvictionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `EvictionTime:` + strings.Replace(strings.Replace(this.EvictionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -12737,7 +12678,7 @@ func (this *ReplicationControllerCondition) String() string { s := strings.Join([]string{`&ReplicationControllerCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -12749,7 +12690,7 @@ func (this *ReplicationControllerList) String() string { return "nil" } s := strings.Join([]string{`&ReplicationControllerList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ReplicationController", "ReplicationController", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12822,7 +12763,7 @@ func (this *ResourceQuotaList) String() string { return "nil" } s := strings.Join([]string{`&ResourceQuotaList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ResourceQuota", "ResourceQuota", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -12973,7 +12914,7 @@ func (this *SecretList) String() string { return "nil" } s := strings.Join([]string{`&SecretList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Secret", "Secret", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -13045,7 +12986,7 @@ func (this *ServiceAccountList) String() string { return "nil" } s := strings.Join([]string{`&ServiceAccountList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ServiceAccount", "ServiceAccount", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -13056,7 +12997,7 @@ func (this *ServiceList) String() string { return "nil" } s := strings.Join([]string{`&ServiceList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Service", "Service", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -19360,96 +19301,6 @@ func (m *ExecAction) Unmarshal(data []byte) error { } return nil } -func (m *ExportOptions) Unmarshal(data []byte) error { - l := len(data) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := data[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ExportOptions: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ExportOptions: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Export", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := data[iNdEx] - iNdEx++ - v |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - m.Export = bool(v != 0) - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Exact", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := data[iNdEx] - iNdEx++ - v |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - m.Exact = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipGenerated(data[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *FCVolumeSource) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 @@ -26158,7 +26009,7 @@ func (m *ObjectMeta) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.DeletionTimestamp == nil { - m.DeletionTimestamp = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.DeletionTimestamp = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.DeletionTimestamp.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -27491,7 +27342,7 @@ func (m *PersistentVolumeClaimSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -29403,7 +29254,7 @@ func (m *PodAffinityTerm) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LabelSelector == nil { - m.LabelSelector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.LabelSelector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.LabelSelector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -30429,7 +30280,7 @@ func (m *PodLogOptions) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.SinceTime == nil { - m.SinceTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.SinceTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.SinceTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -31664,7 +31515,7 @@ func (m *PodStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -39561,635 +39412,632 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 10068 bytes of a gzipped FileDescriptorProto + // 10019 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x8c, 0x24, 0xc7, 0x75, 0x98, 0x7a, 0x66, 0xbf, 0xe6, 0xed, 0xe7, 0xd5, 0x7d, 0x70, 0xb9, 0x22, 0x6f, 0x4f, 0x4d, - 0xf1, 0x74, 0x24, 0x8f, 0x7b, 0xba, 0x23, 0x29, 0x52, 0x22, 0x43, 0x69, 0x77, 0x67, 0xf7, 0x6e, - 0x75, 0xb7, 0x77, 0xc3, 0x9a, 0x3d, 0x1e, 0x25, 0x31, 0xa4, 0x7a, 0xa7, 0x6b, 0x77, 0x5b, 0xd7, - 0xdb, 0x3d, 0xec, 0xee, 0xd9, 0xbb, 0x95, 0x62, 0xc0, 0x91, 0x19, 0x1b, 0x81, 0x05, 0x47, 0x41, - 0x22, 0x24, 0x40, 0x12, 0x44, 0x09, 0x90, 0xc0, 0x89, 0x11, 0xc7, 0x72, 0x14, 0x5b, 0x4a, 0x04, - 0x21, 0x40, 0x1c, 0x41, 0xf9, 0x70, 0x20, 0x03, 0x46, 0x6c, 0xd8, 0xc0, 0xc6, 0x5c, 0x23, 0xc8, - 0x8f, 0xfc, 0x48, 0x80, 0xfc, 0xca, 0xc1, 0x48, 0x82, 0xfa, 0xec, 0xaa, 0x9e, 0x9e, 0xed, 0x9e, - 0xe5, 0xed, 0xfa, 0x64, 0xf8, 0xdf, 0xcc, 0x7b, 0xaf, 0x5e, 0x7d, 0xf4, 0xab, 0x57, 0xaf, 0x5e, - 0xbd, 0x7a, 0x05, 0x17, 0xef, 0xbe, 0x12, 0xcf, 0x79, 0xe1, 0xa5, 0xbb, 0x9d, 0x75, 0x12, 0x05, - 0x24, 0x21, 0xf1, 0xa5, 0xf6, 0xdd, 0xcd, 0x4b, 0x4e, 0xdb, 0xbb, 0xb4, 0x73, 0xf9, 0xd2, 0x26, - 0x09, 0x48, 0xe4, 0x24, 0xc4, 0x9d, 0x6b, 0x47, 0x61, 0x12, 0xa2, 0x27, 0x38, 0xf5, 0x5c, 0x4a, - 0x3d, 0xd7, 0xbe, 0xbb, 0x39, 0xe7, 0xb4, 0xbd, 0xb9, 0x9d, 0xcb, 0x33, 0xcf, 0x6f, 0x7a, 0xc9, - 0x56, 0x67, 0x7d, 0xae, 0x15, 0x6e, 0x5f, 0xda, 0x0c, 0x37, 0xc3, 0x4b, 0xac, 0xd0, 0x7a, 0x67, - 0x83, 0xfd, 0x63, 0x7f, 0xd8, 0x2f, 0xce, 0x6c, 0xe6, 0x4a, 0xef, 0xaa, 0x23, 0x12, 0x87, 0x9d, - 0xa8, 0x45, 0xb2, 0x0d, 0x98, 0x79, 0xa9, 0x77, 0x99, 0x4e, 0xb0, 0x43, 0xa2, 0xd8, 0x0b, 0x03, - 0xe2, 0x76, 0x15, 0x7b, 0x3e, 0xbf, 0x58, 0xd4, 0x09, 0x12, 0x6f, 0xbb, 0xbb, 0x96, 0x17, 0x0f, - 0x26, 0x8f, 0x5b, 0x5b, 0x64, 0xdb, 0xe9, 0x2a, 0x75, 0x39, 0xbf, 0x54, 0x27, 0xf1, 0xfc, 0x4b, - 0x5e, 0x90, 0xc4, 0x49, 0x94, 0x2d, 0x62, 0xff, 0x9e, 0x05, 0xe7, 0xe6, 0xef, 0x34, 0x97, 0x7c, - 0x27, 0x4e, 0xbc, 0xd6, 0x82, 0x1f, 0xb6, 0xee, 0x36, 0x93, 0x30, 0x22, 0x6f, 0x86, 0x7e, 0x67, - 0x9b, 0x34, 0xd9, 0x18, 0xa0, 0x8b, 0x30, 0xb2, 0xc3, 0xfe, 0xaf, 0xd4, 0xa7, 0xad, 0x73, 0xd6, - 0x85, 0xda, 0xc2, 0xd4, 0x8f, 0xf7, 0x66, 0x3f, 0xb2, 0xbf, 0x37, 0x3b, 0xf2, 0xa6, 0x80, 0x63, - 0x45, 0x81, 0xce, 0xc3, 0xd0, 0x46, 0xbc, 0xb6, 0xdb, 0x26, 0xd3, 0x15, 0x46, 0x3b, 0x21, 0x68, - 0x87, 0x96, 0x9b, 0x14, 0x8a, 0x05, 0x16, 0x5d, 0x82, 0x5a, 0xdb, 0x89, 0x12, 0x2f, 0xf1, 0xc2, - 0x60, 0xba, 0x7a, 0xce, 0xba, 0x30, 0xb8, 0x70, 0x42, 0x90, 0xd6, 0x1a, 0x12, 0x81, 0x53, 0x1a, - 0xda, 0x8c, 0x88, 0x38, 0xee, 0xad, 0xc0, 0xdf, 0x9d, 0x1e, 0x38, 0x67, 0x5d, 0x18, 0x49, 0x9b, - 0x81, 0x05, 0x1c, 0x2b, 0x0a, 0xfb, 0x7b, 0x15, 0x18, 0x99, 0xdf, 0xd8, 0xf0, 0x02, 0x2f, 0xd9, - 0x45, 0x5f, 0x86, 0xb1, 0x20, 0x74, 0x89, 0xfc, 0xcf, 0x7a, 0x31, 0x7a, 0xe5, 0xd9, 0xb9, 0x83, - 0xa4, 0x69, 0xee, 0xa6, 0x56, 0x62, 0x61, 0x6a, 0x7f, 0x6f, 0x76, 0x4c, 0x87, 0x60, 0x83, 0x23, - 0x7a, 0x1b, 0x46, 0xdb, 0xa1, 0xab, 0x2a, 0xa8, 0xb0, 0x0a, 0x9e, 0x39, 0xb8, 0x82, 0x46, 0x5a, - 0x60, 0x61, 0x72, 0x7f, 0x6f, 0x76, 0x54, 0x03, 0x60, 0x9d, 0x1d, 0xf2, 0x61, 0x92, 0xfe, 0x0d, - 0x12, 0x4f, 0xd5, 0x50, 0x65, 0x35, 0x3c, 0x5f, 0x5c, 0x83, 0x56, 0x68, 0xe1, 0xe4, 0xfe, 0xde, - 0xec, 0x64, 0x06, 0x88, 0xb3, 0xac, 0xed, 0xaf, 0xc2, 0xc4, 0x7c, 0x92, 0x38, 0xad, 0x2d, 0xe2, - 0xf2, 0xef, 0x8b, 0x5e, 0x84, 0x81, 0xc0, 0xd9, 0x26, 0xe2, 0xeb, 0x9f, 0x13, 0xc3, 0x3e, 0x70, - 0xd3, 0xd9, 0x26, 0x0f, 0xf6, 0x66, 0xa7, 0x6e, 0x07, 0xde, 0x7b, 0x1d, 0x21, 0x33, 0x14, 0x86, - 0x19, 0x35, 0xba, 0x02, 0xe0, 0x92, 0x1d, 0xaf, 0x45, 0x1a, 0x4e, 0xb2, 0x25, 0xa4, 0x01, 0x89, - 0xb2, 0x50, 0x57, 0x18, 0xac, 0x51, 0xd9, 0x5f, 0xb7, 0xa0, 0x36, 0xbf, 0x13, 0x7a, 0x6e, 0x23, - 0x74, 0x63, 0xd4, 0x81, 0xc9, 0x76, 0x44, 0x36, 0x48, 0xa4, 0x40, 0xd3, 0xd6, 0xb9, 0xea, 0x85, - 0xd1, 0x2b, 0x57, 0x0a, 0xfa, 0x6d, 0x16, 0x5a, 0x0a, 0x92, 0x68, 0x77, 0xe1, 0x31, 0x51, 0xf5, - 0x64, 0x06, 0x8b, 0xb3, 0x75, 0xd8, 0x7f, 0xbd, 0x02, 0xa7, 0xe7, 0xbf, 0xda, 0x89, 0x48, 0xdd, - 0x8b, 0xef, 0x66, 0xa7, 0x82, 0xeb, 0xc5, 0x77, 0x6f, 0xa6, 0x83, 0xa1, 0x64, 0xb0, 0x2e, 0xe0, - 0x58, 0x51, 0xa0, 0xe7, 0x61, 0x98, 0xfe, 0xbe, 0x8d, 0x57, 0x44, 0xef, 0x4f, 0x0a, 0xe2, 0xd1, - 0xba, 0x93, 0x38, 0x75, 0x8e, 0xc2, 0x92, 0x06, 0xad, 0xc2, 0x68, 0xcb, 0x69, 0x6d, 0x79, 0xc1, - 0xe6, 0x6a, 0xe8, 0x12, 0xf6, 0x85, 0x6b, 0x0b, 0xcf, 0x51, 0xf2, 0xc5, 0x14, 0xfc, 0x60, 0x6f, - 0x76, 0x9a, 0xb7, 0x4d, 0xb0, 0xd0, 0x70, 0x58, 0x2f, 0x8f, 0x6c, 0x35, 0x11, 0x07, 0x18, 0x27, - 0xc8, 0x99, 0x84, 0x17, 0xb4, 0x39, 0x35, 0xc8, 0xe6, 0xd4, 0x58, 0x8f, 0xf9, 0xf4, 0x4f, 0x2d, - 0x31, 0x26, 0xcb, 0x9e, 0x6f, 0xaa, 0x87, 0x2b, 0x00, 0x31, 0x69, 0x45, 0x24, 0xd1, 0x46, 0x45, - 0x7d, 0xe6, 0xa6, 0xc2, 0x60, 0x8d, 0x8a, 0x4e, 0xfe, 0x78, 0xcb, 0x89, 0x98, 0xb4, 0x88, 0xb1, - 0x51, 0x93, 0xbf, 0x29, 0x11, 0x38, 0xa5, 0x31, 0x26, 0x7f, 0xb5, 0x70, 0xf2, 0xff, 0x2b, 0x0b, - 0x86, 0x17, 0xbc, 0xc0, 0xf5, 0x82, 0x4d, 0xf4, 0x16, 0x8c, 0x6c, 0x93, 0xc4, 0x71, 0x9d, 0xc4, - 0x11, 0xf3, 0xfe, 0xc2, 0xc1, 0xc2, 0x73, 0x6b, 0xfd, 0x2b, 0xa4, 0x95, 0xac, 0x92, 0xc4, 0x49, - 0xbb, 0x91, 0xc2, 0xb0, 0xe2, 0x86, 0x6e, 0xc3, 0x50, 0xe2, 0x44, 0x9b, 0x24, 0x11, 0xd3, 0xfd, - 0xf9, 0x32, 0x7c, 0x31, 0x15, 0x35, 0x12, 0xb4, 0x48, 0xaa, 0x18, 0xd7, 0x18, 0x13, 0x2c, 0x98, - 0xd9, 0x2d, 0x18, 0x5b, 0x74, 0xda, 0xce, 0xba, 0xe7, 0x7b, 0x89, 0x47, 0x62, 0xf4, 0x09, 0xa8, - 0x3a, 0xae, 0xcb, 0x04, 0xbf, 0xb6, 0x70, 0x7a, 0x7f, 0x6f, 0xb6, 0x3a, 0xef, 0xba, 0x0f, 0xf6, - 0x66, 0x41, 0x51, 0xed, 0x62, 0x4a, 0x81, 0x9e, 0x85, 0x01, 0x37, 0x0a, 0xdb, 0xd3, 0x15, 0x46, - 0x79, 0x86, 0xce, 0xd0, 0x7a, 0x14, 0xb6, 0x33, 0xa4, 0x8c, 0xc6, 0xfe, 0x77, 0x15, 0x40, 0x8b, - 0xa4, 0xbd, 0xb5, 0xdc, 0x34, 0xbe, 0xe5, 0x05, 0x18, 0xd9, 0x0e, 0x03, 0x2f, 0x09, 0xa3, 0x58, - 0x54, 0xc8, 0xe4, 0x61, 0x55, 0xc0, 0xb0, 0xc2, 0xa2, 0x73, 0x30, 0xd0, 0x4e, 0xa7, 0xf5, 0x98, - 0x54, 0x09, 0x6c, 0x42, 0x33, 0x0c, 0xa5, 0xe8, 0xc4, 0x24, 0x12, 0x72, 0xac, 0x28, 0x6e, 0xc7, - 0x24, 0xc2, 0x0c, 0x93, 0x4a, 0x0e, 0x95, 0x29, 0x21, 0xa5, 0x19, 0xc9, 0xa1, 0x18, 0xac, 0x51, - 0xa1, 0x77, 0xa1, 0xc6, 0xff, 0x61, 0xb2, 0xc1, 0x44, 0xb6, 0x50, 0x19, 0xdc, 0x08, 0x5b, 0x8e, - 0x9f, 0x1d, 0xfc, 0x71, 0x26, 0x69, 0x92, 0x11, 0x4e, 0x79, 0x1a, 0x92, 0x36, 0x54, 0x28, 0x69, - 0x7f, 0xdb, 0x02, 0xb4, 0xe8, 0x05, 0x2e, 0x89, 0x8e, 0x61, 0xc9, 0xec, 0x6f, 0x12, 0xfc, 0x21, - 0x6d, 0x5a, 0xb8, 0xdd, 0x0e, 0x03, 0x12, 0x24, 0x8b, 0x61, 0xe0, 0xf2, 0x65, 0xf4, 0x33, 0x30, - 0x90, 0xd0, 0xaa, 0x78, 0xb3, 0xce, 0xcb, 0xcf, 0x42, 0x2b, 0x78, 0xb0, 0x37, 0x7b, 0xa6, 0xbb, - 0x04, 0x6b, 0x02, 0x2b, 0x83, 0x3e, 0x0d, 0x43, 0x71, 0xe2, 0x24, 0x9d, 0x58, 0x34, 0xf4, 0x63, - 0xb2, 0xa1, 0x4d, 0x06, 0x7d, 0xb0, 0x37, 0x3b, 0xa9, 0x8a, 0x71, 0x10, 0x16, 0x05, 0xd0, 0x33, - 0x30, 0xbc, 0x4d, 0xe2, 0xd8, 0xd9, 0x94, 0x8a, 0x6d, 0x52, 0x94, 0x1d, 0x5e, 0xe5, 0x60, 0x2c, - 0xf1, 0xe8, 0x29, 0x18, 0x24, 0x51, 0x14, 0x46, 0x42, 0x22, 0xc6, 0x05, 0xe1, 0xe0, 0x12, 0x05, - 0x62, 0x8e, 0xb3, 0x7f, 0xc7, 0x82, 0x49, 0xd5, 0x56, 0x5e, 0xd7, 0x11, 0x4e, 0x75, 0x17, 0xa0, - 0x25, 0x3b, 0x16, 0xb3, 0x09, 0x36, 0x7a, 0xe5, 0x93, 0x07, 0xf3, 0xee, 0x1e, 0xc8, 0xb4, 0x0e, - 0x05, 0x8a, 0xb1, 0xc6, 0xd7, 0xfe, 0xb1, 0x05, 0x27, 0x33, 0x7d, 0xba, 0xe1, 0xc5, 0x09, 0xfa, - 0x8b, 0x5d, 0xfd, 0xba, 0x74, 0x40, 0xdd, 0x9a, 0x1d, 0x3a, 0x47, 0x8b, 0xb3, 0xee, 0x29, 0x41, - 0x91, 0x10, 0xad, 0x73, 0x18, 0x06, 0xbd, 0x84, 0x6c, 0xcb, 0x7e, 0x3d, 0x5f, 0xb2, 0x5f, 0xbc, - 0x81, 0xe9, 0xe7, 0x59, 0xa1, 0x3c, 0x30, 0x67, 0x65, 0xff, 0x6f, 0x0b, 0x6a, 0x8b, 0x61, 0xb0, - 0xe1, 0x6d, 0xae, 0x3a, 0xed, 0x23, 0xfc, 0x30, 0x4d, 0x18, 0x60, 0x5c, 0x79, 0xd3, 0x2f, 0x17, - 0x35, 0x5d, 0x34, 0x68, 0x8e, 0x2e, 0x9e, 0xdc, 0x2a, 0x50, 0x7a, 0x89, 0x82, 0x30, 0x63, 0x36, - 0xf3, 0x32, 0xd4, 0x14, 0x01, 0x9a, 0x82, 0xea, 0x5d, 0xc2, 0x4d, 0xc6, 0x1a, 0xa6, 0x3f, 0xd1, - 0x29, 0x18, 0xdc, 0x71, 0xfc, 0x8e, 0x98, 0xad, 0x98, 0xff, 0xf9, 0x4c, 0xe5, 0x15, 0xcb, 0xfe, - 0x81, 0x05, 0xa7, 0x54, 0x25, 0xd7, 0xc9, 0x6e, 0x93, 0xf8, 0xa4, 0x95, 0x84, 0x11, 0x7a, 0xdf, - 0x82, 0x53, 0x7e, 0x8e, 0x1e, 0x12, 0xa3, 0x71, 0x18, 0x0d, 0xf6, 0x84, 0x68, 0xf8, 0xa9, 0x3c, - 0x2c, 0xce, 0xad, 0x0d, 0x3d, 0xc9, 0xfb, 0xc2, 0x27, 0xef, 0xa8, 0x60, 0x50, 0xbd, 0x4e, 0x76, - 0x59, 0xc7, 0x68, 0xf3, 0xc7, 0x55, 0xf3, 0x8f, 0x43, 0xf2, 0x6e, 0x98, 0x92, 0xf7, 0x89, 0x92, - 0x9f, 0xaf, 0x87, 0xcc, 0xfd, 0xfd, 0x0a, 0x9c, 0x56, 0x34, 0x86, 0x3a, 0x7e, 0x44, 0x86, 0xbf, - 0xbf, 0xee, 0x5e, 0x27, 0xbb, 0x6b, 0x21, 0x5d, 0x4f, 0xf3, 0xbb, 0x8b, 0x2e, 0xc3, 0xa8, 0x4b, - 0x36, 0x9c, 0x8e, 0x9f, 0x28, 0x73, 0x71, 0x90, 0xef, 0x23, 0xea, 0x29, 0x18, 0xeb, 0x34, 0xf6, - 0x6f, 0xd7, 0xd8, 0xac, 0x4c, 0x1c, 0x2f, 0x20, 0x11, 0x5d, 0xa0, 0x35, 0xab, 0x7e, 0x4c, 0xb7, - 0xea, 0x85, 0x05, 0xff, 0x14, 0x0c, 0x7a, 0xdb, 0x54, 0x65, 0x57, 0x4c, 0x4d, 0xbc, 0x42, 0x81, - 0x98, 0xe3, 0xd0, 0xd3, 0x30, 0xdc, 0x0a, 0xb7, 0xb7, 0x9d, 0xc0, 0x9d, 0xae, 0x32, 0x93, 0x61, - 0x94, 0x6a, 0xf5, 0x45, 0x0e, 0xc2, 0x12, 0x87, 0x9e, 0x80, 0x01, 0x27, 0xda, 0x8c, 0xa7, 0x07, - 0x18, 0xcd, 0x08, 0xad, 0x69, 0x3e, 0xda, 0x8c, 0x31, 0x83, 0x52, 0x53, 0xe0, 0x5e, 0x18, 0xdd, - 0xf5, 0x82, 0xcd, 0xba, 0x17, 0xb1, 0x75, 0x5d, 0x33, 0x05, 0xee, 0x28, 0x0c, 0xd6, 0xa8, 0x50, - 0x03, 0x06, 0xdb, 0x61, 0x94, 0xc4, 0xd3, 0x43, 0x6c, 0x38, 0x9f, 0x2b, 0x94, 0x1e, 0xde, 0xef, - 0x46, 0x18, 0x25, 0x69, 0x57, 0xe8, 0xbf, 0x18, 0x73, 0x46, 0x68, 0x11, 0xaa, 0x24, 0xd8, 0x99, - 0x1e, 0x66, 0xfc, 0x3e, 0x7e, 0x30, 0xbf, 0xa5, 0x60, 0xe7, 0x4d, 0x27, 0x4a, 0x67, 0xd1, 0x52, - 0xb0, 0x83, 0x69, 0x69, 0xd4, 0x82, 0x9a, 0x74, 0x1f, 0xc4, 0xd3, 0x23, 0x65, 0x04, 0x0c, 0x0b, - 0x72, 0x4c, 0xde, 0xeb, 0x78, 0x11, 0xd9, 0x26, 0x41, 0x12, 0xa7, 0xf6, 0xb0, 0xc4, 0xc6, 0x38, - 0xe5, 0x8b, 0x5a, 0x30, 0xc6, 0xcd, 0x87, 0xd5, 0xb0, 0x13, 0x24, 0xf1, 0x74, 0x8d, 0x35, 0xb9, - 0x60, 0xc3, 0xf9, 0x66, 0x5a, 0x62, 0xe1, 0x94, 0x60, 0x3f, 0xa6, 0x01, 0x63, 0x6c, 0x30, 0x45, - 0x6f, 0xc3, 0xb8, 0xef, 0xed, 0x90, 0x80, 0xc4, 0x71, 0x23, 0x0a, 0xd7, 0xc9, 0x34, 0xb0, 0xde, - 0x3c, 0x55, 0xb4, 0xf9, 0x0a, 0xd7, 0xc9, 0xc2, 0x89, 0xfd, 0xbd, 0xd9, 0xf1, 0x1b, 0x7a, 0x69, - 0x6c, 0x32, 0x43, 0xef, 0xc2, 0x04, 0xb5, 0x55, 0xbc, 0x94, 0xfd, 0x68, 0x79, 0xf6, 0x68, 0x7f, - 0x6f, 0x76, 0x02, 0x1b, 0xc5, 0x71, 0x86, 0x1d, 0x5a, 0x83, 0x9a, 0xef, 0x6d, 0x90, 0xd6, 0x6e, - 0xcb, 0x27, 0xd3, 0x63, 0x8c, 0x77, 0xc1, 0x94, 0xbb, 0x21, 0xc9, 0xb9, 0x7d, 0xa8, 0xfe, 0xe2, - 0x94, 0x11, 0x7a, 0x13, 0xce, 0x24, 0x24, 0xda, 0xf6, 0x02, 0x87, 0x2e, 0xda, 0xc2, 0x78, 0x61, - 0x3b, 0xdc, 0x71, 0x26, 0xb5, 0x67, 0xc5, 0xc0, 0x9e, 0x59, 0xcb, 0xa5, 0xc2, 0x3d, 0x4a, 0xa3, - 0x5b, 0x30, 0xc9, 0xe6, 0x53, 0xa3, 0xe3, 0xfb, 0x8d, 0xd0, 0xf7, 0x5a, 0xbb, 0xd3, 0x13, 0x8c, - 0xe1, 0xd3, 0x72, 0xdf, 0xba, 0x62, 0xa2, 0xa9, 0x5d, 0x9f, 0xfe, 0xc3, 0xd9, 0xd2, 0xc8, 0x87, - 0xc9, 0x98, 0xb4, 0x3a, 0x91, 0x97, 0xec, 0x52, 0xd9, 0x27, 0xf7, 0x93, 0xe9, 0xc9, 0x32, 0xfb, - 0x94, 0xa6, 0x59, 0x88, 0x3b, 0x0d, 0x32, 0x40, 0x9c, 0x65, 0x4d, 0x55, 0x45, 0x9c, 0xb8, 0x5e, - 0x30, 0x3d, 0xc5, 0x0c, 0x53, 0x35, 0xbf, 0x9a, 0x14, 0x88, 0x39, 0x8e, 0x6d, 0xfb, 0xe8, 0x8f, - 0x5b, 0x54, 0xf7, 0x9e, 0x60, 0x84, 0xe9, 0xb6, 0x4f, 0x22, 0x70, 0x4a, 0x43, 0x17, 0xac, 0x24, - 0xd9, 0x9d, 0x46, 0x8c, 0x54, 0x4d, 0xb5, 0xb5, 0xb5, 0x2f, 0x60, 0x0a, 0xb7, 0xd7, 0x61, 0x42, - 0x4d, 0x6b, 0x36, 0x3a, 0x68, 0x16, 0x06, 0xa9, 0xe6, 0x92, 0xbb, 0x97, 0x1a, 0x6d, 0x02, 0x55, - 0x68, 0x31, 0xe6, 0x70, 0xd6, 0x04, 0xef, 0xab, 0x64, 0x61, 0x37, 0x21, 0xdc, 0x8a, 0xad, 0x6a, - 0x4d, 0x90, 0x08, 0x9c, 0xd2, 0xd8, 0xff, 0x97, 0x2f, 0x8a, 0xa9, 0xee, 0x28, 0xa1, 0x37, 0x2f, - 0xc2, 0xc8, 0x56, 0x18, 0x27, 0x94, 0x9a, 0xd5, 0x31, 0x98, 0xae, 0x82, 0xd7, 0x04, 0x1c, 0x2b, - 0x0a, 0xf4, 0x2a, 0x8c, 0xb7, 0xf4, 0x0a, 0x84, 0x2a, 0x3f, 0x2d, 0x8a, 0x98, 0xb5, 0x63, 0x93, - 0x16, 0xbd, 0x02, 0x23, 0xcc, 0x95, 0xd7, 0x0a, 0x7d, 0x61, 0x2f, 0xcb, 0x95, 0x69, 0xa4, 0x21, - 0xe0, 0x0f, 0xb4, 0xdf, 0x58, 0x51, 0xd3, 0x5d, 0x07, 0x6d, 0xc2, 0x4a, 0x43, 0xa8, 0x5b, 0xb5, - 0xeb, 0xb8, 0xc6, 0xa0, 0x58, 0x60, 0xed, 0x5f, 0xab, 0x68, 0xa3, 0x4c, 0x8d, 0x3e, 0x82, 0xbe, - 0x08, 0xc3, 0xf7, 0x1c, 0x2f, 0xf1, 0x82, 0x4d, 0xb1, 0x82, 0xbe, 0x50, 0x52, 0xf7, 0xb2, 0xe2, - 0x77, 0x78, 0x51, 0xbe, 0x4e, 0x88, 0x3f, 0x58, 0x32, 0xa4, 0xbc, 0xa3, 0x4e, 0x10, 0x50, 0xde, - 0x95, 0xfe, 0x79, 0x63, 0x5e, 0x94, 0xf3, 0x16, 0x7f, 0xb0, 0x64, 0x88, 0x36, 0x00, 0xe4, 0xec, - 0x23, 0xae, 0x70, 0xa1, 0x7d, 0xaa, 0x1f, 0xf6, 0x6b, 0xaa, 0xf4, 0xc2, 0x04, 0x5d, 0x99, 0xd2, - 0xff, 0x58, 0xe3, 0x6c, 0x77, 0x98, 0x21, 0xd2, 0xdd, 0x2c, 0xf4, 0x36, 0x9d, 0x00, 0x4e, 0x94, - 0x10, 0x77, 0x3e, 0x11, 0x43, 0xf7, 0x5c, 0x49, 0x83, 0x6a, 0xcd, 0xdb, 0x26, 0xfa, 0x6c, 0x11, - 0x5c, 0x70, 0xca, 0xd0, 0xfe, 0x7e, 0x15, 0xa6, 0x7b, 0xb5, 0x97, 0xca, 0x24, 0xb9, 0xef, 0x25, - 0x8b, 0xd4, 0x56, 0xb0, 0x4c, 0x99, 0x5c, 0x12, 0x70, 0xac, 0x28, 0xa8, 0x70, 0xc4, 0xde, 0x66, - 0xe0, 0xf8, 0x42, 0x7e, 0x95, 0x70, 0x34, 0x19, 0x14, 0x0b, 0x2c, 0xa5, 0x8b, 0x88, 0x13, 0x0b, - 0x17, 0xae, 0x26, 0x44, 0x98, 0x41, 0xb1, 0xc0, 0xea, 0xdb, 0xbf, 0x81, 0x82, 0xed, 0x9f, 0x31, - 0x46, 0x83, 0x0f, 0x79, 0x8c, 0xd0, 0xbb, 0x00, 0x1b, 0x5e, 0xe0, 0xc5, 0x5b, 0x8c, 0xfd, 0x50, - 0xff, 0xec, 0x95, 0x55, 0xb2, 0xac, 0xd8, 0x60, 0x8d, 0x25, 0x7a, 0x09, 0x46, 0xd5, 0x0c, 0x5d, - 0xa9, 0x4f, 0x0f, 0x9b, 0x8e, 0xbf, 0x54, 0x5d, 0xd5, 0xb1, 0x4e, 0x67, 0x7f, 0x25, 0x2b, 0x32, - 0x62, 0x62, 0x68, 0x23, 0x6c, 0x95, 0x1d, 0xe1, 0xca, 0xc1, 0x23, 0x6c, 0xff, 0x97, 0x2a, 0xdd, - 0x3b, 0x6b, 0x95, 0x75, 0xe2, 0x12, 0x4a, 0xed, 0x0d, 0xaa, 0xe1, 0x9d, 0x84, 0x88, 0x69, 0x79, - 0xb1, 0x9f, 0x79, 0xa3, 0xaf, 0x07, 0x74, 0x3a, 0x70, 0x4e, 0x68, 0x0b, 0x6a, 0xbe, 0x13, 0xb3, - 0x9d, 0x24, 0x11, 0xd3, 0xb1, 0x3f, 0xb6, 0xa9, 0x15, 0xee, 0xc4, 0x89, 0xb6, 0xe0, 0xf2, 0x5a, - 0x52, 0xe6, 0x74, 0x79, 0xa2, 0xd6, 0x81, 0x3c, 0x39, 0x50, 0xcd, 0xa1, 0x26, 0xc4, 0x2e, 0xe6, - 0x38, 0xf4, 0x0a, 0x8c, 0x45, 0x84, 0x89, 0xca, 0x22, 0x35, 0x80, 0x98, 0xf0, 0x0d, 0xa6, 0x96, - 0x12, 0xd6, 0x70, 0xd8, 0xa0, 0x4c, 0x0d, 0xe5, 0xa1, 0x03, 0x0c, 0xe5, 0x67, 0x60, 0x98, 0xfd, - 0x50, 0x52, 0xa1, 0xbe, 0xd0, 0x0a, 0x07, 0x63, 0x89, 0xcf, 0x0a, 0xd1, 0x48, 0x49, 0x21, 0x7a, - 0x16, 0x26, 0xea, 0x0e, 0xd9, 0x0e, 0x83, 0xa5, 0xc0, 0x6d, 0x87, 0x5e, 0x90, 0xa0, 0x69, 0x18, - 0x60, 0x4b, 0x0a, 0x9f, 0xf1, 0x03, 0x94, 0x03, 0x1e, 0xa0, 0xc6, 0xae, 0xfd, 0xff, 0x2c, 0x18, - 0xaf, 0x13, 0x9f, 0x24, 0xe4, 0x56, 0x9b, 0xb9, 0x1f, 0xd0, 0x32, 0xa0, 0xcd, 0xc8, 0x69, 0x91, - 0x06, 0x89, 0xbc, 0xd0, 0x6d, 0x92, 0x56, 0x18, 0x30, 0x87, 0x3b, 0x5d, 0x23, 0xcf, 0xec, 0xef, - 0xcd, 0xa2, 0xab, 0x5d, 0x58, 0x9c, 0x53, 0x02, 0xb9, 0x30, 0xde, 0x8e, 0x88, 0xe1, 0x2f, 0xb1, - 0x8a, 0xed, 0xf3, 0x86, 0x5e, 0x84, 0x9b, 0x8f, 0x06, 0x08, 0x9b, 0x4c, 0xd1, 0xe7, 0x60, 0x2a, - 0x8c, 0xda, 0x5b, 0x4e, 0x50, 0x27, 0x6d, 0x12, 0xb8, 0xd4, 0x66, 0x16, 0x4e, 0xb1, 0x53, 0xfb, - 0x7b, 0xb3, 0x53, 0xb7, 0x32, 0x38, 0xdc, 0x45, 0x6d, 0xff, 0x4a, 0x05, 0x4e, 0xd7, 0xc3, 0x7b, - 0xc1, 0x3d, 0x27, 0x72, 0xe7, 0x1b, 0x2b, 0xdc, 0x10, 0x66, 0x4e, 0x46, 0xe9, 0xdc, 0xb4, 0x7a, - 0x3a, 0x37, 0xbf, 0x04, 0x23, 0x1b, 0x1e, 0xf1, 0x5d, 0x4c, 0x36, 0x44, 0xf7, 0x2e, 0x97, 0xf1, - 0x68, 0x2c, 0xd3, 0x32, 0xd2, 0x2b, 0xc0, 0x7d, 0xab, 0xcb, 0x82, 0x0d, 0x56, 0x0c, 0x51, 0x07, - 0xa6, 0xa4, 0xa5, 0x2f, 0xb1, 0x62, 0x76, 0xbc, 0x50, 0x6e, 0x23, 0x61, 0x56, 0xc3, 0xc6, 0x03, - 0x67, 0x18, 0xe2, 0xae, 0x2a, 0xe8, 0x0e, 0x6d, 0x9b, 0xae, 0x0e, 0x03, 0x4c, 0x56, 0xd8, 0x0e, - 0x8d, 0x6d, 0x21, 0x19, 0xd4, 0xfe, 0xc7, 0x16, 0x3c, 0xd6, 0x35, 0x5a, 0x62, 0x7f, 0xfd, 0x96, - 0xdc, 0xd8, 0xf2, 0xd3, 0x99, 0x82, 0x56, 0xe6, 0x8e, 0x79, 0xb9, 0x4d, 0x6e, 0xa5, 0xc4, 0x26, - 0xf7, 0x16, 0x9c, 0x5a, 0xda, 0x6e, 0x27, 0xbb, 0x75, 0xcf, 0xf4, 0xc9, 0xbe, 0x0c, 0x43, 0xdb, - 0xc4, 0xf5, 0x3a, 0xdb, 0xe2, 0xb3, 0xce, 0x4a, 0x45, 0xba, 0xca, 0xa0, 0x0f, 0xf6, 0x66, 0xc7, - 0x9b, 0x49, 0x18, 0x39, 0x9b, 0x84, 0x03, 0xb0, 0x20, 0xb7, 0x3f, 0xb0, 0x60, 0x52, 0x4e, 0xa8, - 0x79, 0xd7, 0x8d, 0x48, 0x1c, 0xa3, 0x19, 0xa8, 0x78, 0x6d, 0xc1, 0x08, 0x04, 0xa3, 0xca, 0x4a, - 0x03, 0x57, 0xbc, 0x36, 0xfa, 0x22, 0xd4, 0xb8, 0x2b, 0x3f, 0x15, 0x8e, 0x3e, 0x8f, 0x06, 0xd8, - 0xee, 0x63, 0x4d, 0xf2, 0xc0, 0x29, 0x3b, 0x69, 0x59, 0x32, 0x55, 0x5d, 0x35, 0x1d, 0xcb, 0xd7, - 0x04, 0x1c, 0x2b, 0x0a, 0x74, 0x01, 0x46, 0x82, 0xd0, 0xe5, 0xa7, 0x2c, 0x7c, 0xd9, 0x65, 0x22, - 0x77, 0x53, 0xc0, 0xb0, 0xc2, 0xda, 0xdf, 0xb0, 0x60, 0x4c, 0xf6, 0xb1, 0xa4, 0x91, 0x4b, 0x27, - 0x49, 0x6a, 0xe0, 0xa6, 0x93, 0x84, 0x1a, 0xa9, 0x0c, 0x63, 0xd8, 0xa6, 0xd5, 0x7e, 0x6c, 0x53, - 0xfb, 0xfb, 0x15, 0x98, 0x90, 0xcd, 0x69, 0x76, 0xd6, 0x63, 0x92, 0xa0, 0x77, 0xa0, 0xe6, 0xf0, - 0xc1, 0x27, 0x52, 0xce, 0x9e, 0x2f, 0xda, 0xa1, 0x1b, 0xdf, 0x2c, 0x35, 0x0c, 0xe6, 0x25, 0x1f, - 0x9c, 0xb2, 0x44, 0x3b, 0x70, 0x22, 0x08, 0x13, 0xb6, 0x1e, 0x28, 0x7c, 0x39, 0x8f, 0x68, 0xb6, - 0x9e, 0xc7, 0x45, 0x3d, 0x27, 0x6e, 0x66, 0xf9, 0xe1, 0xee, 0x2a, 0xd0, 0x2d, 0xe9, 0xc5, 0xa8, - 0xb2, 0xba, 0x9e, 0x2d, 0x57, 0x57, 0x6f, 0x27, 0x86, 0xfd, 0x43, 0x0b, 0x6a, 0x92, 0xec, 0x28, - 0x7d, 0xe2, 0x77, 0x60, 0x38, 0x66, 0x9f, 0x46, 0x0e, 0xd3, 0xc5, 0x72, 0x4d, 0xe7, 0xdf, 0x33, - 0x5d, 0xfc, 0xf8, 0xff, 0x18, 0x4b, 0x6e, 0xcc, 0x0d, 0xa9, 0x3a, 0xf0, 0xe8, 0xb9, 0x21, 0x55, - 0xd3, 0x7a, 0xb8, 0x21, 0x7f, 0xd9, 0x82, 0x21, 0xee, 0x1c, 0x2a, 0xe7, 0x61, 0xd3, 0x7c, 0xc9, - 0x29, 0xc7, 0x37, 0x29, 0x50, 0xb8, 0x96, 0xd1, 0x1d, 0xa8, 0xb1, 0x1f, 0xcb, 0x51, 0xb8, 0x2d, - 0x16, 0x82, 0x67, 0xcb, 0x38, 0xa7, 0xb8, 0xe2, 0xe3, 0xda, 0xe4, 0x4d, 0xc9, 0x00, 0xa7, 0xbc, - 0xec, 0x1f, 0x54, 0xe9, 0xac, 0x4f, 0x49, 0x8d, 0x65, 0xcd, 0x3a, 0x8e, 0x65, 0xad, 0x72, 0xf4, - 0xcb, 0xda, 0x7b, 0x30, 0xd9, 0xd2, 0x7c, 0xf2, 0xe9, 0x62, 0x7a, 0xa5, 0xa4, 0xbb, 0x59, 0x73, - 0xe4, 0x73, 0x67, 0xc8, 0xa2, 0xc9, 0x0e, 0x67, 0xf9, 0x23, 0x02, 0x63, 0xfc, 0x40, 0x51, 0xd4, - 0x37, 0x50, 0x28, 0xb3, 0xdc, 0xef, 0xc2, 0x4b, 0xa8, 0xca, 0x58, 0xd0, 0x49, 0x53, 0x63, 0x84, - 0x0d, 0xb6, 0xf6, 0xdf, 0x1c, 0x84, 0xc1, 0xa5, 0x1d, 0x12, 0x24, 0x47, 0x38, 0xcb, 0xb7, 0x61, - 0xc2, 0x0b, 0x76, 0x42, 0x7f, 0x87, 0xb8, 0x1c, 0x7f, 0xb8, 0x15, 0xed, 0x8c, 0xa8, 0x64, 0x62, - 0xc5, 0x60, 0x86, 0x33, 0xcc, 0x8f, 0x62, 0x3f, 0xf9, 0x06, 0x0c, 0x71, 0x89, 0x10, 0x9b, 0xc9, - 0x02, 0x27, 0x29, 0x1b, 0x50, 0x31, 0x73, 0xd2, 0x5d, 0x2f, 0xf7, 0xcf, 0x0a, 0x46, 0xe8, 0x2e, - 0x4c, 0x6c, 0x78, 0x51, 0x9c, 0xd0, 0x0d, 0x61, 0x9c, 0x38, 0xdb, 0xed, 0xc3, 0x6c, 0x24, 0xd5, - 0x90, 0x2c, 0x1b, 0xac, 0x70, 0x86, 0x35, 0xda, 0x82, 0x71, 0xba, 0x8f, 0x49, 0xeb, 0x1a, 0xee, - 0xbf, 0x2e, 0xe5, 0x4b, 0xba, 0xa1, 0x73, 0xc2, 0x26, 0x63, 0xaa, 0x8c, 0x5a, 0x6c, 0xe3, 0x33, - 0xc2, 0x96, 0x74, 0xa5, 0x8c, 0xf8, 0x8e, 0x87, 0xe3, 0xa8, 0x4e, 0x63, 0xe7, 0xc7, 0x35, 0x53, - 0xa7, 0xa5, 0xa7, 0xc4, 0xf6, 0x77, 0xe9, 0x02, 0x44, 0x47, 0xf1, 0x38, 0x74, 0xf7, 0x35, 0x53, - 0x77, 0x3f, 0x55, 0xe2, 0xe3, 0xf6, 0xd0, 0xdb, 0x5f, 0x86, 0x51, 0xed, 0xdb, 0xa3, 0x4b, 0x50, - 0x6b, 0xc9, 0xa3, 0x4e, 0xa1, 0xc0, 0x95, 0x01, 0xa1, 0xce, 0x40, 0x71, 0x4a, 0x43, 0x07, 0x86, - 0x1a, 0x5e, 0xd9, 0x88, 0x08, 0x6a, 0x96, 0x61, 0x86, 0xb1, 0x5f, 0x00, 0x58, 0xba, 0x4f, 0x5a, - 0xf3, 0x2d, 0x76, 0x10, 0xaf, 0x9d, 0x9b, 0x58, 0xbd, 0xcf, 0x4d, 0xec, 0xb7, 0x61, 0x7c, 0xe9, - 0x3e, 0x5d, 0xd9, 0xe5, 0x36, 0xed, 0x3c, 0x0c, 0x11, 0x06, 0x60, 0xad, 0x1a, 0x49, 0x85, 0x94, - 0x93, 0x61, 0x81, 0x65, 0xc7, 0xe8, 0xf7, 0x1d, 0x31, 0x61, 0xb5, 0x2d, 0xef, 0x12, 0x05, 0x62, - 0x8e, 0xb3, 0xbf, 0x63, 0xc1, 0xc4, 0xf2, 0xa2, 0x61, 0x27, 0xcf, 0x01, 0x70, 0x7b, 0xf3, 0xce, - 0x9d, 0x9b, 0xd2, 0x8f, 0xca, 0x9d, 0x5d, 0x0a, 0x8a, 0x35, 0x0a, 0xf4, 0x38, 0x54, 0xfd, 0x4e, - 0x20, 0xcc, 0xc0, 0xe1, 0xfd, 0xbd, 0xd9, 0xea, 0x8d, 0x4e, 0x80, 0x29, 0x4c, 0x0b, 0x6c, 0xa8, - 0x96, 0x0e, 0x6c, 0x28, 0x0e, 0xed, 0xfb, 0x56, 0x15, 0xa6, 0x96, 0x7d, 0x72, 0xdf, 0x68, 0xf5, - 0x79, 0x18, 0x72, 0x23, 0x6f, 0x87, 0x44, 0x59, 0x37, 0x49, 0x9d, 0x41, 0xb1, 0xc0, 0x96, 0x8e, - 0xb5, 0x30, 0xe2, 0x4c, 0xaa, 0x47, 0x1c, 0x67, 0x52, 0xd8, 0x67, 0xb4, 0x01, 0xc3, 0x21, 0xff, - 0xfe, 0xd3, 0x83, 0x4c, 0xd0, 0x5f, 0x3d, 0xb8, 0x31, 0xd9, 0xf1, 0x99, 0x13, 0xd2, 0xc3, 0x0f, - 0xbd, 0x95, 0xb2, 0x14, 0x50, 0x2c, 0x99, 0xcf, 0x7c, 0x06, 0xc6, 0x74, 0xca, 0xbe, 0x4e, 0xbf, - 0x7f, 0xce, 0x82, 0x93, 0xcb, 0x7e, 0xd8, 0xba, 0x9b, 0x09, 0x86, 0x79, 0x09, 0x46, 0xe9, 0x54, - 0x8d, 0x8d, 0x08, 0x31, 0x23, 0x14, 0x4e, 0xa0, 0xb0, 0x4e, 0xa7, 0x15, 0xbb, 0x7d, 0x7b, 0xa5, - 0x9e, 0x17, 0x41, 0x27, 0x50, 0x58, 0xa7, 0xb3, 0xff, 0xb3, 0x05, 0x4f, 0x5e, 0x5d, 0x5c, 0x6a, - 0x50, 0x35, 0x12, 0x27, 0x24, 0x48, 0xba, 0x82, 0xf8, 0xce, 0xc3, 0x50, 0xdb, 0xd5, 0x9a, 0xa2, - 0x44, 0xa0, 0x51, 0x67, 0xad, 0x10, 0xd8, 0x47, 0x25, 0x92, 0xf5, 0x97, 0x2d, 0x38, 0x79, 0xd5, - 0x4b, 0x30, 0x69, 0x87, 0xd9, 0xb8, 0xbb, 0x88, 0xb4, 0xc3, 0xd8, 0x4b, 0xc2, 0x68, 0x37, 0x1b, - 0x77, 0x87, 0x15, 0x06, 0x6b, 0x54, 0xbc, 0xe6, 0x1d, 0x8f, 0x2a, 0x58, 0xd1, 0x29, 0xad, 0x66, - 0x0e, 0xc7, 0x8a, 0x82, 0x76, 0xcc, 0xf5, 0x22, 0x66, 0x8b, 0xec, 0x8a, 0x19, 0xac, 0x3a, 0x56, - 0x97, 0x08, 0x9c, 0xd2, 0xd8, 0x7f, 0xd7, 0x82, 0xd3, 0x57, 0xfd, 0x4e, 0x9c, 0x90, 0x68, 0x23, - 0x36, 0x1a, 0xfb, 0x02, 0xd4, 0x88, 0xb4, 0x9b, 0x45, 0x5b, 0xd5, 0x9a, 0xa4, 0x0c, 0x6a, 0x1e, - 0xf4, 0xa7, 0xe8, 0x4a, 0xc4, 0x98, 0xf5, 0x17, 0x11, 0xf5, 0xaf, 0x2b, 0x30, 0x7e, 0x6d, 0x6d, - 0xad, 0x71, 0x95, 0x24, 0x42, 0x07, 0x17, 0x3b, 0x7a, 0x1a, 0xda, 0x2e, 0x77, 0xf4, 0xca, 0x5c, - 0x8f, 0x59, 0xd7, 0x49, 0x3c, 0x7f, 0x8e, 0xc7, 0x58, 0xcf, 0xad, 0x04, 0xc9, 0xad, 0xa8, 0x99, - 0x44, 0x5e, 0xb0, 0x99, 0xbb, 0x2b, 0x96, 0xeb, 0x44, 0xb5, 0xd7, 0x3a, 0x81, 0x5e, 0x80, 0x21, - 0x16, 0xe2, 0x2d, 0x6d, 0x9b, 0x8f, 0x2a, 0x33, 0x84, 0x41, 0x1f, 0xec, 0xcd, 0xd6, 0x6e, 0xe3, - 0x15, 0xfe, 0x07, 0x0b, 0x52, 0xf4, 0x2e, 0x8c, 0x6e, 0x25, 0x49, 0xfb, 0x1a, 0x71, 0x5c, 0x12, - 0x49, 0x2d, 0x51, 0x60, 0x05, 0xd2, 0xc1, 0xe0, 0x05, 0xd2, 0x89, 0x95, 0xc2, 0x62, 0xac, 0x73, - 0xb4, 0x9b, 0x00, 0x29, 0xee, 0x21, 0x6d, 0x6d, 0xec, 0xbf, 0x5c, 0x81, 0xe1, 0x6b, 0x4e, 0xe0, - 0xfa, 0x24, 0x42, 0xcb, 0x30, 0x40, 0xee, 0x93, 0x56, 0x39, 0x03, 0x36, 0x5d, 0x48, 0xb9, 0xa7, - 0x8a, 0xfe, 0xc7, 0xac, 0x3c, 0xc2, 0x30, 0x4c, 0xdb, 0x7d, 0x55, 0x05, 0x66, 0x3e, 0x57, 0x3c, - 0x0a, 0x4a, 0x24, 0xf8, 0x2a, 0x2c, 0x40, 0x58, 0x32, 0x62, 0x3e, 0x9d, 0x56, 0xbb, 0x49, 0x95, - 0x5b, 0x52, 0x2e, 0xf6, 0x7a, 0x6d, 0xb1, 0xc1, 0xc9, 0x05, 0x5f, 0xee, 0xd3, 0x91, 0x40, 0x9c, - 0xb2, 0xb3, 0x5f, 0x81, 0x53, 0xec, 0x54, 0xd0, 0x49, 0xb6, 0x8c, 0x39, 0x53, 0x28, 0x9c, 0xf6, - 0x3f, 0xa8, 0xc0, 0x89, 0x95, 0xe6, 0x62, 0xd3, 0xf4, 0xc6, 0xbd, 0x02, 0x63, 0x7c, 0x79, 0xa6, - 0x42, 0xe7, 0xf8, 0xa2, 0xbc, 0x72, 0x63, 0xaf, 0x69, 0x38, 0x6c, 0x50, 0xa2, 0x27, 0xa1, 0xea, - 0xbd, 0x17, 0x64, 0xe3, 0x83, 0x56, 0xde, 0xb8, 0x89, 0x29, 0x9c, 0xa2, 0xe9, 0x4a, 0xcf, 0x55, - 0x9c, 0x42, 0xab, 0xd5, 0xfe, 0x75, 0x98, 0xf0, 0xe2, 0x56, 0xec, 0xad, 0x04, 0x74, 0xfe, 0x3b, - 0x2d, 0x29, 0xbe, 0xa9, 0xed, 0x4f, 0x9b, 0xaa, 0xb0, 0x38, 0x43, 0xad, 0xe9, 0xdb, 0xc1, 0xd2, - 0xd6, 0x42, 0x71, 0x84, 0xe6, 0x57, 0xa0, 0xa6, 0x22, 0x69, 0x64, 0x00, 0x94, 0x95, 0x1f, 0x00, - 0x55, 0x42, 0xe1, 0x48, 0x1f, 0x69, 0x35, 0xd7, 0x47, 0xfa, 0xcf, 0x2c, 0x48, 0x83, 0x06, 0x10, - 0x86, 0x5a, 0x3b, 0x64, 0x07, 0x10, 0x91, 0x3c, 0xec, 0x7b, 0xba, 0x40, 0x12, 0xf9, 0x4c, 0xe0, - 0xb2, 0xd2, 0x90, 0x65, 0x71, 0xca, 0x06, 0xdd, 0x80, 0xe1, 0x76, 0x44, 0x9a, 0x09, 0x0b, 0xf3, - 0xed, 0x83, 0x23, 0x93, 0xea, 0x06, 0x2f, 0x89, 0x25, 0x0b, 0xfb, 0x37, 0x2c, 0x80, 0x1b, 0xde, - 0xb6, 0x97, 0x60, 0x27, 0xd8, 0x24, 0x47, 0xb8, 0x8b, 0xbc, 0x09, 0x03, 0x71, 0x9b, 0xb4, 0xca, - 0x1d, 0x1d, 0xa5, 0x2d, 0x6a, 0xb6, 0x49, 0x2b, 0xfd, 0x0c, 0xf4, 0x1f, 0x66, 0x7c, 0xec, 0x5f, - 0x05, 0x98, 0x48, 0xc9, 0xa8, 0x19, 0x8f, 0x9e, 0x37, 0xe2, 0x5a, 0x1f, 0xcf, 0xc4, 0xb5, 0xd6, - 0x18, 0xb5, 0x16, 0xca, 0x9a, 0x40, 0x75, 0xdb, 0xb9, 0x2f, 0x76, 0x0d, 0x2f, 0x95, 0x6d, 0x10, - 0xad, 0x69, 0x6e, 0xd5, 0xb9, 0xcf, 0xcd, 0xa8, 0xe7, 0xa4, 0x00, 0xad, 0x3a, 0xf7, 0x1f, 0xf0, - 0x03, 0x22, 0x36, 0x03, 0xe9, 0x36, 0xe5, 0xeb, 0xff, 0x35, 0xfd, 0xcf, 0x94, 0x22, 0xad, 0x8e, - 0xd5, 0xea, 0x05, 0xc2, 0xd5, 0xd7, 0x67, 0xad, 0x5e, 0x90, 0xad, 0xd5, 0x0b, 0x4a, 0xd4, 0xea, - 0x05, 0xe8, 0x7d, 0x0b, 0x86, 0x85, 0x87, 0x9c, 0x85, 0x5f, 0x8d, 0x5e, 0xf9, 0x74, 0x5f, 0x55, - 0x0b, 0x57, 0x3b, 0xaf, 0xfe, 0x92, 0xb4, 0x1d, 0x05, 0xb4, 0xb0, 0x09, 0xb2, 0x6a, 0xf4, 0x6d, - 0x0b, 0x26, 0xc4, 0x6f, 0x4c, 0xde, 0xeb, 0x90, 0x38, 0x11, 0xab, 0xd4, 0xe7, 0x0e, 0xd3, 0x1a, - 0xc1, 0x82, 0x37, 0xea, 0x53, 0x52, 0xc5, 0x98, 0xc8, 0xc2, 0xb6, 0x65, 0xda, 0x83, 0xbe, 0x67, - 0xc1, 0xa9, 0x6d, 0xe7, 0x3e, 0xaf, 0x91, 0xc3, 0xb0, 0x93, 0x78, 0xa1, 0x08, 0x31, 0x5b, 0xee, - 0x57, 0x4e, 0xba, 0x18, 0xf1, 0xe6, 0xbe, 0x26, 0x8f, 0x2d, 0xf3, 0x48, 0x0a, 0x1b, 0x9d, 0xdb, - 0xc2, 0x19, 0x17, 0x46, 0xa4, 0x60, 0xe6, 0x58, 0xed, 0x0b, 0xfa, 0x62, 0x7c, 0xf0, 0x0c, 0x94, - 0x0e, 0xb4, 0xb9, 0x37, 0x3a, 0x4e, 0x90, 0x78, 0xc9, 0xae, 0x66, 0xe3, 0xb3, 0x5a, 0x84, 0x20, - 0x1e, 0x61, 0x2d, 0x5b, 0x30, 0xa6, 0xcb, 0xdc, 0x11, 0xd6, 0x14, 0xc2, 0xc9, 0x1c, 0x79, 0x3a, - 0xc2, 0x0a, 0x3b, 0xf0, 0x78, 0x4f, 0xb9, 0x38, 0xba, 0x6a, 0xed, 0x1f, 0x5a, 0xba, 0xc2, 0x3c, - 0x0e, 0xc7, 0xcc, 0xaa, 0xe9, 0x98, 0xb9, 0x50, 0x76, 0xea, 0xf4, 0xf0, 0xce, 0x6c, 0xe8, 0xed, - 0xa7, 0x2b, 0x01, 0x5a, 0x83, 0x21, 0x9f, 0x42, 0xe4, 0x69, 0xd0, 0xc5, 0x7e, 0x26, 0x67, 0x6a, - 0x5c, 0x30, 0x78, 0x8c, 0x05, 0x2f, 0xfb, 0x37, 0x2d, 0x18, 0x38, 0x8e, 0xe1, 0x69, 0x98, 0xc3, - 0xd3, 0xcb, 0x44, 0x15, 0x57, 0x3e, 0xe7, 0xb0, 0x73, 0x6f, 0xe9, 0x7e, 0x42, 0x82, 0x98, 0x99, - 0x92, 0xb9, 0x23, 0xf4, 0x2b, 0x15, 0x18, 0xa5, 0x15, 0x49, 0x3f, 0xd1, 0xab, 0x30, 0xee, 0x3b, - 0xeb, 0xc4, 0x97, 0xee, 0xe4, 0xec, 0xb6, 0xeb, 0x86, 0x8e, 0xc4, 0x26, 0x2d, 0x2d, 0xbc, 0xa1, - 0x7b, 0xdb, 0x85, 0x49, 0xa4, 0x0a, 0x1b, 0xae, 0x78, 0x6c, 0xd2, 0x52, 0xcb, 0xff, 0x9e, 0x93, - 0xb4, 0xb6, 0xc4, 0x96, 0x4c, 0x35, 0xf7, 0x0e, 0x05, 0x62, 0x8e, 0x43, 0xf3, 0x30, 0x29, 0x25, - 0xf6, 0x4d, 0x3e, 0x74, 0xc2, 0x5c, 0x54, 0xf7, 0xf4, 0xb0, 0x89, 0xc6, 0x59, 0x7a, 0xf4, 0x19, - 0x98, 0xa0, 0x83, 0x13, 0x76, 0x12, 0x19, 0xac, 0x30, 0xc8, 0x82, 0x15, 0x58, 0x70, 0xe8, 0x9a, - 0x81, 0xc1, 0x19, 0x4a, 0xfb, 0x5d, 0x38, 0x79, 0x23, 0x74, 0xdc, 0x05, 0xc7, 0x77, 0x82, 0x16, - 0x89, 0x56, 0x82, 0xcd, 0xc2, 0x73, 0x5d, 0xfd, 0xec, 0xb5, 0x52, 0x74, 0xf6, 0x6a, 0x47, 0x80, - 0xf4, 0x0a, 0x44, 0x98, 0xcd, 0xdb, 0x30, 0xec, 0xf1, 0xaa, 0x84, 0xd4, 0x5e, 0x2e, 0x72, 0x2a, - 0x75, 0xb5, 0x51, 0x0b, 0x1b, 0xe1, 0x00, 0x2c, 0x59, 0xd2, 0x9d, 0x44, 0x9e, 0x17, 0xaa, 0x78, - 0xb3, 0x66, 0xff, 0x55, 0x0b, 0x26, 0x6f, 0x66, 0x2e, 0x83, 0x9d, 0x87, 0xa1, 0x98, 0x44, 0x39, - 0x2e, 0xb5, 0x26, 0x83, 0x62, 0x81, 0x7d, 0xe8, 0xdb, 0xf4, 0x5f, 0xac, 0x40, 0x8d, 0xc5, 0x6c, - 0xb6, 0x9d, 0xd6, 0x51, 0x1a, 0xa5, 0xab, 0x86, 0x51, 0x5a, 0xb0, 0x49, 0x54, 0x0d, 0xea, 0x65, - 0x93, 0xa2, 0xdb, 0xea, 0x72, 0x54, 0xa9, 0xfd, 0x61, 0xca, 0x90, 0xdf, 0xa3, 0x99, 0x30, 0xef, - 0x52, 0xc9, 0x8b, 0x53, 0xec, 0x34, 0x54, 0xd1, 0x3e, 0x7a, 0xa7, 0xa1, 0xaa, 0x69, 0x3d, 0xb4, - 0x52, 0x43, 0x6b, 0x3d, 0x53, 0xdb, 0x9f, 0x65, 0x01, 0x78, 0x8e, 0xef, 0x7d, 0x95, 0xa8, 0x4b, - 0x86, 0xb3, 0x22, 0x9e, 0x4e, 0x40, 0x1f, 0x30, 0x05, 0x23, 0xfe, 0xf1, 0xbb, 0xa3, 0x69, 0x11, - 0xfb, 0x1a, 0x4c, 0x66, 0xc6, 0x0e, 0xbd, 0x04, 0x83, 0xed, 0x2d, 0x27, 0x26, 0x99, 0xc8, 0x8e, - 0xc1, 0x06, 0x05, 0x3e, 0xd8, 0x9b, 0x9d, 0x50, 0x05, 0x18, 0x04, 0x73, 0x6a, 0xfb, 0x4f, 0x2c, - 0x18, 0xb8, 0x19, 0xba, 0x47, 0x29, 0x63, 0xd7, 0x0c, 0x19, 0x3b, 0x5f, 0x7c, 0xe3, 0xbc, 0xa7, - 0x78, 0x35, 0x32, 0xe2, 0x75, 0xa1, 0x04, 0xaf, 0x83, 0x25, 0x6b, 0x1b, 0x46, 0xd9, 0x8d, 0x76, - 0x11, 0xd2, 0xf2, 0x82, 0xb1, 0x81, 0x9a, 0xcd, 0x6c, 0xa0, 0x26, 0x35, 0x52, 0x6d, 0x1b, 0xf5, - 0x0c, 0x0c, 0x8b, 0x10, 0x8a, 0x6c, 0xd4, 0xa1, 0xa0, 0xc5, 0x12, 0x6f, 0xff, 0x7a, 0x15, 0x8c, - 0x1b, 0xf4, 0xe8, 0x47, 0x16, 0xcc, 0x45, 0xfc, 0xca, 0x83, 0x5b, 0xef, 0x44, 0x5e, 0xb0, 0xd9, - 0x6c, 0x6d, 0x11, 0xb7, 0xe3, 0x7b, 0xc1, 0xe6, 0xca, 0x66, 0x10, 0x2a, 0xf0, 0xd2, 0x7d, 0xd2, - 0xea, 0x30, 0xef, 0x6a, 0xe9, 0x8b, 0xfb, 0xea, 0x0c, 0xf5, 0xca, 0xfe, 0xde, 0xec, 0x1c, 0xee, - 0xab, 0x16, 0xdc, 0x67, 0xab, 0xd0, 0xef, 0x5b, 0x70, 0x89, 0xdf, 0x21, 0x2f, 0xdf, 0x93, 0x52, - 0x1b, 0xcf, 0x86, 0x64, 0x9a, 0xb2, 0x5b, 0x23, 0xd1, 0xf6, 0xc2, 0xcb, 0x62, 0x90, 0x2f, 0x35, - 0xfa, 0xab, 0x15, 0xf7, 0xdb, 0x4c, 0xfb, 0xdf, 0x56, 0x61, 0x9c, 0x8e, 0x67, 0x7a, 0x7f, 0xf4, - 0x25, 0x43, 0x4c, 0x3e, 0x96, 0x11, 0x93, 0x13, 0x06, 0xf1, 0xc3, 0xb9, 0x3a, 0x9a, 0xc0, 0x09, - 0xdf, 0x89, 0x93, 0x6b, 0xc4, 0x89, 0x92, 0x75, 0xe2, 0xb0, 0x03, 0x4b, 0x31, 0x09, 0xfa, 0x3a, - 0x04, 0x55, 0x71, 0x39, 0x37, 0xb2, 0xdc, 0x70, 0x77, 0x05, 0xe8, 0x1e, 0x20, 0x76, 0x3a, 0x1a, - 0x39, 0x41, 0xcc, 0x3b, 0xe3, 0x09, 0x87, 0x6c, 0x9f, 0xd5, 0xce, 0x88, 0x6a, 0xd1, 0x8d, 0x2e, - 0x76, 0x38, 0xa7, 0x0a, 0xed, 0x08, 0x7c, 0xb0, 0xec, 0x11, 0xf8, 0x50, 0x41, 0xc0, 0xef, 0xcf, - 0x5b, 0x70, 0x92, 0x7e, 0x18, 0x33, 0x38, 0x34, 0x46, 0x21, 0x4c, 0xd2, 0x1e, 0xf8, 0x24, 0x91, - 0x30, 0x31, 0xc3, 0x0a, 0x6c, 0x69, 0x93, 0x4f, 0x6a, 0xb1, 0x5d, 0x37, 0x99, 0xe1, 0x2c, 0x77, - 0xfb, 0xd7, 0x2d, 0x60, 0xd1, 0x67, 0xc7, 0xb1, 0x8e, 0x5d, 0x35, 0xd7, 0x31, 0xbb, 0x58, 0x69, - 0xf4, 0x58, 0xc2, 0x5e, 0x84, 0x29, 0x8a, 0x6d, 0x44, 0xe1, 0xfd, 0x5d, 0x69, 0x5c, 0x17, 0xfb, - 0x66, 0xdf, 0xaf, 0xf0, 0x99, 0xa3, 0xae, 0x6f, 0xa1, 0x5f, 0xb0, 0x60, 0xa4, 0xe5, 0xb4, 0x9d, - 0x16, 0x4f, 0x41, 0x52, 0xc2, 0x0f, 0x63, 0x94, 0x9f, 0x5b, 0x14, 0x65, 0xb9, 0x0f, 0xe1, 0x93, - 0xb2, 0xeb, 0x12, 0x5c, 0xe8, 0x37, 0x50, 0x95, 0xcf, 0x78, 0x30, 0x6e, 0x30, 0x3b, 0xc2, 0x8d, - 0xe7, 0x2f, 0x58, 0x5c, 0xeb, 0xab, 0xcd, 0xc1, 0x3d, 0x38, 0x11, 0x68, 0xff, 0xa9, 0x3e, 0x93, - 0xb6, 0xf0, 0x5c, 0x79, 0xbd, 0xce, 0xd4, 0xa0, 0x16, 0x68, 0x97, 0x61, 0x88, 0xbb, 0xeb, 0xb0, - 0xff, 0xa1, 0x05, 0x8f, 0xe9, 0x84, 0xda, 0x6d, 0xbb, 0x22, 0xbf, 0x70, 0x1d, 0x46, 0xc2, 0x36, - 0x89, 0x9c, 0x74, 0x23, 0x74, 0x41, 0x8e, 0xfe, 0x2d, 0x01, 0x7f, 0xb0, 0x37, 0x7b, 0x4a, 0xe7, - 0x2e, 0xe1, 0x58, 0x95, 0x44, 0x36, 0x0c, 0xb1, 0x71, 0x89, 0xc5, 0x3d, 0x49, 0x96, 0x90, 0x83, - 0x9d, 0x86, 0xc4, 0x58, 0x60, 0xec, 0xbf, 0x66, 0x71, 0x61, 0xd3, 0x9b, 0x8e, 0xbe, 0x06, 0x53, - 0xdb, 0x74, 0xcf, 0xb4, 0x74, 0xbf, 0x4d, 0x57, 0x52, 0x76, 0x0a, 0x6c, 0x95, 0x59, 0x3f, 0x7a, - 0x74, 0x77, 0x61, 0x5a, 0xb4, 0x7e, 0x6a, 0x35, 0xc3, 0x16, 0x77, 0x55, 0x64, 0xff, 0x81, 0x98, - 0xb2, 0xcc, 0x78, 0x7b, 0x06, 0x86, 0xdb, 0xa1, 0xbb, 0xb8, 0x52, 0xc7, 0x62, 0xac, 0x94, 0xce, - 0x69, 0x70, 0x30, 0x96, 0x78, 0x74, 0x05, 0x80, 0xdc, 0x4f, 0x48, 0x14, 0x38, 0xbe, 0x3a, 0xbd, - 0x55, 0xb6, 0xd2, 0x92, 0xc2, 0x60, 0x8d, 0x8a, 0x96, 0x69, 0x47, 0xe1, 0x8e, 0xe7, 0xb2, 0xa8, - 0xf7, 0xaa, 0x59, 0xa6, 0xa1, 0x30, 0x58, 0xa3, 0xa2, 0x3b, 0xd5, 0x4e, 0x10, 0xf3, 0x75, 0xcc, - 0x59, 0x17, 0x79, 0x24, 0x46, 0xd2, 0x9d, 0xea, 0x6d, 0x1d, 0x89, 0x4d, 0x5a, 0xfb, 0x77, 0x6a, - 0x00, 0xa9, 0xa5, 0x84, 0xde, 0xef, 0x9e, 0xa1, 0x9f, 0x2a, 0x6b, 0x66, 0x3d, 0xbc, 0xe9, 0x89, - 0xbe, 0x69, 0xc1, 0xa8, 0xe3, 0xfb, 0x61, 0xcb, 0x49, 0x58, 0x8f, 0x2a, 0x65, 0x75, 0x85, 0x68, - 0xc9, 0x7c, 0x5a, 0x96, 0x37, 0xe6, 0x05, 0x79, 0xb8, 0xa7, 0x61, 0x0a, 0xdb, 0xa3, 0x37, 0x01, - 0x7d, 0x52, 0x5a, 0xd8, 0xfc, 0xa3, 0xcc, 0x64, 0x2d, 0xec, 0x1a, 0xd3, 0x90, 0x9a, 0x71, 0x8d, - 0xde, 0x35, 0x52, 0x26, 0x0c, 0x94, 0xb9, 0xa2, 0x6b, 0xd8, 0x0e, 0x45, 0xd9, 0x12, 0xd0, 0x17, - 0xf5, 0x80, 0xe0, 0xc1, 0x32, 0xf7, 0x5f, 0x35, 0x13, 0xb6, 0x20, 0x18, 0x38, 0x81, 0x49, 0xd7, - 0x5c, 0x2b, 0x45, 0x84, 0xd7, 0xe5, 0xe2, 0x1a, 0x32, 0x8b, 0x6c, 0xba, 0x3a, 0x66, 0x10, 0x38, - 0x5b, 0x05, 0xfa, 0x22, 0x0f, 0xd7, 0x5e, 0x09, 0x36, 0x42, 0x11, 0xe4, 0x75, 0xb1, 0xc4, 0x37, - 0xdf, 0x8d, 0x13, 0xb2, 0x4d, 0xcb, 0xa4, 0xab, 0xe1, 0x4d, 0xc1, 0x05, 0x2b, 0x7e, 0x68, 0x0d, - 0x86, 0xd8, 0xe5, 0x92, 0x78, 0x7a, 0xa4, 0x8c, 0xb7, 0xcc, 0xbc, 0x56, 0x99, 0xda, 0x20, 0xec, - 0x6f, 0x8c, 0x05, 0x2f, 0x74, 0x4d, 0x5e, 0x43, 0x8e, 0x57, 0x82, 0xdb, 0x31, 0x61, 0xd7, 0x90, - 0x6b, 0x0b, 0x1f, 0x4f, 0xef, 0x15, 0x73, 0x78, 0x6e, 0x92, 0x28, 0xa3, 0x24, 0x35, 0x45, 0xc4, - 0x7f, 0x99, 0x7b, 0x6a, 0x1a, 0xca, 0x34, 0xd4, 0xcc, 0x54, 0x95, 0x0e, 0xf6, 0x9b, 0x26, 0x33, - 0x9c, 0xe5, 0x7e, 0x8c, 0x6b, 0xe0, 0x8c, 0x0f, 0x53, 0xd9, 0x29, 0x79, 0x84, 0x2b, 0xee, 0x1f, - 0x0f, 0xc0, 0x84, 0x29, 0x18, 0xe8, 0x12, 0xd4, 0xb6, 0x59, 0x66, 0xa8, 0x34, 0x1f, 0x8d, 0x92, - 0xff, 0x55, 0x89, 0xc0, 0x29, 0x0d, 0xcb, 0xcc, 0xc3, 0x8a, 0x6b, 0xa1, 0x37, 0x69, 0x66, 0x1e, - 0x85, 0xc1, 0x1a, 0x15, 0xb5, 0x5b, 0xd7, 0xc3, 0x30, 0x51, 0x8a, 0x5b, 0xc9, 0xcc, 0x02, 0x83, - 0x62, 0x81, 0xa5, 0x0a, 0xfb, 0x2e, 0xed, 0x90, 0x6f, 0xba, 0xfd, 0x94, 0xc2, 0xbe, 0xae, 0x23, - 0xb1, 0x49, 0x4b, 0x17, 0xa0, 0x30, 0x66, 0x42, 0x28, 0xac, 0xe3, 0x34, 0x94, 0xa9, 0xc9, 0x2f, - 0x5b, 0x49, 0x3c, 0xfa, 0x02, 0x3c, 0xa6, 0xee, 0x46, 0x61, 0xee, 0x46, 0x95, 0x35, 0x0e, 0x19, - 0x5b, 0xdc, 0xc7, 0x16, 0xf3, 0xc9, 0x70, 0xaf, 0xf2, 0xe8, 0x75, 0x98, 0x10, 0x96, 0xad, 0xe4, - 0x38, 0x6c, 0x9e, 0x74, 0x5f, 0x37, 0xb0, 0x38, 0x43, 0x8d, 0xea, 0x30, 0x45, 0x21, 0xcc, 0xa2, - 0x94, 0x1c, 0xf8, 0x1d, 0x2f, 0xb5, 0x32, 0x5f, 0xcf, 0xe0, 0x71, 0x57, 0x09, 0x34, 0x0f, 0x93, - 0xdc, 0xb6, 0xa0, 0x1b, 0x39, 0xf6, 0x1d, 0x44, 0x50, 0xa6, 0x9a, 0x04, 0xb7, 0x4c, 0x34, 0xce, - 0xd2, 0xa3, 0x57, 0x60, 0xcc, 0x89, 0x5a, 0x5b, 0x5e, 0x42, 0x5a, 0x49, 0x27, 0xe2, 0x17, 0xfc, - 0xb5, 0x50, 0x81, 0x79, 0x0d, 0x87, 0x0d, 0x4a, 0xfb, 0xab, 0x70, 0x32, 0x27, 0xf6, 0x9b, 0x0a, - 0x8e, 0xd3, 0xf6, 0x64, 0x9f, 0x32, 0x41, 0x49, 0xf3, 0x8d, 0x15, 0xd9, 0x1b, 0x8d, 0x8a, 0x4a, - 0x27, 0xf3, 0x1f, 0x6b, 0x69, 0xe2, 0x94, 0x74, 0x2e, 0x4b, 0x04, 0x4e, 0x69, 0xec, 0xff, 0x51, - 0x03, 0xcd, 0xdb, 0x52, 0x22, 0x14, 0xe5, 0x15, 0x18, 0x93, 0x99, 0x0f, 0xb5, 0x8c, 0x63, 0xaa, - 0x9b, 0x57, 0x35, 0x1c, 0x36, 0x28, 0x69, 0xdb, 0x02, 0xe9, 0x3b, 0xca, 0x86, 0x40, 0x29, 0xa7, - 0x12, 0x4e, 0x69, 0xd0, 0x45, 0x18, 0x89, 0x89, 0xbf, 0x71, 0xc3, 0x0b, 0xee, 0x0a, 0xc1, 0x56, - 0x5a, 0xb9, 0x29, 0xe0, 0x58, 0x51, 0xa0, 0xcf, 0x41, 0xb5, 0xe3, 0xb9, 0x42, 0x94, 0xe7, 0xa4, - 0xdd, 0x79, 0x7b, 0xa5, 0xfe, 0x60, 0x6f, 0x76, 0x36, 0x3f, 0x9d, 0x23, 0xdd, 0x4d, 0xc7, 0x73, - 0x74, 0xf2, 0xd1, 0xa2, 0x79, 0x6e, 0xf4, 0xa1, 0x3e, 0xdd, 0xe8, 0x57, 0x00, 0x44, 0x9f, 0xa5, - 0x24, 0x57, 0xd3, 0x6f, 0x76, 0x55, 0x61, 0xb0, 0x46, 0x45, 0xf7, 0xe4, 0xad, 0x88, 0x38, 0x72, - 0xd3, 0xca, 0x03, 0x93, 0x47, 0x3e, 0xc4, 0x9e, 0x7c, 0x31, 0xcb, 0x0d, 0x77, 0x57, 0x80, 0xda, - 0x70, 0xc2, 0xa5, 0xf3, 0xc8, 0xa8, 0xb5, 0x76, 0x88, 0x70, 0x68, 0x5a, 0x63, 0x3d, 0xcb, 0x09, - 0x77, 0x33, 0x47, 0xef, 0xc0, 0x8c, 0x04, 0x76, 0xdf, 0x7e, 0x64, 0xd3, 0xa5, 0xba, 0x70, 0x76, - 0x7f, 0x6f, 0x76, 0xa6, 0xde, 0x93, 0x0a, 0x1f, 0xc0, 0x01, 0xbd, 0x0d, 0x43, 0xec, 0xe0, 0x25, - 0x9e, 0x1e, 0x65, 0xab, 0xdd, 0x8b, 0x65, 0xfd, 0x8e, 0x73, 0xec, 0xf8, 0x46, 0xc4, 0x73, 0xa6, - 0x87, 0x59, 0x0c, 0x88, 0x05, 0x4f, 0xd4, 0x86, 0x51, 0x27, 0x08, 0xc2, 0xc4, 0xe1, 0x46, 0xd8, - 0x58, 0x19, 0x3b, 0x52, 0xab, 0x62, 0x3e, 0x2d, 0xcb, 0xeb, 0x51, 0x41, 0x62, 0x1a, 0x06, 0xeb, - 0x55, 0xd0, 0x65, 0x3c, 0xbc, 0x47, 0x15, 0xa6, 0x3c, 0x7b, 0x88, 0xa7, 0xc7, 0xcb, 0x2c, 0xe3, - 0xb7, 0x8c, 0x42, 0x9a, 0x06, 0x33, 0x99, 0xe1, 0x2c, 0x77, 0x34, 0x67, 0xb8, 0x93, 0x27, 0xd2, - 0x68, 0xe5, 0xd4, 0x9d, 0xac, 0x7b, 0x8f, 0xd9, 0xcd, 0x5a, 0x1e, 0xa1, 0xc8, 0x34, 0xc1, 0x64, - 0xe6, 0x66, 0x6d, 0x8a, 0xc2, 0x3a, 0xdd, 0xcc, 0xa7, 0x61, 0x54, 0x1b, 0xf0, 0x7e, 0xc2, 0x62, - 0x67, 0x5e, 0x87, 0xa9, 0xec, 0x40, 0xf6, 0x15, 0x56, 0xfb, 0xbf, 0x2a, 0x30, 0x99, 0x73, 0xa0, - 0x73, 0xd7, 0x63, 0x81, 0xe3, 0x86, 0xca, 0xbb, 0xee, 0x05, 0x2e, 0x66, 0x18, 0x53, 0x71, 0x55, - 0x4a, 0x28, 0x2e, 0xa9, 0x45, 0xab, 0x3d, 0xb5, 0xa8, 0x50, 0x56, 0x03, 0x87, 0x57, 0x56, 0xe6, - 0xea, 0x30, 0x58, 0x6a, 0x75, 0x78, 0x08, 0x0a, 0xce, 0x58, 0x60, 0x86, 0x4b, 0x2c, 0x30, 0x0f, - 0x2c, 0x98, 0x30, 0x25, 0xaf, 0xc4, 0x88, 0x3f, 0xaa, 0x03, 0x38, 0xc7, 0x36, 0x62, 0x49, 0x14, - 0xfa, 0x3e, 0x89, 0x44, 0xc0, 0xdc, 0x84, 0xd8, 0x57, 0x09, 0x28, 0xd6, 0x28, 0xec, 0x6f, 0x57, - 0x60, 0x2a, 0x8d, 0x9e, 0x16, 0x19, 0x60, 0x8f, 0xee, 0x84, 0x64, 0xcd, 0x38, 0x21, 0x29, 0x4a, - 0xec, 0x9a, 0x69, 0x57, 0xcf, 0xd3, 0x92, 0xb7, 0x33, 0xa7, 0x25, 0x2f, 0xf6, 0xc9, 0xf7, 0xe0, - 0x93, 0x93, 0x7f, 0x5e, 0x81, 0xd3, 0xd9, 0x22, 0x8b, 0xbe, 0xe3, 0x6d, 0x1f, 0xe1, 0x38, 0x7d, - 0xc1, 0x18, 0xa7, 0x97, 0xfb, 0xeb, 0x0f, 0x6b, 0x5c, 0xcf, 0xc1, 0x72, 0x32, 0x83, 0xf5, 0xe9, - 0xc3, 0x30, 0x3f, 0x78, 0xc4, 0x7e, 0xd7, 0x82, 0xc7, 0x73, 0xcb, 0x1d, 0x87, 0x27, 0xf8, 0x2d, - 0xd3, 0x13, 0xfc, 0xc2, 0x21, 0xba, 0xd7, 0xc3, 0x35, 0xfc, 0xdf, 0x2a, 0x3d, 0xba, 0xc5, 0xbc, - 0x65, 0xb7, 0x60, 0xd4, 0x69, 0xb5, 0x48, 0x1c, 0xaf, 0x86, 0xae, 0x4a, 0x49, 0xf4, 0x3c, 0x5b, - 0x3f, 0x53, 0xf0, 0x83, 0xbd, 0xd9, 0x99, 0x2c, 0x8b, 0x14, 0x8d, 0x75, 0x0e, 0x66, 0x6a, 0xb1, - 0xca, 0x11, 0xa5, 0x16, 0xbb, 0x02, 0xb0, 0xa3, 0x76, 0xe9, 0x59, 0x27, 0x9c, 0xb6, 0x7f, 0xd7, - 0xa8, 0xd0, 0x3b, 0xcc, 0xea, 0xe5, 0x91, 0x22, 0x03, 0x85, 0x13, 0xce, 0xf8, 0x80, 0x7a, 0xd8, - 0x09, 0xbf, 0x3a, 0xaa, 0x3c, 0x96, 0x8a, 0xa7, 0xfd, 0xdd, 0x2a, 0x7c, 0xf4, 0x00, 0xb1, 0x43, - 0xf3, 0xe6, 0x01, 0xf0, 0x73, 0x59, 0xf7, 0xd4, 0x4c, 0x6e, 0x61, 0xc3, 0x5f, 0x95, 0xf9, 0x58, - 0x95, 0x0f, 0xfd, 0xb1, 0xbe, 0xa5, 0x3b, 0x13, 0x79, 0xc4, 0xe7, 0xd5, 0x43, 0x4f, 0xac, 0x9f, - 0x4e, 0xe7, 0xff, 0xd7, 0x2d, 0xf8, 0x58, 0x6e, 0xa7, 0x8c, 0x38, 0x93, 0x4b, 0x50, 0x6b, 0x51, - 0xa0, 0x76, 0x25, 0x27, 0xbd, 0x69, 0x27, 0x11, 0x38, 0xa5, 0x31, 0xc2, 0x49, 0x2a, 0x85, 0xe1, - 0x24, 0xff, 0xc1, 0x82, 0x53, 0xd9, 0x46, 0x1c, 0x87, 0xd6, 0x69, 0x9a, 0x5a, 0x67, 0xae, 0xbf, - 0x6f, 0xdf, 0x43, 0xe1, 0x7c, 0x7b, 0x1c, 0xce, 0x74, 0x2d, 0x56, 0x7c, 0x18, 0x7f, 0xd6, 0x82, - 0x13, 0x9b, 0x6c, 0x7f, 0xa1, 0x5d, 0x7c, 0x12, 0x1d, 0x2b, 0xb8, 0x2d, 0x76, 0xe0, 0x7d, 0x29, - 0xbe, 0x5b, 0xea, 0x22, 0xc1, 0xdd, 0x95, 0xa1, 0x6f, 0x58, 0x70, 0xca, 0xb9, 0x17, 0x77, 0x3d, - 0x27, 0x20, 0xe4, 0xe8, 0xf5, 0x02, 0x57, 0x5e, 0xc1, 0x43, 0x04, 0x0b, 0xd3, 0xfb, 0x7b, 0xb3, - 0xa7, 0xf2, 0xa8, 0x70, 0x6e, 0xad, 0xe8, 0x6d, 0x91, 0x86, 0x8d, 0x9a, 0x7d, 0xa5, 0xae, 0xf0, - 0xe5, 0x5d, 0xc3, 0xe0, 0x3a, 0x49, 0x62, 0xb0, 0xe2, 0x88, 0xbe, 0x0c, 0xb5, 0x4d, 0x79, 0xd7, - 0x49, 0x28, 0xbd, 0x82, 0x95, 0x25, 0xf7, 0x6a, 0x14, 0x0f, 0xf6, 0x57, 0x28, 0x9c, 0x32, 0x45, - 0xd7, 0xa0, 0x1a, 0x6c, 0xc4, 0xe2, 0xda, 0x72, 0x51, 0x38, 0x91, 0x19, 0xbc, 0xc5, 0x2f, 0x62, - 0xde, 0x5c, 0x6e, 0x62, 0xca, 0x82, 0x72, 0x8a, 0xd6, 0x5d, 0xe1, 0xc3, 0x2e, 0xe0, 0x84, 0x17, - 0xea, 0xdd, 0x9c, 0xf0, 0x42, 0x1d, 0x53, 0x16, 0x2c, 0x6e, 0x31, 0x6e, 0xc5, 0x9e, 0x70, 0x50, - 0x17, 0xdc, 0x69, 0xef, 0xba, 0x9c, 0xc2, 0x33, 0xf2, 0x31, 0x30, 0xe6, 0x8c, 0xd0, 0x1a, 0x0c, - 0xb5, 0x58, 0x06, 0x6d, 0xe1, 0x3f, 0x28, 0xca, 0xab, 0xdc, 0x95, 0x6d, 0x9b, 0x1f, 0xa4, 0x71, - 0x38, 0x16, 0xbc, 0x18, 0x57, 0xd2, 0xde, 0xda, 0x88, 0x85, 0x7f, 0xa0, 0x88, 0x6b, 0x57, 0x2e, - 0x74, 0xc1, 0x95, 0xc1, 0xb1, 0xe0, 0x85, 0xea, 0x50, 0xd9, 0x68, 0x89, 0x34, 0x98, 0x05, 0x3b, - 0x5a, 0xf3, 0x56, 0xed, 0xc2, 0xd0, 0xfe, 0xde, 0x6c, 0x65, 0x79, 0x11, 0x57, 0x36, 0x5a, 0xe8, - 0x2d, 0x18, 0xde, 0xe0, 0xf7, 0x24, 0x45, 0xca, 0xcb, 0xcb, 0x45, 0x97, 0x39, 0xbb, 0x2e, 0x55, - 0xf2, 0x0b, 0x1d, 0x02, 0x81, 0x25, 0x3b, 0xf4, 0x0e, 0xc0, 0x86, 0xba, 0xf9, 0x29, 0x72, 0x5e, - 0xce, 0xf5, 0x77, 0x53, 0x54, 0xec, 0x9e, 0x15, 0x14, 0x6b, 0x1c, 0xa9, 0xcc, 0x3b, 0xf2, 0x11, - 0x00, 0x96, 0xef, 0xb2, 0x50, 0xe6, 0x73, 0xdf, 0x0c, 0xe0, 0x32, 0xaf, 0x50, 0x38, 0x65, 0x8a, - 0x3a, 0x30, 0xbe, 0x13, 0xb7, 0xb7, 0x88, 0x9c, 0xfa, 0x2c, 0x09, 0xe6, 0xe8, 0x95, 0xd7, 0x0a, - 0x32, 0x9b, 0x8a, 0x22, 0x5e, 0x94, 0x74, 0x1c, 0xbf, 0x4b, 0x83, 0xb1, 0x6c, 0x52, 0x6f, 0xea, - 0x6c, 0xb1, 0x59, 0x0b, 0xfd, 0x24, 0xef, 0x75, 0xc2, 0xf5, 0xdd, 0x84, 0x88, 0x24, 0x99, 0x05, - 0x9f, 0xe4, 0x0d, 0x4e, 0xdc, 0xfd, 0x49, 0x04, 0x02, 0x4b, 0x76, 0x6a, 0xc8, 0x98, 0x36, 0x9e, - 0x2a, 0x3d, 0x64, 0x5d, 0x7d, 0x48, 0x87, 0x8c, 0x69, 0xdf, 0x94, 0x29, 0xd3, 0xba, 0xed, 0xad, - 0x30, 0x09, 0x83, 0x8c, 0xee, 0x3f, 0x51, 0x46, 0xeb, 0x36, 0x72, 0x4a, 0x76, 0x6b, 0xdd, 0x3c, - 0x2a, 0x9c, 0x5b, 0xab, 0xfd, 0x07, 0x83, 0xdd, 0xeb, 0x2d, 0x33, 0x87, 0x7f, 0xa9, 0xfb, 0x74, - 0xf5, 0x73, 0xfd, 0x6f, 0xf7, 0x1e, 0xe2, 0x39, 0xeb, 0x37, 0x2c, 0x38, 0xd3, 0xce, 0x5d, 0x4c, - 0xc5, 0x82, 0xd5, 0xef, 0xae, 0x91, 0x0f, 0x98, 0xca, 0x00, 0x9b, 0x8f, 0xc7, 0x3d, 0xea, 0xcc, - 0x5a, 0xa0, 0xd5, 0x0f, 0x6d, 0x81, 0xde, 0x81, 0x11, 0x66, 0x34, 0xa5, 0x29, 0x48, 0xfa, 0xcc, - 0xda, 0xc1, 0x96, 0xbe, 0x45, 0xc1, 0x02, 0x2b, 0x66, 0x74, 0xe0, 0x9e, 0xcc, 0x76, 0x02, 0x13, - 0x86, 0x16, 0xa9, 0x6b, 0xb9, 0x6b, 0x62, 0x59, 0x8c, 0xc4, 0x93, 0x8d, 0x83, 0x88, 0x1f, 0x14, - 0x11, 0xe0, 0x83, 0x2b, 0x3b, 0x4e, 0x8b, 0xf6, 0x9f, 0x58, 0x39, 0xf6, 0x17, 0xdf, 0x83, 0xbc, - 0x66, 0xee, 0x41, 0xce, 0x67, 0xf7, 0x20, 0x5d, 0x1e, 0x03, 0x63, 0xfb, 0x51, 0x3e, 0x7d, 0x63, - 0xd9, 0x1c, 0x29, 0xb6, 0x0f, 0xe7, 0x8a, 0x26, 0x37, 0x8b, 0x63, 0x72, 0xd5, 0xa1, 0x60, 0x1a, - 0xc7, 0xe4, 0xae, 0xd4, 0x31, 0xc3, 0x94, 0xbd, 0x05, 0x6f, 0xff, 0x1f, 0x0b, 0xaa, 0x8d, 0xd0, - 0x3d, 0x42, 0x0f, 0xc8, 0x55, 0xc3, 0x03, 0xf2, 0x74, 0xe1, 0xd3, 0x47, 0x3d, 0xfd, 0x1d, 0xb7, - 0x32, 0xfe, 0x8e, 0x4f, 0x14, 0xb3, 0x3a, 0xd8, 0xbb, 0xf1, 0xbd, 0x2a, 0xe8, 0x8f, 0x37, 0xa1, - 0xdf, 0x3e, 0x4c, 0x64, 0x6b, 0xb5, 0xdc, 0x7b, 0x4e, 0xa2, 0x0e, 0x16, 0x00, 0x25, 0xaf, 0xbd, - 0xfd, 0xd4, 0x06, 0xb8, 0xde, 0x21, 0xde, 0xe6, 0x56, 0x42, 0xdc, 0x6c, 0xc7, 0x8e, 0x2f, 0xc0, - 0xf5, 0xbf, 0x5b, 0x30, 0x99, 0xa9, 0x1d, 0x6d, 0xe7, 0xdd, 0x9c, 0x39, 0xac, 0x4b, 0xe3, 0x44, - 0xe1, 0x5d, 0x9b, 0x39, 0x00, 0xe5, 0x86, 0x97, 0x8e, 0x07, 0x66, 0x84, 0x29, 0x3f, 0x7d, 0x8c, - 0x35, 0x0a, 0xf4, 0x12, 0x8c, 0x26, 0x61, 0x3b, 0xf4, 0xc3, 0xcd, 0xdd, 0xeb, 0x44, 0x26, 0x66, - 0x50, 0x47, 0x18, 0x6b, 0x29, 0x0a, 0xeb, 0x74, 0xf6, 0x0f, 0xaa, 0x90, 0x7d, 0xfb, 0xeb, 0xcf, - 0x05, 0xf5, 0xa7, 0x47, 0x50, 0x7f, 0xcf, 0x82, 0x29, 0x5a, 0x3b, 0x8b, 0x5f, 0x91, 0x61, 0xa8, - 0x2a, 0xeb, 0xba, 0x75, 0x40, 0xd6, 0xf5, 0xf3, 0x54, 0xdd, 0xb9, 0x61, 0x47, 0x66, 0x02, 0xd2, - 0xb4, 0x18, 0x85, 0x62, 0x81, 0x15, 0x74, 0x24, 0x8a, 0xc4, 0x1d, 0x1d, 0x9d, 0x8e, 0x44, 0x11, - 0x16, 0x58, 0x99, 0x94, 0x7d, 0x20, 0x3f, 0x29, 0x3b, 0x4f, 0x9c, 0x24, 0xe2, 0x26, 0x84, 0x1d, - 0xa0, 0x25, 0x4e, 0x92, 0x01, 0x15, 0x29, 0x8d, 0xfd, 0x2f, 0xab, 0x30, 0xd6, 0x08, 0xdd, 0x34, - 0xc4, 0xfc, 0x45, 0x23, 0xc4, 0xfc, 0x5c, 0x26, 0xc4, 0x7c, 0x4a, 0xa7, 0x7d, 0x38, 0x11, 0xe6, - 0x22, 0xc5, 0x16, 0x7b, 0x36, 0xe0, 0xb0, 0xd1, 0xe5, 0x46, 0x8a, 0x2d, 0xc5, 0x09, 0x9b, 0x8c, - 0xff, 0x4c, 0x45, 0x95, 0xff, 0x89, 0x05, 0x13, 0x8d, 0xd0, 0xa5, 0x22, 0xfa, 0x67, 0x49, 0x1e, - 0xf5, 0xc4, 0x5c, 0x43, 0x07, 0x24, 0xe6, 0xfa, 0x35, 0x0b, 0x86, 0x1b, 0xa1, 0x7b, 0x1c, 0xae, - 0xc4, 0x65, 0xd3, 0x95, 0xf8, 0xb1, 0x42, 0xe5, 0xdb, 0xc3, 0x7b, 0xf8, 0x9b, 0x55, 0x18, 0xa7, - 0x4d, 0x0e, 0x37, 0xe5, 0x07, 0x33, 0x06, 0xc7, 0x2a, 0x31, 0x38, 0xd4, 0x1c, 0x0c, 0x7d, 0x3f, - 0xbc, 0x97, 0xfd, 0x78, 0xcb, 0x0c, 0x8a, 0x05, 0x16, 0x5d, 0x84, 0x91, 0x76, 0x44, 0x76, 0xbc, - 0xb0, 0x13, 0x67, 0xaf, 0xfc, 0x35, 0x04, 0x1c, 0x2b, 0x0a, 0xf4, 0x22, 0x8c, 0xc5, 0x5e, 0xd0, - 0x22, 0x32, 0xb0, 0x62, 0x80, 0x05, 0x56, 0xf0, 0xfc, 0x87, 0x1a, 0x1c, 0x1b, 0x54, 0xe8, 0x2d, - 0xa8, 0xb1, 0xff, 0x6c, 0x0e, 0x1d, 0x22, 0x53, 0x3c, 0x4f, 0xce, 0x25, 0x39, 0xe0, 0x94, 0x19, - 0xba, 0x02, 0x90, 0xc8, 0x18, 0x90, 0x58, 0x9c, 0x99, 0x2a, 0xe3, 0x54, 0x45, 0x87, 0xc4, 0x58, - 0xa3, 0x42, 0xcf, 0x41, 0x2d, 0x71, 0x3c, 0xff, 0x86, 0x17, 0x90, 0x58, 0x44, 0xd1, 0x88, 0x3c, - 0xbe, 0x02, 0x88, 0x53, 0x3c, 0x5d, 0xf3, 0xd9, 0x85, 0x63, 0xfe, 0x0e, 0xc5, 0x08, 0xa3, 0x66, - 0x6b, 0xfe, 0x0d, 0x05, 0xc5, 0x1a, 0x85, 0xfd, 0x02, 0x5b, 0xbb, 0xfb, 0xbc, 0x82, 0xf0, 0x93, - 0x0a, 0xa0, 0x06, 0x8b, 0x35, 0x31, 0x9e, 0xea, 0xd8, 0x82, 0x89, 0x98, 0xdc, 0xf0, 0x82, 0xce, - 0x7d, 0xc1, 0xaa, 0xdc, 0xa5, 0x8f, 0xe6, 0x92, 0x5e, 0x86, 0x5f, 0xb2, 0x35, 0x61, 0x38, 0xc3, - 0x97, 0x0e, 0x49, 0xd4, 0x09, 0xe6, 0xe3, 0xdb, 0x31, 0x89, 0xc4, 0x63, 0x1b, 0x6c, 0x48, 0xb0, - 0x04, 0xe2, 0x14, 0x4f, 0x65, 0x80, 0xfd, 0xb9, 0x19, 0x06, 0x38, 0x0c, 0x13, 0x29, 0x35, 0x2c, - 0xf3, 0xba, 0x06, 0xc7, 0x06, 0x15, 0x5a, 0x06, 0x14, 0x77, 0xda, 0x6d, 0x9f, 0x1d, 0x6d, 0x39, - 0xfe, 0xd5, 0x28, 0xec, 0xb4, 0x79, 0xb8, 0xb1, 0x48, 0x5a, 0xde, 0xec, 0xc2, 0xe2, 0x9c, 0x12, - 0x74, 0xd2, 0x6f, 0xc4, 0xec, 0xb7, 0xb8, 0x44, 0xcc, 0x1d, 0x6c, 0x4d, 0x06, 0xc2, 0x12, 0x67, - 0x77, 0xd8, 0x52, 0xc5, 0x1e, 0x41, 0x48, 0x3a, 0x11, 0x41, 0x04, 0xc6, 0xdb, 0x6c, 0x39, 0x92, - 0xe7, 0xeb, 0xa5, 0x86, 0x32, 0x13, 0xed, 0xc2, 0x93, 0x9d, 0xeb, 0x6c, 0xb0, 0xc9, 0xd5, 0xfe, - 0x4f, 0xc0, 0x74, 0x8d, 0x38, 0x55, 0x1c, 0x16, 0xb1, 0xac, 0xc2, 0x16, 0xfb, 0x78, 0x99, 0x57, - 0x7f, 0x52, 0x3d, 0x2e, 0x22, 0x63, 0xb1, 0xe4, 0x82, 0xbe, 0xc4, 0x03, 0x04, 0xd8, 0xfc, 0x2e, - 0xff, 0x14, 0x17, 0xa7, 0x37, 0xa2, 0xb4, 0x05, 0x0b, 0xac, 0xb1, 0x43, 0x37, 0x60, 0x5c, 0x64, - 0xca, 0x17, 0x9e, 0x81, 0xaa, 0xb1, 0x3b, 0x1e, 0xc7, 0x3a, 0xf2, 0x41, 0x16, 0x80, 0xcd, 0xc2, - 0x68, 0x13, 0x9e, 0xd4, 0x9e, 0xcf, 0xc9, 0x89, 0xc8, 0xe2, 0x8a, 0xe3, 0x63, 0xfb, 0x7b, 0xb3, - 0x4f, 0xae, 0x1d, 0x44, 0x88, 0x0f, 0xe6, 0x83, 0x6e, 0xc1, 0x69, 0xa7, 0x95, 0x78, 0x3b, 0xa4, - 0x4e, 0x1c, 0xd7, 0xf7, 0x02, 0x62, 0xde, 0x30, 0x7f, 0x7c, 0x7f, 0x6f, 0xf6, 0xf4, 0x7c, 0x1e, - 0x01, 0xce, 0x2f, 0x87, 0x5e, 0x83, 0x9a, 0x1b, 0xc4, 0x62, 0x0c, 0x86, 0x8c, 0x97, 0x82, 0x6a, - 0xf5, 0x9b, 0x4d, 0xd5, 0xff, 0xf4, 0x0f, 0x4e, 0x0b, 0xa0, 0xf7, 0xf8, 0x03, 0xc6, 0x6a, 0x43, - 0xc2, 0x5f, 0xa8, 0x7a, 0xb9, 0xd4, 0x16, 0xd8, 0xb8, 0x05, 0xc2, 0x9d, 0x66, 0x2a, 0xf2, 0xd1, - 0xb8, 0x20, 0x62, 0x54, 0x81, 0x3e, 0x0f, 0x28, 0x26, 0xd1, 0x8e, 0xd7, 0x22, 0xf3, 0x2d, 0x96, - 0xf9, 0x93, 0x1d, 0xcf, 0x8d, 0x18, 0xe1, 0xff, 0xa8, 0xd9, 0x45, 0x81, 0x73, 0x4a, 0xa1, 0x6b, - 0x54, 0xe3, 0xe8, 0x50, 0x11, 0xa8, 0x2a, 0x4d, 0xbb, 0xe9, 0x3a, 0x69, 0x47, 0xa4, 0xe5, 0x24, - 0xc4, 0x35, 0x39, 0xe2, 0x4c, 0x39, 0xba, 0xac, 0xa8, 0x8c, 0xe6, 0x60, 0x86, 0x57, 0x76, 0x67, - 0x35, 0xa7, 0x3b, 0xa5, 0xad, 0x30, 0x4e, 0x6e, 0x92, 0xe4, 0x5e, 0x18, 0xdd, 0x65, 0xce, 0xf6, - 0x11, 0x2d, 0xd3, 0x59, 0x8a, 0xc2, 0x3a, 0x1d, 0xb5, 0x81, 0xd8, 0x29, 0xcf, 0x4a, 0x9d, 0xb9, - 0xd0, 0x47, 0xd2, 0xb9, 0x73, 0x8d, 0x83, 0xb1, 0xc4, 0x4b, 0xd2, 0x95, 0xc6, 0x22, 0x73, 0x87, - 0x67, 0x48, 0x57, 0x1a, 0x8b, 0x58, 0xe2, 0x51, 0xd8, 0xfd, 0x1e, 0xd3, 0x44, 0x99, 0xa3, 0x89, - 0x6e, 0x0d, 0x5e, 0xf2, 0x49, 0xa6, 0xfb, 0x30, 0xa5, 0xde, 0x84, 0xe2, 0x29, 0x28, 0xe3, 0xe9, - 0xc9, 0x32, 0xcf, 0x27, 0xe7, 0x66, 0xb2, 0x54, 0x91, 0xc9, 0x2b, 0x19, 0x9e, 0xb8, 0xab, 0x16, - 0x23, 0x53, 0xc2, 0x54, 0x61, 0x96, 0xfa, 0x4b, 0x50, 0x8b, 0x3b, 0xeb, 0x6e, 0xb8, 0xed, 0x78, - 0x01, 0xf3, 0x59, 0xeb, 0x8f, 0x01, 0x4b, 0x04, 0x4e, 0x69, 0x66, 0x3e, 0x0b, 0x27, 0xba, 0x64, - 0xba, 0xaf, 0x90, 0xba, 0x5f, 0x1a, 0x80, 0x9a, 0xf2, 0xea, 0xa0, 0x4b, 0xa6, 0xe3, 0xee, 0xf1, - 0xac, 0xe3, 0x6e, 0x84, 0xae, 0xbc, 0xba, 0xaf, 0xee, 0x9d, 0x9c, 0xd7, 0x40, 0x9f, 0x2d, 0xfc, - 0x88, 0xe5, 0x6f, 0xb6, 0xf4, 0xf1, 0x56, 0x6a, 0x6a, 0xd6, 0x0f, 0x1c, 0x68, 0xd6, 0x97, 0x7c, - 0xec, 0x89, 0x1a, 0xf0, 0xed, 0xd0, 0x5d, 0x69, 0x64, 0x1f, 0x32, 0x69, 0x50, 0x20, 0xe6, 0x38, - 0x66, 0x77, 0x51, 0xa5, 0xcc, 0xec, 0xae, 0xe1, 0xc3, 0xda, 0x5d, 0x92, 0x03, 0x4e, 0x99, 0xa1, - 0x1d, 0x38, 0xd1, 0x32, 0x1f, 0xa6, 0x51, 0x17, 0x56, 0x9e, 0xef, 0xe3, 0x61, 0x98, 0x8e, 0x96, - 0x84, 0x7f, 0x31, 0xcb, 0x0f, 0x77, 0x57, 0x61, 0xff, 0x80, 0x7b, 0x81, 0xc4, 0xb6, 0x90, 0xc4, - 0x1d, 0xff, 0x28, 0x73, 0x6a, 0xdf, 0x32, 0x76, 0xaa, 0x0f, 0xc1, 0xff, 0xf8, 0x5b, 0x16, 0xf3, - 0x3f, 0xae, 0x91, 0xed, 0xb6, 0xef, 0x24, 0x47, 0x19, 0xad, 0xf7, 0x25, 0x18, 0x49, 0x44, 0x2d, - 0xe5, 0x12, 0x81, 0x6b, 0xcd, 0x62, 0xfe, 0x58, 0xa5, 0x08, 0x24, 0x14, 0x2b, 0x86, 0xf6, 0xbf, - 0xe1, 0x5f, 0x41, 0x62, 0x8e, 0x63, 0x67, 0x75, 0xd3, 0xdc, 0x59, 0x3d, 0x53, 0xba, 0x33, 0x3d, - 0x76, 0x58, 0xdf, 0x35, 0xbb, 0xc0, 0x0c, 0xb6, 0x47, 0xdf, 0x23, 0x6e, 0xaf, 0x82, 0xf9, 0xd8, - 0x0e, 0x7a, 0x8d, 0x87, 0xaa, 0x72, 0x8d, 0xf8, 0x6c, 0x9f, 0x61, 0xaa, 0xf6, 0x6f, 0x54, 0xe0, - 0x54, 0xde, 0x1b, 0xfc, 0xc8, 0x85, 0xb1, 0xb6, 0x66, 0x3e, 0x97, 0xcb, 0xe7, 0xa0, 0x1b, 0xdc, - 0xa9, 0xe9, 0xa2, 0x43, 0xb1, 0xc1, 0x15, 0x11, 0x18, 0x23, 0x3b, 0x5e, 0x4b, 0xb9, 0x57, 0x2a, - 0xfd, 0xab, 0x28, 0x55, 0xcd, 0x92, 0xc6, 0x08, 0x1b, 0x6c, 0x8f, 0x20, 0x57, 0xbd, 0xfd, 0x8f, - 0x2c, 0x78, 0xac, 0x47, 0xd2, 0x07, 0x5a, 0xdd, 0x3d, 0xe6, 0x85, 0x14, 0x8f, 0x39, 0xa9, 0xea, - 0xb8, 0x6f, 0x12, 0x0b, 0x2c, 0x5a, 0x07, 0xe0, 0xbe, 0x45, 0xf6, 0xc2, 0x6d, 0xa5, 0x4c, 0x0c, - 0x40, 0xd7, 0xcd, 0x6a, 0xed, 0xd2, 0xad, 0x7a, 0xd3, 0x56, 0xe3, 0x6a, 0x7f, 0xa7, 0x0a, 0x83, - 0xfc, 0x91, 0xcd, 0x06, 0x0c, 0x6f, 0xf1, 0x1c, 0x93, 0xfd, 0xa5, 0xb8, 0x4c, 0xed, 0x24, 0x0e, - 0xc0, 0x92, 0x0d, 0x5a, 0x85, 0x93, 0x5e, 0xe0, 0x25, 0x9e, 0xe3, 0xd7, 0x89, 0xef, 0xec, 0x4a, - 0xc3, 0x9b, 0xe7, 0x17, 0x97, 0xa9, 0x70, 0x4f, 0xae, 0x74, 0x93, 0xe0, 0xbc, 0x72, 0xe8, 0xf5, - 0xae, 0x24, 0x51, 0x3c, 0x77, 0xa7, 0xba, 0xab, 0x75, 0x70, 0xa2, 0x28, 0xf4, 0x2a, 0x8c, 0xb7, - 0xbb, 0xb6, 0x18, 0xda, 0xeb, 0x8c, 0xe6, 0xb6, 0xc2, 0xa4, 0x45, 0x75, 0x98, 0x8a, 0x3b, 0xec, - 0x44, 0x76, 0x6d, 0x2b, 0x22, 0xf1, 0x56, 0xe8, 0xbb, 0xe2, 0x55, 0x31, 0x65, 0x4e, 0x35, 0x33, - 0x78, 0xdc, 0x55, 0x82, 0x72, 0xd9, 0x70, 0x3c, 0xbf, 0x13, 0x91, 0x94, 0xcb, 0x90, 0xc9, 0x65, - 0x39, 0x83, 0xc7, 0x5d, 0x25, 0xec, 0x3f, 0xb2, 0xe0, 0x64, 0x4e, 0xd8, 0x02, 0x8f, 0xa6, 0xdb, - 0xf4, 0xe2, 0x44, 0x65, 0x91, 0xd6, 0xa2, 0xe9, 0x38, 0x1c, 0x2b, 0x0a, 0x2a, 0x85, 0x7c, 0xdf, - 0x98, 0x3d, 0x0e, 0x14, 0x07, 0xb3, 0x02, 0xdb, 0x5f, 0xca, 0x27, 0x74, 0x0e, 0x06, 0x3a, 0x31, - 0x91, 0x2f, 0xbe, 0x2b, 0x0d, 0xc5, 0x5c, 0x04, 0x0c, 0x43, 0x0d, 0x93, 0x4d, 0xb5, 0x3b, 0xd7, - 0x0c, 0x13, 0xbe, 0x3f, 0xe7, 0x38, 0xfb, 0x5b, 0x55, 0x98, 0xcc, 0x84, 0x2f, 0xd1, 0x86, 0x6c, - 0x87, 0x81, 0x97, 0x84, 0x2a, 0xdb, 0x10, 0x73, 0x29, 0x2c, 0x92, 0xf6, 0xd6, 0xaa, 0x80, 0x63, - 0x45, 0x81, 0xce, 0x9b, 0x2f, 0x1e, 0xa7, 0x6d, 0x5e, 0xa8, 0x1b, 0x6f, 0xb9, 0x95, 0xcd, 0x6c, - 0xff, 0x14, 0x0c, 0xb4, 0x43, 0xf5, 0x34, 0xa7, 0x12, 0x7a, 0xbc, 0x50, 0x6f, 0x84, 0xa1, 0x8f, - 0x19, 0x12, 0x3d, 0x2d, 0x7a, 0x9f, 0x71, 0x4e, 0x62, 0xc7, 0x0d, 0x63, 0x6d, 0x08, 0x9e, 0x81, - 0xe1, 0xbb, 0x64, 0x37, 0xf2, 0x82, 0xcd, 0xac, 0x6b, 0xf6, 0x3a, 0x07, 0x63, 0x89, 0x37, 0xb3, - 0xd7, 0x0f, 0x1f, 0x71, 0xf6, 0xfa, 0x91, 0xc2, 0x10, 0xcc, 0x5f, 0xb5, 0x60, 0x92, 0xa5, 0xde, - 0x13, 0xd7, 0x60, 0xbd, 0x30, 0x38, 0xc2, 0x55, 0xf1, 0x29, 0x18, 0x8c, 0x68, 0x65, 0xd9, 0xc4, - 0xd3, 0xac, 0x05, 0x98, 0xe3, 0xd0, 0x13, 0xe2, 0xe1, 0x78, 0xfa, 0xf9, 0xc6, 0x78, 0x22, 0xdf, - 0xf4, 0x05, 0x78, 0x16, 0xe0, 0x8f, 0x49, 0xdb, 0xf7, 0x78, 0x63, 0x53, 0x4f, 0xcc, 0xa3, 0x12, - 0xe0, 0x9f, 0xdb, 0xb8, 0x87, 0x15, 0xe0, 0x9f, 0xcf, 0xfc, 0x60, 0x13, 0xf4, 0x7f, 0x56, 0xe0, - 0x6c, 0x6e, 0xb9, 0xf4, 0x58, 0x67, 0xd9, 0x38, 0xd6, 0xb9, 0x92, 0x39, 0xd6, 0xb1, 0x0f, 0x2e, - 0xfd, 0x70, 0x0e, 0x7a, 0xf2, 0x8f, 0x5f, 0xaa, 0xc7, 0x79, 0xfc, 0x32, 0x50, 0xd6, 0x56, 0x18, - 0x2c, 0xb0, 0x15, 0x7e, 0xd7, 0x82, 0xc7, 0x73, 0xc7, 0xec, 0xd1, 0xbb, 0x52, 0x91, 0xdb, 0xcc, - 0x1e, 0x16, 0xf4, 0xdf, 0xa8, 0xf6, 0xe8, 0x16, 0xb3, 0xa5, 0x2f, 0x50, 0xbd, 0xc3, 0x90, 0xb1, - 0x30, 0x83, 0xc6, 0xb8, 0xce, 0xe1, 0x30, 0xac, 0xb0, 0x28, 0xd6, 0xae, 0x24, 0xf0, 0x46, 0x2e, - 0x1d, 0x72, 0x4a, 0xcd, 0x99, 0xce, 0x33, 0xfd, 0x3e, 0x6f, 0xe6, 0x9e, 0x02, 0xba, 0xa3, 0x6d, - 0x8f, 0xaa, 0x87, 0xd9, 0x1e, 0x8d, 0xe5, 0x6f, 0x8d, 0xd0, 0x3c, 0x4c, 0x6e, 0x7b, 0x01, 0x7b, - 0x3a, 0xce, 0xb4, 0x43, 0xd4, 0x2d, 0xb8, 0x55, 0x13, 0x8d, 0xb3, 0xf4, 0x33, 0xaf, 0xc2, 0xf8, - 0xe1, 0x3d, 0x26, 0x1f, 0x54, 0xe1, 0xa3, 0x07, 0xa8, 0x05, 0xbe, 0x1e, 0x18, 0xdf, 0x45, 0x5b, - 0x0f, 0xba, 0xbe, 0x4d, 0x03, 0x4e, 0x6d, 0x74, 0x7c, 0x7f, 0x97, 0x85, 0x45, 0x10, 0x57, 0x52, - 0x08, 0x1b, 0x4f, 0x3d, 0xea, 0xba, 0x9c, 0x43, 0x83, 0x73, 0x4b, 0xa2, 0xcf, 0x03, 0x0a, 0xd7, - 0x59, 0x3e, 0x4a, 0x37, 0xbd, 0xb1, 0xcc, 0x3e, 0x41, 0x35, 0x9d, 0xab, 0xb7, 0xba, 0x28, 0x70, - 0x4e, 0x29, 0x6a, 0xf1, 0xb1, 0xf7, 0x60, 0x55, 0xb3, 0x32, 0x16, 0x1f, 0xd6, 0x91, 0xd8, 0xa4, - 0x45, 0x57, 0xe1, 0x84, 0xb3, 0xe3, 0x78, 0x3c, 0xdb, 0x8c, 0x64, 0xc0, 0x4d, 0x3e, 0xe5, 0x92, - 0x98, 0xcf, 0x12, 0xe0, 0xee, 0x32, 0xa8, 0x6d, 0x38, 0x99, 0x78, 0xfe, 0xe9, 0xd7, 0x0e, 0x21, - 0xc1, 0xa5, 0xdd, 0x4e, 0xf6, 0x1f, 0x5a, 0x74, 0xd1, 0xcb, 0x79, 0x6a, 0xcd, 0x78, 0xa1, 0x5c, - 0xbb, 0xa5, 0xd1, 0xfd, 0x42, 0x39, 0xf3, 0xbf, 0x9a, 0xb4, 0x5c, 0x34, 0xe2, 0x34, 0xac, 0xd2, - 0xb0, 0x2f, 0xc5, 0xed, 0x24, 0x45, 0x81, 0xee, 0xc0, 0xb0, 0xeb, 0xed, 0x78, 0x71, 0x18, 0x95, - 0x78, 0x10, 0xb8, 0x2b, 0x54, 0x2f, 0x55, 0x97, 0x75, 0xce, 0x04, 0x4b, 0x6e, 0xf6, 0xdf, 0xaa, - 0xc0, 0xb8, 0xac, 0xef, 0x8d, 0x4e, 0xc8, 0x74, 0xd8, 0x51, 0x2d, 0xe5, 0x6f, 0x18, 0x4b, 0xf9, - 0xa5, 0x72, 0x57, 0xb4, 0x58, 0xa3, 0x7a, 0x2e, 0xe1, 0x5f, 0xc8, 0x2c, 0xe1, 0x97, 0xfb, 0x61, - 0x5a, 0xe8, 0x3d, 0x3a, 0x61, 0xd0, 0x3f, 0x42, 0xf9, 0x8f, 0xf3, 0xba, 0xd3, 0x63, 0xe1, 0xf8, - 0x4e, 0x25, 0xd3, 0x0d, 0xb6, 0x60, 0x7c, 0x0d, 0x06, 0xb6, 0x9c, 0xc8, 0x2d, 0x97, 0x6f, 0xad, - 0xab, 0xf8, 0xdc, 0x35, 0x27, 0x72, 0xb9, 0xda, 0xbf, 0xa8, 0x1e, 0x6a, 0x71, 0x22, 0xb7, 0x30, - 0xc8, 0x98, 0x55, 0x8a, 0x5e, 0x81, 0xa1, 0xb8, 0x15, 0xb6, 0x55, 0x54, 0xd7, 0x39, 0xfe, 0x88, - 0x0b, 0x85, 0x3c, 0xd8, 0x9b, 0x45, 0x66, 0x75, 0x14, 0x8c, 0x05, 0xfd, 0x0c, 0x81, 0x9a, 0xaa, - 0xfa, 0x08, 0xc3, 0x59, 0x3f, 0xa8, 0xc2, 0xc9, 0x1c, 0x51, 0x41, 0x3f, 0x63, 0x8c, 0xda, 0xab, - 0x7d, 0xcb, 0xda, 0x87, 0x1c, 0xb7, 0x9f, 0x61, 0x1b, 0x22, 0x57, 0xc8, 0xc6, 0x21, 0xaa, 0xbf, - 0x1d, 0x93, 0x6c, 0xf5, 0x14, 0x54, 0x5c, 0x3d, 0xad, 0xf6, 0x98, 0x06, 0x9f, 0x56, 0xa3, 0xda, - 0x79, 0x84, 0xdf, 0xf8, 0xfd, 0x01, 0x38, 0x95, 0x77, 0x0d, 0x14, 0xfd, 0xbc, 0x95, 0xc9, 0xa0, - 0xfe, 0x7a, 0xff, 0x77, 0x49, 0x79, 0x5a, 0x75, 0x91, 0x1e, 0x62, 0xce, 0xcc, 0xa9, 0x5e, 0x38, - 0xda, 0xa2, 0x76, 0x76, 0x31, 0x20, 0xe2, 0xc9, 0xf0, 0xa5, 0x3e, 0xf8, 0xdc, 0x21, 0x9a, 0x22, - 0xf2, 0xe9, 0xc7, 0x99, 0x8b, 0x01, 0x12, 0x5c, 0x7c, 0x31, 0x40, 0xb6, 0x61, 0x66, 0x13, 0x46, - 0xb5, 0x7e, 0x1d, 0xa1, 0x08, 0x78, 0x74, 0x4d, 0xd2, 0x5a, 0x7d, 0x84, 0x62, 0xf0, 0x77, 0x2c, - 0xc8, 0x84, 0x6b, 0x28, 0xaf, 0x8b, 0xd5, 0xd3, 0xeb, 0x72, 0x0e, 0x06, 0xa2, 0xd0, 0x27, 0xd9, - 0xd4, 0xde, 0x38, 0xf4, 0x09, 0x66, 0x18, 0xf5, 0x1c, 0x64, 0xb5, 0xd7, 0x73, 0x90, 0x74, 0x3b, - 0xee, 0x93, 0x1d, 0x22, 0x7d, 0x20, 0x4a, 0x79, 0xdf, 0xa0, 0x40, 0xcc, 0x71, 0xf6, 0x8f, 0xaa, - 0x30, 0xc4, 0x1d, 0x0d, 0x47, 0xb8, 0x2c, 0x37, 0xc4, 0x9e, 0xbf, 0xd4, 0x85, 0x4c, 0xde, 0x9a, - 0xb9, 0xba, 0x93, 0x38, 0x5c, 0xa0, 0x54, 0xdf, 0x52, 0x3f, 0x01, 0x9a, 0x33, 0x7a, 0x3f, 0x93, - 0xd9, 0xd2, 0x02, 0xe7, 0xa1, 0x8d, 0xc5, 0x16, 0x40, 0xcc, 0x5e, 0x06, 0xa3, 0x3c, 0x44, 0x52, - 0xbc, 0x17, 0x4b, 0xb5, 0xa3, 0xa9, 0x8a, 0xf1, 0xd6, 0xa4, 0xd9, 0xb8, 0x14, 0x02, 0x6b, 0xbc, - 0x67, 0x5e, 0x86, 0x9a, 0x22, 0x2e, 0xb2, 0xf4, 0xc7, 0x74, 0x91, 0xfc, 0x0b, 0x30, 0x99, 0xa9, - 0xab, 0xaf, 0x8d, 0xc2, 0xf7, 0x2d, 0x38, 0xd1, 0xf5, 0x92, 0x2d, 0x7a, 0xdf, 0x82, 0x53, 0x7e, - 0x8e, 0x87, 0x49, 0x7c, 0xe0, 0xc3, 0xf8, 0xa6, 0xd4, 0x2e, 0x21, 0x0f, 0x8b, 0x73, 0x6b, 0x93, - 0x69, 0x3e, 0x2b, 0xf9, 0x69, 0x3e, 0xd9, 0x73, 0x48, 0xbc, 0xed, 0xc7, 0x61, 0x01, 0xad, 0x98, - 0x16, 0xd0, 0xc7, 0xcb, 0x88, 0x41, 0x0f, 0xd3, 0xe7, 0xdf, 0x5b, 0x80, 0x38, 0x41, 0xf6, 0x85, - 0x40, 0xee, 0xb1, 0xd3, 0x6c, 0xf6, 0x54, 0x6e, 0x14, 0x06, 0x6b, 0x54, 0x7d, 0x66, 0x7f, 0x57, - 0x2f, 0x6b, 0x95, 0x7b, 0xbe, 0xbf, 0x5a, 0xe2, 0xf9, 0xfe, 0xdf, 0xaa, 0x42, 0x36, 0xb4, 0x01, - 0x7d, 0x19, 0xc6, 0x5a, 0x4e, 0xdb, 0x59, 0xf7, 0x7c, 0x2f, 0xf1, 0x48, 0x5c, 0xee, 0xd8, 0x68, - 0x51, 0x2b, 0x21, 0x7c, 0xbe, 0x1a, 0x04, 0x1b, 0x1c, 0xd1, 0x1c, 0x40, 0x3b, 0xf2, 0x76, 0x3c, - 0x9f, 0x6c, 0x32, 0xbb, 0x43, 0x25, 0x49, 0x69, 0x28, 0x28, 0xd6, 0x28, 0x72, 0x62, 0xe8, 0xaa, - 0xc7, 0x11, 0x43, 0x37, 0xd0, 0x67, 0x0c, 0xdd, 0x60, 0xa9, 0x18, 0x3a, 0x0c, 0x67, 0xa4, 0xab, - 0x96, 0xfe, 0x5f, 0xf6, 0x7c, 0xc2, 0xf3, 0xfa, 0x89, 0xc8, 0xc7, 0x99, 0xfd, 0xbd, 0xd9, 0x33, - 0x38, 0x97, 0x02, 0xf7, 0x28, 0x69, 0x77, 0xe0, 0x64, 0x93, 0x44, 0x1e, 0x4b, 0xbb, 0xe4, 0xa6, - 0x33, 0xf0, 0x1d, 0xa8, 0x45, 0x99, 0xc9, 0xdf, 0xe7, 0x9d, 0x34, 0x2d, 0x79, 0x85, 0x9c, 0xec, - 0x29, 0x4b, 0xfb, 0xaf, 0x54, 0x60, 0x58, 0x84, 0x10, 0x1d, 0xe1, 0x42, 0x72, 0xdd, 0xd8, 0xdf, - 0x3d, 0x53, 0x34, 0x73, 0x59, 0x73, 0x7a, 0xee, 0xec, 0x9a, 0x99, 0x9d, 0xdd, 0x73, 0xe5, 0xd8, - 0x1d, 0xbc, 0xa7, 0xfb, 0x61, 0x05, 0x26, 0xcc, 0x50, 0xaa, 0x23, 0x1c, 0x8e, 0xb7, 0x60, 0x38, - 0x16, 0xf1, 0x45, 0x95, 0x32, 0xb1, 0x1a, 0xd9, 0x4f, 0xaa, 0x36, 0xed, 0x32, 0xa2, 0x48, 0xb2, - 0xcb, 0x0d, 0x61, 0xaa, 0x1e, 0x47, 0x08, 0x93, 0xfd, 0x23, 0xa6, 0x52, 0xf5, 0x01, 0x3c, 0x8e, - 0x35, 0xe1, 0x0d, 0x53, 0xfb, 0x5e, 0x2c, 0x25, 0x0a, 0xa2, 0x7d, 0x3d, 0xd6, 0x86, 0xef, 0x59, - 0x30, 0x2a, 0x08, 0x8f, 0xa3, 0x07, 0x9f, 0x37, 0x7b, 0xf0, 0x74, 0xa9, 0x1e, 0xf4, 0x68, 0xfa, - 0xdf, 0xab, 0xa8, 0xa6, 0x37, 0xc4, 0xcb, 0xa9, 0x85, 0x89, 0x1e, 0x47, 0xda, 0x51, 0x98, 0x84, - 0xad, 0xd0, 0x17, 0xab, 0xfc, 0x13, 0x69, 0xd4, 0x39, 0x87, 0x3f, 0xd0, 0x7e, 0x63, 0x45, 0xcd, - 0xa2, 0xa9, 0xc3, 0x28, 0x11, 0x4b, 0x54, 0xde, 0xbb, 0xad, 0xeb, 0xf2, 0x5d, 0x6c, 0x0a, 0x13, - 0x57, 0x36, 0xfa, 0x7d, 0x0f, 0x36, 0x8d, 0x21, 0x57, 0x9c, 0xb0, 0xc6, 0x55, 0x86, 0x37, 0xb2, - 0x1a, 0x06, 0x4d, 0x37, 0xea, 0x4d, 0x01, 0xc7, 0x8a, 0xc2, 0x7e, 0x99, 0xe9, 0x58, 0x36, 0x3c, - 0xfd, 0x05, 0x86, 0xff, 0xe2, 0x90, 0x1a, 0x58, 0xe6, 0x24, 0xb9, 0x09, 0x83, 0xb4, 0x8b, 0x72, - 0x1f, 0x58, 0x4e, 0xa1, 0xd1, 0x26, 0xe8, 0x01, 0x62, 0x51, 0x12, 0x63, 0xce, 0x06, 0x91, 0x2e, - 0xdf, 0xfb, 0xcb, 0xa5, 0x75, 0x64, 0x1f, 0xde, 0x76, 0x96, 0x38, 0x86, 0x25, 0xcb, 0x58, 0x69, - 0x64, 0x93, 0x73, 0x2e, 0x4a, 0x04, 0x4e, 0x69, 0xd0, 0x25, 0x61, 0xae, 0x9b, 0xcf, 0xea, 0x4a, - 0x73, 0x5d, 0x0e, 0x89, 0x66, 0xaf, 0x5f, 0x86, 0x51, 0x95, 0x9e, 0xbc, 0xc1, 0xb3, 0x4c, 0xd7, - 0xb8, 0xfd, 0xb2, 0x94, 0x82, 0xb1, 0x4e, 0x83, 0x56, 0xe0, 0xa4, 0xab, 0xa2, 0x59, 0x1b, 0x9d, - 0x75, 0xdf, 0x6b, 0xd1, 0xa2, 0xfc, 0x26, 0xc9, 0x63, 0xfb, 0x7b, 0xb3, 0x27, 0xeb, 0xdd, 0x68, - 0x9c, 0x57, 0x06, 0xad, 0xc1, 0x64, 0xcc, 0xd3, 0xb0, 0xcb, 0x3b, 0x67, 0x22, 0x7b, 0xdd, 0xb3, - 0xd2, 0xe9, 0xdf, 0x34, 0xd1, 0x0f, 0x18, 0x88, 0x2b, 0x05, 0x01, 0xc2, 0x59, 0x16, 0xe8, 0x75, - 0x98, 0xf0, 0xf5, 0x57, 0xa5, 0x1a, 0x22, 0xa8, 0x57, 0x05, 0x44, 0x18, 0x6f, 0x4e, 0x35, 0x70, - 0x86, 0x1a, 0xbd, 0x05, 0xd3, 0x3a, 0x44, 0x5c, 0x6a, 0x77, 0x82, 0x4d, 0x12, 0x8b, 0xfc, 0xcf, - 0x4f, 0xec, 0xef, 0xcd, 0x4e, 0xdf, 0xe8, 0x41, 0x83, 0x7b, 0x96, 0x46, 0xaf, 0xc0, 0x98, 0x1c, - 0x49, 0x2d, 0xc0, 0x37, 0x0d, 0xc5, 0xd1, 0x70, 0xd8, 0xa0, 0xfc, 0x70, 0x67, 0x1b, 0x5f, 0xa3, - 0x85, 0xb5, 0x45, 0x15, 0x7d, 0x05, 0xc6, 0xf4, 0x36, 0x0a, 0x35, 0xf9, 0xc9, 0xf2, 0x2f, 0x75, - 0x89, 0xc5, 0x59, 0xb5, 0x5c, 0xc7, 0x61, 0x83, 0xb7, 0x7d, 0x0b, 0x86, 0x9a, 0xbb, 0x71, 0x2b, - 0xf1, 0x1f, 0xd6, 0x8b, 0xca, 0x2d, 0x98, 0xcc, 0x3c, 0x3d, 0xac, 0xde, 0xb0, 0xb6, 0x1e, 0xd6, - 0x1b, 0xd6, 0xf6, 0xd7, 0x2d, 0x18, 0x5c, 0x73, 0xbc, 0xe2, 0x97, 0x13, 0xca, 0x34, 0x19, 0xbd, - 0x04, 0x43, 0x64, 0x63, 0x83, 0xb4, 0xe4, 0x9b, 0xd8, 0x4f, 0x4a, 0xa3, 0x66, 0x89, 0x41, 0xe9, - 0xd4, 0x64, 0x95, 0xf1, 0xbf, 0x58, 0x10, 0xdb, 0xff, 0xd1, 0x02, 0x58, 0x0b, 0x7d, 0x79, 0x6c, - 0x53, 0xd0, 0x92, 0x85, 0xae, 0x37, 0x1c, 0xce, 0xe7, 0xbc, 0xe1, 0x80, 0x52, 0x86, 0x39, 0x2f, - 0x38, 0xa8, 0xde, 0x54, 0x4b, 0xf5, 0x66, 0xa0, 0x9f, 0xde, 0x7c, 0xd3, 0x02, 0x11, 0x43, 0x53, - 0x42, 0x12, 0x5c, 0x99, 0x77, 0xdd, 0x48, 0x57, 0xf1, 0x6c, 0x99, 0x8b, 0x20, 0x22, 0x49, 0x85, - 0x92, 0x4d, 0x23, 0x35, 0x85, 0xc1, 0x95, 0xee, 0xe5, 0x47, 0x39, 0x7a, 0x95, 0x59, 0x90, 0xc5, - 0xed, 0xea, 0x2b, 0x33, 0x17, 0x4b, 0x4b, 0x4e, 0x19, 0xab, 0x04, 0x4d, 0x7a, 0x5a, 0x72, 0x89, - 0xc0, 0x29, 0x0d, 0x7a, 0x06, 0x86, 0xe3, 0xce, 0x3a, 0x23, 0xcf, 0x04, 0xd4, 0x34, 0x39, 0x18, - 0x4b, 0xbc, 0xfd, 0x73, 0x08, 0x8c, 0xae, 0x19, 0xc9, 0xa0, 0xac, 0x87, 0x9e, 0x0c, 0xea, 0x6d, - 0x18, 0x21, 0xdb, 0xed, 0x64, 0xb7, 0xee, 0x45, 0xe5, 0x12, 0xf3, 0x2d, 0x09, 0xea, 0x6e, 0xee, - 0x12, 0x83, 0x15, 0xc7, 0x1e, 0xa9, 0xbd, 0xaa, 0x8f, 0x44, 0x6a, 0xaf, 0x81, 0x3f, 0x95, 0xd4, - 0x5e, 0x6f, 0xc1, 0xf0, 0xa6, 0x97, 0x60, 0xd2, 0x0e, 0xc5, 0xc5, 0xbf, 0x82, 0xf3, 0xb0, 0xab, - 0x9c, 0xb8, 0x3b, 0x5f, 0x8f, 0x40, 0x60, 0xc9, 0x0e, 0xad, 0xc1, 0x10, 0xdf, 0x7d, 0x88, 0x6c, - 0x59, 0x9f, 0x2c, 0xe3, 0x97, 0xe9, 0x4e, 0x1c, 0x25, 0xa2, 0xa6, 0x04, 0x2f, 0x99, 0xca, 0x6b, - 0xf8, 0xc3, 0xa7, 0xf2, 0x52, 0x09, 0xb8, 0x46, 0x1e, 0x56, 0x02, 0x2e, 0x23, 0x91, 0x59, 0xed, - 0x28, 0x12, 0x99, 0x7d, 0xd3, 0x82, 0xd3, 0xed, 0xbc, 0x3c, 0x80, 0x22, 0x95, 0xd6, 0x67, 0x0f, - 0x91, 0x17, 0xd1, 0xa8, 0x9a, 0xdd, 0xc7, 0xca, 0x25, 0xc3, 0xf9, 0x15, 0xcb, 0x8c, 0x68, 0xa3, - 0x1f, 0x3e, 0x23, 0xda, 0x51, 0xe7, 0xdc, 0x4a, 0xf3, 0xa3, 0x8d, 0x1f, 0x49, 0x7e, 0xb4, 0x89, - 0x87, 0x98, 0x1f, 0x4d, 0xcb, 0x6c, 0x36, 0xf9, 0x70, 0x33, 0x9b, 0x6d, 0xc1, 0xa8, 0x1b, 0xde, - 0x0b, 0xee, 0x39, 0x91, 0x3b, 0xdf, 0x58, 0x11, 0x89, 0xb4, 0x0a, 0x92, 0x36, 0xd4, 0xd3, 0x02, - 0x46, 0x0d, 0xdc, 0x01, 0x99, 0x22, 0xb1, 0xce, 0x5a, 0xe4, 0x78, 0x3b, 0xf1, 0x21, 0x73, 0xbc, - 0x19, 0x99, 0xd2, 0xd0, 0x51, 0x64, 0x4a, 0xfb, 0x32, 0xbb, 0xba, 0xbd, 0xe1, 0x6d, 0xae, 0x3a, - 0xed, 0xe9, 0x93, 0x65, 0x6a, 0x58, 0x94, 0xe4, 0xdd, 0x35, 0x28, 0x14, 0x4e, 0x99, 0x76, 0xe7, - 0x62, 0x3b, 0x75, 0xdc, 0xb9, 0xd8, 0x4e, 0x1f, 0x61, 0x2e, 0xb6, 0x33, 0xc7, 0x9a, 0x8b, 0xed, - 0xb1, 0x3f, 0x95, 0x5c, 0x6c, 0x7f, 0x09, 0xce, 0x1e, 0xfc, 0x39, 0xd2, 0x6c, 0xbf, 0x8d, 0xd4, - 0x65, 0x90, 0xc9, 0xf6, 0xcb, 0x4c, 0x1d, 0x8d, 0xaa, 0x74, 0x4a, 0xa8, 0x7f, 0x61, 0xc1, 0x63, - 0x3d, 0x12, 0xa7, 0x94, 0xbe, 0xcd, 0xd0, 0x86, 0xc9, 0xb6, 0x59, 0xb4, 0xf4, 0xbd, 0x23, 0x23, - 0x51, 0x8b, 0x8a, 0x93, 0xcb, 0x20, 0x70, 0x96, 0xfd, 0xc2, 0xc7, 0x7f, 0xfc, 0xc1, 0xd9, 0x8f, - 0xfc, 0xe4, 0x83, 0xb3, 0x1f, 0xf9, 0xfd, 0x0f, 0xce, 0x7e, 0xe4, 0x67, 0xf7, 0xcf, 0x5a, 0x3f, - 0xde, 0x3f, 0x6b, 0xfd, 0x64, 0xff, 0xac, 0xf5, 0x47, 0xfb, 0x67, 0xad, 0x6f, 0xfe, 0xf1, 0xd9, - 0x8f, 0x7c, 0xb1, 0xb2, 0x73, 0xf9, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xba, 0xe2, 0xd2, - 0xb8, 0xb6, 0x00, 0x00, + 0x91, 0x3a, 0x92, 0xc7, 0x5d, 0xdd, 0x91, 0x14, 0x29, 0x91, 0xa1, 0xb4, 0xbb, 0xb3, 0x7b, 0xb7, + 0xba, 0xdb, 0xbb, 0x61, 0xcd, 0x1e, 0x8f, 0x92, 0x08, 0x49, 0xbd, 0xd3, 0xb5, 0xbb, 0xad, 0xeb, + 0xed, 0x1e, 0x76, 0xf7, 0xec, 0xdd, 0x4a, 0x31, 0xe0, 0xc8, 0x8c, 0x8d, 0x40, 0x82, 0xa3, 0x20, + 0x10, 0x12, 0x20, 0x09, 0xa2, 0x04, 0x48, 0xe0, 0xc4, 0xb0, 0x15, 0x45, 0x4a, 0x20, 0xc5, 0xb2, + 0x81, 0x20, 0xb6, 0xa3, 0x20, 0x71, 0x20, 0xfd, 0x89, 0x0d, 0x1b, 0xd8, 0x98, 0xeb, 0xe4, 0x5f, + 0x7e, 0x04, 0xc8, 0xaf, 0x1c, 0x8c, 0x24, 0xa8, 0xcf, 0xae, 0xea, 0xe9, 0xd9, 0xee, 0x39, 0xde, + 0x9c, 0x4f, 0x46, 0xfe, 0xcd, 0xbc, 0xf7, 0xea, 0xd5, 0x47, 0xbf, 0x7a, 0xf5, 0xea, 0xd5, 0xab, + 0x57, 0x70, 0xe1, 0xf6, 0xab, 0xf1, 0x82, 0x17, 0x2e, 0xde, 0xee, 0x6c, 0x91, 0x28, 0x20, 0x09, + 0x89, 0x17, 0xdb, 0xb7, 0x77, 0x16, 0x9d, 0xb6, 0xb7, 0xb8, 0x7f, 0x71, 0x71, 0x87, 0x04, 0x24, + 0x72, 0x12, 0xe2, 0x2e, 0xb4, 0xa3, 0x30, 0x09, 0xd1, 0x13, 0x9c, 0x7a, 0x21, 0xa5, 0x5e, 0x68, + 0xdf, 0xde, 0x59, 0x70, 0xda, 0xde, 0xc2, 0xfe, 0xc5, 0xb9, 0x17, 0x76, 0xbc, 0x64, 0xb7, 0xb3, + 0xb5, 0xd0, 0x0a, 0xf7, 0x16, 0x77, 0xc2, 0x9d, 0x70, 0x91, 0x15, 0xda, 0xea, 0x6c, 0xb3, 0x7f, + 0xec, 0x0f, 0xfb, 0xc5, 0x99, 0xcd, 0x5d, 0xea, 0x5d, 0x75, 0x44, 0xe2, 0xb0, 0x13, 0xb5, 0x48, + 0xb6, 0x01, 0xc7, 0x94, 0x89, 0x17, 0xf7, 0x48, 0xe2, 0xe4, 0x34, 0x7a, 0xee, 0x85, 0xfc, 0x32, + 0x51, 0x27, 0x48, 0xbc, 0xbd, 0xee, 0x2a, 0x5e, 0x3a, 0x9e, 0x3c, 0x6e, 0xed, 0x92, 0x3d, 0xa7, + 0xab, 0xd4, 0xc5, 0xfc, 0x52, 0x9d, 0xc4, 0xf3, 0x17, 0xbd, 0x20, 0x89, 0x93, 0x28, 0x5b, 0xc4, + 0xfe, 0x43, 0x0b, 0xce, 0x2d, 0xdd, 0x6a, 0xae, 0xfa, 0x4e, 0x9c, 0x78, 0xad, 0x65, 0x3f, 0x6c, + 0xdd, 0x6e, 0x26, 0x61, 0x44, 0xde, 0x0a, 0xfd, 0xce, 0x1e, 0x69, 0xb2, 0x01, 0x40, 0x17, 0x60, + 0x6c, 0x9f, 0xfd, 0x5f, 0xaf, 0xcf, 0x5a, 0xe7, 0xac, 0xf3, 0xb5, 0xe5, 0x99, 0x9f, 0x1c, 0xce, + 0x7f, 0xe8, 0xe8, 0x70, 0x7e, 0xec, 0x2d, 0x01, 0xc7, 0x8a, 0x02, 0x3d, 0x03, 0x23, 0xdb, 0xf1, + 0xe6, 0x41, 0x9b, 0xcc, 0x56, 0x18, 0xed, 0x94, 0xa0, 0x1d, 0x59, 0x6b, 0x52, 0x28, 0x16, 0x58, + 0xb4, 0x08, 0xb5, 0xb6, 0x13, 0x25, 0x5e, 0xe2, 0x85, 0xc1, 0x6c, 0xf5, 0x9c, 0x75, 0x7e, 0x78, + 0xf9, 0x84, 0x20, 0xad, 0x35, 0x24, 0x02, 0xa7, 0x34, 0xb4, 0x19, 0x11, 0x71, 0xdc, 0x1b, 0x81, + 0x7f, 0x30, 0x3b, 0x74, 0xce, 0x3a, 0x3f, 0x96, 0x36, 0x03, 0x0b, 0x38, 0x56, 0x14, 0xf6, 0x0f, + 0x2b, 0x30, 0xb6, 0xb4, 0xbd, 0xed, 0x05, 0x5e, 0x72, 0x80, 0xbe, 0x0c, 0x13, 0x41, 0xe8, 0x12, + 0xf9, 0x9f, 0xf5, 0x62, 0xfc, 0xd2, 0x73, 0x0b, 0xc7, 0x89, 0xd2, 0xc2, 0x75, 0xad, 0xc4, 0xf2, + 0xcc, 0xd1, 0xe1, 0xfc, 0x84, 0x0e, 0xc1, 0x06, 0x47, 0xf4, 0x0e, 0x8c, 0xb7, 0x43, 0x57, 0x55, + 0x50, 0x61, 0x15, 0x3c, 0x7b, 0x7c, 0x05, 0x8d, 0xb4, 0xc0, 0xf2, 0xf4, 0xd1, 0xe1, 0xfc, 0xb8, + 0x06, 0xc0, 0x3a, 0x3b, 0xe4, 0xc3, 0x34, 0xfd, 0x1b, 0x24, 0x9e, 0xaa, 0xa1, 0xca, 0x6a, 0x78, + 0xa1, 0xb8, 0x06, 0xad, 0xd0, 0xf2, 0xc9, 0xa3, 0xc3, 0xf9, 0xe9, 0x0c, 0x10, 0x67, 0x59, 0xdb, + 0x5f, 0x85, 0xa9, 0xa5, 0x24, 0x71, 0x5a, 0xbb, 0xc4, 0xe5, 0xdf, 0x17, 0xbd, 0x04, 0x43, 0x81, + 0xb3, 0x47, 0xc4, 0xd7, 0x3f, 0x27, 0x86, 0x7d, 0xe8, 0xba, 0xb3, 0x47, 0xee, 0x1d, 0xce, 0xcf, + 0xdc, 0x0c, 0xbc, 0x77, 0x3b, 0x42, 0x66, 0x28, 0x0c, 0x33, 0x6a, 0x74, 0x09, 0xc0, 0x25, 0xfb, + 0x5e, 0x8b, 0x34, 0x9c, 0x64, 0x57, 0x48, 0x03, 0x12, 0x65, 0xa1, 0xae, 0x30, 0x58, 0xa3, 0xb2, + 0xbf, 0x6e, 0x41, 0x6d, 0x69, 0x3f, 0xf4, 0xdc, 0x46, 0xe8, 0xc6, 0xa8, 0x03, 0xd3, 0xed, 0x88, + 0x6c, 0x93, 0x48, 0x81, 0x66, 0xad, 0x73, 0xd5, 0xf3, 0xe3, 0x97, 0x2e, 0x15, 0xf4, 0xdb, 0x2c, + 0xb4, 0x1a, 0x24, 0xd1, 0xc1, 0xf2, 0x63, 0xa2, 0xea, 0xe9, 0x0c, 0x16, 0x67, 0xeb, 0xb0, 0xff, + 0x56, 0x05, 0x4e, 0x2f, 0x7d, 0xb5, 0x13, 0x91, 0xba, 0x17, 0xdf, 0xce, 0x4e, 0x05, 0xd7, 0x8b, + 0x6f, 0x5f, 0x4f, 0x07, 0x43, 0xc9, 0x60, 0x5d, 0xc0, 0xb1, 0xa2, 0x40, 0x2f, 0xc0, 0x28, 0xfd, + 0x7d, 0x13, 0xaf, 0x8b, 0xde, 0x9f, 0x14, 0xc4, 0xe3, 0x75, 0x27, 0x71, 0xea, 0x1c, 0x85, 0x25, + 0x0d, 0xda, 0x80, 0xf1, 0x96, 0xd3, 0xda, 0xf5, 0x82, 0x9d, 0x8d, 0xd0, 0x25, 0xec, 0x0b, 0xd7, + 0x96, 0x9f, 0xa7, 0xe4, 0x2b, 0x29, 0xf8, 0xde, 0xe1, 0xfc, 0x2c, 0x6f, 0x9b, 0x60, 0xa1, 0xe1, + 0xb0, 0x5e, 0x1e, 0xd9, 0x6a, 0x22, 0x0e, 0x31, 0x4e, 0x90, 0x33, 0x09, 0xcf, 0x6b, 0x73, 0x6a, + 0x98, 0xcd, 0xa9, 0x89, 0x1e, 0xf3, 0xe9, 0x9f, 0x5b, 0x62, 0x4c, 0xd6, 0x3c, 0xdf, 0x54, 0x0f, + 0x97, 0x00, 0x62, 0xd2, 0x8a, 0x48, 0xa2, 0x8d, 0x8a, 0xfa, 0xcc, 0x4d, 0x85, 0xc1, 0x1a, 0x15, + 0x9d, 0xfc, 0xf1, 0xae, 0x13, 0x31, 0x69, 0x11, 0x63, 0xa3, 0x26, 0x7f, 0x53, 0x22, 0x70, 0x4a, + 0x63, 0x4c, 0xfe, 0x6a, 0xe1, 0xe4, 0xff, 0x37, 0x16, 0x8c, 0x2e, 0x7b, 0x81, 0xeb, 0x05, 0x3b, + 0xe8, 0x6d, 0x18, 0xa3, 0x5a, 0xd9, 0x75, 0x12, 0x47, 0xcc, 0xfb, 0xf3, 0xc7, 0x0b, 0xcf, 0x8d, + 0xad, 0xaf, 0x90, 0x56, 0xb2, 0x41, 0x12, 0x27, 0xed, 0x46, 0x0a, 0xc3, 0x8a, 0x1b, 0xba, 0x09, + 0x23, 0x89, 0x13, 0xed, 0x90, 0x44, 0x4c, 0xf7, 0x17, 0xca, 0xf0, 0xc5, 0x54, 0xd4, 0x48, 0xd0, + 0x22, 0xa9, 0x62, 0xdc, 0x64, 0x4c, 0xb0, 0x60, 0x66, 0xb7, 0x60, 0x62, 0xc5, 0x69, 0x3b, 0x5b, + 0x9e, 0xef, 0x25, 0x1e, 0x89, 0xd1, 0xc7, 0xa0, 0xea, 0xb8, 0x2e, 0x13, 0xfc, 0xda, 0xf2, 0xe9, + 0xa3, 0xc3, 0xf9, 0xea, 0x92, 0xeb, 0xde, 0x3b, 0x9c, 0x07, 0x45, 0x75, 0x80, 0x29, 0x05, 0x7a, + 0x0e, 0x86, 0xdc, 0x28, 0x6c, 0xcf, 0x56, 0x18, 0xe5, 0x19, 0x3a, 0x43, 0xeb, 0x51, 0xd8, 0xce, + 0x90, 0x32, 0x1a, 0xfb, 0xf7, 0x2a, 0x80, 0x56, 0x48, 0x7b, 0x77, 0xad, 0x69, 0x7c, 0xcb, 0xf3, + 0x30, 0xb6, 0x17, 0x06, 0x5e, 0x12, 0x46, 0xb1, 0xa8, 0x90, 0xc9, 0xc3, 0x86, 0x80, 0x61, 0x85, + 0x45, 0xe7, 0x60, 0xa8, 0x9d, 0x4e, 0xeb, 0x09, 0xa9, 0x12, 0xd8, 0x84, 0x66, 0x18, 0x4a, 0xd1, + 0x89, 0x49, 0x24, 0xe4, 0x58, 0x51, 0xdc, 0x8c, 0x49, 0x84, 0x19, 0x26, 0x95, 0x1c, 0x2a, 0x53, + 0x42, 0x4a, 0x33, 0x92, 0x43, 0x31, 0x58, 0xa3, 0x42, 0x5f, 0x82, 0x1a, 0xff, 0x87, 0xc9, 0x36, + 0x13, 0xd9, 0x42, 0x65, 0x70, 0x2d, 0x6c, 0x39, 0x7e, 0x76, 0xf0, 0x27, 0x99, 0xa4, 0x49, 0x46, + 0x38, 0xe5, 0x69, 0x48, 0xda, 0x48, 0xa1, 0xa4, 0xfd, 0x5d, 0x0b, 0xd0, 0x8a, 0x17, 0xb8, 0x24, + 0x7a, 0x08, 0x4b, 0x66, 0x7f, 0x93, 0xe0, 0x4f, 0x68, 0xd3, 0xc2, 0xbd, 0x76, 0x18, 0x90, 0x20, + 0x59, 0x09, 0x03, 0x97, 0x2f, 0xa3, 0x9f, 0x82, 0xa1, 0x84, 0x56, 0xc5, 0x9b, 0xf5, 0x8c, 0xfc, + 0x2c, 0xb4, 0x82, 0x7b, 0x87, 0xf3, 0x67, 0xba, 0x4b, 0xb0, 0x26, 0xb0, 0x32, 0xe8, 0x93, 0x30, + 0x12, 0x27, 0x4e, 0xd2, 0x89, 0x45, 0x43, 0x3f, 0x22, 0x1b, 0xda, 0x64, 0xd0, 0x7b, 0x87, 0xf3, + 0xd3, 0xaa, 0x18, 0x07, 0x61, 0x51, 0x00, 0x3d, 0x0b, 0xa3, 0x7b, 0x24, 0x8e, 0x9d, 0x1d, 0xa9, + 0xd8, 0xa6, 0x45, 0xd9, 0xd1, 0x0d, 0x0e, 0xc6, 0x12, 0x8f, 0x9e, 0x82, 0x61, 0x12, 0x45, 0x61, + 0x24, 0x24, 0x62, 0x52, 0x10, 0x0e, 0xaf, 0x52, 0x20, 0xe6, 0x38, 0xfb, 0x67, 0x16, 0x4c, 0xab, + 0xb6, 0xf2, 0xba, 0x06, 0x38, 0xd5, 0x5d, 0x80, 0x96, 0xec, 0x58, 0xcc, 0x26, 0xd8, 0xf8, 0xa5, + 0x8f, 0x1f, 0xcf, 0xbb, 0x7b, 0x20, 0xd3, 0x3a, 0x14, 0x28, 0xc6, 0x1a, 0x5f, 0xfb, 0xf7, 0x2c, + 0x38, 0x99, 0xe9, 0xd3, 0x35, 0x2f, 0x4e, 0xd0, 0xe7, 0xbb, 0xfa, 0x75, 0xa1, 0x77, 0xdd, 0xf1, + 0x02, 0xa5, 0x65, 0x82, 0xef, 0xc5, 0xbc, 0x6f, 0x4a, 0x4a, 0x24, 0x44, 0xeb, 0x19, 0x86, 0x61, + 0x2f, 0x21, 0x7b, 0xb2, 0x53, 0x2f, 0x94, 0xec, 0x14, 0x6f, 0x5d, 0xfa, 0x6d, 0xd6, 0x29, 0x0f, + 0xcc, 0x59, 0xd9, 0xff, 0xcb, 0x82, 0xda, 0x4a, 0x18, 0x6c, 0x7b, 0x3b, 0x1b, 0x4e, 0x7b, 0x80, + 0x5f, 0xa5, 0x09, 0x43, 0x8c, 0x2b, 0x6f, 0xfa, 0xc5, 0xa2, 0xa6, 0x8b, 0x06, 0x2d, 0xd0, 0x95, + 0x93, 0x9b, 0x04, 0x4a, 0x29, 0x51, 0x10, 0x66, 0xcc, 0xe6, 0x5e, 0x81, 0x9a, 0x22, 0x40, 0x33, + 0x50, 0xbd, 0x4d, 0xb8, 0xbd, 0x58, 0xc3, 0xf4, 0x27, 0x3a, 0x05, 0xc3, 0xfb, 0x8e, 0xdf, 0x11, + 0x53, 0x15, 0xf3, 0x3f, 0x9f, 0xaa, 0xbc, 0x6a, 0xd9, 0x3f, 0xb6, 0xe0, 0x94, 0xaa, 0xe4, 0x2a, + 0x39, 0x68, 0x12, 0x9f, 0xb4, 0x92, 0x30, 0x42, 0xef, 0x59, 0x70, 0xca, 0xcf, 0x51, 0x42, 0x62, + 0x34, 0xee, 0x47, 0x7d, 0x3d, 0x21, 0x1a, 0x7e, 0x2a, 0x0f, 0x8b, 0x73, 0x6b, 0x43, 0x4f, 0xf2, + 0xbe, 0xf0, 0x99, 0x3b, 0x2e, 0x18, 0x54, 0xaf, 0x92, 0x03, 0xd6, 0x31, 0xfb, 0x47, 0x16, 0x4c, + 0xaa, 0xe6, 0x0f, 0x5c, 0xec, 0xae, 0x99, 0x62, 0xf7, 0xb1, 0x92, 0xdf, 0xae, 0x87, 0xc0, 0xfd, + 0xc3, 0x0a, 0x9c, 0x56, 0x34, 0x86, 0x22, 0x7e, 0x44, 0xc6, 0xbe, 0xbf, 0xee, 0x5e, 0x25, 0x07, + 0x9b, 0x21, 0x5d, 0x49, 0xf3, 0xbb, 0x8b, 0x2e, 0xc2, 0xb8, 0x4b, 0xb6, 0x9d, 0x8e, 0x9f, 0x28, + 0x43, 0x71, 0x98, 0xef, 0x20, 0xea, 0x29, 0x18, 0xeb, 0x34, 0xf6, 0x1f, 0xd4, 0xd8, 0x94, 0x4c, + 0x1c, 0x2f, 0x20, 0x11, 0x5d, 0x9a, 0x35, 0x7b, 0x7e, 0x42, 0xb7, 0xe7, 0x85, 0xed, 0xfe, 0x14, + 0x0c, 0x7b, 0x7b, 0x54, 0x59, 0x57, 0x4c, 0x1d, 0xbc, 0x4e, 0x81, 0x98, 0xe3, 0xd0, 0xd3, 0x30, + 0xda, 0x0a, 0xf7, 0xf6, 0x9c, 0xc0, 0x9d, 0xad, 0x32, 0x63, 0x61, 0x9c, 0xea, 0xf3, 0x15, 0x0e, + 0xc2, 0x12, 0x87, 0x9e, 0x80, 0x21, 0x27, 0xda, 0x89, 0x67, 0x87, 0x18, 0xcd, 0x18, 0xad, 0x69, + 0x29, 0xda, 0x89, 0x31, 0x83, 0x52, 0x23, 0xe0, 0x4e, 0x18, 0xdd, 0xf6, 0x82, 0x9d, 0xba, 0x17, + 0xb1, 0x15, 0x5d, 0x33, 0x02, 0x6e, 0x29, 0x0c, 0xd6, 0xa8, 0x50, 0x03, 0x86, 0xdb, 0x61, 0x94, + 0xc4, 0xb3, 0x23, 0x6c, 0x38, 0x9f, 0x2f, 0x94, 0x1e, 0xde, 0xef, 0x46, 0x18, 0x25, 0x69, 0x57, + 0xe8, 0xbf, 0x18, 0x73, 0x46, 0x68, 0x05, 0xaa, 0x24, 0xd8, 0x9f, 0x1d, 0x65, 0xfc, 0x3e, 0x7a, + 0x3c, 0xbf, 0xd5, 0x60, 0xff, 0x2d, 0x27, 0x4a, 0xa7, 0xd0, 0x6a, 0xb0, 0x8f, 0x69, 0x69, 0xd4, + 0x82, 0x9a, 0xf4, 0x1a, 0xc4, 0xb3, 0x63, 0x65, 0x04, 0x0c, 0x0b, 0x72, 0x4c, 0xde, 0xed, 0x78, + 0x11, 0xd9, 0x23, 0x41, 0x12, 0xa7, 0x96, 0xb0, 0xc4, 0xc6, 0x38, 0xe5, 0x8b, 0x5a, 0x30, 0xc1, + 0x0d, 0x87, 0x8d, 0xb0, 0x13, 0x24, 0xf1, 0x6c, 0x8d, 0x35, 0xb9, 0x60, 0xab, 0xf9, 0x56, 0x5a, + 0x62, 0xf9, 0x94, 0x60, 0x3f, 0xa1, 0x01, 0x63, 0x6c, 0x30, 0x45, 0xef, 0xc0, 0xa4, 0xef, 0xed, + 0x93, 0x80, 0xc4, 0x71, 0x23, 0x0a, 0xb7, 0xc8, 0x2c, 0xb0, 0xde, 0x3c, 0x55, 0xb4, 0xed, 0x0a, + 0xb7, 0xc8, 0xf2, 0x89, 0xa3, 0xc3, 0xf9, 0xc9, 0x6b, 0x7a, 0x69, 0x6c, 0x32, 0x43, 0x5f, 0x82, + 0x29, 0x6a, 0xa5, 0x78, 0x29, 0xfb, 0xf1, 0xf2, 0xec, 0xd1, 0xd1, 0xe1, 0xfc, 0x14, 0x36, 0x8a, + 0xe3, 0x0c, 0x3b, 0xb4, 0x09, 0x35, 0xdf, 0xdb, 0x26, 0xad, 0x83, 0x96, 0x4f, 0x66, 0x27, 0x18, + 0xef, 0x82, 0x29, 0x77, 0x4d, 0x92, 0x73, 0xcb, 0x50, 0xfd, 0xc5, 0x29, 0x23, 0xf4, 0x16, 0x9c, + 0x49, 0x48, 0xb4, 0xe7, 0x05, 0x0e, 0x5d, 0xae, 0x85, 0xd9, 0xc2, 0xf6, 0xb6, 0x93, 0x4c, 0x6a, + 0xcf, 0x8a, 0x81, 0x3d, 0xb3, 0x99, 0x4b, 0x85, 0x7b, 0x94, 0x46, 0x37, 0x60, 0x9a, 0xcd, 0xa7, + 0x46, 0xc7, 0xf7, 0x1b, 0xa1, 0xef, 0xb5, 0x0e, 0x66, 0xa7, 0x18, 0xc3, 0xa7, 0xe5, 0x8e, 0x75, + 0xdd, 0x44, 0x53, 0x8b, 0x3e, 0xfd, 0x87, 0xb3, 0xa5, 0x91, 0x0f, 0xd3, 0x31, 0x69, 0x75, 0x22, + 0x2f, 0x39, 0xa0, 0xb2, 0x4f, 0xee, 0x26, 0xb3, 0xd3, 0x65, 0x76, 0x28, 0x4d, 0xb3, 0x10, 0x77, + 0x17, 0x64, 0x80, 0x38, 0xcb, 0x9a, 0xaa, 0x8a, 0x38, 0x71, 0xbd, 0x60, 0x76, 0x86, 0x99, 0xa4, + 0x6a, 0x7e, 0x35, 0x29, 0x10, 0x73, 0x1c, 0xdb, 0xf0, 0xd1, 0x1f, 0x37, 0xa8, 0xee, 0x3d, 0xc1, + 0x08, 0xd3, 0x0d, 0x9f, 0x44, 0xe0, 0x94, 0x86, 0xae, 0x56, 0x49, 0x72, 0x30, 0x8b, 0x18, 0xa9, + 0x9a, 0x6a, 0x9b, 0x9b, 0x9f, 0xc3, 0x14, 0x6e, 0x6f, 0xc1, 0x94, 0x9a, 0xd6, 0x6c, 0x74, 0xd0, + 0x3c, 0x0c, 0x53, 0xcd, 0x25, 0xf7, 0x2d, 0x35, 0xda, 0x04, 0xaa, 0xd0, 0x62, 0xcc, 0xe1, 0xac, + 0x09, 0xde, 0x57, 0xc9, 0xf2, 0x41, 0x42, 0xb8, 0xfd, 0x5a, 0xd5, 0x9a, 0x20, 0x11, 0x38, 0xa5, + 0xb1, 0xff, 0x0f, 0x5f, 0x11, 0x53, 0xdd, 0x51, 0x42, 0x6f, 0x5e, 0x80, 0xb1, 0xdd, 0x30, 0x4e, + 0x28, 0x35, 0xab, 0x63, 0x38, 0x5d, 0x05, 0xaf, 0x08, 0x38, 0x56, 0x14, 0xe8, 0x35, 0x98, 0x6c, + 0xe9, 0x15, 0x08, 0x55, 0x7e, 0x5a, 0x14, 0x31, 0x6b, 0xc7, 0x26, 0x2d, 0x7a, 0x15, 0xc6, 0x98, + 0x13, 0xaf, 0x15, 0xfa, 0xc2, 0x52, 0x96, 0x2b, 0xd3, 0x58, 0x43, 0xc0, 0xef, 0x69, 0xbf, 0xb1, + 0xa2, 0xa6, 0xfb, 0x0d, 0xda, 0x84, 0xf5, 0x86, 0x50, 0xb7, 0x6a, 0xbf, 0x71, 0x85, 0x41, 0xb1, + 0xc0, 0xda, 0xff, 0xa2, 0xa2, 0x8d, 0x32, 0xb5, 0xf8, 0x08, 0xfa, 0x3c, 0x8c, 0xde, 0x71, 0xbc, + 0xc4, 0x0b, 0x76, 0xc4, 0x0a, 0xfa, 0x62, 0x49, 0xdd, 0xcb, 0x8a, 0xdf, 0xe2, 0x45, 0xf9, 0x3a, + 0x21, 0xfe, 0x60, 0xc9, 0x90, 0xf2, 0x8e, 0x3a, 0x41, 0x40, 0x79, 0x57, 0xfa, 0xe7, 0x8d, 0x79, + 0x51, 0xce, 0x5b, 0xfc, 0xc1, 0x92, 0x21, 0xda, 0x06, 0x90, 0xb3, 0x8f, 0xb8, 0xc2, 0x79, 0xf6, + 0x89, 0x7e, 0xd8, 0x6f, 0xaa, 0xd2, 0xcb, 0x53, 0x74, 0x65, 0x4a, 0xff, 0x63, 0x8d, 0xb3, 0x1d, + 0x31, 0x43, 0xa4, 0xbb, 0x59, 0xe8, 0x73, 0x74, 0x02, 0x38, 0x51, 0x42, 0xdc, 0xa5, 0xa4, 0xd8, + 0x0c, 0x4e, 0xad, 0xa9, 0x4d, 0x6f, 0x8f, 0xe8, 0x53, 0x45, 0xb0, 0xc0, 0x29, 0x37, 0xfb, 0xfb, + 0x55, 0x98, 0xed, 0xd5, 0x58, 0x2a, 0x90, 0xe4, 0xae, 0x97, 0xac, 0x50, 0x43, 0xc1, 0x32, 0x05, + 0x72, 0x55, 0xc0, 0xb1, 0xa2, 0xa0, 0x92, 0x11, 0x7b, 0x3b, 0x81, 0xe3, 0x0b, 0xe1, 0x55, 0x92, + 0xd1, 0x64, 0x50, 0x2c, 0xb0, 0x94, 0x2e, 0x22, 0x4e, 0x2c, 0x3c, 0xb7, 0x9a, 0x04, 0x61, 0x06, + 0xc5, 0x02, 0xab, 0xef, 0xfa, 0x86, 0x0a, 0x76, 0x7d, 0xc6, 0x00, 0x0d, 0x3f, 0xc8, 0x01, 0x42, + 0xef, 0x00, 0x6c, 0x7b, 0x81, 0x17, 0xef, 0x32, 0xde, 0x23, 0x7d, 0xf2, 0x56, 0xc6, 0xc8, 0x9a, + 0xe2, 0x81, 0x35, 0x7e, 0xe8, 0x65, 0x18, 0x57, 0x13, 0x73, 0xbd, 0x3e, 0x3b, 0x6a, 0x7a, 0xfa, + 0x52, 0x2d, 0x55, 0xc7, 0x3a, 0x9d, 0xfd, 0x95, 0xac, 0xa4, 0x88, 0xf9, 0xa0, 0x8d, 0xad, 0x55, + 0x76, 0x6c, 0x2b, 0xc7, 0x8f, 0xad, 0xfd, 0x5f, 0xaa, 0x74, 0xb3, 0xac, 0x55, 0xd6, 0x89, 0x4b, + 0xe8, 0xb2, 0x37, 0xa9, 0x62, 0x77, 0x12, 0x22, 0x66, 0xe3, 0x85, 0x7e, 0xa6, 0x8b, 0xbe, 0x0c, + 0xd0, 0x59, 0xc0, 0x39, 0xa1, 0x5d, 0xa8, 0xf9, 0x4e, 0xcc, 0x76, 0x8f, 0x44, 0xcc, 0xc2, 0xfe, + 0xd8, 0xa6, 0xc6, 0xb7, 0x13, 0x27, 0xda, 0x3a, 0xcb, 0x6b, 0x49, 0x99, 0xd3, 0x55, 0x89, 0x1a, + 0x05, 0xf2, 0xa8, 0x40, 0x35, 0x87, 0x5a, 0x0e, 0x07, 0x98, 0xe3, 0xd0, 0xab, 0x30, 0x11, 0x11, + 0x26, 0x27, 0x2b, 0xd4, 0xee, 0x61, 0x62, 0x37, 0x9c, 0x1a, 0x48, 0x58, 0xc3, 0x61, 0x83, 0x32, + 0xb5, 0x8f, 0x47, 0x8e, 0xb1, 0x8f, 0x9f, 0x85, 0x51, 0xf6, 0x43, 0x49, 0x85, 0xfa, 0x42, 0xeb, + 0x1c, 0x8c, 0x25, 0x3e, 0x2b, 0x44, 0x63, 0x25, 0x85, 0xe8, 0x39, 0x98, 0xaa, 0x3b, 0x64, 0x2f, + 0x0c, 0x56, 0x03, 0xb7, 0x1d, 0x7a, 0x41, 0x82, 0x66, 0x61, 0x88, 0xad, 0x24, 0x7c, 0xae, 0x0f, + 0x51, 0x0e, 0x78, 0x88, 0xda, 0xb8, 0xf6, 0xff, 0xb5, 0x60, 0xb2, 0x4e, 0x7c, 0x92, 0x90, 0x1b, + 0x6d, 0xe6, 0x6f, 0x40, 0x6b, 0x80, 0x76, 0x22, 0xa7, 0x45, 0x1a, 0x24, 0xf2, 0x42, 0xb7, 0x49, + 0x5a, 0x61, 0xc0, 0x3c, 0xec, 0x74, 0x69, 0x3c, 0x73, 0x74, 0x38, 0x8f, 0x2e, 0x77, 0x61, 0x71, + 0x4e, 0x09, 0xe4, 0xc2, 0x64, 0x3b, 0x22, 0x86, 0x83, 0xc4, 0x2a, 0x36, 0xcb, 0x1b, 0x7a, 0x11, + 0x6e, 0x35, 0x1a, 0x20, 0x6c, 0x32, 0x45, 0x9f, 0x81, 0x99, 0x30, 0x6a, 0xef, 0x3a, 0x41, 0x9d, + 0xb4, 0x49, 0xe0, 0x52, 0x53, 0x59, 0x78, 0xc1, 0x4e, 0x1d, 0x1d, 0xce, 0xcf, 0xdc, 0xc8, 0xe0, + 0x70, 0x17, 0xb5, 0xfd, 0xeb, 0x15, 0x38, 0x5d, 0x0f, 0xef, 0x04, 0x77, 0x9c, 0xc8, 0x5d, 0x6a, + 0xac, 0x73, 0xfb, 0x97, 0x79, 0x15, 0xa5, 0x37, 0xd3, 0xea, 0xe9, 0xcd, 0xfc, 0x02, 0x8c, 0x6d, + 0x7b, 0xc4, 0x77, 0x31, 0xd9, 0x16, 0xdd, 0xbb, 0x58, 0xc6, 0x8b, 0xb1, 0x46, 0xcb, 0x48, 0x4f, + 0x00, 0x77, 0xa6, 0xae, 0x09, 0x36, 0x58, 0x31, 0x44, 0x1d, 0x98, 0x91, 0x06, 0xbe, 0xc4, 0x8a, + 0xd9, 0xf1, 0x62, 0xb9, 0xfd, 0x83, 0x59, 0x0d, 0x1b, 0x0f, 0x9c, 0x61, 0x88, 0xbb, 0xaa, 0xa0, + 0x1b, 0xb3, 0x3d, 0xba, 0x2e, 0x0c, 0x31, 0x59, 0x61, 0x1b, 0x33, 0xb6, 0x73, 0x64, 0x50, 0xfb, + 0x9f, 0x5a, 0xf0, 0x58, 0xd7, 0x68, 0x89, 0x6d, 0xf5, 0xdb, 0x72, 0x3f, 0xcb, 0x8f, 0x63, 0x0a, + 0x5a, 0x99, 0x3b, 0xe6, 0xe5, 0xf6, 0xb6, 0x95, 0x12, 0x7b, 0xdb, 0x1b, 0x70, 0x6a, 0x75, 0xaf, + 0x9d, 0x1c, 0xd4, 0x3d, 0xd3, 0x09, 0xfb, 0x0a, 0x8c, 0xec, 0x11, 0xd7, 0xeb, 0xec, 0x89, 0xcf, + 0x3a, 0x2f, 0x15, 0xe9, 0x06, 0x83, 0xde, 0x3b, 0x9c, 0x9f, 0x6c, 0x26, 0x61, 0xe4, 0xec, 0x10, + 0x0e, 0xc0, 0x82, 0xdc, 0x7e, 0xdf, 0x82, 0x69, 0x39, 0xa1, 0x96, 0x5c, 0x37, 0x22, 0x71, 0x8c, + 0xe6, 0xa0, 0xe2, 0xb5, 0x05, 0x23, 0x10, 0x8c, 0x2a, 0xeb, 0x0d, 0x5c, 0xf1, 0xda, 0xe8, 0xf3, + 0x50, 0xe3, 0xbe, 0xfb, 0x54, 0x38, 0xfa, 0x3c, 0x0b, 0x60, 0x9b, 0x8e, 0x4d, 0xc9, 0x03, 0xa7, + 0xec, 0xa4, 0x41, 0xc9, 0x54, 0x75, 0xd5, 0xf4, 0x24, 0x5f, 0x11, 0x70, 0xac, 0x28, 0xd0, 0x79, + 0x18, 0x0b, 0x42, 0x97, 0x1f, 0xab, 0xf0, 0x05, 0x97, 0x89, 0xdc, 0x75, 0x01, 0xc3, 0x0a, 0x6b, + 0x7f, 0xd3, 0x82, 0x09, 0xd9, 0xc7, 0x92, 0xb6, 0x2d, 0x9d, 0x24, 0xa9, 0x5d, 0x9b, 0x4e, 0x12, + 0x6a, 0x9b, 0x32, 0x8c, 0x61, 0x92, 0x56, 0xfb, 0x31, 0x49, 0xed, 0x1f, 0x55, 0x60, 0x4a, 0x36, + 0xa7, 0xd9, 0xd9, 0x8a, 0x49, 0x82, 0xbe, 0x08, 0x35, 0x87, 0x0f, 0x3e, 0x91, 0x72, 0xf6, 0x42, + 0xd1, 0xc6, 0xdc, 0xf8, 0x66, 0xa9, 0x55, 0xb0, 0x24, 0xf9, 0xe0, 0x94, 0x25, 0xda, 0x87, 0x13, + 0x41, 0x98, 0xb0, 0xf5, 0x40, 0xe1, 0xcb, 0x79, 0x41, 0xb3, 0xf5, 0x3c, 0x2e, 0xea, 0x39, 0x71, + 0x3d, 0xcb, 0x0f, 0x77, 0x57, 0x81, 0x6e, 0x48, 0xe7, 0x45, 0x95, 0xd5, 0xf5, 0x5c, 0xb9, 0xba, + 0x7a, 0xfb, 0x2e, 0xec, 0xdf, 0xb1, 0xa0, 0x26, 0xc9, 0x06, 0xe9, 0x04, 0xbf, 0x05, 0xa3, 0x31, + 0xfb, 0x34, 0x72, 0x98, 0x2e, 0x94, 0x6b, 0x3a, 0xff, 0x9e, 0xe9, 0xe2, 0xc7, 0xff, 0xc7, 0x58, + 0x72, 0x63, 0xae, 0x47, 0xd5, 0x81, 0x47, 0xcc, 0xf5, 0xa8, 0xda, 0xd5, 0xc3, 0xf5, 0xf8, 0x6b, + 0x16, 0x8c, 0x70, 0x87, 0x50, 0x39, 0xaf, 0x9a, 0xe6, 0x3c, 0x4e, 0x39, 0xbe, 0x45, 0x81, 0xc2, + 0x97, 0x8c, 0x6e, 0x41, 0x8d, 0xfd, 0x58, 0x8b, 0xc2, 0x3d, 0xb1, 0x0a, 0x3c, 0x57, 0xc6, 0x21, + 0xc5, 0xb5, 0x1e, 0x57, 0x25, 0x6f, 0x49, 0x06, 0x38, 0xe5, 0x65, 0xff, 0xb8, 0x4a, 0xa7, 0x7c, + 0x4a, 0x6a, 0xac, 0x69, 0xd6, 0xc3, 0x58, 0xd3, 0x2a, 0x83, 0x5f, 0xd3, 0xde, 0x85, 0xe9, 0x96, + 0xe6, 0x84, 0x4f, 0x57, 0xd2, 0x4b, 0x25, 0x5d, 0xcc, 0x9a, 0xe7, 0x9e, 0x3b, 0x40, 0x56, 0x4c, + 0x76, 0x38, 0xcb, 0x1f, 0x11, 0x98, 0xe0, 0xc7, 0x87, 0xa2, 0xbe, 0x21, 0x56, 0xdf, 0x62, 0xa1, + 0xaf, 0x85, 0x97, 0x50, 0x95, 0xb1, 0x10, 0x93, 0xa6, 0xc6, 0x08, 0x1b, 0x6c, 0xed, 0x5f, 0x1d, + 0x86, 0xe1, 0xd5, 0x7d, 0x12, 0x24, 0x03, 0x9c, 0xe2, 0x7b, 0x30, 0xe5, 0x05, 0xfb, 0xa1, 0xbf, + 0x4f, 0x5c, 0x8e, 0xbf, 0xbf, 0xe5, 0xec, 0x8c, 0xa8, 0x64, 0x6a, 0xdd, 0x60, 0x86, 0x33, 0xcc, + 0x07, 0xb1, 0x8d, 0x7c, 0x13, 0x46, 0xb8, 0x44, 0x88, 0x3d, 0x64, 0x81, 0x63, 0x94, 0x0d, 0xa8, + 0x98, 0x39, 0xe9, 0x66, 0x97, 0xfb, 0x64, 0x05, 0x23, 0xb4, 0x0b, 0x53, 0xdb, 0x5e, 0x14, 0x27, + 0x74, 0x37, 0x18, 0x27, 0xce, 0x5e, 0xbb, 0xef, 0x2d, 0xa4, 0x1a, 0x8f, 0x35, 0x83, 0x0f, 0xce, + 0xf0, 0x45, 0x04, 0x26, 0xe9, 0x0e, 0x26, 0xad, 0x68, 0xb4, 0xcf, 0x8a, 0x94, 0xe7, 0xe8, 0x9a, + 0xce, 0x06, 0x9b, 0x5c, 0xa9, 0x1a, 0x6a, 0xb1, 0xfd, 0xce, 0x18, 0x5b, 0xc9, 0x95, 0x1a, 0xe2, + 0x1b, 0x1d, 0x8e, 0xa3, 0xda, 0x8c, 0x9d, 0x13, 0xd7, 0x4c, 0x6d, 0x96, 0x9e, 0x06, 0xdb, 0xdf, + 0xa3, 0xeb, 0x0e, 0x1d, 0xbf, 0x81, 0xab, 0xec, 0x2b, 0xa6, 0xca, 0x7e, 0xaa, 0xc4, 0x37, 0xed, + 0xa1, 0xae, 0xbf, 0x0c, 0xe3, 0xda, 0x27, 0x47, 0x8b, 0x50, 0x6b, 0xc9, 0x23, 0x4d, 0xa1, 0xb7, + 0x95, 0xd1, 0xa0, 0xce, 0x3a, 0x71, 0x4a, 0x43, 0x47, 0x85, 0x1a, 0x5b, 0xd9, 0xb0, 0x07, 0x6a, + 0x8a, 0x61, 0x86, 0xb1, 0x5f, 0x04, 0x58, 0xbd, 0x4b, 0x5a, 0x4b, 0x2d, 0x76, 0xda, 0xae, 0x1d, + 0x91, 0x58, 0xbd, 0x8f, 0x48, 0xe8, 0x50, 0x4e, 0xad, 0xad, 0x18, 0xd6, 0xeb, 0x02, 0x00, 0xb7, + 0x02, 0x6f, 0xdd, 0xba, 0x2e, 0x9d, 0x9a, 0xdc, 0xf3, 0xa4, 0xa0, 0x58, 0xa3, 0x40, 0x8f, 0x43, + 0xd5, 0xef, 0x04, 0xc2, 0x38, 0x1b, 0x3d, 0x3a, 0x9c, 0xaf, 0x5e, 0xeb, 0x04, 0x98, 0xc2, 0xb4, + 0xf8, 0x82, 0x6a, 0xe9, 0xf8, 0x82, 0xe2, 0x08, 0xbb, 0x6f, 0x57, 0x61, 0x66, 0xcd, 0x27, 0x77, + 0x8d, 0x56, 0x3f, 0x03, 0x23, 0x6e, 0xe4, 0xed, 0x93, 0x28, 0xeb, 0xbc, 0xa8, 0x33, 0x28, 0x16, + 0xd8, 0xd2, 0x21, 0x0f, 0x46, 0xb8, 0x47, 0x75, 0xc0, 0xe1, 0x1e, 0x85, 0x7d, 0x46, 0xdb, 0x30, + 0x1a, 0xf2, 0xcd, 0xf3, 0xec, 0x30, 0x13, 0xc5, 0xd7, 0x8e, 0x6f, 0x4c, 0x76, 0x7c, 0x16, 0xc4, + 0xd6, 0x9b, 0x1f, 0x3f, 0x2b, 0x2d, 0x26, 0xa0, 0x58, 0x32, 0x9f, 0xfb, 0x14, 0x4c, 0xe8, 0x94, + 0x7d, 0x9d, 0x43, 0xff, 0x92, 0x05, 0x27, 0xd7, 0xfc, 0xb0, 0x75, 0x3b, 0x13, 0x93, 0xf2, 0x32, + 0x8c, 0xd3, 0xc9, 0x14, 0x1b, 0x81, 0x5a, 0x46, 0x44, 0x9a, 0x40, 0x61, 0x9d, 0x4e, 0x2b, 0x76, + 0xf3, 0xe6, 0x7a, 0x3d, 0x2f, 0x90, 0x4d, 0xa0, 0xb0, 0x4e, 0x67, 0xff, 0x67, 0x0b, 0x9e, 0xbc, + 0xbc, 0xb2, 0xda, 0x20, 0x51, 0xec, 0xc5, 0x09, 0x09, 0x92, 0xae, 0x58, 0xba, 0x67, 0x60, 0xa4, + 0xed, 0x6a, 0x4d, 0x51, 0x22, 0xd0, 0xa8, 0xb3, 0x56, 0x08, 0xec, 0xa3, 0x12, 0x50, 0xfa, 0x6b, + 0x16, 0x9c, 0xbc, 0xec, 0x25, 0x98, 0xb4, 0xc3, 0x6c, 0xf8, 0x5b, 0x44, 0xda, 0x61, 0xec, 0x25, + 0x61, 0x74, 0x90, 0x0d, 0x7f, 0xc3, 0x0a, 0x83, 0x35, 0x2a, 0x5e, 0xf3, 0xbe, 0x17, 0xd3, 0x96, + 0x56, 0xcc, 0x4d, 0x1d, 0x16, 0x70, 0xac, 0x28, 0x68, 0xc7, 0x5c, 0x2f, 0x62, 0x46, 0xc2, 0x81, + 0x98, 0xc1, 0xaa, 0x63, 0x75, 0x89, 0xc0, 0x29, 0x8d, 0xfd, 0xf7, 0x2d, 0x38, 0x7d, 0xd9, 0xef, + 0xc4, 0x09, 0x89, 0xb6, 0x63, 0xa3, 0xb1, 0x2f, 0x42, 0x8d, 0x48, 0x83, 0x56, 0xb4, 0x55, 0x2d, + 0x19, 0xca, 0xd2, 0xe5, 0xb1, 0x77, 0x8a, 0xae, 0x44, 0xa8, 0x57, 0x7f, 0x81, 0x49, 0xbf, 0x55, + 0x81, 0xc9, 0x2b, 0x9b, 0x9b, 0x8d, 0xcb, 0x24, 0x11, 0x5a, 0xb2, 0xd8, 0xfd, 0xd2, 0xd0, 0xf6, + 0x9e, 0xe3, 0x97, 0x16, 0x7a, 0xcc, 0xba, 0x4e, 0xe2, 0xf9, 0x0b, 0x3c, 0xd4, 0x79, 0x61, 0x3d, + 0x48, 0x6e, 0x44, 0xcd, 0x24, 0xf2, 0x82, 0x9d, 0xdc, 0xbd, 0xaa, 0xd4, 0xe4, 0xd5, 0x5e, 0x9a, + 0x1c, 0xbd, 0x08, 0x23, 0x2c, 0xd2, 0x5a, 0x1a, 0x1d, 0x1f, 0x56, 0xf6, 0x01, 0x83, 0xde, 0x3b, + 0x9c, 0xaf, 0xdd, 0xc4, 0xeb, 0xfc, 0x0f, 0x16, 0xa4, 0xe8, 0x4b, 0x30, 0xbe, 0x9b, 0x24, 0xed, + 0x2b, 0xc4, 0x71, 0x49, 0x24, 0xb5, 0x44, 0x81, 0x79, 0x46, 0x07, 0x83, 0x17, 0x48, 0x27, 0x56, + 0x0a, 0x8b, 0xb1, 0xce, 0xd1, 0x6e, 0x02, 0xa4, 0xb8, 0x07, 0xb4, 0xe7, 0xb0, 0xff, 0x5a, 0x05, + 0x46, 0xaf, 0x38, 0x81, 0xeb, 0x93, 0x08, 0xad, 0xc1, 0x10, 0xb9, 0x4b, 0x5a, 0xe5, 0x2c, 0xcb, + 0x74, 0xa9, 0xe3, 0xfe, 0x23, 0xfa, 0x1f, 0xb3, 0xf2, 0x08, 0xc3, 0x28, 0x6d, 0xf7, 0x65, 0x15, + 0x1f, 0xf9, 0x7c, 0xf1, 0x28, 0x28, 0x91, 0xe0, 0xeb, 0xa4, 0x00, 0x61, 0xc9, 0x88, 0x79, 0x5a, + 0x5a, 0xed, 0x26, 0x55, 0x6e, 0x49, 0xb9, 0x10, 0xe8, 0xcd, 0x95, 0x06, 0x27, 0x17, 0x7c, 0xb9, + 0xa7, 0x45, 0x02, 0x71, 0xca, 0xce, 0x7e, 0x15, 0x4e, 0xb1, 0x23, 0x3a, 0x27, 0xd9, 0x35, 0xe6, + 0x4c, 0xa1, 0x70, 0xda, 0xff, 0xa8, 0x02, 0x27, 0xd6, 0x9b, 0x2b, 0x4d, 0xd3, 0x47, 0xf6, 0x2a, + 0x4c, 0xf0, 0xe5, 0x99, 0x0a, 0x9d, 0xe3, 0x8b, 0xf2, 0xca, 0xb9, 0xbc, 0xa9, 0xe1, 0xb0, 0x41, + 0x89, 0x9e, 0x84, 0xaa, 0xf7, 0x6e, 0x90, 0x8d, 0xd4, 0x59, 0x7f, 0xf3, 0x3a, 0xa6, 0x70, 0x8a, + 0xa6, 0x2b, 0x3d, 0x57, 0x71, 0x0a, 0xad, 0x56, 0xfb, 0x37, 0x60, 0xca, 0x8b, 0x5b, 0xb1, 0xb7, + 0x1e, 0xd0, 0xf9, 0xef, 0xb4, 0xa4, 0xf8, 0xa6, 0x46, 0x39, 0x6d, 0xaa, 0xc2, 0xe2, 0x0c, 0xb5, + 0xa6, 0x6f, 0x87, 0x4b, 0x5b, 0x0b, 0xc5, 0x81, 0x92, 0x5f, 0x81, 0x9a, 0x0a, 0x6b, 0x91, 0xa1, + 0x48, 0x56, 0x7e, 0x28, 0x52, 0x09, 0x85, 0x23, 0x3d, 0x97, 0xd5, 0x5c, 0xcf, 0xe5, 0x6f, 0x58, + 0x90, 0x9e, 0xe0, 0x23, 0x0c, 0xb5, 0x76, 0xc8, 0x8e, 0x05, 0x22, 0x79, 0xf2, 0xf6, 0x74, 0x81, + 0x24, 0xf2, 0x99, 0xc0, 0x65, 0xa5, 0x21, 0xcb, 0xe2, 0x94, 0x0d, 0xba, 0x06, 0xa3, 0xed, 0x88, + 0x34, 0x13, 0x16, 0x6d, 0xdb, 0x07, 0x47, 0x26, 0xd5, 0x0d, 0x5e, 0x12, 0x4b, 0x16, 0xf6, 0xbf, + 0xb6, 0x00, 0xae, 0x79, 0x7b, 0x5e, 0x82, 0x9d, 0x60, 0x87, 0x0c, 0x70, 0x7b, 0x77, 0x1d, 0x86, + 0xe2, 0x36, 0x69, 0x95, 0x3b, 0xd0, 0x49, 0x5b, 0xd4, 0x6c, 0x93, 0x56, 0xfa, 0x19, 0xe8, 0x3f, + 0xcc, 0xf8, 0xd8, 0xbf, 0x09, 0x30, 0x95, 0x92, 0x51, 0x43, 0x1b, 0xbd, 0x60, 0x84, 0x97, 0x3e, + 0x9e, 0x09, 0x2f, 0xad, 0x31, 0x6a, 0x2d, 0xa2, 0x34, 0x81, 0xea, 0x9e, 0x73, 0x57, 0xd8, 0xf5, + 0x2f, 0x97, 0x6d, 0x10, 0xad, 0x69, 0x61, 0xc3, 0xb9, 0xcb, 0xcd, 0xa8, 0xe7, 0xa5, 0x00, 0x6d, + 0x38, 0x77, 0xef, 0xf1, 0x63, 0x1b, 0x36, 0x03, 0xe9, 0x46, 0xe2, 0xeb, 0xff, 0x35, 0xfd, 0xcf, + 0x94, 0x22, 0xad, 0x8e, 0xd5, 0xea, 0x05, 0xc2, 0x01, 0xd7, 0x67, 0xad, 0x5e, 0x90, 0xad, 0xd5, + 0x0b, 0x4a, 0xd4, 0xea, 0x05, 0xe8, 0x3d, 0x0b, 0x46, 0x85, 0xdf, 0x9a, 0xc5, 0x42, 0x8d, 0x5f, + 0xfa, 0x64, 0x5f, 0x55, 0x0b, 0x07, 0x38, 0xaf, 0x7e, 0x51, 0xda, 0x8e, 0x02, 0x5a, 0xd8, 0x04, + 0x59, 0x35, 0xfa, 0x8e, 0x05, 0x53, 0xe2, 0x37, 0x26, 0xef, 0x76, 0x48, 0x9c, 0x88, 0x55, 0xea, + 0x33, 0xf7, 0xd3, 0x1a, 0xc1, 0x82, 0x37, 0xea, 0x13, 0x52, 0xc5, 0x98, 0xc8, 0xc2, 0xb6, 0x65, + 0xda, 0x83, 0x7e, 0x68, 0xc1, 0xa9, 0x3d, 0xe7, 0x2e, 0xaf, 0x91, 0xc3, 0xb0, 0x93, 0x78, 0xa1, + 0x88, 0xf7, 0x5a, 0xeb, 0x57, 0x4e, 0xba, 0x18, 0xf1, 0xe6, 0xbe, 0x2e, 0x0f, 0x13, 0xf3, 0x48, + 0x0a, 0x1b, 0x9d, 0xdb, 0xc2, 0x39, 0x17, 0xc6, 0xa4, 0x60, 0xe6, 0x58, 0xed, 0xcb, 0xfa, 0x62, + 0x7c, 0xfc, 0x0c, 0x94, 0x9e, 0xad, 0x85, 0x37, 0x3b, 0x4e, 0x90, 0x78, 0xc9, 0x81, 0x66, 0xe3, + 0xb3, 0x5a, 0x84, 0x20, 0x0e, 0xb0, 0x96, 0x5d, 0x98, 0xd0, 0x65, 0x6e, 0x80, 0x35, 0x85, 0x70, + 0x32, 0x47, 0x9e, 0x06, 0x58, 0x61, 0x07, 0x1e, 0xef, 0x29, 0x17, 0x83, 0xab, 0xd6, 0xfe, 0x2d, + 0x4b, 0x57, 0x98, 0x03, 0xf7, 0x9b, 0x6c, 0x98, 0x7e, 0x93, 0xf3, 0x65, 0xe7, 0x4d, 0x0f, 0xe7, + 0xc9, 0xb6, 0xde, 0x78, 0xba, 0x0c, 0xa0, 0x4d, 0x18, 0xf1, 0x29, 0x44, 0x1e, 0xd0, 0x5c, 0xe8, + 0x67, 0x66, 0xa6, 0x96, 0x05, 0x83, 0xc7, 0x58, 0xf0, 0xb2, 0x7f, 0x60, 0xc1, 0xd0, 0xc0, 0xc7, + 0xa6, 0x61, 0x8e, 0x4d, 0x2f, 0xe3, 0x54, 0xdc, 0xb9, 0x5c, 0xc0, 0xce, 0x9d, 0xd5, 0xbb, 0x09, + 0x09, 0x62, 0x66, 0x44, 0xe6, 0x0e, 0xcf, 0xaf, 0x57, 0x60, 0x9c, 0x56, 0x24, 0x8f, 0xd7, 0x5f, + 0x83, 0x49, 0xdf, 0xd9, 0x22, 0xbe, 0xf4, 0xf0, 0x66, 0x37, 0x5c, 0xd7, 0x74, 0x24, 0x36, 0x69, + 0x69, 0xe1, 0x6d, 0xdd, 0x01, 0x2e, 0x8c, 0x21, 0x55, 0xd8, 0xf0, 0x8e, 0x63, 0x93, 0x96, 0xda, + 0xfc, 0x77, 0x9c, 0xa4, 0xb5, 0x2b, 0x36, 0x63, 0xaa, 0xb9, 0xb7, 0x28, 0x10, 0x73, 0x1c, 0x5a, + 0x82, 0x69, 0x29, 0xab, 0x6f, 0xd1, 0x5d, 0x7a, 0x18, 0x08, 0x43, 0x51, 0x5d, 0x94, 0xc3, 0x26, + 0x1a, 0x67, 0xe9, 0xd1, 0xa7, 0x60, 0x8a, 0x0e, 0x4e, 0xd8, 0x49, 0x64, 0xf0, 0xc0, 0x30, 0x0b, + 0x1e, 0x60, 0x31, 0x9a, 0x9b, 0x06, 0x06, 0x67, 0x28, 0xed, 0x2f, 0xc1, 0xc9, 0x6b, 0xa1, 0xe3, + 0x2e, 0x3b, 0xbe, 0x13, 0xb4, 0x48, 0xb4, 0x1e, 0xec, 0x14, 0x9e, 0xb3, 0xea, 0x67, 0xa1, 0x95, + 0xa2, 0xb3, 0x50, 0x3b, 0x02, 0xa4, 0x57, 0x20, 0xc2, 0x5e, 0xde, 0x81, 0x51, 0x8f, 0x57, 0x25, + 0x44, 0xf6, 0x62, 0x91, 0x3b, 0xa9, 0xab, 0x8d, 0x5a, 0x18, 0x07, 0x07, 0x60, 0xc9, 0x92, 0xee, + 0x21, 0xf2, 0xfc, 0x4f, 0xc5, 0xdb, 0x34, 0xfb, 0x6f, 0x58, 0x30, 0x7d, 0x3d, 0x73, 0x1b, 0xeb, + 0x19, 0x18, 0x89, 0x49, 0x94, 0xe3, 0x4c, 0x6b, 0x32, 0x28, 0x16, 0xd8, 0x07, 0xbe, 0x41, 0xff, + 0x46, 0x05, 0x6a, 0x2c, 0x74, 0xb2, 0xed, 0xb4, 0x06, 0x69, 0x8e, 0x6e, 0x18, 0xe6, 0x68, 0xc1, + 0xf6, 0x50, 0x35, 0xa8, 0x97, 0x35, 0x8a, 0x6e, 0xaa, 0xdb, 0x49, 0xa5, 0x76, 0x86, 0x29, 0x43, + 0x7e, 0x97, 0x65, 0xca, 0xbc, 0xcc, 0x24, 0x6f, 0x2e, 0xb1, 0xd3, 0x49, 0x45, 0xfb, 0x88, 0x9d, + 0x4e, 0xaa, 0x76, 0xf5, 0x50, 0x49, 0x0d, 0xad, 0xe9, 0x4c, 0x61, 0x7f, 0x9a, 0x85, 0xc2, 0x39, + 0xbe, 0xf7, 0x55, 0xa2, 0xae, 0xf8, 0xcd, 0x8b, 0xe0, 0x36, 0x01, 0xbd, 0xc7, 0xb4, 0x8b, 0xf8, + 0xc7, 0x6f, 0x6e, 0xa6, 0x45, 0xec, 0x2b, 0x30, 0x9d, 0x19, 0x38, 0xf4, 0x32, 0x0c, 0xb7, 0x77, + 0x9d, 0x98, 0x64, 0xc2, 0x2c, 0x86, 0x1b, 0x14, 0x78, 0xef, 0x70, 0x7e, 0x4a, 0x15, 0x60, 0x10, + 0xcc, 0xa9, 0xed, 0x3f, 0xb7, 0x60, 0xe8, 0x7a, 0xe8, 0x0e, 0x52, 0xc0, 0xae, 0x18, 0x02, 0xf6, + 0x4c, 0xf1, 0x7d, 0xef, 0x9e, 0xb2, 0xd5, 0xc8, 0xc8, 0xd6, 0xf9, 0x12, 0xbc, 0x8e, 0x17, 0xab, + 0x3d, 0x18, 0x67, 0xf7, 0xc9, 0x45, 0x7c, 0xc9, 0x8b, 0xc6, 0xbe, 0x69, 0x3e, 0xb3, 0x6f, 0x9a, + 0xd6, 0x48, 0xb5, 0xdd, 0xd3, 0xb3, 0x30, 0x2a, 0xe2, 0x19, 0xb2, 0x21, 0x80, 0x82, 0x16, 0x4b, + 0xbc, 0xfd, 0x2f, 0xab, 0x60, 0xdc, 0x5f, 0x47, 0xbf, 0x6f, 0xc1, 0x42, 0xc4, 0xaf, 0x1d, 0xb8, + 0xf5, 0x4e, 0xe4, 0x05, 0x3b, 0xcd, 0xd6, 0x2e, 0x71, 0x3b, 0xbe, 0x17, 0xec, 0xac, 0xef, 0x04, + 0xa1, 0x02, 0xaf, 0xde, 0x25, 0xad, 0x0e, 0x73, 0xaa, 0x96, 0xbe, 0x36, 0xaf, 0xce, 0x34, 0x2f, + 0x1d, 0x1d, 0xce, 0x2f, 0xe0, 0xbe, 0x6a, 0xc1, 0x7d, 0xb6, 0x0a, 0xfd, 0x91, 0x05, 0x8b, 0xfc, + 0x06, 0x77, 0xf9, 0x9e, 0x94, 0xda, 0x6f, 0x36, 0x24, 0xd3, 0x94, 0xdd, 0x26, 0x89, 0xf6, 0x96, + 0x5f, 0x11, 0x83, 0xbc, 0xd8, 0xe8, 0xaf, 0x56, 0xdc, 0x6f, 0x33, 0xed, 0xdf, 0xae, 0xc2, 0x24, + 0x1d, 0xcf, 0xf4, 0xf6, 0xe6, 0xcb, 0x86, 0x98, 0x7c, 0x24, 0x23, 0x26, 0x27, 0x0c, 0xe2, 0x07, + 0x73, 0x71, 0xf3, 0x5d, 0x38, 0xe1, 0x3b, 0x71, 0x72, 0x85, 0x38, 0x51, 0xb2, 0x45, 0x1c, 0x76, + 0x8c, 0x58, 0x3c, 0x09, 0x32, 0xe7, 0x92, 0x2a, 0x42, 0xe6, 0x5a, 0x96, 0x15, 0xee, 0xe6, 0x8e, + 0x12, 0x40, 0xec, 0xc0, 0x32, 0x72, 0x82, 0x98, 0xf7, 0xc4, 0x13, 0x4e, 0xd8, 0x7e, 0xea, 0x9c, + 0x13, 0x75, 0xa2, 0x6b, 0x5d, 0xbc, 0x70, 0x0e, 0x7f, 0xed, 0x30, 0x7a, 0xb8, 0xec, 0x61, 0xf4, + 0x48, 0x41, 0xdc, 0xed, 0x2f, 0x5b, 0x70, 0x92, 0x7e, 0x12, 0x33, 0x46, 0x33, 0x46, 0x21, 0x4c, + 0xd3, 0xe6, 0xfb, 0x24, 0x91, 0xb0, 0xe2, 0x75, 0x84, 0x05, 0xd2, 0x19, 0x7c, 0x52, 0x43, 0xed, + 0xaa, 0xc9, 0x0c, 0x67, 0xb9, 0xdb, 0xdf, 0xb5, 0x80, 0x05, 0x81, 0x0d, 0x7c, 0xf9, 0xba, 0x6c, + 0x2e, 0x5f, 0x76, 0xb1, 0xae, 0xe8, 0xb1, 0x72, 0xbd, 0x04, 0x33, 0x14, 0xdb, 0x88, 0xc2, 0xbb, + 0x07, 0xd2, 0xa0, 0x2e, 0xf6, 0xc4, 0xbe, 0x57, 0xe1, 0x13, 0x46, 0xdd, 0x9c, 0x42, 0xbf, 0x62, + 0xc1, 0x58, 0xcb, 0x69, 0x3b, 0x2d, 0x9e, 0xf7, 0xa3, 0x84, 0xd7, 0xc5, 0x28, 0xbf, 0xb0, 0x22, + 0xca, 0x72, 0x8f, 0xc1, 0xc7, 0x65, 0xd7, 0x25, 0xb8, 0xd0, 0x4b, 0xa0, 0x2a, 0x9f, 0xf3, 0x60, + 0xd2, 0x60, 0x36, 0xc0, 0x6d, 0xe6, 0xaf, 0x58, 0x5c, 0xd9, 0xab, 0x0d, 0xc1, 0x1d, 0x38, 0x11, + 0x68, 0xff, 0xa9, 0x1a, 0x93, 0xf6, 0xef, 0x42, 0x79, 0x75, 0xce, 0xb4, 0x9f, 0x16, 0xec, 0x96, + 0x61, 0x88, 0xbb, 0xeb, 0xb0, 0xff, 0xb1, 0x05, 0x8f, 0xe9, 0x84, 0xda, 0x45, 0xb7, 0x22, 0x2f, + 0x70, 0x1d, 0xc6, 0xc2, 0x36, 0x89, 0x9c, 0x74, 0xf3, 0x73, 0x5e, 0x8e, 0xfe, 0x0d, 0x01, 0xbf, + 0x77, 0x38, 0x7f, 0x4a, 0xe7, 0x2e, 0xe1, 0x58, 0x95, 0x44, 0x36, 0x8c, 0xb0, 0x71, 0x89, 0xc5, + 0x15, 0x45, 0x96, 0x05, 0x83, 0x9d, 0x7d, 0xc4, 0x58, 0x60, 0xec, 0xbf, 0x69, 0x71, 0x61, 0xd3, + 0x9b, 0x8e, 0xbe, 0x06, 0x33, 0x7b, 0x74, 0x9f, 0xb4, 0x7a, 0xb7, 0x4d, 0x17, 0x50, 0x76, 0xe6, + 0x6b, 0x95, 0x59, 0x36, 0x7a, 0x74, 0x77, 0x79, 0x56, 0xb4, 0x7e, 0x66, 0x23, 0xc3, 0x16, 0x77, + 0x55, 0x64, 0xff, 0xb1, 0x98, 0xaf, 0xcc, 0x66, 0x7b, 0x16, 0x46, 0xdb, 0xa1, 0xbb, 0xb2, 0x5e, + 0xc7, 0x62, 0xac, 0x94, 0xc2, 0x69, 0x70, 0x30, 0x96, 0x78, 0x74, 0x09, 0x80, 0xdc, 0x4d, 0x48, + 0x14, 0x38, 0xbe, 0x3a, 0xab, 0x55, 0x26, 0xd2, 0xaa, 0xc2, 0x60, 0x8d, 0x8a, 0x96, 0x69, 0x47, + 0xe1, 0xbe, 0xe7, 0xb2, 0xc8, 0xf3, 0xaa, 0x59, 0xa6, 0xa1, 0x30, 0x58, 0xa3, 0xa2, 0xbb, 0xd3, + 0x4e, 0x10, 0xf3, 0xe5, 0xcb, 0xd9, 0x12, 0xc9, 0x1b, 0xc6, 0xd2, 0xdd, 0xe9, 0x4d, 0x1d, 0x89, + 0x4d, 0x5a, 0xfb, 0x67, 0x35, 0x80, 0xd4, 0x40, 0x42, 0xef, 0x75, 0xcf, 0xd0, 0x4f, 0x94, 0xb5, + 0xae, 0x1e, 0xdc, 0xf4, 0x44, 0xdf, 0xb2, 0x60, 0xdc, 0xf1, 0xfd, 0xb0, 0xe5, 0x24, 0xac, 0x47, + 0x95, 0xb2, 0xba, 0x42, 0xb4, 0x64, 0x29, 0x2d, 0xcb, 0x1b, 0xf3, 0xa2, 0x3c, 0xca, 0xd3, 0x30, + 0x85, 0xed, 0xd1, 0x9b, 0x80, 0x3e, 0x2e, 0x0d, 0x6b, 0xfe, 0x51, 0xe6, 0xb2, 0x86, 0x75, 0x8d, + 0x69, 0x48, 0xcd, 0xa6, 0x46, 0x5f, 0x32, 0xf2, 0x14, 0x0c, 0x95, 0xb9, 0x1d, 0x6b, 0x98, 0x0c, + 0x45, 0x29, 0x0a, 0xd0, 0xe7, 0xf5, 0xa0, 0xdc, 0xe1, 0x32, 0x57, 0x4f, 0x35, 0xcb, 0xb5, 0x20, + 0x20, 0x37, 0x81, 0x69, 0xd7, 0x5c, 0x28, 0x45, 0xa0, 0xd5, 0xc5, 0xe2, 0x1a, 0x32, 0x2b, 0x6c, + 0xba, 0x34, 0x66, 0x10, 0x38, 0x5b, 0x05, 0x5d, 0x0d, 0xa9, 0xda, 0x5a, 0x0f, 0xb6, 0x43, 0x11, + 0x6e, 0x75, 0xa1, 0xc4, 0x37, 0x3f, 0x88, 0x13, 0xb2, 0x47, 0xcb, 0xa4, 0xab, 0xe1, 0x75, 0xc1, + 0x05, 0x2b, 0x7e, 0x68, 0x13, 0x46, 0xd8, 0x05, 0x8f, 0x78, 0x76, 0xac, 0x8c, 0x7b, 0xcc, 0xbc, + 0xd1, 0x98, 0x1a, 0x20, 0xec, 0x6f, 0x8c, 0x05, 0x2f, 0x74, 0x45, 0xde, 0x00, 0x8e, 0xd7, 0x83, + 0x9b, 0x31, 0x61, 0x37, 0x80, 0x6b, 0xcb, 0x1f, 0x4d, 0xaf, 0xf4, 0x72, 0x78, 0x6e, 0x66, 0x26, + 0xa3, 0x24, 0xb5, 0x43, 0xc4, 0x7f, 0x99, 0xf0, 0x69, 0x16, 0xca, 0x34, 0xd4, 0x4c, 0x0f, 0x95, + 0x0e, 0xf6, 0x5b, 0x26, 0x33, 0x9c, 0xe5, 0xfe, 0x10, 0xd7, 0xc0, 0x39, 0x1f, 0x66, 0xb2, 0x53, + 0x72, 0x80, 0x2b, 0xee, 0x9f, 0x0d, 0xc1, 0x94, 0x29, 0x18, 0x68, 0x11, 0x6a, 0x7b, 0x2c, 0x1d, + 0x53, 0x9a, 0x04, 0x46, 0xc9, 0xff, 0x86, 0x44, 0xe0, 0x94, 0x86, 0xa5, 0xc3, 0x61, 0xc5, 0xb5, + 0x40, 0x9b, 0x34, 0x1d, 0x8e, 0xc2, 0x60, 0x8d, 0x8a, 0x1a, 0xad, 0x5b, 0x61, 0x98, 0x28, 0xc5, + 0xad, 0x64, 0x66, 0x99, 0x41, 0xb1, 0xc0, 0x52, 0x85, 0x7d, 0x9b, 0x76, 0xc8, 0x37, 0x5d, 0x7d, + 0x4a, 0x61, 0x5f, 0xd5, 0x91, 0xd8, 0xa4, 0xa5, 0x0b, 0x50, 0x18, 0x33, 0x21, 0x14, 0xa6, 0x71, + 0x1a, 0xb8, 0xd4, 0xe4, 0x17, 0x9e, 0x24, 0x1e, 0x7d, 0x0e, 0x1e, 0x53, 0xf7, 0x93, 0x30, 0x77, + 0x9d, 0xca, 0x1a, 0x47, 0x8c, 0x9d, 0xed, 0x63, 0x2b, 0xf9, 0x64, 0xb8, 0x57, 0x79, 0xf4, 0x06, + 0x4c, 0x09, 0xb3, 0x56, 0x72, 0x1c, 0x35, 0xcf, 0xb5, 0xaf, 0x1a, 0x58, 0x9c, 0xa1, 0x46, 0x75, + 0x98, 0xa1, 0x10, 0x66, 0x51, 0x4a, 0x0e, 0xfc, 0x9e, 0x95, 0x5a, 0x99, 0xaf, 0x66, 0xf0, 0xb8, + 0xab, 0x04, 0x5a, 0x82, 0x69, 0x6e, 0x5b, 0xd0, 0xfd, 0x1b, 0xfb, 0x0e, 0x22, 0x42, 0x52, 0x4d, + 0x82, 0x1b, 0x26, 0x1a, 0x67, 0xe9, 0xd1, 0xab, 0x30, 0xe1, 0x44, 0xad, 0x5d, 0x2f, 0x21, 0xad, + 0xa4, 0x13, 0xf1, 0xbb, 0xf5, 0x5a, 0x60, 0xc0, 0x92, 0x86, 0xc3, 0x06, 0xa5, 0xfd, 0x55, 0x38, + 0x99, 0x13, 0x82, 0x4d, 0x05, 0xc7, 0x69, 0x7b, 0xb2, 0x4f, 0x99, 0x10, 0xa4, 0xa5, 0xc6, 0xba, + 0xec, 0x8d, 0x46, 0x45, 0xa5, 0x93, 0xf9, 0x8c, 0xb5, 0xdc, 0x6c, 0x4a, 0x3a, 0xd7, 0x24, 0x02, + 0xa7, 0x34, 0xf6, 0x7f, 0xaf, 0x81, 0xe6, 0x64, 0x29, 0x11, 0x78, 0xf2, 0x2a, 0x4c, 0xc8, 0x74, + 0x83, 0x5a, 0x9a, 0x2f, 0xd5, 0xcd, 0xcb, 0x1a, 0x0e, 0x1b, 0x94, 0xb4, 0x6d, 0x81, 0x74, 0x19, + 0x65, 0x03, 0x9e, 0x94, 0x2f, 0x09, 0xa7, 0x34, 0xe8, 0x02, 0x8c, 0xc5, 0xc4, 0xdf, 0xbe, 0xe6, + 0x05, 0xb7, 0x85, 0x60, 0x2b, 0xad, 0xdc, 0x14, 0x70, 0xac, 0x28, 0xd0, 0x67, 0xa0, 0xda, 0xf1, + 0x5c, 0x21, 0xca, 0x0b, 0xd2, 0xee, 0xbc, 0xb9, 0x5e, 0xbf, 0x77, 0x38, 0x3f, 0x9f, 0x9f, 0x43, + 0x91, 0x6e, 0xa2, 0xe3, 0x05, 0x3a, 0xf9, 0x68, 0xd1, 0x3c, 0xd7, 0xf9, 0x48, 0x9f, 0xae, 0xf3, + 0x4b, 0x00, 0xa2, 0xcf, 0x52, 0x92, 0xab, 0xe9, 0x37, 0xbb, 0xac, 0x30, 0x58, 0xa3, 0xa2, 0x5b, + 0xf1, 0x56, 0x44, 0x1c, 0xb9, 0x63, 0xe5, 0x21, 0xc2, 0x63, 0xf7, 0xbb, 0x15, 0x5f, 0xc9, 0xb2, + 0xc2, 0xdd, 0xdc, 0xd1, 0x1e, 0x9c, 0x70, 0xe9, 0x24, 0x32, 0xaa, 0xac, 0xf5, 0x1b, 0x95, 0x4c, + 0xab, 0xab, 0x67, 0xd9, 0xe0, 0x6e, 0xce, 0xe8, 0x8b, 0x30, 0x27, 0x81, 0xdd, 0x77, 0x0f, 0xd9, + 0x44, 0xa9, 0x2e, 0x9f, 0x3d, 0x3a, 0x9c, 0x9f, 0xab, 0xf7, 0xa4, 0xc2, 0xc7, 0x70, 0x40, 0xef, + 0xc0, 0x08, 0x3b, 0x66, 0x89, 0x67, 0xc7, 0xd9, 0x3a, 0xf7, 0x52, 0x59, 0x47, 0xe3, 0x02, 0x3b, + 0xac, 0x11, 0x71, 0x9b, 0xe9, 0xb9, 0x15, 0x03, 0x62, 0xc1, 0x13, 0xb5, 0x61, 0xdc, 0x09, 0x82, + 0x30, 0x71, 0xb8, 0xf9, 0x35, 0x51, 0xc6, 0x82, 0xd4, 0xaa, 0x58, 0x4a, 0xcb, 0xf2, 0x7a, 0x54, + 0x30, 0x98, 0x86, 0xc1, 0x7a, 0x15, 0x74, 0x01, 0x0f, 0xef, 0x50, 0x55, 0x29, 0x4f, 0x1a, 0xe2, + 0xd9, 0xc9, 0x32, 0x0b, 0xf8, 0x0d, 0xa3, 0x90, 0xa6, 0xbb, 0x4c, 0x66, 0x38, 0xcb, 0x1d, 0x2d, + 0x18, 0xfe, 0xe3, 0xa9, 0x34, 0x2a, 0x39, 0xf5, 0x1f, 0xeb, 0xee, 0x62, 0x76, 0xaf, 0x95, 0x47, + 0x22, 0x32, 0x1d, 0x30, 0x9d, 0xb9, 0xd7, 0x9a, 0xa2, 0xb0, 0x4e, 0x37, 0xf7, 0x49, 0x18, 0xd7, + 0x06, 0xbc, 0x9f, 0xf0, 0xd7, 0xb9, 0x37, 0x60, 0x26, 0x3b, 0x90, 0x7d, 0x85, 0xcf, 0xfe, 0xcf, + 0x0a, 0x4c, 0xe7, 0x1c, 0xdf, 0xdc, 0xf6, 0x58, 0x08, 0xb7, 0xa1, 0xec, 0xae, 0x7a, 0x81, 0x8b, + 0x19, 0xc6, 0x54, 0x59, 0x95, 0x12, 0x2a, 0x4b, 0xea, 0xcf, 0x6a, 0x4f, 0xfd, 0x29, 0xd4, 0xd4, + 0xd0, 0xfd, 0xab, 0x29, 0x73, 0x5d, 0x18, 0x2e, 0xb5, 0x2e, 0x3c, 0x00, 0xd5, 0x66, 0x2c, 0x2d, + 0xa3, 0x25, 0x96, 0x96, 0x7b, 0x16, 0x4c, 0x99, 0x92, 0x57, 0x62, 0xc4, 0x1f, 0xd5, 0x01, 0x5c, + 0x60, 0x5b, 0xb0, 0x24, 0x0a, 0x7d, 0x9f, 0x44, 0x22, 0x30, 0x6e, 0x4a, 0xec, 0xa8, 0x04, 0x14, + 0x6b, 0x14, 0xf6, 0x77, 0x2a, 0x30, 0x93, 0x46, 0x49, 0x8b, 0x84, 0xab, 0x83, 0x3b, 0x12, 0xd9, + 0x34, 0x8e, 0x44, 0x8a, 0xf2, 0xa8, 0x66, 0xda, 0xd5, 0xf3, 0x78, 0xe4, 0x9d, 0xcc, 0xf1, 0xc8, + 0x4b, 0x7d, 0xf2, 0x3d, 0xfe, 0xa8, 0xe4, 0xbb, 0x15, 0x38, 0x9d, 0x2d, 0xb2, 0xe2, 0x3b, 0xde, + 0xde, 0x00, 0xc7, 0xe9, 0x73, 0xc6, 0x38, 0xbd, 0xd2, 0x5f, 0x7f, 0x58, 0xe3, 0x7a, 0x0e, 0x96, + 0x93, 0x19, 0xac, 0x4f, 0xde, 0x0f, 0xf3, 0xe3, 0x47, 0xec, 0x67, 0x16, 0x3c, 0x9e, 0x5b, 0x6e, + 0xe0, 0x0e, 0xe0, 0xb7, 0x4d, 0x07, 0xf0, 0x8b, 0xf7, 0xd1, 0xb7, 0x1e, 0x1e, 0xe1, 0xa3, 0x4a, + 0x8f, 0x3e, 0x31, 0x27, 0xd9, 0x0d, 0x18, 0x77, 0x5a, 0x2d, 0x12, 0xc7, 0x1b, 0xa1, 0xab, 0x92, + 0x00, 0xbd, 0xc0, 0x16, 0xcf, 0x14, 0x7c, 0xef, 0x70, 0x7e, 0x2e, 0xcb, 0x22, 0x45, 0x63, 0x9d, + 0x83, 0x99, 0xcc, 0xab, 0x32, 0xa0, 0x64, 0x5e, 0x97, 0x00, 0xf6, 0xd5, 0xe6, 0x3c, 0xeb, 0x7b, + 0xd3, 0xb6, 0xed, 0x1a, 0x15, 0xfa, 0x02, 0x33, 0x76, 0x79, 0x50, 0xc8, 0x50, 0x91, 0x7f, 0x44, + 0xfb, 0x7a, 0x7a, 0x78, 0x09, 0xbf, 0xb5, 0xa9, 0xbc, 0x94, 0x8a, 0xa1, 0xfd, 0x83, 0x2a, 0x7c, + 0xf8, 0x18, 0x81, 0x43, 0x4b, 0xe6, 0x59, 0xef, 0xf3, 0x59, 0x97, 0xd4, 0x5c, 0x6e, 0x61, 0xc3, + 0x47, 0x95, 0xf9, 0x52, 0x95, 0x0f, 0xfc, 0xa5, 0xbe, 0xad, 0x3b, 0x10, 0x79, 0x4c, 0xe7, 0xe5, + 0xfb, 0x9e, 0x52, 0x3f, 0x9f, 0x0e, 0xff, 0xaf, 0x5b, 0xf0, 0x91, 0xdc, 0x4e, 0x19, 0xf1, 0x24, + 0x8b, 0x50, 0x6b, 0x51, 0xa0, 0x76, 0xe9, 0x26, 0xbd, 0xed, 0x26, 0x11, 0x38, 0xa5, 0x31, 0xc2, + 0x46, 0x2a, 0x85, 0x61, 0x23, 0xff, 0xde, 0x82, 0x53, 0xd9, 0x46, 0x0c, 0x5c, 0xdf, 0x34, 0x4d, + 0x7d, 0xb3, 0xd0, 0xdf, 0x87, 0xef, 0xa1, 0x6a, 0xbe, 0x33, 0x09, 0x67, 0xba, 0xd6, 0x28, 0x3e, + 0x86, 0xbf, 0x68, 0xc1, 0x89, 0x1d, 0xb6, 0xad, 0xd0, 0xee, 0x35, 0x89, 0x5e, 0x15, 0x5c, 0x06, + 0x3b, 0xf6, 0x3a, 0x14, 0xdf, 0x24, 0x75, 0x91, 0xe0, 0xee, 0xca, 0xd0, 0x37, 0x2d, 0x38, 0xe5, + 0xdc, 0x89, 0xbb, 0x92, 0xf6, 0x0b, 0x21, 0x7a, 0xa3, 0xc0, 0x77, 0x57, 0x90, 0xee, 0x7f, 0x79, + 0xf6, 0xe8, 0x70, 0xfe, 0x54, 0x1e, 0x15, 0xce, 0xad, 0x15, 0xbd, 0x23, 0x52, 0x9e, 0x51, 0x6b, + 0xaf, 0xd4, 0x0d, 0xbd, 0xbc, 0x5b, 0x16, 0x5c, 0x21, 0x49, 0x0c, 0x56, 0x1c, 0xd1, 0x97, 0xa1, + 0xb6, 0x23, 0xaf, 0x32, 0x09, 0x75, 0x57, 0xb0, 0xa6, 0xe4, 0xde, 0x7c, 0xe2, 0xb1, 0xfc, 0x0a, + 0x85, 0x53, 0xa6, 0xe8, 0x0a, 0x54, 0x83, 0xed, 0x58, 0x5c, 0x17, 0x2e, 0x8a, 0x19, 0x32, 0x23, + 0xb4, 0xf8, 0x3d, 0xcb, 0xeb, 0x6b, 0x4d, 0x4c, 0x59, 0x50, 0x4e, 0xd1, 0x96, 0x2b, 0x9c, 0xd6, + 0x05, 0x9c, 0xf0, 0x72, 0xbd, 0x9b, 0x13, 0x5e, 0xae, 0x63, 0xca, 0x82, 0x05, 0x27, 0xc6, 0xad, + 0xd8, 0x13, 0x1e, 0xe9, 0x82, 0xbb, 0xe4, 0x5d, 0x77, 0x4f, 0x78, 0xf6, 0x3b, 0x06, 0xc6, 0x9c, + 0x11, 0xda, 0x84, 0x91, 0x16, 0xcb, 0x53, 0x2d, 0x1c, 0x06, 0x45, 0xd9, 0x8b, 0xbb, 0x72, 0x5a, + 0xf3, 0x93, 0x33, 0x0e, 0xc7, 0x82, 0x17, 0xe3, 0x4a, 0xda, 0xbb, 0xdb, 0xb1, 0xf0, 0x09, 0x14, + 0x71, 0xed, 0xca, 0x38, 0x2e, 0xb8, 0x32, 0x38, 0x16, 0xbc, 0x50, 0x1d, 0x2a, 0xdb, 0x2d, 0x91, + 0x72, 0xb2, 0x60, 0x23, 0x6b, 0x5e, 0x9a, 0x5d, 0x1e, 0x39, 0x3a, 0x9c, 0xaf, 0xac, 0xad, 0xe0, + 0xca, 0x76, 0x0b, 0xbd, 0x0d, 0xa3, 0xdb, 0xfc, 0x1a, 0xa4, 0x48, 0x2f, 0x79, 0xb1, 0xe8, 0xae, + 0x66, 0xd7, 0x9d, 0x49, 0x7e, 0x5f, 0x43, 0x20, 0xb0, 0x64, 0x87, 0xbe, 0x08, 0xb0, 0xad, 0x2e, + 0x76, 0x8a, 0xfc, 0x92, 0x0b, 0xfd, 0x5d, 0x04, 0x15, 0x9b, 0x66, 0x05, 0xc5, 0x1a, 0x47, 0x2a, + 0xf3, 0x8e, 0x4c, 0xb5, 0xcf, 0x72, 0x4b, 0x16, 0xca, 0x7c, 0x6e, 0x66, 0x7e, 0x2e, 0xf3, 0x0a, + 0x85, 0x53, 0xa6, 0xa8, 0x03, 0x93, 0xfb, 0x71, 0x7b, 0x97, 0xc8, 0xa9, 0xcf, 0x12, 0x4e, 0x8e, + 0x5f, 0x7a, 0xbd, 0x20, 0x8b, 0xa8, 0x28, 0xe2, 0x45, 0x49, 0xc7, 0xf1, 0xbb, 0x34, 0x18, 0x4b, + 0xe1, 0xf4, 0x96, 0xce, 0x16, 0x9b, 0xb5, 0xd0, 0x4f, 0xf2, 0x6e, 0x27, 0xdc, 0x3a, 0x48, 0x88, + 0x48, 0x48, 0x59, 0xf0, 0x49, 0xde, 0xe4, 0xc4, 0xdd, 0x9f, 0x44, 0x20, 0xb0, 0x64, 0xa7, 0x86, + 0x8c, 0x69, 0xe3, 0x99, 0xd2, 0x43, 0xd6, 0xd5, 0x87, 0x74, 0xc8, 0x98, 0xf6, 0x4d, 0x99, 0x32, + 0xad, 0xdb, 0xde, 0x0d, 0x93, 0x30, 0xc8, 0xe8, 0xfe, 0x13, 0x65, 0xb4, 0x6e, 0x23, 0xa7, 0x64, + 0xb7, 0xd6, 0xcd, 0xa3, 0xc2, 0xb9, 0xb5, 0xda, 0x7f, 0x3c, 0xdc, 0xbd, 0xd8, 0x32, 0x43, 0xf8, + 0x57, 0xbb, 0x8f, 0x53, 0x3f, 0xd3, 0xff, 0x2e, 0xef, 0x01, 0x1e, 0xac, 0x7e, 0xd3, 0x82, 0x33, + 0xed, 0xdc, 0xc5, 0x54, 0x2c, 0x58, 0xfd, 0x6e, 0x16, 0xf9, 0x80, 0xa9, 0x6c, 0xab, 0xf9, 0x78, + 0xdc, 0xa3, 0xce, 0xac, 0xf9, 0x59, 0xfd, 0xc0, 0xe6, 0xe7, 0x2d, 0x18, 0x63, 0x16, 0x53, 0x9a, + 0xfa, 0xa3, 0xcf, 0x6c, 0x19, 0x6c, 0xe9, 0x5b, 0x11, 0x2c, 0xb0, 0x62, 0x46, 0x07, 0xee, 0xc9, + 0x6c, 0x27, 0x30, 0x61, 0x68, 0x91, 0x26, 0x96, 0x7b, 0x24, 0xd6, 0xc4, 0x48, 0x3c, 0xd9, 0x38, + 0x8e, 0xf8, 0x5e, 0x11, 0x01, 0x3e, 0xbe, 0xb2, 0x87, 0x69, 0xce, 0xfe, 0x33, 0x2b, 0xc7, 0xfe, + 0xe2, 0x1b, 0x90, 0xd7, 0xcd, 0x0d, 0xc8, 0x33, 0xd9, 0x0d, 0x48, 0x97, 0xa3, 0xc0, 0xd8, 0x7b, + 0x94, 0xcf, 0x99, 0x58, 0x36, 0x37, 0x89, 0xed, 0xc3, 0xb9, 0xa2, 0xc9, 0xcd, 0x02, 0x97, 0x5c, + 0x75, 0x0a, 0x98, 0x06, 0x2e, 0xb9, 0xeb, 0x75, 0xcc, 0x30, 0x65, 0x2f, 0xb9, 0xdb, 0xff, 0xdb, + 0x82, 0x6a, 0x23, 0x74, 0x07, 0xe8, 0xf8, 0xb8, 0x6c, 0x38, 0x3e, 0x9e, 0x2e, 0x7c, 0x60, 0xa8, + 0xa7, 0x9b, 0xe3, 0x46, 0xc6, 0xcd, 0xf1, 0xb1, 0x62, 0x56, 0xc7, 0x3b, 0x35, 0x7e, 0x58, 0x05, + 0xfd, 0x89, 0x24, 0xf4, 0x07, 0xf7, 0x13, 0xc1, 0x5a, 0x2d, 0xf7, 0x6a, 0x92, 0xa8, 0x83, 0x45, + 0x3c, 0xc9, 0x5b, 0x6d, 0x3f, 0xb7, 0x81, 0xac, 0xb7, 0x88, 0xb7, 0xb3, 0x9b, 0x10, 0x37, 0xdb, + 0xb1, 0x87, 0x17, 0xc8, 0xfa, 0xdf, 0x2c, 0x98, 0xce, 0xd4, 0x8e, 0xbe, 0x92, 0x77, 0x3d, 0xe6, + 0xbe, 0x9c, 0x19, 0x27, 0x0a, 0x6f, 0xd3, 0x2c, 0x00, 0x28, 0xd7, 0xbb, 0x74, 0x39, 0x30, 0x0b, + 0x4c, 0xf9, 0xe6, 0x63, 0xac, 0x51, 0xa0, 0x97, 0x61, 0x3c, 0x09, 0xdb, 0xa1, 0x1f, 0xee, 0x1c, + 0x5c, 0x25, 0x32, 0xe9, 0x82, 0x3a, 0xb6, 0xd8, 0x4c, 0x51, 0x58, 0xa7, 0xb3, 0x7f, 0x5c, 0x85, + 0xec, 0xf3, 0x5a, 0xff, 0x5f, 0x4a, 0x7f, 0x7e, 0xa4, 0xf4, 0x0f, 0x2d, 0x98, 0xa1, 0xb5, 0xb3, + 0x68, 0x15, 0x19, 0x74, 0xaa, 0xd2, 0x9b, 0x5b, 0xc7, 0xa4, 0x37, 0x7f, 0x86, 0xea, 0x3a, 0x37, + 0xec, 0x24, 0xc2, 0x4d, 0xa2, 0xa9, 0x30, 0x0a, 0xc5, 0x02, 0x2b, 0xe8, 0x48, 0x14, 0x89, 0x5b, + 0x38, 0x3a, 0x1d, 0x89, 0x22, 0x2c, 0xb0, 0x32, 0xfb, 0xf9, 0x50, 0x7e, 0xf6, 0x73, 0x9e, 0xb6, + 0x48, 0x44, 0x49, 0x08, 0x23, 0x40, 0x4b, 0x5b, 0x24, 0xc3, 0x27, 0x52, 0x1a, 0xfb, 0xbb, 0x55, + 0x98, 0x68, 0x84, 0x6e, 0x1a, 0x47, 0xfe, 0x92, 0x11, 0x47, 0x7e, 0x2e, 0x13, 0x47, 0x3e, 0xa3, + 0xd3, 0x3e, 0x98, 0x30, 0x72, 0x91, 0xda, 0x8a, 0xe5, 0xe7, 0xbf, 0xaf, 0x10, 0x72, 0x23, 0xb5, + 0x95, 0x62, 0x83, 0x4d, 0xae, 0x7f, 0x79, 0x42, 0xc7, 0xff, 0xdc, 0x82, 0xa9, 0x46, 0xe8, 0x52, + 0xe1, 0xfc, 0xcb, 0x24, 0x89, 0x7a, 0x42, 0xac, 0x91, 0x63, 0x12, 0x62, 0xfd, 0x86, 0x05, 0xa3, + 0x8d, 0xd0, 0x1d, 0xb8, 0xfb, 0x70, 0xcd, 0x74, 0x1f, 0x7e, 0xa4, 0x50, 0xe7, 0xf6, 0xf0, 0x18, + 0xfe, 0xa0, 0x0a, 0x93, 0xb4, 0xbd, 0xe1, 0x8e, 0xfc, 0x5a, 0xc6, 0xc8, 0x58, 0x25, 0x46, 0x86, + 0x9a, 0x80, 0xa1, 0xef, 0x87, 0x77, 0xb2, 0x5f, 0x6e, 0x8d, 0x41, 0xb1, 0xc0, 0xa2, 0x0b, 0x30, + 0xd6, 0x8e, 0xc8, 0xbe, 0x17, 0x76, 0xe2, 0xec, 0x5d, 0xbe, 0x86, 0x80, 0x63, 0x45, 0x81, 0x5e, + 0x82, 0x89, 0xd8, 0x0b, 0x5a, 0x44, 0xc6, 0x50, 0x0c, 0xb1, 0x18, 0x0a, 0x9e, 0x6b, 0x50, 0x83, + 0x63, 0x83, 0x0a, 0xdd, 0x84, 0x1a, 0xfb, 0xcf, 0x66, 0x4f, 0xbf, 0xc9, 0xd8, 0x79, 0xb2, 0x2d, + 0x59, 0x1c, 0xa7, 0x9c, 0xd0, 0x25, 0x80, 0x44, 0xc6, 0x7a, 0xc4, 0xe2, 0x6c, 0x54, 0x59, 0xa3, + 0x2a, 0x0a, 0x24, 0xc6, 0x1a, 0x15, 0x7a, 0x1e, 0x6a, 0x89, 0xe3, 0xf9, 0xd7, 0xbc, 0x80, 0xc4, + 0x22, 0x4e, 0x46, 0x64, 0xcb, 0x15, 0x40, 0x9c, 0xe2, 0xe9, 0x3a, 0xcf, 0xee, 0x10, 0xf3, 0x47, + 0x1e, 0xc6, 0x18, 0x35, 0x5b, 0xe7, 0xaf, 0x29, 0x28, 0xd6, 0x28, 0xec, 0x17, 0xd9, 0x7a, 0xdd, + 0xe7, 0x25, 0x83, 0x9f, 0x56, 0x00, 0x35, 0x58, 0x4c, 0x89, 0xf1, 0x0e, 0xc6, 0x2e, 0x4c, 0xc5, + 0xe4, 0x9a, 0x17, 0x74, 0xee, 0x0a, 0x56, 0xe5, 0xee, 0x74, 0x34, 0x57, 0xf5, 0x32, 0xfc, 0xea, + 0xac, 0x09, 0xc3, 0x19, 0xbe, 0x74, 0x48, 0xa2, 0x4e, 0xb0, 0x14, 0xdf, 0x8c, 0x49, 0x24, 0x5e, + 0xb2, 0x60, 0x43, 0x82, 0x25, 0x10, 0xa7, 0x78, 0x2a, 0x00, 0xec, 0xcf, 0xf5, 0x30, 0xc0, 0x61, + 0x98, 0x48, 0x91, 0x61, 0xf9, 0xcd, 0x35, 0x38, 0x36, 0xa8, 0xd0, 0x1a, 0xa0, 0xb8, 0xd3, 0x6e, + 0xfb, 0xec, 0x14, 0xcb, 0xf1, 0x2f, 0x47, 0x61, 0xa7, 0xcd, 0x03, 0x8a, 0x45, 0x6a, 0xf0, 0x66, + 0x17, 0x16, 0xe7, 0x94, 0xa0, 0xd3, 0x7d, 0x3b, 0x66, 0xbf, 0xc5, 0xd5, 0x60, 0xee, 0x51, 0x6b, + 0x32, 0x10, 0x96, 0x38, 0xbb, 0xc3, 0x96, 0x27, 0xf6, 0xc8, 0x40, 0xd2, 0x89, 0x08, 0x5d, 0x2d, + 0xda, 0x6c, 0x09, 0x92, 0xe7, 0xe8, 0xa5, 0x86, 0x32, 0x13, 0xd5, 0xc2, 0x53, 0x8a, 0xeb, 0x6c, + 0xb0, 0xc9, 0xd5, 0xfe, 0x4f, 0xc0, 0xb4, 0x8c, 0x38, 0x40, 0x1c, 0x15, 0xd1, 0xaa, 0xc2, 0xfe, + 0xfa, 0x68, 0x99, 0x27, 0x75, 0x52, 0x0d, 0x2e, 0x62, 0x5f, 0xb1, 0xe4, 0x82, 0xbe, 0xc0, 0x03, + 0x01, 0xd8, 0xe4, 0x2e, 0xff, 0xce, 0x15, 0xa7, 0x37, 0xe2, 0xb0, 0x05, 0x0b, 0xac, 0xb1, 0x43, + 0xd7, 0x60, 0x52, 0xe4, 0xa3, 0x17, 0xae, 0x80, 0xaa, 0xb1, 0x1d, 0x9e, 0xc4, 0x3a, 0xf2, 0x5e, + 0x16, 0x80, 0xcd, 0xc2, 0x68, 0x07, 0x9e, 0xd4, 0xde, 0xa6, 0xc9, 0x89, 0xbc, 0xe2, 0x5a, 0xe3, + 0x23, 0x47, 0x87, 0xf3, 0x4f, 0x6e, 0x1e, 0x47, 0x88, 0x8f, 0xe7, 0x83, 0x6e, 0xc0, 0x69, 0xa7, + 0x95, 0x78, 0xfb, 0xa4, 0x4e, 0x1c, 0xd7, 0xf7, 0x02, 0x62, 0xde, 0x1b, 0x7f, 0xfc, 0xe8, 0x70, + 0xfe, 0xf4, 0x52, 0x1e, 0x01, 0xce, 0x2f, 0x87, 0x5e, 0x87, 0x9a, 0x1b, 0xc4, 0x62, 0x0c, 0x46, + 0x8c, 0x67, 0x78, 0x6a, 0xf5, 0xeb, 0x4d, 0xd5, 0xff, 0xf4, 0x0f, 0x4e, 0x0b, 0xa0, 0x77, 0xf9, + 0xbb, 0xc0, 0x6a, 0x07, 0xc2, 0x9f, 0x7f, 0x7a, 0xa5, 0xd4, 0x9e, 0xd7, 0xb8, 0xe7, 0xc1, 0xbd, + 0x64, 0x2a, 0xb6, 0xd1, 0xb8, 0x02, 0x62, 0x54, 0x81, 0x3e, 0x0b, 0x28, 0x26, 0xd1, 0xbe, 0xd7, + 0x22, 0x4b, 0x2d, 0x96, 0x68, 0x93, 0x1d, 0xc6, 0x8d, 0x19, 0x01, 0xfe, 0xa8, 0xd9, 0x45, 0x81, + 0x73, 0x4a, 0xa1, 0x2b, 0x54, 0xe3, 0xe8, 0x50, 0x11, 0x8a, 0x2a, 0xcd, 0xb9, 0xd9, 0x3a, 0x69, + 0x47, 0xa4, 0xe5, 0x24, 0xc4, 0x35, 0x39, 0xe2, 0x4c, 0x39, 0xba, 0xa6, 0xa8, 0xbc, 0xe1, 0x60, + 0x06, 0x50, 0x76, 0xe7, 0x0e, 0xa7, 0xbb, 0xa3, 0xdd, 0x30, 0x4e, 0xae, 0x93, 0xe4, 0x4e, 0x18, + 0xdd, 0x66, 0xde, 0xf5, 0x31, 0x2d, 0x73, 0x59, 0x8a, 0xc2, 0x3a, 0x1d, 0xb5, 0x7e, 0xd8, 0xb1, + 0xce, 0x7a, 0x9d, 0xf9, 0xcc, 0xc7, 0xd2, 0xb9, 0x73, 0x85, 0x83, 0xb1, 0xc4, 0x4b, 0xd2, 0xf5, + 0xc6, 0x0a, 0xf3, 0x7f, 0x67, 0x48, 0xd7, 0x1b, 0x2b, 0x58, 0xe2, 0x51, 0xd8, 0xfd, 0xd8, 0xd1, + 0x54, 0x99, 0xb3, 0x88, 0x6e, 0x0d, 0x5e, 0xf2, 0xbd, 0xa3, 0xbb, 0x30, 0xa3, 0x1e, 0x5c, 0xe2, + 0x29, 0x25, 0xe3, 0xd9, 0xe9, 0x32, 0xaf, 0x12, 0xe7, 0x66, 0xa6, 0x54, 0xb1, 0xc7, 0xeb, 0x19, + 0x9e, 0xb8, 0xab, 0x16, 0x23, 0xff, 0xc1, 0x4c, 0x61, 0x2e, 0xf8, 0x45, 0xa8, 0xc5, 0x9d, 0x2d, + 0x37, 0xdc, 0x73, 0xbc, 0x80, 0x39, 0xa9, 0xf5, 0x37, 0x76, 0x25, 0x02, 0xa7, 0x34, 0x73, 0x9f, + 0x86, 0x13, 0x5d, 0x32, 0xdd, 0x57, 0xe8, 0xdc, 0x37, 0x86, 0xa0, 0xa6, 0xdc, 0x38, 0x68, 0xd1, + 0xf4, 0xd4, 0x3d, 0x9e, 0xf5, 0xd4, 0x8d, 0xd1, 0x95, 0x57, 0x77, 0xce, 0x7d, 0x31, 0xe7, 0x91, + 0xcd, 0xe7, 0x0a, 0x3f, 0x62, 0xf9, 0xbb, 0x2b, 0x7d, 0x3c, 0x41, 0x9a, 0x1a, 0xf4, 0x43, 0xc7, + 0x1a, 0xf4, 0x25, 0x5f, 0x52, 0xa2, 0xa6, 0x7b, 0x3b, 0x74, 0xd7, 0x1b, 0xd9, 0xe7, 0x42, 0x1a, + 0x14, 0x88, 0x39, 0x8e, 0x19, 0x5d, 0x54, 0x29, 0x33, 0xa3, 0x6b, 0xf4, 0xbe, 0x8c, 0x2e, 0x59, + 0x1c, 0xa7, 0x9c, 0xd0, 0x3e, 0x9c, 0x68, 0x99, 0x6f, 0xbf, 0xa8, 0xfb, 0x28, 0x2f, 0xf4, 0xf1, + 0xf6, 0x4a, 0x47, 0xcb, 0x73, 0xbf, 0x92, 0xe5, 0x87, 0xbb, 0xab, 0xb0, 0x7f, 0xcc, 0x7d, 0x3e, + 0x62, 0x1f, 0x48, 0xe2, 0x8e, 0x3f, 0xc8, 0xcc, 0xd5, 0x37, 0x8c, 0xad, 0xe9, 0x03, 0xf0, 0x36, + 0xfe, 0xae, 0xc5, 0xbc, 0x8d, 0x9b, 0x64, 0xaf, 0xed, 0x3b, 0xc9, 0x20, 0x43, 0xf2, 0xbe, 0x00, + 0x63, 0x89, 0xa8, 0xa5, 0x5c, 0xba, 0x6d, 0xad, 0x59, 0xcc, 0xfb, 0xaa, 0xb4, 0x80, 0x84, 0x62, + 0xc5, 0xd0, 0xfe, 0x6d, 0xfe, 0x15, 0x24, 0x66, 0xe0, 0x1b, 0xaa, 0xeb, 0xe6, 0x86, 0xea, 0xd9, + 0xd2, 0x3d, 0xe9, 0xb5, 0xb1, 0x32, 0xdb, 0xcf, 0x4c, 0xb5, 0x47, 0xdf, 0xf9, 0x6d, 0x6f, 0x80, + 0xf9, 0x98, 0x0d, 0x7a, 0x9d, 0x07, 0xa3, 0x72, 0x5d, 0xf8, 0x5c, 0x9f, 0x81, 0xa8, 0xf6, 0xf7, + 0x2b, 0x70, 0x2a, 0xef, 0x51, 0x7b, 0xe4, 0xc2, 0x44, 0x5b, 0x33, 0x9c, 0xcb, 0xa5, 0x68, 0xd0, + 0x4d, 0xed, 0xd4, 0x68, 0xd1, 0xa1, 0xd8, 0xe0, 0x8a, 0xb6, 0x60, 0x82, 0xec, 0x7b, 0x2d, 0xe5, + 0x4f, 0xa9, 0xf4, 0xa9, 0x9c, 0x54, 0x1d, 0xab, 0x1a, 0x17, 0x6c, 0xf0, 0x1c, 0x40, 0x2e, 0x78, + 0xfb, 0x9f, 0x58, 0xf0, 0x58, 0x8f, 0x24, 0x0e, 0xb4, 0xba, 0x3b, 0xcc, 0xe1, 0x28, 0x5e, 0x4a, + 0x52, 0xd5, 0x71, 0x37, 0x24, 0x16, 0x58, 0xb4, 0x05, 0xc0, 0xdd, 0x88, 0xec, 0xd5, 0xd8, 0x4a, + 0x99, 0xb3, 0xfe, 0xae, 0x2b, 0xd3, 0xda, 0x6d, 0x5a, 0xf5, 0x4e, 0xac, 0xc6, 0xd5, 0xfe, 0x5e, + 0x15, 0x86, 0xf9, 0xc3, 0x95, 0x0d, 0x18, 0xdd, 0xe5, 0xa9, 0x22, 0xfb, 0xcb, 0x54, 0x99, 0x9a, + 0x47, 0x1c, 0x80, 0x25, 0x1b, 0xb4, 0x01, 0x27, 0xbd, 0xc0, 0x4b, 0x3c, 0xc7, 0xaf, 0x13, 0xdf, + 0x39, 0x90, 0xf6, 0x36, 0x4f, 0x13, 0x2e, 0x33, 0xda, 0x9e, 0x5c, 0xef, 0x26, 0xc1, 0x79, 0xe5, + 0xd0, 0x1b, 0x5d, 0x19, 0x9f, 0x78, 0x0a, 0x4e, 0x75, 0x09, 0xeb, 0xf8, 0xac, 0x4f, 0xe8, 0x35, + 0x98, 0x6c, 0x77, 0xed, 0x2c, 0xb4, 0x17, 0x0f, 0xcd, 0xdd, 0x84, 0x49, 0x8b, 0xea, 0x30, 0x13, + 0x77, 0xd8, 0xc9, 0xeb, 0xe6, 0x6e, 0x44, 0xe2, 0xdd, 0xd0, 0x77, 0xc5, 0x93, 0x5d, 0xca, 0x8a, + 0x6a, 0x66, 0xf0, 0xb8, 0xab, 0x04, 0xe5, 0xb2, 0xed, 0x78, 0x7e, 0x27, 0x22, 0x29, 0x97, 0x11, + 0x93, 0xcb, 0x5a, 0x06, 0x8f, 0xbb, 0x4a, 0xd8, 0x7f, 0x6a, 0xc1, 0xc9, 0x9c, 0xf0, 0x04, 0x1e, + 0x32, 0xb7, 0xe3, 0xc5, 0x89, 0x4a, 0x06, 0xad, 0x85, 0xcc, 0x71, 0x38, 0x56, 0x14, 0x54, 0x0a, + 0xf9, 0x76, 0x31, 0x7b, 0xec, 0x27, 0x0e, 0x60, 0x05, 0xb6, 0xbf, 0xfc, 0x4d, 0xea, 0xe5, 0xfd, + 0xa1, 0x9e, 0x2f, 0xef, 0x3f, 0x05, 0xc3, 0x3b, 0x6a, 0x53, 0xae, 0xd9, 0x23, 0x7c, 0x5b, 0xce, + 0x71, 0xf6, 0xb7, 0xab, 0x30, 0x9d, 0x09, 0x53, 0xa2, 0x0d, 0xd9, 0x0b, 0x03, 0x2f, 0x09, 0x55, + 0xf6, 0x20, 0xe6, 0x49, 0x58, 0x21, 0xed, 0xdd, 0x0d, 0x01, 0xc7, 0x8a, 0x02, 0x3d, 0x63, 0xbe, + 0x22, 0x9c, 0xb6, 0x79, 0xb9, 0x6e, 0x3c, 0x94, 0x56, 0x36, 0x41, 0xfd, 0x53, 0x30, 0xd4, 0x0e, + 0xd5, 0x73, 0x97, 0x4a, 0xe8, 0xf1, 0x72, 0xbd, 0x11, 0x86, 0x3e, 0x66, 0x48, 0xf4, 0xb4, 0xe8, + 0x7d, 0xc6, 0x1b, 0x89, 0x1d, 0x37, 0x8c, 0xb5, 0x21, 0x78, 0x16, 0x46, 0x6f, 0x93, 0x83, 0xc8, + 0x0b, 0x76, 0xb2, 0xbe, 0xd8, 0xab, 0x1c, 0x8c, 0x25, 0xde, 0x4c, 0x42, 0x3f, 0x3a, 0xe0, 0x24, + 0xf4, 0x63, 0x85, 0x71, 0x96, 0xbf, 0x69, 0xc1, 0x34, 0x4b, 0xa2, 0x27, 0xee, 0xb7, 0x7a, 0x61, + 0x30, 0xc0, 0x25, 0xf1, 0x29, 0x18, 0x8e, 0x68, 0x65, 0xd9, 0xfc, 0xd1, 0xac, 0x05, 0x98, 0xe3, + 0xd0, 0x13, 0xe2, 0x25, 0x76, 0xfa, 0xf9, 0x26, 0x78, 0x3e, 0xde, 0xf4, 0x49, 0x75, 0x16, 0xbf, + 0x8f, 0x49, 0xdb, 0xf7, 0x78, 0x63, 0x53, 0x07, 0xcc, 0xa3, 0x12, 0xbf, 0x9f, 0xdb, 0xb8, 0x07, + 0x15, 0xbf, 0x9f, 0xcf, 0xfc, 0x78, 0xe3, 0xf3, 0x7f, 0x54, 0xe0, 0x6c, 0x6e, 0xb9, 0xf4, 0x04, + 0x67, 0xcd, 0x38, 0xc1, 0xb9, 0x94, 0x39, 0xc1, 0xb1, 0x8f, 0x2f, 0xfd, 0x60, 0xce, 0x74, 0xf2, + 0x0f, 0x5b, 0xaa, 0x0f, 0xed, 0xb0, 0x65, 0xa8, 0xac, 0xa1, 0x30, 0x5c, 0x60, 0x28, 0xfc, 0xcc, + 0x82, 0xc7, 0x73, 0x07, 0xec, 0x11, 0xbb, 0x2e, 0x91, 0xdb, 0xc6, 0x1e, 0x86, 0xf3, 0xdf, 0xae, + 0xf6, 0xe8, 0x13, 0x33, 0xa1, 0xcf, 0x53, 0x8d, 0xc3, 0x90, 0xb1, 0x30, 0x80, 0x26, 0xb8, 0xb6, + 0xe1, 0x30, 0xac, 0xb0, 0x28, 0xd6, 0xae, 0x1b, 0xf0, 0x46, 0xae, 0xde, 0xe7, 0x64, 0x5a, 0x30, + 0xbd, 0x65, 0xfa, 0x15, 0xdd, 0xcc, 0x35, 0x04, 0x74, 0x4b, 0xdb, 0x12, 0x55, 0xef, 0x67, 0x4b, + 0x34, 0x91, 0xbf, 0x1d, 0x42, 0x4b, 0x30, 0xbd, 0xe7, 0x05, 0xec, 0x45, 0x36, 0xd3, 0x02, 0x51, + 0xd7, 0xdb, 0x36, 0x4c, 0x34, 0xce, 0xd2, 0xcf, 0xbd, 0x06, 0x93, 0xf7, 0xef, 0x22, 0x79, 0xbf, + 0x0a, 0x1f, 0x3e, 0x46, 0x21, 0xf0, 0x95, 0xc0, 0xf8, 0x2e, 0xda, 0x4a, 0xd0, 0xf5, 0x6d, 0x1a, + 0x70, 0x6a, 0xbb, 0xe3, 0xfb, 0x07, 0x2c, 0xf6, 0x81, 0xb8, 0x92, 0x42, 0x58, 0x77, 0xea, 0xad, + 0xd4, 0xb5, 0x1c, 0x1a, 0x9c, 0x5b, 0x12, 0x7d, 0x16, 0x50, 0xb8, 0xc5, 0xd2, 0x4a, 0xba, 0xe9, + 0x25, 0x64, 0xf6, 0x09, 0xaa, 0xe9, 0x44, 0xbd, 0xd1, 0x45, 0x81, 0x73, 0x4a, 0x51, 0x5b, 0x8f, + 0x3d, 0xb3, 0xaa, 0x9a, 0x95, 0xb1, 0xf5, 0xb0, 0x8e, 0xc4, 0x26, 0x2d, 0xba, 0x0c, 0x27, 0x9c, + 0x7d, 0xc7, 0xe3, 0x09, 0x64, 0x24, 0x03, 0x6e, 0xec, 0x29, 0x37, 0xc4, 0x52, 0x96, 0x00, 0x77, + 0x97, 0x41, 0x6d, 0xc3, 0xab, 0xc4, 0x13, 0x48, 0xbf, 0x7e, 0x1f, 0x12, 0x5c, 0xda, 0xcf, 0x64, + 0xff, 0x89, 0x45, 0x97, 0xbb, 0x9c, 0x47, 0xcc, 0x8c, 0xf7, 0xbe, 0xb5, 0x4b, 0x18, 0xdd, 0xef, + 0x7d, 0x33, 0x87, 0xab, 0x49, 0xcb, 0x45, 0x23, 0x4e, 0x03, 0x27, 0x0d, 0xcb, 0x52, 0xdc, 0x3c, + 0x52, 0x14, 0xe8, 0x16, 0x8c, 0xba, 0xde, 0xbe, 0x17, 0x87, 0x51, 0x89, 0x77, 0x76, 0xbb, 0x82, + 0xf1, 0x52, 0x5d, 0x59, 0xe7, 0x4c, 0xb0, 0xe4, 0x66, 0xff, 0x9d, 0x0a, 0x4c, 0xca, 0xfa, 0xde, + 0xec, 0x84, 0x4c, 0x87, 0x0d, 0x6a, 0x11, 0x7f, 0xd3, 0x58, 0xc4, 0x17, 0xcb, 0x5d, 0xbf, 0x62, + 0x8d, 0xea, 0xb9, 0x78, 0x7f, 0x2e, 0xb3, 0x78, 0x5f, 0xec, 0x87, 0xe9, 0xf1, 0x8b, 0xf6, 0xbf, + 0xb5, 0xe0, 0x84, 0x41, 0xff, 0xa8, 0xe4, 0x30, 0xce, 0xeb, 0x4b, 0x8f, 0x55, 0xe3, 0x7b, 0x95, + 0x4c, 0x1f, 0xd8, 0x6a, 0xf1, 0x35, 0x18, 0xda, 0x75, 0x22, 0xb7, 0x5c, 0xfe, 0xb4, 0xae, 0xe2, + 0x0b, 0x57, 0x9c, 0xc8, 0xe5, 0x3a, 0xff, 0x82, 0x7a, 0x66, 0xc5, 0x89, 0xdc, 0xc2, 0x18, 0x62, + 0x56, 0x29, 0x7a, 0x15, 0x46, 0xe2, 0x56, 0xd8, 0x56, 0x71, 0x5b, 0xe7, 0xf8, 0x13, 0x2c, 0x14, + 0x72, 0xef, 0x70, 0x1e, 0x99, 0xd5, 0x51, 0x30, 0x16, 0xf4, 0x73, 0x04, 0x6a, 0xaa, 0xea, 0x01, + 0x46, 0xab, 0xbe, 0x5f, 0x85, 0x93, 0x39, 0x72, 0x82, 0x7e, 0xc1, 0x18, 0xb5, 0xd7, 0xfa, 0x16, + 0xb4, 0x0f, 0x38, 0x6e, 0xbf, 0xc0, 0xf6, 0x41, 0xae, 0x90, 0x8d, 0xfb, 0xa8, 0xfe, 0x66, 0x4c, + 0xb2, 0xd5, 0x53, 0x50, 0x71, 0xf5, 0xb4, 0xda, 0x87, 0x34, 0xf8, 0xb4, 0x1a, 0xd5, 0xce, 0x01, + 0x7e, 0xe3, 0xf7, 0x86, 0xe0, 0x54, 0xde, 0xfd, 0x4e, 0xf4, 0xcb, 0x56, 0x26, 0x05, 0xfa, 0x1b, + 0xfd, 0x5f, 0x12, 0xe5, 0x79, 0xd1, 0x45, 0xd2, 0x87, 0x05, 0x33, 0x29, 0x7a, 0xe1, 0x68, 0x8b, + 0xda, 0x59, 0xdc, 0x7f, 0xc4, 0x53, 0xd9, 0x4b, 0x7d, 0xf0, 0x99, 0xfb, 0x68, 0x8a, 0xc8, 0x86, + 0x1f, 0x67, 0xe2, 0xfe, 0x25, 0xb8, 0x38, 0xee, 0x5f, 0xb6, 0x61, 0x6e, 0x07, 0xc6, 0xb5, 0x7e, + 0x0d, 0x50, 0x04, 0x3c, 0xba, 0x20, 0x69, 0xad, 0x1e, 0xa0, 0x18, 0xfc, 0x3d, 0x0b, 0x32, 0xc1, + 0x19, 0xca, 0xd9, 0x62, 0xf5, 0x74, 0xb6, 0x9c, 0x83, 0xa1, 0x28, 0xf4, 0x49, 0x36, 0x3d, 0x37, + 0x0e, 0x7d, 0x82, 0x19, 0x46, 0xbd, 0xb5, 0x58, 0xed, 0xf5, 0xd6, 0x22, 0xdd, 0x85, 0xfb, 0x64, + 0x9f, 0x48, 0xd7, 0x87, 0x52, 0xde, 0xd7, 0x28, 0x10, 0x73, 0x9c, 0xfd, 0xfb, 0x55, 0x18, 0xe1, + 0xfe, 0x85, 0x01, 0xae, 0xc9, 0x0d, 0xb1, 0xd5, 0x2f, 0x75, 0xdf, 0x92, 0xb7, 0x66, 0xa1, 0xee, + 0x24, 0x0e, 0x17, 0x28, 0xd5, 0xb7, 0xd4, 0x3d, 0x80, 0x16, 0x8c, 0xde, 0xcf, 0x65, 0x76, 0xb2, + 0xc0, 0x79, 0x68, 0x63, 0xb1, 0x0b, 0x10, 0xb3, 0x77, 0xbd, 0x28, 0x0f, 0x91, 0xe4, 0xee, 0xa5, + 0x52, 0xed, 0x68, 0xaa, 0x62, 0xbc, 0x35, 0x69, 0x76, 0x2d, 0x85, 0xc0, 0x1a, 0xef, 0xb9, 0x57, + 0xa0, 0xa6, 0x88, 0x8b, 0xcc, 0xfc, 0x09, 0x5d, 0x24, 0xff, 0x0a, 0x4c, 0x67, 0xea, 0xea, 0x6b, + 0x97, 0xf0, 0x23, 0x0b, 0x4e, 0x74, 0x3d, 0x10, 0x8b, 0xde, 0xb3, 0xe0, 0x94, 0x9f, 0xe3, 0x58, + 0x12, 0x1f, 0xf8, 0x7e, 0x5c, 0x52, 0x6a, 0x8b, 0x90, 0x87, 0xc5, 0xb9, 0xb5, 0xc9, 0xb4, 0x9d, + 0x95, 0xfc, 0xb4, 0x9d, 0xf6, 0xf7, 0x2d, 0x10, 0x9f, 0x6c, 0xe0, 0xe6, 0xcf, 0xba, 0x69, 0xfe, + 0x7c, 0xb4, 0x8c, 0x0c, 0xf4, 0xb0, 0x7b, 0xfe, 0x83, 0x05, 0x88, 0x13, 0x64, 0x1f, 0xf7, 0xe3, + 0x5e, 0x3a, 0xcd, 0x5a, 0x4f, 0x85, 0x46, 0x61, 0xb0, 0x46, 0xd5, 0x67, 0x06, 0x77, 0xf5, 0x28, + 0x56, 0xb9, 0xf7, 0xf0, 0xab, 0x25, 0xde, 0xc3, 0xff, 0xdd, 0x2a, 0x64, 0xa3, 0x18, 0xd0, 0x97, + 0x61, 0xa2, 0xe5, 0xb4, 0x9d, 0x2d, 0xcf, 0xf7, 0x12, 0x8f, 0xc4, 0xe5, 0xce, 0x89, 0x56, 0xb4, + 0x12, 0xc2, 0xcf, 0xab, 0x41, 0xb0, 0xc1, 0x11, 0x2d, 0x00, 0xb4, 0x23, 0x6f, 0xdf, 0xf3, 0xc9, + 0x0e, 0x33, 0x3a, 0x54, 0xde, 0x93, 0x86, 0x82, 0x62, 0x8d, 0x22, 0x27, 0x5c, 0xae, 0xfa, 0x30, + 0xc2, 0xe5, 0x86, 0xfa, 0x0c, 0x97, 0x1b, 0x2e, 0x15, 0x2e, 0x87, 0xe1, 0x8c, 0x74, 0xcf, 0xd2, + 0xff, 0x6b, 0x9e, 0x4f, 0x78, 0x92, 0x3e, 0x11, 0xe4, 0x38, 0x77, 0x74, 0x38, 0x7f, 0x06, 0xe7, + 0x52, 0xe0, 0x1e, 0x25, 0xed, 0x0e, 0x9c, 0x6c, 0x92, 0xc8, 0x63, 0x99, 0x94, 0xdc, 0x74, 0xfa, + 0x7d, 0x11, 0x6a, 0x51, 0x66, 0xe6, 0xf7, 0x79, 0xdf, 0x4c, 0x4b, 0x49, 0x21, 0x67, 0x7a, 0xca, + 0xd2, 0xfe, 0xeb, 0x15, 0x18, 0x15, 0xd1, 0x42, 0x03, 0x5c, 0x45, 0xae, 0x1a, 0x3b, 0xbb, 0x67, + 0x8b, 0x66, 0x2e, 0x6b, 0x4e, 0xcf, 0x3d, 0x5d, 0x33, 0xb3, 0xa7, 0x7b, 0xbe, 0x1c, 0xbb, 0xe3, + 0x77, 0x73, 0xbf, 0x53, 0x81, 0x29, 0x33, 0x6a, 0x6a, 0x80, 0xc3, 0xf1, 0x36, 0x8c, 0xc6, 0x22, + 0x94, 0xa8, 0x52, 0x26, 0x32, 0x23, 0xfb, 0x49, 0xd3, 0xb7, 0xf5, 0x45, 0xf0, 0x90, 0x64, 0x97, + 0x1b, 0xad, 0x54, 0x7d, 0x18, 0xd1, 0x4a, 0xf6, 0xbf, 0x63, 0x2a, 0x55, 0x1f, 0xc0, 0x81, 0x2f, + 0x08, 0x6f, 0x9a, 0xaa, 0xf7, 0x42, 0x29, 0x39, 0x10, 0x8d, 0xeb, 0xb1, 0x30, 0xfc, 0x2b, 0x0b, + 0xc6, 0x05, 0xe1, 0xc0, 0x9b, 0xff, 0x59, 0xb3, 0xf9, 0x4f, 0x97, 0x6a, 0x7e, 0x8f, 0x76, 0xff, + 0x83, 0x8a, 0x6a, 0x77, 0x43, 0x3c, 0x77, 0x5a, 0x98, 0xaf, 0x71, 0xac, 0x1d, 0x85, 0x49, 0xd8, + 0x0a, 0x7d, 0xb1, 0xb8, 0x3f, 0x91, 0xc6, 0x95, 0x73, 0xf8, 0x3d, 0xed, 0x37, 0x56, 0xd4, 0x2c, + 0x64, 0x3a, 0x8c, 0x12, 0xb1, 0x38, 0xe5, 0x3d, 0xb6, 0xba, 0x25, 0x1f, 0xb3, 0xa6, 0x30, 0x71, + 0x1d, 0xa3, 0xdf, 0x47, 0x5c, 0xd3, 0x40, 0x71, 0xc5, 0x09, 0x6b, 0x5c, 0x65, 0x0c, 0x23, 0xab, + 0x61, 0xd8, 0x74, 0x9d, 0x5e, 0x17, 0x70, 0xac, 0x28, 0xec, 0x57, 0x98, 0x76, 0x65, 0xc3, 0xd3, + 0x5f, 0xf4, 0xf7, 0x37, 0x46, 0xd4, 0xc0, 0x32, 0xdf, 0xc8, 0x75, 0x18, 0xa6, 0x5d, 0x94, 0xdb, + 0xbf, 0x72, 0xaa, 0x8c, 0x36, 0x41, 0x8f, 0x02, 0x8b, 0x92, 0x18, 0x73, 0x36, 0x88, 0x74, 0xf9, + 0xdb, 0x5f, 0x29, 0xad, 0x1d, 0xfb, 0xf0, 0xb0, 0xb3, 0x5c, 0x30, 0x2c, 0x05, 0xc6, 0x7a, 0x23, + 0x9b, 0x63, 0x73, 0x45, 0x22, 0x70, 0x4a, 0x83, 0x16, 0x85, 0x95, 0x6e, 0xbe, 0x85, 0x2b, 0xad, + 0x74, 0x39, 0x24, 0x9a, 0x99, 0x7e, 0x11, 0xc6, 0x55, 0x96, 0xf1, 0x06, 0x4f, 0x16, 0x5d, 0xe3, + 0x96, 0xcb, 0x6a, 0x0a, 0xc6, 0x3a, 0x0d, 0x5a, 0x87, 0x93, 0xae, 0x0a, 0x59, 0x6d, 0x74, 0xb6, + 0x7c, 0xaf, 0x45, 0x8b, 0xf2, 0x8b, 0x22, 0x8f, 0x1d, 0x1d, 0xce, 0x9f, 0xac, 0x77, 0xa3, 0x71, + 0x5e, 0x19, 0xb4, 0x09, 0xd3, 0x31, 0xcf, 0xa6, 0x2e, 0x2f, 0x93, 0x89, 0x54, 0x74, 0xcf, 0x49, + 0x47, 0x7f, 0xd3, 0x44, 0xdf, 0x63, 0x20, 0xae, 0x11, 0x04, 0x08, 0x67, 0x59, 0xa0, 0x37, 0x60, + 0xca, 0xd7, 0x1f, 0x84, 0x6a, 0x88, 0xc8, 0x5d, 0x15, 0xfe, 0x60, 0x3c, 0x17, 0xd5, 0xc0, 0x19, + 0x6a, 0xf4, 0x36, 0xcc, 0xea, 0x10, 0x71, 0x55, 0xdd, 0x09, 0x76, 0x48, 0x2c, 0xd2, 0x38, 0x3f, + 0x71, 0x74, 0x38, 0x3f, 0x7b, 0xad, 0x07, 0x0d, 0xee, 0x59, 0x1a, 0xbd, 0x0a, 0x13, 0x72, 0x24, + 0xb5, 0x28, 0xde, 0x34, 0xf0, 0x46, 0xc3, 0x61, 0x83, 0xf2, 0x83, 0x9d, 0x67, 0x7c, 0x8d, 0x16, + 0xd6, 0x96, 0x53, 0xf4, 0x15, 0x98, 0xd0, 0xdb, 0x28, 0x74, 0xe4, 0xc7, 0xcb, 0x3f, 0xb2, 0x25, + 0x96, 0x65, 0xd5, 0x72, 0x1d, 0x87, 0x0d, 0xde, 0xf6, 0x0d, 0x18, 0x69, 0x1e, 0xc4, 0xad, 0xc4, + 0x7f, 0x50, 0xcf, 0x20, 0xb7, 0x60, 0x3a, 0xf3, 0x5e, 0xb0, 0x7a, 0x78, 0xda, 0x7a, 0x50, 0x0f, + 0x4f, 0xdb, 0x5f, 0xb7, 0x60, 0x78, 0xd3, 0xf1, 0x8a, 0x1f, 0x40, 0x28, 0xd3, 0x64, 0xf4, 0x32, + 0x8c, 0x90, 0xed, 0x6d, 0xd2, 0x92, 0x0f, 0x59, 0x3f, 0x29, 0xcd, 0x99, 0x55, 0x06, 0xa5, 0x53, + 0x93, 0x55, 0xc6, 0xff, 0x62, 0x41, 0x6c, 0xff, 0x47, 0x0b, 0x60, 0x33, 0xf4, 0xe5, 0x51, 0x4d, + 0x41, 0x4b, 0x96, 0xbb, 0x9e, 0x62, 0x78, 0x26, 0xe7, 0x29, 0x06, 0x94, 0x32, 0xcc, 0x79, 0x88, + 0x41, 0xf5, 0xa6, 0x5a, 0xaa, 0x37, 0x43, 0xfd, 0xf4, 0xe6, 0x5b, 0x16, 0x88, 0x88, 0x99, 0x12, + 0x92, 0xe0, 0xca, 0xf4, 0xe9, 0x46, 0x12, 0x8a, 0xe7, 0xca, 0xdc, 0xf6, 0x10, 0xa9, 0x27, 0x94, + 0x6c, 0x1a, 0x09, 0x27, 0x0c, 0xae, 0x74, 0x0b, 0x3f, 0xce, 0xd1, 0x1b, 0xcc, 0x76, 0x2c, 0x6e, + 0x57, 0x5f, 0xc9, 0xb6, 0x58, 0x76, 0x71, 0xca, 0x58, 0xa5, 0x5d, 0xd2, 0xb3, 0x8b, 0x4b, 0x04, + 0x4e, 0x69, 0xd0, 0xb3, 0x30, 0x1a, 0x77, 0xb6, 0x18, 0x79, 0x26, 0x7c, 0xa6, 0xc9, 0xc1, 0x58, + 0xe2, 0xed, 0x5f, 0x42, 0x60, 0x74, 0xcd, 0x48, 0xf1, 0x64, 0x3d, 0xf0, 0x14, 0x4f, 0xef, 0xc0, + 0x18, 0xd9, 0x6b, 0x27, 0x07, 0x75, 0x2f, 0x2a, 0x97, 0x68, 0x6f, 0x55, 0x50, 0x77, 0x73, 0x97, + 0x18, 0xac, 0x38, 0xf6, 0x48, 0xd8, 0x55, 0x7d, 0x24, 0x12, 0x76, 0x0d, 0xfd, 0x85, 0x24, 0xec, + 0x7a, 0x1b, 0x46, 0x77, 0xbc, 0x04, 0x93, 0x76, 0x28, 0xae, 0xf6, 0x15, 0x9c, 0x81, 0x5d, 0xe6, + 0xc4, 0xdd, 0x59, 0x78, 0x04, 0x02, 0x4b, 0x76, 0x68, 0x13, 0x46, 0xf8, 0xbe, 0x43, 0xe4, 0xc0, + 0xfa, 0x78, 0x19, 0x8f, 0x4c, 0x77, 0x3a, 0x28, 0x11, 0x23, 0x25, 0x78, 0xc9, 0x04, 0x5d, 0xa3, + 0x1f, 0x3c, 0x41, 0x97, 0x4a, 0xab, 0x35, 0xf6, 0xa0, 0xd2, 0x6a, 0x19, 0xe9, 0xc9, 0x6a, 0x83, + 0x48, 0x4f, 0xf6, 0x2d, 0x0b, 0x4e, 0xb7, 0xf3, 0x52, 0xfb, 0x89, 0x04, 0x59, 0x9f, 0xbe, 0x8f, + 0x54, 0x87, 0x46, 0xd5, 0xec, 0xd2, 0x55, 0x2e, 0x19, 0xce, 0xaf, 0x58, 0xe6, 0x39, 0x1b, 0xff, + 0xe0, 0x79, 0xce, 0x06, 0x9d, 0x49, 0x2b, 0xcd, 0x7a, 0x36, 0x39, 0x90, 0xac, 0x67, 0x53, 0x0f, + 0x30, 0xeb, 0x99, 0x96, 0xaf, 0x6c, 0xfa, 0xc1, 0xe6, 0x2b, 0xdb, 0x85, 0x71, 0x37, 0xbc, 0x13, + 0xdc, 0x71, 0x22, 0x77, 0xa9, 0xb1, 0x2e, 0xd2, 0x63, 0x15, 0x64, 0x63, 0xa8, 0xa7, 0x05, 0x8c, + 0x1a, 0xb8, 0xeb, 0x31, 0x45, 0x62, 0x9d, 0xb5, 0xc8, 0xdc, 0x76, 0xe2, 0x03, 0x66, 0x6e, 0x33, + 0xf2, 0x9f, 0xa1, 0x41, 0xe4, 0x3f, 0xfb, 0x32, 0xbb, 0x9c, 0xbd, 0xed, 0xed, 0x6c, 0x38, 0xed, + 0xd9, 0x93, 0x65, 0x6a, 0x58, 0x91, 0xe4, 0xdd, 0x35, 0x28, 0x14, 0x4e, 0x99, 0x76, 0x67, 0x58, + 0x3b, 0xf5, 0xb0, 0x33, 0xac, 0x9d, 0x1e, 0x60, 0x86, 0xb5, 0x33, 0x0f, 0x35, 0xc3, 0xda, 0x63, + 0x7f, 0x21, 0x19, 0xd6, 0xfe, 0x2a, 0x9c, 0x3d, 0xfe, 0x73, 0xa4, 0xd9, 0x7b, 0x1b, 0xa9, 0xcb, + 0x20, 0x93, 0xbd, 0x97, 0x99, 0x3a, 0x1a, 0x55, 0xe9, 0x44, 0x4f, 0xdf, 0xb7, 0xe0, 0xb1, 0x1e, + 0x19, 0x51, 0x4a, 0xdf, 0x5d, 0x68, 0xc3, 0x74, 0xdb, 0x2c, 0x5a, 0xfa, 0x7e, 0x91, 0x91, 0x81, + 0x45, 0xc5, 0xc6, 0x65, 0x10, 0x38, 0xcb, 0x7e, 0xf9, 0xa3, 0x3f, 0x79, 0xff, 0xec, 0x87, 0x7e, + 0xfa, 0xfe, 0xd9, 0x0f, 0xfd, 0xd1, 0xfb, 0x67, 0x3f, 0xf4, 0x8b, 0x47, 0x67, 0xad, 0x9f, 0x1c, + 0x9d, 0xb5, 0x7e, 0x7a, 0x74, 0xd6, 0xfa, 0xd3, 0xa3, 0xb3, 0xd6, 0xb7, 0xfe, 0xec, 0xec, 0x87, + 0x3e, 0x5f, 0xd9, 0xbf, 0xf8, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x69, 0x61, 0x78, 0x3b, 0xf1, + 0xb5, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto b/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto index 59b2be5ef49..d0d79528cf7 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/api/v1/generated.proto @@ -22,7 +22,7 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.api.v1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -252,7 +252,7 @@ message ComponentStatusList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of ComponentStatus objects. repeated ComponentStatus items = 2; @@ -284,7 +284,7 @@ message ConfigMapKeySelector { message ConfigMapList { // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of ConfigMaps. repeated ConfigMap items = 2; @@ -508,7 +508,7 @@ message ContainerState { message ContainerStateRunning { // Time at which the container was last (re-)started // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startedAt = 1; } // ContainerStateTerminated is a terminated state of a container. @@ -530,11 +530,11 @@ message ContainerStateTerminated { // Time at which previous execution of the container started // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startedAt = 5; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startedAt = 5; // Time at which the container last terminated // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time finishedAt = 6; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time finishedAt = 6; // Container's ID in the format 'docker://' // +optional @@ -765,7 +765,7 @@ message EndpointsList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of endpoints. repeated Endpoints items = 2; @@ -840,11 +840,11 @@ message Event { // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time firstTimestamp = 6; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time firstTimestamp = 6; // The time at which the most recent occurrence of this event was recorded. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTimestamp = 7; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTimestamp = 7; // The number of times this event has occurred. // +optional @@ -860,7 +860,7 @@ message EventList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of events repeated Event items = 2; @@ -888,15 +888,6 @@ message ExecAction { repeated string command = 1; } -// ExportOptions is the query options to the standard REST get call. -message ExportOptions { - // Should this value be exported. Export strips fields that a user can not specify. - optional bool export = 1; - - // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace' - optional bool exact = 2; -} - // Represents a Fibre Channel volume. // Fibre Channel volumes can only be mounted as read/write once. // Fibre Channel volumes support ownership management and SELinux relabeling. @@ -1214,7 +1205,7 @@ message LimitRangeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of LimitRange objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_limit_range.md @@ -1232,7 +1223,7 @@ message List { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of objects repeated k8s.io.kubernetes.pkg.runtime.RawExtension items = 2; @@ -1340,7 +1331,7 @@ message NamespaceList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Namespace objects in the list. // More info: http://kubernetes.io/docs/user-guide/namespaces @@ -1426,11 +1417,11 @@ message NodeCondition { // Last time we got an update on a given condition. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastHeartbeatTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastHeartbeatTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -1453,7 +1444,7 @@ message NodeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of nodes repeated Node items = 2; @@ -1522,7 +1513,7 @@ message NodeSpec { optional string providerID = 3; // Unschedulable controls node schedulability of new pods. By default, node is schedulable. - // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration" + // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration // +optional optional bool unschedulable = 4; } @@ -1709,7 +1700,7 @@ message ObjectMeta { // Null for lists. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time creationTimestamp = 8; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time creationTimestamp = 8; // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // field is set by the server when a graceful deletion is requested by the user, and is not @@ -1729,7 +1720,7 @@ message ObjectMeta { // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time deletionTimestamp = 9; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time deletionTimestamp = 9; // Number of seconds allowed for this object to gracefully terminate before // it will be removed from the system. Only set when deletionTimestamp is also set. @@ -1887,7 +1878,7 @@ message PersistentVolumeClaimList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // A list of persistent volume claims. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims @@ -1904,7 +1895,7 @@ message PersistentVolumeClaimSpec { // A label query over volumes to consider for binding. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // Resources represents the minimum resources the volume should have. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources @@ -1952,7 +1943,7 @@ message PersistentVolumeList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of persistent volumes. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes @@ -2170,7 +2161,7 @@ message PodAffinity { message PodAffinityTerm { // A label query over a set of resources, in this case pods. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector labelSelector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector labelSelector = 1; // namespaces specifies which namespaces the labelSelector applies to (matches against); // nil list means "this pod's namespace," empty list means "all namespaces" @@ -2271,11 +2262,11 @@ message PodCondition { // Last time we probed the condition. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transitioned from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // Unique, one-word, CamelCase reason for the condition's last transition. // +optional @@ -2325,7 +2316,7 @@ message PodList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of pods. // More info: http://kubernetes.io/docs/user-guide/pods @@ -2358,7 +2349,7 @@ message PodLogOptions { // If this value is in the future, no logs will be returned. // Only one of sinceSeconds or sinceTime may be specified. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time sinceTime = 5; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time sinceTime = 5; // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // of log output. Defaults to false. @@ -2582,7 +2573,7 @@ message PodStatus { // RFC 3339 date and time at which the object was acknowledged by the Kubelet. // This is before the Kubelet pulled the container image(s) for the pod. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 7; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 7; // The list has one entry per container in the manifest. Each entry is currently the output // of `docker inspect`. @@ -2625,7 +2616,7 @@ message PodTemplateList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of pod templates repeated PodTemplate items = 2; @@ -2658,7 +2649,7 @@ message PreferAvoidPodsEntry { // Time at which this entry was added to the list. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time evictionTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time evictionTime = 2; // (brief) reason why this entry was added to the list. // +optional @@ -2836,7 +2827,7 @@ message ReplicationControllerCondition { // The last time the condition transitioned from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 3; // The reason for the condition's last transition. // +optional @@ -2852,7 +2843,7 @@ message ReplicationControllerList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of replication controllers. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -2954,7 +2945,7 @@ message ResourceQuotaList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of ResourceQuota objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota @@ -3063,7 +3054,7 @@ message SecretList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of secret objects. // More info: http://kubernetes.io/docs/user-guide/secrets @@ -3201,7 +3192,7 @@ message ServiceAccountList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of ServiceAccounts. // More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md#service-accounts @@ -3213,7 +3204,7 @@ message ServiceList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of services repeated Service items = 2; diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/meta.go b/staging/src/k8s.io/client-go/pkg/api/v1/meta.go index a641eb2b53c..6968cf7117d 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/meta.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/meta.go @@ -19,7 +19,7 @@ package v1 import ( "k8s.io/client-go/pkg/api/meta" "k8s.io/client-go/pkg/api/meta/metatypes" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/types" ) @@ -27,24 +27,24 @@ func (obj *ObjectMeta) GetObjectMeta() meta.Object { return obj } // Namespace implements meta.Object for any object with an ObjectMeta typed field. Allows // fast, direct access to metadata fields for API objects. -func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } -func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } -func (meta *ObjectMeta) GetName() string { return meta.Name } -func (meta *ObjectMeta) SetName(name string) { meta.Name = name } -func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } -func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } -func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } -func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } -func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } -func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } -func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } -func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } -func (meta *ObjectMeta) GetCreationTimestamp() unversioned.Time { return meta.CreationTimestamp } -func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp unversioned.Time) { +func (meta *ObjectMeta) GetNamespace() string { return meta.Namespace } +func (meta *ObjectMeta) SetNamespace(namespace string) { meta.Namespace = namespace } +func (meta *ObjectMeta) GetName() string { return meta.Name } +func (meta *ObjectMeta) SetName(name string) { meta.Name = name } +func (meta *ObjectMeta) GetGenerateName() string { return meta.GenerateName } +func (meta *ObjectMeta) SetGenerateName(generateName string) { meta.GenerateName = generateName } +func (meta *ObjectMeta) GetUID() types.UID { return meta.UID } +func (meta *ObjectMeta) SetUID(uid types.UID) { meta.UID = uid } +func (meta *ObjectMeta) GetResourceVersion() string { return meta.ResourceVersion } +func (meta *ObjectMeta) SetResourceVersion(version string) { meta.ResourceVersion = version } +func (meta *ObjectMeta) GetSelfLink() string { return meta.SelfLink } +func (meta *ObjectMeta) SetSelfLink(selfLink string) { meta.SelfLink = selfLink } +func (meta *ObjectMeta) GetCreationTimestamp() metav1.Time { return meta.CreationTimestamp } +func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp metav1.Time) { meta.CreationTimestamp = creationTimestamp } -func (meta *ObjectMeta) GetDeletionTimestamp() *unversioned.Time { return meta.DeletionTimestamp } -func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *unversioned.Time) { +func (meta *ObjectMeta) GetDeletionTimestamp() *metav1.Time { return meta.DeletionTimestamp } +func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *metav1.Time) { meta.DeletionTimestamp = deletionTimestamp } func (meta *ObjectMeta) GetLabels() map[string]string { return meta.Labels } diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/register.go b/staging/src/k8s.io/client-go/pkg/api/v1/register.go index 21fdb64a29a..21fe24ca752 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/register.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -29,6 +29,11 @@ const GroupName = "" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs, addFastPathConversionFuncs) AddToScheme = SchemeBuilder.AddToScheme @@ -71,7 +76,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &PersistentVolumeClaim{}, &PersistentVolumeClaimList{}, &DeleteOptions{}, - &ExportOptions{}, + &metav1.ExportOptions{}, &ListOptions{}, &PodAttachOptions{}, &PodLogOptions{}, @@ -86,7 +91,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { ) // Add common types - scheme.AddKnownTypes(SchemeGroupVersion, &unversioned.Status{}) + scheme.AddKnownTypes(SchemeGroupVersion, &metav1.Status{}) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/resource_helpers.go b/staging/src/k8s.io/client-go/pkg/api/v1/resource_helpers.go index 87eaa4c3a9d..d263de321b8 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/resource_helpers.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/resource_helpers.go @@ -20,7 +20,7 @@ import ( "time" "k8s.io/client-go/pkg/api/resource" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // Returns string version of ResourceName. @@ -81,7 +81,7 @@ func GetExistingContainerStatus(statuses []ContainerStatus, name string) Contain // of that, there are two cases when a pod can be considered available: // 1. minReadySeconds == 0, or // 2. LastTransitionTime (is set) + minReadySeconds < current time -func IsPodAvailable(pod *Pod, minReadySeconds int32, now unversioned.Time) bool { +func IsPodAvailable(pod *Pod, minReadySeconds int32, now metav1.Time) bool { if !IsPodReady(pod) { return false } @@ -144,7 +144,7 @@ func GetNodeCondition(status *NodeStatus, conditionType NodeConditionType) (int, // status has changed. // Returns true if pod condition has changed or has been added. func UpdatePodCondition(status *PodStatus, condition *PodCondition) bool { - condition.LastTransitionTime = unversioned.Now() + condition.LastTransitionTime = metav1.Now() // Try to find this pod condition. conditionIndex, oldCondition := GetPodCondition(status, condition.Type) diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go b/staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go index 2c30987d83c..4f912ad4c6f 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_resource "k8s.io/client-go/pkg/api/resource" - pkg2_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg2_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg5_runtime "k8s.io/client-go/pkg/runtime" pkg1_types "k8s.io/client-go/pkg/types" pkg4_intstr "k8s.io/client-go/pkg/util/intstr" @@ -66,7 +66,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg3_resource.Quantity - var v1 pkg2_unversioned.Time + var v1 pkg2_v1.Time var v2 pkg5_runtime.RawExtension var v3 pkg1_types.UID var v4 pkg4_intstr.IntOrString @@ -674,7 +674,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv62 := &x.CreationTimestamp yym63 := z.DecBinary() @@ -696,7 +696,7 @@ func (x *ObjectMeta) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym65 := z.DecBinary() _ = yym65 @@ -918,7 +918,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg2_unversioned.Time{} + x.CreationTimestamp = pkg2_v1.Time{} } else { yyv85 := &x.CreationTimestamp yym86 := z.DecBinary() @@ -950,7 +950,7 @@ func (x *ObjectMeta) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg2_unversioned.Time) + x.DeletionTimestamp = new(pkg2_v1.Time) } yym88 := z.DecBinary() _ = yym88 @@ -8173,7 +8173,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv474 := &x.ListMeta yym475 := z.DecBinary() @@ -8254,7 +8254,7 @@ func (x *PersistentVolumeList) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv481 := &x.ListMeta yym482 := z.DecBinary() @@ -8860,7 +8860,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv537 := &x.ListMeta yym538 := z.DecBinary() @@ -8941,7 +8941,7 @@ func (x *PersistentVolumeClaimList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv544 := &x.ListMeta yym545 := z.DecBinary() @@ -9214,7 +9214,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromMap(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym568 := z.DecBinary() _ = yym568 @@ -9290,7 +9290,7 @@ func (x *PersistentVolumeClaimSpec) codecDecodeSelfFromArray(l int, d *codec1978 } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym575 := z.DecBinary() _ = yym575 @@ -22631,7 +22631,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromMap(l int, d *codec1978.Decod switch yys1636 { case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1637 := &x.StartedAt yym1638 := z.DecBinary() @@ -22672,7 +22672,7 @@ func (x *ContainerStateRunning) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1640 := &x.StartedAt yym1641 := z.DecBinary() @@ -23019,7 +23019,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "startedAt": if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1676 := &x.StartedAt yym1677 := z.DecBinary() @@ -23036,7 +23036,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromMap(l int, d *codec1978.De } case "finishedAt": if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1678 := &x.FinishedAt yym1679 := z.DecBinary() @@ -23147,7 +23147,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StartedAt = pkg2_unversioned.Time{} + x.StartedAt = pkg2_v1.Time{} } else { yyv1686 := &x.StartedAt yym1687 := z.DecBinary() @@ -23174,7 +23174,7 @@ func (x *ContainerStateTerminated) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FinishedAt = pkg2_unversioned.Time{} + x.FinishedAt = pkg2_v1.Time{} } else { yyv1688 := &x.FinishedAt yym1689 := z.DecBinary() @@ -24271,7 +24271,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1781 := &x.LastProbeTime yym1782 := z.DecBinary() @@ -24288,7 +24288,7 @@ func (x *PodCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1783 := &x.LastTransitionTime yym1784 := z.DecBinary() @@ -24373,7 +24373,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv1790 := &x.LastProbeTime yym1791 := z.DecBinary() @@ -24400,7 +24400,7 @@ func (x *PodCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv1792 := &x.LastTransitionTime yym1793 := z.DecBinary() @@ -26353,7 +26353,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym1935 := z.DecBinary() _ = yym1935 @@ -26412,7 +26412,7 @@ func (x *PodAffinityTerm) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.LabelSelector == nil { - x.LabelSelector = new(pkg2_unversioned.LabelSelector) + x.LabelSelector = new(pkg2_v1.LabelSelector) } yym1941 := z.DecBinary() _ = yym1941 @@ -29413,7 +29413,7 @@ func (x *PodStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2201 := z.DecBinary() _ = yym2201 @@ -29572,7 +29572,7 @@ func (x *PodStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg2_unversioned.Time) + x.StartTime = new(pkg2_v1.Time) } yym2213 := z.DecBinary() _ = yym2213 @@ -30482,7 +30482,7 @@ func (x *PodList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2294 := &x.ListMeta yym2295 := z.DecBinary() @@ -30563,7 +30563,7 @@ func (x *PodList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2301 := &x.ListMeta yym2302 := z.DecBinary() @@ -31332,7 +31332,7 @@ func (x *PodTemplateList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2368 := &x.ListMeta yym2369 := z.DecBinary() @@ -31413,7 +31413,7 @@ func (x *PodTemplateList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2375 := &x.ListMeta yym2376 := z.DecBinary() @@ -32494,7 +32494,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromMap(l int, d *codec1 } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2469 := &x.LastTransitionTime yym2470 := z.DecBinary() @@ -32579,7 +32579,7 @@ func (x *ReplicationControllerCondition) codecDecodeSelfFromArray(l int, d *code } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv2476 := &x.LastTransitionTime yym2477 := z.DecBinary() @@ -33199,7 +33199,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromMap(l int, d *codec1978.D } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2532 := &x.ListMeta yym2533 := z.DecBinary() @@ -33280,7 +33280,7 @@ func (x *ReplicationControllerList) codecDecodeSelfFromArray(l int, d *codec1978 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2539 := &x.ListMeta yym2540 := z.DecBinary() @@ -35551,7 +35551,7 @@ func (x *ServiceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2734 := &x.ListMeta yym2735 := z.DecBinary() @@ -35632,7 +35632,7 @@ func (x *ServiceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2741 := &x.ListMeta yym2742 := z.DecBinary() @@ -36290,7 +36290,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2801 := &x.ListMeta yym2802 := z.DecBinary() @@ -36371,7 +36371,7 @@ func (x *ServiceAccountList) codecDecodeSelfFromArray(l int, d *codec1978.Decode } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2808 := &x.ListMeta yym2809 := z.DecBinary() @@ -37871,7 +37871,7 @@ func (x *EndpointsList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2935 := &x.ListMeta yym2936 := z.DecBinary() @@ -37952,7 +37952,7 @@ func (x *EndpointsList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv2942 := &x.ListMeta yym2943 := z.DecBinary() @@ -40458,7 +40458,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "evictionTime": if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3159 := &x.EvictionTime yym3160 := z.DecBinary() @@ -40528,7 +40528,7 @@ func (x *PreferAvoidPodsEntry) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.EvictionTime = pkg2_unversioned.Time{} + x.EvictionTime = pkg2_v1.Time{} } else { yyv3165 := &x.EvictionTime yym3166 := z.DecBinary() @@ -41301,7 +41301,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastHeartbeatTime": if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3225 := &x.LastHeartbeatTime yym3226 := z.DecBinary() @@ -41318,7 +41318,7 @@ func (x *NodeCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3227 := &x.LastTransitionTime yym3228 := z.DecBinary() @@ -41403,7 +41403,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastHeartbeatTime = pkg2_unversioned.Time{} + x.LastHeartbeatTime = pkg2_v1.Time{} } else { yyv3234 := &x.LastHeartbeatTime yym3235 := z.DecBinary() @@ -41430,7 +41430,7 @@ func (x *NodeCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv3236 := &x.LastTransitionTime yym3237 := z.DecBinary() @@ -42325,7 +42325,7 @@ func (x *NodeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3312 := &x.ListMeta yym3313 := z.DecBinary() @@ -42406,7 +42406,7 @@ func (x *NodeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3319 := &x.ListMeta yym3320 := z.DecBinary() @@ -43412,7 +43412,7 @@ func (x *NamespaceList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3401 := &x.ListMeta yym3402 := z.DecBinary() @@ -43493,7 +43493,7 @@ func (x *NamespaceList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv3408 := &x.ListMeta yym3409 := z.DecBinary() @@ -44468,7 +44468,7 @@ func (x *DeleteOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x *ExportOptions) CodecEncodeSelf(e *codec1978.Encoder) { +func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -44482,16 +44482,21 @@ func (x *ExportOptions) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep3491 := !z.EncBinary() yy2arr3491 := z.EncBasicHandle().StructToArray - var yyq3491 [4]bool + var yyq3491 [7]bool _, _, _ = yysep3491, yyq3491, yy2arr3491 const yyr3491 bool = false yyq3491[0] = x.Kind != "" yyq3491[1] = x.APIVersion != "" + yyq3491[2] = x.LabelSelector != "" + yyq3491[3] = x.FieldSelector != "" + yyq3491[4] = x.Watch != false + yyq3491[5] = x.ResourceVersion != "" + yyq3491[6] = x.TimeoutSeconds != nil var yynn3491 int if yyr3491 || yy2arr3491 { - r.EncodeArrayStart(4) + r.EncodeArrayStart(7) } else { - yynn3491 = 2 + yynn3491 = 0 for _, b := range yyq3491 { if b { yynn3491++ @@ -44552,313 +44557,9 @@ func (x *ExportOptions) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr3491 || yy2arr3491 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3499 := z.EncBinary() - _ = yym3499 - if false { - } else { - r.EncodeBool(bool(x.Export)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("export")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3500 := z.EncBinary() - _ = yym3500 - if false { - } else { - r.EncodeBool(bool(x.Export)) - } - } - if yyr3491 || yy2arr3491 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3502 := z.EncBinary() - _ = yym3502 - if false { - } else { - r.EncodeBool(bool(x.Exact)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("exact")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3503 := z.EncBinary() - _ = yym3503 - if false { - } else { - r.EncodeBool(bool(x.Exact)) - } - } - if yyr3491 || yy2arr3491 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *ExportOptions) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym3504 := z.DecBinary() - _ = yym3504 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct3505 := r.ContainerType() - if yyct3505 == codecSelferValueTypeMap1234 { - yyl3505 := r.ReadMapStart() - if yyl3505 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl3505, d) - } - } else if yyct3505 == codecSelferValueTypeArray1234 { - yyl3505 := r.ReadArrayStart() - if yyl3505 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl3505, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *ExportOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys3506Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3506Slc - var yyhl3506 bool = l >= 0 - for yyj3506 := 0; ; yyj3506++ { - if yyhl3506 { - if yyj3506 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3506Slc = r.DecodeBytes(yys3506Slc, true, true) - yys3506 := string(yys3506Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3506 { - case "kind": - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - case "apiVersion": - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - case "export": - if r.TryDecodeAsNil() { - x.Export = false - } else { - x.Export = bool(r.DecodeBool()) - } - case "exact": - if r.TryDecodeAsNil() { - x.Exact = false - } else { - x.Exact = bool(r.DecodeBool()) - } - default: - z.DecStructFieldNotFound(-1, yys3506) - } // end switch yys3506 - } // end for yyj3506 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *ExportOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj3511 int - var yyb3511 bool - var yyhl3511 bool = l >= 0 - yyj3511++ - if yyhl3511 { - yyb3511 = yyj3511 > l - } else { - yyb3511 = r.CheckBreak() - } - if yyb3511 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - yyj3511++ - if yyhl3511 { - yyb3511 = yyj3511 > l - } else { - yyb3511 = r.CheckBreak() - } - if yyb3511 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - yyj3511++ - if yyhl3511 { - yyb3511 = yyj3511 > l - } else { - yyb3511 = r.CheckBreak() - } - if yyb3511 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Export = false - } else { - x.Export = bool(r.DecodeBool()) - } - yyj3511++ - if yyhl3511 { - yyb3511 = yyj3511 > l - } else { - yyb3511 = r.CheckBreak() - } - if yyb3511 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Exact = false - } else { - x.Exact = bool(r.DecodeBool()) - } - for { - yyj3511++ - if yyhl3511 { - yyb3511 = yyj3511 > l - } else { - yyb3511 = r.CheckBreak() - } - if yyb3511 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3511-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym3516 := z.EncBinary() - _ = yym3516 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep3517 := !z.EncBinary() - yy2arr3517 := z.EncBasicHandle().StructToArray - var yyq3517 [7]bool - _, _, _ = yysep3517, yyq3517, yy2arr3517 - const yyr3517 bool = false - yyq3517[0] = x.Kind != "" - yyq3517[1] = x.APIVersion != "" - yyq3517[2] = x.LabelSelector != "" - yyq3517[3] = x.FieldSelector != "" - yyq3517[4] = x.Watch != false - yyq3517[5] = x.ResourceVersion != "" - yyq3517[6] = x.TimeoutSeconds != nil - var yynn3517 int - if yyr3517 || yy2arr3517 { - r.EncodeArrayStart(7) - } else { - yynn3517 = 0 - for _, b := range yyq3517 { - if b { - yynn3517++ - } - } - r.EncodeMapStart(yynn3517) - yynn3517 = 0 - } - if yyr3517 || yy2arr3517 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3517[0] { - yym3519 := z.EncBinary() - _ = yym3519 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq3517[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kind")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3520 := z.EncBinary() - _ = yym3520 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } - } - if yyr3517 || yy2arr3517 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3517[1] { - yym3522 := z.EncBinary() - _ = yym3522 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq3517[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3523 := z.EncBinary() - _ = yym3523 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } - } - if yyr3517 || yy2arr3517 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3517[2] { - yym3525 := z.EncBinary() - _ = yym3525 + if yyq3491[2] { + yym3499 := z.EncBinary() + _ = yym3499 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.LabelSelector)) @@ -44867,23 +44568,23 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3517[2] { + if yyq3491[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("labelSelector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3526 := z.EncBinary() - _ = yym3526 + yym3500 := z.EncBinary() + _ = yym3500 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.LabelSelector)) } } } - if yyr3517 || yy2arr3517 { + if yyr3491 || yy2arr3491 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3517[3] { - yym3528 := z.EncBinary() - _ = yym3528 + if yyq3491[3] { + yym3502 := z.EncBinary() + _ = yym3502 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FieldSelector)) @@ -44892,23 +44593,23 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3517[3] { + if yyq3491[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("fieldSelector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3529 := z.EncBinary() - _ = yym3529 + yym3503 := z.EncBinary() + _ = yym3503 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FieldSelector)) } } } - if yyr3517 || yy2arr3517 { + if yyr3491 || yy2arr3491 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3517[4] { - yym3531 := z.EncBinary() - _ = yym3531 + if yyq3491[4] { + yym3505 := z.EncBinary() + _ = yym3505 if false { } else { r.EncodeBool(bool(x.Watch)) @@ -44917,23 +44618,23 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3517[4] { + if yyq3491[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("watch")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3532 := z.EncBinary() - _ = yym3532 + yym3506 := z.EncBinary() + _ = yym3506 if false { } else { r.EncodeBool(bool(x.Watch)) } } } - if yyr3517 || yy2arr3517 { + if yyr3491 || yy2arr3491 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3517[5] { - yym3534 := z.EncBinary() - _ = yym3534 + if yyq3491[5] { + yym3508 := z.EncBinary() + _ = yym3508 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) @@ -44942,54 +44643,54 @@ func (x *ListOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3517[5] { + if yyq3491[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resourceVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3535 := z.EncBinary() - _ = yym3535 + yym3509 := z.EncBinary() + _ = yym3509 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) } } } - if yyr3517 || yy2arr3517 { + if yyr3491 || yy2arr3491 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3517[6] { + if yyq3491[6] { if x.TimeoutSeconds == nil { r.EncodeNil() } else { - yy3537 := *x.TimeoutSeconds - yym3538 := z.EncBinary() - _ = yym3538 + yy3511 := *x.TimeoutSeconds + yym3512 := z.EncBinary() + _ = yym3512 if false { } else { - r.EncodeInt(int64(yy3537)) + r.EncodeInt(int64(yy3511)) } } } else { r.EncodeNil() } } else { - if yyq3517[6] { + if yyq3491[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("timeoutSeconds")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.TimeoutSeconds == nil { r.EncodeNil() } else { - yy3539 := *x.TimeoutSeconds - yym3540 := z.EncBinary() - _ = yym3540 + yy3513 := *x.TimeoutSeconds + yym3514 := z.EncBinary() + _ = yym3514 if false { } else { - r.EncodeInt(int64(yy3539)) + r.EncodeInt(int64(yy3513)) } } } } - if yyr3517 || yy2arr3517 { + if yyr3491 || yy2arr3491 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -45002,25 +44703,25 @@ func (x *ListOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3541 := z.DecBinary() - _ = yym3541 + yym3515 := z.DecBinary() + _ = yym3515 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3542 := r.ContainerType() - if yyct3542 == codecSelferValueTypeMap1234 { - yyl3542 := r.ReadMapStart() - if yyl3542 == 0 { + yyct3516 := r.ContainerType() + if yyct3516 == codecSelferValueTypeMap1234 { + yyl3516 := r.ReadMapStart() + if yyl3516 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3542, d) + x.codecDecodeSelfFromMap(yyl3516, d) } - } else if yyct3542 == codecSelferValueTypeArray1234 { - yyl3542 := r.ReadArrayStart() - if yyl3542 == 0 { + } else if yyct3516 == codecSelferValueTypeArray1234 { + yyl3516 := r.ReadArrayStart() + if yyl3516 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3542, d) + x.codecDecodeSelfFromArray(yyl3516, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -45032,12 +44733,12 @@ func (x *ListOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3543Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3543Slc - var yyhl3543 bool = l >= 0 - for yyj3543 := 0; ; yyj3543++ { - if yyhl3543 { - if yyj3543 >= l { + var yys3517Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3517Slc + var yyhl3517 bool = l >= 0 + for yyj3517 := 0; ; yyj3517++ { + if yyhl3517 { + if yyj3517 >= l { break } } else { @@ -45046,10 +44747,10 @@ func (x *ListOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3543Slc = r.DecodeBytes(yys3543Slc, true, true) - yys3543 := string(yys3543Slc) + yys3517Slc = r.DecodeBytes(yys3517Slc, true, true) + yys3517 := string(yys3517Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3543 { + switch yys3517 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -45095,17 +44796,17 @@ func (x *ListOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.TimeoutSeconds == nil { x.TimeoutSeconds = new(int64) } - yym3551 := z.DecBinary() - _ = yym3551 + yym3525 := z.DecBinary() + _ = yym3525 if false { } else { *((*int64)(x.TimeoutSeconds)) = int64(r.DecodeInt(64)) } } default: - z.DecStructFieldNotFound(-1, yys3543) - } // end switch yys3543 - } // end for yyj3543 + z.DecStructFieldNotFound(-1, yys3517) + } // end switch yys3517 + } // end for yyj3517 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -45113,16 +44814,16 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3552 int - var yyb3552 bool - var yyhl3552 bool = l >= 0 - yyj3552++ - if yyhl3552 { - yyb3552 = yyj3552 > l + var yyj3526 int + var yyb3526 bool + var yyhl3526 bool = l >= 0 + yyj3526++ + if yyhl3526 { + yyb3526 = yyj3526 > l } else { - yyb3552 = r.CheckBreak() + yyb3526 = r.CheckBreak() } - if yyb3552 { + if yyb3526 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45132,13 +44833,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3552++ - if yyhl3552 { - yyb3552 = yyj3552 > l + yyj3526++ + if yyhl3526 { + yyb3526 = yyj3526 > l } else { - yyb3552 = r.CheckBreak() + yyb3526 = r.CheckBreak() } - if yyb3552 { + if yyb3526 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45148,13 +44849,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3552++ - if yyhl3552 { - yyb3552 = yyj3552 > l + yyj3526++ + if yyhl3526 { + yyb3526 = yyj3526 > l } else { - yyb3552 = r.CheckBreak() + yyb3526 = r.CheckBreak() } - if yyb3552 { + if yyb3526 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45164,13 +44865,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.LabelSelector = string(r.DecodeString()) } - yyj3552++ - if yyhl3552 { - yyb3552 = yyj3552 > l + yyj3526++ + if yyhl3526 { + yyb3526 = yyj3526 > l } else { - yyb3552 = r.CheckBreak() + yyb3526 = r.CheckBreak() } - if yyb3552 { + if yyb3526 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45180,13 +44881,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.FieldSelector = string(r.DecodeString()) } - yyj3552++ - if yyhl3552 { - yyb3552 = yyj3552 > l + yyj3526++ + if yyhl3526 { + yyb3526 = yyj3526 > l } else { - yyb3552 = r.CheckBreak() + yyb3526 = r.CheckBreak() } - if yyb3552 { + if yyb3526 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45196,13 +44897,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Watch = bool(r.DecodeBool()) } - yyj3552++ - if yyhl3552 { - yyb3552 = yyj3552 > l + yyj3526++ + if yyhl3526 { + yyb3526 = yyj3526 > l } else { - yyb3552 = r.CheckBreak() + yyb3526 = r.CheckBreak() } - if yyb3552 { + if yyb3526 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45212,13 +44913,13 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.ResourceVersion = string(r.DecodeString()) } - yyj3552++ - if yyhl3552 { - yyb3552 = yyj3552 > l + yyj3526++ + if yyhl3526 { + yyb3526 = yyj3526 > l } else { - yyb3552 = r.CheckBreak() + yyb3526 = r.CheckBreak() } - if yyb3552 { + if yyb3526 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45231,25 +44932,25 @@ func (x *ListOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.TimeoutSeconds == nil { x.TimeoutSeconds = new(int64) } - yym3560 := z.DecBinary() - _ = yym3560 + yym3534 := z.DecBinary() + _ = yym3534 if false { } else { *((*int64)(x.TimeoutSeconds)) = int64(r.DecodeInt(64)) } } for { - yyj3552++ - if yyhl3552 { - yyb3552 = yyj3552 > l + yyj3526++ + if yyhl3526 { + yyb3526 = yyj3526 > l } else { - yyb3552 = r.CheckBreak() + yyb3526 = r.CheckBreak() } - if yyb3552 { + if yyb3526 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3552-1, "") + z.DecStructFieldNotFound(yyj3526-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -45261,44 +44962,44 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3561 := z.EncBinary() - _ = yym3561 + yym3535 := z.EncBinary() + _ = yym3535 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3562 := !z.EncBinary() - yy2arr3562 := z.EncBasicHandle().StructToArray - var yyq3562 [10]bool - _, _, _ = yysep3562, yyq3562, yy2arr3562 - const yyr3562 bool = false - yyq3562[0] = x.Kind != "" - yyq3562[1] = x.APIVersion != "" - yyq3562[2] = x.Container != "" - yyq3562[3] = x.Follow != false - yyq3562[4] = x.Previous != false - yyq3562[5] = x.SinceSeconds != nil - yyq3562[6] = x.SinceTime != nil - yyq3562[7] = x.Timestamps != false - yyq3562[8] = x.TailLines != nil - yyq3562[9] = x.LimitBytes != nil - var yynn3562 int - if yyr3562 || yy2arr3562 { + yysep3536 := !z.EncBinary() + yy2arr3536 := z.EncBasicHandle().StructToArray + var yyq3536 [10]bool + _, _, _ = yysep3536, yyq3536, yy2arr3536 + const yyr3536 bool = false + yyq3536[0] = x.Kind != "" + yyq3536[1] = x.APIVersion != "" + yyq3536[2] = x.Container != "" + yyq3536[3] = x.Follow != false + yyq3536[4] = x.Previous != false + yyq3536[5] = x.SinceSeconds != nil + yyq3536[6] = x.SinceTime != nil + yyq3536[7] = x.Timestamps != false + yyq3536[8] = x.TailLines != nil + yyq3536[9] = x.LimitBytes != nil + var yynn3536 int + if yyr3536 || yy2arr3536 { r.EncodeArrayStart(10) } else { - yynn3562 = 0 - for _, b := range yyq3562 { + yynn3536 = 0 + for _, b := range yyq3536 { if b { - yynn3562++ + yynn3536++ } } - r.EncodeMapStart(yynn3562) - yynn3562 = 0 + r.EncodeMapStart(yynn3536) + yynn3536 = 0 } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[0] { - yym3564 := z.EncBinary() - _ = yym3564 + if yyq3536[0] { + yym3538 := z.EncBinary() + _ = yym3538 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -45307,23 +45008,23 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3562[0] { + if yyq3536[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3565 := z.EncBinary() - _ = yym3565 + yym3539 := z.EncBinary() + _ = yym3539 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[1] { - yym3567 := z.EncBinary() - _ = yym3567 + if yyq3536[1] { + yym3541 := z.EncBinary() + _ = yym3541 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -45332,23 +45033,23 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3562[1] { + if yyq3536[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3568 := z.EncBinary() - _ = yym3568 + yym3542 := z.EncBinary() + _ = yym3542 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[2] { - yym3570 := z.EncBinary() - _ = yym3570 + if yyq3536[2] { + yym3544 := z.EncBinary() + _ = yym3544 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) @@ -45357,23 +45058,23 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3562[2] { + if yyq3536[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("container")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3571 := z.EncBinary() - _ = yym3571 + yym3545 := z.EncBinary() + _ = yym3545 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[3] { - yym3573 := z.EncBinary() - _ = yym3573 + if yyq3536[3] { + yym3547 := z.EncBinary() + _ = yym3547 if false { } else { r.EncodeBool(bool(x.Follow)) @@ -45382,23 +45083,23 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3562[3] { + if yyq3536[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("follow")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3574 := z.EncBinary() - _ = yym3574 + yym3548 := z.EncBinary() + _ = yym3548 if false { } else { r.EncodeBool(bool(x.Follow)) } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[4] { - yym3576 := z.EncBinary() - _ = yym3576 + if yyq3536[4] { + yym3550 := z.EncBinary() + _ = yym3550 if false { } else { r.EncodeBool(bool(x.Previous)) @@ -45407,66 +45108,66 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3562[4] { + if yyq3536[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("previous")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3577 := z.EncBinary() - _ = yym3577 + yym3551 := z.EncBinary() + _ = yym3551 if false { } else { r.EncodeBool(bool(x.Previous)) } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[5] { + if yyq3536[5] { if x.SinceSeconds == nil { r.EncodeNil() } else { - yy3579 := *x.SinceSeconds - yym3580 := z.EncBinary() - _ = yym3580 + yy3553 := *x.SinceSeconds + yym3554 := z.EncBinary() + _ = yym3554 if false { } else { - r.EncodeInt(int64(yy3579)) + r.EncodeInt(int64(yy3553)) } } } else { r.EncodeNil() } } else { - if yyq3562[5] { + if yyq3536[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("sinceSeconds")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.SinceSeconds == nil { r.EncodeNil() } else { - yy3581 := *x.SinceSeconds - yym3582 := z.EncBinary() - _ = yym3582 + yy3555 := *x.SinceSeconds + yym3556 := z.EncBinary() + _ = yym3556 if false { } else { - r.EncodeInt(int64(yy3581)) + r.EncodeInt(int64(yy3555)) } } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[6] { + if yyq3536[6] { if x.SinceTime == nil { r.EncodeNil() } else { - yym3584 := z.EncBinary() - _ = yym3584 + yym3558 := z.EncBinary() + _ = yym3558 if false { } else if z.HasExtensions() && z.EncExt(x.SinceTime) { - } else if yym3584 { + } else if yym3558 { z.EncBinaryMarshal(x.SinceTime) - } else if !yym3584 && z.IsJSONHandle() { + } else if !yym3558 && z.IsJSONHandle() { z.EncJSONMarshal(x.SinceTime) } else { z.EncFallback(x.SinceTime) @@ -45476,20 +45177,20 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq3562[6] { + if yyq3536[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("sinceTime")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.SinceTime == nil { r.EncodeNil() } else { - yym3585 := z.EncBinary() - _ = yym3585 + yym3559 := z.EncBinary() + _ = yym3559 if false { } else if z.HasExtensions() && z.EncExt(x.SinceTime) { - } else if yym3585 { + } else if yym3559 { z.EncBinaryMarshal(x.SinceTime) - } else if !yym3585 && z.IsJSONHandle() { + } else if !yym3559 && z.IsJSONHandle() { z.EncJSONMarshal(x.SinceTime) } else { z.EncFallback(x.SinceTime) @@ -45497,11 +45198,11 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[7] { - yym3587 := z.EncBinary() - _ = yym3587 + if yyq3536[7] { + yym3561 := z.EncBinary() + _ = yym3561 if false { } else { r.EncodeBool(bool(x.Timestamps)) @@ -45510,89 +45211,89 @@ func (x *PodLogOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3562[7] { + if yyq3536[7] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("timestamps")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3588 := z.EncBinary() - _ = yym3588 + yym3562 := z.EncBinary() + _ = yym3562 if false { } else { r.EncodeBool(bool(x.Timestamps)) } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[8] { + if yyq3536[8] { if x.TailLines == nil { r.EncodeNil() } else { - yy3590 := *x.TailLines - yym3591 := z.EncBinary() - _ = yym3591 + yy3564 := *x.TailLines + yym3565 := z.EncBinary() + _ = yym3565 if false { } else { - r.EncodeInt(int64(yy3590)) + r.EncodeInt(int64(yy3564)) } } } else { r.EncodeNil() } } else { - if yyq3562[8] { + if yyq3536[8] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("tailLines")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.TailLines == nil { r.EncodeNil() } else { - yy3592 := *x.TailLines - yym3593 := z.EncBinary() - _ = yym3593 + yy3566 := *x.TailLines + yym3567 := z.EncBinary() + _ = yym3567 if false { } else { - r.EncodeInt(int64(yy3592)) + r.EncodeInt(int64(yy3566)) } } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3562[9] { + if yyq3536[9] { if x.LimitBytes == nil { r.EncodeNil() } else { - yy3595 := *x.LimitBytes - yym3596 := z.EncBinary() - _ = yym3596 + yy3569 := *x.LimitBytes + yym3570 := z.EncBinary() + _ = yym3570 if false { } else { - r.EncodeInt(int64(yy3595)) + r.EncodeInt(int64(yy3569)) } } } else { r.EncodeNil() } } else { - if yyq3562[9] { + if yyq3536[9] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("limitBytes")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.LimitBytes == nil { r.EncodeNil() } else { - yy3597 := *x.LimitBytes - yym3598 := z.EncBinary() - _ = yym3598 + yy3571 := *x.LimitBytes + yym3572 := z.EncBinary() + _ = yym3572 if false { } else { - r.EncodeInt(int64(yy3597)) + r.EncodeInt(int64(yy3571)) } } } } - if yyr3562 || yy2arr3562 { + if yyr3536 || yy2arr3536 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -45605,25 +45306,25 @@ func (x *PodLogOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3599 := z.DecBinary() - _ = yym3599 + yym3573 := z.DecBinary() + _ = yym3573 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3600 := r.ContainerType() - if yyct3600 == codecSelferValueTypeMap1234 { - yyl3600 := r.ReadMapStart() - if yyl3600 == 0 { + yyct3574 := r.ContainerType() + if yyct3574 == codecSelferValueTypeMap1234 { + yyl3574 := r.ReadMapStart() + if yyl3574 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3600, d) + x.codecDecodeSelfFromMap(yyl3574, d) } - } else if yyct3600 == codecSelferValueTypeArray1234 { - yyl3600 := r.ReadArrayStart() - if yyl3600 == 0 { + } else if yyct3574 == codecSelferValueTypeArray1234 { + yyl3574 := r.ReadArrayStart() + if yyl3574 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3600, d) + x.codecDecodeSelfFromArray(yyl3574, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -45635,12 +45336,12 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3601Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3601Slc - var yyhl3601 bool = l >= 0 - for yyj3601 := 0; ; yyj3601++ { - if yyhl3601 { - if yyj3601 >= l { + var yys3575Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3575Slc + var yyhl3575 bool = l >= 0 + for yyj3575 := 0; ; yyj3575++ { + if yyhl3575 { + if yyj3575 >= l { break } } else { @@ -45649,10 +45350,10 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3601Slc = r.DecodeBytes(yys3601Slc, true, true) - yys3601 := string(yys3601Slc) + yys3575Slc = r.DecodeBytes(yys3575Slc, true, true) + yys3575 := string(yys3575Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3601 { + switch yys3575 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -45692,8 +45393,8 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.SinceSeconds == nil { x.SinceSeconds = new(int64) } - yym3608 := z.DecBinary() - _ = yym3608 + yym3582 := z.DecBinary() + _ = yym3582 if false { } else { *((*int64)(x.SinceSeconds)) = int64(r.DecodeInt(64)) @@ -45706,15 +45407,15 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } - yym3610 := z.DecBinary() - _ = yym3610 + yym3584 := z.DecBinary() + _ = yym3584 if false { } else if z.HasExtensions() && z.DecExt(x.SinceTime) { - } else if yym3610 { + } else if yym3584 { z.DecBinaryUnmarshal(x.SinceTime) - } else if !yym3610 && z.IsJSONHandle() { + } else if !yym3584 && z.IsJSONHandle() { z.DecJSONUnmarshal(x.SinceTime) } else { z.DecFallback(x.SinceTime, false) @@ -45735,8 +45436,8 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.TailLines == nil { x.TailLines = new(int64) } - yym3613 := z.DecBinary() - _ = yym3613 + yym3587 := z.DecBinary() + _ = yym3587 if false { } else { *((*int64)(x.TailLines)) = int64(r.DecodeInt(64)) @@ -45751,17 +45452,17 @@ func (x *PodLogOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.LimitBytes == nil { x.LimitBytes = new(int64) } - yym3615 := z.DecBinary() - _ = yym3615 + yym3589 := z.DecBinary() + _ = yym3589 if false { } else { *((*int64)(x.LimitBytes)) = int64(r.DecodeInt(64)) } } default: - z.DecStructFieldNotFound(-1, yys3601) - } // end switch yys3601 - } // end for yyj3601 + z.DecStructFieldNotFound(-1, yys3575) + } // end switch yys3575 + } // end for yyj3575 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -45769,16 +45470,16 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3616 int - var yyb3616 bool - var yyhl3616 bool = l >= 0 - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + var yyj3590 int + var yyb3590 bool + var yyhl3590 bool = l >= 0 + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45788,13 +45489,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45804,13 +45505,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45820,13 +45521,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Container = string(r.DecodeString()) } - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45836,13 +45537,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Follow = bool(r.DecodeBool()) } - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45852,13 +45553,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Previous = bool(r.DecodeBool()) } - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45871,20 +45572,20 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.SinceSeconds == nil { x.SinceSeconds = new(int64) } - yym3623 := z.DecBinary() - _ = yym3623 + yym3597 := z.DecBinary() + _ = yym3597 if false { } else { *((*int64)(x.SinceSeconds)) = int64(r.DecodeInt(64)) } } - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45895,27 +45596,27 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.SinceTime == nil { - x.SinceTime = new(pkg2_unversioned.Time) + x.SinceTime = new(pkg2_v1.Time) } - yym3625 := z.DecBinary() - _ = yym3625 + yym3599 := z.DecBinary() + _ = yym3599 if false { } else if z.HasExtensions() && z.DecExt(x.SinceTime) { - } else if yym3625 { + } else if yym3599 { z.DecBinaryUnmarshal(x.SinceTime) - } else if !yym3625 && z.IsJSONHandle() { + } else if !yym3599 && z.IsJSONHandle() { z.DecJSONUnmarshal(x.SinceTime) } else { z.DecFallback(x.SinceTime, false) } } - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45925,13 +45626,13 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Timestamps = bool(r.DecodeBool()) } - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45944,20 +45645,20 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.TailLines == nil { x.TailLines = new(int64) } - yym3628 := z.DecBinary() - _ = yym3628 + yym3602 := z.DecBinary() + _ = yym3602 if false { } else { *((*int64)(x.TailLines)) = int64(r.DecodeInt(64)) } } - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -45970,25 +45671,25 @@ func (x *PodLogOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.LimitBytes == nil { x.LimitBytes = new(int64) } - yym3630 := z.DecBinary() - _ = yym3630 + yym3604 := z.DecBinary() + _ = yym3604 if false { } else { *((*int64)(x.LimitBytes)) = int64(r.DecodeInt(64)) } } for { - yyj3616++ - if yyhl3616 { - yyb3616 = yyj3616 > l + yyj3590++ + if yyhl3590 { + yyb3590 = yyj3590 > l } else { - yyb3616 = r.CheckBreak() + yyb3590 = r.CheckBreak() } - if yyb3616 { + if yyb3590 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3616-1, "") + z.DecStructFieldNotFound(yyj3590-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -46000,41 +45701,41 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3631 := z.EncBinary() - _ = yym3631 + yym3605 := z.EncBinary() + _ = yym3605 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3632 := !z.EncBinary() - yy2arr3632 := z.EncBasicHandle().StructToArray - var yyq3632 [7]bool - _, _, _ = yysep3632, yyq3632, yy2arr3632 - const yyr3632 bool = false - yyq3632[0] = x.Kind != "" - yyq3632[1] = x.APIVersion != "" - yyq3632[2] = x.Stdin != false - yyq3632[3] = x.Stdout != false - yyq3632[4] = x.Stderr != false - yyq3632[5] = x.TTY != false - yyq3632[6] = x.Container != "" - var yynn3632 int - if yyr3632 || yy2arr3632 { + yysep3606 := !z.EncBinary() + yy2arr3606 := z.EncBasicHandle().StructToArray + var yyq3606 [7]bool + _, _, _ = yysep3606, yyq3606, yy2arr3606 + const yyr3606 bool = false + yyq3606[0] = x.Kind != "" + yyq3606[1] = x.APIVersion != "" + yyq3606[2] = x.Stdin != false + yyq3606[3] = x.Stdout != false + yyq3606[4] = x.Stderr != false + yyq3606[5] = x.TTY != false + yyq3606[6] = x.Container != "" + var yynn3606 int + if yyr3606 || yy2arr3606 { r.EncodeArrayStart(7) } else { - yynn3632 = 0 - for _, b := range yyq3632 { + yynn3606 = 0 + for _, b := range yyq3606 { if b { - yynn3632++ + yynn3606++ } } - r.EncodeMapStart(yynn3632) - yynn3632 = 0 + r.EncodeMapStart(yynn3606) + yynn3606 = 0 } - if yyr3632 || yy2arr3632 { + if yyr3606 || yy2arr3606 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3632[0] { - yym3634 := z.EncBinary() - _ = yym3634 + if yyq3606[0] { + yym3608 := z.EncBinary() + _ = yym3608 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -46043,23 +45744,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3632[0] { + if yyq3606[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3635 := z.EncBinary() - _ = yym3635 + yym3609 := z.EncBinary() + _ = yym3609 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3632 || yy2arr3632 { + if yyr3606 || yy2arr3606 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3632[1] { - yym3637 := z.EncBinary() - _ = yym3637 + if yyq3606[1] { + yym3611 := z.EncBinary() + _ = yym3611 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -46068,23 +45769,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3632[1] { + if yyq3606[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3638 := z.EncBinary() - _ = yym3638 + yym3612 := z.EncBinary() + _ = yym3612 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3632 || yy2arr3632 { + if yyr3606 || yy2arr3606 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3632[2] { - yym3640 := z.EncBinary() - _ = yym3640 + if yyq3606[2] { + yym3614 := z.EncBinary() + _ = yym3614 if false { } else { r.EncodeBool(bool(x.Stdin)) @@ -46093,23 +45794,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3632[2] { + if yyq3606[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stdin")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3641 := z.EncBinary() - _ = yym3641 + yym3615 := z.EncBinary() + _ = yym3615 if false { } else { r.EncodeBool(bool(x.Stdin)) } } } - if yyr3632 || yy2arr3632 { + if yyr3606 || yy2arr3606 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3632[3] { - yym3643 := z.EncBinary() - _ = yym3643 + if yyq3606[3] { + yym3617 := z.EncBinary() + _ = yym3617 if false { } else { r.EncodeBool(bool(x.Stdout)) @@ -46118,23 +45819,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3632[3] { + if yyq3606[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stdout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3644 := z.EncBinary() - _ = yym3644 + yym3618 := z.EncBinary() + _ = yym3618 if false { } else { r.EncodeBool(bool(x.Stdout)) } } } - if yyr3632 || yy2arr3632 { + if yyr3606 || yy2arr3606 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3632[4] { - yym3646 := z.EncBinary() - _ = yym3646 + if yyq3606[4] { + yym3620 := z.EncBinary() + _ = yym3620 if false { } else { r.EncodeBool(bool(x.Stderr)) @@ -46143,23 +45844,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3632[4] { + if yyq3606[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stderr")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3647 := z.EncBinary() - _ = yym3647 + yym3621 := z.EncBinary() + _ = yym3621 if false { } else { r.EncodeBool(bool(x.Stderr)) } } } - if yyr3632 || yy2arr3632 { + if yyr3606 || yy2arr3606 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3632[5] { - yym3649 := z.EncBinary() - _ = yym3649 + if yyq3606[5] { + yym3623 := z.EncBinary() + _ = yym3623 if false { } else { r.EncodeBool(bool(x.TTY)) @@ -46168,23 +45869,23 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3632[5] { + if yyq3606[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("tty")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3650 := z.EncBinary() - _ = yym3650 + yym3624 := z.EncBinary() + _ = yym3624 if false { } else { r.EncodeBool(bool(x.TTY)) } } } - if yyr3632 || yy2arr3632 { + if yyr3606 || yy2arr3606 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3632[6] { - yym3652 := z.EncBinary() - _ = yym3652 + if yyq3606[6] { + yym3626 := z.EncBinary() + _ = yym3626 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) @@ -46193,19 +45894,19 @@ func (x *PodAttachOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3632[6] { + if yyq3606[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("container")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3653 := z.EncBinary() - _ = yym3653 + yym3627 := z.EncBinary() + _ = yym3627 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) } } } - if yyr3632 || yy2arr3632 { + if yyr3606 || yy2arr3606 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -46218,25 +45919,25 @@ func (x *PodAttachOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3654 := z.DecBinary() - _ = yym3654 + yym3628 := z.DecBinary() + _ = yym3628 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3655 := r.ContainerType() - if yyct3655 == codecSelferValueTypeMap1234 { - yyl3655 := r.ReadMapStart() - if yyl3655 == 0 { + yyct3629 := r.ContainerType() + if yyct3629 == codecSelferValueTypeMap1234 { + yyl3629 := r.ReadMapStart() + if yyl3629 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3655, d) + x.codecDecodeSelfFromMap(yyl3629, d) } - } else if yyct3655 == codecSelferValueTypeArray1234 { - yyl3655 := r.ReadArrayStart() - if yyl3655 == 0 { + } else if yyct3629 == codecSelferValueTypeArray1234 { + yyl3629 := r.ReadArrayStart() + if yyl3629 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3655, d) + x.codecDecodeSelfFromArray(yyl3629, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -46248,12 +45949,12 @@ func (x *PodAttachOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3656Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3656Slc - var yyhl3656 bool = l >= 0 - for yyj3656 := 0; ; yyj3656++ { - if yyhl3656 { - if yyj3656 >= l { + var yys3630Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3630Slc + var yyhl3630 bool = l >= 0 + for yyj3630 := 0; ; yyj3630++ { + if yyhl3630 { + if yyj3630 >= l { break } } else { @@ -46262,10 +45963,10 @@ func (x *PodAttachOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3656Slc = r.DecodeBytes(yys3656Slc, true, true) - yys3656 := string(yys3656Slc) + yys3630Slc = r.DecodeBytes(yys3630Slc, true, true) + yys3630 := string(yys3630Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3656 { + switch yys3630 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -46309,9 +46010,9 @@ func (x *PodAttachOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Container = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3656) - } // end switch yys3656 - } // end for yyj3656 + z.DecStructFieldNotFound(-1, yys3630) + } // end switch yys3630 + } // end for yyj3630 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -46319,16 +46020,16 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3664 int - var yyb3664 bool - var yyhl3664 bool = l >= 0 - yyj3664++ - if yyhl3664 { - yyb3664 = yyj3664 > l + var yyj3638 int + var yyb3638 bool + var yyhl3638 bool = l >= 0 + yyj3638++ + if yyhl3638 { + yyb3638 = yyj3638 > l } else { - yyb3664 = r.CheckBreak() + yyb3638 = r.CheckBreak() } - if yyb3664 { + if yyb3638 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46338,13 +46039,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3664++ - if yyhl3664 { - yyb3664 = yyj3664 > l + yyj3638++ + if yyhl3638 { + yyb3638 = yyj3638 > l } else { - yyb3664 = r.CheckBreak() + yyb3638 = r.CheckBreak() } - if yyb3664 { + if yyb3638 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46354,13 +46055,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3664++ - if yyhl3664 { - yyb3664 = yyj3664 > l + yyj3638++ + if yyhl3638 { + yyb3638 = yyj3638 > l } else { - yyb3664 = r.CheckBreak() + yyb3638 = r.CheckBreak() } - if yyb3664 { + if yyb3638 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46370,13 +46071,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Stdin = bool(r.DecodeBool()) } - yyj3664++ - if yyhl3664 { - yyb3664 = yyj3664 > l + yyj3638++ + if yyhl3638 { + yyb3638 = yyj3638 > l } else { - yyb3664 = r.CheckBreak() + yyb3638 = r.CheckBreak() } - if yyb3664 { + if yyb3638 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46386,13 +46087,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Stdout = bool(r.DecodeBool()) } - yyj3664++ - if yyhl3664 { - yyb3664 = yyj3664 > l + yyj3638++ + if yyhl3638 { + yyb3638 = yyj3638 > l } else { - yyb3664 = r.CheckBreak() + yyb3638 = r.CheckBreak() } - if yyb3664 { + if yyb3638 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46402,13 +46103,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Stderr = bool(r.DecodeBool()) } - yyj3664++ - if yyhl3664 { - yyb3664 = yyj3664 > l + yyj3638++ + if yyhl3638 { + yyb3638 = yyj3638 > l } else { - yyb3664 = r.CheckBreak() + yyb3638 = r.CheckBreak() } - if yyb3664 { + if yyb3638 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46418,13 +46119,13 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.TTY = bool(r.DecodeBool()) } - yyj3664++ - if yyhl3664 { - yyb3664 = yyj3664 > l + yyj3638++ + if yyhl3638 { + yyb3638 = yyj3638 > l } else { - yyb3664 = r.CheckBreak() + yyb3638 = r.CheckBreak() } - if yyb3664 { + if yyb3638 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46435,17 +46136,17 @@ func (x *PodAttachOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.Container = string(r.DecodeString()) } for { - yyj3664++ - if yyhl3664 { - yyb3664 = yyj3664 > l + yyj3638++ + if yyhl3638 { + yyb3638 = yyj3638 > l } else { - yyb3664 = r.CheckBreak() + yyb3638 = r.CheckBreak() } - if yyb3664 { + if yyb3638 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3664-1, "") + z.DecStructFieldNotFound(yyj3638-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -46457,41 +46158,41 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3672 := z.EncBinary() - _ = yym3672 + yym3646 := z.EncBinary() + _ = yym3646 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3673 := !z.EncBinary() - yy2arr3673 := z.EncBasicHandle().StructToArray - var yyq3673 [8]bool - _, _, _ = yysep3673, yyq3673, yy2arr3673 - const yyr3673 bool = false - yyq3673[0] = x.Kind != "" - yyq3673[1] = x.APIVersion != "" - yyq3673[2] = x.Stdin != false - yyq3673[3] = x.Stdout != false - yyq3673[4] = x.Stderr != false - yyq3673[5] = x.TTY != false - yyq3673[6] = x.Container != "" - var yynn3673 int - if yyr3673 || yy2arr3673 { + yysep3647 := !z.EncBinary() + yy2arr3647 := z.EncBasicHandle().StructToArray + var yyq3647 [8]bool + _, _, _ = yysep3647, yyq3647, yy2arr3647 + const yyr3647 bool = false + yyq3647[0] = x.Kind != "" + yyq3647[1] = x.APIVersion != "" + yyq3647[2] = x.Stdin != false + yyq3647[3] = x.Stdout != false + yyq3647[4] = x.Stderr != false + yyq3647[5] = x.TTY != false + yyq3647[6] = x.Container != "" + var yynn3647 int + if yyr3647 || yy2arr3647 { r.EncodeArrayStart(8) } else { - yynn3673 = 1 - for _, b := range yyq3673 { + yynn3647 = 1 + for _, b := range yyq3647 { if b { - yynn3673++ + yynn3647++ } } - r.EncodeMapStart(yynn3673) - yynn3673 = 0 + r.EncodeMapStart(yynn3647) + yynn3647 = 0 } - if yyr3673 || yy2arr3673 { + if yyr3647 || yy2arr3647 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3673[0] { - yym3675 := z.EncBinary() - _ = yym3675 + if yyq3647[0] { + yym3649 := z.EncBinary() + _ = yym3649 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -46500,23 +46201,23 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3673[0] { + if yyq3647[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3676 := z.EncBinary() - _ = yym3676 + yym3650 := z.EncBinary() + _ = yym3650 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3673 || yy2arr3673 { + if yyr3647 || yy2arr3647 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3673[1] { - yym3678 := z.EncBinary() - _ = yym3678 + if yyq3647[1] { + yym3652 := z.EncBinary() + _ = yym3652 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -46525,23 +46226,23 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3673[1] { + if yyq3647[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3679 := z.EncBinary() - _ = yym3679 + yym3653 := z.EncBinary() + _ = yym3653 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3673 || yy2arr3673 { + if yyr3647 || yy2arr3647 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3673[2] { - yym3681 := z.EncBinary() - _ = yym3681 + if yyq3647[2] { + yym3655 := z.EncBinary() + _ = yym3655 if false { } else { r.EncodeBool(bool(x.Stdin)) @@ -46550,23 +46251,23 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3673[2] { + if yyq3647[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stdin")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3682 := z.EncBinary() - _ = yym3682 + yym3656 := z.EncBinary() + _ = yym3656 if false { } else { r.EncodeBool(bool(x.Stdin)) } } } - if yyr3673 || yy2arr3673 { + if yyr3647 || yy2arr3647 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3673[3] { - yym3684 := z.EncBinary() - _ = yym3684 + if yyq3647[3] { + yym3658 := z.EncBinary() + _ = yym3658 if false { } else { r.EncodeBool(bool(x.Stdout)) @@ -46575,23 +46276,23 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3673[3] { + if yyq3647[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stdout")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3685 := z.EncBinary() - _ = yym3685 + yym3659 := z.EncBinary() + _ = yym3659 if false { } else { r.EncodeBool(bool(x.Stdout)) } } } - if yyr3673 || yy2arr3673 { + if yyr3647 || yy2arr3647 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3673[4] { - yym3687 := z.EncBinary() - _ = yym3687 + if yyq3647[4] { + yym3661 := z.EncBinary() + _ = yym3661 if false { } else { r.EncodeBool(bool(x.Stderr)) @@ -46600,23 +46301,23 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3673[4] { + if yyq3647[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stderr")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3688 := z.EncBinary() - _ = yym3688 + yym3662 := z.EncBinary() + _ = yym3662 if false { } else { r.EncodeBool(bool(x.Stderr)) } } } - if yyr3673 || yy2arr3673 { + if yyr3647 || yy2arr3647 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3673[5] { - yym3690 := z.EncBinary() - _ = yym3690 + if yyq3647[5] { + yym3664 := z.EncBinary() + _ = yym3664 if false { } else { r.EncodeBool(bool(x.TTY)) @@ -46625,23 +46326,23 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq3673[5] { + if yyq3647[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("tty")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3691 := z.EncBinary() - _ = yym3691 + yym3665 := z.EncBinary() + _ = yym3665 if false { } else { r.EncodeBool(bool(x.TTY)) } } } - if yyr3673 || yy2arr3673 { + if yyr3647 || yy2arr3647 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3673[6] { - yym3693 := z.EncBinary() - _ = yym3693 + if yyq3647[6] { + yym3667 := z.EncBinary() + _ = yym3667 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) @@ -46650,25 +46351,25 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3673[6] { + if yyq3647[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("container")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3694 := z.EncBinary() - _ = yym3694 + yym3668 := z.EncBinary() + _ = yym3668 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Container)) } } } - if yyr3673 || yy2arr3673 { + if yyr3647 || yy2arr3647 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Command == nil { r.EncodeNil() } else { - yym3696 := z.EncBinary() - _ = yym3696 + yym3670 := z.EncBinary() + _ = yym3670 if false { } else { z.F.EncSliceStringV(x.Command, false, e) @@ -46681,15 +46382,15 @@ func (x *PodExecOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x.Command == nil { r.EncodeNil() } else { - yym3697 := z.EncBinary() - _ = yym3697 + yym3671 := z.EncBinary() + _ = yym3671 if false { } else { z.F.EncSliceStringV(x.Command, false, e) } } } - if yyr3673 || yy2arr3673 { + if yyr3647 || yy2arr3647 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -46702,25 +46403,25 @@ func (x *PodExecOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3698 := z.DecBinary() - _ = yym3698 + yym3672 := z.DecBinary() + _ = yym3672 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3699 := r.ContainerType() - if yyct3699 == codecSelferValueTypeMap1234 { - yyl3699 := r.ReadMapStart() - if yyl3699 == 0 { + yyct3673 := r.ContainerType() + if yyct3673 == codecSelferValueTypeMap1234 { + yyl3673 := r.ReadMapStart() + if yyl3673 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3699, d) + x.codecDecodeSelfFromMap(yyl3673, d) } - } else if yyct3699 == codecSelferValueTypeArray1234 { - yyl3699 := r.ReadArrayStart() - if yyl3699 == 0 { + } else if yyct3673 == codecSelferValueTypeArray1234 { + yyl3673 := r.ReadArrayStart() + if yyl3673 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3699, d) + x.codecDecodeSelfFromArray(yyl3673, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -46732,12 +46433,12 @@ func (x *PodExecOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3700Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3700Slc - var yyhl3700 bool = l >= 0 - for yyj3700 := 0; ; yyj3700++ { - if yyhl3700 { - if yyj3700 >= l { + var yys3674Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3674Slc + var yyhl3674 bool = l >= 0 + for yyj3674 := 0; ; yyj3674++ { + if yyhl3674 { + if yyj3674 >= l { break } } else { @@ -46746,10 +46447,10 @@ func (x *PodExecOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3700Slc = r.DecodeBytes(yys3700Slc, true, true) - yys3700 := string(yys3700Slc) + yys3674Slc = r.DecodeBytes(yys3674Slc, true, true) + yys3674 := string(yys3674Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3700 { + switch yys3674 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -46796,18 +46497,18 @@ func (x *PodExecOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Command = nil } else { - yyv3708 := &x.Command - yym3709 := z.DecBinary() - _ = yym3709 + yyv3682 := &x.Command + yym3683 := z.DecBinary() + _ = yym3683 if false { } else { - z.F.DecSliceStringX(yyv3708, false, d) + z.F.DecSliceStringX(yyv3682, false, d) } } default: - z.DecStructFieldNotFound(-1, yys3700) - } // end switch yys3700 - } // end for yyj3700 + z.DecStructFieldNotFound(-1, yys3674) + } // end switch yys3674 + } // end for yyj3674 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -46815,16 +46516,16 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3710 int - var yyb3710 bool - var yyhl3710 bool = l >= 0 - yyj3710++ - if yyhl3710 { - yyb3710 = yyj3710 > l + var yyj3684 int + var yyb3684 bool + var yyhl3684 bool = l >= 0 + yyj3684++ + if yyhl3684 { + yyb3684 = yyj3684 > l } else { - yyb3710 = r.CheckBreak() + yyb3684 = r.CheckBreak() } - if yyb3710 { + if yyb3684 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46834,13 +46535,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3710++ - if yyhl3710 { - yyb3710 = yyj3710 > l + yyj3684++ + if yyhl3684 { + yyb3684 = yyj3684 > l } else { - yyb3710 = r.CheckBreak() + yyb3684 = r.CheckBreak() } - if yyb3710 { + if yyb3684 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46850,13 +46551,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3710++ - if yyhl3710 { - yyb3710 = yyj3710 > l + yyj3684++ + if yyhl3684 { + yyb3684 = yyj3684 > l } else { - yyb3710 = r.CheckBreak() + yyb3684 = r.CheckBreak() } - if yyb3710 { + if yyb3684 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46866,13 +46567,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Stdin = bool(r.DecodeBool()) } - yyj3710++ - if yyhl3710 { - yyb3710 = yyj3710 > l + yyj3684++ + if yyhl3684 { + yyb3684 = yyj3684 > l } else { - yyb3710 = r.CheckBreak() + yyb3684 = r.CheckBreak() } - if yyb3710 { + if yyb3684 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46882,13 +46583,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Stdout = bool(r.DecodeBool()) } - yyj3710++ - if yyhl3710 { - yyb3710 = yyj3710 > l + yyj3684++ + if yyhl3684 { + yyb3684 = yyj3684 > l } else { - yyb3710 = r.CheckBreak() + yyb3684 = r.CheckBreak() } - if yyb3710 { + if yyb3684 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46898,13 +46599,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Stderr = bool(r.DecodeBool()) } - yyj3710++ - if yyhl3710 { - yyb3710 = yyj3710 > l + yyj3684++ + if yyhl3684 { + yyb3684 = yyj3684 > l } else { - yyb3710 = r.CheckBreak() + yyb3684 = r.CheckBreak() } - if yyb3710 { + if yyb3684 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46914,13 +46615,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.TTY = bool(r.DecodeBool()) } - yyj3710++ - if yyhl3710 { - yyb3710 = yyj3710 > l + yyj3684++ + if yyhl3684 { + yyb3684 = yyj3684 > l } else { - yyb3710 = r.CheckBreak() + yyb3684 = r.CheckBreak() } - if yyb3710 { + if yyb3684 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46930,13 +46631,13 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Container = string(r.DecodeString()) } - yyj3710++ - if yyhl3710 { - yyb3710 = yyj3710 > l + yyj3684++ + if yyhl3684 { + yyb3684 = yyj3684 > l } else { - yyb3710 = r.CheckBreak() + yyb3684 = r.CheckBreak() } - if yyb3710 { + if yyb3684 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -46944,26 +46645,26 @@ func (x *PodExecOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Command = nil } else { - yyv3718 := &x.Command - yym3719 := z.DecBinary() - _ = yym3719 + yyv3692 := &x.Command + yym3693 := z.DecBinary() + _ = yym3693 if false { } else { - z.F.DecSliceStringX(yyv3718, false, d) + z.F.DecSliceStringX(yyv3692, false, d) } } for { - yyj3710++ - if yyhl3710 { - yyb3710 = yyj3710 > l + yyj3684++ + if yyhl3684 { + yyb3684 = yyj3684 > l } else { - yyb3710 = r.CheckBreak() + yyb3684 = r.CheckBreak() } - if yyb3710 { + if yyb3684 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3710-1, "") + z.DecStructFieldNotFound(yyj3684-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -46975,37 +46676,37 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3720 := z.EncBinary() - _ = yym3720 + yym3694 := z.EncBinary() + _ = yym3694 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3721 := !z.EncBinary() - yy2arr3721 := z.EncBasicHandle().StructToArray - var yyq3721 [3]bool - _, _, _ = yysep3721, yyq3721, yy2arr3721 - const yyr3721 bool = false - yyq3721[0] = x.Kind != "" - yyq3721[1] = x.APIVersion != "" - yyq3721[2] = x.Path != "" - var yynn3721 int - if yyr3721 || yy2arr3721 { + yysep3695 := !z.EncBinary() + yy2arr3695 := z.EncBasicHandle().StructToArray + var yyq3695 [3]bool + _, _, _ = yysep3695, yyq3695, yy2arr3695 + const yyr3695 bool = false + yyq3695[0] = x.Kind != "" + yyq3695[1] = x.APIVersion != "" + yyq3695[2] = x.Path != "" + var yynn3695 int + if yyr3695 || yy2arr3695 { r.EncodeArrayStart(3) } else { - yynn3721 = 0 - for _, b := range yyq3721 { + yynn3695 = 0 + for _, b := range yyq3695 { if b { - yynn3721++ + yynn3695++ } } - r.EncodeMapStart(yynn3721) - yynn3721 = 0 + r.EncodeMapStart(yynn3695) + yynn3695 = 0 } - if yyr3721 || yy2arr3721 { + if yyr3695 || yy2arr3695 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3721[0] { - yym3723 := z.EncBinary() - _ = yym3723 + if yyq3695[0] { + yym3697 := z.EncBinary() + _ = yym3697 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -47014,23 +46715,23 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3721[0] { + if yyq3695[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3724 := z.EncBinary() - _ = yym3724 + yym3698 := z.EncBinary() + _ = yym3698 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3721 || yy2arr3721 { + if yyr3695 || yy2arr3695 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3721[1] { - yym3726 := z.EncBinary() - _ = yym3726 + if yyq3695[1] { + yym3700 := z.EncBinary() + _ = yym3700 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -47039,23 +46740,23 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3721[1] { + if yyq3695[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3727 := z.EncBinary() - _ = yym3727 + yym3701 := z.EncBinary() + _ = yym3701 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3721 || yy2arr3721 { + if yyr3695 || yy2arr3695 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3721[2] { - yym3729 := z.EncBinary() - _ = yym3729 + if yyq3695[2] { + yym3703 := z.EncBinary() + _ = yym3703 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) @@ -47064,19 +46765,19 @@ func (x *PodProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3721[2] { + if yyq3695[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("path")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3730 := z.EncBinary() - _ = yym3730 + yym3704 := z.EncBinary() + _ = yym3704 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) } } } - if yyr3721 || yy2arr3721 { + if yyr3695 || yy2arr3695 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -47089,25 +46790,25 @@ func (x *PodProxyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3731 := z.DecBinary() - _ = yym3731 + yym3705 := z.DecBinary() + _ = yym3705 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3732 := r.ContainerType() - if yyct3732 == codecSelferValueTypeMap1234 { - yyl3732 := r.ReadMapStart() - if yyl3732 == 0 { + yyct3706 := r.ContainerType() + if yyct3706 == codecSelferValueTypeMap1234 { + yyl3706 := r.ReadMapStart() + if yyl3706 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3732, d) + x.codecDecodeSelfFromMap(yyl3706, d) } - } else if yyct3732 == codecSelferValueTypeArray1234 { - yyl3732 := r.ReadArrayStart() - if yyl3732 == 0 { + } else if yyct3706 == codecSelferValueTypeArray1234 { + yyl3706 := r.ReadArrayStart() + if yyl3706 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3732, d) + x.codecDecodeSelfFromArray(yyl3706, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -47119,12 +46820,12 @@ func (x *PodProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3733Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3733Slc - var yyhl3733 bool = l >= 0 - for yyj3733 := 0; ; yyj3733++ { - if yyhl3733 { - if yyj3733 >= l { + var yys3707Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3707Slc + var yyhl3707 bool = l >= 0 + for yyj3707 := 0; ; yyj3707++ { + if yyhl3707 { + if yyj3707 >= l { break } } else { @@ -47133,10 +46834,10 @@ func (x *PodProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3733Slc = r.DecodeBytes(yys3733Slc, true, true) - yys3733 := string(yys3733Slc) + yys3707Slc = r.DecodeBytes(yys3707Slc, true, true) + yys3707 := string(yys3707Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3733 { + switch yys3707 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -47156,9 +46857,9 @@ func (x *PodProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Path = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3733) - } // end switch yys3733 - } // end for yyj3733 + z.DecStructFieldNotFound(-1, yys3707) + } // end switch yys3707 + } // end for yyj3707 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -47166,16 +46867,16 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3737 int - var yyb3737 bool - var yyhl3737 bool = l >= 0 - yyj3737++ - if yyhl3737 { - yyb3737 = yyj3737 > l + var yyj3711 int + var yyb3711 bool + var yyhl3711 bool = l >= 0 + yyj3711++ + if yyhl3711 { + yyb3711 = yyj3711 > l } else { - yyb3737 = r.CheckBreak() + yyb3711 = r.CheckBreak() } - if yyb3737 { + if yyb3711 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47185,13 +46886,13 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3737++ - if yyhl3737 { - yyb3737 = yyj3737 > l + yyj3711++ + if yyhl3711 { + yyb3711 = yyj3711 > l } else { - yyb3737 = r.CheckBreak() + yyb3711 = r.CheckBreak() } - if yyb3737 { + if yyb3711 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47201,13 +46902,13 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3737++ - if yyhl3737 { - yyb3737 = yyj3737 > l + yyj3711++ + if yyhl3711 { + yyb3711 = yyj3711 > l } else { - yyb3737 = r.CheckBreak() + yyb3711 = r.CheckBreak() } - if yyb3737 { + if yyb3711 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47218,17 +46919,17 @@ func (x *PodProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.Path = string(r.DecodeString()) } for { - yyj3737++ - if yyhl3737 { - yyb3737 = yyj3737 > l + yyj3711++ + if yyhl3711 { + yyb3711 = yyj3711 > l } else { - yyb3737 = r.CheckBreak() + yyb3711 = r.CheckBreak() } - if yyb3737 { + if yyb3711 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3737-1, "") + z.DecStructFieldNotFound(yyj3711-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -47240,37 +46941,37 @@ func (x *NodeProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3741 := z.EncBinary() - _ = yym3741 + yym3715 := z.EncBinary() + _ = yym3715 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3742 := !z.EncBinary() - yy2arr3742 := z.EncBasicHandle().StructToArray - var yyq3742 [3]bool - _, _, _ = yysep3742, yyq3742, yy2arr3742 - const yyr3742 bool = false - yyq3742[0] = x.Kind != "" - yyq3742[1] = x.APIVersion != "" - yyq3742[2] = x.Path != "" - var yynn3742 int - if yyr3742 || yy2arr3742 { + yysep3716 := !z.EncBinary() + yy2arr3716 := z.EncBasicHandle().StructToArray + var yyq3716 [3]bool + _, _, _ = yysep3716, yyq3716, yy2arr3716 + const yyr3716 bool = false + yyq3716[0] = x.Kind != "" + yyq3716[1] = x.APIVersion != "" + yyq3716[2] = x.Path != "" + var yynn3716 int + if yyr3716 || yy2arr3716 { r.EncodeArrayStart(3) } else { - yynn3742 = 0 - for _, b := range yyq3742 { + yynn3716 = 0 + for _, b := range yyq3716 { if b { - yynn3742++ + yynn3716++ } } - r.EncodeMapStart(yynn3742) - yynn3742 = 0 + r.EncodeMapStart(yynn3716) + yynn3716 = 0 } - if yyr3742 || yy2arr3742 { + if yyr3716 || yy2arr3716 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3742[0] { - yym3744 := z.EncBinary() - _ = yym3744 + if yyq3716[0] { + yym3718 := z.EncBinary() + _ = yym3718 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -47279,23 +46980,23 @@ func (x *NodeProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3742[0] { + if yyq3716[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3745 := z.EncBinary() - _ = yym3745 + yym3719 := z.EncBinary() + _ = yym3719 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3742 || yy2arr3742 { + if yyr3716 || yy2arr3716 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3742[1] { - yym3747 := z.EncBinary() - _ = yym3747 + if yyq3716[1] { + yym3721 := z.EncBinary() + _ = yym3721 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -47304,23 +47005,23 @@ func (x *NodeProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3742[1] { + if yyq3716[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3748 := z.EncBinary() - _ = yym3748 + yym3722 := z.EncBinary() + _ = yym3722 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3742 || yy2arr3742 { + if yyr3716 || yy2arr3716 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3742[2] { - yym3750 := z.EncBinary() - _ = yym3750 + if yyq3716[2] { + yym3724 := z.EncBinary() + _ = yym3724 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) @@ -47329,19 +47030,19 @@ func (x *NodeProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3742[2] { + if yyq3716[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("path")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3751 := z.EncBinary() - _ = yym3751 + yym3725 := z.EncBinary() + _ = yym3725 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) } } } - if yyr3742 || yy2arr3742 { + if yyr3716 || yy2arr3716 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -47354,25 +47055,25 @@ func (x *NodeProxyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3752 := z.DecBinary() - _ = yym3752 + yym3726 := z.DecBinary() + _ = yym3726 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3753 := r.ContainerType() - if yyct3753 == codecSelferValueTypeMap1234 { - yyl3753 := r.ReadMapStart() - if yyl3753 == 0 { + yyct3727 := r.ContainerType() + if yyct3727 == codecSelferValueTypeMap1234 { + yyl3727 := r.ReadMapStart() + if yyl3727 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3753, d) + x.codecDecodeSelfFromMap(yyl3727, d) } - } else if yyct3753 == codecSelferValueTypeArray1234 { - yyl3753 := r.ReadArrayStart() - if yyl3753 == 0 { + } else if yyct3727 == codecSelferValueTypeArray1234 { + yyl3727 := r.ReadArrayStart() + if yyl3727 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3753, d) + x.codecDecodeSelfFromArray(yyl3727, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -47384,12 +47085,12 @@ func (x *NodeProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3754Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3754Slc - var yyhl3754 bool = l >= 0 - for yyj3754 := 0; ; yyj3754++ { - if yyhl3754 { - if yyj3754 >= l { + var yys3728Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3728Slc + var yyhl3728 bool = l >= 0 + for yyj3728 := 0; ; yyj3728++ { + if yyhl3728 { + if yyj3728 >= l { break } } else { @@ -47398,10 +47099,10 @@ func (x *NodeProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3754Slc = r.DecodeBytes(yys3754Slc, true, true) - yys3754 := string(yys3754Slc) + yys3728Slc = r.DecodeBytes(yys3728Slc, true, true) + yys3728 := string(yys3728Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3754 { + switch yys3728 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -47421,9 +47122,9 @@ func (x *NodeProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Path = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3754) - } // end switch yys3754 - } // end for yyj3754 + z.DecStructFieldNotFound(-1, yys3728) + } // end switch yys3728 + } // end for yyj3728 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -47431,16 +47132,16 @@ func (x *NodeProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3758 int - var yyb3758 bool - var yyhl3758 bool = l >= 0 - yyj3758++ - if yyhl3758 { - yyb3758 = yyj3758 > l + var yyj3732 int + var yyb3732 bool + var yyhl3732 bool = l >= 0 + yyj3732++ + if yyhl3732 { + yyb3732 = yyj3732 > l } else { - yyb3758 = r.CheckBreak() + yyb3732 = r.CheckBreak() } - if yyb3758 { + if yyb3732 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47450,13 +47151,13 @@ func (x *NodeProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3758++ - if yyhl3758 { - yyb3758 = yyj3758 > l + yyj3732++ + if yyhl3732 { + yyb3732 = yyj3732 > l } else { - yyb3758 = r.CheckBreak() + yyb3732 = r.CheckBreak() } - if yyb3758 { + if yyb3732 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47466,13 +47167,13 @@ func (x *NodeProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3758++ - if yyhl3758 { - yyb3758 = yyj3758 > l + yyj3732++ + if yyhl3732 { + yyb3732 = yyj3732 > l } else { - yyb3758 = r.CheckBreak() + yyb3732 = r.CheckBreak() } - if yyb3758 { + if yyb3732 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47483,17 +47184,17 @@ func (x *NodeProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.Path = string(r.DecodeString()) } for { - yyj3758++ - if yyhl3758 { - yyb3758 = yyj3758 > l + yyj3732++ + if yyhl3732 { + yyb3732 = yyj3732 > l } else { - yyb3758 = r.CheckBreak() + yyb3732 = r.CheckBreak() } - if yyb3758 { + if yyb3732 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3758-1, "") + z.DecStructFieldNotFound(yyj3732-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -47505,37 +47206,37 @@ func (x *ServiceProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3762 := z.EncBinary() - _ = yym3762 + yym3736 := z.EncBinary() + _ = yym3736 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3763 := !z.EncBinary() - yy2arr3763 := z.EncBasicHandle().StructToArray - var yyq3763 [3]bool - _, _, _ = yysep3763, yyq3763, yy2arr3763 - const yyr3763 bool = false - yyq3763[0] = x.Kind != "" - yyq3763[1] = x.APIVersion != "" - yyq3763[2] = x.Path != "" - var yynn3763 int - if yyr3763 || yy2arr3763 { + yysep3737 := !z.EncBinary() + yy2arr3737 := z.EncBasicHandle().StructToArray + var yyq3737 [3]bool + _, _, _ = yysep3737, yyq3737, yy2arr3737 + const yyr3737 bool = false + yyq3737[0] = x.Kind != "" + yyq3737[1] = x.APIVersion != "" + yyq3737[2] = x.Path != "" + var yynn3737 int + if yyr3737 || yy2arr3737 { r.EncodeArrayStart(3) } else { - yynn3763 = 0 - for _, b := range yyq3763 { + yynn3737 = 0 + for _, b := range yyq3737 { if b { - yynn3763++ + yynn3737++ } } - r.EncodeMapStart(yynn3763) - yynn3763 = 0 + r.EncodeMapStart(yynn3737) + yynn3737 = 0 } - if yyr3763 || yy2arr3763 { + if yyr3737 || yy2arr3737 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3763[0] { - yym3765 := z.EncBinary() - _ = yym3765 + if yyq3737[0] { + yym3739 := z.EncBinary() + _ = yym3739 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -47544,23 +47245,23 @@ func (x *ServiceProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3763[0] { + if yyq3737[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3766 := z.EncBinary() - _ = yym3766 + yym3740 := z.EncBinary() + _ = yym3740 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3763 || yy2arr3763 { + if yyr3737 || yy2arr3737 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3763[1] { - yym3768 := z.EncBinary() - _ = yym3768 + if yyq3737[1] { + yym3742 := z.EncBinary() + _ = yym3742 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -47569,23 +47270,23 @@ func (x *ServiceProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3763[1] { + if yyq3737[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3769 := z.EncBinary() - _ = yym3769 + yym3743 := z.EncBinary() + _ = yym3743 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3763 || yy2arr3763 { + if yyr3737 || yy2arr3737 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3763[2] { - yym3771 := z.EncBinary() - _ = yym3771 + if yyq3737[2] { + yym3745 := z.EncBinary() + _ = yym3745 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) @@ -47594,19 +47295,19 @@ func (x *ServiceProxyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3763[2] { + if yyq3737[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("path")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3772 := z.EncBinary() - _ = yym3772 + yym3746 := z.EncBinary() + _ = yym3746 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) } } } - if yyr3763 || yy2arr3763 { + if yyr3737 || yy2arr3737 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -47619,25 +47320,25 @@ func (x *ServiceProxyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3773 := z.DecBinary() - _ = yym3773 + yym3747 := z.DecBinary() + _ = yym3747 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3774 := r.ContainerType() - if yyct3774 == codecSelferValueTypeMap1234 { - yyl3774 := r.ReadMapStart() - if yyl3774 == 0 { + yyct3748 := r.ContainerType() + if yyct3748 == codecSelferValueTypeMap1234 { + yyl3748 := r.ReadMapStart() + if yyl3748 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3774, d) + x.codecDecodeSelfFromMap(yyl3748, d) } - } else if yyct3774 == codecSelferValueTypeArray1234 { - yyl3774 := r.ReadArrayStart() - if yyl3774 == 0 { + } else if yyct3748 == codecSelferValueTypeArray1234 { + yyl3748 := r.ReadArrayStart() + if yyl3748 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3774, d) + x.codecDecodeSelfFromArray(yyl3748, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -47649,12 +47350,12 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3775Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3775Slc - var yyhl3775 bool = l >= 0 - for yyj3775 := 0; ; yyj3775++ { - if yyhl3775 { - if yyj3775 >= l { + var yys3749Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3749Slc + var yyhl3749 bool = l >= 0 + for yyj3749 := 0; ; yyj3749++ { + if yyhl3749 { + if yyj3749 >= l { break } } else { @@ -47663,10 +47364,10 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3775Slc = r.DecodeBytes(yys3775Slc, true, true) - yys3775 := string(yys3775Slc) + yys3749Slc = r.DecodeBytes(yys3749Slc, true, true) + yys3749 := string(yys3749Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3775 { + switch yys3749 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -47686,9 +47387,9 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder x.Path = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3775) - } // end switch yys3775 - } // end for yyj3775 + z.DecStructFieldNotFound(-1, yys3749) + } // end switch yys3749 + } // end for yyj3749 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -47696,16 +47397,16 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3779 int - var yyb3779 bool - var yyhl3779 bool = l >= 0 - yyj3779++ - if yyhl3779 { - yyb3779 = yyj3779 > l + var yyj3753 int + var yyb3753 bool + var yyhl3753 bool = l >= 0 + yyj3753++ + if yyhl3753 { + yyb3753 = yyj3753 > l } else { - yyb3779 = r.CheckBreak() + yyb3753 = r.CheckBreak() } - if yyb3779 { + if yyb3753 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47715,13 +47416,13 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Kind = string(r.DecodeString()) } - yyj3779++ - if yyhl3779 { - yyb3779 = yyj3779 > l + yyj3753++ + if yyhl3753 { + yyb3753 = yyj3753 > l } else { - yyb3779 = r.CheckBreak() + yyb3753 = r.CheckBreak() } - if yyb3779 { + if yyb3753 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47731,13 +47432,13 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.APIVersion = string(r.DecodeString()) } - yyj3779++ - if yyhl3779 { - yyb3779 = yyj3779 > l + yyj3753++ + if yyhl3753 { + yyb3753 = yyj3753 > l } else { - yyb3779 = r.CheckBreak() + yyb3753 = r.CheckBreak() } - if yyb3779 { + if yyb3753 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -47748,17 +47449,17 @@ func (x *ServiceProxyOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decod x.Path = string(r.DecodeString()) } for { - yyj3779++ - if yyhl3779 { - yyb3779 = yyj3779 > l + yyj3753++ + if yyhl3753 { + yyb3753 = yyj3753 > l } else { - yyb3779 = r.CheckBreak() + yyb3753 = r.CheckBreak() } - if yyb3779 { + if yyb3753 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3779-1, "") + z.DecStructFieldNotFound(yyj3753-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -47770,34 +47471,34 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3783 := z.EncBinary() - _ = yym3783 + yym3757 := z.EncBinary() + _ = yym3757 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3784 := !z.EncBinary() - yy2arr3784 := z.EncBasicHandle().StructToArray - var yyq3784 [5]bool - _, _, _ = yysep3784, yyq3784, yy2arr3784 - const yyr3784 bool = false - yyq3784[4] = x.Controller != nil - var yynn3784 int - if yyr3784 || yy2arr3784 { + yysep3758 := !z.EncBinary() + yy2arr3758 := z.EncBasicHandle().StructToArray + var yyq3758 [5]bool + _, _, _ = yysep3758, yyq3758, yy2arr3758 + const yyr3758 bool = false + yyq3758[4] = x.Controller != nil + var yynn3758 int + if yyr3758 || yy2arr3758 { r.EncodeArrayStart(5) } else { - yynn3784 = 4 - for _, b := range yyq3784 { + yynn3758 = 4 + for _, b := range yyq3758 { if b { - yynn3784++ + yynn3758++ } } - r.EncodeMapStart(yynn3784) - yynn3784 = 0 + r.EncodeMapStart(yynn3758) + yynn3758 = 0 } - if yyr3784 || yy2arr3784 { + if yyr3758 || yy2arr3758 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3786 := z.EncBinary() - _ = yym3786 + yym3760 := z.EncBinary() + _ = yym3760 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -47806,17 +47507,17 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3787 := z.EncBinary() - _ = yym3787 + yym3761 := z.EncBinary() + _ = yym3761 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } - if yyr3784 || yy2arr3784 { + if yyr3758 || yy2arr3758 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3789 := z.EncBinary() - _ = yym3789 + yym3763 := z.EncBinary() + _ = yym3763 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -47825,17 +47526,17 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3790 := z.EncBinary() - _ = yym3790 + yym3764 := z.EncBinary() + _ = yym3764 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } - if yyr3784 || yy2arr3784 { + if yyr3758 || yy2arr3758 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3792 := z.EncBinary() - _ = yym3792 + yym3766 := z.EncBinary() + _ = yym3766 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) @@ -47844,17 +47545,17 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("name")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3793 := z.EncBinary() - _ = yym3793 + yym3767 := z.EncBinary() + _ = yym3767 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) } } - if yyr3784 || yy2arr3784 { + if yyr3758 || yy2arr3758 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym3795 := z.EncBinary() - _ = yym3795 + yym3769 := z.EncBinary() + _ = yym3769 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { @@ -47864,50 +47565,50 @@ func (x *OwnerReference) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("uid")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3796 := z.EncBinary() - _ = yym3796 + yym3770 := z.EncBinary() + _ = yym3770 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { r.EncodeString(codecSelferC_UTF81234, string(x.UID)) } } - if yyr3784 || yy2arr3784 { + if yyr3758 || yy2arr3758 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3784[4] { + if yyq3758[4] { if x.Controller == nil { r.EncodeNil() } else { - yy3798 := *x.Controller - yym3799 := z.EncBinary() - _ = yym3799 + yy3772 := *x.Controller + yym3773 := z.EncBinary() + _ = yym3773 if false { } else { - r.EncodeBool(bool(yy3798)) + r.EncodeBool(bool(yy3772)) } } } else { r.EncodeNil() } } else { - if yyq3784[4] { + if yyq3758[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("controller")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Controller == nil { r.EncodeNil() } else { - yy3800 := *x.Controller - yym3801 := z.EncBinary() - _ = yym3801 + yy3774 := *x.Controller + yym3775 := z.EncBinary() + _ = yym3775 if false { } else { - r.EncodeBool(bool(yy3800)) + r.EncodeBool(bool(yy3774)) } } } } - if yyr3784 || yy2arr3784 { + if yyr3758 || yy2arr3758 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -47920,25 +47621,25 @@ func (x *OwnerReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3802 := z.DecBinary() - _ = yym3802 + yym3776 := z.DecBinary() + _ = yym3776 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3803 := r.ContainerType() - if yyct3803 == codecSelferValueTypeMap1234 { - yyl3803 := r.ReadMapStart() - if yyl3803 == 0 { + yyct3777 := r.ContainerType() + if yyct3777 == codecSelferValueTypeMap1234 { + yyl3777 := r.ReadMapStart() + if yyl3777 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3803, d) + x.codecDecodeSelfFromMap(yyl3777, d) } - } else if yyct3803 == codecSelferValueTypeArray1234 { - yyl3803 := r.ReadArrayStart() - if yyl3803 == 0 { + } else if yyct3777 == codecSelferValueTypeArray1234 { + yyl3777 := r.ReadArrayStart() + if yyl3777 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3803, d) + x.codecDecodeSelfFromArray(yyl3777, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -47950,12 +47651,12 @@ func (x *OwnerReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3804Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3804Slc - var yyhl3804 bool = l >= 0 - for yyj3804 := 0; ; yyj3804++ { - if yyhl3804 { - if yyj3804 >= l { + var yys3778Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3778Slc + var yyhl3778 bool = l >= 0 + for yyj3778 := 0; ; yyj3778++ { + if yyhl3778 { + if yyj3778 >= l { break } } else { @@ -47964,10 +47665,10 @@ func (x *OwnerReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3804Slc = r.DecodeBytes(yys3804Slc, true, true) - yys3804 := string(yys3804Slc) + yys3778Slc = r.DecodeBytes(yys3778Slc, true, true) + yys3778 := string(yys3778Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3804 { + switch yys3778 { case "apiVersion": if r.TryDecodeAsNil() { x.APIVersion = "" @@ -48001,17 +47702,17 @@ func (x *OwnerReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.Controller == nil { x.Controller = new(bool) } - yym3810 := z.DecBinary() - _ = yym3810 + yym3784 := z.DecBinary() + _ = yym3784 if false { } else { *((*bool)(x.Controller)) = r.DecodeBool() } } default: - z.DecStructFieldNotFound(-1, yys3804) - } // end switch yys3804 - } // end for yyj3804 + z.DecStructFieldNotFound(-1, yys3778) + } // end switch yys3778 + } // end for yyj3778 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -48019,16 +47720,16 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3811 int - var yyb3811 bool - var yyhl3811 bool = l >= 0 - yyj3811++ - if yyhl3811 { - yyb3811 = yyj3811 > l + var yyj3785 int + var yyb3785 bool + var yyhl3785 bool = l >= 0 + yyj3785++ + if yyhl3785 { + yyb3785 = yyj3785 > l } else { - yyb3811 = r.CheckBreak() + yyb3785 = r.CheckBreak() } - if yyb3811 { + if yyb3785 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48038,13 +47739,13 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3811++ - if yyhl3811 { - yyb3811 = yyj3811 > l + yyj3785++ + if yyhl3785 { + yyb3785 = yyj3785 > l } else { - yyb3811 = r.CheckBreak() + yyb3785 = r.CheckBreak() } - if yyb3811 { + if yyb3785 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48054,13 +47755,13 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3811++ - if yyhl3811 { - yyb3811 = yyj3811 > l + yyj3785++ + if yyhl3785 { + yyb3785 = yyj3785 > l } else { - yyb3811 = r.CheckBreak() + yyb3785 = r.CheckBreak() } - if yyb3811 { + if yyb3785 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48070,13 +47771,13 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Name = string(r.DecodeString()) } - yyj3811++ - if yyhl3811 { - yyb3811 = yyj3811 > l + yyj3785++ + if yyhl3785 { + yyb3785 = yyj3785 > l } else { - yyb3811 = r.CheckBreak() + yyb3785 = r.CheckBreak() } - if yyb3811 { + if yyb3785 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48086,13 +47787,13 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.UID = pkg1_types.UID(r.DecodeString()) } - yyj3811++ - if yyhl3811 { - yyb3811 = yyj3811 > l + yyj3785++ + if yyhl3785 { + yyb3785 = yyj3785 > l } else { - yyb3811 = r.CheckBreak() + yyb3785 = r.CheckBreak() } - if yyb3811 { + if yyb3785 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48105,25 +47806,25 @@ func (x *OwnerReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.Controller == nil { x.Controller = new(bool) } - yym3817 := z.DecBinary() - _ = yym3817 + yym3791 := z.DecBinary() + _ = yym3791 if false { } else { *((*bool)(x.Controller)) = r.DecodeBool() } } for { - yyj3811++ - if yyhl3811 { - yyb3811 = yyj3811 > l + yyj3785++ + if yyhl3785 { + yyb3785 = yyj3785 > l } else { - yyb3811 = r.CheckBreak() + yyb3785 = r.CheckBreak() } - if yyb3811 { + if yyb3785 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3811-1, "") + z.DecStructFieldNotFound(yyj3785-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -48135,41 +47836,41 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3818 := z.EncBinary() - _ = yym3818 + yym3792 := z.EncBinary() + _ = yym3792 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3819 := !z.EncBinary() - yy2arr3819 := z.EncBasicHandle().StructToArray - var yyq3819 [7]bool - _, _, _ = yysep3819, yyq3819, yy2arr3819 - const yyr3819 bool = false - yyq3819[0] = x.Kind != "" - yyq3819[1] = x.Namespace != "" - yyq3819[2] = x.Name != "" - yyq3819[3] = x.UID != "" - yyq3819[4] = x.APIVersion != "" - yyq3819[5] = x.ResourceVersion != "" - yyq3819[6] = x.FieldPath != "" - var yynn3819 int - if yyr3819 || yy2arr3819 { + yysep3793 := !z.EncBinary() + yy2arr3793 := z.EncBasicHandle().StructToArray + var yyq3793 [7]bool + _, _, _ = yysep3793, yyq3793, yy2arr3793 + const yyr3793 bool = false + yyq3793[0] = x.Kind != "" + yyq3793[1] = x.Namespace != "" + yyq3793[2] = x.Name != "" + yyq3793[3] = x.UID != "" + yyq3793[4] = x.APIVersion != "" + yyq3793[5] = x.ResourceVersion != "" + yyq3793[6] = x.FieldPath != "" + var yynn3793 int + if yyr3793 || yy2arr3793 { r.EncodeArrayStart(7) } else { - yynn3819 = 0 - for _, b := range yyq3819 { + yynn3793 = 0 + for _, b := range yyq3793 { if b { - yynn3819++ + yynn3793++ } } - r.EncodeMapStart(yynn3819) - yynn3819 = 0 + r.EncodeMapStart(yynn3793) + yynn3793 = 0 } - if yyr3819 || yy2arr3819 { + if yyr3793 || yy2arr3793 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3819[0] { - yym3821 := z.EncBinary() - _ = yym3821 + if yyq3793[0] { + yym3795 := z.EncBinary() + _ = yym3795 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -48178,23 +47879,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3819[0] { + if yyq3793[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3822 := z.EncBinary() - _ = yym3822 + yym3796 := z.EncBinary() + _ = yym3796 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3819 || yy2arr3819 { + if yyr3793 || yy2arr3793 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3819[1] { - yym3824 := z.EncBinary() - _ = yym3824 + if yyq3793[1] { + yym3798 := z.EncBinary() + _ = yym3798 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Namespace)) @@ -48203,23 +47904,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3819[1] { + if yyq3793[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("namespace")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3825 := z.EncBinary() - _ = yym3825 + yym3799 := z.EncBinary() + _ = yym3799 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Namespace)) } } } - if yyr3819 || yy2arr3819 { + if yyr3793 || yy2arr3793 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3819[2] { - yym3827 := z.EncBinary() - _ = yym3827 + if yyq3793[2] { + yym3801 := z.EncBinary() + _ = yym3801 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) @@ -48228,23 +47929,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3819[2] { + if yyq3793[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("name")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3828 := z.EncBinary() - _ = yym3828 + yym3802 := z.EncBinary() + _ = yym3802 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) } } } - if yyr3819 || yy2arr3819 { + if yyr3793 || yy2arr3793 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3819[3] { - yym3830 := z.EncBinary() - _ = yym3830 + if yyq3793[3] { + yym3804 := z.EncBinary() + _ = yym3804 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { @@ -48254,12 +47955,12 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3819[3] { + if yyq3793[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("uid")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3831 := z.EncBinary() - _ = yym3831 + yym3805 := z.EncBinary() + _ = yym3805 if false { } else if z.HasExtensions() && z.EncExt(x.UID) { } else { @@ -48267,11 +47968,11 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr3819 || yy2arr3819 { + if yyr3793 || yy2arr3793 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3819[4] { - yym3833 := z.EncBinary() - _ = yym3833 + if yyq3793[4] { + yym3807 := z.EncBinary() + _ = yym3807 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -48280,23 +47981,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3819[4] { + if yyq3793[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3834 := z.EncBinary() - _ = yym3834 + yym3808 := z.EncBinary() + _ = yym3808 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3819 || yy2arr3819 { + if yyr3793 || yy2arr3793 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3819[5] { - yym3836 := z.EncBinary() - _ = yym3836 + if yyq3793[5] { + yym3810 := z.EncBinary() + _ = yym3810 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) @@ -48305,23 +48006,23 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3819[5] { + if yyq3793[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resourceVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3837 := z.EncBinary() - _ = yym3837 + yym3811 := z.EncBinary() + _ = yym3811 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ResourceVersion)) } } } - if yyr3819 || yy2arr3819 { + if yyr3793 || yy2arr3793 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3819[6] { - yym3839 := z.EncBinary() - _ = yym3839 + if yyq3793[6] { + yym3813 := z.EncBinary() + _ = yym3813 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FieldPath)) @@ -48330,19 +48031,19 @@ func (x *ObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3819[6] { + if yyq3793[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("fieldPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3840 := z.EncBinary() - _ = yym3840 + yym3814 := z.EncBinary() + _ = yym3814 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FieldPath)) } } } - if yyr3819 || yy2arr3819 { + if yyr3793 || yy2arr3793 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -48355,25 +48056,25 @@ func (x *ObjectReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3841 := z.DecBinary() - _ = yym3841 + yym3815 := z.DecBinary() + _ = yym3815 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3842 := r.ContainerType() - if yyct3842 == codecSelferValueTypeMap1234 { - yyl3842 := r.ReadMapStart() - if yyl3842 == 0 { + yyct3816 := r.ContainerType() + if yyct3816 == codecSelferValueTypeMap1234 { + yyl3816 := r.ReadMapStart() + if yyl3816 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3842, d) + x.codecDecodeSelfFromMap(yyl3816, d) } - } else if yyct3842 == codecSelferValueTypeArray1234 { - yyl3842 := r.ReadArrayStart() - if yyl3842 == 0 { + } else if yyct3816 == codecSelferValueTypeArray1234 { + yyl3816 := r.ReadArrayStart() + if yyl3816 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3842, d) + x.codecDecodeSelfFromArray(yyl3816, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -48385,12 +48086,12 @@ func (x *ObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3843Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3843Slc - var yyhl3843 bool = l >= 0 - for yyj3843 := 0; ; yyj3843++ { - if yyhl3843 { - if yyj3843 >= l { + var yys3817Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3817Slc + var yyhl3817 bool = l >= 0 + for yyj3817 := 0; ; yyj3817++ { + if yyhl3817 { + if yyj3817 >= l { break } } else { @@ -48399,10 +48100,10 @@ func (x *ObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3843Slc = r.DecodeBytes(yys3843Slc, true, true) - yys3843 := string(yys3843Slc) + yys3817Slc = r.DecodeBytes(yys3817Slc, true, true) + yys3817 := string(yys3817Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3843 { + switch yys3817 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -48446,9 +48147,9 @@ func (x *ObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.FieldPath = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3843) - } // end switch yys3843 - } // end for yyj3843 + z.DecStructFieldNotFound(-1, yys3817) + } // end switch yys3817 + } // end for yyj3817 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -48456,16 +48157,16 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3851 int - var yyb3851 bool - var yyhl3851 bool = l >= 0 - yyj3851++ - if yyhl3851 { - yyb3851 = yyj3851 > l + var yyj3825 int + var yyb3825 bool + var yyhl3825 bool = l >= 0 + yyj3825++ + if yyhl3825 { + yyb3825 = yyj3825 > l } else { - yyb3851 = r.CheckBreak() + yyb3825 = r.CheckBreak() } - if yyb3851 { + if yyb3825 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48475,13 +48176,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj3851++ - if yyhl3851 { - yyb3851 = yyj3851 > l + yyj3825++ + if yyhl3825 { + yyb3825 = yyj3825 > l } else { - yyb3851 = r.CheckBreak() + yyb3825 = r.CheckBreak() } - if yyb3851 { + if yyb3825 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48491,13 +48192,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Namespace = string(r.DecodeString()) } - yyj3851++ - if yyhl3851 { - yyb3851 = yyj3851 > l + yyj3825++ + if yyhl3825 { + yyb3825 = yyj3825 > l } else { - yyb3851 = r.CheckBreak() + yyb3825 = r.CheckBreak() } - if yyb3851 { + if yyb3825 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48507,13 +48208,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Name = string(r.DecodeString()) } - yyj3851++ - if yyhl3851 { - yyb3851 = yyj3851 > l + yyj3825++ + if yyhl3825 { + yyb3825 = yyj3825 > l } else { - yyb3851 = r.CheckBreak() + yyb3825 = r.CheckBreak() } - if yyb3851 { + if yyb3825 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48523,13 +48224,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.UID = pkg1_types.UID(r.DecodeString()) } - yyj3851++ - if yyhl3851 { - yyb3851 = yyj3851 > l + yyj3825++ + if yyhl3825 { + yyb3825 = yyj3825 > l } else { - yyb3851 = r.CheckBreak() + yyb3825 = r.CheckBreak() } - if yyb3851 { + if yyb3825 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48539,13 +48240,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj3851++ - if yyhl3851 { - yyb3851 = yyj3851 > l + yyj3825++ + if yyhl3825 { + yyb3825 = yyj3825 > l } else { - yyb3851 = r.CheckBreak() + yyb3825 = r.CheckBreak() } - if yyb3851 { + if yyb3825 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48555,13 +48256,13 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.ResourceVersion = string(r.DecodeString()) } - yyj3851++ - if yyhl3851 { - yyb3851 = yyj3851 > l + yyj3825++ + if yyhl3825 { + yyb3825 = yyj3825 > l } else { - yyb3851 = r.CheckBreak() + yyb3825 = r.CheckBreak() } - if yyb3851 { + if yyb3825 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48572,17 +48273,17 @@ func (x *ObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) x.FieldPath = string(r.DecodeString()) } for { - yyj3851++ - if yyhl3851 { - yyb3851 = yyj3851 > l + yyj3825++ + if yyhl3825 { + yyb3825 = yyj3825 > l } else { - yyb3851 = r.CheckBreak() + yyb3825 = r.CheckBreak() } - if yyb3851 { + if yyb3825 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3851-1, "") + z.DecStructFieldNotFound(yyj3825-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -48594,35 +48295,35 @@ func (x *LocalObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3859 := z.EncBinary() - _ = yym3859 + yym3833 := z.EncBinary() + _ = yym3833 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3860 := !z.EncBinary() - yy2arr3860 := z.EncBasicHandle().StructToArray - var yyq3860 [1]bool - _, _, _ = yysep3860, yyq3860, yy2arr3860 - const yyr3860 bool = false - yyq3860[0] = x.Name != "" - var yynn3860 int - if yyr3860 || yy2arr3860 { + yysep3834 := !z.EncBinary() + yy2arr3834 := z.EncBasicHandle().StructToArray + var yyq3834 [1]bool + _, _, _ = yysep3834, yyq3834, yy2arr3834 + const yyr3834 bool = false + yyq3834[0] = x.Name != "" + var yynn3834 int + if yyr3834 || yy2arr3834 { r.EncodeArrayStart(1) } else { - yynn3860 = 0 - for _, b := range yyq3860 { + yynn3834 = 0 + for _, b := range yyq3834 { if b { - yynn3860++ + yynn3834++ } } - r.EncodeMapStart(yynn3860) - yynn3860 = 0 + r.EncodeMapStart(yynn3834) + yynn3834 = 0 } - if yyr3860 || yy2arr3860 { + if yyr3834 || yy2arr3834 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3860[0] { - yym3862 := z.EncBinary() - _ = yym3862 + if yyq3834[0] { + yym3836 := z.EncBinary() + _ = yym3836 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) @@ -48631,19 +48332,19 @@ func (x *LocalObjectReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3860[0] { + if yyq3834[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("name")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3863 := z.EncBinary() - _ = yym3863 + yym3837 := z.EncBinary() + _ = yym3837 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Name)) } } } - if yyr3860 || yy2arr3860 { + if yyr3834 || yy2arr3834 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -48656,25 +48357,25 @@ func (x *LocalObjectReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3864 := z.DecBinary() - _ = yym3864 + yym3838 := z.DecBinary() + _ = yym3838 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3865 := r.ContainerType() - if yyct3865 == codecSelferValueTypeMap1234 { - yyl3865 := r.ReadMapStart() - if yyl3865 == 0 { + yyct3839 := r.ContainerType() + if yyct3839 == codecSelferValueTypeMap1234 { + yyl3839 := r.ReadMapStart() + if yyl3839 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3865, d) + x.codecDecodeSelfFromMap(yyl3839, d) } - } else if yyct3865 == codecSelferValueTypeArray1234 { - yyl3865 := r.ReadArrayStart() - if yyl3865 == 0 { + } else if yyct3839 == codecSelferValueTypeArray1234 { + yyl3839 := r.ReadArrayStart() + if yyl3839 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3865, d) + x.codecDecodeSelfFromArray(yyl3839, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -48686,12 +48387,12 @@ func (x *LocalObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3866Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3866Slc - var yyhl3866 bool = l >= 0 - for yyj3866 := 0; ; yyj3866++ { - if yyhl3866 { - if yyj3866 >= l { + var yys3840Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3840Slc + var yyhl3840 bool = l >= 0 + for yyj3840 := 0; ; yyj3840++ { + if yyhl3840 { + if yyj3840 >= l { break } } else { @@ -48700,10 +48401,10 @@ func (x *LocalObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decode } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3866Slc = r.DecodeBytes(yys3866Slc, true, true) - yys3866 := string(yys3866Slc) + yys3840Slc = r.DecodeBytes(yys3840Slc, true, true) + yys3840 := string(yys3840Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3866 { + switch yys3840 { case "name": if r.TryDecodeAsNil() { x.Name = "" @@ -48711,9 +48412,9 @@ func (x *LocalObjectReference) codecDecodeSelfFromMap(l int, d *codec1978.Decode x.Name = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3866) - } // end switch yys3866 - } // end for yyj3866 + z.DecStructFieldNotFound(-1, yys3840) + } // end switch yys3840 + } // end for yyj3840 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -48721,16 +48422,16 @@ func (x *LocalObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3868 int - var yyb3868 bool - var yyhl3868 bool = l >= 0 - yyj3868++ - if yyhl3868 { - yyb3868 = yyj3868 > l + var yyj3842 int + var yyb3842 bool + var yyhl3842 bool = l >= 0 + yyj3842++ + if yyhl3842 { + yyb3842 = yyj3842 > l } else { - yyb3868 = r.CheckBreak() + yyb3842 = r.CheckBreak() } - if yyb3868 { + if yyb3842 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48741,17 +48442,17 @@ func (x *LocalObjectReference) codecDecodeSelfFromArray(l int, d *codec1978.Deco x.Name = string(r.DecodeString()) } for { - yyj3868++ - if yyhl3868 { - yyb3868 = yyj3868 > l + yyj3842++ + if yyhl3842 { + yyb3842 = yyj3842 > l } else { - yyb3868 = r.CheckBreak() + yyb3842 = r.CheckBreak() } - if yyb3868 { + if yyb3842 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3868-1, "") + z.DecStructFieldNotFound(yyj3842-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -48763,37 +48464,37 @@ func (x *SerializedReference) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3870 := z.EncBinary() - _ = yym3870 + yym3844 := z.EncBinary() + _ = yym3844 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3871 := !z.EncBinary() - yy2arr3871 := z.EncBasicHandle().StructToArray - var yyq3871 [3]bool - _, _, _ = yysep3871, yyq3871, yy2arr3871 - const yyr3871 bool = false - yyq3871[0] = x.Kind != "" - yyq3871[1] = x.APIVersion != "" - yyq3871[2] = true - var yynn3871 int - if yyr3871 || yy2arr3871 { + yysep3845 := !z.EncBinary() + yy2arr3845 := z.EncBasicHandle().StructToArray + var yyq3845 [3]bool + _, _, _ = yysep3845, yyq3845, yy2arr3845 + const yyr3845 bool = false + yyq3845[0] = x.Kind != "" + yyq3845[1] = x.APIVersion != "" + yyq3845[2] = true + var yynn3845 int + if yyr3845 || yy2arr3845 { r.EncodeArrayStart(3) } else { - yynn3871 = 0 - for _, b := range yyq3871 { + yynn3845 = 0 + for _, b := range yyq3845 { if b { - yynn3871++ + yynn3845++ } } - r.EncodeMapStart(yynn3871) - yynn3871 = 0 + r.EncodeMapStart(yynn3845) + yynn3845 = 0 } - if yyr3871 || yy2arr3871 { + if yyr3845 || yy2arr3845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3871[0] { - yym3873 := z.EncBinary() - _ = yym3873 + if yyq3845[0] { + yym3847 := z.EncBinary() + _ = yym3847 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -48802,23 +48503,23 @@ func (x *SerializedReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3871[0] { + if yyq3845[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3874 := z.EncBinary() - _ = yym3874 + yym3848 := z.EncBinary() + _ = yym3848 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3871 || yy2arr3871 { + if yyr3845 || yy2arr3845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3871[1] { - yym3876 := z.EncBinary() - _ = yym3876 + if yyq3845[1] { + yym3850 := z.EncBinary() + _ = yym3850 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -48827,36 +48528,36 @@ func (x *SerializedReference) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3871[1] { + if yyq3845[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3877 := z.EncBinary() - _ = yym3877 + yym3851 := z.EncBinary() + _ = yym3851 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3871 || yy2arr3871 { + if yyr3845 || yy2arr3845 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3871[2] { - yy3879 := &x.Reference - yy3879.CodecEncodeSelf(e) + if yyq3845[2] { + yy3853 := &x.Reference + yy3853.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3871[2] { + if yyq3845[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reference")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3880 := &x.Reference - yy3880.CodecEncodeSelf(e) + yy3854 := &x.Reference + yy3854.CodecEncodeSelf(e) } } - if yyr3871 || yy2arr3871 { + if yyr3845 || yy2arr3845 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -48869,25 +48570,25 @@ func (x *SerializedReference) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3881 := z.DecBinary() - _ = yym3881 + yym3855 := z.DecBinary() + _ = yym3855 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3882 := r.ContainerType() - if yyct3882 == codecSelferValueTypeMap1234 { - yyl3882 := r.ReadMapStart() - if yyl3882 == 0 { + yyct3856 := r.ContainerType() + if yyct3856 == codecSelferValueTypeMap1234 { + yyl3856 := r.ReadMapStart() + if yyl3856 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3882, d) + x.codecDecodeSelfFromMap(yyl3856, d) } - } else if yyct3882 == codecSelferValueTypeArray1234 { - yyl3882 := r.ReadArrayStart() - if yyl3882 == 0 { + } else if yyct3856 == codecSelferValueTypeArray1234 { + yyl3856 := r.ReadArrayStart() + if yyl3856 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3882, d) + x.codecDecodeSelfFromArray(yyl3856, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -48899,12 +48600,12 @@ func (x *SerializedReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3883Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3883Slc - var yyhl3883 bool = l >= 0 - for yyj3883 := 0; ; yyj3883++ { - if yyhl3883 { - if yyj3883 >= l { + var yys3857Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3857Slc + var yyhl3857 bool = l >= 0 + for yyj3857 := 0; ; yyj3857++ { + if yyhl3857 { + if yyj3857 >= l { break } } else { @@ -48913,10 +48614,10 @@ func (x *SerializedReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3883Slc = r.DecodeBytes(yys3883Slc, true, true) - yys3883 := string(yys3883Slc) + yys3857Slc = r.DecodeBytes(yys3857Slc, true, true) + yys3857 := string(yys3857Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3883 { + switch yys3857 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -48933,13 +48634,13 @@ func (x *SerializedReference) codecDecodeSelfFromMap(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Reference = ObjectReference{} } else { - yyv3886 := &x.Reference - yyv3886.CodecDecodeSelf(d) + yyv3860 := &x.Reference + yyv3860.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys3883) - } // end switch yys3883 - } // end for yyj3883 + z.DecStructFieldNotFound(-1, yys3857) + } // end switch yys3857 + } // end for yyj3857 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -48947,16 +48648,16 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3887 int - var yyb3887 bool - var yyhl3887 bool = l >= 0 - yyj3887++ - if yyhl3887 { - yyb3887 = yyj3887 > l + var yyj3861 int + var yyb3861 bool + var yyhl3861 bool = l >= 0 + yyj3861++ + if yyhl3861 { + yyb3861 = yyj3861 > l } else { - yyb3887 = r.CheckBreak() + yyb3861 = r.CheckBreak() } - if yyb3887 { + if yyb3861 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48966,13 +48667,13 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Kind = string(r.DecodeString()) } - yyj3887++ - if yyhl3887 { - yyb3887 = yyj3887 > l + yyj3861++ + if yyhl3861 { + yyb3861 = yyj3861 > l } else { - yyb3887 = r.CheckBreak() + yyb3861 = r.CheckBreak() } - if yyb3887 { + if yyb3861 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48982,13 +48683,13 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.APIVersion = string(r.DecodeString()) } - yyj3887++ - if yyhl3887 { - yyb3887 = yyj3887 > l + yyj3861++ + if yyhl3861 { + yyb3861 = yyj3861 > l } else { - yyb3887 = r.CheckBreak() + yyb3861 = r.CheckBreak() } - if yyb3887 { + if yyb3861 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -48996,21 +48697,21 @@ func (x *SerializedReference) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Reference = ObjectReference{} } else { - yyv3890 := &x.Reference - yyv3890.CodecDecodeSelf(d) + yyv3864 := &x.Reference + yyv3864.CodecDecodeSelf(d) } for { - yyj3887++ - if yyhl3887 { - yyb3887 = yyj3887 > l + yyj3861++ + if yyhl3861 { + yyb3861 = yyj3861 > l } else { - yyb3887 = r.CheckBreak() + yyb3861 = r.CheckBreak() } - if yyb3887 { + if yyb3861 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3887-1, "") + z.DecStructFieldNotFound(yyj3861-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -49022,36 +48723,36 @@ func (x *EventSource) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3891 := z.EncBinary() - _ = yym3891 + yym3865 := z.EncBinary() + _ = yym3865 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3892 := !z.EncBinary() - yy2arr3892 := z.EncBasicHandle().StructToArray - var yyq3892 [2]bool - _, _, _ = yysep3892, yyq3892, yy2arr3892 - const yyr3892 bool = false - yyq3892[0] = x.Component != "" - yyq3892[1] = x.Host != "" - var yynn3892 int - if yyr3892 || yy2arr3892 { + yysep3866 := !z.EncBinary() + yy2arr3866 := z.EncBasicHandle().StructToArray + var yyq3866 [2]bool + _, _, _ = yysep3866, yyq3866, yy2arr3866 + const yyr3866 bool = false + yyq3866[0] = x.Component != "" + yyq3866[1] = x.Host != "" + var yynn3866 int + if yyr3866 || yy2arr3866 { r.EncodeArrayStart(2) } else { - yynn3892 = 0 - for _, b := range yyq3892 { + yynn3866 = 0 + for _, b := range yyq3866 { if b { - yynn3892++ + yynn3866++ } } - r.EncodeMapStart(yynn3892) - yynn3892 = 0 + r.EncodeMapStart(yynn3866) + yynn3866 = 0 } - if yyr3892 || yy2arr3892 { + if yyr3866 || yy2arr3866 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3892[0] { - yym3894 := z.EncBinary() - _ = yym3894 + if yyq3866[0] { + yym3868 := z.EncBinary() + _ = yym3868 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Component)) @@ -49060,23 +48761,23 @@ func (x *EventSource) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3892[0] { + if yyq3866[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("component")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3895 := z.EncBinary() - _ = yym3895 + yym3869 := z.EncBinary() + _ = yym3869 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Component)) } } } - if yyr3892 || yy2arr3892 { + if yyr3866 || yy2arr3866 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3892[1] { - yym3897 := z.EncBinary() - _ = yym3897 + if yyq3866[1] { + yym3871 := z.EncBinary() + _ = yym3871 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Host)) @@ -49085,19 +48786,19 @@ func (x *EventSource) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3892[1] { + if yyq3866[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("host")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3898 := z.EncBinary() - _ = yym3898 + yym3872 := z.EncBinary() + _ = yym3872 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Host)) } } } - if yyr3892 || yy2arr3892 { + if yyr3866 || yy2arr3866 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -49110,25 +48811,25 @@ func (x *EventSource) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3899 := z.DecBinary() - _ = yym3899 + yym3873 := z.DecBinary() + _ = yym3873 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3900 := r.ContainerType() - if yyct3900 == codecSelferValueTypeMap1234 { - yyl3900 := r.ReadMapStart() - if yyl3900 == 0 { + yyct3874 := r.ContainerType() + if yyct3874 == codecSelferValueTypeMap1234 { + yyl3874 := r.ReadMapStart() + if yyl3874 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3900, d) + x.codecDecodeSelfFromMap(yyl3874, d) } - } else if yyct3900 == codecSelferValueTypeArray1234 { - yyl3900 := r.ReadArrayStart() - if yyl3900 == 0 { + } else if yyct3874 == codecSelferValueTypeArray1234 { + yyl3874 := r.ReadArrayStart() + if yyl3874 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3900, d) + x.codecDecodeSelfFromArray(yyl3874, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -49140,12 +48841,12 @@ func (x *EventSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3901Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3901Slc - var yyhl3901 bool = l >= 0 - for yyj3901 := 0; ; yyj3901++ { - if yyhl3901 { - if yyj3901 >= l { + var yys3875Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3875Slc + var yyhl3875 bool = l >= 0 + for yyj3875 := 0; ; yyj3875++ { + if yyhl3875 { + if yyj3875 >= l { break } } else { @@ -49154,10 +48855,10 @@ func (x *EventSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3901Slc = r.DecodeBytes(yys3901Slc, true, true) - yys3901 := string(yys3901Slc) + yys3875Slc = r.DecodeBytes(yys3875Slc, true, true) + yys3875 := string(yys3875Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3901 { + switch yys3875 { case "component": if r.TryDecodeAsNil() { x.Component = "" @@ -49171,9 +48872,9 @@ func (x *EventSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Host = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3901) - } // end switch yys3901 - } // end for yyj3901 + z.DecStructFieldNotFound(-1, yys3875) + } // end switch yys3875 + } // end for yyj3875 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -49181,16 +48882,16 @@ func (x *EventSource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3904 int - var yyb3904 bool - var yyhl3904 bool = l >= 0 - yyj3904++ - if yyhl3904 { - yyb3904 = yyj3904 > l + var yyj3878 int + var yyb3878 bool + var yyhl3878 bool = l >= 0 + yyj3878++ + if yyhl3878 { + yyb3878 = yyj3878 > l } else { - yyb3904 = r.CheckBreak() + yyb3878 = r.CheckBreak() } - if yyb3904 { + if yyb3878 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49200,13 +48901,13 @@ func (x *EventSource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Component = string(r.DecodeString()) } - yyj3904++ - if yyhl3904 { - yyb3904 = yyj3904 > l + yyj3878++ + if yyhl3878 { + yyb3878 = yyj3878 > l } else { - yyb3904 = r.CheckBreak() + yyb3878 = r.CheckBreak() } - if yyb3904 { + if yyb3878 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49217,17 +48918,17 @@ func (x *EventSource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Host = string(r.DecodeString()) } for { - yyj3904++ - if yyhl3904 { - yyb3904 = yyj3904 > l + yyj3878++ + if yyhl3878 { + yyb3878 = yyj3878 > l } else { - yyb3904 = r.CheckBreak() + yyb3878 = r.CheckBreak() } - if yyb3904 { + if yyb3878 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3904-1, "") + z.DecStructFieldNotFound(yyj3878-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -49239,43 +48940,43 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3907 := z.EncBinary() - _ = yym3907 + yym3881 := z.EncBinary() + _ = yym3881 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3908 := !z.EncBinary() - yy2arr3908 := z.EncBasicHandle().StructToArray - var yyq3908 [11]bool - _, _, _ = yysep3908, yyq3908, yy2arr3908 - const yyr3908 bool = false - yyq3908[0] = x.Kind != "" - yyq3908[1] = x.APIVersion != "" - yyq3908[4] = x.Reason != "" - yyq3908[5] = x.Message != "" - yyq3908[6] = true - yyq3908[7] = true - yyq3908[8] = true - yyq3908[9] = x.Count != 0 - yyq3908[10] = x.Type != "" - var yynn3908 int - if yyr3908 || yy2arr3908 { + yysep3882 := !z.EncBinary() + yy2arr3882 := z.EncBasicHandle().StructToArray + var yyq3882 [11]bool + _, _, _ = yysep3882, yyq3882, yy2arr3882 + const yyr3882 bool = false + yyq3882[0] = x.Kind != "" + yyq3882[1] = x.APIVersion != "" + yyq3882[4] = x.Reason != "" + yyq3882[5] = x.Message != "" + yyq3882[6] = true + yyq3882[7] = true + yyq3882[8] = true + yyq3882[9] = x.Count != 0 + yyq3882[10] = x.Type != "" + var yynn3882 int + if yyr3882 || yy2arr3882 { r.EncodeArrayStart(11) } else { - yynn3908 = 2 - for _, b := range yyq3908 { + yynn3882 = 2 + for _, b := range yyq3882 { if b { - yynn3908++ + yynn3882++ } } - r.EncodeMapStart(yynn3908) - yynn3908 = 0 + r.EncodeMapStart(yynn3882) + yynn3882 = 0 } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3908[0] { - yym3910 := z.EncBinary() - _ = yym3910 + if yyq3882[0] { + yym3884 := z.EncBinary() + _ = yym3884 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -49284,23 +48985,23 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3908[0] { + if yyq3882[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3911 := z.EncBinary() - _ = yym3911 + yym3885 := z.EncBinary() + _ = yym3885 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3908[1] { - yym3913 := z.EncBinary() - _ = yym3913 + if yyq3882[1] { + yym3887 := z.EncBinary() + _ = yym3887 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -49309,45 +49010,45 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3908[1] { + if yyq3882[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3914 := z.EncBinary() - _ = yym3914 + yym3888 := z.EncBinary() + _ = yym3888 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3916 := &x.ObjectMeta - yy3916.CodecEncodeSelf(e) + yy3890 := &x.ObjectMeta + yy3890.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3917 := &x.ObjectMeta - yy3917.CodecEncodeSelf(e) + yy3891 := &x.ObjectMeta + yy3891.CodecEncodeSelf(e) } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy3919 := &x.InvolvedObject - yy3919.CodecEncodeSelf(e) + yy3893 := &x.InvolvedObject + yy3893.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("involvedObject")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3920 := &x.InvolvedObject - yy3920.CodecEncodeSelf(e) + yy3894 := &x.InvolvedObject + yy3894.CodecEncodeSelf(e) } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3908[4] { - yym3922 := z.EncBinary() - _ = yym3922 + if yyq3882[4] { + yym3896 := z.EncBinary() + _ = yym3896 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Reason)) @@ -49356,23 +49057,23 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3908[4] { + if yyq3882[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reason")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3923 := z.EncBinary() - _ = yym3923 + yym3897 := z.EncBinary() + _ = yym3897 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Reason)) } } } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3908[5] { - yym3925 := z.EncBinary() - _ = yym3925 + if yyq3882[5] { + yym3899 := z.EncBinary() + _ = yym3899 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) @@ -49381,114 +49082,114 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3908[5] { + if yyq3882[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("message")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3926 := z.EncBinary() - _ = yym3926 + yym3900 := z.EncBinary() + _ = yym3900 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) } } } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3908[6] { - yy3928 := &x.Source - yy3928.CodecEncodeSelf(e) + if yyq3882[6] { + yy3902 := &x.Source + yy3902.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq3908[6] { + if yyq3882[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("source")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3929 := &x.Source - yy3929.CodecEncodeSelf(e) + yy3903 := &x.Source + yy3903.CodecEncodeSelf(e) } } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3908[7] { - yy3931 := &x.FirstTimestamp - yym3932 := z.EncBinary() - _ = yym3932 + if yyq3882[7] { + yy3905 := &x.FirstTimestamp + yym3906 := z.EncBinary() + _ = yym3906 if false { - } else if z.HasExtensions() && z.EncExt(yy3931) { - } else if yym3932 { - z.EncBinaryMarshal(yy3931) - } else if !yym3932 && z.IsJSONHandle() { - z.EncJSONMarshal(yy3931) + } else if z.HasExtensions() && z.EncExt(yy3905) { + } else if yym3906 { + z.EncBinaryMarshal(yy3905) + } else if !yym3906 && z.IsJSONHandle() { + z.EncJSONMarshal(yy3905) } else { - z.EncFallback(yy3931) + z.EncFallback(yy3905) } } else { r.EncodeNil() } } else { - if yyq3908[7] { + if yyq3882[7] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("firstTimestamp")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3933 := &x.FirstTimestamp - yym3934 := z.EncBinary() - _ = yym3934 + yy3907 := &x.FirstTimestamp + yym3908 := z.EncBinary() + _ = yym3908 if false { - } else if z.HasExtensions() && z.EncExt(yy3933) { - } else if yym3934 { - z.EncBinaryMarshal(yy3933) - } else if !yym3934 && z.IsJSONHandle() { - z.EncJSONMarshal(yy3933) + } else if z.HasExtensions() && z.EncExt(yy3907) { + } else if yym3908 { + z.EncBinaryMarshal(yy3907) + } else if !yym3908 && z.IsJSONHandle() { + z.EncJSONMarshal(yy3907) } else { - z.EncFallback(yy3933) + z.EncFallback(yy3907) } } } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3908[8] { - yy3936 := &x.LastTimestamp - yym3937 := z.EncBinary() - _ = yym3937 + if yyq3882[8] { + yy3910 := &x.LastTimestamp + yym3911 := z.EncBinary() + _ = yym3911 if false { - } else if z.HasExtensions() && z.EncExt(yy3936) { - } else if yym3937 { - z.EncBinaryMarshal(yy3936) - } else if !yym3937 && z.IsJSONHandle() { - z.EncJSONMarshal(yy3936) + } else if z.HasExtensions() && z.EncExt(yy3910) { + } else if yym3911 { + z.EncBinaryMarshal(yy3910) + } else if !yym3911 && z.IsJSONHandle() { + z.EncJSONMarshal(yy3910) } else { - z.EncFallback(yy3936) + z.EncFallback(yy3910) } } else { r.EncodeNil() } } else { - if yyq3908[8] { + if yyq3882[8] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lastTimestamp")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3938 := &x.LastTimestamp - yym3939 := z.EncBinary() - _ = yym3939 + yy3912 := &x.LastTimestamp + yym3913 := z.EncBinary() + _ = yym3913 if false { - } else if z.HasExtensions() && z.EncExt(yy3938) { - } else if yym3939 { - z.EncBinaryMarshal(yy3938) - } else if !yym3939 && z.IsJSONHandle() { - z.EncJSONMarshal(yy3938) + } else if z.HasExtensions() && z.EncExt(yy3912) { + } else if yym3913 { + z.EncBinaryMarshal(yy3912) + } else if !yym3913 && z.IsJSONHandle() { + z.EncJSONMarshal(yy3912) } else { - z.EncFallback(yy3938) + z.EncFallback(yy3912) } } } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3908[9] { - yym3941 := z.EncBinary() - _ = yym3941 + if yyq3882[9] { + yym3915 := z.EncBinary() + _ = yym3915 if false { } else { r.EncodeInt(int64(x.Count)) @@ -49497,23 +49198,23 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq3908[9] { + if yyq3882[9] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("count")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3942 := z.EncBinary() - _ = yym3942 + yym3916 := z.EncBinary() + _ = yym3916 if false { } else { r.EncodeInt(int64(x.Count)) } } } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3908[10] { - yym3944 := z.EncBinary() - _ = yym3944 + if yyq3882[10] { + yym3918 := z.EncBinary() + _ = yym3918 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) @@ -49522,19 +49223,19 @@ func (x *Event) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3908[10] { + if yyq3882[10] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3945 := z.EncBinary() - _ = yym3945 + yym3919 := z.EncBinary() + _ = yym3919 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) } } } - if yyr3908 || yy2arr3908 { + if yyr3882 || yy2arr3882 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -49547,25 +49248,25 @@ func (x *Event) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3946 := z.DecBinary() - _ = yym3946 + yym3920 := z.DecBinary() + _ = yym3920 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3947 := r.ContainerType() - if yyct3947 == codecSelferValueTypeMap1234 { - yyl3947 := r.ReadMapStart() - if yyl3947 == 0 { + yyct3921 := r.ContainerType() + if yyct3921 == codecSelferValueTypeMap1234 { + yyl3921 := r.ReadMapStart() + if yyl3921 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3947, d) + x.codecDecodeSelfFromMap(yyl3921, d) } - } else if yyct3947 == codecSelferValueTypeArray1234 { - yyl3947 := r.ReadArrayStart() - if yyl3947 == 0 { + } else if yyct3921 == codecSelferValueTypeArray1234 { + yyl3921 := r.ReadArrayStart() + if yyl3921 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3947, d) + x.codecDecodeSelfFromArray(yyl3921, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -49577,12 +49278,12 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3948Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3948Slc - var yyhl3948 bool = l >= 0 - for yyj3948 := 0; ; yyj3948++ { - if yyhl3948 { - if yyj3948 >= l { + var yys3922Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3922Slc + var yyhl3922 bool = l >= 0 + for yyj3922 := 0; ; yyj3922++ { + if yyhl3922 { + if yyj3922 >= l { break } } else { @@ -49591,10 +49292,10 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3948Slc = r.DecodeBytes(yys3948Slc, true, true) - yys3948 := string(yys3948Slc) + yys3922Slc = r.DecodeBytes(yys3922Slc, true, true) + yys3922 := string(yys3922Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3948 { + switch yys3922 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -49611,15 +49312,15 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3951 := &x.ObjectMeta - yyv3951.CodecDecodeSelf(d) + yyv3925 := &x.ObjectMeta + yyv3925.CodecDecodeSelf(d) } case "involvedObject": if r.TryDecodeAsNil() { x.InvolvedObject = ObjectReference{} } else { - yyv3952 := &x.InvolvedObject - yyv3952.CodecDecodeSelf(d) + yyv3926 := &x.InvolvedObject + yyv3926.CodecDecodeSelf(d) } case "reason": if r.TryDecodeAsNil() { @@ -49637,41 +49338,41 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Source = EventSource{} } else { - yyv3955 := &x.Source - yyv3955.CodecDecodeSelf(d) + yyv3929 := &x.Source + yyv3929.CodecDecodeSelf(d) } case "firstTimestamp": if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { - yyv3956 := &x.FirstTimestamp - yym3957 := z.DecBinary() - _ = yym3957 + yyv3930 := &x.FirstTimestamp + yym3931 := z.DecBinary() + _ = yym3931 if false { - } else if z.HasExtensions() && z.DecExt(yyv3956) { - } else if yym3957 { - z.DecBinaryUnmarshal(yyv3956) - } else if !yym3957 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv3956) + } else if z.HasExtensions() && z.DecExt(yyv3930) { + } else if yym3931 { + z.DecBinaryUnmarshal(yyv3930) + } else if !yym3931 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv3930) } else { - z.DecFallback(yyv3956, false) + z.DecFallback(yyv3930, false) } } case "lastTimestamp": if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { - yyv3958 := &x.LastTimestamp - yym3959 := z.DecBinary() - _ = yym3959 + yyv3932 := &x.LastTimestamp + yym3933 := z.DecBinary() + _ = yym3933 if false { - } else if z.HasExtensions() && z.DecExt(yyv3958) { - } else if yym3959 { - z.DecBinaryUnmarshal(yyv3958) - } else if !yym3959 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv3958) + } else if z.HasExtensions() && z.DecExt(yyv3932) { + } else if yym3933 { + z.DecBinaryUnmarshal(yyv3932) + } else if !yym3933 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv3932) } else { - z.DecFallback(yyv3958, false) + z.DecFallback(yyv3932, false) } } case "count": @@ -49687,9 +49388,9 @@ func (x *Event) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Type = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys3948) - } // end switch yys3948 - } // end for yyj3948 + z.DecStructFieldNotFound(-1, yys3922) + } // end switch yys3922 + } // end for yyj3922 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -49697,16 +49398,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj3962 int - var yyb3962 bool - var yyhl3962 bool = l >= 0 - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + var yyj3936 int + var yyb3936 bool + var yyhl3936 bool = l >= 0 + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49716,13 +49417,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49732,13 +49433,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49746,16 +49447,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv3965 := &x.ObjectMeta - yyv3965.CodecDecodeSelf(d) + yyv3939 := &x.ObjectMeta + yyv3939.CodecDecodeSelf(d) } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49763,16 +49464,16 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.InvolvedObject = ObjectReference{} } else { - yyv3966 := &x.InvolvedObject - yyv3966.CodecDecodeSelf(d) + yyv3940 := &x.InvolvedObject + yyv3940.CodecDecodeSelf(d) } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49782,13 +49483,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Reason = string(r.DecodeString()) } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49798,13 +49499,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Message = string(r.DecodeString()) } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49812,70 +49513,70 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Source = EventSource{} } else { - yyv3969 := &x.Source - yyv3969.CodecDecodeSelf(d) + yyv3943 := &x.Source + yyv3943.CodecDecodeSelf(d) } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FirstTimestamp = pkg2_unversioned.Time{} + x.FirstTimestamp = pkg2_v1.Time{} } else { - yyv3970 := &x.FirstTimestamp - yym3971 := z.DecBinary() - _ = yym3971 + yyv3944 := &x.FirstTimestamp + yym3945 := z.DecBinary() + _ = yym3945 if false { - } else if z.HasExtensions() && z.DecExt(yyv3970) { - } else if yym3971 { - z.DecBinaryUnmarshal(yyv3970) - } else if !yym3971 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv3970) + } else if z.HasExtensions() && z.DecExt(yyv3944) { + } else if yym3945 { + z.DecBinaryUnmarshal(yyv3944) + } else if !yym3945 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv3944) } else { - z.DecFallback(yyv3970, false) + z.DecFallback(yyv3944, false) } } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTimestamp = pkg2_unversioned.Time{} + x.LastTimestamp = pkg2_v1.Time{} } else { - yyv3972 := &x.LastTimestamp - yym3973 := z.DecBinary() - _ = yym3973 + yyv3946 := &x.LastTimestamp + yym3947 := z.DecBinary() + _ = yym3947 if false { - } else if z.HasExtensions() && z.DecExt(yyv3972) { - } else if yym3973 { - z.DecBinaryUnmarshal(yyv3972) - } else if !yym3973 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv3972) + } else if z.HasExtensions() && z.DecExt(yyv3946) { + } else if yym3947 { + z.DecBinaryUnmarshal(yyv3946) + } else if !yym3947 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv3946) } else { - z.DecFallback(yyv3972, false) + z.DecFallback(yyv3946, false) } } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49885,13 +49586,13 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Count = int32(r.DecodeInt(32)) } - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -49902,17 +49603,17 @@ func (x *Event) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Type = string(r.DecodeString()) } for { - yyj3962++ - if yyhl3962 { - yyb3962 = yyj3962 > l + yyj3936++ + if yyhl3936 { + yyb3936 = yyj3936 > l } else { - yyb3962 = r.CheckBreak() + yyb3936 = r.CheckBreak() } - if yyb3962 { + if yyb3936 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj3962-1, "") + z.DecStructFieldNotFound(yyj3936-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -49924,37 +49625,37 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym3976 := z.EncBinary() - _ = yym3976 + yym3950 := z.EncBinary() + _ = yym3950 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep3977 := !z.EncBinary() - yy2arr3977 := z.EncBasicHandle().StructToArray - var yyq3977 [4]bool - _, _, _ = yysep3977, yyq3977, yy2arr3977 - const yyr3977 bool = false - yyq3977[0] = x.Kind != "" - yyq3977[1] = x.APIVersion != "" - yyq3977[2] = true - var yynn3977 int - if yyr3977 || yy2arr3977 { + yysep3951 := !z.EncBinary() + yy2arr3951 := z.EncBasicHandle().StructToArray + var yyq3951 [4]bool + _, _, _ = yysep3951, yyq3951, yy2arr3951 + const yyr3951 bool = false + yyq3951[0] = x.Kind != "" + yyq3951[1] = x.APIVersion != "" + yyq3951[2] = true + var yynn3951 int + if yyr3951 || yy2arr3951 { r.EncodeArrayStart(4) } else { - yynn3977 = 1 - for _, b := range yyq3977 { + yynn3951 = 1 + for _, b := range yyq3951 { if b { - yynn3977++ + yynn3951++ } } - r.EncodeMapStart(yynn3977) - yynn3977 = 0 + r.EncodeMapStart(yynn3951) + yynn3951 = 0 } - if yyr3977 || yy2arr3977 { + if yyr3951 || yy2arr3951 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3977[0] { - yym3979 := z.EncBinary() - _ = yym3979 + if yyq3951[0] { + yym3953 := z.EncBinary() + _ = yym3953 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -49963,23 +49664,23 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3977[0] { + if yyq3951[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3980 := z.EncBinary() - _ = yym3980 + yym3954 := z.EncBinary() + _ = yym3954 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr3977 || yy2arr3977 { + if yyr3951 || yy2arr3951 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3977[1] { - yym3982 := z.EncBinary() - _ = yym3982 + if yyq3951[1] { + yym3956 := z.EncBinary() + _ = yym3956 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -49988,54 +49689,54 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq3977[1] { + if yyq3951[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym3983 := z.EncBinary() - _ = yym3983 + yym3957 := z.EncBinary() + _ = yym3957 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr3977 || yy2arr3977 { + if yyr3951 || yy2arr3951 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq3977[2] { - yy3985 := &x.ListMeta - yym3986 := z.EncBinary() - _ = yym3986 + if yyq3951[2] { + yy3959 := &x.ListMeta + yym3960 := z.EncBinary() + _ = yym3960 if false { - } else if z.HasExtensions() && z.EncExt(yy3985) { + } else if z.HasExtensions() && z.EncExt(yy3959) { } else { - z.EncFallback(yy3985) + z.EncFallback(yy3959) } } else { r.EncodeNil() } } else { - if yyq3977[2] { + if yyq3951[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy3987 := &x.ListMeta - yym3988 := z.EncBinary() - _ = yym3988 + yy3961 := &x.ListMeta + yym3962 := z.EncBinary() + _ = yym3962 if false { - } else if z.HasExtensions() && z.EncExt(yy3987) { + } else if z.HasExtensions() && z.EncExt(yy3961) { } else { - z.EncFallback(yy3987) + z.EncFallback(yy3961) } } } - if yyr3977 || yy2arr3977 { + if yyr3951 || yy2arr3951 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym3990 := z.EncBinary() - _ = yym3990 + yym3964 := z.EncBinary() + _ = yym3964 if false { } else { h.encSliceEvent(([]Event)(x.Items), e) @@ -50048,15 +49749,15 @@ func (x *EventList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym3991 := z.EncBinary() - _ = yym3991 + yym3965 := z.EncBinary() + _ = yym3965 if false { } else { h.encSliceEvent(([]Event)(x.Items), e) } } } - if yyr3977 || yy2arr3977 { + if yyr3951 || yy2arr3951 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -50069,25 +49770,25 @@ func (x *EventList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym3992 := z.DecBinary() - _ = yym3992 + yym3966 := z.DecBinary() + _ = yym3966 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct3993 := r.ContainerType() - if yyct3993 == codecSelferValueTypeMap1234 { - yyl3993 := r.ReadMapStart() - if yyl3993 == 0 { + yyct3967 := r.ContainerType() + if yyct3967 == codecSelferValueTypeMap1234 { + yyl3967 := r.ReadMapStart() + if yyl3967 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl3993, d) + x.codecDecodeSelfFromMap(yyl3967, d) } - } else if yyct3993 == codecSelferValueTypeArray1234 { - yyl3993 := r.ReadArrayStart() - if yyl3993 == 0 { + } else if yyct3967 == codecSelferValueTypeArray1234 { + yyl3967 := r.ReadArrayStart() + if yyl3967 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl3993, d) + x.codecDecodeSelfFromArray(yyl3967, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -50099,12 +49800,12 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys3994Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys3994Slc - var yyhl3994 bool = l >= 0 - for yyj3994 := 0; ; yyj3994++ { - if yyhl3994 { - if yyj3994 >= l { + var yys3968Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys3968Slc + var yyhl3968 bool = l >= 0 + for yyj3968 := 0; ; yyj3968++ { + if yyhl3968 { + if yyj3968 >= l { break } } else { @@ -50113,10 +49814,10 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys3994Slc = r.DecodeBytes(yys3994Slc, true, true) - yys3994 := string(yys3994Slc) + yys3968Slc = r.DecodeBytes(yys3968Slc, true, true) + yys3968 := string(yys3968Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys3994 { + switch yys3968 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -50131,33 +49832,33 @@ func (x *EventList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv3997 := &x.ListMeta - yym3998 := z.DecBinary() - _ = yym3998 + yyv3971 := &x.ListMeta + yym3972 := z.DecBinary() + _ = yym3972 if false { - } else if z.HasExtensions() && z.DecExt(yyv3997) { + } else if z.HasExtensions() && z.DecExt(yyv3971) { } else { - z.DecFallback(yyv3997, false) + z.DecFallback(yyv3971, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv3999 := &x.Items - yym4000 := z.DecBinary() - _ = yym4000 + yyv3973 := &x.Items + yym3974 := z.DecBinary() + _ = yym3974 if false { } else { - h.decSliceEvent((*[]Event)(yyv3999), d) + h.decSliceEvent((*[]Event)(yyv3973), d) } } default: - z.DecStructFieldNotFound(-1, yys3994) - } // end switch yys3994 - } // end for yyj3994 + z.DecStructFieldNotFound(-1, yys3968) + } // end switch yys3968 + } // end for yyj3968 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -50165,16 +49866,16 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4001 int - var yyb4001 bool - var yyhl4001 bool = l >= 0 - yyj4001++ - if yyhl4001 { - yyb4001 = yyj4001 > l + var yyj3975 int + var yyb3975 bool + var yyhl3975 bool = l >= 0 + yyj3975++ + if yyhl3975 { + yyb3975 = yyj3975 > l } else { - yyb4001 = r.CheckBreak() + yyb3975 = r.CheckBreak() } - if yyb4001 { + if yyb3975 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50184,13 +49885,13 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4001++ - if yyhl4001 { - yyb4001 = yyj4001 > l + yyj3975++ + if yyhl3975 { + yyb3975 = yyj3975 > l } else { - yyb4001 = r.CheckBreak() + yyb3975 = r.CheckBreak() } - if yyb4001 { + if yyb3975 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50200,36 +49901,36 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4001++ - if yyhl4001 { - yyb4001 = yyj4001 > l + yyj3975++ + if yyhl3975 { + yyb3975 = yyj3975 > l } else { - yyb4001 = r.CheckBreak() + yyb3975 = r.CheckBreak() } - if yyb4001 { + if yyb3975 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4004 := &x.ListMeta - yym4005 := z.DecBinary() - _ = yym4005 + yyv3978 := &x.ListMeta + yym3979 := z.DecBinary() + _ = yym3979 if false { - } else if z.HasExtensions() && z.DecExt(yyv4004) { + } else if z.HasExtensions() && z.DecExt(yyv3978) { } else { - z.DecFallback(yyv4004, false) + z.DecFallback(yyv3978, false) } } - yyj4001++ - if yyhl4001 { - yyb4001 = yyj4001 > l + yyj3975++ + if yyhl3975 { + yyb3975 = yyj3975 > l } else { - yyb4001 = r.CheckBreak() + yyb3975 = r.CheckBreak() } - if yyb4001 { + if yyb3975 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -50237,26 +49938,26 @@ func (x *EventList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4006 := &x.Items - yym4007 := z.DecBinary() - _ = yym4007 + yyv3980 := &x.Items + yym3981 := z.DecBinary() + _ = yym3981 if false { } else { - h.decSliceEvent((*[]Event)(yyv4006), d) + h.decSliceEvent((*[]Event)(yyv3980), d) } } for { - yyj4001++ - if yyhl4001 { - yyb4001 = yyj4001 > l + yyj3975++ + if yyhl3975 { + yyb3975 = yyj3975 > l } else { - yyb4001 = r.CheckBreak() + yyb3975 = r.CheckBreak() } - if yyb4001 { + if yyb3975 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4001-1, "") + z.DecStructFieldNotFound(yyj3975-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -50268,37 +49969,37 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4008 := z.EncBinary() - _ = yym4008 + yym3982 := z.EncBinary() + _ = yym3982 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4009 := !z.EncBinary() - yy2arr4009 := z.EncBasicHandle().StructToArray - var yyq4009 [4]bool - _, _, _ = yysep4009, yyq4009, yy2arr4009 - const yyr4009 bool = false - yyq4009[0] = x.Kind != "" - yyq4009[1] = x.APIVersion != "" - yyq4009[2] = true - var yynn4009 int - if yyr4009 || yy2arr4009 { + yysep3983 := !z.EncBinary() + yy2arr3983 := z.EncBasicHandle().StructToArray + var yyq3983 [4]bool + _, _, _ = yysep3983, yyq3983, yy2arr3983 + const yyr3983 bool = false + yyq3983[0] = x.Kind != "" + yyq3983[1] = x.APIVersion != "" + yyq3983[2] = true + var yynn3983 int + if yyr3983 || yy2arr3983 { r.EncodeArrayStart(4) } else { - yynn4009 = 1 - for _, b := range yyq4009 { + yynn3983 = 1 + for _, b := range yyq3983 { if b { - yynn4009++ + yynn3983++ } } - r.EncodeMapStart(yynn4009) - yynn4009 = 0 + r.EncodeMapStart(yynn3983) + yynn3983 = 0 } - if yyr4009 || yy2arr4009 { + if yyr3983 || yy2arr3983 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4009[0] { - yym4011 := z.EncBinary() - _ = yym4011 + if yyq3983[0] { + yym3985 := z.EncBinary() + _ = yym3985 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -50307,23 +50008,23 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4009[0] { + if yyq3983[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4012 := z.EncBinary() - _ = yym4012 + yym3986 := z.EncBinary() + _ = yym3986 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4009 || yy2arr4009 { + if yyr3983 || yy2arr3983 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4009[1] { - yym4014 := z.EncBinary() - _ = yym4014 + if yyq3983[1] { + yym3988 := z.EncBinary() + _ = yym3988 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -50332,54 +50033,54 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4009[1] { + if yyq3983[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4015 := z.EncBinary() - _ = yym4015 + yym3989 := z.EncBinary() + _ = yym3989 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4009 || yy2arr4009 { + if yyr3983 || yy2arr3983 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4009[2] { - yy4017 := &x.ListMeta - yym4018 := z.EncBinary() - _ = yym4018 + if yyq3983[2] { + yy3991 := &x.ListMeta + yym3992 := z.EncBinary() + _ = yym3992 if false { - } else if z.HasExtensions() && z.EncExt(yy4017) { + } else if z.HasExtensions() && z.EncExt(yy3991) { } else { - z.EncFallback(yy4017) + z.EncFallback(yy3991) } } else { r.EncodeNil() } } else { - if yyq4009[2] { + if yyq3983[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4019 := &x.ListMeta - yym4020 := z.EncBinary() - _ = yym4020 + yy3993 := &x.ListMeta + yym3994 := z.EncBinary() + _ = yym3994 if false { - } else if z.HasExtensions() && z.EncExt(yy4019) { + } else if z.HasExtensions() && z.EncExt(yy3993) { } else { - z.EncFallback(yy4019) + z.EncFallback(yy3993) } } } - if yyr4009 || yy2arr4009 { + if yyr3983 || yy2arr3983 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4022 := z.EncBinary() - _ = yym4022 + yym3996 := z.EncBinary() + _ = yym3996 if false { } else { h.encSliceruntime_RawExtension(([]pkg5_runtime.RawExtension)(x.Items), e) @@ -50392,15 +50093,15 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4023 := z.EncBinary() - _ = yym4023 + yym3997 := z.EncBinary() + _ = yym3997 if false { } else { h.encSliceruntime_RawExtension(([]pkg5_runtime.RawExtension)(x.Items), e) } } } - if yyr4009 || yy2arr4009 { + if yyr3983 || yy2arr3983 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -50410,6 +50111,403 @@ func (x *List) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *List) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym3998 := z.DecBinary() + _ = yym3998 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct3999 := r.ContainerType() + if yyct3999 == codecSelferValueTypeMap1234 { + yyl3999 := r.ReadMapStart() + if yyl3999 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl3999, d) + } + } else if yyct3999 == codecSelferValueTypeArray1234 { + yyl3999 := r.ReadArrayStart() + if yyl3999 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl3999, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys4000Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4000Slc + var yyhl4000 bool = l >= 0 + for yyj4000 := 0; ; yyj4000++ { + if yyhl4000 { + if yyj4000 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys4000Slc = r.DecodeBytes(yys4000Slc, true, true) + yys4000 := string(yys4000Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys4000 { + case "kind": + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + case "apiVersion": + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + case "metadata": + if r.TryDecodeAsNil() { + x.ListMeta = pkg2_v1.ListMeta{} + } else { + yyv4003 := &x.ListMeta + yym4004 := z.DecBinary() + _ = yym4004 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4003) { + } else { + z.DecFallback(yyv4003, false) + } + } + case "items": + if r.TryDecodeAsNil() { + x.Items = nil + } else { + yyv4005 := &x.Items + yym4006 := z.DecBinary() + _ = yym4006 + if false { + } else { + h.decSliceruntime_RawExtension((*[]pkg5_runtime.RawExtension)(yyv4005), d) + } + } + default: + z.DecStructFieldNotFound(-1, yys4000) + } // end switch yys4000 + } // end for yyj4000 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj4007 int + var yyb4007 bool + var yyhl4007 bool = l >= 0 + yyj4007++ + if yyhl4007 { + yyb4007 = yyj4007 > l + } else { + yyb4007 = r.CheckBreak() + } + if yyb4007 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + yyj4007++ + if yyhl4007 { + yyb4007 = yyj4007 > l + } else { + yyb4007 = r.CheckBreak() + } + if yyb4007 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + yyj4007++ + if yyhl4007 { + yyb4007 = yyj4007 > l + } else { + yyb4007 = r.CheckBreak() + } + if yyb4007 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ListMeta = pkg2_v1.ListMeta{} + } else { + yyv4010 := &x.ListMeta + yym4011 := z.DecBinary() + _ = yym4011 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4010) { + } else { + z.DecFallback(yyv4010, false) + } + } + yyj4007++ + if yyhl4007 { + yyb4007 = yyj4007 > l + } else { + yyb4007 = r.CheckBreak() + } + if yyb4007 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Items = nil + } else { + yyv4012 := &x.Items + yym4013 := z.DecBinary() + _ = yym4013 + if false { + } else { + h.decSliceruntime_RawExtension((*[]pkg5_runtime.RawExtension)(yyv4012), d) + } + } + for { + yyj4007++ + if yyhl4007 { + yyb4007 = yyj4007 > l + } else { + yyb4007 = r.CheckBreak() + } + if yyb4007 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj4007-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x LimitType) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + yym4014 := z.EncBinary() + _ = yym4014 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x)) + } +} + +func (x *LimitType) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym4015 := z.DecBinary() + _ = yym4015 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + *((*string)(x)) = r.DecodeString() + } +} + +func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym4016 := z.EncBinary() + _ = yym4016 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep4017 := !z.EncBinary() + yy2arr4017 := z.EncBasicHandle().StructToArray + var yyq4017 [6]bool + _, _, _ = yysep4017, yyq4017, yy2arr4017 + const yyr4017 bool = false + yyq4017[0] = x.Type != "" + yyq4017[1] = len(x.Max) != 0 + yyq4017[2] = len(x.Min) != 0 + yyq4017[3] = len(x.Default) != 0 + yyq4017[4] = len(x.DefaultRequest) != 0 + yyq4017[5] = len(x.MaxLimitRequestRatio) != 0 + var yynn4017 int + if yyr4017 || yy2arr4017 { + r.EncodeArrayStart(6) + } else { + yynn4017 = 0 + for _, b := range yyq4017 { + if b { + yynn4017++ + } + } + r.EncodeMapStart(yynn4017) + yynn4017 = 0 + } + if yyr4017 || yy2arr4017 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4017[0] { + x.Type.CodecEncodeSelf(e) + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4017[0] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("type")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + x.Type.CodecEncodeSelf(e) + } + } + if yyr4017 || yy2arr4017 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4017[1] { + if x.Max == nil { + r.EncodeNil() + } else { + x.Max.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4017[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("max")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Max == nil { + r.EncodeNil() + } else { + x.Max.CodecEncodeSelf(e) + } + } + } + if yyr4017 || yy2arr4017 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4017[2] { + if x.Min == nil { + r.EncodeNil() + } else { + x.Min.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4017[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("min")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Min == nil { + r.EncodeNil() + } else { + x.Min.CodecEncodeSelf(e) + } + } + } + if yyr4017 || yy2arr4017 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4017[3] { + if x.Default == nil { + r.EncodeNil() + } else { + x.Default.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4017[3] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("default")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Default == nil { + r.EncodeNil() + } else { + x.Default.CodecEncodeSelf(e) + } + } + } + if yyr4017 || yy2arr4017 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4017[4] { + if x.DefaultRequest == nil { + r.EncodeNil() + } else { + x.DefaultRequest.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4017[4] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("defaultRequest")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.DefaultRequest == nil { + r.EncodeNil() + } else { + x.DefaultRequest.CodecEncodeSelf(e) + } + } + } + if yyr4017 || yy2arr4017 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4017[5] { + if x.MaxLimitRequestRatio == nil { + r.EncodeNil() + } else { + x.MaxLimitRequestRatio.CodecEncodeSelf(e) + } + } else { + r.EncodeNil() + } + } else { + if yyq4017[5] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("maxLimitRequestRatio")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.MaxLimitRequestRatio == nil { + r.EncodeNil() + } else { + x.MaxLimitRequestRatio.CodecEncodeSelf(e) + } + } + } + if yyr4017 || yy2arr4017 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + +func (x *LimitRangeItem) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -50439,7 +50537,7 @@ func (x *List) CodecDecodeSelf(d *codec1978.Decoder) { } } -func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { +func (x *LimitRangeItem) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -50461,42 +50559,46 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { yys4026 := string(yys4026Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) switch yys4026 { - case "kind": + case "type": if r.TryDecodeAsNil() { - x.Kind = "" + x.Type = "" } else { - x.Kind = string(r.DecodeString()) + x.Type = LimitType(r.DecodeString()) } - case "apiVersion": + case "max": if r.TryDecodeAsNil() { - x.APIVersion = "" + x.Max = nil } else { - x.APIVersion = string(r.DecodeString()) + yyv4028 := &x.Max + yyv4028.CodecDecodeSelf(d) } - case "metadata": + case "min": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.Min = nil } else { - yyv4029 := &x.ListMeta - yym4030 := z.DecBinary() - _ = yym4030 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4029) { - } else { - z.DecFallback(yyv4029, false) - } + yyv4029 := &x.Min + yyv4029.CodecDecodeSelf(d) } - case "items": + case "default": if r.TryDecodeAsNil() { - x.Items = nil + x.Default = nil } else { - yyv4031 := &x.Items - yym4032 := z.DecBinary() - _ = yym4032 - if false { - } else { - h.decSliceruntime_RawExtension((*[]pkg5_runtime.RawExtension)(yyv4031), d) - } + yyv4030 := &x.Default + yyv4030.CodecDecodeSelf(d) + } + case "defaultRequest": + if r.TryDecodeAsNil() { + x.DefaultRequest = nil + } else { + yyv4031 := &x.DefaultRequest + yyv4031.CodecDecodeSelf(d) + } + case "maxLimitRequestRatio": + if r.TryDecodeAsNil() { + x.MaxLimitRequestRatio = nil + } else { + yyv4032 := &x.MaxLimitRequestRatio + yyv4032.CodecDecodeSelf(d) } default: z.DecStructFieldNotFound(-1, yys4026) @@ -50505,7 +50607,7 @@ func (x *List) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } -func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { +func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -50524,9 +50626,9 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Kind = "" + x.Type = "" } else { - x.Kind = string(r.DecodeString()) + x.Type = LimitType(r.DecodeString()) } yyj4033++ if yyhl4033 { @@ -50540,9 +50642,10 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.APIVersion = "" + x.Max = nil } else { - x.APIVersion = string(r.DecodeString()) + yyv4035 := &x.Max + yyv4035.CodecDecodeSelf(d) } yyj4033++ if yyhl4033 { @@ -50556,16 +50659,10 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.Min = nil } else { - yyv4036 := &x.ListMeta - yym4037 := z.DecBinary() - _ = yym4037 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4036) { - } else { - z.DecFallback(yyv4036, false) - } + yyv4036 := &x.Min + yyv4036.CodecDecodeSelf(d) } yyj4033++ if yyhl4033 { @@ -50579,15 +50676,44 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Items = nil + x.Default = nil } else { - yyv4038 := &x.Items - yym4039 := z.DecBinary() - _ = yym4039 - if false { - } else { - h.decSliceruntime_RawExtension((*[]pkg5_runtime.RawExtension)(yyv4038), d) - } + yyv4037 := &x.Default + yyv4037.CodecDecodeSelf(d) + } + yyj4033++ + if yyhl4033 { + yyb4033 = yyj4033 > l + } else { + yyb4033 = r.CheckBreak() + } + if yyb4033 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.DefaultRequest = nil + } else { + yyv4038 := &x.DefaultRequest + yyv4038.CodecDecodeSelf(d) + } + yyj4033++ + if yyhl4033 { + yyb4033 = yyj4033 > l + } else { + yyb4033 = r.CheckBreak() + } + if yyb4033 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.MaxLimitRequestRatio = nil + } else { + yyv4039 := &x.MaxLimitRequestRatio + yyv4039.CodecDecodeSelf(d) } for { yyj4033++ @@ -50605,431 +50731,6 @@ func (x *List) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x LimitType) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - yym4040 := z.EncBinary() - _ = yym4040 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x)) - } -} - -func (x *LimitType) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4041 := z.DecBinary() - _ = yym4041 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - *((*string)(x)) = r.DecodeString() - } -} - -func (x *LimitRangeItem) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym4042 := z.EncBinary() - _ = yym4042 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep4043 := !z.EncBinary() - yy2arr4043 := z.EncBasicHandle().StructToArray - var yyq4043 [6]bool - _, _, _ = yysep4043, yyq4043, yy2arr4043 - const yyr4043 bool = false - yyq4043[0] = x.Type != "" - yyq4043[1] = len(x.Max) != 0 - yyq4043[2] = len(x.Min) != 0 - yyq4043[3] = len(x.Default) != 0 - yyq4043[4] = len(x.DefaultRequest) != 0 - yyq4043[5] = len(x.MaxLimitRequestRatio) != 0 - var yynn4043 int - if yyr4043 || yy2arr4043 { - r.EncodeArrayStart(6) - } else { - yynn4043 = 0 - for _, b := range yyq4043 { - if b { - yynn4043++ - } - } - r.EncodeMapStart(yynn4043) - yynn4043 = 0 - } - if yyr4043 || yy2arr4043 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4043[0] { - x.Type.CodecEncodeSelf(e) - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4043[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("type")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - x.Type.CodecEncodeSelf(e) - } - } - if yyr4043 || yy2arr4043 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4043[1] { - if x.Max == nil { - r.EncodeNil() - } else { - x.Max.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4043[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("max")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Max == nil { - r.EncodeNil() - } else { - x.Max.CodecEncodeSelf(e) - } - } - } - if yyr4043 || yy2arr4043 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4043[2] { - if x.Min == nil { - r.EncodeNil() - } else { - x.Min.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4043[2] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("min")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Min == nil { - r.EncodeNil() - } else { - x.Min.CodecEncodeSelf(e) - } - } - } - if yyr4043 || yy2arr4043 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4043[3] { - if x.Default == nil { - r.EncodeNil() - } else { - x.Default.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4043[3] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("default")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Default == nil { - r.EncodeNil() - } else { - x.Default.CodecEncodeSelf(e) - } - } - } - if yyr4043 || yy2arr4043 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4043[4] { - if x.DefaultRequest == nil { - r.EncodeNil() - } else { - x.DefaultRequest.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4043[4] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("defaultRequest")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.DefaultRequest == nil { - r.EncodeNil() - } else { - x.DefaultRequest.CodecEncodeSelf(e) - } - } - } - if yyr4043 || yy2arr4043 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4043[5] { - if x.MaxLimitRequestRatio == nil { - r.EncodeNil() - } else { - x.MaxLimitRequestRatio.CodecEncodeSelf(e) - } - } else { - r.EncodeNil() - } - } else { - if yyq4043[5] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("maxLimitRequestRatio")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.MaxLimitRequestRatio == nil { - r.EncodeNil() - } else { - x.MaxLimitRequestRatio.CodecEncodeSelf(e) - } - } - } - if yyr4043 || yy2arr4043 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *LimitRangeItem) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4050 := z.DecBinary() - _ = yym4050 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct4051 := r.ContainerType() - if yyct4051 == codecSelferValueTypeMap1234 { - yyl4051 := r.ReadMapStart() - if yyl4051 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl4051, d) - } - } else if yyct4051 == codecSelferValueTypeArray1234 { - yyl4051 := r.ReadArrayStart() - if yyl4051 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl4051, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *LimitRangeItem) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys4052Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4052Slc - var yyhl4052 bool = l >= 0 - for yyj4052 := 0; ; yyj4052++ { - if yyhl4052 { - if yyj4052 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4052Slc = r.DecodeBytes(yys4052Slc, true, true) - yys4052 := string(yys4052Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4052 { - case "type": - if r.TryDecodeAsNil() { - x.Type = "" - } else { - x.Type = LimitType(r.DecodeString()) - } - case "max": - if r.TryDecodeAsNil() { - x.Max = nil - } else { - yyv4054 := &x.Max - yyv4054.CodecDecodeSelf(d) - } - case "min": - if r.TryDecodeAsNil() { - x.Min = nil - } else { - yyv4055 := &x.Min - yyv4055.CodecDecodeSelf(d) - } - case "default": - if r.TryDecodeAsNil() { - x.Default = nil - } else { - yyv4056 := &x.Default - yyv4056.CodecDecodeSelf(d) - } - case "defaultRequest": - if r.TryDecodeAsNil() { - x.DefaultRequest = nil - } else { - yyv4057 := &x.DefaultRequest - yyv4057.CodecDecodeSelf(d) - } - case "maxLimitRequestRatio": - if r.TryDecodeAsNil() { - x.MaxLimitRequestRatio = nil - } else { - yyv4058 := &x.MaxLimitRequestRatio - yyv4058.CodecDecodeSelf(d) - } - default: - z.DecStructFieldNotFound(-1, yys4052) - } // end switch yys4052 - } // end for yyj4052 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *LimitRangeItem) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj4059 int - var yyb4059 bool - var yyhl4059 bool = l >= 0 - yyj4059++ - if yyhl4059 { - yyb4059 = yyj4059 > l - } else { - yyb4059 = r.CheckBreak() - } - if yyb4059 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Type = "" - } else { - x.Type = LimitType(r.DecodeString()) - } - yyj4059++ - if yyhl4059 { - yyb4059 = yyj4059 > l - } else { - yyb4059 = r.CheckBreak() - } - if yyb4059 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Max = nil - } else { - yyv4061 := &x.Max - yyv4061.CodecDecodeSelf(d) - } - yyj4059++ - if yyhl4059 { - yyb4059 = yyj4059 > l - } else { - yyb4059 = r.CheckBreak() - } - if yyb4059 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Min = nil - } else { - yyv4062 := &x.Min - yyv4062.CodecDecodeSelf(d) - } - yyj4059++ - if yyhl4059 { - yyb4059 = yyj4059 > l - } else { - yyb4059 = r.CheckBreak() - } - if yyb4059 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Default = nil - } else { - yyv4063 := &x.Default - yyv4063.CodecDecodeSelf(d) - } - yyj4059++ - if yyhl4059 { - yyb4059 = yyj4059 > l - } else { - yyb4059 = r.CheckBreak() - } - if yyb4059 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.DefaultRequest = nil - } else { - yyv4064 := &x.DefaultRequest - yyv4064.CodecDecodeSelf(d) - } - yyj4059++ - if yyhl4059 { - yyb4059 = yyj4059 > l - } else { - yyb4059 = r.CheckBreak() - } - if yyb4059 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.MaxLimitRequestRatio = nil - } else { - yyv4065 := &x.MaxLimitRequestRatio - yyv4065.CodecDecodeSelf(d) - } - for { - yyj4059++ - if yyhl4059 { - yyb4059 = yyj4059 > l - } else { - yyb4059 = r.CheckBreak() - } - if yyb4059 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4059-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - func (x *LimitRangeSpec) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) @@ -51037,36 +50738,36 @@ func (x *LimitRangeSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4066 := z.EncBinary() - _ = yym4066 + yym4040 := z.EncBinary() + _ = yym4040 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4067 := !z.EncBinary() - yy2arr4067 := z.EncBasicHandle().StructToArray - var yyq4067 [1]bool - _, _, _ = yysep4067, yyq4067, yy2arr4067 - const yyr4067 bool = false - var yynn4067 int - if yyr4067 || yy2arr4067 { + yysep4041 := !z.EncBinary() + yy2arr4041 := z.EncBasicHandle().StructToArray + var yyq4041 [1]bool + _, _, _ = yysep4041, yyq4041, yy2arr4041 + const yyr4041 bool = false + var yynn4041 int + if yyr4041 || yy2arr4041 { r.EncodeArrayStart(1) } else { - yynn4067 = 1 - for _, b := range yyq4067 { + yynn4041 = 1 + for _, b := range yyq4041 { if b { - yynn4067++ + yynn4041++ } } - r.EncodeMapStart(yynn4067) - yynn4067 = 0 + r.EncodeMapStart(yynn4041) + yynn4041 = 0 } - if yyr4067 || yy2arr4067 { + if yyr4041 || yy2arr4041 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Limits == nil { r.EncodeNil() } else { - yym4069 := z.EncBinary() - _ = yym4069 + yym4043 := z.EncBinary() + _ = yym4043 if false { } else { h.encSliceLimitRangeItem(([]LimitRangeItem)(x.Limits), e) @@ -51079,15 +50780,15 @@ func (x *LimitRangeSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x.Limits == nil { r.EncodeNil() } else { - yym4070 := z.EncBinary() - _ = yym4070 + yym4044 := z.EncBinary() + _ = yym4044 if false { } else { h.encSliceLimitRangeItem(([]LimitRangeItem)(x.Limits), e) } } } - if yyr4067 || yy2arr4067 { + if yyr4041 || yy2arr4041 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -51100,25 +50801,25 @@ func (x *LimitRangeSpec) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4071 := z.DecBinary() - _ = yym4071 + yym4045 := z.DecBinary() + _ = yym4045 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4072 := r.ContainerType() - if yyct4072 == codecSelferValueTypeMap1234 { - yyl4072 := r.ReadMapStart() - if yyl4072 == 0 { + yyct4046 := r.ContainerType() + if yyct4046 == codecSelferValueTypeMap1234 { + yyl4046 := r.ReadMapStart() + if yyl4046 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4072, d) + x.codecDecodeSelfFromMap(yyl4046, d) } - } else if yyct4072 == codecSelferValueTypeArray1234 { - yyl4072 := r.ReadArrayStart() - if yyl4072 == 0 { + } else if yyct4046 == codecSelferValueTypeArray1234 { + yyl4046 := r.ReadArrayStart() + if yyl4046 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4072, d) + x.codecDecodeSelfFromArray(yyl4046, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -51130,12 +50831,12 @@ func (x *LimitRangeSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4073Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4073Slc - var yyhl4073 bool = l >= 0 - for yyj4073 := 0; ; yyj4073++ { - if yyhl4073 { - if yyj4073 >= l { + var yys4047Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4047Slc + var yyhl4047 bool = l >= 0 + for yyj4047 := 0; ; yyj4047++ { + if yyhl4047 { + if yyj4047 >= l { break } } else { @@ -51144,26 +50845,26 @@ func (x *LimitRangeSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4073Slc = r.DecodeBytes(yys4073Slc, true, true) - yys4073 := string(yys4073Slc) + yys4047Slc = r.DecodeBytes(yys4047Slc, true, true) + yys4047 := string(yys4047Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4073 { + switch yys4047 { case "limits": if r.TryDecodeAsNil() { x.Limits = nil } else { - yyv4074 := &x.Limits - yym4075 := z.DecBinary() - _ = yym4075 + yyv4048 := &x.Limits + yym4049 := z.DecBinary() + _ = yym4049 if false { } else { - h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv4074), d) + h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv4048), d) } } default: - z.DecStructFieldNotFound(-1, yys4073) - } // end switch yys4073 - } // end for yyj4073 + z.DecStructFieldNotFound(-1, yys4047) + } // end switch yys4047 + } // end for yyj4047 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -51171,16 +50872,16 @@ func (x *LimitRangeSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4076 int - var yyb4076 bool - var yyhl4076 bool = l >= 0 - yyj4076++ - if yyhl4076 { - yyb4076 = yyj4076 > l + var yyj4050 int + var yyb4050 bool + var yyhl4050 bool = l >= 0 + yyj4050++ + if yyhl4050 { + yyb4050 = yyj4050 > l } else { - yyb4076 = r.CheckBreak() + yyb4050 = r.CheckBreak() } - if yyb4076 { + if yyb4050 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -51188,31 +50889,332 @@ func (x *LimitRangeSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Limits = nil } else { - yyv4077 := &x.Limits - yym4078 := z.DecBinary() - _ = yym4078 + yyv4051 := &x.Limits + yym4052 := z.DecBinary() + _ = yym4052 if false { } else { - h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv4077), d) + h.decSliceLimitRangeItem((*[]LimitRangeItem)(yyv4051), d) } } for { - yyj4076++ - if yyhl4076 { - yyb4076 = yyj4076 > l + yyj4050++ + if yyhl4050 { + yyb4050 = yyj4050 > l } else { - yyb4076 = r.CheckBreak() + yyb4050 = r.CheckBreak() } - if yyb4076 { + if yyb4050 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4076-1, "") + z.DecStructFieldNotFound(yyj4050-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym4053 := z.EncBinary() + _ = yym4053 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep4054 := !z.EncBinary() + yy2arr4054 := z.EncBasicHandle().StructToArray + var yyq4054 [4]bool + _, _, _ = yysep4054, yyq4054, yy2arr4054 + const yyr4054 bool = false + yyq4054[0] = x.Kind != "" + yyq4054[1] = x.APIVersion != "" + yyq4054[2] = true + yyq4054[3] = true + var yynn4054 int + if yyr4054 || yy2arr4054 { + r.EncodeArrayStart(4) + } else { + yynn4054 = 0 + for _, b := range yyq4054 { + if b { + yynn4054++ + } + } + r.EncodeMapStart(yynn4054) + yynn4054 = 0 + } + if yyr4054 || yy2arr4054 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4054[0] { + yym4056 := z.EncBinary() + _ = yym4056 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4054[0] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("kind")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym4057 := z.EncBinary() + _ = yym4057 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) + } + } + } + if yyr4054 || yy2arr4054 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4054[1] { + yym4059 := z.EncBinary() + _ = yym4059 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4054[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym4060 := z.EncBinary() + _ = yym4060 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) + } + } + } + if yyr4054 || yy2arr4054 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4054[2] { + yy4062 := &x.ObjectMeta + yy4062.CodecEncodeSelf(e) + } else { + r.EncodeNil() + } + } else { + if yyq4054[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("metadata")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy4063 := &x.ObjectMeta + yy4063.CodecEncodeSelf(e) + } + } + if yyr4054 || yy2arr4054 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4054[3] { + yy4065 := &x.Spec + yy4065.CodecEncodeSelf(e) + } else { + r.EncodeNil() + } + } else { + if yyq4054[3] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("spec")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy4066 := &x.Spec + yy4066.CodecEncodeSelf(e) + } + } + if yyr4054 || yy2arr4054 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + +func (x *LimitRange) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym4067 := z.DecBinary() + _ = yym4067 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct4068 := r.ContainerType() + if yyct4068 == codecSelferValueTypeMap1234 { + yyl4068 := r.ReadMapStart() + if yyl4068 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl4068, d) + } + } else if yyct4068 == codecSelferValueTypeArray1234 { + yyl4068 := r.ReadArrayStart() + if yyl4068 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl4068, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *LimitRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys4069Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4069Slc + var yyhl4069 bool = l >= 0 + for yyj4069 := 0; ; yyj4069++ { + if yyhl4069 { + if yyj4069 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys4069Slc = r.DecodeBytes(yys4069Slc, true, true) + yys4069 := string(yys4069Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys4069 { + case "kind": + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + case "apiVersion": + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + case "metadata": + if r.TryDecodeAsNil() { + x.ObjectMeta = ObjectMeta{} + } else { + yyv4072 := &x.ObjectMeta + yyv4072.CodecDecodeSelf(d) + } + case "spec": + if r.TryDecodeAsNil() { + x.Spec = LimitRangeSpec{} + } else { + yyv4073 := &x.Spec + yyv4073.CodecDecodeSelf(d) + } + default: + z.DecStructFieldNotFound(-1, yys4069) + } // end switch yys4069 + } // end for yyj4069 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *LimitRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj4074 int + var yyb4074 bool + var yyhl4074 bool = l >= 0 + yyj4074++ + if yyhl4074 { + yyb4074 = yyj4074 > l + } else { + yyb4074 = r.CheckBreak() + } + if yyb4074 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + yyj4074++ + if yyhl4074 { + yyb4074 = yyj4074 > l + } else { + yyb4074 = r.CheckBreak() + } + if yyb4074 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + yyj4074++ + if yyhl4074 { + yyb4074 = yyj4074 > l + } else { + yyb4074 = r.CheckBreak() + } + if yyb4074 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ObjectMeta = ObjectMeta{} + } else { + yyv4077 := &x.ObjectMeta + yyv4077.CodecDecodeSelf(d) + } + yyj4074++ + if yyhl4074 { + yyb4074 = yyj4074 > l + } else { + yyb4074 = r.CheckBreak() + } + if yyb4074 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Spec = LimitRangeSpec{} + } else { + yyv4078 := &x.Spec + yyv4078.CodecDecodeSelf(d) + } + for { + yyj4074++ + if yyhl4074 { + yyb4074 = yyj4074 > l + } else { + yyb4074 = r.CheckBreak() + } + if yyb4074 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj4074-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -51232,12 +51234,11 @@ func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { yyq4080[0] = x.Kind != "" yyq4080[1] = x.APIVersion != "" yyq4080[2] = true - yyq4080[3] = true var yynn4080 int if yyr4080 || yy2arr4080 { r.EncodeArrayStart(4) } else { - yynn4080 = 0 + yynn4080 = 1 for _, b := range yyq4080 { if b { yynn4080++ @@ -51299,8 +51300,14 @@ func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { if yyr4080 || yy2arr4080 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if yyq4080[2] { - yy4088 := &x.ObjectMeta - yy4088.CodecEncodeSelf(e) + yy4088 := &x.ListMeta + yym4089 := z.EncBinary() + _ = yym4089 + if false { + } else if z.HasExtensions() && z.EncExt(yy4088) { + } else { + z.EncFallback(yy4088) + } } else { r.EncodeNil() } @@ -51309,329 +51316,23 @@ func (x *LimitRange) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4089 := &x.ObjectMeta - yy4089.CodecEncodeSelf(e) + yy4090 := &x.ListMeta + yym4091 := z.EncBinary() + _ = yym4091 + if false { + } else if z.HasExtensions() && z.EncExt(yy4090) { + } else { + z.EncFallback(yy4090) + } } } if yyr4080 || yy2arr4080 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4080[3] { - yy4091 := &x.Spec - yy4091.CodecEncodeSelf(e) - } else { - r.EncodeNil() - } - } else { - if yyq4080[3] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("spec")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4092 := &x.Spec - yy4092.CodecEncodeSelf(e) - } - } - if yyr4080 || yy2arr4080 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *LimitRange) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4093 := z.DecBinary() - _ = yym4093 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct4094 := r.ContainerType() - if yyct4094 == codecSelferValueTypeMap1234 { - yyl4094 := r.ReadMapStart() - if yyl4094 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl4094, d) - } - } else if yyct4094 == codecSelferValueTypeArray1234 { - yyl4094 := r.ReadArrayStart() - if yyl4094 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl4094, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *LimitRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys4095Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4095Slc - var yyhl4095 bool = l >= 0 - for yyj4095 := 0; ; yyj4095++ { - if yyhl4095 { - if yyj4095 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4095Slc = r.DecodeBytes(yys4095Slc, true, true) - yys4095 := string(yys4095Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4095 { - case "kind": - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - case "apiVersion": - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - case "metadata": - if r.TryDecodeAsNil() { - x.ObjectMeta = ObjectMeta{} - } else { - yyv4098 := &x.ObjectMeta - yyv4098.CodecDecodeSelf(d) - } - case "spec": - if r.TryDecodeAsNil() { - x.Spec = LimitRangeSpec{} - } else { - yyv4099 := &x.Spec - yyv4099.CodecDecodeSelf(d) - } - default: - z.DecStructFieldNotFound(-1, yys4095) - } // end switch yys4095 - } // end for yyj4095 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *LimitRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj4100 int - var yyb4100 bool - var yyhl4100 bool = l >= 0 - yyj4100++ - if yyhl4100 { - yyb4100 = yyj4100 > l - } else { - yyb4100 = r.CheckBreak() - } - if yyb4100 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - yyj4100++ - if yyhl4100 { - yyb4100 = yyj4100 > l - } else { - yyb4100 = r.CheckBreak() - } - if yyb4100 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - yyj4100++ - if yyhl4100 { - yyb4100 = yyj4100 > l - } else { - yyb4100 = r.CheckBreak() - } - if yyb4100 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ObjectMeta = ObjectMeta{} - } else { - yyv4103 := &x.ObjectMeta - yyv4103.CodecDecodeSelf(d) - } - yyj4100++ - if yyhl4100 { - yyb4100 = yyj4100 > l - } else { - yyb4100 = r.CheckBreak() - } - if yyb4100 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Spec = LimitRangeSpec{} - } else { - yyv4104 := &x.Spec - yyv4104.CodecDecodeSelf(d) - } - for { - yyj4100++ - if yyhl4100 { - yyb4100 = yyj4100 > l - } else { - yyb4100 = r.CheckBreak() - } - if yyb4100 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4100-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym4105 := z.EncBinary() - _ = yym4105 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep4106 := !z.EncBinary() - yy2arr4106 := z.EncBasicHandle().StructToArray - var yyq4106 [4]bool - _, _, _ = yysep4106, yyq4106, yy2arr4106 - const yyr4106 bool = false - yyq4106[0] = x.Kind != "" - yyq4106[1] = x.APIVersion != "" - yyq4106[2] = true - var yynn4106 int - if yyr4106 || yy2arr4106 { - r.EncodeArrayStart(4) - } else { - yynn4106 = 1 - for _, b := range yyq4106 { - if b { - yynn4106++ - } - } - r.EncodeMapStart(yynn4106) - yynn4106 = 0 - } - if yyr4106 || yy2arr4106 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4106[0] { - yym4108 := z.EncBinary() - _ = yym4108 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4106[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kind")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4109 := z.EncBinary() - _ = yym4109 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } - } - if yyr4106 || yy2arr4106 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4106[1] { - yym4111 := z.EncBinary() - _ = yym4111 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4106[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4112 := z.EncBinary() - _ = yym4112 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } - } - if yyr4106 || yy2arr4106 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4106[2] { - yy4114 := &x.ListMeta - yym4115 := z.EncBinary() - _ = yym4115 - if false { - } else if z.HasExtensions() && z.EncExt(yy4114) { - } else { - z.EncFallback(yy4114) - } - } else { - r.EncodeNil() - } - } else { - if yyq4106[2] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("metadata")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4116 := &x.ListMeta - yym4117 := z.EncBinary() - _ = yym4117 - if false { - } else if z.HasExtensions() && z.EncExt(yy4116) { - } else { - z.EncFallback(yy4116) - } - } - } - if yyr4106 || yy2arr4106 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4119 := z.EncBinary() - _ = yym4119 + yym4093 := z.EncBinary() + _ = yym4093 if false { } else { h.encSliceLimitRange(([]LimitRange)(x.Items), e) @@ -51644,15 +51345,15 @@ func (x *LimitRangeList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4120 := z.EncBinary() - _ = yym4120 + yym4094 := z.EncBinary() + _ = yym4094 if false { } else { h.encSliceLimitRange(([]LimitRange)(x.Items), e) } } } - if yyr4106 || yy2arr4106 { + if yyr4080 || yy2arr4080 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -51665,25 +51366,25 @@ func (x *LimitRangeList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4121 := z.DecBinary() - _ = yym4121 + yym4095 := z.DecBinary() + _ = yym4095 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4122 := r.ContainerType() - if yyct4122 == codecSelferValueTypeMap1234 { - yyl4122 := r.ReadMapStart() - if yyl4122 == 0 { + yyct4096 := r.ContainerType() + if yyct4096 == codecSelferValueTypeMap1234 { + yyl4096 := r.ReadMapStart() + if yyl4096 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4122, d) + x.codecDecodeSelfFromMap(yyl4096, d) } - } else if yyct4122 == codecSelferValueTypeArray1234 { - yyl4122 := r.ReadArrayStart() - if yyl4122 == 0 { + } else if yyct4096 == codecSelferValueTypeArray1234 { + yyl4096 := r.ReadArrayStart() + if yyl4096 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4122, d) + x.codecDecodeSelfFromArray(yyl4096, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -51695,12 +51396,12 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4123Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4123Slc - var yyhl4123 bool = l >= 0 - for yyj4123 := 0; ; yyj4123++ { - if yyhl4123 { - if yyj4123 >= l { + var yys4097Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4097Slc + var yyhl4097 bool = l >= 0 + for yyj4097 := 0; ; yyj4097++ { + if yyhl4097 { + if yyj4097 >= l { break } } else { @@ -51709,10 +51410,10 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4123Slc = r.DecodeBytes(yys4123Slc, true, true) - yys4123 := string(yys4123Slc) + yys4097Slc = r.DecodeBytes(yys4097Slc, true, true) + yys4097 := string(yys4097Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4123 { + switch yys4097 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -51727,33 +51428,33 @@ func (x *LimitRangeList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4126 := &x.ListMeta - yym4127 := z.DecBinary() - _ = yym4127 + yyv4100 := &x.ListMeta + yym4101 := z.DecBinary() + _ = yym4101 if false { - } else if z.HasExtensions() && z.DecExt(yyv4126) { + } else if z.HasExtensions() && z.DecExt(yyv4100) { } else { - z.DecFallback(yyv4126, false) + z.DecFallback(yyv4100, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4128 := &x.Items - yym4129 := z.DecBinary() - _ = yym4129 + yyv4102 := &x.Items + yym4103 := z.DecBinary() + _ = yym4103 if false { } else { - h.decSliceLimitRange((*[]LimitRange)(yyv4128), d) + h.decSliceLimitRange((*[]LimitRange)(yyv4102), d) } } default: - z.DecStructFieldNotFound(-1, yys4123) - } // end switch yys4123 - } // end for yyj4123 + z.DecStructFieldNotFound(-1, yys4097) + } // end switch yys4097 + } // end for yyj4097 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -51761,16 +51462,16 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4130 int - var yyb4130 bool - var yyhl4130 bool = l >= 0 - yyj4130++ - if yyhl4130 { - yyb4130 = yyj4130 > l + var yyj4104 int + var yyb4104 bool + var yyhl4104 bool = l >= 0 + yyj4104++ + if yyhl4104 { + yyb4104 = yyj4104 > l } else { - yyb4130 = r.CheckBreak() + yyb4104 = r.CheckBreak() } - if yyb4130 { + if yyb4104 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -51780,13 +51481,13 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4130++ - if yyhl4130 { - yyb4130 = yyj4130 > l + yyj4104++ + if yyhl4104 { + yyb4104 = yyj4104 > l } else { - yyb4130 = r.CheckBreak() + yyb4104 = r.CheckBreak() } - if yyb4130 { + if yyb4104 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -51796,36 +51497,36 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4130++ - if yyhl4130 { - yyb4130 = yyj4130 > l + yyj4104++ + if yyhl4104 { + yyb4104 = yyj4104 > l } else { - yyb4130 = r.CheckBreak() + yyb4104 = r.CheckBreak() } - if yyb4130 { + if yyb4104 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4133 := &x.ListMeta - yym4134 := z.DecBinary() - _ = yym4134 + yyv4107 := &x.ListMeta + yym4108 := z.DecBinary() + _ = yym4108 if false { - } else if z.HasExtensions() && z.DecExt(yyv4133) { + } else if z.HasExtensions() && z.DecExt(yyv4107) { } else { - z.DecFallback(yyv4133, false) + z.DecFallback(yyv4107, false) } } - yyj4130++ - if yyhl4130 { - yyb4130 = yyj4130 > l + yyj4104++ + if yyhl4104 { + yyb4104 = yyj4104 > l } else { - yyb4130 = r.CheckBreak() + yyb4104 = r.CheckBreak() } - if yyb4130 { + if yyb4104 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -51833,26 +51534,26 @@ func (x *LimitRangeList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4135 := &x.Items - yym4136 := z.DecBinary() - _ = yym4136 + yyv4109 := &x.Items + yym4110 := z.DecBinary() + _ = yym4110 if false { } else { - h.decSliceLimitRange((*[]LimitRange)(yyv4135), d) + h.decSliceLimitRange((*[]LimitRange)(yyv4109), d) } } for { - yyj4130++ - if yyhl4130 { - yyb4130 = yyj4130 > l + yyj4104++ + if yyhl4104 { + yyb4104 = yyj4104 > l } else { - yyb4130 = r.CheckBreak() + yyb4104 = r.CheckBreak() } - if yyb4130 { + if yyb4104 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4130-1, "") + z.DecStructFieldNotFound(yyj4104-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -51861,8 +51562,8 @@ func (x ResourceQuotaScope) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym4137 := z.EncBinary() - _ = yym4137 + yym4111 := z.EncBinary() + _ = yym4111 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -51874,8 +51575,8 @@ func (x *ResourceQuotaScope) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4138 := z.DecBinary() - _ = yym4138 + yym4112 := z.DecBinary() + _ = yym4112 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -51890,34 +51591,34 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4139 := z.EncBinary() - _ = yym4139 + yym4113 := z.EncBinary() + _ = yym4113 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4140 := !z.EncBinary() - yy2arr4140 := z.EncBasicHandle().StructToArray - var yyq4140 [2]bool - _, _, _ = yysep4140, yyq4140, yy2arr4140 - const yyr4140 bool = false - yyq4140[0] = len(x.Hard) != 0 - yyq4140[1] = len(x.Scopes) != 0 - var yynn4140 int - if yyr4140 || yy2arr4140 { + yysep4114 := !z.EncBinary() + yy2arr4114 := z.EncBasicHandle().StructToArray + var yyq4114 [2]bool + _, _, _ = yysep4114, yyq4114, yy2arr4114 + const yyr4114 bool = false + yyq4114[0] = len(x.Hard) != 0 + yyq4114[1] = len(x.Scopes) != 0 + var yynn4114 int + if yyr4114 || yy2arr4114 { r.EncodeArrayStart(2) } else { - yynn4140 = 0 - for _, b := range yyq4140 { + yynn4114 = 0 + for _, b := range yyq4114 { if b { - yynn4140++ + yynn4114++ } } - r.EncodeMapStart(yynn4140) - yynn4140 = 0 + r.EncodeMapStart(yynn4114) + yynn4114 = 0 } - if yyr4140 || yy2arr4140 { + if yyr4114 || yy2arr4114 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4140[0] { + if yyq4114[0] { if x.Hard == nil { r.EncodeNil() } else { @@ -51927,7 +51628,7 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4140[0] { + if yyq4114[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hard")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -51938,14 +51639,14 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4140 || yy2arr4140 { + if yyr4114 || yy2arr4114 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4140[1] { + if yyq4114[1] { if x.Scopes == nil { r.EncodeNil() } else { - yym4143 := z.EncBinary() - _ = yym4143 + yym4117 := z.EncBinary() + _ = yym4117 if false { } else { h.encSliceResourceQuotaScope(([]ResourceQuotaScope)(x.Scopes), e) @@ -51955,15 +51656,15 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4140[1] { + if yyq4114[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("scopes")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Scopes == nil { r.EncodeNil() } else { - yym4144 := z.EncBinary() - _ = yym4144 + yym4118 := z.EncBinary() + _ = yym4118 if false { } else { h.encSliceResourceQuotaScope(([]ResourceQuotaScope)(x.Scopes), e) @@ -51971,7 +51672,7 @@ func (x *ResourceQuotaSpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4140 || yy2arr4140 { + if yyr4114 || yy2arr4114 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -51984,25 +51685,25 @@ func (x *ResourceQuotaSpec) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4145 := z.DecBinary() - _ = yym4145 + yym4119 := z.DecBinary() + _ = yym4119 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4146 := r.ContainerType() - if yyct4146 == codecSelferValueTypeMap1234 { - yyl4146 := r.ReadMapStart() - if yyl4146 == 0 { + yyct4120 := r.ContainerType() + if yyct4120 == codecSelferValueTypeMap1234 { + yyl4120 := r.ReadMapStart() + if yyl4120 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4146, d) + x.codecDecodeSelfFromMap(yyl4120, d) } - } else if yyct4146 == codecSelferValueTypeArray1234 { - yyl4146 := r.ReadArrayStart() - if yyl4146 == 0 { + } else if yyct4120 == codecSelferValueTypeArray1234 { + yyl4120 := r.ReadArrayStart() + if yyl4120 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4146, d) + x.codecDecodeSelfFromArray(yyl4120, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -52014,12 +51715,12 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4147Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4147Slc - var yyhl4147 bool = l >= 0 - for yyj4147 := 0; ; yyj4147++ { - if yyhl4147 { - if yyj4147 >= l { + var yys4121Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4121Slc + var yyhl4121 bool = l >= 0 + for yyj4121 := 0; ; yyj4121++ { + if yyhl4121 { + if yyj4121 >= l { break } } else { @@ -52028,33 +51729,33 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4147Slc = r.DecodeBytes(yys4147Slc, true, true) - yys4147 := string(yys4147Slc) + yys4121Slc = r.DecodeBytes(yys4121Slc, true, true) + yys4121 := string(yys4121Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4147 { + switch yys4121 { case "hard": if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv4148 := &x.Hard - yyv4148.CodecDecodeSelf(d) + yyv4122 := &x.Hard + yyv4122.CodecDecodeSelf(d) } case "scopes": if r.TryDecodeAsNil() { x.Scopes = nil } else { - yyv4149 := &x.Scopes - yym4150 := z.DecBinary() - _ = yym4150 + yyv4123 := &x.Scopes + yym4124 := z.DecBinary() + _ = yym4124 if false { } else { - h.decSliceResourceQuotaScope((*[]ResourceQuotaScope)(yyv4149), d) + h.decSliceResourceQuotaScope((*[]ResourceQuotaScope)(yyv4123), d) } } default: - z.DecStructFieldNotFound(-1, yys4147) - } // end switch yys4147 - } // end for yyj4147 + z.DecStructFieldNotFound(-1, yys4121) + } // end switch yys4121 + } // end for yyj4121 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -52062,16 +51763,16 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4151 int - var yyb4151 bool - var yyhl4151 bool = l >= 0 - yyj4151++ - if yyhl4151 { - yyb4151 = yyj4151 > l + var yyj4125 int + var yyb4125 bool + var yyhl4125 bool = l >= 0 + yyj4125++ + if yyhl4125 { + yyb4125 = yyj4125 > l } else { - yyb4151 = r.CheckBreak() + yyb4125 = r.CheckBreak() } - if yyb4151 { + if yyb4125 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52079,16 +51780,16 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv4152 := &x.Hard - yyv4152.CodecDecodeSelf(d) + yyv4126 := &x.Hard + yyv4126.CodecDecodeSelf(d) } - yyj4151++ - if yyhl4151 { - yyb4151 = yyj4151 > l + yyj4125++ + if yyhl4125 { + yyb4125 = yyj4125 > l } else { - yyb4151 = r.CheckBreak() + yyb4125 = r.CheckBreak() } - if yyb4151 { + if yyb4125 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52096,26 +51797,26 @@ func (x *ResourceQuotaSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Scopes = nil } else { - yyv4153 := &x.Scopes - yym4154 := z.DecBinary() - _ = yym4154 + yyv4127 := &x.Scopes + yym4128 := z.DecBinary() + _ = yym4128 if false { } else { - h.decSliceResourceQuotaScope((*[]ResourceQuotaScope)(yyv4153), d) + h.decSliceResourceQuotaScope((*[]ResourceQuotaScope)(yyv4127), d) } } for { - yyj4151++ - if yyhl4151 { - yyb4151 = yyj4151 > l + yyj4125++ + if yyhl4125 { + yyb4125 = yyj4125 > l } else { - yyb4151 = r.CheckBreak() + yyb4125 = r.CheckBreak() } - if yyb4151 { + if yyb4125 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4151-1, "") + z.DecStructFieldNotFound(yyj4125-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -52127,34 +51828,34 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4155 := z.EncBinary() - _ = yym4155 + yym4129 := z.EncBinary() + _ = yym4129 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4156 := !z.EncBinary() - yy2arr4156 := z.EncBasicHandle().StructToArray - var yyq4156 [2]bool - _, _, _ = yysep4156, yyq4156, yy2arr4156 - const yyr4156 bool = false - yyq4156[0] = len(x.Hard) != 0 - yyq4156[1] = len(x.Used) != 0 - var yynn4156 int - if yyr4156 || yy2arr4156 { + yysep4130 := !z.EncBinary() + yy2arr4130 := z.EncBasicHandle().StructToArray + var yyq4130 [2]bool + _, _, _ = yysep4130, yyq4130, yy2arr4130 + const yyr4130 bool = false + yyq4130[0] = len(x.Hard) != 0 + yyq4130[1] = len(x.Used) != 0 + var yynn4130 int + if yyr4130 || yy2arr4130 { r.EncodeArrayStart(2) } else { - yynn4156 = 0 - for _, b := range yyq4156 { + yynn4130 = 0 + for _, b := range yyq4130 { if b { - yynn4156++ + yynn4130++ } } - r.EncodeMapStart(yynn4156) - yynn4156 = 0 + r.EncodeMapStart(yynn4130) + yynn4130 = 0 } - if yyr4156 || yy2arr4156 { + if yyr4130 || yy2arr4130 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4156[0] { + if yyq4130[0] { if x.Hard == nil { r.EncodeNil() } else { @@ -52164,7 +51865,7 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4156[0] { + if yyq4130[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hard")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -52175,9 +51876,9 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4156 || yy2arr4156 { + if yyr4130 || yy2arr4130 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4156[1] { + if yyq4130[1] { if x.Used == nil { r.EncodeNil() } else { @@ -52187,7 +51888,7 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4156[1] { + if yyq4130[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("used")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -52198,7 +51899,7 @@ func (x *ResourceQuotaStatus) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4156 || yy2arr4156 { + if yyr4130 || yy2arr4130 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -52211,25 +51912,25 @@ func (x *ResourceQuotaStatus) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4159 := z.DecBinary() - _ = yym4159 + yym4133 := z.DecBinary() + _ = yym4133 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4160 := r.ContainerType() - if yyct4160 == codecSelferValueTypeMap1234 { - yyl4160 := r.ReadMapStart() - if yyl4160 == 0 { + yyct4134 := r.ContainerType() + if yyct4134 == codecSelferValueTypeMap1234 { + yyl4134 := r.ReadMapStart() + if yyl4134 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4160, d) + x.codecDecodeSelfFromMap(yyl4134, d) } - } else if yyct4160 == codecSelferValueTypeArray1234 { - yyl4160 := r.ReadArrayStart() - if yyl4160 == 0 { + } else if yyct4134 == codecSelferValueTypeArray1234 { + yyl4134 := r.ReadArrayStart() + if yyl4134 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4160, d) + x.codecDecodeSelfFromArray(yyl4134, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -52241,12 +51942,12 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4161Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4161Slc - var yyhl4161 bool = l >= 0 - for yyj4161 := 0; ; yyj4161++ { - if yyhl4161 { - if yyj4161 >= l { + var yys4135Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4135Slc + var yyhl4135 bool = l >= 0 + for yyj4135 := 0; ; yyj4135++ { + if yyhl4135 { + if yyj4135 >= l { break } } else { @@ -52255,28 +51956,28 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4161Slc = r.DecodeBytes(yys4161Slc, true, true) - yys4161 := string(yys4161Slc) + yys4135Slc = r.DecodeBytes(yys4135Slc, true, true) + yys4135 := string(yys4135Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4161 { + switch yys4135 { case "hard": if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv4162 := &x.Hard - yyv4162.CodecDecodeSelf(d) + yyv4136 := &x.Hard + yyv4136.CodecDecodeSelf(d) } case "used": if r.TryDecodeAsNil() { x.Used = nil } else { - yyv4163 := &x.Used - yyv4163.CodecDecodeSelf(d) + yyv4137 := &x.Used + yyv4137.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys4161) - } // end switch yys4161 - } // end for yyj4161 + z.DecStructFieldNotFound(-1, yys4135) + } // end switch yys4135 + } // end for yyj4135 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -52284,16 +51985,16 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4164 int - var yyb4164 bool - var yyhl4164 bool = l >= 0 - yyj4164++ - if yyhl4164 { - yyb4164 = yyj4164 > l + var yyj4138 int + var yyb4138 bool + var yyhl4138 bool = l >= 0 + yyj4138++ + if yyhl4138 { + yyb4138 = yyj4138 > l } else { - yyb4164 = r.CheckBreak() + yyb4138 = r.CheckBreak() } - if yyb4164 { + if yyb4138 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52301,16 +52002,16 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Hard = nil } else { - yyv4165 := &x.Hard - yyv4165.CodecDecodeSelf(d) + yyv4139 := &x.Hard + yyv4139.CodecDecodeSelf(d) } - yyj4164++ - if yyhl4164 { - yyb4164 = yyj4164 > l + yyj4138++ + if yyhl4138 { + yyb4138 = yyj4138 > l } else { - yyb4164 = r.CheckBreak() + yyb4138 = r.CheckBreak() } - if yyb4164 { + if yyb4138 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52318,21 +52019,21 @@ func (x *ResourceQuotaStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.Used = nil } else { - yyv4166 := &x.Used - yyv4166.CodecDecodeSelf(d) + yyv4140 := &x.Used + yyv4140.CodecDecodeSelf(d) } for { - yyj4164++ - if yyhl4164 { - yyb4164 = yyj4164 > l + yyj4138++ + if yyhl4138 { + yyb4138 = yyj4138 > l } else { - yyb4164 = r.CheckBreak() + yyb4138 = r.CheckBreak() } - if yyb4164 { + if yyb4138 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4164-1, "") + z.DecStructFieldNotFound(yyj4138-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -52344,39 +52045,39 @@ func (x *ResourceQuota) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4167 := z.EncBinary() - _ = yym4167 + yym4141 := z.EncBinary() + _ = yym4141 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4168 := !z.EncBinary() - yy2arr4168 := z.EncBasicHandle().StructToArray - var yyq4168 [5]bool - _, _, _ = yysep4168, yyq4168, yy2arr4168 - const yyr4168 bool = false - yyq4168[0] = x.Kind != "" - yyq4168[1] = x.APIVersion != "" - yyq4168[2] = true - yyq4168[3] = true - yyq4168[4] = true - var yynn4168 int - if yyr4168 || yy2arr4168 { + yysep4142 := !z.EncBinary() + yy2arr4142 := z.EncBasicHandle().StructToArray + var yyq4142 [5]bool + _, _, _ = yysep4142, yyq4142, yy2arr4142 + const yyr4142 bool = false + yyq4142[0] = x.Kind != "" + yyq4142[1] = x.APIVersion != "" + yyq4142[2] = true + yyq4142[3] = true + yyq4142[4] = true + var yynn4142 int + if yyr4142 || yy2arr4142 { r.EncodeArrayStart(5) } else { - yynn4168 = 0 - for _, b := range yyq4168 { + yynn4142 = 0 + for _, b := range yyq4142 { if b { - yynn4168++ + yynn4142++ } } - r.EncodeMapStart(yynn4168) - yynn4168 = 0 + r.EncodeMapStart(yynn4142) + yynn4142 = 0 } - if yyr4168 || yy2arr4168 { + if yyr4142 || yy2arr4142 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4168[0] { - yym4170 := z.EncBinary() - _ = yym4170 + if yyq4142[0] { + yym4144 := z.EncBinary() + _ = yym4144 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -52385,23 +52086,23 @@ func (x *ResourceQuota) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4168[0] { + if yyq4142[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4171 := z.EncBinary() - _ = yym4171 + yym4145 := z.EncBinary() + _ = yym4145 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4168 || yy2arr4168 { + if yyr4142 || yy2arr4142 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4168[1] { - yym4173 := z.EncBinary() - _ = yym4173 + if yyq4142[1] { + yym4147 := z.EncBinary() + _ = yym4147 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -52410,70 +52111,70 @@ func (x *ResourceQuota) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4168[1] { + if yyq4142[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4174 := z.EncBinary() - _ = yym4174 + yym4148 := z.EncBinary() + _ = yym4148 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4168 || yy2arr4168 { + if yyr4142 || yy2arr4142 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4168[2] { - yy4176 := &x.ObjectMeta - yy4176.CodecEncodeSelf(e) + if yyq4142[2] { + yy4150 := &x.ObjectMeta + yy4150.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4168[2] { + if yyq4142[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4177 := &x.ObjectMeta - yy4177.CodecEncodeSelf(e) + yy4151 := &x.ObjectMeta + yy4151.CodecEncodeSelf(e) } } - if yyr4168 || yy2arr4168 { + if yyr4142 || yy2arr4142 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4168[3] { - yy4179 := &x.Spec - yy4179.CodecEncodeSelf(e) + if yyq4142[3] { + yy4153 := &x.Spec + yy4153.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4168[3] { + if yyq4142[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("spec")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4180 := &x.Spec - yy4180.CodecEncodeSelf(e) + yy4154 := &x.Spec + yy4154.CodecEncodeSelf(e) } } - if yyr4168 || yy2arr4168 { + if yyr4142 || yy2arr4142 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4168[4] { - yy4182 := &x.Status - yy4182.CodecEncodeSelf(e) + if yyq4142[4] { + yy4156 := &x.Status + yy4156.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4168[4] { + if yyq4142[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("status")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4183 := &x.Status - yy4183.CodecEncodeSelf(e) + yy4157 := &x.Status + yy4157.CodecEncodeSelf(e) } } - if yyr4168 || yy2arr4168 { + if yyr4142 || yy2arr4142 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -52486,25 +52187,25 @@ func (x *ResourceQuota) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4184 := z.DecBinary() - _ = yym4184 + yym4158 := z.DecBinary() + _ = yym4158 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4185 := r.ContainerType() - if yyct4185 == codecSelferValueTypeMap1234 { - yyl4185 := r.ReadMapStart() - if yyl4185 == 0 { + yyct4159 := r.ContainerType() + if yyct4159 == codecSelferValueTypeMap1234 { + yyl4159 := r.ReadMapStart() + if yyl4159 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4185, d) + x.codecDecodeSelfFromMap(yyl4159, d) } - } else if yyct4185 == codecSelferValueTypeArray1234 { - yyl4185 := r.ReadArrayStart() - if yyl4185 == 0 { + } else if yyct4159 == codecSelferValueTypeArray1234 { + yyl4159 := r.ReadArrayStart() + if yyl4159 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4185, d) + x.codecDecodeSelfFromArray(yyl4159, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -52516,12 +52217,12 @@ func (x *ResourceQuota) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4186Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4186Slc - var yyhl4186 bool = l >= 0 - for yyj4186 := 0; ; yyj4186++ { - if yyhl4186 { - if yyj4186 >= l { + var yys4160Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4160Slc + var yyhl4160 bool = l >= 0 + for yyj4160 := 0; ; yyj4160++ { + if yyhl4160 { + if yyj4160 >= l { break } } else { @@ -52530,10 +52231,10 @@ func (x *ResourceQuota) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4186Slc = r.DecodeBytes(yys4186Slc, true, true) - yys4186 := string(yys4186Slc) + yys4160Slc = r.DecodeBytes(yys4160Slc, true, true) + yys4160 := string(yys4160Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4186 { + switch yys4160 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -52550,27 +52251,27 @@ func (x *ResourceQuota) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4189 := &x.ObjectMeta - yyv4189.CodecDecodeSelf(d) + yyv4163 := &x.ObjectMeta + yyv4163.CodecDecodeSelf(d) } case "spec": if r.TryDecodeAsNil() { x.Spec = ResourceQuotaSpec{} } else { - yyv4190 := &x.Spec - yyv4190.CodecDecodeSelf(d) + yyv4164 := &x.Spec + yyv4164.CodecDecodeSelf(d) } case "status": if r.TryDecodeAsNil() { x.Status = ResourceQuotaStatus{} } else { - yyv4191 := &x.Status - yyv4191.CodecDecodeSelf(d) + yyv4165 := &x.Status + yyv4165.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys4186) - } // end switch yys4186 - } // end for yyj4186 + z.DecStructFieldNotFound(-1, yys4160) + } // end switch yys4160 + } // end for yyj4160 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -52578,16 +52279,16 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4192 int - var yyb4192 bool - var yyhl4192 bool = l >= 0 - yyj4192++ - if yyhl4192 { - yyb4192 = yyj4192 > l + var yyj4166 int + var yyb4166 bool + var yyhl4166 bool = l >= 0 + yyj4166++ + if yyhl4166 { + yyb4166 = yyj4166 > l } else { - yyb4192 = r.CheckBreak() + yyb4166 = r.CheckBreak() } - if yyb4192 { + if yyb4166 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52597,13 +52298,13 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4192++ - if yyhl4192 { - yyb4192 = yyj4192 > l + yyj4166++ + if yyhl4166 { + yyb4166 = yyj4166 > l } else { - yyb4192 = r.CheckBreak() + yyb4166 = r.CheckBreak() } - if yyb4192 { + if yyb4166 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52613,13 +52314,13 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4192++ - if yyhl4192 { - yyb4192 = yyj4192 > l + yyj4166++ + if yyhl4166 { + yyb4166 = yyj4166 > l } else { - yyb4192 = r.CheckBreak() + yyb4166 = r.CheckBreak() } - if yyb4192 { + if yyb4166 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52627,16 +52328,16 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4195 := &x.ObjectMeta - yyv4195.CodecDecodeSelf(d) + yyv4169 := &x.ObjectMeta + yyv4169.CodecDecodeSelf(d) } - yyj4192++ - if yyhl4192 { - yyb4192 = yyj4192 > l + yyj4166++ + if yyhl4166 { + yyb4166 = yyj4166 > l } else { - yyb4192 = r.CheckBreak() + yyb4166 = r.CheckBreak() } - if yyb4192 { + if yyb4166 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52644,16 +52345,16 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Spec = ResourceQuotaSpec{} } else { - yyv4196 := &x.Spec - yyv4196.CodecDecodeSelf(d) + yyv4170 := &x.Spec + yyv4170.CodecDecodeSelf(d) } - yyj4192++ - if yyhl4192 { - yyb4192 = yyj4192 > l + yyj4166++ + if yyhl4166 { + yyb4166 = yyj4166 > l } else { - yyb4192 = r.CheckBreak() + yyb4166 = r.CheckBreak() } - if yyb4192 { + if yyb4166 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52661,21 +52362,21 @@ func (x *ResourceQuota) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Status = ResourceQuotaStatus{} } else { - yyv4197 := &x.Status - yyv4197.CodecDecodeSelf(d) + yyv4171 := &x.Status + yyv4171.CodecDecodeSelf(d) } for { - yyj4192++ - if yyhl4192 { - yyb4192 = yyj4192 > l + yyj4166++ + if yyhl4166 { + yyb4166 = yyj4166 > l } else { - yyb4192 = r.CheckBreak() + yyb4166 = r.CheckBreak() } - if yyb4192 { + if yyb4166 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4192-1, "") + z.DecStructFieldNotFound(yyj4166-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -52687,37 +52388,37 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4198 := z.EncBinary() - _ = yym4198 + yym4172 := z.EncBinary() + _ = yym4172 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4199 := !z.EncBinary() - yy2arr4199 := z.EncBasicHandle().StructToArray - var yyq4199 [4]bool - _, _, _ = yysep4199, yyq4199, yy2arr4199 - const yyr4199 bool = false - yyq4199[0] = x.Kind != "" - yyq4199[1] = x.APIVersion != "" - yyq4199[2] = true - var yynn4199 int - if yyr4199 || yy2arr4199 { + yysep4173 := !z.EncBinary() + yy2arr4173 := z.EncBasicHandle().StructToArray + var yyq4173 [4]bool + _, _, _ = yysep4173, yyq4173, yy2arr4173 + const yyr4173 bool = false + yyq4173[0] = x.Kind != "" + yyq4173[1] = x.APIVersion != "" + yyq4173[2] = true + var yynn4173 int + if yyr4173 || yy2arr4173 { r.EncodeArrayStart(4) } else { - yynn4199 = 1 - for _, b := range yyq4199 { + yynn4173 = 1 + for _, b := range yyq4173 { if b { - yynn4199++ + yynn4173++ } } - r.EncodeMapStart(yynn4199) - yynn4199 = 0 + r.EncodeMapStart(yynn4173) + yynn4173 = 0 } - if yyr4199 || yy2arr4199 { + if yyr4173 || yy2arr4173 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4199[0] { - yym4201 := z.EncBinary() - _ = yym4201 + if yyq4173[0] { + yym4175 := z.EncBinary() + _ = yym4175 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -52726,23 +52427,23 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4199[0] { + if yyq4173[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4202 := z.EncBinary() - _ = yym4202 + yym4176 := z.EncBinary() + _ = yym4176 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4199 || yy2arr4199 { + if yyr4173 || yy2arr4173 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4199[1] { - yym4204 := z.EncBinary() - _ = yym4204 + if yyq4173[1] { + yym4178 := z.EncBinary() + _ = yym4178 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -52751,54 +52452,54 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4199[1] { + if yyq4173[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4205 := z.EncBinary() - _ = yym4205 + yym4179 := z.EncBinary() + _ = yym4179 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4199 || yy2arr4199 { + if yyr4173 || yy2arr4173 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4199[2] { - yy4207 := &x.ListMeta - yym4208 := z.EncBinary() - _ = yym4208 + if yyq4173[2] { + yy4181 := &x.ListMeta + yym4182 := z.EncBinary() + _ = yym4182 if false { - } else if z.HasExtensions() && z.EncExt(yy4207) { + } else if z.HasExtensions() && z.EncExt(yy4181) { } else { - z.EncFallback(yy4207) + z.EncFallback(yy4181) } } else { r.EncodeNil() } } else { - if yyq4199[2] { + if yyq4173[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4209 := &x.ListMeta - yym4210 := z.EncBinary() - _ = yym4210 + yy4183 := &x.ListMeta + yym4184 := z.EncBinary() + _ = yym4184 if false { - } else if z.HasExtensions() && z.EncExt(yy4209) { + } else if z.HasExtensions() && z.EncExt(yy4183) { } else { - z.EncFallback(yy4209) + z.EncFallback(yy4183) } } } - if yyr4199 || yy2arr4199 { + if yyr4173 || yy2arr4173 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4212 := z.EncBinary() - _ = yym4212 + yym4186 := z.EncBinary() + _ = yym4186 if false { } else { h.encSliceResourceQuota(([]ResourceQuota)(x.Items), e) @@ -52811,15 +52512,15 @@ func (x *ResourceQuotaList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4213 := z.EncBinary() - _ = yym4213 + yym4187 := z.EncBinary() + _ = yym4187 if false { } else { h.encSliceResourceQuota(([]ResourceQuota)(x.Items), e) } } } - if yyr4199 || yy2arr4199 { + if yyr4173 || yy2arr4173 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -52832,25 +52533,25 @@ func (x *ResourceQuotaList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4214 := z.DecBinary() - _ = yym4214 + yym4188 := z.DecBinary() + _ = yym4188 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4215 := r.ContainerType() - if yyct4215 == codecSelferValueTypeMap1234 { - yyl4215 := r.ReadMapStart() - if yyl4215 == 0 { + yyct4189 := r.ContainerType() + if yyct4189 == codecSelferValueTypeMap1234 { + yyl4189 := r.ReadMapStart() + if yyl4189 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4215, d) + x.codecDecodeSelfFromMap(yyl4189, d) } - } else if yyct4215 == codecSelferValueTypeArray1234 { - yyl4215 := r.ReadArrayStart() - if yyl4215 == 0 { + } else if yyct4189 == codecSelferValueTypeArray1234 { + yyl4189 := r.ReadArrayStart() + if yyl4189 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4215, d) + x.codecDecodeSelfFromArray(yyl4189, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -52862,12 +52563,12 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4216Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4216Slc - var yyhl4216 bool = l >= 0 - for yyj4216 := 0; ; yyj4216++ { - if yyhl4216 { - if yyj4216 >= l { + var yys4190Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4190Slc + var yyhl4190 bool = l >= 0 + for yyj4190 := 0; ; yyj4190++ { + if yyhl4190 { + if yyj4190 >= l { break } } else { @@ -52876,10 +52577,10 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4216Slc = r.DecodeBytes(yys4216Slc, true, true) - yys4216 := string(yys4216Slc) + yys4190Slc = r.DecodeBytes(yys4190Slc, true, true) + yys4190 := string(yys4190Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4216 { + switch yys4190 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -52894,33 +52595,33 @@ func (x *ResourceQuotaList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4219 := &x.ListMeta - yym4220 := z.DecBinary() - _ = yym4220 + yyv4193 := &x.ListMeta + yym4194 := z.DecBinary() + _ = yym4194 if false { - } else if z.HasExtensions() && z.DecExt(yyv4219) { + } else if z.HasExtensions() && z.DecExt(yyv4193) { } else { - z.DecFallback(yyv4219, false) + z.DecFallback(yyv4193, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4221 := &x.Items - yym4222 := z.DecBinary() - _ = yym4222 + yyv4195 := &x.Items + yym4196 := z.DecBinary() + _ = yym4196 if false { } else { - h.decSliceResourceQuota((*[]ResourceQuota)(yyv4221), d) + h.decSliceResourceQuota((*[]ResourceQuota)(yyv4195), d) } } default: - z.DecStructFieldNotFound(-1, yys4216) - } // end switch yys4216 - } // end for yyj4216 + z.DecStructFieldNotFound(-1, yys4190) + } // end switch yys4190 + } // end for yyj4190 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -52928,16 +52629,16 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4223 int - var yyb4223 bool - var yyhl4223 bool = l >= 0 - yyj4223++ - if yyhl4223 { - yyb4223 = yyj4223 > l + var yyj4197 int + var yyb4197 bool + var yyhl4197 bool = l >= 0 + yyj4197++ + if yyhl4197 { + yyb4197 = yyj4197 > l } else { - yyb4223 = r.CheckBreak() + yyb4197 = r.CheckBreak() } - if yyb4223 { + if yyb4197 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52947,13 +52648,13 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.Kind = string(r.DecodeString()) } - yyj4223++ - if yyhl4223 { - yyb4223 = yyj4223 > l + yyj4197++ + if yyhl4197 { + yyb4197 = yyj4197 > l } else { - yyb4223 = r.CheckBreak() + yyb4197 = r.CheckBreak() } - if yyb4223 { + if yyb4197 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -52963,36 +52664,36 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.APIVersion = string(r.DecodeString()) } - yyj4223++ - if yyhl4223 { - yyb4223 = yyj4223 > l + yyj4197++ + if yyhl4197 { + yyb4197 = yyj4197 > l } else { - yyb4223 = r.CheckBreak() + yyb4197 = r.CheckBreak() } - if yyb4223 { + if yyb4197 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4226 := &x.ListMeta - yym4227 := z.DecBinary() - _ = yym4227 + yyv4200 := &x.ListMeta + yym4201 := z.DecBinary() + _ = yym4201 if false { - } else if z.HasExtensions() && z.DecExt(yyv4226) { + } else if z.HasExtensions() && z.DecExt(yyv4200) { } else { - z.DecFallback(yyv4226, false) + z.DecFallback(yyv4200, false) } } - yyj4223++ - if yyhl4223 { - yyb4223 = yyj4223 > l + yyj4197++ + if yyhl4197 { + yyb4197 = yyj4197 > l } else { - yyb4223 = r.CheckBreak() + yyb4197 = r.CheckBreak() } - if yyb4223 { + if yyb4197 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53000,26 +52701,26 @@ func (x *ResourceQuotaList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4228 := &x.Items - yym4229 := z.DecBinary() - _ = yym4229 + yyv4202 := &x.Items + yym4203 := z.DecBinary() + _ = yym4203 if false { } else { - h.decSliceResourceQuota((*[]ResourceQuota)(yyv4228), d) + h.decSliceResourceQuota((*[]ResourceQuota)(yyv4202), d) } } for { - yyj4223++ - if yyhl4223 { - yyb4223 = yyj4223 > l + yyj4197++ + if yyhl4197 { + yyb4197 = yyj4197 > l } else { - yyb4223 = r.CheckBreak() + yyb4197 = r.CheckBreak() } - if yyb4223 { + if yyb4197 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4223-1, "") + z.DecStructFieldNotFound(yyj4197-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -53031,40 +52732,40 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4230 := z.EncBinary() - _ = yym4230 + yym4204 := z.EncBinary() + _ = yym4204 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4231 := !z.EncBinary() - yy2arr4231 := z.EncBasicHandle().StructToArray - var yyq4231 [6]bool - _, _, _ = yysep4231, yyq4231, yy2arr4231 - const yyr4231 bool = false - yyq4231[0] = x.Kind != "" - yyq4231[1] = x.APIVersion != "" - yyq4231[2] = true - yyq4231[3] = len(x.Data) != 0 - yyq4231[4] = len(x.StringData) != 0 - yyq4231[5] = x.Type != "" - var yynn4231 int - if yyr4231 || yy2arr4231 { + yysep4205 := !z.EncBinary() + yy2arr4205 := z.EncBasicHandle().StructToArray + var yyq4205 [6]bool + _, _, _ = yysep4205, yyq4205, yy2arr4205 + const yyr4205 bool = false + yyq4205[0] = x.Kind != "" + yyq4205[1] = x.APIVersion != "" + yyq4205[2] = true + yyq4205[3] = len(x.Data) != 0 + yyq4205[4] = len(x.StringData) != 0 + yyq4205[5] = x.Type != "" + var yynn4205 int + if yyr4205 || yy2arr4205 { r.EncodeArrayStart(6) } else { - yynn4231 = 0 - for _, b := range yyq4231 { + yynn4205 = 0 + for _, b := range yyq4205 { if b { - yynn4231++ + yynn4205++ } } - r.EncodeMapStart(yynn4231) - yynn4231 = 0 + r.EncodeMapStart(yynn4205) + yynn4205 = 0 } - if yyr4231 || yy2arr4231 { + if yyr4205 || yy2arr4205 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4231[0] { - yym4233 := z.EncBinary() - _ = yym4233 + if yyq4205[0] { + yym4207 := z.EncBinary() + _ = yym4207 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -53073,23 +52774,23 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4231[0] { + if yyq4205[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4234 := z.EncBinary() - _ = yym4234 + yym4208 := z.EncBinary() + _ = yym4208 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4231 || yy2arr4231 { + if yyr4205 || yy2arr4205 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4231[1] { - yym4236 := z.EncBinary() - _ = yym4236 + if yyq4205[1] { + yym4210 := z.EncBinary() + _ = yym4210 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -53098,43 +52799,43 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4231[1] { + if yyq4205[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4237 := z.EncBinary() - _ = yym4237 + yym4211 := z.EncBinary() + _ = yym4211 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4231 || yy2arr4231 { + if yyr4205 || yy2arr4205 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4231[2] { - yy4239 := &x.ObjectMeta - yy4239.CodecEncodeSelf(e) + if yyq4205[2] { + yy4213 := &x.ObjectMeta + yy4213.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4231[2] { + if yyq4205[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4240 := &x.ObjectMeta - yy4240.CodecEncodeSelf(e) + yy4214 := &x.ObjectMeta + yy4214.CodecEncodeSelf(e) } } - if yyr4231 || yy2arr4231 { + if yyr4205 || yy2arr4205 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4231[3] { + if yyq4205[3] { if x.Data == nil { r.EncodeNil() } else { - yym4242 := z.EncBinary() - _ = yym4242 + yym4216 := z.EncBinary() + _ = yym4216 if false { } else { h.encMapstringSliceuint8((map[string][]uint8)(x.Data), e) @@ -53144,15 +52845,15 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4231[3] { + if yyq4205[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("data")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Data == nil { r.EncodeNil() } else { - yym4243 := z.EncBinary() - _ = yym4243 + yym4217 := z.EncBinary() + _ = yym4217 if false { } else { h.encMapstringSliceuint8((map[string][]uint8)(x.Data), e) @@ -53160,14 +52861,14 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4231 || yy2arr4231 { + if yyr4205 || yy2arr4205 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4231[4] { + if yyq4205[4] { if x.StringData == nil { r.EncodeNil() } else { - yym4245 := z.EncBinary() - _ = yym4245 + yym4219 := z.EncBinary() + _ = yym4219 if false { } else { z.F.EncMapStringStringV(x.StringData, false, e) @@ -53177,15 +52878,15 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4231[4] { + if yyq4205[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("stringData")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.StringData == nil { r.EncodeNil() } else { - yym4246 := z.EncBinary() - _ = yym4246 + yym4220 := z.EncBinary() + _ = yym4220 if false { } else { z.F.EncMapStringStringV(x.StringData, false, e) @@ -53193,22 +52894,22 @@ func (x *Secret) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4231 || yy2arr4231 { + if yyr4205 || yy2arr4205 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4231[5] { + if yyq4205[5] { x.Type.CodecEncodeSelf(e) } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4231[5] { + if yyq4205[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Type.CodecEncodeSelf(e) } } - if yyr4231 || yy2arr4231 { + if yyr4205 || yy2arr4205 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -53221,25 +52922,25 @@ func (x *Secret) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4248 := z.DecBinary() - _ = yym4248 + yym4222 := z.DecBinary() + _ = yym4222 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4249 := r.ContainerType() - if yyct4249 == codecSelferValueTypeMap1234 { - yyl4249 := r.ReadMapStart() - if yyl4249 == 0 { + yyct4223 := r.ContainerType() + if yyct4223 == codecSelferValueTypeMap1234 { + yyl4223 := r.ReadMapStart() + if yyl4223 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4249, d) + x.codecDecodeSelfFromMap(yyl4223, d) } - } else if yyct4249 == codecSelferValueTypeArray1234 { - yyl4249 := r.ReadArrayStart() - if yyl4249 == 0 { + } else if yyct4223 == codecSelferValueTypeArray1234 { + yyl4223 := r.ReadArrayStart() + if yyl4223 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4249, d) + x.codecDecodeSelfFromArray(yyl4223, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -53251,12 +52952,12 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4250Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4250Slc - var yyhl4250 bool = l >= 0 - for yyj4250 := 0; ; yyj4250++ { - if yyhl4250 { - if yyj4250 >= l { + var yys4224Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4224Slc + var yyhl4224 bool = l >= 0 + for yyj4224 := 0; ; yyj4224++ { + if yyhl4224 { + if yyj4224 >= l { break } } else { @@ -53265,10 +52966,10 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4250Slc = r.DecodeBytes(yys4250Slc, true, true) - yys4250 := string(yys4250Slc) + yys4224Slc = r.DecodeBytes(yys4224Slc, true, true) + yys4224 := string(yys4224Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4250 { + switch yys4224 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -53285,31 +52986,31 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4253 := &x.ObjectMeta - yyv4253.CodecDecodeSelf(d) + yyv4227 := &x.ObjectMeta + yyv4227.CodecDecodeSelf(d) } case "data": if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4254 := &x.Data - yym4255 := z.DecBinary() - _ = yym4255 + yyv4228 := &x.Data + yym4229 := z.DecBinary() + _ = yym4229 if false { } else { - h.decMapstringSliceuint8((*map[string][]uint8)(yyv4254), d) + h.decMapstringSliceuint8((*map[string][]uint8)(yyv4228), d) } } case "stringData": if r.TryDecodeAsNil() { x.StringData = nil } else { - yyv4256 := &x.StringData - yym4257 := z.DecBinary() - _ = yym4257 + yyv4230 := &x.StringData + yym4231 := z.DecBinary() + _ = yym4231 if false { } else { - z.F.DecMapStringStringX(yyv4256, false, d) + z.F.DecMapStringStringX(yyv4230, false, d) } } case "type": @@ -53319,9 +53020,9 @@ func (x *Secret) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Type = SecretType(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys4250) - } // end switch yys4250 - } // end for yyj4250 + z.DecStructFieldNotFound(-1, yys4224) + } // end switch yys4224 + } // end for yyj4224 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -53329,16 +53030,16 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4259 int - var yyb4259 bool - var yyhl4259 bool = l >= 0 - yyj4259++ - if yyhl4259 { - yyb4259 = yyj4259 > l + var yyj4233 int + var yyb4233 bool + var yyhl4233 bool = l >= 0 + yyj4233++ + if yyhl4233 { + yyb4233 = yyj4233 > l } else { - yyb4259 = r.CheckBreak() + yyb4233 = r.CheckBreak() } - if yyb4259 { + if yyb4233 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53348,13 +53049,13 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4259++ - if yyhl4259 { - yyb4259 = yyj4259 > l + yyj4233++ + if yyhl4233 { + yyb4233 = yyj4233 > l } else { - yyb4259 = r.CheckBreak() + yyb4233 = r.CheckBreak() } - if yyb4259 { + if yyb4233 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53364,13 +53065,13 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4259++ - if yyhl4259 { - yyb4259 = yyj4259 > l + yyj4233++ + if yyhl4233 { + yyb4233 = yyj4233 > l } else { - yyb4259 = r.CheckBreak() + yyb4233 = r.CheckBreak() } - if yyb4259 { + if yyb4233 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53378,16 +53079,16 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4262 := &x.ObjectMeta - yyv4262.CodecDecodeSelf(d) + yyv4236 := &x.ObjectMeta + yyv4236.CodecDecodeSelf(d) } - yyj4259++ - if yyhl4259 { - yyb4259 = yyj4259 > l + yyj4233++ + if yyhl4233 { + yyb4233 = yyj4233 > l } else { - yyb4259 = r.CheckBreak() + yyb4233 = r.CheckBreak() } - if yyb4259 { + if yyb4233 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53395,21 +53096,21 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4263 := &x.Data - yym4264 := z.DecBinary() - _ = yym4264 + yyv4237 := &x.Data + yym4238 := z.DecBinary() + _ = yym4238 if false { } else { - h.decMapstringSliceuint8((*map[string][]uint8)(yyv4263), d) + h.decMapstringSliceuint8((*map[string][]uint8)(yyv4237), d) } } - yyj4259++ - if yyhl4259 { - yyb4259 = yyj4259 > l + yyj4233++ + if yyhl4233 { + yyb4233 = yyj4233 > l } else { - yyb4259 = r.CheckBreak() + yyb4233 = r.CheckBreak() } - if yyb4259 { + if yyb4233 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53417,21 +53118,21 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.StringData = nil } else { - yyv4265 := &x.StringData - yym4266 := z.DecBinary() - _ = yym4266 + yyv4239 := &x.StringData + yym4240 := z.DecBinary() + _ = yym4240 if false { } else { - z.F.DecMapStringStringX(yyv4265, false, d) + z.F.DecMapStringStringX(yyv4239, false, d) } } - yyj4259++ - if yyhl4259 { - yyb4259 = yyj4259 > l + yyj4233++ + if yyhl4233 { + yyb4233 = yyj4233 > l } else { - yyb4259 = r.CheckBreak() + yyb4233 = r.CheckBreak() } - if yyb4259 { + if yyb4233 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53442,17 +53143,17 @@ func (x *Secret) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Type = SecretType(r.DecodeString()) } for { - yyj4259++ - if yyhl4259 { - yyb4259 = yyj4259 > l + yyj4233++ + if yyhl4233 { + yyb4233 = yyj4233 > l } else { - yyb4259 = r.CheckBreak() + yyb4233 = r.CheckBreak() } - if yyb4259 { + if yyb4233 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4259-1, "") + z.DecStructFieldNotFound(yyj4233-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -53461,8 +53162,8 @@ func (x SecretType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym4268 := z.EncBinary() - _ = yym4268 + yym4242 := z.EncBinary() + _ = yym4242 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -53474,8 +53175,8 @@ func (x *SecretType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4269 := z.DecBinary() - _ = yym4269 + yym4243 := z.DecBinary() + _ = yym4243 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -53490,37 +53191,37 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4270 := z.EncBinary() - _ = yym4270 + yym4244 := z.EncBinary() + _ = yym4244 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4271 := !z.EncBinary() - yy2arr4271 := z.EncBasicHandle().StructToArray - var yyq4271 [4]bool - _, _, _ = yysep4271, yyq4271, yy2arr4271 - const yyr4271 bool = false - yyq4271[0] = x.Kind != "" - yyq4271[1] = x.APIVersion != "" - yyq4271[2] = true - var yynn4271 int - if yyr4271 || yy2arr4271 { + yysep4245 := !z.EncBinary() + yy2arr4245 := z.EncBasicHandle().StructToArray + var yyq4245 [4]bool + _, _, _ = yysep4245, yyq4245, yy2arr4245 + const yyr4245 bool = false + yyq4245[0] = x.Kind != "" + yyq4245[1] = x.APIVersion != "" + yyq4245[2] = true + var yynn4245 int + if yyr4245 || yy2arr4245 { r.EncodeArrayStart(4) } else { - yynn4271 = 1 - for _, b := range yyq4271 { + yynn4245 = 1 + for _, b := range yyq4245 { if b { - yynn4271++ + yynn4245++ } } - r.EncodeMapStart(yynn4271) - yynn4271 = 0 + r.EncodeMapStart(yynn4245) + yynn4245 = 0 } - if yyr4271 || yy2arr4271 { + if yyr4245 || yy2arr4245 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4271[0] { - yym4273 := z.EncBinary() - _ = yym4273 + if yyq4245[0] { + yym4247 := z.EncBinary() + _ = yym4247 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -53529,23 +53230,23 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4271[0] { + if yyq4245[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4274 := z.EncBinary() - _ = yym4274 + yym4248 := z.EncBinary() + _ = yym4248 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4271 || yy2arr4271 { + if yyr4245 || yy2arr4245 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4271[1] { - yym4276 := z.EncBinary() - _ = yym4276 + if yyq4245[1] { + yym4250 := z.EncBinary() + _ = yym4250 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -53554,54 +53255,54 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4271[1] { + if yyq4245[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4277 := z.EncBinary() - _ = yym4277 + yym4251 := z.EncBinary() + _ = yym4251 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4271 || yy2arr4271 { + if yyr4245 || yy2arr4245 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4271[2] { - yy4279 := &x.ListMeta - yym4280 := z.EncBinary() - _ = yym4280 + if yyq4245[2] { + yy4253 := &x.ListMeta + yym4254 := z.EncBinary() + _ = yym4254 if false { - } else if z.HasExtensions() && z.EncExt(yy4279) { + } else if z.HasExtensions() && z.EncExt(yy4253) { } else { - z.EncFallback(yy4279) + z.EncFallback(yy4253) } } else { r.EncodeNil() } } else { - if yyq4271[2] { + if yyq4245[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4281 := &x.ListMeta - yym4282 := z.EncBinary() - _ = yym4282 + yy4255 := &x.ListMeta + yym4256 := z.EncBinary() + _ = yym4256 if false { - } else if z.HasExtensions() && z.EncExt(yy4281) { + } else if z.HasExtensions() && z.EncExt(yy4255) { } else { - z.EncFallback(yy4281) + z.EncFallback(yy4255) } } } - if yyr4271 || yy2arr4271 { + if yyr4245 || yy2arr4245 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4284 := z.EncBinary() - _ = yym4284 + yym4258 := z.EncBinary() + _ = yym4258 if false { } else { h.encSliceSecret(([]Secret)(x.Items), e) @@ -53614,15 +53315,15 @@ func (x *SecretList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4285 := z.EncBinary() - _ = yym4285 + yym4259 := z.EncBinary() + _ = yym4259 if false { } else { h.encSliceSecret(([]Secret)(x.Items), e) } } } - if yyr4271 || yy2arr4271 { + if yyr4245 || yy2arr4245 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -53635,25 +53336,25 @@ func (x *SecretList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4286 := z.DecBinary() - _ = yym4286 + yym4260 := z.DecBinary() + _ = yym4260 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4287 := r.ContainerType() - if yyct4287 == codecSelferValueTypeMap1234 { - yyl4287 := r.ReadMapStart() - if yyl4287 == 0 { + yyct4261 := r.ContainerType() + if yyct4261 == codecSelferValueTypeMap1234 { + yyl4261 := r.ReadMapStart() + if yyl4261 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4287, d) + x.codecDecodeSelfFromMap(yyl4261, d) } - } else if yyct4287 == codecSelferValueTypeArray1234 { - yyl4287 := r.ReadArrayStart() - if yyl4287 == 0 { + } else if yyct4261 == codecSelferValueTypeArray1234 { + yyl4261 := r.ReadArrayStart() + if yyl4261 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4287, d) + x.codecDecodeSelfFromArray(yyl4261, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -53665,12 +53366,12 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4288Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4288Slc - var yyhl4288 bool = l >= 0 - for yyj4288 := 0; ; yyj4288++ { - if yyhl4288 { - if yyj4288 >= l { + var yys4262Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4262Slc + var yyhl4262 bool = l >= 0 + for yyj4262 := 0; ; yyj4262++ { + if yyhl4262 { + if yyj4262 >= l { break } } else { @@ -53679,10 +53380,10 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4288Slc = r.DecodeBytes(yys4288Slc, true, true) - yys4288 := string(yys4288Slc) + yys4262Slc = r.DecodeBytes(yys4262Slc, true, true) + yys4262 := string(yys4262Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4288 { + switch yys4262 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -53697,33 +53398,33 @@ func (x *SecretList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4291 := &x.ListMeta - yym4292 := z.DecBinary() - _ = yym4292 + yyv4265 := &x.ListMeta + yym4266 := z.DecBinary() + _ = yym4266 if false { - } else if z.HasExtensions() && z.DecExt(yyv4291) { + } else if z.HasExtensions() && z.DecExt(yyv4265) { } else { - z.DecFallback(yyv4291, false) + z.DecFallback(yyv4265, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4293 := &x.Items - yym4294 := z.DecBinary() - _ = yym4294 + yyv4267 := &x.Items + yym4268 := z.DecBinary() + _ = yym4268 if false { } else { - h.decSliceSecret((*[]Secret)(yyv4293), d) + h.decSliceSecret((*[]Secret)(yyv4267), d) } } default: - z.DecStructFieldNotFound(-1, yys4288) - } // end switch yys4288 - } // end for yyj4288 + z.DecStructFieldNotFound(-1, yys4262) + } // end switch yys4262 + } // end for yyj4262 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -53731,16 +53432,16 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4295 int - var yyb4295 bool - var yyhl4295 bool = l >= 0 - yyj4295++ - if yyhl4295 { - yyb4295 = yyj4295 > l + var yyj4269 int + var yyb4269 bool + var yyhl4269 bool = l >= 0 + yyj4269++ + if yyhl4269 { + yyb4269 = yyj4269 > l } else { - yyb4295 = r.CheckBreak() + yyb4269 = r.CheckBreak() } - if yyb4295 { + if yyb4269 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53750,13 +53451,13 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4295++ - if yyhl4295 { - yyb4295 = yyj4295 > l + yyj4269++ + if yyhl4269 { + yyb4269 = yyj4269 > l } else { - yyb4295 = r.CheckBreak() + yyb4269 = r.CheckBreak() } - if yyb4295 { + if yyb4269 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53766,36 +53467,36 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4295++ - if yyhl4295 { - yyb4295 = yyj4295 > l + yyj4269++ + if yyhl4269 { + yyb4269 = yyj4269 > l } else { - yyb4295 = r.CheckBreak() + yyb4269 = r.CheckBreak() } - if yyb4295 { + if yyb4269 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4298 := &x.ListMeta - yym4299 := z.DecBinary() - _ = yym4299 + yyv4272 := &x.ListMeta + yym4273 := z.DecBinary() + _ = yym4273 if false { - } else if z.HasExtensions() && z.DecExt(yyv4298) { + } else if z.HasExtensions() && z.DecExt(yyv4272) { } else { - z.DecFallback(yyv4298, false) + z.DecFallback(yyv4272, false) } } - yyj4295++ - if yyhl4295 { - yyb4295 = yyj4295 > l + yyj4269++ + if yyhl4269 { + yyb4269 = yyj4269 > l } else { - yyb4295 = r.CheckBreak() + yyb4269 = r.CheckBreak() } - if yyb4295 { + if yyb4269 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -53803,26 +53504,26 @@ func (x *SecretList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4300 := &x.Items - yym4301 := z.DecBinary() - _ = yym4301 + yyv4274 := &x.Items + yym4275 := z.DecBinary() + _ = yym4275 if false { } else { - h.decSliceSecret((*[]Secret)(yyv4300), d) + h.decSliceSecret((*[]Secret)(yyv4274), d) } } for { - yyj4295++ - if yyhl4295 { - yyb4295 = yyj4295 > l + yyj4269++ + if yyhl4269 { + yyb4269 = yyj4269 > l } else { - yyb4295 = r.CheckBreak() + yyb4269 = r.CheckBreak() } - if yyb4295 { + if yyb4269 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4295-1, "") + z.DecStructFieldNotFound(yyj4269-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -53834,38 +53535,38 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4302 := z.EncBinary() - _ = yym4302 + yym4276 := z.EncBinary() + _ = yym4276 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4303 := !z.EncBinary() - yy2arr4303 := z.EncBasicHandle().StructToArray - var yyq4303 [4]bool - _, _, _ = yysep4303, yyq4303, yy2arr4303 - const yyr4303 bool = false - yyq4303[0] = x.Kind != "" - yyq4303[1] = x.APIVersion != "" - yyq4303[2] = true - yyq4303[3] = len(x.Data) != 0 - var yynn4303 int - if yyr4303 || yy2arr4303 { + yysep4277 := !z.EncBinary() + yy2arr4277 := z.EncBasicHandle().StructToArray + var yyq4277 [4]bool + _, _, _ = yysep4277, yyq4277, yy2arr4277 + const yyr4277 bool = false + yyq4277[0] = x.Kind != "" + yyq4277[1] = x.APIVersion != "" + yyq4277[2] = true + yyq4277[3] = len(x.Data) != 0 + var yynn4277 int + if yyr4277 || yy2arr4277 { r.EncodeArrayStart(4) } else { - yynn4303 = 0 - for _, b := range yyq4303 { + yynn4277 = 0 + for _, b := range yyq4277 { if b { - yynn4303++ + yynn4277++ } } - r.EncodeMapStart(yynn4303) - yynn4303 = 0 + r.EncodeMapStart(yynn4277) + yynn4277 = 0 } - if yyr4303 || yy2arr4303 { + if yyr4277 || yy2arr4277 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4303[0] { - yym4305 := z.EncBinary() - _ = yym4305 + if yyq4277[0] { + yym4279 := z.EncBinary() + _ = yym4279 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -53874,23 +53575,23 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4303[0] { + if yyq4277[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4306 := z.EncBinary() - _ = yym4306 + yym4280 := z.EncBinary() + _ = yym4280 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4303 || yy2arr4303 { + if yyr4277 || yy2arr4277 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4303[1] { - yym4308 := z.EncBinary() - _ = yym4308 + if yyq4277[1] { + yym4282 := z.EncBinary() + _ = yym4282 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -53899,43 +53600,43 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4303[1] { + if yyq4277[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4309 := z.EncBinary() - _ = yym4309 + yym4283 := z.EncBinary() + _ = yym4283 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4303 || yy2arr4303 { + if yyr4277 || yy2arr4277 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4303[2] { - yy4311 := &x.ObjectMeta - yy4311.CodecEncodeSelf(e) + if yyq4277[2] { + yy4285 := &x.ObjectMeta + yy4285.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4303[2] { + if yyq4277[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4312 := &x.ObjectMeta - yy4312.CodecEncodeSelf(e) + yy4286 := &x.ObjectMeta + yy4286.CodecEncodeSelf(e) } } - if yyr4303 || yy2arr4303 { + if yyr4277 || yy2arr4277 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4303[3] { + if yyq4277[3] { if x.Data == nil { r.EncodeNil() } else { - yym4314 := z.EncBinary() - _ = yym4314 + yym4288 := z.EncBinary() + _ = yym4288 if false { } else { z.F.EncMapStringStringV(x.Data, false, e) @@ -53945,15 +53646,15 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4303[3] { + if yyq4277[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("data")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Data == nil { r.EncodeNil() } else { - yym4315 := z.EncBinary() - _ = yym4315 + yym4289 := z.EncBinary() + _ = yym4289 if false { } else { z.F.EncMapStringStringV(x.Data, false, e) @@ -53961,7 +53662,7 @@ func (x *ConfigMap) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4303 || yy2arr4303 { + if yyr4277 || yy2arr4277 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -53974,25 +53675,25 @@ func (x *ConfigMap) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4316 := z.DecBinary() - _ = yym4316 + yym4290 := z.DecBinary() + _ = yym4290 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4317 := r.ContainerType() - if yyct4317 == codecSelferValueTypeMap1234 { - yyl4317 := r.ReadMapStart() - if yyl4317 == 0 { + yyct4291 := r.ContainerType() + if yyct4291 == codecSelferValueTypeMap1234 { + yyl4291 := r.ReadMapStart() + if yyl4291 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4317, d) + x.codecDecodeSelfFromMap(yyl4291, d) } - } else if yyct4317 == codecSelferValueTypeArray1234 { - yyl4317 := r.ReadArrayStart() - if yyl4317 == 0 { + } else if yyct4291 == codecSelferValueTypeArray1234 { + yyl4291 := r.ReadArrayStart() + if yyl4291 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4317, d) + x.codecDecodeSelfFromArray(yyl4291, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -54004,12 +53705,12 @@ func (x *ConfigMap) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4318Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4318Slc - var yyhl4318 bool = l >= 0 - for yyj4318 := 0; ; yyj4318++ { - if yyhl4318 { - if yyj4318 >= l { + var yys4292Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4292Slc + var yyhl4292 bool = l >= 0 + for yyj4292 := 0; ; yyj4292++ { + if yyhl4292 { + if yyj4292 >= l { break } } else { @@ -54018,10 +53719,10 @@ func (x *ConfigMap) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4318Slc = r.DecodeBytes(yys4318Slc, true, true) - yys4318 := string(yys4318Slc) + yys4292Slc = r.DecodeBytes(yys4292Slc, true, true) + yys4292 := string(yys4292Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4318 { + switch yys4292 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -54038,25 +53739,25 @@ func (x *ConfigMap) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4321 := &x.ObjectMeta - yyv4321.CodecDecodeSelf(d) + yyv4295 := &x.ObjectMeta + yyv4295.CodecDecodeSelf(d) } case "data": if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4322 := &x.Data - yym4323 := z.DecBinary() - _ = yym4323 + yyv4296 := &x.Data + yym4297 := z.DecBinary() + _ = yym4297 if false { } else { - z.F.DecMapStringStringX(yyv4322, false, d) + z.F.DecMapStringStringX(yyv4296, false, d) } } default: - z.DecStructFieldNotFound(-1, yys4318) - } // end switch yys4318 - } // end for yyj4318 + z.DecStructFieldNotFound(-1, yys4292) + } // end switch yys4292 + } // end for yyj4292 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -54064,16 +53765,16 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4324 int - var yyb4324 bool - var yyhl4324 bool = l >= 0 - yyj4324++ - if yyhl4324 { - yyb4324 = yyj4324 > l + var yyj4298 int + var yyb4298 bool + var yyhl4298 bool = l >= 0 + yyj4298++ + if yyhl4298 { + yyb4298 = yyj4298 > l } else { - yyb4324 = r.CheckBreak() + yyb4298 = r.CheckBreak() } - if yyb4324 { + if yyb4298 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54083,13 +53784,13 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj4324++ - if yyhl4324 { - yyb4324 = yyj4324 > l + yyj4298++ + if yyhl4298 { + yyb4298 = yyj4298 > l } else { - yyb4324 = r.CheckBreak() + yyb4298 = r.CheckBreak() } - if yyb4324 { + if yyb4298 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54099,13 +53800,13 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj4324++ - if yyhl4324 { - yyb4324 = yyj4324 > l + yyj4298++ + if yyhl4298 { + yyb4298 = yyj4298 > l } else { - yyb4324 = r.CheckBreak() + yyb4298 = r.CheckBreak() } - if yyb4324 { + if yyb4298 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54113,16 +53814,16 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4327 := &x.ObjectMeta - yyv4327.CodecDecodeSelf(d) + yyv4301 := &x.ObjectMeta + yyv4301.CodecDecodeSelf(d) } - yyj4324++ - if yyhl4324 { - yyb4324 = yyj4324 > l + yyj4298++ + if yyhl4298 { + yyb4298 = yyj4298 > l } else { - yyb4324 = r.CheckBreak() + yyb4298 = r.CheckBreak() } - if yyb4324 { + if yyb4298 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -54130,26 +53831,26 @@ func (x *ConfigMap) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4328 := &x.Data - yym4329 := z.DecBinary() - _ = yym4329 + yyv4302 := &x.Data + yym4303 := z.DecBinary() + _ = yym4303 if false { } else { - z.F.DecMapStringStringX(yyv4328, false, d) + z.F.DecMapStringStringX(yyv4302, false, d) } } for { - yyj4324++ - if yyhl4324 { - yyb4324 = yyj4324 > l + yyj4298++ + if yyhl4298 { + yyb4298 = yyj4298 > l } else { - yyb4324 = r.CheckBreak() + yyb4298 = r.CheckBreak() } - if yyb4324 { + if yyb4298 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4324-1, "") + z.DecStructFieldNotFound(yyj4298-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -54161,37 +53862,37 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4330 := z.EncBinary() - _ = yym4330 + yym4304 := z.EncBinary() + _ = yym4304 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4331 := !z.EncBinary() - yy2arr4331 := z.EncBasicHandle().StructToArray - var yyq4331 [4]bool - _, _, _ = yysep4331, yyq4331, yy2arr4331 - const yyr4331 bool = false - yyq4331[0] = x.Kind != "" - yyq4331[1] = x.APIVersion != "" - yyq4331[2] = true - var yynn4331 int - if yyr4331 || yy2arr4331 { + yysep4305 := !z.EncBinary() + yy2arr4305 := z.EncBasicHandle().StructToArray + var yyq4305 [4]bool + _, _, _ = yysep4305, yyq4305, yy2arr4305 + const yyr4305 bool = false + yyq4305[0] = x.Kind != "" + yyq4305[1] = x.APIVersion != "" + yyq4305[2] = true + var yynn4305 int + if yyr4305 || yy2arr4305 { r.EncodeArrayStart(4) } else { - yynn4331 = 1 - for _, b := range yyq4331 { + yynn4305 = 1 + for _, b := range yyq4305 { if b { - yynn4331++ + yynn4305++ } } - r.EncodeMapStart(yynn4331) - yynn4331 = 0 + r.EncodeMapStart(yynn4305) + yynn4305 = 0 } - if yyr4331 || yy2arr4331 { + if yyr4305 || yy2arr4305 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4331[0] { - yym4333 := z.EncBinary() - _ = yym4333 + if yyq4305[0] { + yym4307 := z.EncBinary() + _ = yym4307 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -54200,23 +53901,23 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4331[0] { + if yyq4305[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4334 := z.EncBinary() - _ = yym4334 + yym4308 := z.EncBinary() + _ = yym4308 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4331 || yy2arr4331 { + if yyr4305 || yy2arr4305 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4331[1] { - yym4336 := z.EncBinary() - _ = yym4336 + if yyq4305[1] { + yym4310 := z.EncBinary() + _ = yym4310 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -54225,54 +53926,54 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4331[1] { + if yyq4305[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4337 := z.EncBinary() - _ = yym4337 + yym4311 := z.EncBinary() + _ = yym4311 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4331 || yy2arr4331 { + if yyr4305 || yy2arr4305 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4331[2] { - yy4339 := &x.ListMeta - yym4340 := z.EncBinary() - _ = yym4340 + if yyq4305[2] { + yy4313 := &x.ListMeta + yym4314 := z.EncBinary() + _ = yym4314 if false { - } else if z.HasExtensions() && z.EncExt(yy4339) { + } else if z.HasExtensions() && z.EncExt(yy4313) { } else { - z.EncFallback(yy4339) + z.EncFallback(yy4313) } } else { r.EncodeNil() } } else { - if yyq4331[2] { + if yyq4305[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4341 := &x.ListMeta - yym4342 := z.EncBinary() - _ = yym4342 + yy4315 := &x.ListMeta + yym4316 := z.EncBinary() + _ = yym4316 if false { - } else if z.HasExtensions() && z.EncExt(yy4341) { + } else if z.HasExtensions() && z.EncExt(yy4315) { } else { - z.EncFallback(yy4341) + z.EncFallback(yy4315) } } } - if yyr4331 || yy2arr4331 { + if yyr4305 || yy2arr4305 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4344 := z.EncBinary() - _ = yym4344 + yym4318 := z.EncBinary() + _ = yym4318 if false { } else { h.encSliceConfigMap(([]ConfigMap)(x.Items), e) @@ -54285,15 +53986,15 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4345 := z.EncBinary() - _ = yym4345 + yym4319 := z.EncBinary() + _ = yym4319 if false { } else { h.encSliceConfigMap(([]ConfigMap)(x.Items), e) } } } - if yyr4331 || yy2arr4331 { + if yyr4305 || yy2arr4305 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -54306,25 +54007,25 @@ func (x *ConfigMapList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4346 := z.DecBinary() - _ = yym4346 + yym4320 := z.DecBinary() + _ = yym4320 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4347 := r.ContainerType() - if yyct4347 == codecSelferValueTypeMap1234 { - yyl4347 := r.ReadMapStart() - if yyl4347 == 0 { + yyct4321 := r.ContainerType() + if yyct4321 == codecSelferValueTypeMap1234 { + yyl4321 := r.ReadMapStart() + if yyl4321 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4347, d) + x.codecDecodeSelfFromMap(yyl4321, d) } - } else if yyct4347 == codecSelferValueTypeArray1234 { - yyl4347 := r.ReadArrayStart() - if yyl4347 == 0 { + } else if yyct4321 == codecSelferValueTypeArray1234 { + yyl4321 := r.ReadArrayStart() + if yyl4321 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4347, d) + x.codecDecodeSelfFromArray(yyl4321, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -54336,12 +54037,12 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4348Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4348Slc - var yyhl4348 bool = l >= 0 - for yyj4348 := 0; ; yyj4348++ { - if yyhl4348 { - if yyj4348 >= l { + var yys4322Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4322Slc + var yyhl4322 bool = l >= 0 + for yyj4322 := 0; ; yyj4322++ { + if yyhl4322 { + if yyj4322 >= l { break } } else { @@ -54350,10 +54051,10 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4348Slc = r.DecodeBytes(yys4348Slc, true, true) - yys4348 := string(yys4348Slc) + yys4322Slc = r.DecodeBytes(yys4322Slc, true, true) + yys4322 := string(yys4322Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4348 { + switch yys4322 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -54368,37 +54069,355 @@ func (x *ConfigMapList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { - yyv4351 := &x.ListMeta - yym4352 := z.DecBinary() - _ = yym4352 + yyv4325 := &x.ListMeta + yym4326 := z.DecBinary() + _ = yym4326 if false { - } else if z.HasExtensions() && z.DecExt(yyv4351) { + } else if z.HasExtensions() && z.DecExt(yyv4325) { } else { - z.DecFallback(yyv4351, false) + z.DecFallback(yyv4325, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4353 := &x.Items - yym4354 := z.DecBinary() - _ = yym4354 + yyv4327 := &x.Items + yym4328 := z.DecBinary() + _ = yym4328 if false { } else { - h.decSliceConfigMap((*[]ConfigMap)(yyv4353), d) + h.decSliceConfigMap((*[]ConfigMap)(yyv4327), d) } } default: - z.DecStructFieldNotFound(-1, yys4348) - } // end switch yys4348 - } // end for yyj4348 + z.DecStructFieldNotFound(-1, yys4322) + } // end switch yys4322 + } // end for yyj4322 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj4329 int + var yyb4329 bool + var yyhl4329 bool = l >= 0 + yyj4329++ + if yyhl4329 { + yyb4329 = yyj4329 > l + } else { + yyb4329 = r.CheckBreak() + } + if yyb4329 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + yyj4329++ + if yyhl4329 { + yyb4329 = yyj4329 > l + } else { + yyb4329 = r.CheckBreak() + } + if yyb4329 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + yyj4329++ + if yyhl4329 { + yyb4329 = yyj4329 > l + } else { + yyb4329 = r.CheckBreak() + } + if yyb4329 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ListMeta = pkg2_v1.ListMeta{} + } else { + yyv4332 := &x.ListMeta + yym4333 := z.DecBinary() + _ = yym4333 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4332) { + } else { + z.DecFallback(yyv4332, false) + } + } + yyj4329++ + if yyhl4329 { + yyb4329 = yyj4329 > l + } else { + yyb4329 = r.CheckBreak() + } + if yyb4329 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Items = nil + } else { + yyv4334 := &x.Items + yym4335 := z.DecBinary() + _ = yym4335 + if false { + } else { + h.decSliceConfigMap((*[]ConfigMap)(yyv4334), d) + } + } + for { + yyj4329++ + if yyhl4329 { + yyb4329 = yyj4329 > l + } else { + yyb4329 = r.CheckBreak() + } + if yyb4329 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj4329-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x ComponentConditionType) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + yym4336 := z.EncBinary() + _ = yym4336 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x)) + } +} + +func (x *ComponentConditionType) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym4337 := z.DecBinary() + _ = yym4337 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + *((*string)(x)) = r.DecodeString() + } +} + +func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym4338 := z.EncBinary() + _ = yym4338 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep4339 := !z.EncBinary() + yy2arr4339 := z.EncBasicHandle().StructToArray + var yyq4339 [4]bool + _, _, _ = yysep4339, yyq4339, yy2arr4339 + const yyr4339 bool = false + yyq4339[2] = x.Message != "" + yyq4339[3] = x.Error != "" + var yynn4339 int + if yyr4339 || yy2arr4339 { + r.EncodeArrayStart(4) + } else { + yynn4339 = 2 + for _, b := range yyq4339 { + if b { + yynn4339++ + } + } + r.EncodeMapStart(yynn4339) + yynn4339 = 0 + } + if yyr4339 || yy2arr4339 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + x.Type.CodecEncodeSelf(e) + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("type")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + x.Type.CodecEncodeSelf(e) + } + if yyr4339 || yy2arr4339 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + x.Status.CodecEncodeSelf(e) + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("status")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + x.Status.CodecEncodeSelf(e) + } + if yyr4339 || yy2arr4339 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4339[2] { + yym4343 := z.EncBinary() + _ = yym4343 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Message)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4339[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("message")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym4344 := z.EncBinary() + _ = yym4344 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Message)) + } + } + } + if yyr4339 || yy2arr4339 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4339[3] { + yym4346 := z.EncBinary() + _ = yym4346 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Error)) + } + } else { + r.EncodeString(codecSelferC_UTF81234, "") + } + } else { + if yyq4339[3] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("error")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym4347 := z.EncBinary() + _ = yym4347 + if false { + } else { + r.EncodeString(codecSelferC_UTF81234, string(x.Error)) + } + } + } + if yyr4339 || yy2arr4339 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + +func (x *ComponentCondition) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym4348 := z.DecBinary() + _ = yym4348 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct4349 := r.ContainerType() + if yyct4349 == codecSelferValueTypeMap1234 { + yyl4349 := r.ReadMapStart() + if yyl4349 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl4349, d) + } + } else if yyct4349 == codecSelferValueTypeArray1234 { + yyl4349 := r.ReadArrayStart() + if yyl4349 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl4349, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *ComponentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys4350Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4350Slc + var yyhl4350 bool = l >= 0 + for yyj4350 := 0; ; yyj4350++ { + if yyhl4350 { + if yyj4350 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys4350Slc = r.DecodeBytes(yys4350Slc, true, true) + yys4350 := string(yys4350Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys4350 { + case "type": + if r.TryDecodeAsNil() { + x.Type = "" + } else { + x.Type = ComponentConditionType(r.DecodeString()) + } + case "status": + if r.TryDecodeAsNil() { + x.Status = "" + } else { + x.Status = ConditionStatus(r.DecodeString()) + } + case "message": + if r.TryDecodeAsNil() { + x.Message = "" + } else { + x.Message = string(r.DecodeString()) + } + case "error": + if r.TryDecodeAsNil() { + x.Error = "" + } else { + x.Error = string(r.DecodeString()) + } + default: + z.DecStructFieldNotFound(-1, yys4350) + } // end switch yys4350 + } // end for yyj4350 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *ComponentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -54417,9 +54436,9 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Kind = "" + x.Type = "" } else { - x.Kind = string(r.DecodeString()) + x.Type = ComponentConditionType(r.DecodeString()) } yyj4355++ if yyhl4355 { @@ -54433,9 +54452,9 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.APIVersion = "" + x.Status = "" } else { - x.APIVersion = string(r.DecodeString()) + x.Status = ConditionStatus(r.DecodeString()) } yyj4355++ if yyhl4355 { @@ -54449,16 +54468,9 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.Message = "" } else { - yyv4358 := &x.ListMeta - yym4359 := z.DecBinary() - _ = yym4359 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4358) { - } else { - z.DecFallback(yyv4358, false) - } + x.Message = string(r.DecodeString()) } yyj4355++ if yyhl4355 { @@ -54472,15 +54484,9 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.Items = nil + x.Error = "" } else { - yyv4360 := &x.Items - yym4361 := z.DecBinary() - _ = yym4361 - if false { - } else { - h.decSliceConfigMap((*[]ConfigMap)(yyv4360), d) - } + x.Error = string(r.DecodeString()) } for { yyj4355++ @@ -54498,133 +54504,141 @@ func (x *ConfigMapList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x ComponentConditionType) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - yym4362 := z.EncBinary() - _ = yym4362 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x)) - } -} - -func (x *ComponentConditionType) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4363 := z.DecBinary() - _ = yym4363 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - *((*string)(x)) = r.DecodeString() - } -} - -func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { +func (x *ComponentStatus) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r if x == nil { r.EncodeNil() } else { - yym4364 := z.EncBinary() - _ = yym4364 + yym4360 := z.EncBinary() + _ = yym4360 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4365 := !z.EncBinary() - yy2arr4365 := z.EncBasicHandle().StructToArray - var yyq4365 [4]bool - _, _, _ = yysep4365, yyq4365, yy2arr4365 - const yyr4365 bool = false - yyq4365[2] = x.Message != "" - yyq4365[3] = x.Error != "" - var yynn4365 int - if yyr4365 || yy2arr4365 { + yysep4361 := !z.EncBinary() + yy2arr4361 := z.EncBasicHandle().StructToArray + var yyq4361 [4]bool + _, _, _ = yysep4361, yyq4361, yy2arr4361 + const yyr4361 bool = false + yyq4361[0] = x.Kind != "" + yyq4361[1] = x.APIVersion != "" + yyq4361[2] = true + yyq4361[3] = len(x.Conditions) != 0 + var yynn4361 int + if yyr4361 || yy2arr4361 { r.EncodeArrayStart(4) } else { - yynn4365 = 2 - for _, b := range yyq4365 { + yynn4361 = 0 + for _, b := range yyq4361 { if b { - yynn4365++ + yynn4361++ } } - r.EncodeMapStart(yynn4365) - yynn4365 = 0 + r.EncodeMapStart(yynn4361) + yynn4361 = 0 } - if yyr4365 || yy2arr4365 { + if yyr4361 || yy2arr4361 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - x.Type.CodecEncodeSelf(e) - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("type")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - x.Type.CodecEncodeSelf(e) - } - if yyr4365 || yy2arr4365 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - x.Status.CodecEncodeSelf(e) - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("status")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - x.Status.CodecEncodeSelf(e) - } - if yyr4365 || yy2arr4365 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4365[2] { - yym4369 := z.EncBinary() - _ = yym4369 + if yyq4361[0] { + yym4363 := z.EncBinary() + _ = yym4363 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Message)) + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4365[2] { + if yyq4361[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("message")) + r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4370 := z.EncBinary() - _ = yym4370 + yym4364 := z.EncBinary() + _ = yym4364 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Message)) + r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4365 || yy2arr4365 { + if yyr4361 || yy2arr4361 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4365[3] { - yym4372 := z.EncBinary() - _ = yym4372 + if yyq4361[1] { + yym4366 := z.EncBinary() + _ = yym4366 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Error)) + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4365[3] { + if yyq4361[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("error")) + r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4373 := z.EncBinary() - _ = yym4373 + yym4367 := z.EncBinary() + _ = yym4367 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Error)) + r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4365 || yy2arr4365 { + if yyr4361 || yy2arr4361 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4361[2] { + yy4369 := &x.ObjectMeta + yy4369.CodecEncodeSelf(e) + } else { + r.EncodeNil() + } + } else { + if yyq4361[2] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("metadata")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy4370 := &x.ObjectMeta + yy4370.CodecEncodeSelf(e) + } + } + if yyr4361 || yy2arr4361 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4361[3] { + if x.Conditions == nil { + r.EncodeNil() + } else { + yym4372 := z.EncBinary() + _ = yym4372 + if false { + } else { + h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) + } + } + } else { + r.EncodeNil() + } + } else { + if yyq4361[3] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("conditions")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Conditions == nil { + r.EncodeNil() + } else { + yym4373 := z.EncBinary() + _ = yym4373 + if false { + } else { + h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) + } + } + } + } + if yyr4361 || yy2arr4361 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -54633,7 +54647,7 @@ func (x *ComponentCondition) CodecEncodeSelf(e *codec1978.Encoder) { } } -func (x *ComponentCondition) CodecDecodeSelf(d *codec1978.Decoder) { +func (x *ComponentStatus) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -54663,7 +54677,7 @@ func (x *ComponentCondition) CodecDecodeSelf(d *codec1978.Decoder) { } } -func (x *ComponentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { +func (x *ComponentStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -54685,319 +54699,6 @@ func (x *ComponentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) yys4376 := string(yys4376Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) switch yys4376 { - case "type": - if r.TryDecodeAsNil() { - x.Type = "" - } else { - x.Type = ComponentConditionType(r.DecodeString()) - } - case "status": - if r.TryDecodeAsNil() { - x.Status = "" - } else { - x.Status = ConditionStatus(r.DecodeString()) - } - case "message": - if r.TryDecodeAsNil() { - x.Message = "" - } else { - x.Message = string(r.DecodeString()) - } - case "error": - if r.TryDecodeAsNil() { - x.Error = "" - } else { - x.Error = string(r.DecodeString()) - } - default: - z.DecStructFieldNotFound(-1, yys4376) - } // end switch yys4376 - } // end for yyj4376 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *ComponentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj4381 int - var yyb4381 bool - var yyhl4381 bool = l >= 0 - yyj4381++ - if yyhl4381 { - yyb4381 = yyj4381 > l - } else { - yyb4381 = r.CheckBreak() - } - if yyb4381 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Type = "" - } else { - x.Type = ComponentConditionType(r.DecodeString()) - } - yyj4381++ - if yyhl4381 { - yyb4381 = yyj4381 > l - } else { - yyb4381 = r.CheckBreak() - } - if yyb4381 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Status = "" - } else { - x.Status = ConditionStatus(r.DecodeString()) - } - yyj4381++ - if yyhl4381 { - yyb4381 = yyj4381 > l - } else { - yyb4381 = r.CheckBreak() - } - if yyb4381 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Message = "" - } else { - x.Message = string(r.DecodeString()) - } - yyj4381++ - if yyhl4381 { - yyb4381 = yyj4381 > l - } else { - yyb4381 = r.CheckBreak() - } - if yyb4381 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Error = "" - } else { - x.Error = string(r.DecodeString()) - } - for { - yyj4381++ - if yyhl4381 { - yyb4381 = yyj4381 > l - } else { - yyb4381 = r.CheckBreak() - } - if yyb4381 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4381-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x *ComponentStatus) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym4386 := z.EncBinary() - _ = yym4386 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep4387 := !z.EncBinary() - yy2arr4387 := z.EncBasicHandle().StructToArray - var yyq4387 [4]bool - _, _, _ = yysep4387, yyq4387, yy2arr4387 - const yyr4387 bool = false - yyq4387[0] = x.Kind != "" - yyq4387[1] = x.APIVersion != "" - yyq4387[2] = true - yyq4387[3] = len(x.Conditions) != 0 - var yynn4387 int - if yyr4387 || yy2arr4387 { - r.EncodeArrayStart(4) - } else { - yynn4387 = 0 - for _, b := range yyq4387 { - if b { - yynn4387++ - } - } - r.EncodeMapStart(yynn4387) - yynn4387 = 0 - } - if yyr4387 || yy2arr4387 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4387[0] { - yym4389 := z.EncBinary() - _ = yym4389 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4387[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kind")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4390 := z.EncBinary() - _ = yym4390 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } - } - if yyr4387 || yy2arr4387 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4387[1] { - yym4392 := z.EncBinary() - _ = yym4392 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq4387[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4393 := z.EncBinary() - _ = yym4393 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } - } - if yyr4387 || yy2arr4387 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4387[2] { - yy4395 := &x.ObjectMeta - yy4395.CodecEncodeSelf(e) - } else { - r.EncodeNil() - } - } else { - if yyq4387[2] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("metadata")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4396 := &x.ObjectMeta - yy4396.CodecEncodeSelf(e) - } - } - if yyr4387 || yy2arr4387 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4387[3] { - if x.Conditions == nil { - r.EncodeNil() - } else { - yym4398 := z.EncBinary() - _ = yym4398 - if false { - } else { - h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) - } - } - } else { - r.EncodeNil() - } - } else { - if yyq4387[3] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("conditions")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Conditions == nil { - r.EncodeNil() - } else { - yym4399 := z.EncBinary() - _ = yym4399 - if false { - } else { - h.encSliceComponentCondition(([]ComponentCondition)(x.Conditions), e) - } - } - } - } - if yyr4387 || yy2arr4387 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *ComponentStatus) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4400 := z.DecBinary() - _ = yym4400 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct4401 := r.ContainerType() - if yyct4401 == codecSelferValueTypeMap1234 { - yyl4401 := r.ReadMapStart() - if yyl4401 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl4401, d) - } - } else if yyct4401 == codecSelferValueTypeArray1234 { - yyl4401 := r.ReadArrayStart() - if yyl4401 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl4401, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *ComponentStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys4402Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4402Slc - var yyhl4402 bool = l >= 0 - for yyj4402 := 0; ; yyj4402++ { - if yyhl4402 { - if yyj4402 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4402Slc = r.DecodeBytes(yys4402Slc, true, true) - yys4402 := string(yys4402Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4402 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -55014,25 +54715,25 @@ func (x *ComponentStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4405 := &x.ObjectMeta - yyv4405.CodecDecodeSelf(d) + yyv4379 := &x.ObjectMeta + yyv4379.CodecDecodeSelf(d) } case "conditions": if r.TryDecodeAsNil() { x.Conditions = nil } else { - yyv4406 := &x.Conditions - yym4407 := z.DecBinary() - _ = yym4407 + yyv4380 := &x.Conditions + yym4381 := z.DecBinary() + _ = yym4381 if false { } else { - h.decSliceComponentCondition((*[]ComponentCondition)(yyv4406), d) + h.decSliceComponentCondition((*[]ComponentCondition)(yyv4380), d) } } default: - z.DecStructFieldNotFound(-1, yys4402) - } // end switch yys4402 - } // end for yyj4402 + z.DecStructFieldNotFound(-1, yys4376) + } // end switch yys4376 + } // end for yyj4376 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -55040,16 +54741,16 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4408 int - var yyb4408 bool - var yyhl4408 bool = l >= 0 - yyj4408++ - if yyhl4408 { - yyb4408 = yyj4408 > l + var yyj4382 int + var yyb4382 bool + var yyhl4382 bool = l >= 0 + yyj4382++ + if yyhl4382 { + yyb4382 = yyj4382 > l } else { - yyb4408 = r.CheckBreak() + yyb4382 = r.CheckBreak() } - if yyb4408 { + if yyb4382 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55059,13 +54760,13 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj4408++ - if yyhl4408 { - yyb4408 = yyj4408 > l + yyj4382++ + if yyhl4382 { + yyb4382 = yyj4382 > l } else { - yyb4408 = r.CheckBreak() + yyb4382 = r.CheckBreak() } - if yyb4408 { + if yyb4382 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55075,13 +54776,13 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj4408++ - if yyhl4408 { - yyb4408 = yyj4408 > l + yyj4382++ + if yyhl4382 { + yyb4382 = yyj4382 > l } else { - yyb4408 = r.CheckBreak() + yyb4382 = r.CheckBreak() } - if yyb4408 { + if yyb4382 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55089,16 +54790,16 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4411 := &x.ObjectMeta - yyv4411.CodecDecodeSelf(d) + yyv4385 := &x.ObjectMeta + yyv4385.CodecDecodeSelf(d) } - yyj4408++ - if yyhl4408 { - yyb4408 = yyj4408 > l + yyj4382++ + if yyhl4382 { + yyb4382 = yyj4382 > l } else { - yyb4408 = r.CheckBreak() + yyb4382 = r.CheckBreak() } - if yyb4408 { + if yyb4382 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55106,26 +54807,26 @@ func (x *ComponentStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.Conditions = nil } else { - yyv4412 := &x.Conditions - yym4413 := z.DecBinary() - _ = yym4413 + yyv4386 := &x.Conditions + yym4387 := z.DecBinary() + _ = yym4387 if false { } else { - h.decSliceComponentCondition((*[]ComponentCondition)(yyv4412), d) + h.decSliceComponentCondition((*[]ComponentCondition)(yyv4386), d) } } for { - yyj4408++ - if yyhl4408 { - yyb4408 = yyj4408 > l + yyj4382++ + if yyhl4382 { + yyb4382 = yyj4382 > l } else { - yyb4408 = r.CheckBreak() + yyb4382 = r.CheckBreak() } - if yyb4408 { + if yyb4382 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4408-1, "") + z.DecStructFieldNotFound(yyj4382-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -55137,37 +54838,37 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4414 := z.EncBinary() - _ = yym4414 + yym4388 := z.EncBinary() + _ = yym4388 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4415 := !z.EncBinary() - yy2arr4415 := z.EncBasicHandle().StructToArray - var yyq4415 [4]bool - _, _, _ = yysep4415, yyq4415, yy2arr4415 - const yyr4415 bool = false - yyq4415[0] = x.Kind != "" - yyq4415[1] = x.APIVersion != "" - yyq4415[2] = true - var yynn4415 int - if yyr4415 || yy2arr4415 { + yysep4389 := !z.EncBinary() + yy2arr4389 := z.EncBasicHandle().StructToArray + var yyq4389 [4]bool + _, _, _ = yysep4389, yyq4389, yy2arr4389 + const yyr4389 bool = false + yyq4389[0] = x.Kind != "" + yyq4389[1] = x.APIVersion != "" + yyq4389[2] = true + var yynn4389 int + if yyr4389 || yy2arr4389 { r.EncodeArrayStart(4) } else { - yynn4415 = 1 - for _, b := range yyq4415 { + yynn4389 = 1 + for _, b := range yyq4389 { if b { - yynn4415++ + yynn4389++ } } - r.EncodeMapStart(yynn4415) - yynn4415 = 0 + r.EncodeMapStart(yynn4389) + yynn4389 = 0 } - if yyr4415 || yy2arr4415 { + if yyr4389 || yy2arr4389 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4415[0] { - yym4417 := z.EncBinary() - _ = yym4417 + if yyq4389[0] { + yym4391 := z.EncBinary() + _ = yym4391 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -55176,23 +54877,23 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4415[0] { + if yyq4389[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4418 := z.EncBinary() - _ = yym4418 + yym4392 := z.EncBinary() + _ = yym4392 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4415 || yy2arr4415 { + if yyr4389 || yy2arr4389 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4415[1] { - yym4420 := z.EncBinary() - _ = yym4420 + if yyq4389[1] { + yym4394 := z.EncBinary() + _ = yym4394 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -55201,54 +54902,54 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4415[1] { + if yyq4389[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4421 := z.EncBinary() - _ = yym4421 + yym4395 := z.EncBinary() + _ = yym4395 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4415 || yy2arr4415 { + if yyr4389 || yy2arr4389 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4415[2] { - yy4423 := &x.ListMeta - yym4424 := z.EncBinary() - _ = yym4424 + if yyq4389[2] { + yy4397 := &x.ListMeta + yym4398 := z.EncBinary() + _ = yym4398 if false { - } else if z.HasExtensions() && z.EncExt(yy4423) { + } else if z.HasExtensions() && z.EncExt(yy4397) { } else { - z.EncFallback(yy4423) + z.EncFallback(yy4397) } } else { r.EncodeNil() } } else { - if yyq4415[2] { + if yyq4389[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4425 := &x.ListMeta - yym4426 := z.EncBinary() - _ = yym4426 + yy4399 := &x.ListMeta + yym4400 := z.EncBinary() + _ = yym4400 if false { - } else if z.HasExtensions() && z.EncExt(yy4425) { + } else if z.HasExtensions() && z.EncExt(yy4399) { } else { - z.EncFallback(yy4425) + z.EncFallback(yy4399) } } } - if yyr4415 || yy2arr4415 { + if yyr4389 || yy2arr4389 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym4428 := z.EncBinary() - _ = yym4428 + yym4402 := z.EncBinary() + _ = yym4402 if false { } else { h.encSliceComponentStatus(([]ComponentStatus)(x.Items), e) @@ -55261,15 +54962,15 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym4429 := z.EncBinary() - _ = yym4429 + yym4403 := z.EncBinary() + _ = yym4403 if false { } else { h.encSliceComponentStatus(([]ComponentStatus)(x.Items), e) } } } - if yyr4415 || yy2arr4415 { + if yyr4389 || yy2arr4389 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -55279,6 +54980,311 @@ func (x *ComponentStatusList) CodecEncodeSelf(e *codec1978.Encoder) { } func (x *ComponentStatusList) CodecDecodeSelf(d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yym4404 := z.DecBinary() + _ = yym4404 + if false { + } else if z.HasExtensions() && z.DecExt(x) { + } else { + yyct4405 := r.ContainerType() + if yyct4405 == codecSelferValueTypeMap1234 { + yyl4405 := r.ReadMapStart() + if yyl4405 == 0 { + z.DecSendContainerState(codecSelfer_containerMapEnd1234) + } else { + x.codecDecodeSelfFromMap(yyl4405, d) + } + } else if yyct4405 == codecSelferValueTypeArray1234 { + yyl4405 := r.ReadArrayStart() + if yyl4405 == 0 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + x.codecDecodeSelfFromArray(yyl4405, d) + } + } else { + panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) + } + } +} + +func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yys4406Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4406Slc + var yyhl4406 bool = l >= 0 + for yyj4406 := 0; ; yyj4406++ { + if yyhl4406 { + if yyj4406 >= l { + break + } + } else { + if r.CheckBreak() { + break + } + } + z.DecSendContainerState(codecSelfer_containerMapKey1234) + yys4406Slc = r.DecodeBytes(yys4406Slc, true, true) + yys4406 := string(yys4406Slc) + z.DecSendContainerState(codecSelfer_containerMapValue1234) + switch yys4406 { + case "kind": + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + case "apiVersion": + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + case "metadata": + if r.TryDecodeAsNil() { + x.ListMeta = pkg2_v1.ListMeta{} + } else { + yyv4409 := &x.ListMeta + yym4410 := z.DecBinary() + _ = yym4410 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4409) { + } else { + z.DecFallback(yyv4409, false) + } + } + case "items": + if r.TryDecodeAsNil() { + x.Items = nil + } else { + yyv4411 := &x.Items + yym4412 := z.DecBinary() + _ = yym4412 + if false { + } else { + h.decSliceComponentStatus((*[]ComponentStatus)(yyv4411), d) + } + } + default: + z.DecStructFieldNotFound(-1, yys4406) + } // end switch yys4406 + } // end for yyj4406 + z.DecSendContainerState(codecSelfer_containerMapEnd1234) +} + +func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + var yyj4413 int + var yyb4413 bool + var yyhl4413 bool = l >= 0 + yyj4413++ + if yyhl4413 { + yyb4413 = yyj4413 > l + } else { + yyb4413 = r.CheckBreak() + } + if yyb4413 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Kind = "" + } else { + x.Kind = string(r.DecodeString()) + } + yyj4413++ + if yyhl4413 { + yyb4413 = yyj4413 > l + } else { + yyb4413 = r.CheckBreak() + } + if yyb4413 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.APIVersion = "" + } else { + x.APIVersion = string(r.DecodeString()) + } + yyj4413++ + if yyhl4413 { + yyb4413 = yyj4413 > l + } else { + yyb4413 = r.CheckBreak() + } + if yyb4413 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.ListMeta = pkg2_v1.ListMeta{} + } else { + yyv4416 := &x.ListMeta + yym4417 := z.DecBinary() + _ = yym4417 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4416) { + } else { + z.DecFallback(yyv4416, false) + } + } + yyj4413++ + if yyhl4413 { + yyb4413 = yyj4413 > l + } else { + yyb4413 = r.CheckBreak() + } + if yyb4413 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.Items = nil + } else { + yyv4418 := &x.Items + yym4419 := z.DecBinary() + _ = yym4419 + if false { + } else { + h.decSliceComponentStatus((*[]ComponentStatus)(yyv4418), d) + } + } + for { + yyj4413++ + if yyhl4413 { + yyb4413 = yyj4413 > l + } else { + yyb4413 = r.CheckBreak() + } + if yyb4413 { + break + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + z.DecStructFieldNotFound(yyj4413-1, "") + } + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x *DownwardAPIVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + if x == nil { + r.EncodeNil() + } else { + yym4420 := z.EncBinary() + _ = yym4420 + if false { + } else if z.HasExtensions() && z.EncExt(x) { + } else { + yysep4421 := !z.EncBinary() + yy2arr4421 := z.EncBasicHandle().StructToArray + var yyq4421 [2]bool + _, _, _ = yysep4421, yyq4421, yy2arr4421 + const yyr4421 bool = false + yyq4421[0] = len(x.Items) != 0 + yyq4421[1] = x.DefaultMode != nil + var yynn4421 int + if yyr4421 || yy2arr4421 { + r.EncodeArrayStart(2) + } else { + yynn4421 = 0 + for _, b := range yyq4421 { + if b { + yynn4421++ + } + } + r.EncodeMapStart(yynn4421) + yynn4421 = 0 + } + if yyr4421 || yy2arr4421 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4421[0] { + if x.Items == nil { + r.EncodeNil() + } else { + yym4423 := z.EncBinary() + _ = yym4423 + if false { + } else { + h.encSliceDownwardAPIVolumeFile(([]DownwardAPIVolumeFile)(x.Items), e) + } + } + } else { + r.EncodeNil() + } + } else { + if yyq4421[0] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("items")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.Items == nil { + r.EncodeNil() + } else { + yym4424 := z.EncBinary() + _ = yym4424 + if false { + } else { + h.encSliceDownwardAPIVolumeFile(([]DownwardAPIVolumeFile)(x.Items), e) + } + } + } + } + if yyr4421 || yy2arr4421 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + if yyq4421[1] { + if x.DefaultMode == nil { + r.EncodeNil() + } else { + yy4426 := *x.DefaultMode + yym4427 := z.EncBinary() + _ = yym4427 + if false { + } else { + r.EncodeInt(int64(yy4426)) + } + } + } else { + r.EncodeNil() + } + } else { + if yyq4421[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("defaultMode")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + if x.DefaultMode == nil { + r.EncodeNil() + } else { + yy4428 := *x.DefaultMode + yym4429 := z.EncBinary() + _ = yym4429 + if false { + } else { + r.EncodeInt(int64(yy4428)) + } + } + } + } + if yyr4421 || yy2arr4421 { + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) + } else { + z.EncSendContainerState(codecSelfer_containerMapEnd1234) + } + } + } +} + +func (x *DownwardAPIVolumeSource) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -55308,7 +55314,7 @@ func (x *ComponentStatusList) CodecDecodeSelf(d *codec1978.Decoder) { } } -func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { +func (x *DownwardAPIVolumeSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -55330,321 +55336,16 @@ func (x *ComponentStatusList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder yys4432 := string(yys4432Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) switch yys4432 { - case "kind": - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - case "apiVersion": - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - case "metadata": - if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} - } else { - yyv4435 := &x.ListMeta - yym4436 := z.DecBinary() - _ = yym4436 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4435) { - } else { - z.DecFallback(yyv4435, false) - } - } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4437 := &x.Items - yym4438 := z.DecBinary() - _ = yym4438 + yyv4433 := &x.Items + yym4434 := z.DecBinary() + _ = yym4434 if false { } else { - h.decSliceComponentStatus((*[]ComponentStatus)(yyv4437), d) - } - } - default: - z.DecStructFieldNotFound(-1, yys4432) - } // end switch yys4432 - } // end for yyj4432 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *ComponentStatusList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj4439 int - var yyb4439 bool - var yyhl4439 bool = l >= 0 - yyj4439++ - if yyhl4439 { - yyb4439 = yyj4439 > l - } else { - yyb4439 = r.CheckBreak() - } - if yyb4439 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - yyj4439++ - if yyhl4439 { - yyb4439 = yyj4439 > l - } else { - yyb4439 = r.CheckBreak() - } - if yyb4439 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - yyj4439++ - if yyhl4439 { - yyb4439 = yyj4439 > l - } else { - yyb4439 = r.CheckBreak() - } - if yyb4439 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} - } else { - yyv4442 := &x.ListMeta - yym4443 := z.DecBinary() - _ = yym4443 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4442) { - } else { - z.DecFallback(yyv4442, false) - } - } - yyj4439++ - if yyhl4439 { - yyb4439 = yyj4439 > l - } else { - yyb4439 = r.CheckBreak() - } - if yyb4439 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Items = nil - } else { - yyv4444 := &x.Items - yym4445 := z.DecBinary() - _ = yym4445 - if false { - } else { - h.decSliceComponentStatus((*[]ComponentStatus)(yyv4444), d) - } - } - for { - yyj4439++ - if yyhl4439 { - yyb4439 = yyj4439 > l - } else { - yyb4439 = r.CheckBreak() - } - if yyb4439 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4439-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x *DownwardAPIVolumeSource) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym4446 := z.EncBinary() - _ = yym4446 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep4447 := !z.EncBinary() - yy2arr4447 := z.EncBasicHandle().StructToArray - var yyq4447 [2]bool - _, _, _ = yysep4447, yyq4447, yy2arr4447 - const yyr4447 bool = false - yyq4447[0] = len(x.Items) != 0 - yyq4447[1] = x.DefaultMode != nil - var yynn4447 int - if yyr4447 || yy2arr4447 { - r.EncodeArrayStart(2) - } else { - yynn4447 = 0 - for _, b := range yyq4447 { - if b { - yynn4447++ - } - } - r.EncodeMapStart(yynn4447) - yynn4447 = 0 - } - if yyr4447 || yy2arr4447 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4447[0] { - if x.Items == nil { - r.EncodeNil() - } else { - yym4449 := z.EncBinary() - _ = yym4449 - if false { - } else { - h.encSliceDownwardAPIVolumeFile(([]DownwardAPIVolumeFile)(x.Items), e) - } - } - } else { - r.EncodeNil() - } - } else { - if yyq4447[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("items")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.Items == nil { - r.EncodeNil() - } else { - yym4450 := z.EncBinary() - _ = yym4450 - if false { - } else { - h.encSliceDownwardAPIVolumeFile(([]DownwardAPIVolumeFile)(x.Items), e) - } - } - } - } - if yyr4447 || yy2arr4447 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4447[1] { - if x.DefaultMode == nil { - r.EncodeNil() - } else { - yy4452 := *x.DefaultMode - yym4453 := z.EncBinary() - _ = yym4453 - if false { - } else { - r.EncodeInt(int64(yy4452)) - } - } - } else { - r.EncodeNil() - } - } else { - if yyq4447[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("defaultMode")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - if x.DefaultMode == nil { - r.EncodeNil() - } else { - yy4454 := *x.DefaultMode - yym4455 := z.EncBinary() - _ = yym4455 - if false { - } else { - r.EncodeInt(int64(yy4454)) - } - } - } - } - if yyr4447 || yy2arr4447 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *DownwardAPIVolumeSource) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym4456 := z.DecBinary() - _ = yym4456 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct4457 := r.ContainerType() - if yyct4457 == codecSelferValueTypeMap1234 { - yyl4457 := r.ReadMapStart() - if yyl4457 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl4457, d) - } - } else if yyct4457 == codecSelferValueTypeArray1234 { - yyl4457 := r.ReadArrayStart() - if yyl4457 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl4457, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *DownwardAPIVolumeSource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys4458Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4458Slc - var yyhl4458 bool = l >= 0 - for yyj4458 := 0; ; yyj4458++ { - if yyhl4458 { - if yyj4458 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4458Slc = r.DecodeBytes(yys4458Slc, true, true) - yys4458 := string(yys4458Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4458 { - case "items": - if r.TryDecodeAsNil() { - x.Items = nil - } else { - yyv4459 := &x.Items - yym4460 := z.DecBinary() - _ = yym4460 - if false { - } else { - h.decSliceDownwardAPIVolumeFile((*[]DownwardAPIVolumeFile)(yyv4459), d) + h.decSliceDownwardAPIVolumeFile((*[]DownwardAPIVolumeFile)(yyv4433), d) } } case "defaultMode": @@ -55656,17 +55357,17 @@ func (x *DownwardAPIVolumeSource) codecDecodeSelfFromMap(l int, d *codec1978.Dec if x.DefaultMode == nil { x.DefaultMode = new(int32) } - yym4462 := z.DecBinary() - _ = yym4462 + yym4436 := z.DecBinary() + _ = yym4436 if false { } else { *((*int32)(x.DefaultMode)) = int32(r.DecodeInt(32)) } } default: - z.DecStructFieldNotFound(-1, yys4458) - } // end switch yys4458 - } // end for yyj4458 + z.DecStructFieldNotFound(-1, yys4432) + } // end switch yys4432 + } // end for yyj4432 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -55674,16 +55375,16 @@ func (x *DownwardAPIVolumeSource) codecDecodeSelfFromArray(l int, d *codec1978.D var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4463 int - var yyb4463 bool - var yyhl4463 bool = l >= 0 - yyj4463++ - if yyhl4463 { - yyb4463 = yyj4463 > l + var yyj4437 int + var yyb4437 bool + var yyhl4437 bool = l >= 0 + yyj4437++ + if yyhl4437 { + yyb4437 = yyj4437 > l } else { - yyb4463 = r.CheckBreak() + yyb4437 = r.CheckBreak() } - if yyb4463 { + if yyb4437 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55691,21 +55392,21 @@ func (x *DownwardAPIVolumeSource) codecDecodeSelfFromArray(l int, d *codec1978.D if r.TryDecodeAsNil() { x.Items = nil } else { - yyv4464 := &x.Items - yym4465 := z.DecBinary() - _ = yym4465 + yyv4438 := &x.Items + yym4439 := z.DecBinary() + _ = yym4439 if false { } else { - h.decSliceDownwardAPIVolumeFile((*[]DownwardAPIVolumeFile)(yyv4464), d) + h.decSliceDownwardAPIVolumeFile((*[]DownwardAPIVolumeFile)(yyv4438), d) } } - yyj4463++ - if yyhl4463 { - yyb4463 = yyj4463 > l + yyj4437++ + if yyhl4437 { + yyb4437 = yyj4437 > l } else { - yyb4463 = r.CheckBreak() + yyb4437 = r.CheckBreak() } - if yyb4463 { + if yyb4437 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -55718,25 +55419,25 @@ func (x *DownwardAPIVolumeSource) codecDecodeSelfFromArray(l int, d *codec1978.D if x.DefaultMode == nil { x.DefaultMode = new(int32) } - yym4467 := z.DecBinary() - _ = yym4467 + yym4441 := z.DecBinary() + _ = yym4441 if false { } else { *((*int32)(x.DefaultMode)) = int32(r.DecodeInt(32)) } } for { - yyj4463++ - if yyhl4463 { - yyb4463 = yyj4463 > l + yyj4437++ + if yyhl4437 { + yyb4437 = yyj4437 > l } else { - yyb4463 = r.CheckBreak() + yyb4437 = r.CheckBreak() } - if yyb4463 { + if yyb4437 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4463-1, "") + z.DecStructFieldNotFound(yyj4437-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -55748,36 +55449,36 @@ func (x *DownwardAPIVolumeFile) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4468 := z.EncBinary() - _ = yym4468 + yym4442 := z.EncBinary() + _ = yym4442 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4469 := !z.EncBinary() - yy2arr4469 := z.EncBasicHandle().StructToArray - var yyq4469 [4]bool - _, _, _ = yysep4469, yyq4469, yy2arr4469 - const yyr4469 bool = false - yyq4469[1] = x.FieldRef != nil - yyq4469[2] = x.ResourceFieldRef != nil - yyq4469[3] = x.Mode != nil - var yynn4469 int - if yyr4469 || yy2arr4469 { + yysep4443 := !z.EncBinary() + yy2arr4443 := z.EncBasicHandle().StructToArray + var yyq4443 [4]bool + _, _, _ = yysep4443, yyq4443, yy2arr4443 + const yyr4443 bool = false + yyq4443[1] = x.FieldRef != nil + yyq4443[2] = x.ResourceFieldRef != nil + yyq4443[3] = x.Mode != nil + var yynn4443 int + if yyr4443 || yy2arr4443 { r.EncodeArrayStart(4) } else { - yynn4469 = 1 - for _, b := range yyq4469 { + yynn4443 = 1 + for _, b := range yyq4443 { if b { - yynn4469++ + yynn4443++ } } - r.EncodeMapStart(yynn4469) - yynn4469 = 0 + r.EncodeMapStart(yynn4443) + yynn4443 = 0 } - if yyr4469 || yy2arr4469 { + if yyr4443 || yy2arr4443 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym4471 := z.EncBinary() - _ = yym4471 + yym4445 := z.EncBinary() + _ = yym4445 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) @@ -55786,16 +55487,16 @@ func (x *DownwardAPIVolumeFile) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("path")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4472 := z.EncBinary() - _ = yym4472 + yym4446 := z.EncBinary() + _ = yym4446 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Path)) } } - if yyr4469 || yy2arr4469 { + if yyr4443 || yy2arr4443 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4469[1] { + if yyq4443[1] { if x.FieldRef == nil { r.EncodeNil() } else { @@ -55805,7 +55506,7 @@ func (x *DownwardAPIVolumeFile) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4469[1] { + if yyq4443[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("fieldRef")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -55816,9 +55517,9 @@ func (x *DownwardAPIVolumeFile) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4469 || yy2arr4469 { + if yyr4443 || yy2arr4443 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4469[2] { + if yyq4443[2] { if x.ResourceFieldRef == nil { r.EncodeNil() } else { @@ -55828,7 +55529,7 @@ func (x *DownwardAPIVolumeFile) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4469[2] { + if yyq4443[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("resourceFieldRef")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -55839,42 +55540,42 @@ func (x *DownwardAPIVolumeFile) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4469 || yy2arr4469 { + if yyr4443 || yy2arr4443 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4469[3] { + if yyq4443[3] { if x.Mode == nil { r.EncodeNil() } else { - yy4476 := *x.Mode - yym4477 := z.EncBinary() - _ = yym4477 + yy4450 := *x.Mode + yym4451 := z.EncBinary() + _ = yym4451 if false { } else { - r.EncodeInt(int64(yy4476)) + r.EncodeInt(int64(yy4450)) } } } else { r.EncodeNil() } } else { - if yyq4469[3] { + if yyq4443[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("mode")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Mode == nil { r.EncodeNil() } else { - yy4478 := *x.Mode - yym4479 := z.EncBinary() - _ = yym4479 + yy4452 := *x.Mode + yym4453 := z.EncBinary() + _ = yym4453 if false { } else { - r.EncodeInt(int64(yy4478)) + r.EncodeInt(int64(yy4452)) } } } } - if yyr4469 || yy2arr4469 { + if yyr4443 || yy2arr4443 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -55887,25 +55588,25 @@ func (x *DownwardAPIVolumeFile) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4480 := z.DecBinary() - _ = yym4480 + yym4454 := z.DecBinary() + _ = yym4454 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4481 := r.ContainerType() - if yyct4481 == codecSelferValueTypeMap1234 { - yyl4481 := r.ReadMapStart() - if yyl4481 == 0 { + yyct4455 := r.ContainerType() + if yyct4455 == codecSelferValueTypeMap1234 { + yyl4455 := r.ReadMapStart() + if yyl4455 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4481, d) + x.codecDecodeSelfFromMap(yyl4455, d) } - } else if yyct4481 == codecSelferValueTypeArray1234 { - yyl4481 := r.ReadArrayStart() - if yyl4481 == 0 { + } else if yyct4455 == codecSelferValueTypeArray1234 { + yyl4455 := r.ReadArrayStart() + if yyl4455 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4481, d) + x.codecDecodeSelfFromArray(yyl4455, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -55917,12 +55618,12 @@ func (x *DownwardAPIVolumeFile) codecDecodeSelfFromMap(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4482Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4482Slc - var yyhl4482 bool = l >= 0 - for yyj4482 := 0; ; yyj4482++ { - if yyhl4482 { - if yyj4482 >= l { + var yys4456Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4456Slc + var yyhl4456 bool = l >= 0 + for yyj4456 := 0; ; yyj4456++ { + if yyhl4456 { + if yyj4456 >= l { break } } else { @@ -55931,10 +55632,10 @@ func (x *DownwardAPIVolumeFile) codecDecodeSelfFromMap(l int, d *codec1978.Decod } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4482Slc = r.DecodeBytes(yys4482Slc, true, true) - yys4482 := string(yys4482Slc) + yys4456Slc = r.DecodeBytes(yys4456Slc, true, true) + yys4456 := string(yys4456Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4482 { + switch yys4456 { case "path": if r.TryDecodeAsNil() { x.Path = "" @@ -55972,17 +55673,17 @@ func (x *DownwardAPIVolumeFile) codecDecodeSelfFromMap(l int, d *codec1978.Decod if x.Mode == nil { x.Mode = new(int32) } - yym4487 := z.DecBinary() - _ = yym4487 + yym4461 := z.DecBinary() + _ = yym4461 if false { } else { *((*int32)(x.Mode)) = int32(r.DecodeInt(32)) } } default: - z.DecStructFieldNotFound(-1, yys4482) - } // end switch yys4482 - } // end for yyj4482 + z.DecStructFieldNotFound(-1, yys4456) + } // end switch yys4456 + } // end for yyj4456 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -55990,16 +55691,16 @@ func (x *DownwardAPIVolumeFile) codecDecodeSelfFromArray(l int, d *codec1978.Dec var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4488 int - var yyb4488 bool - var yyhl4488 bool = l >= 0 - yyj4488++ - if yyhl4488 { - yyb4488 = yyj4488 > l + var yyj4462 int + var yyb4462 bool + var yyhl4462 bool = l >= 0 + yyj4462++ + if yyhl4462 { + yyb4462 = yyj4462 > l } else { - yyb4488 = r.CheckBreak() + yyb4462 = r.CheckBreak() } - if yyb4488 { + if yyb4462 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56009,13 +55710,13 @@ func (x *DownwardAPIVolumeFile) codecDecodeSelfFromArray(l int, d *codec1978.Dec } else { x.Path = string(r.DecodeString()) } - yyj4488++ - if yyhl4488 { - yyb4488 = yyj4488 > l + yyj4462++ + if yyhl4462 { + yyb4462 = yyj4462 > l } else { - yyb4488 = r.CheckBreak() + yyb4462 = r.CheckBreak() } - if yyb4488 { + if yyb4462 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56030,13 +55731,13 @@ func (x *DownwardAPIVolumeFile) codecDecodeSelfFromArray(l int, d *codec1978.Dec } x.FieldRef.CodecDecodeSelf(d) } - yyj4488++ - if yyhl4488 { - yyb4488 = yyj4488 > l + yyj4462++ + if yyhl4462 { + yyb4462 = yyj4462 > l } else { - yyb4488 = r.CheckBreak() + yyb4462 = r.CheckBreak() } - if yyb4488 { + if yyb4462 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56051,13 +55752,13 @@ func (x *DownwardAPIVolumeFile) codecDecodeSelfFromArray(l int, d *codec1978.Dec } x.ResourceFieldRef.CodecDecodeSelf(d) } - yyj4488++ - if yyhl4488 { - yyb4488 = yyj4488 > l + yyj4462++ + if yyhl4462 { + yyb4462 = yyj4462 > l } else { - yyb4488 = r.CheckBreak() + yyb4462 = r.CheckBreak() } - if yyb4488 { + if yyb4462 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56070,25 +55771,25 @@ func (x *DownwardAPIVolumeFile) codecDecodeSelfFromArray(l int, d *codec1978.Dec if x.Mode == nil { x.Mode = new(int32) } - yym4493 := z.DecBinary() - _ = yym4493 + yym4467 := z.DecBinary() + _ = yym4467 if false { } else { *((*int32)(x.Mode)) = int32(r.DecodeInt(32)) } } for { - yyj4488++ - if yyhl4488 { - yyb4488 = yyj4488 > l + yyj4462++ + if yyhl4462 { + yyb4462 = yyj4462 > l } else { - yyb4488 = r.CheckBreak() + yyb4462 = r.CheckBreak() } - if yyb4488 { + if yyb4462 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4488-1, "") + z.DecStructFieldNotFound(yyj4462-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -56100,38 +55801,38 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4494 := z.EncBinary() - _ = yym4494 + yym4468 := z.EncBinary() + _ = yym4468 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4495 := !z.EncBinary() - yy2arr4495 := z.EncBasicHandle().StructToArray - var yyq4495 [6]bool - _, _, _ = yysep4495, yyq4495, yy2arr4495 - const yyr4495 bool = false - yyq4495[0] = x.Capabilities != nil - yyq4495[1] = x.Privileged != nil - yyq4495[2] = x.SELinuxOptions != nil - yyq4495[3] = x.RunAsUser != nil - yyq4495[4] = x.RunAsNonRoot != nil - yyq4495[5] = x.ReadOnlyRootFilesystem != nil - var yynn4495 int - if yyr4495 || yy2arr4495 { + yysep4469 := !z.EncBinary() + yy2arr4469 := z.EncBasicHandle().StructToArray + var yyq4469 [6]bool + _, _, _ = yysep4469, yyq4469, yy2arr4469 + const yyr4469 bool = false + yyq4469[0] = x.Capabilities != nil + yyq4469[1] = x.Privileged != nil + yyq4469[2] = x.SELinuxOptions != nil + yyq4469[3] = x.RunAsUser != nil + yyq4469[4] = x.RunAsNonRoot != nil + yyq4469[5] = x.ReadOnlyRootFilesystem != nil + var yynn4469 int + if yyr4469 || yy2arr4469 { r.EncodeArrayStart(6) } else { - yynn4495 = 0 - for _, b := range yyq4495 { + yynn4469 = 0 + for _, b := range yyq4469 { if b { - yynn4495++ + yynn4469++ } } - r.EncodeMapStart(yynn4495) - yynn4495 = 0 + r.EncodeMapStart(yynn4469) + yynn4469 = 0 } - if yyr4495 || yy2arr4495 { + if yyr4469 || yy2arr4469 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4495[0] { + if yyq4469[0] { if x.Capabilities == nil { r.EncodeNil() } else { @@ -56141,7 +55842,7 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4495[0] { + if yyq4469[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("capabilities")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -56152,44 +55853,44 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4495 || yy2arr4495 { + if yyr4469 || yy2arr4469 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4495[1] { + if yyq4469[1] { if x.Privileged == nil { r.EncodeNil() } else { - yy4498 := *x.Privileged - yym4499 := z.EncBinary() - _ = yym4499 + yy4472 := *x.Privileged + yym4473 := z.EncBinary() + _ = yym4473 if false { } else { - r.EncodeBool(bool(yy4498)) + r.EncodeBool(bool(yy4472)) } } } else { r.EncodeNil() } } else { - if yyq4495[1] { + if yyq4469[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("privileged")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Privileged == nil { r.EncodeNil() } else { - yy4500 := *x.Privileged - yym4501 := z.EncBinary() - _ = yym4501 + yy4474 := *x.Privileged + yym4475 := z.EncBinary() + _ = yym4475 if false { } else { - r.EncodeBool(bool(yy4500)) + r.EncodeBool(bool(yy4474)) } } } } - if yyr4495 || yy2arr4495 { + if yyr4469 || yy2arr4469 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4495[2] { + if yyq4469[2] { if x.SELinuxOptions == nil { r.EncodeNil() } else { @@ -56199,7 +55900,7 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq4495[2] { + if yyq4469[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("seLinuxOptions")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -56210,112 +55911,112 @@ func (x *SecurityContext) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr4495 || yy2arr4495 { + if yyr4469 || yy2arr4469 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4495[3] { + if yyq4469[3] { if x.RunAsUser == nil { r.EncodeNil() } else { - yy4504 := *x.RunAsUser - yym4505 := z.EncBinary() - _ = yym4505 + yy4478 := *x.RunAsUser + yym4479 := z.EncBinary() + _ = yym4479 if false { } else { - r.EncodeInt(int64(yy4504)) + r.EncodeInt(int64(yy4478)) } } } else { r.EncodeNil() } } else { - if yyq4495[3] { + if yyq4469[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runAsUser")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.RunAsUser == nil { r.EncodeNil() } else { - yy4506 := *x.RunAsUser - yym4507 := z.EncBinary() - _ = yym4507 + yy4480 := *x.RunAsUser + yym4481 := z.EncBinary() + _ = yym4481 if false { } else { - r.EncodeInt(int64(yy4506)) + r.EncodeInt(int64(yy4480)) } } } } - if yyr4495 || yy2arr4495 { + if yyr4469 || yy2arr4469 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4495[4] { + if yyq4469[4] { if x.RunAsNonRoot == nil { r.EncodeNil() } else { - yy4509 := *x.RunAsNonRoot - yym4510 := z.EncBinary() - _ = yym4510 + yy4483 := *x.RunAsNonRoot + yym4484 := z.EncBinary() + _ = yym4484 if false { } else { - r.EncodeBool(bool(yy4509)) + r.EncodeBool(bool(yy4483)) } } } else { r.EncodeNil() } } else { - if yyq4495[4] { + if yyq4469[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runAsNonRoot")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.RunAsNonRoot == nil { r.EncodeNil() } else { - yy4511 := *x.RunAsNonRoot - yym4512 := z.EncBinary() - _ = yym4512 + yy4485 := *x.RunAsNonRoot + yym4486 := z.EncBinary() + _ = yym4486 if false { } else { - r.EncodeBool(bool(yy4511)) + r.EncodeBool(bool(yy4485)) } } } } - if yyr4495 || yy2arr4495 { + if yyr4469 || yy2arr4469 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4495[5] { + if yyq4469[5] { if x.ReadOnlyRootFilesystem == nil { r.EncodeNil() } else { - yy4514 := *x.ReadOnlyRootFilesystem - yym4515 := z.EncBinary() - _ = yym4515 + yy4488 := *x.ReadOnlyRootFilesystem + yym4489 := z.EncBinary() + _ = yym4489 if false { } else { - r.EncodeBool(bool(yy4514)) + r.EncodeBool(bool(yy4488)) } } } else { r.EncodeNil() } } else { - if yyq4495[5] { + if yyq4469[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("readOnlyRootFilesystem")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.ReadOnlyRootFilesystem == nil { r.EncodeNil() } else { - yy4516 := *x.ReadOnlyRootFilesystem - yym4517 := z.EncBinary() - _ = yym4517 + yy4490 := *x.ReadOnlyRootFilesystem + yym4491 := z.EncBinary() + _ = yym4491 if false { } else { - r.EncodeBool(bool(yy4516)) + r.EncodeBool(bool(yy4490)) } } } } - if yyr4495 || yy2arr4495 { + if yyr4469 || yy2arr4469 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -56328,25 +56029,25 @@ func (x *SecurityContext) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4518 := z.DecBinary() - _ = yym4518 + yym4492 := z.DecBinary() + _ = yym4492 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4519 := r.ContainerType() - if yyct4519 == codecSelferValueTypeMap1234 { - yyl4519 := r.ReadMapStart() - if yyl4519 == 0 { + yyct4493 := r.ContainerType() + if yyct4493 == codecSelferValueTypeMap1234 { + yyl4493 := r.ReadMapStart() + if yyl4493 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4519, d) + x.codecDecodeSelfFromMap(yyl4493, d) } - } else if yyct4519 == codecSelferValueTypeArray1234 { - yyl4519 := r.ReadArrayStart() - if yyl4519 == 0 { + } else if yyct4493 == codecSelferValueTypeArray1234 { + yyl4493 := r.ReadArrayStart() + if yyl4493 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4519, d) + x.codecDecodeSelfFromArray(yyl4493, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -56358,12 +56059,12 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4520Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4520Slc - var yyhl4520 bool = l >= 0 - for yyj4520 := 0; ; yyj4520++ { - if yyhl4520 { - if yyj4520 >= l { + var yys4494Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4494Slc + var yyhl4494 bool = l >= 0 + for yyj4494 := 0; ; yyj4494++ { + if yyhl4494 { + if yyj4494 >= l { break } } else { @@ -56372,10 +56073,10 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4520Slc = r.DecodeBytes(yys4520Slc, true, true) - yys4520 := string(yys4520Slc) + yys4494Slc = r.DecodeBytes(yys4494Slc, true, true) + yys4494 := string(yys4494Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4520 { + switch yys4494 { case "capabilities": if r.TryDecodeAsNil() { if x.Capabilities != nil { @@ -56396,8 +56097,8 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.Privileged == nil { x.Privileged = new(bool) } - yym4523 := z.DecBinary() - _ = yym4523 + yym4497 := z.DecBinary() + _ = yym4497 if false { } else { *((*bool)(x.Privileged)) = r.DecodeBool() @@ -56423,8 +56124,8 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.RunAsUser == nil { x.RunAsUser = new(int64) } - yym4526 := z.DecBinary() - _ = yym4526 + yym4500 := z.DecBinary() + _ = yym4500 if false { } else { *((*int64)(x.RunAsUser)) = int64(r.DecodeInt(64)) @@ -56439,8 +56140,8 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.RunAsNonRoot == nil { x.RunAsNonRoot = new(bool) } - yym4528 := z.DecBinary() - _ = yym4528 + yym4502 := z.DecBinary() + _ = yym4502 if false { } else { *((*bool)(x.RunAsNonRoot)) = r.DecodeBool() @@ -56455,17 +56156,17 @@ func (x *SecurityContext) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.ReadOnlyRootFilesystem == nil { x.ReadOnlyRootFilesystem = new(bool) } - yym4530 := z.DecBinary() - _ = yym4530 + yym4504 := z.DecBinary() + _ = yym4504 if false { } else { *((*bool)(x.ReadOnlyRootFilesystem)) = r.DecodeBool() } } default: - z.DecStructFieldNotFound(-1, yys4520) - } // end switch yys4520 - } // end for yyj4520 + z.DecStructFieldNotFound(-1, yys4494) + } // end switch yys4494 + } // end for yyj4494 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -56473,16 +56174,16 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4531 int - var yyb4531 bool - var yyhl4531 bool = l >= 0 - yyj4531++ - if yyhl4531 { - yyb4531 = yyj4531 > l + var yyj4505 int + var yyb4505 bool + var yyhl4505 bool = l >= 0 + yyj4505++ + if yyhl4505 { + yyb4505 = yyj4505 > l } else { - yyb4531 = r.CheckBreak() + yyb4505 = r.CheckBreak() } - if yyb4531 { + if yyb4505 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56497,13 +56198,13 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } x.Capabilities.CodecDecodeSelf(d) } - yyj4531++ - if yyhl4531 { - yyb4531 = yyj4531 > l + yyj4505++ + if yyhl4505 { + yyb4505 = yyj4505 > l } else { - yyb4531 = r.CheckBreak() + yyb4505 = r.CheckBreak() } - if yyb4531 { + if yyb4505 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56516,20 +56217,20 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.Privileged == nil { x.Privileged = new(bool) } - yym4534 := z.DecBinary() - _ = yym4534 + yym4508 := z.DecBinary() + _ = yym4508 if false { } else { *((*bool)(x.Privileged)) = r.DecodeBool() } } - yyj4531++ - if yyhl4531 { - yyb4531 = yyj4531 > l + yyj4505++ + if yyhl4505 { + yyb4505 = yyj4505 > l } else { - yyb4531 = r.CheckBreak() + yyb4505 = r.CheckBreak() } - if yyb4531 { + if yyb4505 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56544,13 +56245,13 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } x.SELinuxOptions.CodecDecodeSelf(d) } - yyj4531++ - if yyhl4531 { - yyb4531 = yyj4531 > l + yyj4505++ + if yyhl4505 { + yyb4505 = yyj4505 > l } else { - yyb4531 = r.CheckBreak() + yyb4505 = r.CheckBreak() } - if yyb4531 { + if yyb4505 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56563,20 +56264,20 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.RunAsUser == nil { x.RunAsUser = new(int64) } - yym4537 := z.DecBinary() - _ = yym4537 + yym4511 := z.DecBinary() + _ = yym4511 if false { } else { *((*int64)(x.RunAsUser)) = int64(r.DecodeInt(64)) } } - yyj4531++ - if yyhl4531 { - yyb4531 = yyj4531 > l + yyj4505++ + if yyhl4505 { + yyb4505 = yyj4505 > l } else { - yyb4531 = r.CheckBreak() + yyb4505 = r.CheckBreak() } - if yyb4531 { + if yyb4505 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56589,20 +56290,20 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.RunAsNonRoot == nil { x.RunAsNonRoot = new(bool) } - yym4539 := z.DecBinary() - _ = yym4539 + yym4513 := z.DecBinary() + _ = yym4513 if false { } else { *((*bool)(x.RunAsNonRoot)) = r.DecodeBool() } } - yyj4531++ - if yyhl4531 { - yyb4531 = yyj4531 > l + yyj4505++ + if yyhl4505 { + yyb4505 = yyj4505 > l } else { - yyb4531 = r.CheckBreak() + yyb4505 = r.CheckBreak() } - if yyb4531 { + if yyb4505 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56615,25 +56316,25 @@ func (x *SecurityContext) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if x.ReadOnlyRootFilesystem == nil { x.ReadOnlyRootFilesystem = new(bool) } - yym4541 := z.DecBinary() - _ = yym4541 + yym4515 := z.DecBinary() + _ = yym4515 if false { } else { *((*bool)(x.ReadOnlyRootFilesystem)) = r.DecodeBool() } } for { - yyj4531++ - if yyhl4531 { - yyb4531 = yyj4531 > l + yyj4505++ + if yyhl4505 { + yyb4505 = yyj4505 > l } else { - yyb4531 = r.CheckBreak() + yyb4505 = r.CheckBreak() } - if yyb4531 { + if yyb4505 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4531-1, "") + z.DecStructFieldNotFound(yyj4505-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -56645,38 +56346,38 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4542 := z.EncBinary() - _ = yym4542 + yym4516 := z.EncBinary() + _ = yym4516 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4543 := !z.EncBinary() - yy2arr4543 := z.EncBasicHandle().StructToArray - var yyq4543 [4]bool - _, _, _ = yysep4543, yyq4543, yy2arr4543 - const yyr4543 bool = false - yyq4543[0] = x.User != "" - yyq4543[1] = x.Role != "" - yyq4543[2] = x.Type != "" - yyq4543[3] = x.Level != "" - var yynn4543 int - if yyr4543 || yy2arr4543 { + yysep4517 := !z.EncBinary() + yy2arr4517 := z.EncBasicHandle().StructToArray + var yyq4517 [4]bool + _, _, _ = yysep4517, yyq4517, yy2arr4517 + const yyr4517 bool = false + yyq4517[0] = x.User != "" + yyq4517[1] = x.Role != "" + yyq4517[2] = x.Type != "" + yyq4517[3] = x.Level != "" + var yynn4517 int + if yyr4517 || yy2arr4517 { r.EncodeArrayStart(4) } else { - yynn4543 = 0 - for _, b := range yyq4543 { + yynn4517 = 0 + for _, b := range yyq4517 { if b { - yynn4543++ + yynn4517++ } } - r.EncodeMapStart(yynn4543) - yynn4543 = 0 + r.EncodeMapStart(yynn4517) + yynn4517 = 0 } - if yyr4543 || yy2arr4543 { + if yyr4517 || yy2arr4517 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4543[0] { - yym4545 := z.EncBinary() - _ = yym4545 + if yyq4517[0] { + yym4519 := z.EncBinary() + _ = yym4519 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.User)) @@ -56685,23 +56386,23 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4543[0] { + if yyq4517[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("user")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4546 := z.EncBinary() - _ = yym4546 + yym4520 := z.EncBinary() + _ = yym4520 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.User)) } } } - if yyr4543 || yy2arr4543 { + if yyr4517 || yy2arr4517 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4543[1] { - yym4548 := z.EncBinary() - _ = yym4548 + if yyq4517[1] { + yym4522 := z.EncBinary() + _ = yym4522 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Role)) @@ -56710,23 +56411,23 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4543[1] { + if yyq4517[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("role")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4549 := z.EncBinary() - _ = yym4549 + yym4523 := z.EncBinary() + _ = yym4523 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Role)) } } } - if yyr4543 || yy2arr4543 { + if yyr4517 || yy2arr4517 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4543[2] { - yym4551 := z.EncBinary() - _ = yym4551 + if yyq4517[2] { + yym4525 := z.EncBinary() + _ = yym4525 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) @@ -56735,23 +56436,23 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4543[2] { + if yyq4517[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("type")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4552 := z.EncBinary() - _ = yym4552 + yym4526 := z.EncBinary() + _ = yym4526 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Type)) } } } - if yyr4543 || yy2arr4543 { + if yyr4517 || yy2arr4517 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4543[3] { - yym4554 := z.EncBinary() - _ = yym4554 + if yyq4517[3] { + yym4528 := z.EncBinary() + _ = yym4528 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Level)) @@ -56760,19 +56461,19 @@ func (x *SELinuxOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4543[3] { + if yyq4517[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("level")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4555 := z.EncBinary() - _ = yym4555 + yym4529 := z.EncBinary() + _ = yym4529 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Level)) } } } - if yyr4543 || yy2arr4543 { + if yyr4517 || yy2arr4517 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -56785,25 +56486,25 @@ func (x *SELinuxOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4556 := z.DecBinary() - _ = yym4556 + yym4530 := z.DecBinary() + _ = yym4530 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4557 := r.ContainerType() - if yyct4557 == codecSelferValueTypeMap1234 { - yyl4557 := r.ReadMapStart() - if yyl4557 == 0 { + yyct4531 := r.ContainerType() + if yyct4531 == codecSelferValueTypeMap1234 { + yyl4531 := r.ReadMapStart() + if yyl4531 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4557, d) + x.codecDecodeSelfFromMap(yyl4531, d) } - } else if yyct4557 == codecSelferValueTypeArray1234 { - yyl4557 := r.ReadArrayStart() - if yyl4557 == 0 { + } else if yyct4531 == codecSelferValueTypeArray1234 { + yyl4531 := r.ReadArrayStart() + if yyl4531 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4557, d) + x.codecDecodeSelfFromArray(yyl4531, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -56815,12 +56516,12 @@ func (x *SELinuxOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4558Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4558Slc - var yyhl4558 bool = l >= 0 - for yyj4558 := 0; ; yyj4558++ { - if yyhl4558 { - if yyj4558 >= l { + var yys4532Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4532Slc + var yyhl4532 bool = l >= 0 + for yyj4532 := 0; ; yyj4532++ { + if yyhl4532 { + if yyj4532 >= l { break } } else { @@ -56829,10 +56530,10 @@ func (x *SELinuxOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4558Slc = r.DecodeBytes(yys4558Slc, true, true) - yys4558 := string(yys4558Slc) + yys4532Slc = r.DecodeBytes(yys4532Slc, true, true) + yys4532 := string(yys4532Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4558 { + switch yys4532 { case "user": if r.TryDecodeAsNil() { x.User = "" @@ -56858,9 +56559,9 @@ func (x *SELinuxOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Level = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys4558) - } // end switch yys4558 - } // end for yyj4558 + z.DecStructFieldNotFound(-1, yys4532) + } // end switch yys4532 + } // end for yyj4532 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -56868,16 +56569,16 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4563 int - var yyb4563 bool - var yyhl4563 bool = l >= 0 - yyj4563++ - if yyhl4563 { - yyb4563 = yyj4563 > l + var yyj4537 int + var yyb4537 bool + var yyhl4537 bool = l >= 0 + yyj4537++ + if yyhl4537 { + yyb4537 = yyj4537 > l } else { - yyb4563 = r.CheckBreak() + yyb4537 = r.CheckBreak() } - if yyb4563 { + if yyb4537 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56887,13 +56588,13 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.User = string(r.DecodeString()) } - yyj4563++ - if yyhl4563 { - yyb4563 = yyj4563 > l + yyj4537++ + if yyhl4537 { + yyb4537 = yyj4537 > l } else { - yyb4563 = r.CheckBreak() + yyb4537 = r.CheckBreak() } - if yyb4563 { + if yyb4537 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56903,13 +56604,13 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Role = string(r.DecodeString()) } - yyj4563++ - if yyhl4563 { - yyb4563 = yyj4563 > l + yyj4537++ + if yyhl4537 { + yyb4537 = yyj4537 > l } else { - yyb4563 = r.CheckBreak() + yyb4537 = r.CheckBreak() } - if yyb4563 { + if yyb4537 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56919,13 +56620,13 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Type = string(r.DecodeString()) } - yyj4563++ - if yyhl4563 { - yyb4563 = yyj4563 > l + yyj4537++ + if yyhl4537 { + yyb4537 = yyj4537 > l } else { - yyb4563 = r.CheckBreak() + yyb4537 = r.CheckBreak() } - if yyb4563 { + if yyb4537 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -56936,17 +56637,17 @@ func (x *SELinuxOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Level = string(r.DecodeString()) } for { - yyj4563++ - if yyhl4563 { - yyb4563 = yyj4563 > l + yyj4537++ + if yyhl4537 { + yyb4537 = yyj4537 > l } else { - yyb4563 = r.CheckBreak() + yyb4537 = r.CheckBreak() } - if yyb4563 { + if yyb4537 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4563-1, "") + z.DecStructFieldNotFound(yyj4537-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -56958,37 +56659,37 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym4568 := z.EncBinary() - _ = yym4568 + yym4542 := z.EncBinary() + _ = yym4542 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep4569 := !z.EncBinary() - yy2arr4569 := z.EncBasicHandle().StructToArray - var yyq4569 [5]bool - _, _, _ = yysep4569, yyq4569, yy2arr4569 - const yyr4569 bool = false - yyq4569[0] = x.Kind != "" - yyq4569[1] = x.APIVersion != "" - yyq4569[2] = true - var yynn4569 int - if yyr4569 || yy2arr4569 { + yysep4543 := !z.EncBinary() + yy2arr4543 := z.EncBasicHandle().StructToArray + var yyq4543 [5]bool + _, _, _ = yysep4543, yyq4543, yy2arr4543 + const yyr4543 bool = false + yyq4543[0] = x.Kind != "" + yyq4543[1] = x.APIVersion != "" + yyq4543[2] = true + var yynn4543 int + if yyr4543 || yy2arr4543 { r.EncodeArrayStart(5) } else { - yynn4569 = 2 - for _, b := range yyq4569 { + yynn4543 = 2 + for _, b := range yyq4543 { if b { - yynn4569++ + yynn4543++ } } - r.EncodeMapStart(yynn4569) - yynn4569 = 0 + r.EncodeMapStart(yynn4543) + yynn4543 = 0 } - if yyr4569 || yy2arr4569 { + if yyr4543 || yy2arr4543 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4569[0] { - yym4571 := z.EncBinary() - _ = yym4571 + if yyq4543[0] { + yym4545 := z.EncBinary() + _ = yym4545 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -56997,23 +56698,23 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4569[0] { + if yyq4543[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4572 := z.EncBinary() - _ = yym4572 + yym4546 := z.EncBinary() + _ = yym4546 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr4569 || yy2arr4569 { + if yyr4543 || yy2arr4543 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4569[1] { - yym4574 := z.EncBinary() - _ = yym4574 + if yyq4543[1] { + yym4548 := z.EncBinary() + _ = yym4548 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -57022,39 +56723,39 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq4569[1] { + if yyq4543[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4575 := z.EncBinary() - _ = yym4575 + yym4549 := z.EncBinary() + _ = yym4549 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr4569 || yy2arr4569 { + if yyr4543 || yy2arr4543 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq4569[2] { - yy4577 := &x.ObjectMeta - yy4577.CodecEncodeSelf(e) + if yyq4543[2] { + yy4551 := &x.ObjectMeta + yy4551.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq4569[2] { + if yyq4543[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4578 := &x.ObjectMeta - yy4578.CodecEncodeSelf(e) + yy4552 := &x.ObjectMeta + yy4552.CodecEncodeSelf(e) } } - if yyr4569 || yy2arr4569 { + if yyr4543 || yy2arr4543 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym4580 := z.EncBinary() - _ = yym4580 + yym4554 := z.EncBinary() + _ = yym4554 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Range)) @@ -57063,20 +56764,20 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("range")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym4581 := z.EncBinary() - _ = yym4581 + yym4555 := z.EncBinary() + _ = yym4555 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Range)) } } - if yyr4569 || yy2arr4569 { + if yyr4543 || yy2arr4543 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Data == nil { r.EncodeNil() } else { - yym4583 := z.EncBinary() - _ = yym4583 + yym4557 := z.EncBinary() + _ = yym4557 if false { } else { r.EncodeStringBytes(codecSelferC_RAW1234, []byte(x.Data)) @@ -57089,15 +56790,15 @@ func (x *RangeAllocation) CodecEncodeSelf(e *codec1978.Encoder) { if x.Data == nil { r.EncodeNil() } else { - yym4584 := z.EncBinary() - _ = yym4584 + yym4558 := z.EncBinary() + _ = yym4558 if false { } else { r.EncodeStringBytes(codecSelferC_RAW1234, []byte(x.Data)) } } } - if yyr4569 || yy2arr4569 { + if yyr4543 || yy2arr4543 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -57110,25 +56811,25 @@ func (x *RangeAllocation) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym4585 := z.DecBinary() - _ = yym4585 + yym4559 := z.DecBinary() + _ = yym4559 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct4586 := r.ContainerType() - if yyct4586 == codecSelferValueTypeMap1234 { - yyl4586 := r.ReadMapStart() - if yyl4586 == 0 { + yyct4560 := r.ContainerType() + if yyct4560 == codecSelferValueTypeMap1234 { + yyl4560 := r.ReadMapStart() + if yyl4560 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl4586, d) + x.codecDecodeSelfFromMap(yyl4560, d) } - } else if yyct4586 == codecSelferValueTypeArray1234 { - yyl4586 := r.ReadArrayStart() - if yyl4586 == 0 { + } else if yyct4560 == codecSelferValueTypeArray1234 { + yyl4560 := r.ReadArrayStart() + if yyl4560 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl4586, d) + x.codecDecodeSelfFromArray(yyl4560, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -57140,12 +56841,12 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys4587Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys4587Slc - var yyhl4587 bool = l >= 0 - for yyj4587 := 0; ; yyj4587++ { - if yyhl4587 { - if yyj4587 >= l { + var yys4561Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys4561Slc + var yyhl4561 bool = l >= 0 + for yyj4561 := 0; ; yyj4561++ { + if yyhl4561 { + if yyj4561 >= l { break } } else { @@ -57154,10 +56855,10 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys4587Slc = r.DecodeBytes(yys4587Slc, true, true) - yys4587 := string(yys4587Slc) + yys4561Slc = r.DecodeBytes(yys4561Slc, true, true) + yys4561 := string(yys4561Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys4587 { + switch yys4561 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -57174,8 +56875,8 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4590 := &x.ObjectMeta - yyv4590.CodecDecodeSelf(d) + yyv4564 := &x.ObjectMeta + yyv4564.CodecDecodeSelf(d) } case "range": if r.TryDecodeAsNil() { @@ -57187,18 +56888,18 @@ func (x *RangeAllocation) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4592 := &x.Data - yym4593 := z.DecBinary() - _ = yym4593 + yyv4566 := &x.Data + yym4567 := z.DecBinary() + _ = yym4567 if false { } else { - *yyv4592 = r.DecodeBytes(*(*[]byte)(yyv4592), false, false) + *yyv4566 = r.DecodeBytes(*(*[]byte)(yyv4566), false, false) } } default: - z.DecStructFieldNotFound(-1, yys4587) - } // end switch yys4587 - } // end for yyj4587 + z.DecStructFieldNotFound(-1, yys4561) + } // end switch yys4561 + } // end for yyj4561 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -57206,16 +56907,16 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj4594 int - var yyb4594 bool - var yyhl4594 bool = l >= 0 - yyj4594++ - if yyhl4594 { - yyb4594 = yyj4594 > l + var yyj4568 int + var yyb4568 bool + var yyhl4568 bool = l >= 0 + yyj4568++ + if yyhl4568 { + yyb4568 = yyj4568 > l } else { - yyb4594 = r.CheckBreak() + yyb4568 = r.CheckBreak() } - if yyb4594 { + if yyb4568 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57225,13 +56926,13 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Kind = string(r.DecodeString()) } - yyj4594++ - if yyhl4594 { - yyb4594 = yyj4594 > l + yyj4568++ + if yyhl4568 { + yyb4568 = yyj4568 > l } else { - yyb4594 = r.CheckBreak() + yyb4568 = r.CheckBreak() } - if yyb4594 { + if yyb4568 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57241,13 +56942,13 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.APIVersion = string(r.DecodeString()) } - yyj4594++ - if yyhl4594 { - yyb4594 = yyj4594 > l + yyj4568++ + if yyhl4568 { + yyb4568 = yyj4568 > l } else { - yyb4594 = r.CheckBreak() + yyb4568 = r.CheckBreak() } - if yyb4594 { + if yyb4568 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57255,16 +56956,16 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.ObjectMeta = ObjectMeta{} } else { - yyv4597 := &x.ObjectMeta - yyv4597.CodecDecodeSelf(d) + yyv4571 := &x.ObjectMeta + yyv4571.CodecDecodeSelf(d) } - yyj4594++ - if yyhl4594 { - yyb4594 = yyj4594 > l + yyj4568++ + if yyhl4568 { + yyb4568 = yyj4568 > l } else { - yyb4594 = r.CheckBreak() + yyb4568 = r.CheckBreak() } - if yyb4594 { + if yyb4568 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57274,13 +56975,13 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Range = string(r.DecodeString()) } - yyj4594++ - if yyhl4594 { - yyb4594 = yyj4594 > l + yyj4568++ + if yyhl4568 { + yyb4568 = yyj4568 > l } else { - yyb4594 = r.CheckBreak() + yyb4568 = r.CheckBreak() } - if yyb4594 { + if yyb4568 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -57288,26 +56989,26 @@ func (x *RangeAllocation) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.Data = nil } else { - yyv4599 := &x.Data - yym4600 := z.DecBinary() - _ = yym4600 + yyv4573 := &x.Data + yym4574 := z.DecBinary() + _ = yym4574 if false { } else { - *yyv4599 = r.DecodeBytes(*(*[]byte)(yyv4599), false, false) + *yyv4573 = r.DecodeBytes(*(*[]byte)(yyv4573), false, false) } } for { - yyj4594++ - if yyhl4594 { - yyb4594 = yyj4594 > l + yyj4568++ + if yyhl4568 { + yyb4568 = yyj4568 > l } else { - yyb4594 = r.CheckBreak() + yyb4568 = r.CheckBreak() } - if yyb4594 { + if yyb4568 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj4594-1, "") + z.DecStructFieldNotFound(yyj4568-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57317,10 +57018,10 @@ func (x codecSelfer1234) encSliceOwnerReference(v []OwnerReference, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4601 := range v { + for _, yyv4575 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4602 := &yyv4601 - yy4602.CodecEncodeSelf(e) + yy4576 := &yyv4575 + yy4576.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57330,83 +57031,83 @@ func (x codecSelfer1234) decSliceOwnerReference(v *[]OwnerReference, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4603 := *v - yyh4603, yyl4603 := z.DecSliceHelperStart() - var yyc4603 bool - if yyl4603 == 0 { - if yyv4603 == nil { - yyv4603 = []OwnerReference{} - yyc4603 = true - } else if len(yyv4603) != 0 { - yyv4603 = yyv4603[:0] - yyc4603 = true + yyv4577 := *v + yyh4577, yyl4577 := z.DecSliceHelperStart() + var yyc4577 bool + if yyl4577 == 0 { + if yyv4577 == nil { + yyv4577 = []OwnerReference{} + yyc4577 = true + } else if len(yyv4577) != 0 { + yyv4577 = yyv4577[:0] + yyc4577 = true } - } else if yyl4603 > 0 { - var yyrr4603, yyrl4603 int - var yyrt4603 bool - if yyl4603 > cap(yyv4603) { + } else if yyl4577 > 0 { + var yyrr4577, yyrl4577 int + var yyrt4577 bool + if yyl4577 > cap(yyv4577) { - yyrg4603 := len(yyv4603) > 0 - yyv24603 := yyv4603 - yyrl4603, yyrt4603 = z.DecInferLen(yyl4603, z.DecBasicHandle().MaxInitLen, 72) - if yyrt4603 { - if yyrl4603 <= cap(yyv4603) { - yyv4603 = yyv4603[:yyrl4603] + yyrg4577 := len(yyv4577) > 0 + yyv24577 := yyv4577 + yyrl4577, yyrt4577 = z.DecInferLen(yyl4577, z.DecBasicHandle().MaxInitLen, 72) + if yyrt4577 { + if yyrl4577 <= cap(yyv4577) { + yyv4577 = yyv4577[:yyrl4577] } else { - yyv4603 = make([]OwnerReference, yyrl4603) + yyv4577 = make([]OwnerReference, yyrl4577) } } else { - yyv4603 = make([]OwnerReference, yyrl4603) + yyv4577 = make([]OwnerReference, yyrl4577) } - yyc4603 = true - yyrr4603 = len(yyv4603) - if yyrg4603 { - copy(yyv4603, yyv24603) + yyc4577 = true + yyrr4577 = len(yyv4577) + if yyrg4577 { + copy(yyv4577, yyv24577) } - } else if yyl4603 != len(yyv4603) { - yyv4603 = yyv4603[:yyl4603] - yyc4603 = true + } else if yyl4577 != len(yyv4577) { + yyv4577 = yyv4577[:yyl4577] + yyc4577 = true } - yyj4603 := 0 - for ; yyj4603 < yyrr4603; yyj4603++ { - yyh4603.ElemContainerState(yyj4603) + yyj4577 := 0 + for ; yyj4577 < yyrr4577; yyj4577++ { + yyh4577.ElemContainerState(yyj4577) if r.TryDecodeAsNil() { - yyv4603[yyj4603] = OwnerReference{} + yyv4577[yyj4577] = OwnerReference{} } else { - yyv4604 := &yyv4603[yyj4603] - yyv4604.CodecDecodeSelf(d) + yyv4578 := &yyv4577[yyj4577] + yyv4578.CodecDecodeSelf(d) } } - if yyrt4603 { - for ; yyj4603 < yyl4603; yyj4603++ { - yyv4603 = append(yyv4603, OwnerReference{}) - yyh4603.ElemContainerState(yyj4603) + if yyrt4577 { + for ; yyj4577 < yyl4577; yyj4577++ { + yyv4577 = append(yyv4577, OwnerReference{}) + yyh4577.ElemContainerState(yyj4577) if r.TryDecodeAsNil() { - yyv4603[yyj4603] = OwnerReference{} + yyv4577[yyj4577] = OwnerReference{} } else { - yyv4605 := &yyv4603[yyj4603] - yyv4605.CodecDecodeSelf(d) + yyv4579 := &yyv4577[yyj4577] + yyv4579.CodecDecodeSelf(d) } } } } else { - yyj4603 := 0 - for ; !r.CheckBreak(); yyj4603++ { + yyj4577 := 0 + for ; !r.CheckBreak(); yyj4577++ { - if yyj4603 >= len(yyv4603) { - yyv4603 = append(yyv4603, OwnerReference{}) // var yyz4603 OwnerReference - yyc4603 = true + if yyj4577 >= len(yyv4577) { + yyv4577 = append(yyv4577, OwnerReference{}) // var yyz4577 OwnerReference + yyc4577 = true } - yyh4603.ElemContainerState(yyj4603) - if yyj4603 < len(yyv4603) { + yyh4577.ElemContainerState(yyj4577) + if yyj4577 < len(yyv4577) { if r.TryDecodeAsNil() { - yyv4603[yyj4603] = OwnerReference{} + yyv4577[yyj4577] = OwnerReference{} } else { - yyv4606 := &yyv4603[yyj4603] - yyv4606.CodecDecodeSelf(d) + yyv4580 := &yyv4577[yyj4577] + yyv4580.CodecDecodeSelf(d) } } else { @@ -57414,17 +57115,17 @@ func (x codecSelfer1234) decSliceOwnerReference(v *[]OwnerReference, d *codec197 } } - if yyj4603 < len(yyv4603) { - yyv4603 = yyv4603[:yyj4603] - yyc4603 = true - } else if yyj4603 == 0 && yyv4603 == nil { - yyv4603 = []OwnerReference{} - yyc4603 = true + if yyj4577 < len(yyv4577) { + yyv4577 = yyv4577[:yyj4577] + yyc4577 = true + } else if yyj4577 == 0 && yyv4577 == nil { + yyv4577 = []OwnerReference{} + yyc4577 = true } } - yyh4603.End() - if yyc4603 { - *v = yyv4603 + yyh4577.End() + if yyc4577 { + *v = yyv4577 } } @@ -57433,9 +57134,9 @@ func (x codecSelfer1234) encSlicePersistentVolumeAccessMode(v []PersistentVolume z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4607 := range v { + for _, yyv4581 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4607.CodecEncodeSelf(e) + yyv4581.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57445,75 +57146,75 @@ func (x codecSelfer1234) decSlicePersistentVolumeAccessMode(v *[]PersistentVolum z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4608 := *v - yyh4608, yyl4608 := z.DecSliceHelperStart() - var yyc4608 bool - if yyl4608 == 0 { - if yyv4608 == nil { - yyv4608 = []PersistentVolumeAccessMode{} - yyc4608 = true - } else if len(yyv4608) != 0 { - yyv4608 = yyv4608[:0] - yyc4608 = true + yyv4582 := *v + yyh4582, yyl4582 := z.DecSliceHelperStart() + var yyc4582 bool + if yyl4582 == 0 { + if yyv4582 == nil { + yyv4582 = []PersistentVolumeAccessMode{} + yyc4582 = true + } else if len(yyv4582) != 0 { + yyv4582 = yyv4582[:0] + yyc4582 = true } - } else if yyl4608 > 0 { - var yyrr4608, yyrl4608 int - var yyrt4608 bool - if yyl4608 > cap(yyv4608) { + } else if yyl4582 > 0 { + var yyrr4582, yyrl4582 int + var yyrt4582 bool + if yyl4582 > cap(yyv4582) { - yyrl4608, yyrt4608 = z.DecInferLen(yyl4608, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4608 { - if yyrl4608 <= cap(yyv4608) { - yyv4608 = yyv4608[:yyrl4608] + yyrl4582, yyrt4582 = z.DecInferLen(yyl4582, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4582 { + if yyrl4582 <= cap(yyv4582) { + yyv4582 = yyv4582[:yyrl4582] } else { - yyv4608 = make([]PersistentVolumeAccessMode, yyrl4608) + yyv4582 = make([]PersistentVolumeAccessMode, yyrl4582) } } else { - yyv4608 = make([]PersistentVolumeAccessMode, yyrl4608) + yyv4582 = make([]PersistentVolumeAccessMode, yyrl4582) } - yyc4608 = true - yyrr4608 = len(yyv4608) - } else if yyl4608 != len(yyv4608) { - yyv4608 = yyv4608[:yyl4608] - yyc4608 = true + yyc4582 = true + yyrr4582 = len(yyv4582) + } else if yyl4582 != len(yyv4582) { + yyv4582 = yyv4582[:yyl4582] + yyc4582 = true } - yyj4608 := 0 - for ; yyj4608 < yyrr4608; yyj4608++ { - yyh4608.ElemContainerState(yyj4608) + yyj4582 := 0 + for ; yyj4582 < yyrr4582; yyj4582++ { + yyh4582.ElemContainerState(yyj4582) if r.TryDecodeAsNil() { - yyv4608[yyj4608] = "" + yyv4582[yyj4582] = "" } else { - yyv4608[yyj4608] = PersistentVolumeAccessMode(r.DecodeString()) + yyv4582[yyj4582] = PersistentVolumeAccessMode(r.DecodeString()) } } - if yyrt4608 { - for ; yyj4608 < yyl4608; yyj4608++ { - yyv4608 = append(yyv4608, "") - yyh4608.ElemContainerState(yyj4608) + if yyrt4582 { + for ; yyj4582 < yyl4582; yyj4582++ { + yyv4582 = append(yyv4582, "") + yyh4582.ElemContainerState(yyj4582) if r.TryDecodeAsNil() { - yyv4608[yyj4608] = "" + yyv4582[yyj4582] = "" } else { - yyv4608[yyj4608] = PersistentVolumeAccessMode(r.DecodeString()) + yyv4582[yyj4582] = PersistentVolumeAccessMode(r.DecodeString()) } } } } else { - yyj4608 := 0 - for ; !r.CheckBreak(); yyj4608++ { + yyj4582 := 0 + for ; !r.CheckBreak(); yyj4582++ { - if yyj4608 >= len(yyv4608) { - yyv4608 = append(yyv4608, "") // var yyz4608 PersistentVolumeAccessMode - yyc4608 = true + if yyj4582 >= len(yyv4582) { + yyv4582 = append(yyv4582, "") // var yyz4582 PersistentVolumeAccessMode + yyc4582 = true } - yyh4608.ElemContainerState(yyj4608) - if yyj4608 < len(yyv4608) { + yyh4582.ElemContainerState(yyj4582) + if yyj4582 < len(yyv4582) { if r.TryDecodeAsNil() { - yyv4608[yyj4608] = "" + yyv4582[yyj4582] = "" } else { - yyv4608[yyj4608] = PersistentVolumeAccessMode(r.DecodeString()) + yyv4582[yyj4582] = PersistentVolumeAccessMode(r.DecodeString()) } } else { @@ -57521,17 +57222,17 @@ func (x codecSelfer1234) decSlicePersistentVolumeAccessMode(v *[]PersistentVolum } } - if yyj4608 < len(yyv4608) { - yyv4608 = yyv4608[:yyj4608] - yyc4608 = true - } else if yyj4608 == 0 && yyv4608 == nil { - yyv4608 = []PersistentVolumeAccessMode{} - yyc4608 = true + if yyj4582 < len(yyv4582) { + yyv4582 = yyv4582[:yyj4582] + yyc4582 = true + } else if yyj4582 == 0 && yyv4582 == nil { + yyv4582 = []PersistentVolumeAccessMode{} + yyc4582 = true } } - yyh4608.End() - if yyc4608 { - *v = yyv4608 + yyh4582.End() + if yyc4582 { + *v = yyv4582 } } @@ -57540,10 +57241,10 @@ func (x codecSelfer1234) encSlicePersistentVolume(v []PersistentVolume, e *codec z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4612 := range v { + for _, yyv4586 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4613 := &yyv4612 - yy4613.CodecEncodeSelf(e) + yy4587 := &yyv4586 + yy4587.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57553,83 +57254,83 @@ func (x codecSelfer1234) decSlicePersistentVolume(v *[]PersistentVolume, d *code z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4614 := *v - yyh4614, yyl4614 := z.DecSliceHelperStart() - var yyc4614 bool - if yyl4614 == 0 { - if yyv4614 == nil { - yyv4614 = []PersistentVolume{} - yyc4614 = true - } else if len(yyv4614) != 0 { - yyv4614 = yyv4614[:0] - yyc4614 = true + yyv4588 := *v + yyh4588, yyl4588 := z.DecSliceHelperStart() + var yyc4588 bool + if yyl4588 == 0 { + if yyv4588 == nil { + yyv4588 = []PersistentVolume{} + yyc4588 = true + } else if len(yyv4588) != 0 { + yyv4588 = yyv4588[:0] + yyc4588 = true } - } else if yyl4614 > 0 { - var yyrr4614, yyrl4614 int - var yyrt4614 bool - if yyl4614 > cap(yyv4614) { + } else if yyl4588 > 0 { + var yyrr4588, yyrl4588 int + var yyrt4588 bool + if yyl4588 > cap(yyv4588) { - yyrg4614 := len(yyv4614) > 0 - yyv24614 := yyv4614 - yyrl4614, yyrt4614 = z.DecInferLen(yyl4614, z.DecBasicHandle().MaxInitLen, 496) - if yyrt4614 { - if yyrl4614 <= cap(yyv4614) { - yyv4614 = yyv4614[:yyrl4614] + yyrg4588 := len(yyv4588) > 0 + yyv24588 := yyv4588 + yyrl4588, yyrt4588 = z.DecInferLen(yyl4588, z.DecBasicHandle().MaxInitLen, 496) + if yyrt4588 { + if yyrl4588 <= cap(yyv4588) { + yyv4588 = yyv4588[:yyrl4588] } else { - yyv4614 = make([]PersistentVolume, yyrl4614) + yyv4588 = make([]PersistentVolume, yyrl4588) } } else { - yyv4614 = make([]PersistentVolume, yyrl4614) + yyv4588 = make([]PersistentVolume, yyrl4588) } - yyc4614 = true - yyrr4614 = len(yyv4614) - if yyrg4614 { - copy(yyv4614, yyv24614) + yyc4588 = true + yyrr4588 = len(yyv4588) + if yyrg4588 { + copy(yyv4588, yyv24588) } - } else if yyl4614 != len(yyv4614) { - yyv4614 = yyv4614[:yyl4614] - yyc4614 = true + } else if yyl4588 != len(yyv4588) { + yyv4588 = yyv4588[:yyl4588] + yyc4588 = true } - yyj4614 := 0 - for ; yyj4614 < yyrr4614; yyj4614++ { - yyh4614.ElemContainerState(yyj4614) + yyj4588 := 0 + for ; yyj4588 < yyrr4588; yyj4588++ { + yyh4588.ElemContainerState(yyj4588) if r.TryDecodeAsNil() { - yyv4614[yyj4614] = PersistentVolume{} + yyv4588[yyj4588] = PersistentVolume{} } else { - yyv4615 := &yyv4614[yyj4614] - yyv4615.CodecDecodeSelf(d) + yyv4589 := &yyv4588[yyj4588] + yyv4589.CodecDecodeSelf(d) } } - if yyrt4614 { - for ; yyj4614 < yyl4614; yyj4614++ { - yyv4614 = append(yyv4614, PersistentVolume{}) - yyh4614.ElemContainerState(yyj4614) + if yyrt4588 { + for ; yyj4588 < yyl4588; yyj4588++ { + yyv4588 = append(yyv4588, PersistentVolume{}) + yyh4588.ElemContainerState(yyj4588) if r.TryDecodeAsNil() { - yyv4614[yyj4614] = PersistentVolume{} + yyv4588[yyj4588] = PersistentVolume{} } else { - yyv4616 := &yyv4614[yyj4614] - yyv4616.CodecDecodeSelf(d) + yyv4590 := &yyv4588[yyj4588] + yyv4590.CodecDecodeSelf(d) } } } } else { - yyj4614 := 0 - for ; !r.CheckBreak(); yyj4614++ { + yyj4588 := 0 + for ; !r.CheckBreak(); yyj4588++ { - if yyj4614 >= len(yyv4614) { - yyv4614 = append(yyv4614, PersistentVolume{}) // var yyz4614 PersistentVolume - yyc4614 = true + if yyj4588 >= len(yyv4588) { + yyv4588 = append(yyv4588, PersistentVolume{}) // var yyz4588 PersistentVolume + yyc4588 = true } - yyh4614.ElemContainerState(yyj4614) - if yyj4614 < len(yyv4614) { + yyh4588.ElemContainerState(yyj4588) + if yyj4588 < len(yyv4588) { if r.TryDecodeAsNil() { - yyv4614[yyj4614] = PersistentVolume{} + yyv4588[yyj4588] = PersistentVolume{} } else { - yyv4617 := &yyv4614[yyj4614] - yyv4617.CodecDecodeSelf(d) + yyv4591 := &yyv4588[yyj4588] + yyv4591.CodecDecodeSelf(d) } } else { @@ -57637,17 +57338,17 @@ func (x codecSelfer1234) decSlicePersistentVolume(v *[]PersistentVolume, d *code } } - if yyj4614 < len(yyv4614) { - yyv4614 = yyv4614[:yyj4614] - yyc4614 = true - } else if yyj4614 == 0 && yyv4614 == nil { - yyv4614 = []PersistentVolume{} - yyc4614 = true + if yyj4588 < len(yyv4588) { + yyv4588 = yyv4588[:yyj4588] + yyc4588 = true + } else if yyj4588 == 0 && yyv4588 == nil { + yyv4588 = []PersistentVolume{} + yyc4588 = true } } - yyh4614.End() - if yyc4614 { - *v = yyv4614 + yyh4588.End() + if yyc4588 { + *v = yyv4588 } } @@ -57656,10 +57357,10 @@ func (x codecSelfer1234) encSlicePersistentVolumeClaim(v []PersistentVolumeClaim z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4618 := range v { + for _, yyv4592 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4619 := &yyv4618 - yy4619.CodecEncodeSelf(e) + yy4593 := &yyv4592 + yy4593.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57669,83 +57370,83 @@ func (x codecSelfer1234) decSlicePersistentVolumeClaim(v *[]PersistentVolumeClai z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4620 := *v - yyh4620, yyl4620 := z.DecSliceHelperStart() - var yyc4620 bool - if yyl4620 == 0 { - if yyv4620 == nil { - yyv4620 = []PersistentVolumeClaim{} - yyc4620 = true - } else if len(yyv4620) != 0 { - yyv4620 = yyv4620[:0] - yyc4620 = true + yyv4594 := *v + yyh4594, yyl4594 := z.DecSliceHelperStart() + var yyc4594 bool + if yyl4594 == 0 { + if yyv4594 == nil { + yyv4594 = []PersistentVolumeClaim{} + yyc4594 = true + } else if len(yyv4594) != 0 { + yyv4594 = yyv4594[:0] + yyc4594 = true } - } else if yyl4620 > 0 { - var yyrr4620, yyrl4620 int - var yyrt4620 bool - if yyl4620 > cap(yyv4620) { + } else if yyl4594 > 0 { + var yyrr4594, yyrl4594 int + var yyrt4594 bool + if yyl4594 > cap(yyv4594) { - yyrg4620 := len(yyv4620) > 0 - yyv24620 := yyv4620 - yyrl4620, yyrt4620 = z.DecInferLen(yyl4620, z.DecBasicHandle().MaxInitLen, 368) - if yyrt4620 { - if yyrl4620 <= cap(yyv4620) { - yyv4620 = yyv4620[:yyrl4620] + yyrg4594 := len(yyv4594) > 0 + yyv24594 := yyv4594 + yyrl4594, yyrt4594 = z.DecInferLen(yyl4594, z.DecBasicHandle().MaxInitLen, 368) + if yyrt4594 { + if yyrl4594 <= cap(yyv4594) { + yyv4594 = yyv4594[:yyrl4594] } else { - yyv4620 = make([]PersistentVolumeClaim, yyrl4620) + yyv4594 = make([]PersistentVolumeClaim, yyrl4594) } } else { - yyv4620 = make([]PersistentVolumeClaim, yyrl4620) + yyv4594 = make([]PersistentVolumeClaim, yyrl4594) } - yyc4620 = true - yyrr4620 = len(yyv4620) - if yyrg4620 { - copy(yyv4620, yyv24620) + yyc4594 = true + yyrr4594 = len(yyv4594) + if yyrg4594 { + copy(yyv4594, yyv24594) } - } else if yyl4620 != len(yyv4620) { - yyv4620 = yyv4620[:yyl4620] - yyc4620 = true + } else if yyl4594 != len(yyv4594) { + yyv4594 = yyv4594[:yyl4594] + yyc4594 = true } - yyj4620 := 0 - for ; yyj4620 < yyrr4620; yyj4620++ { - yyh4620.ElemContainerState(yyj4620) + yyj4594 := 0 + for ; yyj4594 < yyrr4594; yyj4594++ { + yyh4594.ElemContainerState(yyj4594) if r.TryDecodeAsNil() { - yyv4620[yyj4620] = PersistentVolumeClaim{} + yyv4594[yyj4594] = PersistentVolumeClaim{} } else { - yyv4621 := &yyv4620[yyj4620] - yyv4621.CodecDecodeSelf(d) + yyv4595 := &yyv4594[yyj4594] + yyv4595.CodecDecodeSelf(d) } } - if yyrt4620 { - for ; yyj4620 < yyl4620; yyj4620++ { - yyv4620 = append(yyv4620, PersistentVolumeClaim{}) - yyh4620.ElemContainerState(yyj4620) + if yyrt4594 { + for ; yyj4594 < yyl4594; yyj4594++ { + yyv4594 = append(yyv4594, PersistentVolumeClaim{}) + yyh4594.ElemContainerState(yyj4594) if r.TryDecodeAsNil() { - yyv4620[yyj4620] = PersistentVolumeClaim{} + yyv4594[yyj4594] = PersistentVolumeClaim{} } else { - yyv4622 := &yyv4620[yyj4620] - yyv4622.CodecDecodeSelf(d) + yyv4596 := &yyv4594[yyj4594] + yyv4596.CodecDecodeSelf(d) } } } } else { - yyj4620 := 0 - for ; !r.CheckBreak(); yyj4620++ { + yyj4594 := 0 + for ; !r.CheckBreak(); yyj4594++ { - if yyj4620 >= len(yyv4620) { - yyv4620 = append(yyv4620, PersistentVolumeClaim{}) // var yyz4620 PersistentVolumeClaim - yyc4620 = true + if yyj4594 >= len(yyv4594) { + yyv4594 = append(yyv4594, PersistentVolumeClaim{}) // var yyz4594 PersistentVolumeClaim + yyc4594 = true } - yyh4620.ElemContainerState(yyj4620) - if yyj4620 < len(yyv4620) { + yyh4594.ElemContainerState(yyj4594) + if yyj4594 < len(yyv4594) { if r.TryDecodeAsNil() { - yyv4620[yyj4620] = PersistentVolumeClaim{} + yyv4594[yyj4594] = PersistentVolumeClaim{} } else { - yyv4623 := &yyv4620[yyj4620] - yyv4623.CodecDecodeSelf(d) + yyv4597 := &yyv4594[yyj4594] + yyv4597.CodecDecodeSelf(d) } } else { @@ -57753,17 +57454,17 @@ func (x codecSelfer1234) decSlicePersistentVolumeClaim(v *[]PersistentVolumeClai } } - if yyj4620 < len(yyv4620) { - yyv4620 = yyv4620[:yyj4620] - yyc4620 = true - } else if yyj4620 == 0 && yyv4620 == nil { - yyv4620 = []PersistentVolumeClaim{} - yyc4620 = true + if yyj4594 < len(yyv4594) { + yyv4594 = yyv4594[:yyj4594] + yyc4594 = true + } else if yyj4594 == 0 && yyv4594 == nil { + yyv4594 = []PersistentVolumeClaim{} + yyc4594 = true } } - yyh4620.End() - if yyc4620 { - *v = yyv4620 + yyh4594.End() + if yyc4594 { + *v = yyv4594 } } @@ -57772,10 +57473,10 @@ func (x codecSelfer1234) encSliceKeyToPath(v []KeyToPath, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4624 := range v { + for _, yyv4598 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4625 := &yyv4624 - yy4625.CodecEncodeSelf(e) + yy4599 := &yyv4598 + yy4599.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57785,83 +57486,83 @@ func (x codecSelfer1234) decSliceKeyToPath(v *[]KeyToPath, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4626 := *v - yyh4626, yyl4626 := z.DecSliceHelperStart() - var yyc4626 bool - if yyl4626 == 0 { - if yyv4626 == nil { - yyv4626 = []KeyToPath{} - yyc4626 = true - } else if len(yyv4626) != 0 { - yyv4626 = yyv4626[:0] - yyc4626 = true + yyv4600 := *v + yyh4600, yyl4600 := z.DecSliceHelperStart() + var yyc4600 bool + if yyl4600 == 0 { + if yyv4600 == nil { + yyv4600 = []KeyToPath{} + yyc4600 = true + } else if len(yyv4600) != 0 { + yyv4600 = yyv4600[:0] + yyc4600 = true } - } else if yyl4626 > 0 { - var yyrr4626, yyrl4626 int - var yyrt4626 bool - if yyl4626 > cap(yyv4626) { + } else if yyl4600 > 0 { + var yyrr4600, yyrl4600 int + var yyrt4600 bool + if yyl4600 > cap(yyv4600) { - yyrg4626 := len(yyv4626) > 0 - yyv24626 := yyv4626 - yyrl4626, yyrt4626 = z.DecInferLen(yyl4626, z.DecBasicHandle().MaxInitLen, 40) - if yyrt4626 { - if yyrl4626 <= cap(yyv4626) { - yyv4626 = yyv4626[:yyrl4626] + yyrg4600 := len(yyv4600) > 0 + yyv24600 := yyv4600 + yyrl4600, yyrt4600 = z.DecInferLen(yyl4600, z.DecBasicHandle().MaxInitLen, 40) + if yyrt4600 { + if yyrl4600 <= cap(yyv4600) { + yyv4600 = yyv4600[:yyrl4600] } else { - yyv4626 = make([]KeyToPath, yyrl4626) + yyv4600 = make([]KeyToPath, yyrl4600) } } else { - yyv4626 = make([]KeyToPath, yyrl4626) + yyv4600 = make([]KeyToPath, yyrl4600) } - yyc4626 = true - yyrr4626 = len(yyv4626) - if yyrg4626 { - copy(yyv4626, yyv24626) + yyc4600 = true + yyrr4600 = len(yyv4600) + if yyrg4600 { + copy(yyv4600, yyv24600) } - } else if yyl4626 != len(yyv4626) { - yyv4626 = yyv4626[:yyl4626] - yyc4626 = true + } else if yyl4600 != len(yyv4600) { + yyv4600 = yyv4600[:yyl4600] + yyc4600 = true } - yyj4626 := 0 - for ; yyj4626 < yyrr4626; yyj4626++ { - yyh4626.ElemContainerState(yyj4626) + yyj4600 := 0 + for ; yyj4600 < yyrr4600; yyj4600++ { + yyh4600.ElemContainerState(yyj4600) if r.TryDecodeAsNil() { - yyv4626[yyj4626] = KeyToPath{} + yyv4600[yyj4600] = KeyToPath{} } else { - yyv4627 := &yyv4626[yyj4626] - yyv4627.CodecDecodeSelf(d) + yyv4601 := &yyv4600[yyj4600] + yyv4601.CodecDecodeSelf(d) } } - if yyrt4626 { - for ; yyj4626 < yyl4626; yyj4626++ { - yyv4626 = append(yyv4626, KeyToPath{}) - yyh4626.ElemContainerState(yyj4626) + if yyrt4600 { + for ; yyj4600 < yyl4600; yyj4600++ { + yyv4600 = append(yyv4600, KeyToPath{}) + yyh4600.ElemContainerState(yyj4600) if r.TryDecodeAsNil() { - yyv4626[yyj4626] = KeyToPath{} + yyv4600[yyj4600] = KeyToPath{} } else { - yyv4628 := &yyv4626[yyj4626] - yyv4628.CodecDecodeSelf(d) + yyv4602 := &yyv4600[yyj4600] + yyv4602.CodecDecodeSelf(d) } } } } else { - yyj4626 := 0 - for ; !r.CheckBreak(); yyj4626++ { + yyj4600 := 0 + for ; !r.CheckBreak(); yyj4600++ { - if yyj4626 >= len(yyv4626) { - yyv4626 = append(yyv4626, KeyToPath{}) // var yyz4626 KeyToPath - yyc4626 = true + if yyj4600 >= len(yyv4600) { + yyv4600 = append(yyv4600, KeyToPath{}) // var yyz4600 KeyToPath + yyc4600 = true } - yyh4626.ElemContainerState(yyj4626) - if yyj4626 < len(yyv4626) { + yyh4600.ElemContainerState(yyj4600) + if yyj4600 < len(yyv4600) { if r.TryDecodeAsNil() { - yyv4626[yyj4626] = KeyToPath{} + yyv4600[yyj4600] = KeyToPath{} } else { - yyv4629 := &yyv4626[yyj4626] - yyv4629.CodecDecodeSelf(d) + yyv4603 := &yyv4600[yyj4600] + yyv4603.CodecDecodeSelf(d) } } else { @@ -57869,17 +57570,17 @@ func (x codecSelfer1234) decSliceKeyToPath(v *[]KeyToPath, d *codec1978.Decoder) } } - if yyj4626 < len(yyv4626) { - yyv4626 = yyv4626[:yyj4626] - yyc4626 = true - } else if yyj4626 == 0 && yyv4626 == nil { - yyv4626 = []KeyToPath{} - yyc4626 = true + if yyj4600 < len(yyv4600) { + yyv4600 = yyv4600[:yyj4600] + yyc4600 = true + } else if yyj4600 == 0 && yyv4600 == nil { + yyv4600 = []KeyToPath{} + yyc4600 = true } } - yyh4626.End() - if yyc4626 { - *v = yyv4626 + yyh4600.End() + if yyc4600 { + *v = yyv4600 } } @@ -57888,10 +57589,10 @@ func (x codecSelfer1234) encSliceHTTPHeader(v []HTTPHeader, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4630 := range v { + for _, yyv4604 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4631 := &yyv4630 - yy4631.CodecEncodeSelf(e) + yy4605 := &yyv4604 + yy4605.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -57901,83 +57602,83 @@ func (x codecSelfer1234) decSliceHTTPHeader(v *[]HTTPHeader, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4632 := *v - yyh4632, yyl4632 := z.DecSliceHelperStart() - var yyc4632 bool - if yyl4632 == 0 { - if yyv4632 == nil { - yyv4632 = []HTTPHeader{} - yyc4632 = true - } else if len(yyv4632) != 0 { - yyv4632 = yyv4632[:0] - yyc4632 = true + yyv4606 := *v + yyh4606, yyl4606 := z.DecSliceHelperStart() + var yyc4606 bool + if yyl4606 == 0 { + if yyv4606 == nil { + yyv4606 = []HTTPHeader{} + yyc4606 = true + } else if len(yyv4606) != 0 { + yyv4606 = yyv4606[:0] + yyc4606 = true } - } else if yyl4632 > 0 { - var yyrr4632, yyrl4632 int - var yyrt4632 bool - if yyl4632 > cap(yyv4632) { + } else if yyl4606 > 0 { + var yyrr4606, yyrl4606 int + var yyrt4606 bool + if yyl4606 > cap(yyv4606) { - yyrg4632 := len(yyv4632) > 0 - yyv24632 := yyv4632 - yyrl4632, yyrt4632 = z.DecInferLen(yyl4632, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4632 { - if yyrl4632 <= cap(yyv4632) { - yyv4632 = yyv4632[:yyrl4632] + yyrg4606 := len(yyv4606) > 0 + yyv24606 := yyv4606 + yyrl4606, yyrt4606 = z.DecInferLen(yyl4606, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4606 { + if yyrl4606 <= cap(yyv4606) { + yyv4606 = yyv4606[:yyrl4606] } else { - yyv4632 = make([]HTTPHeader, yyrl4632) + yyv4606 = make([]HTTPHeader, yyrl4606) } } else { - yyv4632 = make([]HTTPHeader, yyrl4632) + yyv4606 = make([]HTTPHeader, yyrl4606) } - yyc4632 = true - yyrr4632 = len(yyv4632) - if yyrg4632 { - copy(yyv4632, yyv24632) + yyc4606 = true + yyrr4606 = len(yyv4606) + if yyrg4606 { + copy(yyv4606, yyv24606) } - } else if yyl4632 != len(yyv4632) { - yyv4632 = yyv4632[:yyl4632] - yyc4632 = true + } else if yyl4606 != len(yyv4606) { + yyv4606 = yyv4606[:yyl4606] + yyc4606 = true } - yyj4632 := 0 - for ; yyj4632 < yyrr4632; yyj4632++ { - yyh4632.ElemContainerState(yyj4632) + yyj4606 := 0 + for ; yyj4606 < yyrr4606; yyj4606++ { + yyh4606.ElemContainerState(yyj4606) if r.TryDecodeAsNil() { - yyv4632[yyj4632] = HTTPHeader{} + yyv4606[yyj4606] = HTTPHeader{} } else { - yyv4633 := &yyv4632[yyj4632] - yyv4633.CodecDecodeSelf(d) + yyv4607 := &yyv4606[yyj4606] + yyv4607.CodecDecodeSelf(d) } } - if yyrt4632 { - for ; yyj4632 < yyl4632; yyj4632++ { - yyv4632 = append(yyv4632, HTTPHeader{}) - yyh4632.ElemContainerState(yyj4632) + if yyrt4606 { + for ; yyj4606 < yyl4606; yyj4606++ { + yyv4606 = append(yyv4606, HTTPHeader{}) + yyh4606.ElemContainerState(yyj4606) if r.TryDecodeAsNil() { - yyv4632[yyj4632] = HTTPHeader{} + yyv4606[yyj4606] = HTTPHeader{} } else { - yyv4634 := &yyv4632[yyj4632] - yyv4634.CodecDecodeSelf(d) + yyv4608 := &yyv4606[yyj4606] + yyv4608.CodecDecodeSelf(d) } } } } else { - yyj4632 := 0 - for ; !r.CheckBreak(); yyj4632++ { + yyj4606 := 0 + for ; !r.CheckBreak(); yyj4606++ { - if yyj4632 >= len(yyv4632) { - yyv4632 = append(yyv4632, HTTPHeader{}) // var yyz4632 HTTPHeader - yyc4632 = true + if yyj4606 >= len(yyv4606) { + yyv4606 = append(yyv4606, HTTPHeader{}) // var yyz4606 HTTPHeader + yyc4606 = true } - yyh4632.ElemContainerState(yyj4632) - if yyj4632 < len(yyv4632) { + yyh4606.ElemContainerState(yyj4606) + if yyj4606 < len(yyv4606) { if r.TryDecodeAsNil() { - yyv4632[yyj4632] = HTTPHeader{} + yyv4606[yyj4606] = HTTPHeader{} } else { - yyv4635 := &yyv4632[yyj4632] - yyv4635.CodecDecodeSelf(d) + yyv4609 := &yyv4606[yyj4606] + yyv4609.CodecDecodeSelf(d) } } else { @@ -57985,17 +57686,17 @@ func (x codecSelfer1234) decSliceHTTPHeader(v *[]HTTPHeader, d *codec1978.Decode } } - if yyj4632 < len(yyv4632) { - yyv4632 = yyv4632[:yyj4632] - yyc4632 = true - } else if yyj4632 == 0 && yyv4632 == nil { - yyv4632 = []HTTPHeader{} - yyc4632 = true + if yyj4606 < len(yyv4606) { + yyv4606 = yyv4606[:yyj4606] + yyc4606 = true + } else if yyj4606 == 0 && yyv4606 == nil { + yyv4606 = []HTTPHeader{} + yyc4606 = true } } - yyh4632.End() - if yyc4632 { - *v = yyv4632 + yyh4606.End() + if yyc4606 { + *v = yyv4606 } } @@ -58004,9 +57705,9 @@ func (x codecSelfer1234) encSliceCapability(v []Capability, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4636 := range v { + for _, yyv4610 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4636.CodecEncodeSelf(e) + yyv4610.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58016,75 +57717,75 @@ func (x codecSelfer1234) decSliceCapability(v *[]Capability, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4637 := *v - yyh4637, yyl4637 := z.DecSliceHelperStart() - var yyc4637 bool - if yyl4637 == 0 { - if yyv4637 == nil { - yyv4637 = []Capability{} - yyc4637 = true - } else if len(yyv4637) != 0 { - yyv4637 = yyv4637[:0] - yyc4637 = true + yyv4611 := *v + yyh4611, yyl4611 := z.DecSliceHelperStart() + var yyc4611 bool + if yyl4611 == 0 { + if yyv4611 == nil { + yyv4611 = []Capability{} + yyc4611 = true + } else if len(yyv4611) != 0 { + yyv4611 = yyv4611[:0] + yyc4611 = true } - } else if yyl4637 > 0 { - var yyrr4637, yyrl4637 int - var yyrt4637 bool - if yyl4637 > cap(yyv4637) { + } else if yyl4611 > 0 { + var yyrr4611, yyrl4611 int + var yyrt4611 bool + if yyl4611 > cap(yyv4611) { - yyrl4637, yyrt4637 = z.DecInferLen(yyl4637, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4637 { - if yyrl4637 <= cap(yyv4637) { - yyv4637 = yyv4637[:yyrl4637] + yyrl4611, yyrt4611 = z.DecInferLen(yyl4611, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4611 { + if yyrl4611 <= cap(yyv4611) { + yyv4611 = yyv4611[:yyrl4611] } else { - yyv4637 = make([]Capability, yyrl4637) + yyv4611 = make([]Capability, yyrl4611) } } else { - yyv4637 = make([]Capability, yyrl4637) + yyv4611 = make([]Capability, yyrl4611) } - yyc4637 = true - yyrr4637 = len(yyv4637) - } else if yyl4637 != len(yyv4637) { - yyv4637 = yyv4637[:yyl4637] - yyc4637 = true + yyc4611 = true + yyrr4611 = len(yyv4611) + } else if yyl4611 != len(yyv4611) { + yyv4611 = yyv4611[:yyl4611] + yyc4611 = true } - yyj4637 := 0 - for ; yyj4637 < yyrr4637; yyj4637++ { - yyh4637.ElemContainerState(yyj4637) + yyj4611 := 0 + for ; yyj4611 < yyrr4611; yyj4611++ { + yyh4611.ElemContainerState(yyj4611) if r.TryDecodeAsNil() { - yyv4637[yyj4637] = "" + yyv4611[yyj4611] = "" } else { - yyv4637[yyj4637] = Capability(r.DecodeString()) + yyv4611[yyj4611] = Capability(r.DecodeString()) } } - if yyrt4637 { - for ; yyj4637 < yyl4637; yyj4637++ { - yyv4637 = append(yyv4637, "") - yyh4637.ElemContainerState(yyj4637) + if yyrt4611 { + for ; yyj4611 < yyl4611; yyj4611++ { + yyv4611 = append(yyv4611, "") + yyh4611.ElemContainerState(yyj4611) if r.TryDecodeAsNil() { - yyv4637[yyj4637] = "" + yyv4611[yyj4611] = "" } else { - yyv4637[yyj4637] = Capability(r.DecodeString()) + yyv4611[yyj4611] = Capability(r.DecodeString()) } } } } else { - yyj4637 := 0 - for ; !r.CheckBreak(); yyj4637++ { + yyj4611 := 0 + for ; !r.CheckBreak(); yyj4611++ { - if yyj4637 >= len(yyv4637) { - yyv4637 = append(yyv4637, "") // var yyz4637 Capability - yyc4637 = true + if yyj4611 >= len(yyv4611) { + yyv4611 = append(yyv4611, "") // var yyz4611 Capability + yyc4611 = true } - yyh4637.ElemContainerState(yyj4637) - if yyj4637 < len(yyv4637) { + yyh4611.ElemContainerState(yyj4611) + if yyj4611 < len(yyv4611) { if r.TryDecodeAsNil() { - yyv4637[yyj4637] = "" + yyv4611[yyj4611] = "" } else { - yyv4637[yyj4637] = Capability(r.DecodeString()) + yyv4611[yyj4611] = Capability(r.DecodeString()) } } else { @@ -58092,17 +57793,17 @@ func (x codecSelfer1234) decSliceCapability(v *[]Capability, d *codec1978.Decode } } - if yyj4637 < len(yyv4637) { - yyv4637 = yyv4637[:yyj4637] - yyc4637 = true - } else if yyj4637 == 0 && yyv4637 == nil { - yyv4637 = []Capability{} - yyc4637 = true + if yyj4611 < len(yyv4611) { + yyv4611 = yyv4611[:yyj4611] + yyc4611 = true + } else if yyj4611 == 0 && yyv4611 == nil { + yyv4611 = []Capability{} + yyc4611 = true } } - yyh4637.End() - if yyc4637 { - *v = yyv4637 + yyh4611.End() + if yyc4611 { + *v = yyv4611 } } @@ -58111,10 +57812,10 @@ func (x codecSelfer1234) encSliceContainerPort(v []ContainerPort, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4641 := range v { + for _, yyv4615 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4642 := &yyv4641 - yy4642.CodecEncodeSelf(e) + yy4616 := &yyv4615 + yy4616.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58124,83 +57825,83 @@ func (x codecSelfer1234) decSliceContainerPort(v *[]ContainerPort, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4643 := *v - yyh4643, yyl4643 := z.DecSliceHelperStart() - var yyc4643 bool - if yyl4643 == 0 { - if yyv4643 == nil { - yyv4643 = []ContainerPort{} - yyc4643 = true - } else if len(yyv4643) != 0 { - yyv4643 = yyv4643[:0] - yyc4643 = true + yyv4617 := *v + yyh4617, yyl4617 := z.DecSliceHelperStart() + var yyc4617 bool + if yyl4617 == 0 { + if yyv4617 == nil { + yyv4617 = []ContainerPort{} + yyc4617 = true + } else if len(yyv4617) != 0 { + yyv4617 = yyv4617[:0] + yyc4617 = true } - } else if yyl4643 > 0 { - var yyrr4643, yyrl4643 int - var yyrt4643 bool - if yyl4643 > cap(yyv4643) { + } else if yyl4617 > 0 { + var yyrr4617, yyrl4617 int + var yyrt4617 bool + if yyl4617 > cap(yyv4617) { - yyrg4643 := len(yyv4643) > 0 - yyv24643 := yyv4643 - yyrl4643, yyrt4643 = z.DecInferLen(yyl4643, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4643 { - if yyrl4643 <= cap(yyv4643) { - yyv4643 = yyv4643[:yyrl4643] + yyrg4617 := len(yyv4617) > 0 + yyv24617 := yyv4617 + yyrl4617, yyrt4617 = z.DecInferLen(yyl4617, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4617 { + if yyrl4617 <= cap(yyv4617) { + yyv4617 = yyv4617[:yyrl4617] } else { - yyv4643 = make([]ContainerPort, yyrl4643) + yyv4617 = make([]ContainerPort, yyrl4617) } } else { - yyv4643 = make([]ContainerPort, yyrl4643) + yyv4617 = make([]ContainerPort, yyrl4617) } - yyc4643 = true - yyrr4643 = len(yyv4643) - if yyrg4643 { - copy(yyv4643, yyv24643) + yyc4617 = true + yyrr4617 = len(yyv4617) + if yyrg4617 { + copy(yyv4617, yyv24617) } - } else if yyl4643 != len(yyv4643) { - yyv4643 = yyv4643[:yyl4643] - yyc4643 = true + } else if yyl4617 != len(yyv4617) { + yyv4617 = yyv4617[:yyl4617] + yyc4617 = true } - yyj4643 := 0 - for ; yyj4643 < yyrr4643; yyj4643++ { - yyh4643.ElemContainerState(yyj4643) + yyj4617 := 0 + for ; yyj4617 < yyrr4617; yyj4617++ { + yyh4617.ElemContainerState(yyj4617) if r.TryDecodeAsNil() { - yyv4643[yyj4643] = ContainerPort{} + yyv4617[yyj4617] = ContainerPort{} } else { - yyv4644 := &yyv4643[yyj4643] - yyv4644.CodecDecodeSelf(d) + yyv4618 := &yyv4617[yyj4617] + yyv4618.CodecDecodeSelf(d) } } - if yyrt4643 { - for ; yyj4643 < yyl4643; yyj4643++ { - yyv4643 = append(yyv4643, ContainerPort{}) - yyh4643.ElemContainerState(yyj4643) + if yyrt4617 { + for ; yyj4617 < yyl4617; yyj4617++ { + yyv4617 = append(yyv4617, ContainerPort{}) + yyh4617.ElemContainerState(yyj4617) if r.TryDecodeAsNil() { - yyv4643[yyj4643] = ContainerPort{} + yyv4617[yyj4617] = ContainerPort{} } else { - yyv4645 := &yyv4643[yyj4643] - yyv4645.CodecDecodeSelf(d) + yyv4619 := &yyv4617[yyj4617] + yyv4619.CodecDecodeSelf(d) } } } } else { - yyj4643 := 0 - for ; !r.CheckBreak(); yyj4643++ { + yyj4617 := 0 + for ; !r.CheckBreak(); yyj4617++ { - if yyj4643 >= len(yyv4643) { - yyv4643 = append(yyv4643, ContainerPort{}) // var yyz4643 ContainerPort - yyc4643 = true + if yyj4617 >= len(yyv4617) { + yyv4617 = append(yyv4617, ContainerPort{}) // var yyz4617 ContainerPort + yyc4617 = true } - yyh4643.ElemContainerState(yyj4643) - if yyj4643 < len(yyv4643) { + yyh4617.ElemContainerState(yyj4617) + if yyj4617 < len(yyv4617) { if r.TryDecodeAsNil() { - yyv4643[yyj4643] = ContainerPort{} + yyv4617[yyj4617] = ContainerPort{} } else { - yyv4646 := &yyv4643[yyj4643] - yyv4646.CodecDecodeSelf(d) + yyv4620 := &yyv4617[yyj4617] + yyv4620.CodecDecodeSelf(d) } } else { @@ -58208,17 +57909,17 @@ func (x codecSelfer1234) decSliceContainerPort(v *[]ContainerPort, d *codec1978. } } - if yyj4643 < len(yyv4643) { - yyv4643 = yyv4643[:yyj4643] - yyc4643 = true - } else if yyj4643 == 0 && yyv4643 == nil { - yyv4643 = []ContainerPort{} - yyc4643 = true + if yyj4617 < len(yyv4617) { + yyv4617 = yyv4617[:yyj4617] + yyc4617 = true + } else if yyj4617 == 0 && yyv4617 == nil { + yyv4617 = []ContainerPort{} + yyc4617 = true } } - yyh4643.End() - if yyc4643 { - *v = yyv4643 + yyh4617.End() + if yyc4617 { + *v = yyv4617 } } @@ -58227,10 +57928,10 @@ func (x codecSelfer1234) encSliceEnvVar(v []EnvVar, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4647 := range v { + for _, yyv4621 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4648 := &yyv4647 - yy4648.CodecEncodeSelf(e) + yy4622 := &yyv4621 + yy4622.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58240,83 +57941,83 @@ func (x codecSelfer1234) decSliceEnvVar(v *[]EnvVar, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4649 := *v - yyh4649, yyl4649 := z.DecSliceHelperStart() - var yyc4649 bool - if yyl4649 == 0 { - if yyv4649 == nil { - yyv4649 = []EnvVar{} - yyc4649 = true - } else if len(yyv4649) != 0 { - yyv4649 = yyv4649[:0] - yyc4649 = true + yyv4623 := *v + yyh4623, yyl4623 := z.DecSliceHelperStart() + var yyc4623 bool + if yyl4623 == 0 { + if yyv4623 == nil { + yyv4623 = []EnvVar{} + yyc4623 = true + } else if len(yyv4623) != 0 { + yyv4623 = yyv4623[:0] + yyc4623 = true } - } else if yyl4649 > 0 { - var yyrr4649, yyrl4649 int - var yyrt4649 bool - if yyl4649 > cap(yyv4649) { + } else if yyl4623 > 0 { + var yyrr4623, yyrl4623 int + var yyrt4623 bool + if yyl4623 > cap(yyv4623) { - yyrg4649 := len(yyv4649) > 0 - yyv24649 := yyv4649 - yyrl4649, yyrt4649 = z.DecInferLen(yyl4649, z.DecBasicHandle().MaxInitLen, 40) - if yyrt4649 { - if yyrl4649 <= cap(yyv4649) { - yyv4649 = yyv4649[:yyrl4649] + yyrg4623 := len(yyv4623) > 0 + yyv24623 := yyv4623 + yyrl4623, yyrt4623 = z.DecInferLen(yyl4623, z.DecBasicHandle().MaxInitLen, 40) + if yyrt4623 { + if yyrl4623 <= cap(yyv4623) { + yyv4623 = yyv4623[:yyrl4623] } else { - yyv4649 = make([]EnvVar, yyrl4649) + yyv4623 = make([]EnvVar, yyrl4623) } } else { - yyv4649 = make([]EnvVar, yyrl4649) + yyv4623 = make([]EnvVar, yyrl4623) } - yyc4649 = true - yyrr4649 = len(yyv4649) - if yyrg4649 { - copy(yyv4649, yyv24649) + yyc4623 = true + yyrr4623 = len(yyv4623) + if yyrg4623 { + copy(yyv4623, yyv24623) } - } else if yyl4649 != len(yyv4649) { - yyv4649 = yyv4649[:yyl4649] - yyc4649 = true + } else if yyl4623 != len(yyv4623) { + yyv4623 = yyv4623[:yyl4623] + yyc4623 = true } - yyj4649 := 0 - for ; yyj4649 < yyrr4649; yyj4649++ { - yyh4649.ElemContainerState(yyj4649) + yyj4623 := 0 + for ; yyj4623 < yyrr4623; yyj4623++ { + yyh4623.ElemContainerState(yyj4623) if r.TryDecodeAsNil() { - yyv4649[yyj4649] = EnvVar{} + yyv4623[yyj4623] = EnvVar{} } else { - yyv4650 := &yyv4649[yyj4649] - yyv4650.CodecDecodeSelf(d) + yyv4624 := &yyv4623[yyj4623] + yyv4624.CodecDecodeSelf(d) } } - if yyrt4649 { - for ; yyj4649 < yyl4649; yyj4649++ { - yyv4649 = append(yyv4649, EnvVar{}) - yyh4649.ElemContainerState(yyj4649) + if yyrt4623 { + for ; yyj4623 < yyl4623; yyj4623++ { + yyv4623 = append(yyv4623, EnvVar{}) + yyh4623.ElemContainerState(yyj4623) if r.TryDecodeAsNil() { - yyv4649[yyj4649] = EnvVar{} + yyv4623[yyj4623] = EnvVar{} } else { - yyv4651 := &yyv4649[yyj4649] - yyv4651.CodecDecodeSelf(d) + yyv4625 := &yyv4623[yyj4623] + yyv4625.CodecDecodeSelf(d) } } } } else { - yyj4649 := 0 - for ; !r.CheckBreak(); yyj4649++ { + yyj4623 := 0 + for ; !r.CheckBreak(); yyj4623++ { - if yyj4649 >= len(yyv4649) { - yyv4649 = append(yyv4649, EnvVar{}) // var yyz4649 EnvVar - yyc4649 = true + if yyj4623 >= len(yyv4623) { + yyv4623 = append(yyv4623, EnvVar{}) // var yyz4623 EnvVar + yyc4623 = true } - yyh4649.ElemContainerState(yyj4649) - if yyj4649 < len(yyv4649) { + yyh4623.ElemContainerState(yyj4623) + if yyj4623 < len(yyv4623) { if r.TryDecodeAsNil() { - yyv4649[yyj4649] = EnvVar{} + yyv4623[yyj4623] = EnvVar{} } else { - yyv4652 := &yyv4649[yyj4649] - yyv4652.CodecDecodeSelf(d) + yyv4626 := &yyv4623[yyj4623] + yyv4626.CodecDecodeSelf(d) } } else { @@ -58324,17 +58025,17 @@ func (x codecSelfer1234) decSliceEnvVar(v *[]EnvVar, d *codec1978.Decoder) { } } - if yyj4649 < len(yyv4649) { - yyv4649 = yyv4649[:yyj4649] - yyc4649 = true - } else if yyj4649 == 0 && yyv4649 == nil { - yyv4649 = []EnvVar{} - yyc4649 = true + if yyj4623 < len(yyv4623) { + yyv4623 = yyv4623[:yyj4623] + yyc4623 = true + } else if yyj4623 == 0 && yyv4623 == nil { + yyv4623 = []EnvVar{} + yyc4623 = true } } - yyh4649.End() - if yyc4649 { - *v = yyv4649 + yyh4623.End() + if yyc4623 { + *v = yyv4623 } } @@ -58343,10 +58044,10 @@ func (x codecSelfer1234) encSliceVolumeMount(v []VolumeMount, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4653 := range v { + for _, yyv4627 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4654 := &yyv4653 - yy4654.CodecEncodeSelf(e) + yy4628 := &yyv4627 + yy4628.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58356,83 +58057,83 @@ func (x codecSelfer1234) decSliceVolumeMount(v *[]VolumeMount, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4655 := *v - yyh4655, yyl4655 := z.DecSliceHelperStart() - var yyc4655 bool - if yyl4655 == 0 { - if yyv4655 == nil { - yyv4655 = []VolumeMount{} - yyc4655 = true - } else if len(yyv4655) != 0 { - yyv4655 = yyv4655[:0] - yyc4655 = true + yyv4629 := *v + yyh4629, yyl4629 := z.DecSliceHelperStart() + var yyc4629 bool + if yyl4629 == 0 { + if yyv4629 == nil { + yyv4629 = []VolumeMount{} + yyc4629 = true + } else if len(yyv4629) != 0 { + yyv4629 = yyv4629[:0] + yyc4629 = true } - } else if yyl4655 > 0 { - var yyrr4655, yyrl4655 int - var yyrt4655 bool - if yyl4655 > cap(yyv4655) { + } else if yyl4629 > 0 { + var yyrr4629, yyrl4629 int + var yyrt4629 bool + if yyl4629 > cap(yyv4629) { - yyrg4655 := len(yyv4655) > 0 - yyv24655 := yyv4655 - yyrl4655, yyrt4655 = z.DecInferLen(yyl4655, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4655 { - if yyrl4655 <= cap(yyv4655) { - yyv4655 = yyv4655[:yyrl4655] + yyrg4629 := len(yyv4629) > 0 + yyv24629 := yyv4629 + yyrl4629, yyrt4629 = z.DecInferLen(yyl4629, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4629 { + if yyrl4629 <= cap(yyv4629) { + yyv4629 = yyv4629[:yyrl4629] } else { - yyv4655 = make([]VolumeMount, yyrl4655) + yyv4629 = make([]VolumeMount, yyrl4629) } } else { - yyv4655 = make([]VolumeMount, yyrl4655) + yyv4629 = make([]VolumeMount, yyrl4629) } - yyc4655 = true - yyrr4655 = len(yyv4655) - if yyrg4655 { - copy(yyv4655, yyv24655) + yyc4629 = true + yyrr4629 = len(yyv4629) + if yyrg4629 { + copy(yyv4629, yyv24629) } - } else if yyl4655 != len(yyv4655) { - yyv4655 = yyv4655[:yyl4655] - yyc4655 = true + } else if yyl4629 != len(yyv4629) { + yyv4629 = yyv4629[:yyl4629] + yyc4629 = true } - yyj4655 := 0 - for ; yyj4655 < yyrr4655; yyj4655++ { - yyh4655.ElemContainerState(yyj4655) + yyj4629 := 0 + for ; yyj4629 < yyrr4629; yyj4629++ { + yyh4629.ElemContainerState(yyj4629) if r.TryDecodeAsNil() { - yyv4655[yyj4655] = VolumeMount{} + yyv4629[yyj4629] = VolumeMount{} } else { - yyv4656 := &yyv4655[yyj4655] - yyv4656.CodecDecodeSelf(d) + yyv4630 := &yyv4629[yyj4629] + yyv4630.CodecDecodeSelf(d) } } - if yyrt4655 { - for ; yyj4655 < yyl4655; yyj4655++ { - yyv4655 = append(yyv4655, VolumeMount{}) - yyh4655.ElemContainerState(yyj4655) + if yyrt4629 { + for ; yyj4629 < yyl4629; yyj4629++ { + yyv4629 = append(yyv4629, VolumeMount{}) + yyh4629.ElemContainerState(yyj4629) if r.TryDecodeAsNil() { - yyv4655[yyj4655] = VolumeMount{} + yyv4629[yyj4629] = VolumeMount{} } else { - yyv4657 := &yyv4655[yyj4655] - yyv4657.CodecDecodeSelf(d) + yyv4631 := &yyv4629[yyj4629] + yyv4631.CodecDecodeSelf(d) } } } } else { - yyj4655 := 0 - for ; !r.CheckBreak(); yyj4655++ { + yyj4629 := 0 + for ; !r.CheckBreak(); yyj4629++ { - if yyj4655 >= len(yyv4655) { - yyv4655 = append(yyv4655, VolumeMount{}) // var yyz4655 VolumeMount - yyc4655 = true + if yyj4629 >= len(yyv4629) { + yyv4629 = append(yyv4629, VolumeMount{}) // var yyz4629 VolumeMount + yyc4629 = true } - yyh4655.ElemContainerState(yyj4655) - if yyj4655 < len(yyv4655) { + yyh4629.ElemContainerState(yyj4629) + if yyj4629 < len(yyv4629) { if r.TryDecodeAsNil() { - yyv4655[yyj4655] = VolumeMount{} + yyv4629[yyj4629] = VolumeMount{} } else { - yyv4658 := &yyv4655[yyj4655] - yyv4658.CodecDecodeSelf(d) + yyv4632 := &yyv4629[yyj4629] + yyv4632.CodecDecodeSelf(d) } } else { @@ -58440,17 +58141,17 @@ func (x codecSelfer1234) decSliceVolumeMount(v *[]VolumeMount, d *codec1978.Deco } } - if yyj4655 < len(yyv4655) { - yyv4655 = yyv4655[:yyj4655] - yyc4655 = true - } else if yyj4655 == 0 && yyv4655 == nil { - yyv4655 = []VolumeMount{} - yyc4655 = true + if yyj4629 < len(yyv4629) { + yyv4629 = yyv4629[:yyj4629] + yyc4629 = true + } else if yyj4629 == 0 && yyv4629 == nil { + yyv4629 = []VolumeMount{} + yyc4629 = true } } - yyh4655.End() - if yyc4655 { - *v = yyv4655 + yyh4629.End() + if yyc4629 { + *v = yyv4629 } } @@ -58459,10 +58160,10 @@ func (x codecSelfer1234) encSliceNodeSelectorTerm(v []NodeSelectorTerm, e *codec z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4659 := range v { + for _, yyv4633 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4660 := &yyv4659 - yy4660.CodecEncodeSelf(e) + yy4634 := &yyv4633 + yy4634.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58472,83 +58173,83 @@ func (x codecSelfer1234) decSliceNodeSelectorTerm(v *[]NodeSelectorTerm, d *code z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4661 := *v - yyh4661, yyl4661 := z.DecSliceHelperStart() - var yyc4661 bool - if yyl4661 == 0 { - if yyv4661 == nil { - yyv4661 = []NodeSelectorTerm{} - yyc4661 = true - } else if len(yyv4661) != 0 { - yyv4661 = yyv4661[:0] - yyc4661 = true + yyv4635 := *v + yyh4635, yyl4635 := z.DecSliceHelperStart() + var yyc4635 bool + if yyl4635 == 0 { + if yyv4635 == nil { + yyv4635 = []NodeSelectorTerm{} + yyc4635 = true + } else if len(yyv4635) != 0 { + yyv4635 = yyv4635[:0] + yyc4635 = true } - } else if yyl4661 > 0 { - var yyrr4661, yyrl4661 int - var yyrt4661 bool - if yyl4661 > cap(yyv4661) { + } else if yyl4635 > 0 { + var yyrr4635, yyrl4635 int + var yyrt4635 bool + if yyl4635 > cap(yyv4635) { - yyrg4661 := len(yyv4661) > 0 - yyv24661 := yyv4661 - yyrl4661, yyrt4661 = z.DecInferLen(yyl4661, z.DecBasicHandle().MaxInitLen, 24) - if yyrt4661 { - if yyrl4661 <= cap(yyv4661) { - yyv4661 = yyv4661[:yyrl4661] + yyrg4635 := len(yyv4635) > 0 + yyv24635 := yyv4635 + yyrl4635, yyrt4635 = z.DecInferLen(yyl4635, z.DecBasicHandle().MaxInitLen, 24) + if yyrt4635 { + if yyrl4635 <= cap(yyv4635) { + yyv4635 = yyv4635[:yyrl4635] } else { - yyv4661 = make([]NodeSelectorTerm, yyrl4661) + yyv4635 = make([]NodeSelectorTerm, yyrl4635) } } else { - yyv4661 = make([]NodeSelectorTerm, yyrl4661) + yyv4635 = make([]NodeSelectorTerm, yyrl4635) } - yyc4661 = true - yyrr4661 = len(yyv4661) - if yyrg4661 { - copy(yyv4661, yyv24661) + yyc4635 = true + yyrr4635 = len(yyv4635) + if yyrg4635 { + copy(yyv4635, yyv24635) } - } else if yyl4661 != len(yyv4661) { - yyv4661 = yyv4661[:yyl4661] - yyc4661 = true + } else if yyl4635 != len(yyv4635) { + yyv4635 = yyv4635[:yyl4635] + yyc4635 = true } - yyj4661 := 0 - for ; yyj4661 < yyrr4661; yyj4661++ { - yyh4661.ElemContainerState(yyj4661) + yyj4635 := 0 + for ; yyj4635 < yyrr4635; yyj4635++ { + yyh4635.ElemContainerState(yyj4635) if r.TryDecodeAsNil() { - yyv4661[yyj4661] = NodeSelectorTerm{} + yyv4635[yyj4635] = NodeSelectorTerm{} } else { - yyv4662 := &yyv4661[yyj4661] - yyv4662.CodecDecodeSelf(d) + yyv4636 := &yyv4635[yyj4635] + yyv4636.CodecDecodeSelf(d) } } - if yyrt4661 { - for ; yyj4661 < yyl4661; yyj4661++ { - yyv4661 = append(yyv4661, NodeSelectorTerm{}) - yyh4661.ElemContainerState(yyj4661) + if yyrt4635 { + for ; yyj4635 < yyl4635; yyj4635++ { + yyv4635 = append(yyv4635, NodeSelectorTerm{}) + yyh4635.ElemContainerState(yyj4635) if r.TryDecodeAsNil() { - yyv4661[yyj4661] = NodeSelectorTerm{} + yyv4635[yyj4635] = NodeSelectorTerm{} } else { - yyv4663 := &yyv4661[yyj4661] - yyv4663.CodecDecodeSelf(d) + yyv4637 := &yyv4635[yyj4635] + yyv4637.CodecDecodeSelf(d) } } } } else { - yyj4661 := 0 - for ; !r.CheckBreak(); yyj4661++ { + yyj4635 := 0 + for ; !r.CheckBreak(); yyj4635++ { - if yyj4661 >= len(yyv4661) { - yyv4661 = append(yyv4661, NodeSelectorTerm{}) // var yyz4661 NodeSelectorTerm - yyc4661 = true + if yyj4635 >= len(yyv4635) { + yyv4635 = append(yyv4635, NodeSelectorTerm{}) // var yyz4635 NodeSelectorTerm + yyc4635 = true } - yyh4661.ElemContainerState(yyj4661) - if yyj4661 < len(yyv4661) { + yyh4635.ElemContainerState(yyj4635) + if yyj4635 < len(yyv4635) { if r.TryDecodeAsNil() { - yyv4661[yyj4661] = NodeSelectorTerm{} + yyv4635[yyj4635] = NodeSelectorTerm{} } else { - yyv4664 := &yyv4661[yyj4661] - yyv4664.CodecDecodeSelf(d) + yyv4638 := &yyv4635[yyj4635] + yyv4638.CodecDecodeSelf(d) } } else { @@ -58556,17 +58257,17 @@ func (x codecSelfer1234) decSliceNodeSelectorTerm(v *[]NodeSelectorTerm, d *code } } - if yyj4661 < len(yyv4661) { - yyv4661 = yyv4661[:yyj4661] - yyc4661 = true - } else if yyj4661 == 0 && yyv4661 == nil { - yyv4661 = []NodeSelectorTerm{} - yyc4661 = true + if yyj4635 < len(yyv4635) { + yyv4635 = yyv4635[:yyj4635] + yyc4635 = true + } else if yyj4635 == 0 && yyv4635 == nil { + yyv4635 = []NodeSelectorTerm{} + yyc4635 = true } } - yyh4661.End() - if yyc4661 { - *v = yyv4661 + yyh4635.End() + if yyc4635 { + *v = yyv4635 } } @@ -58575,10 +58276,10 @@ func (x codecSelfer1234) encSliceNodeSelectorRequirement(v []NodeSelectorRequire z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4665 := range v { + for _, yyv4639 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4666 := &yyv4665 - yy4666.CodecEncodeSelf(e) + yy4640 := &yyv4639 + yy4640.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58588,83 +58289,83 @@ func (x codecSelfer1234) decSliceNodeSelectorRequirement(v *[]NodeSelectorRequir z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4667 := *v - yyh4667, yyl4667 := z.DecSliceHelperStart() - var yyc4667 bool - if yyl4667 == 0 { - if yyv4667 == nil { - yyv4667 = []NodeSelectorRequirement{} - yyc4667 = true - } else if len(yyv4667) != 0 { - yyv4667 = yyv4667[:0] - yyc4667 = true + yyv4641 := *v + yyh4641, yyl4641 := z.DecSliceHelperStart() + var yyc4641 bool + if yyl4641 == 0 { + if yyv4641 == nil { + yyv4641 = []NodeSelectorRequirement{} + yyc4641 = true + } else if len(yyv4641) != 0 { + yyv4641 = yyv4641[:0] + yyc4641 = true } - } else if yyl4667 > 0 { - var yyrr4667, yyrl4667 int - var yyrt4667 bool - if yyl4667 > cap(yyv4667) { + } else if yyl4641 > 0 { + var yyrr4641, yyrl4641 int + var yyrt4641 bool + if yyl4641 > cap(yyv4641) { - yyrg4667 := len(yyv4667) > 0 - yyv24667 := yyv4667 - yyrl4667, yyrt4667 = z.DecInferLen(yyl4667, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4667 { - if yyrl4667 <= cap(yyv4667) { - yyv4667 = yyv4667[:yyrl4667] + yyrg4641 := len(yyv4641) > 0 + yyv24641 := yyv4641 + yyrl4641, yyrt4641 = z.DecInferLen(yyl4641, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4641 { + if yyrl4641 <= cap(yyv4641) { + yyv4641 = yyv4641[:yyrl4641] } else { - yyv4667 = make([]NodeSelectorRequirement, yyrl4667) + yyv4641 = make([]NodeSelectorRequirement, yyrl4641) } } else { - yyv4667 = make([]NodeSelectorRequirement, yyrl4667) + yyv4641 = make([]NodeSelectorRequirement, yyrl4641) } - yyc4667 = true - yyrr4667 = len(yyv4667) - if yyrg4667 { - copy(yyv4667, yyv24667) + yyc4641 = true + yyrr4641 = len(yyv4641) + if yyrg4641 { + copy(yyv4641, yyv24641) } - } else if yyl4667 != len(yyv4667) { - yyv4667 = yyv4667[:yyl4667] - yyc4667 = true + } else if yyl4641 != len(yyv4641) { + yyv4641 = yyv4641[:yyl4641] + yyc4641 = true } - yyj4667 := 0 - for ; yyj4667 < yyrr4667; yyj4667++ { - yyh4667.ElemContainerState(yyj4667) + yyj4641 := 0 + for ; yyj4641 < yyrr4641; yyj4641++ { + yyh4641.ElemContainerState(yyj4641) if r.TryDecodeAsNil() { - yyv4667[yyj4667] = NodeSelectorRequirement{} + yyv4641[yyj4641] = NodeSelectorRequirement{} } else { - yyv4668 := &yyv4667[yyj4667] - yyv4668.CodecDecodeSelf(d) + yyv4642 := &yyv4641[yyj4641] + yyv4642.CodecDecodeSelf(d) } } - if yyrt4667 { - for ; yyj4667 < yyl4667; yyj4667++ { - yyv4667 = append(yyv4667, NodeSelectorRequirement{}) - yyh4667.ElemContainerState(yyj4667) + if yyrt4641 { + for ; yyj4641 < yyl4641; yyj4641++ { + yyv4641 = append(yyv4641, NodeSelectorRequirement{}) + yyh4641.ElemContainerState(yyj4641) if r.TryDecodeAsNil() { - yyv4667[yyj4667] = NodeSelectorRequirement{} + yyv4641[yyj4641] = NodeSelectorRequirement{} } else { - yyv4669 := &yyv4667[yyj4667] - yyv4669.CodecDecodeSelf(d) + yyv4643 := &yyv4641[yyj4641] + yyv4643.CodecDecodeSelf(d) } } } } else { - yyj4667 := 0 - for ; !r.CheckBreak(); yyj4667++ { + yyj4641 := 0 + for ; !r.CheckBreak(); yyj4641++ { - if yyj4667 >= len(yyv4667) { - yyv4667 = append(yyv4667, NodeSelectorRequirement{}) // var yyz4667 NodeSelectorRequirement - yyc4667 = true + if yyj4641 >= len(yyv4641) { + yyv4641 = append(yyv4641, NodeSelectorRequirement{}) // var yyz4641 NodeSelectorRequirement + yyc4641 = true } - yyh4667.ElemContainerState(yyj4667) - if yyj4667 < len(yyv4667) { + yyh4641.ElemContainerState(yyj4641) + if yyj4641 < len(yyv4641) { if r.TryDecodeAsNil() { - yyv4667[yyj4667] = NodeSelectorRequirement{} + yyv4641[yyj4641] = NodeSelectorRequirement{} } else { - yyv4670 := &yyv4667[yyj4667] - yyv4670.CodecDecodeSelf(d) + yyv4644 := &yyv4641[yyj4641] + yyv4644.CodecDecodeSelf(d) } } else { @@ -58672,17 +58373,17 @@ func (x codecSelfer1234) decSliceNodeSelectorRequirement(v *[]NodeSelectorRequir } } - if yyj4667 < len(yyv4667) { - yyv4667 = yyv4667[:yyj4667] - yyc4667 = true - } else if yyj4667 == 0 && yyv4667 == nil { - yyv4667 = []NodeSelectorRequirement{} - yyc4667 = true + if yyj4641 < len(yyv4641) { + yyv4641 = yyv4641[:yyj4641] + yyc4641 = true + } else if yyj4641 == 0 && yyv4641 == nil { + yyv4641 = []NodeSelectorRequirement{} + yyc4641 = true } } - yyh4667.End() - if yyc4667 { - *v = yyv4667 + yyh4641.End() + if yyc4641 { + *v = yyv4641 } } @@ -58691,10 +58392,10 @@ func (x codecSelfer1234) encSlicePodAffinityTerm(v []PodAffinityTerm, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4671 := range v { + for _, yyv4645 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4672 := &yyv4671 - yy4672.CodecEncodeSelf(e) + yy4646 := &yyv4645 + yy4646.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58704,83 +58405,83 @@ func (x codecSelfer1234) decSlicePodAffinityTerm(v *[]PodAffinityTerm, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4673 := *v - yyh4673, yyl4673 := z.DecSliceHelperStart() - var yyc4673 bool - if yyl4673 == 0 { - if yyv4673 == nil { - yyv4673 = []PodAffinityTerm{} - yyc4673 = true - } else if len(yyv4673) != 0 { - yyv4673 = yyv4673[:0] - yyc4673 = true + yyv4647 := *v + yyh4647, yyl4647 := z.DecSliceHelperStart() + var yyc4647 bool + if yyl4647 == 0 { + if yyv4647 == nil { + yyv4647 = []PodAffinityTerm{} + yyc4647 = true + } else if len(yyv4647) != 0 { + yyv4647 = yyv4647[:0] + yyc4647 = true } - } else if yyl4673 > 0 { - var yyrr4673, yyrl4673 int - var yyrt4673 bool - if yyl4673 > cap(yyv4673) { + } else if yyl4647 > 0 { + var yyrr4647, yyrl4647 int + var yyrt4647 bool + if yyl4647 > cap(yyv4647) { - yyrg4673 := len(yyv4673) > 0 - yyv24673 := yyv4673 - yyrl4673, yyrt4673 = z.DecInferLen(yyl4673, z.DecBasicHandle().MaxInitLen, 48) - if yyrt4673 { - if yyrl4673 <= cap(yyv4673) { - yyv4673 = yyv4673[:yyrl4673] + yyrg4647 := len(yyv4647) > 0 + yyv24647 := yyv4647 + yyrl4647, yyrt4647 = z.DecInferLen(yyl4647, z.DecBasicHandle().MaxInitLen, 48) + if yyrt4647 { + if yyrl4647 <= cap(yyv4647) { + yyv4647 = yyv4647[:yyrl4647] } else { - yyv4673 = make([]PodAffinityTerm, yyrl4673) + yyv4647 = make([]PodAffinityTerm, yyrl4647) } } else { - yyv4673 = make([]PodAffinityTerm, yyrl4673) + yyv4647 = make([]PodAffinityTerm, yyrl4647) } - yyc4673 = true - yyrr4673 = len(yyv4673) - if yyrg4673 { - copy(yyv4673, yyv24673) + yyc4647 = true + yyrr4647 = len(yyv4647) + if yyrg4647 { + copy(yyv4647, yyv24647) } - } else if yyl4673 != len(yyv4673) { - yyv4673 = yyv4673[:yyl4673] - yyc4673 = true + } else if yyl4647 != len(yyv4647) { + yyv4647 = yyv4647[:yyl4647] + yyc4647 = true } - yyj4673 := 0 - for ; yyj4673 < yyrr4673; yyj4673++ { - yyh4673.ElemContainerState(yyj4673) + yyj4647 := 0 + for ; yyj4647 < yyrr4647; yyj4647++ { + yyh4647.ElemContainerState(yyj4647) if r.TryDecodeAsNil() { - yyv4673[yyj4673] = PodAffinityTerm{} + yyv4647[yyj4647] = PodAffinityTerm{} } else { - yyv4674 := &yyv4673[yyj4673] - yyv4674.CodecDecodeSelf(d) + yyv4648 := &yyv4647[yyj4647] + yyv4648.CodecDecodeSelf(d) } } - if yyrt4673 { - for ; yyj4673 < yyl4673; yyj4673++ { - yyv4673 = append(yyv4673, PodAffinityTerm{}) - yyh4673.ElemContainerState(yyj4673) + if yyrt4647 { + for ; yyj4647 < yyl4647; yyj4647++ { + yyv4647 = append(yyv4647, PodAffinityTerm{}) + yyh4647.ElemContainerState(yyj4647) if r.TryDecodeAsNil() { - yyv4673[yyj4673] = PodAffinityTerm{} + yyv4647[yyj4647] = PodAffinityTerm{} } else { - yyv4675 := &yyv4673[yyj4673] - yyv4675.CodecDecodeSelf(d) + yyv4649 := &yyv4647[yyj4647] + yyv4649.CodecDecodeSelf(d) } } } } else { - yyj4673 := 0 - for ; !r.CheckBreak(); yyj4673++ { + yyj4647 := 0 + for ; !r.CheckBreak(); yyj4647++ { - if yyj4673 >= len(yyv4673) { - yyv4673 = append(yyv4673, PodAffinityTerm{}) // var yyz4673 PodAffinityTerm - yyc4673 = true + if yyj4647 >= len(yyv4647) { + yyv4647 = append(yyv4647, PodAffinityTerm{}) // var yyz4647 PodAffinityTerm + yyc4647 = true } - yyh4673.ElemContainerState(yyj4673) - if yyj4673 < len(yyv4673) { + yyh4647.ElemContainerState(yyj4647) + if yyj4647 < len(yyv4647) { if r.TryDecodeAsNil() { - yyv4673[yyj4673] = PodAffinityTerm{} + yyv4647[yyj4647] = PodAffinityTerm{} } else { - yyv4676 := &yyv4673[yyj4673] - yyv4676.CodecDecodeSelf(d) + yyv4650 := &yyv4647[yyj4647] + yyv4650.CodecDecodeSelf(d) } } else { @@ -58788,17 +58489,17 @@ func (x codecSelfer1234) decSlicePodAffinityTerm(v *[]PodAffinityTerm, d *codec1 } } - if yyj4673 < len(yyv4673) { - yyv4673 = yyv4673[:yyj4673] - yyc4673 = true - } else if yyj4673 == 0 && yyv4673 == nil { - yyv4673 = []PodAffinityTerm{} - yyc4673 = true + if yyj4647 < len(yyv4647) { + yyv4647 = yyv4647[:yyj4647] + yyc4647 = true + } else if yyj4647 == 0 && yyv4647 == nil { + yyv4647 = []PodAffinityTerm{} + yyc4647 = true } } - yyh4673.End() - if yyc4673 { - *v = yyv4673 + yyh4647.End() + if yyc4647 { + *v = yyv4647 } } @@ -58807,10 +58508,10 @@ func (x codecSelfer1234) encSliceWeightedPodAffinityTerm(v []WeightedPodAffinity z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4677 := range v { + for _, yyv4651 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4678 := &yyv4677 - yy4678.CodecEncodeSelf(e) + yy4652 := &yyv4651 + yy4652.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58820,83 +58521,83 @@ func (x codecSelfer1234) decSliceWeightedPodAffinityTerm(v *[]WeightedPodAffinit z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4679 := *v - yyh4679, yyl4679 := z.DecSliceHelperStart() - var yyc4679 bool - if yyl4679 == 0 { - if yyv4679 == nil { - yyv4679 = []WeightedPodAffinityTerm{} - yyc4679 = true - } else if len(yyv4679) != 0 { - yyv4679 = yyv4679[:0] - yyc4679 = true + yyv4653 := *v + yyh4653, yyl4653 := z.DecSliceHelperStart() + var yyc4653 bool + if yyl4653 == 0 { + if yyv4653 == nil { + yyv4653 = []WeightedPodAffinityTerm{} + yyc4653 = true + } else if len(yyv4653) != 0 { + yyv4653 = yyv4653[:0] + yyc4653 = true } - } else if yyl4679 > 0 { - var yyrr4679, yyrl4679 int - var yyrt4679 bool - if yyl4679 > cap(yyv4679) { + } else if yyl4653 > 0 { + var yyrr4653, yyrl4653 int + var yyrt4653 bool + if yyl4653 > cap(yyv4653) { - yyrg4679 := len(yyv4679) > 0 - yyv24679 := yyv4679 - yyrl4679, yyrt4679 = z.DecInferLen(yyl4679, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4679 { - if yyrl4679 <= cap(yyv4679) { - yyv4679 = yyv4679[:yyrl4679] + yyrg4653 := len(yyv4653) > 0 + yyv24653 := yyv4653 + yyrl4653, yyrt4653 = z.DecInferLen(yyl4653, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4653 { + if yyrl4653 <= cap(yyv4653) { + yyv4653 = yyv4653[:yyrl4653] } else { - yyv4679 = make([]WeightedPodAffinityTerm, yyrl4679) + yyv4653 = make([]WeightedPodAffinityTerm, yyrl4653) } } else { - yyv4679 = make([]WeightedPodAffinityTerm, yyrl4679) + yyv4653 = make([]WeightedPodAffinityTerm, yyrl4653) } - yyc4679 = true - yyrr4679 = len(yyv4679) - if yyrg4679 { - copy(yyv4679, yyv24679) + yyc4653 = true + yyrr4653 = len(yyv4653) + if yyrg4653 { + copy(yyv4653, yyv24653) } - } else if yyl4679 != len(yyv4679) { - yyv4679 = yyv4679[:yyl4679] - yyc4679 = true + } else if yyl4653 != len(yyv4653) { + yyv4653 = yyv4653[:yyl4653] + yyc4653 = true } - yyj4679 := 0 - for ; yyj4679 < yyrr4679; yyj4679++ { - yyh4679.ElemContainerState(yyj4679) + yyj4653 := 0 + for ; yyj4653 < yyrr4653; yyj4653++ { + yyh4653.ElemContainerState(yyj4653) if r.TryDecodeAsNil() { - yyv4679[yyj4679] = WeightedPodAffinityTerm{} + yyv4653[yyj4653] = WeightedPodAffinityTerm{} } else { - yyv4680 := &yyv4679[yyj4679] - yyv4680.CodecDecodeSelf(d) + yyv4654 := &yyv4653[yyj4653] + yyv4654.CodecDecodeSelf(d) } } - if yyrt4679 { - for ; yyj4679 < yyl4679; yyj4679++ { - yyv4679 = append(yyv4679, WeightedPodAffinityTerm{}) - yyh4679.ElemContainerState(yyj4679) + if yyrt4653 { + for ; yyj4653 < yyl4653; yyj4653++ { + yyv4653 = append(yyv4653, WeightedPodAffinityTerm{}) + yyh4653.ElemContainerState(yyj4653) if r.TryDecodeAsNil() { - yyv4679[yyj4679] = WeightedPodAffinityTerm{} + yyv4653[yyj4653] = WeightedPodAffinityTerm{} } else { - yyv4681 := &yyv4679[yyj4679] - yyv4681.CodecDecodeSelf(d) + yyv4655 := &yyv4653[yyj4653] + yyv4655.CodecDecodeSelf(d) } } } } else { - yyj4679 := 0 - for ; !r.CheckBreak(); yyj4679++ { + yyj4653 := 0 + for ; !r.CheckBreak(); yyj4653++ { - if yyj4679 >= len(yyv4679) { - yyv4679 = append(yyv4679, WeightedPodAffinityTerm{}) // var yyz4679 WeightedPodAffinityTerm - yyc4679 = true + if yyj4653 >= len(yyv4653) { + yyv4653 = append(yyv4653, WeightedPodAffinityTerm{}) // var yyz4653 WeightedPodAffinityTerm + yyc4653 = true } - yyh4679.ElemContainerState(yyj4679) - if yyj4679 < len(yyv4679) { + yyh4653.ElemContainerState(yyj4653) + if yyj4653 < len(yyv4653) { if r.TryDecodeAsNil() { - yyv4679[yyj4679] = WeightedPodAffinityTerm{} + yyv4653[yyj4653] = WeightedPodAffinityTerm{} } else { - yyv4682 := &yyv4679[yyj4679] - yyv4682.CodecDecodeSelf(d) + yyv4656 := &yyv4653[yyj4653] + yyv4656.CodecDecodeSelf(d) } } else { @@ -58904,17 +58605,17 @@ func (x codecSelfer1234) decSliceWeightedPodAffinityTerm(v *[]WeightedPodAffinit } } - if yyj4679 < len(yyv4679) { - yyv4679 = yyv4679[:yyj4679] - yyc4679 = true - } else if yyj4679 == 0 && yyv4679 == nil { - yyv4679 = []WeightedPodAffinityTerm{} - yyc4679 = true + if yyj4653 < len(yyv4653) { + yyv4653 = yyv4653[:yyj4653] + yyc4653 = true + } else if yyj4653 == 0 && yyv4653 == nil { + yyv4653 = []WeightedPodAffinityTerm{} + yyc4653 = true } } - yyh4679.End() - if yyc4679 { - *v = yyv4679 + yyh4653.End() + if yyc4653 { + *v = yyv4653 } } @@ -58923,10 +58624,10 @@ func (x codecSelfer1234) encSlicePreferredSchedulingTerm(v []PreferredScheduling z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4683 := range v { + for _, yyv4657 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4684 := &yyv4683 - yy4684.CodecEncodeSelf(e) + yy4658 := &yyv4657 + yy4658.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -58936,83 +58637,83 @@ func (x codecSelfer1234) decSlicePreferredSchedulingTerm(v *[]PreferredSchedulin z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4685 := *v - yyh4685, yyl4685 := z.DecSliceHelperStart() - var yyc4685 bool - if yyl4685 == 0 { - if yyv4685 == nil { - yyv4685 = []PreferredSchedulingTerm{} - yyc4685 = true - } else if len(yyv4685) != 0 { - yyv4685 = yyv4685[:0] - yyc4685 = true + yyv4659 := *v + yyh4659, yyl4659 := z.DecSliceHelperStart() + var yyc4659 bool + if yyl4659 == 0 { + if yyv4659 == nil { + yyv4659 = []PreferredSchedulingTerm{} + yyc4659 = true + } else if len(yyv4659) != 0 { + yyv4659 = yyv4659[:0] + yyc4659 = true } - } else if yyl4685 > 0 { - var yyrr4685, yyrl4685 int - var yyrt4685 bool - if yyl4685 > cap(yyv4685) { + } else if yyl4659 > 0 { + var yyrr4659, yyrl4659 int + var yyrt4659 bool + if yyl4659 > cap(yyv4659) { - yyrg4685 := len(yyv4685) > 0 - yyv24685 := yyv4685 - yyrl4685, yyrt4685 = z.DecInferLen(yyl4685, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4685 { - if yyrl4685 <= cap(yyv4685) { - yyv4685 = yyv4685[:yyrl4685] + yyrg4659 := len(yyv4659) > 0 + yyv24659 := yyv4659 + yyrl4659, yyrt4659 = z.DecInferLen(yyl4659, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4659 { + if yyrl4659 <= cap(yyv4659) { + yyv4659 = yyv4659[:yyrl4659] } else { - yyv4685 = make([]PreferredSchedulingTerm, yyrl4685) + yyv4659 = make([]PreferredSchedulingTerm, yyrl4659) } } else { - yyv4685 = make([]PreferredSchedulingTerm, yyrl4685) + yyv4659 = make([]PreferredSchedulingTerm, yyrl4659) } - yyc4685 = true - yyrr4685 = len(yyv4685) - if yyrg4685 { - copy(yyv4685, yyv24685) + yyc4659 = true + yyrr4659 = len(yyv4659) + if yyrg4659 { + copy(yyv4659, yyv24659) } - } else if yyl4685 != len(yyv4685) { - yyv4685 = yyv4685[:yyl4685] - yyc4685 = true + } else if yyl4659 != len(yyv4659) { + yyv4659 = yyv4659[:yyl4659] + yyc4659 = true } - yyj4685 := 0 - for ; yyj4685 < yyrr4685; yyj4685++ { - yyh4685.ElemContainerState(yyj4685) + yyj4659 := 0 + for ; yyj4659 < yyrr4659; yyj4659++ { + yyh4659.ElemContainerState(yyj4659) if r.TryDecodeAsNil() { - yyv4685[yyj4685] = PreferredSchedulingTerm{} + yyv4659[yyj4659] = PreferredSchedulingTerm{} } else { - yyv4686 := &yyv4685[yyj4685] - yyv4686.CodecDecodeSelf(d) + yyv4660 := &yyv4659[yyj4659] + yyv4660.CodecDecodeSelf(d) } } - if yyrt4685 { - for ; yyj4685 < yyl4685; yyj4685++ { - yyv4685 = append(yyv4685, PreferredSchedulingTerm{}) - yyh4685.ElemContainerState(yyj4685) + if yyrt4659 { + for ; yyj4659 < yyl4659; yyj4659++ { + yyv4659 = append(yyv4659, PreferredSchedulingTerm{}) + yyh4659.ElemContainerState(yyj4659) if r.TryDecodeAsNil() { - yyv4685[yyj4685] = PreferredSchedulingTerm{} + yyv4659[yyj4659] = PreferredSchedulingTerm{} } else { - yyv4687 := &yyv4685[yyj4685] - yyv4687.CodecDecodeSelf(d) + yyv4661 := &yyv4659[yyj4659] + yyv4661.CodecDecodeSelf(d) } } } } else { - yyj4685 := 0 - for ; !r.CheckBreak(); yyj4685++ { + yyj4659 := 0 + for ; !r.CheckBreak(); yyj4659++ { - if yyj4685 >= len(yyv4685) { - yyv4685 = append(yyv4685, PreferredSchedulingTerm{}) // var yyz4685 PreferredSchedulingTerm - yyc4685 = true + if yyj4659 >= len(yyv4659) { + yyv4659 = append(yyv4659, PreferredSchedulingTerm{}) // var yyz4659 PreferredSchedulingTerm + yyc4659 = true } - yyh4685.ElemContainerState(yyj4685) - if yyj4685 < len(yyv4685) { + yyh4659.ElemContainerState(yyj4659) + if yyj4659 < len(yyv4659) { if r.TryDecodeAsNil() { - yyv4685[yyj4685] = PreferredSchedulingTerm{} + yyv4659[yyj4659] = PreferredSchedulingTerm{} } else { - yyv4688 := &yyv4685[yyj4685] - yyv4688.CodecDecodeSelf(d) + yyv4662 := &yyv4659[yyj4659] + yyv4662.CodecDecodeSelf(d) } } else { @@ -59020,17 +58721,17 @@ func (x codecSelfer1234) decSlicePreferredSchedulingTerm(v *[]PreferredSchedulin } } - if yyj4685 < len(yyv4685) { - yyv4685 = yyv4685[:yyj4685] - yyc4685 = true - } else if yyj4685 == 0 && yyv4685 == nil { - yyv4685 = []PreferredSchedulingTerm{} - yyc4685 = true + if yyj4659 < len(yyv4659) { + yyv4659 = yyv4659[:yyj4659] + yyc4659 = true + } else if yyj4659 == 0 && yyv4659 == nil { + yyv4659 = []PreferredSchedulingTerm{} + yyc4659 = true } } - yyh4685.End() - if yyc4685 { - *v = yyv4685 + yyh4659.End() + if yyc4659 { + *v = yyv4659 } } @@ -59039,10 +58740,10 @@ func (x codecSelfer1234) encSliceVolume(v []Volume, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4689 := range v { + for _, yyv4663 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4690 := &yyv4689 - yy4690.CodecEncodeSelf(e) + yy4664 := &yyv4663 + yy4664.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59052,83 +58753,83 @@ func (x codecSelfer1234) decSliceVolume(v *[]Volume, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4691 := *v - yyh4691, yyl4691 := z.DecSliceHelperStart() - var yyc4691 bool - if yyl4691 == 0 { - if yyv4691 == nil { - yyv4691 = []Volume{} - yyc4691 = true - } else if len(yyv4691) != 0 { - yyv4691 = yyv4691[:0] - yyc4691 = true + yyv4665 := *v + yyh4665, yyl4665 := z.DecSliceHelperStart() + var yyc4665 bool + if yyl4665 == 0 { + if yyv4665 == nil { + yyv4665 = []Volume{} + yyc4665 = true + } else if len(yyv4665) != 0 { + yyv4665 = yyv4665[:0] + yyc4665 = true } - } else if yyl4691 > 0 { - var yyrr4691, yyrl4691 int - var yyrt4691 bool - if yyl4691 > cap(yyv4691) { + } else if yyl4665 > 0 { + var yyrr4665, yyrl4665 int + var yyrt4665 bool + if yyl4665 > cap(yyv4665) { - yyrg4691 := len(yyv4691) > 0 - yyv24691 := yyv4691 - yyrl4691, yyrt4691 = z.DecInferLen(yyl4691, z.DecBasicHandle().MaxInitLen, 200) - if yyrt4691 { - if yyrl4691 <= cap(yyv4691) { - yyv4691 = yyv4691[:yyrl4691] + yyrg4665 := len(yyv4665) > 0 + yyv24665 := yyv4665 + yyrl4665, yyrt4665 = z.DecInferLen(yyl4665, z.DecBasicHandle().MaxInitLen, 200) + if yyrt4665 { + if yyrl4665 <= cap(yyv4665) { + yyv4665 = yyv4665[:yyrl4665] } else { - yyv4691 = make([]Volume, yyrl4691) + yyv4665 = make([]Volume, yyrl4665) } } else { - yyv4691 = make([]Volume, yyrl4691) + yyv4665 = make([]Volume, yyrl4665) } - yyc4691 = true - yyrr4691 = len(yyv4691) - if yyrg4691 { - copy(yyv4691, yyv24691) + yyc4665 = true + yyrr4665 = len(yyv4665) + if yyrg4665 { + copy(yyv4665, yyv24665) } - } else if yyl4691 != len(yyv4691) { - yyv4691 = yyv4691[:yyl4691] - yyc4691 = true + } else if yyl4665 != len(yyv4665) { + yyv4665 = yyv4665[:yyl4665] + yyc4665 = true } - yyj4691 := 0 - for ; yyj4691 < yyrr4691; yyj4691++ { - yyh4691.ElemContainerState(yyj4691) + yyj4665 := 0 + for ; yyj4665 < yyrr4665; yyj4665++ { + yyh4665.ElemContainerState(yyj4665) if r.TryDecodeAsNil() { - yyv4691[yyj4691] = Volume{} + yyv4665[yyj4665] = Volume{} } else { - yyv4692 := &yyv4691[yyj4691] - yyv4692.CodecDecodeSelf(d) + yyv4666 := &yyv4665[yyj4665] + yyv4666.CodecDecodeSelf(d) } } - if yyrt4691 { - for ; yyj4691 < yyl4691; yyj4691++ { - yyv4691 = append(yyv4691, Volume{}) - yyh4691.ElemContainerState(yyj4691) + if yyrt4665 { + for ; yyj4665 < yyl4665; yyj4665++ { + yyv4665 = append(yyv4665, Volume{}) + yyh4665.ElemContainerState(yyj4665) if r.TryDecodeAsNil() { - yyv4691[yyj4691] = Volume{} + yyv4665[yyj4665] = Volume{} } else { - yyv4693 := &yyv4691[yyj4691] - yyv4693.CodecDecodeSelf(d) + yyv4667 := &yyv4665[yyj4665] + yyv4667.CodecDecodeSelf(d) } } } } else { - yyj4691 := 0 - for ; !r.CheckBreak(); yyj4691++ { + yyj4665 := 0 + for ; !r.CheckBreak(); yyj4665++ { - if yyj4691 >= len(yyv4691) { - yyv4691 = append(yyv4691, Volume{}) // var yyz4691 Volume - yyc4691 = true + if yyj4665 >= len(yyv4665) { + yyv4665 = append(yyv4665, Volume{}) // var yyz4665 Volume + yyc4665 = true } - yyh4691.ElemContainerState(yyj4691) - if yyj4691 < len(yyv4691) { + yyh4665.ElemContainerState(yyj4665) + if yyj4665 < len(yyv4665) { if r.TryDecodeAsNil() { - yyv4691[yyj4691] = Volume{} + yyv4665[yyj4665] = Volume{} } else { - yyv4694 := &yyv4691[yyj4691] - yyv4694.CodecDecodeSelf(d) + yyv4668 := &yyv4665[yyj4665] + yyv4668.CodecDecodeSelf(d) } } else { @@ -59136,17 +58837,17 @@ func (x codecSelfer1234) decSliceVolume(v *[]Volume, d *codec1978.Decoder) { } } - if yyj4691 < len(yyv4691) { - yyv4691 = yyv4691[:yyj4691] - yyc4691 = true - } else if yyj4691 == 0 && yyv4691 == nil { - yyv4691 = []Volume{} - yyc4691 = true + if yyj4665 < len(yyv4665) { + yyv4665 = yyv4665[:yyj4665] + yyc4665 = true + } else if yyj4665 == 0 && yyv4665 == nil { + yyv4665 = []Volume{} + yyc4665 = true } } - yyh4691.End() - if yyc4691 { - *v = yyv4691 + yyh4665.End() + if yyc4665 { + *v = yyv4665 } } @@ -59155,10 +58856,10 @@ func (x codecSelfer1234) encSliceContainer(v []Container, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4695 := range v { + for _, yyv4669 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4696 := &yyv4695 - yy4696.CodecEncodeSelf(e) + yy4670 := &yyv4669 + yy4670.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59168,83 +58869,83 @@ func (x codecSelfer1234) decSliceContainer(v *[]Container, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4697 := *v - yyh4697, yyl4697 := z.DecSliceHelperStart() - var yyc4697 bool - if yyl4697 == 0 { - if yyv4697 == nil { - yyv4697 = []Container{} - yyc4697 = true - } else if len(yyv4697) != 0 { - yyv4697 = yyv4697[:0] - yyc4697 = true + yyv4671 := *v + yyh4671, yyl4671 := z.DecSliceHelperStart() + var yyc4671 bool + if yyl4671 == 0 { + if yyv4671 == nil { + yyv4671 = []Container{} + yyc4671 = true + } else if len(yyv4671) != 0 { + yyv4671 = yyv4671[:0] + yyc4671 = true } - } else if yyl4697 > 0 { - var yyrr4697, yyrl4697 int - var yyrt4697 bool - if yyl4697 > cap(yyv4697) { + } else if yyl4671 > 0 { + var yyrr4671, yyrl4671 int + var yyrt4671 bool + if yyl4671 > cap(yyv4671) { - yyrg4697 := len(yyv4697) > 0 - yyv24697 := yyv4697 - yyrl4697, yyrt4697 = z.DecInferLen(yyl4697, z.DecBasicHandle().MaxInitLen, 256) - if yyrt4697 { - if yyrl4697 <= cap(yyv4697) { - yyv4697 = yyv4697[:yyrl4697] + yyrg4671 := len(yyv4671) > 0 + yyv24671 := yyv4671 + yyrl4671, yyrt4671 = z.DecInferLen(yyl4671, z.DecBasicHandle().MaxInitLen, 256) + if yyrt4671 { + if yyrl4671 <= cap(yyv4671) { + yyv4671 = yyv4671[:yyrl4671] } else { - yyv4697 = make([]Container, yyrl4697) + yyv4671 = make([]Container, yyrl4671) } } else { - yyv4697 = make([]Container, yyrl4697) + yyv4671 = make([]Container, yyrl4671) } - yyc4697 = true - yyrr4697 = len(yyv4697) - if yyrg4697 { - copy(yyv4697, yyv24697) + yyc4671 = true + yyrr4671 = len(yyv4671) + if yyrg4671 { + copy(yyv4671, yyv24671) } - } else if yyl4697 != len(yyv4697) { - yyv4697 = yyv4697[:yyl4697] - yyc4697 = true + } else if yyl4671 != len(yyv4671) { + yyv4671 = yyv4671[:yyl4671] + yyc4671 = true } - yyj4697 := 0 - for ; yyj4697 < yyrr4697; yyj4697++ { - yyh4697.ElemContainerState(yyj4697) + yyj4671 := 0 + for ; yyj4671 < yyrr4671; yyj4671++ { + yyh4671.ElemContainerState(yyj4671) if r.TryDecodeAsNil() { - yyv4697[yyj4697] = Container{} + yyv4671[yyj4671] = Container{} } else { - yyv4698 := &yyv4697[yyj4697] - yyv4698.CodecDecodeSelf(d) + yyv4672 := &yyv4671[yyj4671] + yyv4672.CodecDecodeSelf(d) } } - if yyrt4697 { - for ; yyj4697 < yyl4697; yyj4697++ { - yyv4697 = append(yyv4697, Container{}) - yyh4697.ElemContainerState(yyj4697) + if yyrt4671 { + for ; yyj4671 < yyl4671; yyj4671++ { + yyv4671 = append(yyv4671, Container{}) + yyh4671.ElemContainerState(yyj4671) if r.TryDecodeAsNil() { - yyv4697[yyj4697] = Container{} + yyv4671[yyj4671] = Container{} } else { - yyv4699 := &yyv4697[yyj4697] - yyv4699.CodecDecodeSelf(d) + yyv4673 := &yyv4671[yyj4671] + yyv4673.CodecDecodeSelf(d) } } } } else { - yyj4697 := 0 - for ; !r.CheckBreak(); yyj4697++ { + yyj4671 := 0 + for ; !r.CheckBreak(); yyj4671++ { - if yyj4697 >= len(yyv4697) { - yyv4697 = append(yyv4697, Container{}) // var yyz4697 Container - yyc4697 = true + if yyj4671 >= len(yyv4671) { + yyv4671 = append(yyv4671, Container{}) // var yyz4671 Container + yyc4671 = true } - yyh4697.ElemContainerState(yyj4697) - if yyj4697 < len(yyv4697) { + yyh4671.ElemContainerState(yyj4671) + if yyj4671 < len(yyv4671) { if r.TryDecodeAsNil() { - yyv4697[yyj4697] = Container{} + yyv4671[yyj4671] = Container{} } else { - yyv4700 := &yyv4697[yyj4697] - yyv4700.CodecDecodeSelf(d) + yyv4674 := &yyv4671[yyj4671] + yyv4674.CodecDecodeSelf(d) } } else { @@ -59252,17 +58953,17 @@ func (x codecSelfer1234) decSliceContainer(v *[]Container, d *codec1978.Decoder) } } - if yyj4697 < len(yyv4697) { - yyv4697 = yyv4697[:yyj4697] - yyc4697 = true - } else if yyj4697 == 0 && yyv4697 == nil { - yyv4697 = []Container{} - yyc4697 = true + if yyj4671 < len(yyv4671) { + yyv4671 = yyv4671[:yyj4671] + yyc4671 = true + } else if yyj4671 == 0 && yyv4671 == nil { + yyv4671 = []Container{} + yyc4671 = true } } - yyh4697.End() - if yyc4697 { - *v = yyv4697 + yyh4671.End() + if yyc4671 { + *v = yyv4671 } } @@ -59271,10 +58972,10 @@ func (x codecSelfer1234) encSliceLocalObjectReference(v []LocalObjectReference, z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4701 := range v { + for _, yyv4675 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4702 := &yyv4701 - yy4702.CodecEncodeSelf(e) + yy4676 := &yyv4675 + yy4676.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59284,83 +58985,83 @@ func (x codecSelfer1234) decSliceLocalObjectReference(v *[]LocalObjectReference, z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4703 := *v - yyh4703, yyl4703 := z.DecSliceHelperStart() - var yyc4703 bool - if yyl4703 == 0 { - if yyv4703 == nil { - yyv4703 = []LocalObjectReference{} - yyc4703 = true - } else if len(yyv4703) != 0 { - yyv4703 = yyv4703[:0] - yyc4703 = true + yyv4677 := *v + yyh4677, yyl4677 := z.DecSliceHelperStart() + var yyc4677 bool + if yyl4677 == 0 { + if yyv4677 == nil { + yyv4677 = []LocalObjectReference{} + yyc4677 = true + } else if len(yyv4677) != 0 { + yyv4677 = yyv4677[:0] + yyc4677 = true } - } else if yyl4703 > 0 { - var yyrr4703, yyrl4703 int - var yyrt4703 bool - if yyl4703 > cap(yyv4703) { + } else if yyl4677 > 0 { + var yyrr4677, yyrl4677 int + var yyrt4677 bool + if yyl4677 > cap(yyv4677) { - yyrg4703 := len(yyv4703) > 0 - yyv24703 := yyv4703 - yyrl4703, yyrt4703 = z.DecInferLen(yyl4703, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4703 { - if yyrl4703 <= cap(yyv4703) { - yyv4703 = yyv4703[:yyrl4703] + yyrg4677 := len(yyv4677) > 0 + yyv24677 := yyv4677 + yyrl4677, yyrt4677 = z.DecInferLen(yyl4677, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4677 { + if yyrl4677 <= cap(yyv4677) { + yyv4677 = yyv4677[:yyrl4677] } else { - yyv4703 = make([]LocalObjectReference, yyrl4703) + yyv4677 = make([]LocalObjectReference, yyrl4677) } } else { - yyv4703 = make([]LocalObjectReference, yyrl4703) + yyv4677 = make([]LocalObjectReference, yyrl4677) } - yyc4703 = true - yyrr4703 = len(yyv4703) - if yyrg4703 { - copy(yyv4703, yyv24703) + yyc4677 = true + yyrr4677 = len(yyv4677) + if yyrg4677 { + copy(yyv4677, yyv24677) } - } else if yyl4703 != len(yyv4703) { - yyv4703 = yyv4703[:yyl4703] - yyc4703 = true + } else if yyl4677 != len(yyv4677) { + yyv4677 = yyv4677[:yyl4677] + yyc4677 = true } - yyj4703 := 0 - for ; yyj4703 < yyrr4703; yyj4703++ { - yyh4703.ElemContainerState(yyj4703) + yyj4677 := 0 + for ; yyj4677 < yyrr4677; yyj4677++ { + yyh4677.ElemContainerState(yyj4677) if r.TryDecodeAsNil() { - yyv4703[yyj4703] = LocalObjectReference{} + yyv4677[yyj4677] = LocalObjectReference{} } else { - yyv4704 := &yyv4703[yyj4703] - yyv4704.CodecDecodeSelf(d) + yyv4678 := &yyv4677[yyj4677] + yyv4678.CodecDecodeSelf(d) } } - if yyrt4703 { - for ; yyj4703 < yyl4703; yyj4703++ { - yyv4703 = append(yyv4703, LocalObjectReference{}) - yyh4703.ElemContainerState(yyj4703) + if yyrt4677 { + for ; yyj4677 < yyl4677; yyj4677++ { + yyv4677 = append(yyv4677, LocalObjectReference{}) + yyh4677.ElemContainerState(yyj4677) if r.TryDecodeAsNil() { - yyv4703[yyj4703] = LocalObjectReference{} + yyv4677[yyj4677] = LocalObjectReference{} } else { - yyv4705 := &yyv4703[yyj4703] - yyv4705.CodecDecodeSelf(d) + yyv4679 := &yyv4677[yyj4677] + yyv4679.CodecDecodeSelf(d) } } } } else { - yyj4703 := 0 - for ; !r.CheckBreak(); yyj4703++ { + yyj4677 := 0 + for ; !r.CheckBreak(); yyj4677++ { - if yyj4703 >= len(yyv4703) { - yyv4703 = append(yyv4703, LocalObjectReference{}) // var yyz4703 LocalObjectReference - yyc4703 = true + if yyj4677 >= len(yyv4677) { + yyv4677 = append(yyv4677, LocalObjectReference{}) // var yyz4677 LocalObjectReference + yyc4677 = true } - yyh4703.ElemContainerState(yyj4703) - if yyj4703 < len(yyv4703) { + yyh4677.ElemContainerState(yyj4677) + if yyj4677 < len(yyv4677) { if r.TryDecodeAsNil() { - yyv4703[yyj4703] = LocalObjectReference{} + yyv4677[yyj4677] = LocalObjectReference{} } else { - yyv4706 := &yyv4703[yyj4703] - yyv4706.CodecDecodeSelf(d) + yyv4680 := &yyv4677[yyj4677] + yyv4680.CodecDecodeSelf(d) } } else { @@ -59368,17 +59069,17 @@ func (x codecSelfer1234) decSliceLocalObjectReference(v *[]LocalObjectReference, } } - if yyj4703 < len(yyv4703) { - yyv4703 = yyv4703[:yyj4703] - yyc4703 = true - } else if yyj4703 == 0 && yyv4703 == nil { - yyv4703 = []LocalObjectReference{} - yyc4703 = true + if yyj4677 < len(yyv4677) { + yyv4677 = yyv4677[:yyj4677] + yyc4677 = true + } else if yyj4677 == 0 && yyv4677 == nil { + yyv4677 = []LocalObjectReference{} + yyc4677 = true } } - yyh4703.End() - if yyc4703 { - *v = yyv4703 + yyh4677.End() + if yyc4677 { + *v = yyv4677 } } @@ -59387,10 +59088,10 @@ func (x codecSelfer1234) encSlicePodCondition(v []PodCondition, e *codec1978.Enc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4707 := range v { + for _, yyv4681 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4708 := &yyv4707 - yy4708.CodecEncodeSelf(e) + yy4682 := &yyv4681 + yy4682.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59400,83 +59101,83 @@ func (x codecSelfer1234) decSlicePodCondition(v *[]PodCondition, d *codec1978.De z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4709 := *v - yyh4709, yyl4709 := z.DecSliceHelperStart() - var yyc4709 bool - if yyl4709 == 0 { - if yyv4709 == nil { - yyv4709 = []PodCondition{} - yyc4709 = true - } else if len(yyv4709) != 0 { - yyv4709 = yyv4709[:0] - yyc4709 = true + yyv4683 := *v + yyh4683, yyl4683 := z.DecSliceHelperStart() + var yyc4683 bool + if yyl4683 == 0 { + if yyv4683 == nil { + yyv4683 = []PodCondition{} + yyc4683 = true + } else if len(yyv4683) != 0 { + yyv4683 = yyv4683[:0] + yyc4683 = true } - } else if yyl4709 > 0 { - var yyrr4709, yyrl4709 int - var yyrt4709 bool - if yyl4709 > cap(yyv4709) { + } else if yyl4683 > 0 { + var yyrr4683, yyrl4683 int + var yyrt4683 bool + if yyl4683 > cap(yyv4683) { - yyrg4709 := len(yyv4709) > 0 - yyv24709 := yyv4709 - yyrl4709, yyrt4709 = z.DecInferLen(yyl4709, z.DecBasicHandle().MaxInitLen, 112) - if yyrt4709 { - if yyrl4709 <= cap(yyv4709) { - yyv4709 = yyv4709[:yyrl4709] + yyrg4683 := len(yyv4683) > 0 + yyv24683 := yyv4683 + yyrl4683, yyrt4683 = z.DecInferLen(yyl4683, z.DecBasicHandle().MaxInitLen, 112) + if yyrt4683 { + if yyrl4683 <= cap(yyv4683) { + yyv4683 = yyv4683[:yyrl4683] } else { - yyv4709 = make([]PodCondition, yyrl4709) + yyv4683 = make([]PodCondition, yyrl4683) } } else { - yyv4709 = make([]PodCondition, yyrl4709) + yyv4683 = make([]PodCondition, yyrl4683) } - yyc4709 = true - yyrr4709 = len(yyv4709) - if yyrg4709 { - copy(yyv4709, yyv24709) + yyc4683 = true + yyrr4683 = len(yyv4683) + if yyrg4683 { + copy(yyv4683, yyv24683) } - } else if yyl4709 != len(yyv4709) { - yyv4709 = yyv4709[:yyl4709] - yyc4709 = true + } else if yyl4683 != len(yyv4683) { + yyv4683 = yyv4683[:yyl4683] + yyc4683 = true } - yyj4709 := 0 - for ; yyj4709 < yyrr4709; yyj4709++ { - yyh4709.ElemContainerState(yyj4709) + yyj4683 := 0 + for ; yyj4683 < yyrr4683; yyj4683++ { + yyh4683.ElemContainerState(yyj4683) if r.TryDecodeAsNil() { - yyv4709[yyj4709] = PodCondition{} + yyv4683[yyj4683] = PodCondition{} } else { - yyv4710 := &yyv4709[yyj4709] - yyv4710.CodecDecodeSelf(d) + yyv4684 := &yyv4683[yyj4683] + yyv4684.CodecDecodeSelf(d) } } - if yyrt4709 { - for ; yyj4709 < yyl4709; yyj4709++ { - yyv4709 = append(yyv4709, PodCondition{}) - yyh4709.ElemContainerState(yyj4709) + if yyrt4683 { + for ; yyj4683 < yyl4683; yyj4683++ { + yyv4683 = append(yyv4683, PodCondition{}) + yyh4683.ElemContainerState(yyj4683) if r.TryDecodeAsNil() { - yyv4709[yyj4709] = PodCondition{} + yyv4683[yyj4683] = PodCondition{} } else { - yyv4711 := &yyv4709[yyj4709] - yyv4711.CodecDecodeSelf(d) + yyv4685 := &yyv4683[yyj4683] + yyv4685.CodecDecodeSelf(d) } } } } else { - yyj4709 := 0 - for ; !r.CheckBreak(); yyj4709++ { + yyj4683 := 0 + for ; !r.CheckBreak(); yyj4683++ { - if yyj4709 >= len(yyv4709) { - yyv4709 = append(yyv4709, PodCondition{}) // var yyz4709 PodCondition - yyc4709 = true + if yyj4683 >= len(yyv4683) { + yyv4683 = append(yyv4683, PodCondition{}) // var yyz4683 PodCondition + yyc4683 = true } - yyh4709.ElemContainerState(yyj4709) - if yyj4709 < len(yyv4709) { + yyh4683.ElemContainerState(yyj4683) + if yyj4683 < len(yyv4683) { if r.TryDecodeAsNil() { - yyv4709[yyj4709] = PodCondition{} + yyv4683[yyj4683] = PodCondition{} } else { - yyv4712 := &yyv4709[yyj4709] - yyv4712.CodecDecodeSelf(d) + yyv4686 := &yyv4683[yyj4683] + yyv4686.CodecDecodeSelf(d) } } else { @@ -59484,17 +59185,17 @@ func (x codecSelfer1234) decSlicePodCondition(v *[]PodCondition, d *codec1978.De } } - if yyj4709 < len(yyv4709) { - yyv4709 = yyv4709[:yyj4709] - yyc4709 = true - } else if yyj4709 == 0 && yyv4709 == nil { - yyv4709 = []PodCondition{} - yyc4709 = true + if yyj4683 < len(yyv4683) { + yyv4683 = yyv4683[:yyj4683] + yyc4683 = true + } else if yyj4683 == 0 && yyv4683 == nil { + yyv4683 = []PodCondition{} + yyc4683 = true } } - yyh4709.End() - if yyc4709 { - *v = yyv4709 + yyh4683.End() + if yyc4683 { + *v = yyv4683 } } @@ -59503,10 +59204,10 @@ func (x codecSelfer1234) encSliceContainerStatus(v []ContainerStatus, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4713 := range v { + for _, yyv4687 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4714 := &yyv4713 - yy4714.CodecEncodeSelf(e) + yy4688 := &yyv4687 + yy4688.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59516,83 +59217,83 @@ func (x codecSelfer1234) decSliceContainerStatus(v *[]ContainerStatus, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4715 := *v - yyh4715, yyl4715 := z.DecSliceHelperStart() - var yyc4715 bool - if yyl4715 == 0 { - if yyv4715 == nil { - yyv4715 = []ContainerStatus{} - yyc4715 = true - } else if len(yyv4715) != 0 { - yyv4715 = yyv4715[:0] - yyc4715 = true + yyv4689 := *v + yyh4689, yyl4689 := z.DecSliceHelperStart() + var yyc4689 bool + if yyl4689 == 0 { + if yyv4689 == nil { + yyv4689 = []ContainerStatus{} + yyc4689 = true + } else if len(yyv4689) != 0 { + yyv4689 = yyv4689[:0] + yyc4689 = true } - } else if yyl4715 > 0 { - var yyrr4715, yyrl4715 int - var yyrt4715 bool - if yyl4715 > cap(yyv4715) { + } else if yyl4689 > 0 { + var yyrr4689, yyrl4689 int + var yyrt4689 bool + if yyl4689 > cap(yyv4689) { - yyrg4715 := len(yyv4715) > 0 - yyv24715 := yyv4715 - yyrl4715, yyrt4715 = z.DecInferLen(yyl4715, z.DecBasicHandle().MaxInitLen, 120) - if yyrt4715 { - if yyrl4715 <= cap(yyv4715) { - yyv4715 = yyv4715[:yyrl4715] + yyrg4689 := len(yyv4689) > 0 + yyv24689 := yyv4689 + yyrl4689, yyrt4689 = z.DecInferLen(yyl4689, z.DecBasicHandle().MaxInitLen, 120) + if yyrt4689 { + if yyrl4689 <= cap(yyv4689) { + yyv4689 = yyv4689[:yyrl4689] } else { - yyv4715 = make([]ContainerStatus, yyrl4715) + yyv4689 = make([]ContainerStatus, yyrl4689) } } else { - yyv4715 = make([]ContainerStatus, yyrl4715) + yyv4689 = make([]ContainerStatus, yyrl4689) } - yyc4715 = true - yyrr4715 = len(yyv4715) - if yyrg4715 { - copy(yyv4715, yyv24715) + yyc4689 = true + yyrr4689 = len(yyv4689) + if yyrg4689 { + copy(yyv4689, yyv24689) } - } else if yyl4715 != len(yyv4715) { - yyv4715 = yyv4715[:yyl4715] - yyc4715 = true + } else if yyl4689 != len(yyv4689) { + yyv4689 = yyv4689[:yyl4689] + yyc4689 = true } - yyj4715 := 0 - for ; yyj4715 < yyrr4715; yyj4715++ { - yyh4715.ElemContainerState(yyj4715) + yyj4689 := 0 + for ; yyj4689 < yyrr4689; yyj4689++ { + yyh4689.ElemContainerState(yyj4689) if r.TryDecodeAsNil() { - yyv4715[yyj4715] = ContainerStatus{} + yyv4689[yyj4689] = ContainerStatus{} } else { - yyv4716 := &yyv4715[yyj4715] - yyv4716.CodecDecodeSelf(d) + yyv4690 := &yyv4689[yyj4689] + yyv4690.CodecDecodeSelf(d) } } - if yyrt4715 { - for ; yyj4715 < yyl4715; yyj4715++ { - yyv4715 = append(yyv4715, ContainerStatus{}) - yyh4715.ElemContainerState(yyj4715) + if yyrt4689 { + for ; yyj4689 < yyl4689; yyj4689++ { + yyv4689 = append(yyv4689, ContainerStatus{}) + yyh4689.ElemContainerState(yyj4689) if r.TryDecodeAsNil() { - yyv4715[yyj4715] = ContainerStatus{} + yyv4689[yyj4689] = ContainerStatus{} } else { - yyv4717 := &yyv4715[yyj4715] - yyv4717.CodecDecodeSelf(d) + yyv4691 := &yyv4689[yyj4689] + yyv4691.CodecDecodeSelf(d) } } } } else { - yyj4715 := 0 - for ; !r.CheckBreak(); yyj4715++ { + yyj4689 := 0 + for ; !r.CheckBreak(); yyj4689++ { - if yyj4715 >= len(yyv4715) { - yyv4715 = append(yyv4715, ContainerStatus{}) // var yyz4715 ContainerStatus - yyc4715 = true + if yyj4689 >= len(yyv4689) { + yyv4689 = append(yyv4689, ContainerStatus{}) // var yyz4689 ContainerStatus + yyc4689 = true } - yyh4715.ElemContainerState(yyj4715) - if yyj4715 < len(yyv4715) { + yyh4689.ElemContainerState(yyj4689) + if yyj4689 < len(yyv4689) { if r.TryDecodeAsNil() { - yyv4715[yyj4715] = ContainerStatus{} + yyv4689[yyj4689] = ContainerStatus{} } else { - yyv4718 := &yyv4715[yyj4715] - yyv4718.CodecDecodeSelf(d) + yyv4692 := &yyv4689[yyj4689] + yyv4692.CodecDecodeSelf(d) } } else { @@ -59600,17 +59301,17 @@ func (x codecSelfer1234) decSliceContainerStatus(v *[]ContainerStatus, d *codec1 } } - if yyj4715 < len(yyv4715) { - yyv4715 = yyv4715[:yyj4715] - yyc4715 = true - } else if yyj4715 == 0 && yyv4715 == nil { - yyv4715 = []ContainerStatus{} - yyc4715 = true + if yyj4689 < len(yyv4689) { + yyv4689 = yyv4689[:yyj4689] + yyc4689 = true + } else if yyj4689 == 0 && yyv4689 == nil { + yyv4689 = []ContainerStatus{} + yyc4689 = true } } - yyh4715.End() - if yyc4715 { - *v = yyv4715 + yyh4689.End() + if yyc4689 { + *v = yyv4689 } } @@ -59619,10 +59320,10 @@ func (x codecSelfer1234) encSlicePod(v []Pod, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4719 := range v { + for _, yyv4693 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4720 := &yyv4719 - yy4720.CodecEncodeSelf(e) + yy4694 := &yyv4693 + yy4694.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59632,83 +59333,83 @@ func (x codecSelfer1234) decSlicePod(v *[]Pod, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4721 := *v - yyh4721, yyl4721 := z.DecSliceHelperStart() - var yyc4721 bool - if yyl4721 == 0 { - if yyv4721 == nil { - yyv4721 = []Pod{} - yyc4721 = true - } else if len(yyv4721) != 0 { - yyv4721 = yyv4721[:0] - yyc4721 = true + yyv4695 := *v + yyh4695, yyl4695 := z.DecSliceHelperStart() + var yyc4695 bool + if yyl4695 == 0 { + if yyv4695 == nil { + yyv4695 = []Pod{} + yyc4695 = true + } else if len(yyv4695) != 0 { + yyv4695 = yyv4695[:0] + yyc4695 = true } - } else if yyl4721 > 0 { - var yyrr4721, yyrl4721 int - var yyrt4721 bool - if yyl4721 > cap(yyv4721) { + } else if yyl4695 > 0 { + var yyrr4695, yyrl4695 int + var yyrt4695 bool + if yyl4695 > cap(yyv4695) { - yyrg4721 := len(yyv4721) > 0 - yyv24721 := yyv4721 - yyrl4721, yyrt4721 = z.DecInferLen(yyl4721, z.DecBasicHandle().MaxInitLen, 664) - if yyrt4721 { - if yyrl4721 <= cap(yyv4721) { - yyv4721 = yyv4721[:yyrl4721] + yyrg4695 := len(yyv4695) > 0 + yyv24695 := yyv4695 + yyrl4695, yyrt4695 = z.DecInferLen(yyl4695, z.DecBasicHandle().MaxInitLen, 664) + if yyrt4695 { + if yyrl4695 <= cap(yyv4695) { + yyv4695 = yyv4695[:yyrl4695] } else { - yyv4721 = make([]Pod, yyrl4721) + yyv4695 = make([]Pod, yyrl4695) } } else { - yyv4721 = make([]Pod, yyrl4721) + yyv4695 = make([]Pod, yyrl4695) } - yyc4721 = true - yyrr4721 = len(yyv4721) - if yyrg4721 { - copy(yyv4721, yyv24721) + yyc4695 = true + yyrr4695 = len(yyv4695) + if yyrg4695 { + copy(yyv4695, yyv24695) } - } else if yyl4721 != len(yyv4721) { - yyv4721 = yyv4721[:yyl4721] - yyc4721 = true + } else if yyl4695 != len(yyv4695) { + yyv4695 = yyv4695[:yyl4695] + yyc4695 = true } - yyj4721 := 0 - for ; yyj4721 < yyrr4721; yyj4721++ { - yyh4721.ElemContainerState(yyj4721) + yyj4695 := 0 + for ; yyj4695 < yyrr4695; yyj4695++ { + yyh4695.ElemContainerState(yyj4695) if r.TryDecodeAsNil() { - yyv4721[yyj4721] = Pod{} + yyv4695[yyj4695] = Pod{} } else { - yyv4722 := &yyv4721[yyj4721] - yyv4722.CodecDecodeSelf(d) + yyv4696 := &yyv4695[yyj4695] + yyv4696.CodecDecodeSelf(d) } } - if yyrt4721 { - for ; yyj4721 < yyl4721; yyj4721++ { - yyv4721 = append(yyv4721, Pod{}) - yyh4721.ElemContainerState(yyj4721) + if yyrt4695 { + for ; yyj4695 < yyl4695; yyj4695++ { + yyv4695 = append(yyv4695, Pod{}) + yyh4695.ElemContainerState(yyj4695) if r.TryDecodeAsNil() { - yyv4721[yyj4721] = Pod{} + yyv4695[yyj4695] = Pod{} } else { - yyv4723 := &yyv4721[yyj4721] - yyv4723.CodecDecodeSelf(d) + yyv4697 := &yyv4695[yyj4695] + yyv4697.CodecDecodeSelf(d) } } } } else { - yyj4721 := 0 - for ; !r.CheckBreak(); yyj4721++ { + yyj4695 := 0 + for ; !r.CheckBreak(); yyj4695++ { - if yyj4721 >= len(yyv4721) { - yyv4721 = append(yyv4721, Pod{}) // var yyz4721 Pod - yyc4721 = true + if yyj4695 >= len(yyv4695) { + yyv4695 = append(yyv4695, Pod{}) // var yyz4695 Pod + yyc4695 = true } - yyh4721.ElemContainerState(yyj4721) - if yyj4721 < len(yyv4721) { + yyh4695.ElemContainerState(yyj4695) + if yyj4695 < len(yyv4695) { if r.TryDecodeAsNil() { - yyv4721[yyj4721] = Pod{} + yyv4695[yyj4695] = Pod{} } else { - yyv4724 := &yyv4721[yyj4721] - yyv4724.CodecDecodeSelf(d) + yyv4698 := &yyv4695[yyj4695] + yyv4698.CodecDecodeSelf(d) } } else { @@ -59716,17 +59417,17 @@ func (x codecSelfer1234) decSlicePod(v *[]Pod, d *codec1978.Decoder) { } } - if yyj4721 < len(yyv4721) { - yyv4721 = yyv4721[:yyj4721] - yyc4721 = true - } else if yyj4721 == 0 && yyv4721 == nil { - yyv4721 = []Pod{} - yyc4721 = true + if yyj4695 < len(yyv4695) { + yyv4695 = yyv4695[:yyj4695] + yyc4695 = true + } else if yyj4695 == 0 && yyv4695 == nil { + yyv4695 = []Pod{} + yyc4695 = true } } - yyh4721.End() - if yyc4721 { - *v = yyv4721 + yyh4695.End() + if yyc4695 { + *v = yyv4695 } } @@ -59735,10 +59436,10 @@ func (x codecSelfer1234) encSlicePodTemplate(v []PodTemplate, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4725 := range v { + for _, yyv4699 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4726 := &yyv4725 - yy4726.CodecEncodeSelf(e) + yy4700 := &yyv4699 + yy4700.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59748,83 +59449,83 @@ func (x codecSelfer1234) decSlicePodTemplate(v *[]PodTemplate, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4727 := *v - yyh4727, yyl4727 := z.DecSliceHelperStart() - var yyc4727 bool - if yyl4727 == 0 { - if yyv4727 == nil { - yyv4727 = []PodTemplate{} - yyc4727 = true - } else if len(yyv4727) != 0 { - yyv4727 = yyv4727[:0] - yyc4727 = true + yyv4701 := *v + yyh4701, yyl4701 := z.DecSliceHelperStart() + var yyc4701 bool + if yyl4701 == 0 { + if yyv4701 == nil { + yyv4701 = []PodTemplate{} + yyc4701 = true + } else if len(yyv4701) != 0 { + yyv4701 = yyv4701[:0] + yyc4701 = true } - } else if yyl4727 > 0 { - var yyrr4727, yyrl4727 int - var yyrt4727 bool - if yyl4727 > cap(yyv4727) { + } else if yyl4701 > 0 { + var yyrr4701, yyrl4701 int + var yyrt4701 bool + if yyl4701 > cap(yyv4701) { - yyrg4727 := len(yyv4727) > 0 - yyv24727 := yyv4727 - yyrl4727, yyrt4727 = z.DecInferLen(yyl4727, z.DecBasicHandle().MaxInitLen, 728) - if yyrt4727 { - if yyrl4727 <= cap(yyv4727) { - yyv4727 = yyv4727[:yyrl4727] + yyrg4701 := len(yyv4701) > 0 + yyv24701 := yyv4701 + yyrl4701, yyrt4701 = z.DecInferLen(yyl4701, z.DecBasicHandle().MaxInitLen, 728) + if yyrt4701 { + if yyrl4701 <= cap(yyv4701) { + yyv4701 = yyv4701[:yyrl4701] } else { - yyv4727 = make([]PodTemplate, yyrl4727) + yyv4701 = make([]PodTemplate, yyrl4701) } } else { - yyv4727 = make([]PodTemplate, yyrl4727) + yyv4701 = make([]PodTemplate, yyrl4701) } - yyc4727 = true - yyrr4727 = len(yyv4727) - if yyrg4727 { - copy(yyv4727, yyv24727) + yyc4701 = true + yyrr4701 = len(yyv4701) + if yyrg4701 { + copy(yyv4701, yyv24701) } - } else if yyl4727 != len(yyv4727) { - yyv4727 = yyv4727[:yyl4727] - yyc4727 = true + } else if yyl4701 != len(yyv4701) { + yyv4701 = yyv4701[:yyl4701] + yyc4701 = true } - yyj4727 := 0 - for ; yyj4727 < yyrr4727; yyj4727++ { - yyh4727.ElemContainerState(yyj4727) + yyj4701 := 0 + for ; yyj4701 < yyrr4701; yyj4701++ { + yyh4701.ElemContainerState(yyj4701) if r.TryDecodeAsNil() { - yyv4727[yyj4727] = PodTemplate{} + yyv4701[yyj4701] = PodTemplate{} } else { - yyv4728 := &yyv4727[yyj4727] - yyv4728.CodecDecodeSelf(d) + yyv4702 := &yyv4701[yyj4701] + yyv4702.CodecDecodeSelf(d) } } - if yyrt4727 { - for ; yyj4727 < yyl4727; yyj4727++ { - yyv4727 = append(yyv4727, PodTemplate{}) - yyh4727.ElemContainerState(yyj4727) + if yyrt4701 { + for ; yyj4701 < yyl4701; yyj4701++ { + yyv4701 = append(yyv4701, PodTemplate{}) + yyh4701.ElemContainerState(yyj4701) if r.TryDecodeAsNil() { - yyv4727[yyj4727] = PodTemplate{} + yyv4701[yyj4701] = PodTemplate{} } else { - yyv4729 := &yyv4727[yyj4727] - yyv4729.CodecDecodeSelf(d) + yyv4703 := &yyv4701[yyj4701] + yyv4703.CodecDecodeSelf(d) } } } } else { - yyj4727 := 0 - for ; !r.CheckBreak(); yyj4727++ { + yyj4701 := 0 + for ; !r.CheckBreak(); yyj4701++ { - if yyj4727 >= len(yyv4727) { - yyv4727 = append(yyv4727, PodTemplate{}) // var yyz4727 PodTemplate - yyc4727 = true + if yyj4701 >= len(yyv4701) { + yyv4701 = append(yyv4701, PodTemplate{}) // var yyz4701 PodTemplate + yyc4701 = true } - yyh4727.ElemContainerState(yyj4727) - if yyj4727 < len(yyv4727) { + yyh4701.ElemContainerState(yyj4701) + if yyj4701 < len(yyv4701) { if r.TryDecodeAsNil() { - yyv4727[yyj4727] = PodTemplate{} + yyv4701[yyj4701] = PodTemplate{} } else { - yyv4730 := &yyv4727[yyj4727] - yyv4730.CodecDecodeSelf(d) + yyv4704 := &yyv4701[yyj4701] + yyv4704.CodecDecodeSelf(d) } } else { @@ -59832,17 +59533,17 @@ func (x codecSelfer1234) decSlicePodTemplate(v *[]PodTemplate, d *codec1978.Deco } } - if yyj4727 < len(yyv4727) { - yyv4727 = yyv4727[:yyj4727] - yyc4727 = true - } else if yyj4727 == 0 && yyv4727 == nil { - yyv4727 = []PodTemplate{} - yyc4727 = true + if yyj4701 < len(yyv4701) { + yyv4701 = yyv4701[:yyj4701] + yyc4701 = true + } else if yyj4701 == 0 && yyv4701 == nil { + yyv4701 = []PodTemplate{} + yyc4701 = true } } - yyh4727.End() - if yyc4727 { - *v = yyv4727 + yyh4701.End() + if yyc4701 { + *v = yyv4701 } } @@ -59851,10 +59552,10 @@ func (x codecSelfer1234) encSliceReplicationControllerCondition(v []ReplicationC z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4731 := range v { + for _, yyv4705 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4732 := &yyv4731 - yy4732.CodecEncodeSelf(e) + yy4706 := &yyv4705 + yy4706.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59864,83 +59565,83 @@ func (x codecSelfer1234) decSliceReplicationControllerCondition(v *[]Replication z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4733 := *v - yyh4733, yyl4733 := z.DecSliceHelperStart() - var yyc4733 bool - if yyl4733 == 0 { - if yyv4733 == nil { - yyv4733 = []ReplicationControllerCondition{} - yyc4733 = true - } else if len(yyv4733) != 0 { - yyv4733 = yyv4733[:0] - yyc4733 = true + yyv4707 := *v + yyh4707, yyl4707 := z.DecSliceHelperStart() + var yyc4707 bool + if yyl4707 == 0 { + if yyv4707 == nil { + yyv4707 = []ReplicationControllerCondition{} + yyc4707 = true + } else if len(yyv4707) != 0 { + yyv4707 = yyv4707[:0] + yyc4707 = true } - } else if yyl4733 > 0 { - var yyrr4733, yyrl4733 int - var yyrt4733 bool - if yyl4733 > cap(yyv4733) { + } else if yyl4707 > 0 { + var yyrr4707, yyrl4707 int + var yyrt4707 bool + if yyl4707 > cap(yyv4707) { - yyrg4733 := len(yyv4733) > 0 - yyv24733 := yyv4733 - yyrl4733, yyrt4733 = z.DecInferLen(yyl4733, z.DecBasicHandle().MaxInitLen, 88) - if yyrt4733 { - if yyrl4733 <= cap(yyv4733) { - yyv4733 = yyv4733[:yyrl4733] + yyrg4707 := len(yyv4707) > 0 + yyv24707 := yyv4707 + yyrl4707, yyrt4707 = z.DecInferLen(yyl4707, z.DecBasicHandle().MaxInitLen, 88) + if yyrt4707 { + if yyrl4707 <= cap(yyv4707) { + yyv4707 = yyv4707[:yyrl4707] } else { - yyv4733 = make([]ReplicationControllerCondition, yyrl4733) + yyv4707 = make([]ReplicationControllerCondition, yyrl4707) } } else { - yyv4733 = make([]ReplicationControllerCondition, yyrl4733) + yyv4707 = make([]ReplicationControllerCondition, yyrl4707) } - yyc4733 = true - yyrr4733 = len(yyv4733) - if yyrg4733 { - copy(yyv4733, yyv24733) + yyc4707 = true + yyrr4707 = len(yyv4707) + if yyrg4707 { + copy(yyv4707, yyv24707) } - } else if yyl4733 != len(yyv4733) { - yyv4733 = yyv4733[:yyl4733] - yyc4733 = true + } else if yyl4707 != len(yyv4707) { + yyv4707 = yyv4707[:yyl4707] + yyc4707 = true } - yyj4733 := 0 - for ; yyj4733 < yyrr4733; yyj4733++ { - yyh4733.ElemContainerState(yyj4733) + yyj4707 := 0 + for ; yyj4707 < yyrr4707; yyj4707++ { + yyh4707.ElemContainerState(yyj4707) if r.TryDecodeAsNil() { - yyv4733[yyj4733] = ReplicationControllerCondition{} + yyv4707[yyj4707] = ReplicationControllerCondition{} } else { - yyv4734 := &yyv4733[yyj4733] - yyv4734.CodecDecodeSelf(d) + yyv4708 := &yyv4707[yyj4707] + yyv4708.CodecDecodeSelf(d) } } - if yyrt4733 { - for ; yyj4733 < yyl4733; yyj4733++ { - yyv4733 = append(yyv4733, ReplicationControllerCondition{}) - yyh4733.ElemContainerState(yyj4733) + if yyrt4707 { + for ; yyj4707 < yyl4707; yyj4707++ { + yyv4707 = append(yyv4707, ReplicationControllerCondition{}) + yyh4707.ElemContainerState(yyj4707) if r.TryDecodeAsNil() { - yyv4733[yyj4733] = ReplicationControllerCondition{} + yyv4707[yyj4707] = ReplicationControllerCondition{} } else { - yyv4735 := &yyv4733[yyj4733] - yyv4735.CodecDecodeSelf(d) + yyv4709 := &yyv4707[yyj4707] + yyv4709.CodecDecodeSelf(d) } } } } else { - yyj4733 := 0 - for ; !r.CheckBreak(); yyj4733++ { + yyj4707 := 0 + for ; !r.CheckBreak(); yyj4707++ { - if yyj4733 >= len(yyv4733) { - yyv4733 = append(yyv4733, ReplicationControllerCondition{}) // var yyz4733 ReplicationControllerCondition - yyc4733 = true + if yyj4707 >= len(yyv4707) { + yyv4707 = append(yyv4707, ReplicationControllerCondition{}) // var yyz4707 ReplicationControllerCondition + yyc4707 = true } - yyh4733.ElemContainerState(yyj4733) - if yyj4733 < len(yyv4733) { + yyh4707.ElemContainerState(yyj4707) + if yyj4707 < len(yyv4707) { if r.TryDecodeAsNil() { - yyv4733[yyj4733] = ReplicationControllerCondition{} + yyv4707[yyj4707] = ReplicationControllerCondition{} } else { - yyv4736 := &yyv4733[yyj4733] - yyv4736.CodecDecodeSelf(d) + yyv4710 := &yyv4707[yyj4707] + yyv4710.CodecDecodeSelf(d) } } else { @@ -59948,17 +59649,17 @@ func (x codecSelfer1234) decSliceReplicationControllerCondition(v *[]Replication } } - if yyj4733 < len(yyv4733) { - yyv4733 = yyv4733[:yyj4733] - yyc4733 = true - } else if yyj4733 == 0 && yyv4733 == nil { - yyv4733 = []ReplicationControllerCondition{} - yyc4733 = true + if yyj4707 < len(yyv4707) { + yyv4707 = yyv4707[:yyj4707] + yyc4707 = true + } else if yyj4707 == 0 && yyv4707 == nil { + yyv4707 = []ReplicationControllerCondition{} + yyc4707 = true } } - yyh4733.End() - if yyc4733 { - *v = yyv4733 + yyh4707.End() + if yyc4707 { + *v = yyv4707 } } @@ -59967,10 +59668,10 @@ func (x codecSelfer1234) encSliceReplicationController(v []ReplicationController z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4737 := range v { + for _, yyv4711 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4738 := &yyv4737 - yy4738.CodecEncodeSelf(e) + yy4712 := &yyv4711 + yy4712.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -59980,83 +59681,83 @@ func (x codecSelfer1234) decSliceReplicationController(v *[]ReplicationControlle z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4739 := *v - yyh4739, yyl4739 := z.DecSliceHelperStart() - var yyc4739 bool - if yyl4739 == 0 { - if yyv4739 == nil { - yyv4739 = []ReplicationController{} - yyc4739 = true - } else if len(yyv4739) != 0 { - yyv4739 = yyv4739[:0] - yyc4739 = true + yyv4713 := *v + yyh4713, yyl4713 := z.DecSliceHelperStart() + var yyc4713 bool + if yyl4713 == 0 { + if yyv4713 == nil { + yyv4713 = []ReplicationController{} + yyc4713 = true + } else if len(yyv4713) != 0 { + yyv4713 = yyv4713[:0] + yyc4713 = true } - } else if yyl4739 > 0 { - var yyrr4739, yyrl4739 int - var yyrt4739 bool - if yyl4739 > cap(yyv4739) { + } else if yyl4713 > 0 { + var yyrr4713, yyrl4713 int + var yyrt4713 bool + if yyl4713 > cap(yyv4713) { - yyrg4739 := len(yyv4739) > 0 - yyv24739 := yyv4739 - yyrl4739, yyrt4739 = z.DecInferLen(yyl4739, z.DecBasicHandle().MaxInitLen, 336) - if yyrt4739 { - if yyrl4739 <= cap(yyv4739) { - yyv4739 = yyv4739[:yyrl4739] + yyrg4713 := len(yyv4713) > 0 + yyv24713 := yyv4713 + yyrl4713, yyrt4713 = z.DecInferLen(yyl4713, z.DecBasicHandle().MaxInitLen, 336) + if yyrt4713 { + if yyrl4713 <= cap(yyv4713) { + yyv4713 = yyv4713[:yyrl4713] } else { - yyv4739 = make([]ReplicationController, yyrl4739) + yyv4713 = make([]ReplicationController, yyrl4713) } } else { - yyv4739 = make([]ReplicationController, yyrl4739) + yyv4713 = make([]ReplicationController, yyrl4713) } - yyc4739 = true - yyrr4739 = len(yyv4739) - if yyrg4739 { - copy(yyv4739, yyv24739) + yyc4713 = true + yyrr4713 = len(yyv4713) + if yyrg4713 { + copy(yyv4713, yyv24713) } - } else if yyl4739 != len(yyv4739) { - yyv4739 = yyv4739[:yyl4739] - yyc4739 = true + } else if yyl4713 != len(yyv4713) { + yyv4713 = yyv4713[:yyl4713] + yyc4713 = true } - yyj4739 := 0 - for ; yyj4739 < yyrr4739; yyj4739++ { - yyh4739.ElemContainerState(yyj4739) + yyj4713 := 0 + for ; yyj4713 < yyrr4713; yyj4713++ { + yyh4713.ElemContainerState(yyj4713) if r.TryDecodeAsNil() { - yyv4739[yyj4739] = ReplicationController{} + yyv4713[yyj4713] = ReplicationController{} } else { - yyv4740 := &yyv4739[yyj4739] - yyv4740.CodecDecodeSelf(d) + yyv4714 := &yyv4713[yyj4713] + yyv4714.CodecDecodeSelf(d) } } - if yyrt4739 { - for ; yyj4739 < yyl4739; yyj4739++ { - yyv4739 = append(yyv4739, ReplicationController{}) - yyh4739.ElemContainerState(yyj4739) + if yyrt4713 { + for ; yyj4713 < yyl4713; yyj4713++ { + yyv4713 = append(yyv4713, ReplicationController{}) + yyh4713.ElemContainerState(yyj4713) if r.TryDecodeAsNil() { - yyv4739[yyj4739] = ReplicationController{} + yyv4713[yyj4713] = ReplicationController{} } else { - yyv4741 := &yyv4739[yyj4739] - yyv4741.CodecDecodeSelf(d) + yyv4715 := &yyv4713[yyj4713] + yyv4715.CodecDecodeSelf(d) } } } } else { - yyj4739 := 0 - for ; !r.CheckBreak(); yyj4739++ { + yyj4713 := 0 + for ; !r.CheckBreak(); yyj4713++ { - if yyj4739 >= len(yyv4739) { - yyv4739 = append(yyv4739, ReplicationController{}) // var yyz4739 ReplicationController - yyc4739 = true + if yyj4713 >= len(yyv4713) { + yyv4713 = append(yyv4713, ReplicationController{}) // var yyz4713 ReplicationController + yyc4713 = true } - yyh4739.ElemContainerState(yyj4739) - if yyj4739 < len(yyv4739) { + yyh4713.ElemContainerState(yyj4713) + if yyj4713 < len(yyv4713) { if r.TryDecodeAsNil() { - yyv4739[yyj4739] = ReplicationController{} + yyv4713[yyj4713] = ReplicationController{} } else { - yyv4742 := &yyv4739[yyj4739] - yyv4742.CodecDecodeSelf(d) + yyv4716 := &yyv4713[yyj4713] + yyv4716.CodecDecodeSelf(d) } } else { @@ -60064,17 +59765,17 @@ func (x codecSelfer1234) decSliceReplicationController(v *[]ReplicationControlle } } - if yyj4739 < len(yyv4739) { - yyv4739 = yyv4739[:yyj4739] - yyc4739 = true - } else if yyj4739 == 0 && yyv4739 == nil { - yyv4739 = []ReplicationController{} - yyc4739 = true + if yyj4713 < len(yyv4713) { + yyv4713 = yyv4713[:yyj4713] + yyc4713 = true + } else if yyj4713 == 0 && yyv4713 == nil { + yyv4713 = []ReplicationController{} + yyc4713 = true } } - yyh4739.End() - if yyc4739 { - *v = yyv4739 + yyh4713.End() + if yyc4713 { + *v = yyv4713 } } @@ -60083,10 +59784,10 @@ func (x codecSelfer1234) encSliceLoadBalancerIngress(v []LoadBalancerIngress, e z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4743 := range v { + for _, yyv4717 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4744 := &yyv4743 - yy4744.CodecEncodeSelf(e) + yy4718 := &yyv4717 + yy4718.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60096,83 +59797,83 @@ func (x codecSelfer1234) decSliceLoadBalancerIngress(v *[]LoadBalancerIngress, d z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4745 := *v - yyh4745, yyl4745 := z.DecSliceHelperStart() - var yyc4745 bool - if yyl4745 == 0 { - if yyv4745 == nil { - yyv4745 = []LoadBalancerIngress{} - yyc4745 = true - } else if len(yyv4745) != 0 { - yyv4745 = yyv4745[:0] - yyc4745 = true + yyv4719 := *v + yyh4719, yyl4719 := z.DecSliceHelperStart() + var yyc4719 bool + if yyl4719 == 0 { + if yyv4719 == nil { + yyv4719 = []LoadBalancerIngress{} + yyc4719 = true + } else if len(yyv4719) != 0 { + yyv4719 = yyv4719[:0] + yyc4719 = true } - } else if yyl4745 > 0 { - var yyrr4745, yyrl4745 int - var yyrt4745 bool - if yyl4745 > cap(yyv4745) { + } else if yyl4719 > 0 { + var yyrr4719, yyrl4719 int + var yyrt4719 bool + if yyl4719 > cap(yyv4719) { - yyrg4745 := len(yyv4745) > 0 - yyv24745 := yyv4745 - yyrl4745, yyrt4745 = z.DecInferLen(yyl4745, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4745 { - if yyrl4745 <= cap(yyv4745) { - yyv4745 = yyv4745[:yyrl4745] + yyrg4719 := len(yyv4719) > 0 + yyv24719 := yyv4719 + yyrl4719, yyrt4719 = z.DecInferLen(yyl4719, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4719 { + if yyrl4719 <= cap(yyv4719) { + yyv4719 = yyv4719[:yyrl4719] } else { - yyv4745 = make([]LoadBalancerIngress, yyrl4745) + yyv4719 = make([]LoadBalancerIngress, yyrl4719) } } else { - yyv4745 = make([]LoadBalancerIngress, yyrl4745) + yyv4719 = make([]LoadBalancerIngress, yyrl4719) } - yyc4745 = true - yyrr4745 = len(yyv4745) - if yyrg4745 { - copy(yyv4745, yyv24745) + yyc4719 = true + yyrr4719 = len(yyv4719) + if yyrg4719 { + copy(yyv4719, yyv24719) } - } else if yyl4745 != len(yyv4745) { - yyv4745 = yyv4745[:yyl4745] - yyc4745 = true + } else if yyl4719 != len(yyv4719) { + yyv4719 = yyv4719[:yyl4719] + yyc4719 = true } - yyj4745 := 0 - for ; yyj4745 < yyrr4745; yyj4745++ { - yyh4745.ElemContainerState(yyj4745) + yyj4719 := 0 + for ; yyj4719 < yyrr4719; yyj4719++ { + yyh4719.ElemContainerState(yyj4719) if r.TryDecodeAsNil() { - yyv4745[yyj4745] = LoadBalancerIngress{} + yyv4719[yyj4719] = LoadBalancerIngress{} } else { - yyv4746 := &yyv4745[yyj4745] - yyv4746.CodecDecodeSelf(d) + yyv4720 := &yyv4719[yyj4719] + yyv4720.CodecDecodeSelf(d) } } - if yyrt4745 { - for ; yyj4745 < yyl4745; yyj4745++ { - yyv4745 = append(yyv4745, LoadBalancerIngress{}) - yyh4745.ElemContainerState(yyj4745) + if yyrt4719 { + for ; yyj4719 < yyl4719; yyj4719++ { + yyv4719 = append(yyv4719, LoadBalancerIngress{}) + yyh4719.ElemContainerState(yyj4719) if r.TryDecodeAsNil() { - yyv4745[yyj4745] = LoadBalancerIngress{} + yyv4719[yyj4719] = LoadBalancerIngress{} } else { - yyv4747 := &yyv4745[yyj4745] - yyv4747.CodecDecodeSelf(d) + yyv4721 := &yyv4719[yyj4719] + yyv4721.CodecDecodeSelf(d) } } } } else { - yyj4745 := 0 - for ; !r.CheckBreak(); yyj4745++ { + yyj4719 := 0 + for ; !r.CheckBreak(); yyj4719++ { - if yyj4745 >= len(yyv4745) { - yyv4745 = append(yyv4745, LoadBalancerIngress{}) // var yyz4745 LoadBalancerIngress - yyc4745 = true + if yyj4719 >= len(yyv4719) { + yyv4719 = append(yyv4719, LoadBalancerIngress{}) // var yyz4719 LoadBalancerIngress + yyc4719 = true } - yyh4745.ElemContainerState(yyj4745) - if yyj4745 < len(yyv4745) { + yyh4719.ElemContainerState(yyj4719) + if yyj4719 < len(yyv4719) { if r.TryDecodeAsNil() { - yyv4745[yyj4745] = LoadBalancerIngress{} + yyv4719[yyj4719] = LoadBalancerIngress{} } else { - yyv4748 := &yyv4745[yyj4745] - yyv4748.CodecDecodeSelf(d) + yyv4722 := &yyv4719[yyj4719] + yyv4722.CodecDecodeSelf(d) } } else { @@ -60180,17 +59881,17 @@ func (x codecSelfer1234) decSliceLoadBalancerIngress(v *[]LoadBalancerIngress, d } } - if yyj4745 < len(yyv4745) { - yyv4745 = yyv4745[:yyj4745] - yyc4745 = true - } else if yyj4745 == 0 && yyv4745 == nil { - yyv4745 = []LoadBalancerIngress{} - yyc4745 = true + if yyj4719 < len(yyv4719) { + yyv4719 = yyv4719[:yyj4719] + yyc4719 = true + } else if yyj4719 == 0 && yyv4719 == nil { + yyv4719 = []LoadBalancerIngress{} + yyc4719 = true } } - yyh4745.End() - if yyc4745 { - *v = yyv4745 + yyh4719.End() + if yyc4719 { + *v = yyv4719 } } @@ -60199,10 +59900,10 @@ func (x codecSelfer1234) encSliceServicePort(v []ServicePort, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4749 := range v { + for _, yyv4723 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4750 := &yyv4749 - yy4750.CodecEncodeSelf(e) + yy4724 := &yyv4723 + yy4724.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60212,83 +59913,83 @@ func (x codecSelfer1234) decSliceServicePort(v *[]ServicePort, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4751 := *v - yyh4751, yyl4751 := z.DecSliceHelperStart() - var yyc4751 bool - if yyl4751 == 0 { - if yyv4751 == nil { - yyv4751 = []ServicePort{} - yyc4751 = true - } else if len(yyv4751) != 0 { - yyv4751 = yyv4751[:0] - yyc4751 = true + yyv4725 := *v + yyh4725, yyl4725 := z.DecSliceHelperStart() + var yyc4725 bool + if yyl4725 == 0 { + if yyv4725 == nil { + yyv4725 = []ServicePort{} + yyc4725 = true + } else if len(yyv4725) != 0 { + yyv4725 = yyv4725[:0] + yyc4725 = true } - } else if yyl4751 > 0 { - var yyrr4751, yyrl4751 int - var yyrt4751 bool - if yyl4751 > cap(yyv4751) { + } else if yyl4725 > 0 { + var yyrr4725, yyrl4725 int + var yyrt4725 bool + if yyl4725 > cap(yyv4725) { - yyrg4751 := len(yyv4751) > 0 - yyv24751 := yyv4751 - yyrl4751, yyrt4751 = z.DecInferLen(yyl4751, z.DecBasicHandle().MaxInitLen, 80) - if yyrt4751 { - if yyrl4751 <= cap(yyv4751) { - yyv4751 = yyv4751[:yyrl4751] + yyrg4725 := len(yyv4725) > 0 + yyv24725 := yyv4725 + yyrl4725, yyrt4725 = z.DecInferLen(yyl4725, z.DecBasicHandle().MaxInitLen, 80) + if yyrt4725 { + if yyrl4725 <= cap(yyv4725) { + yyv4725 = yyv4725[:yyrl4725] } else { - yyv4751 = make([]ServicePort, yyrl4751) + yyv4725 = make([]ServicePort, yyrl4725) } } else { - yyv4751 = make([]ServicePort, yyrl4751) + yyv4725 = make([]ServicePort, yyrl4725) } - yyc4751 = true - yyrr4751 = len(yyv4751) - if yyrg4751 { - copy(yyv4751, yyv24751) + yyc4725 = true + yyrr4725 = len(yyv4725) + if yyrg4725 { + copy(yyv4725, yyv24725) } - } else if yyl4751 != len(yyv4751) { - yyv4751 = yyv4751[:yyl4751] - yyc4751 = true + } else if yyl4725 != len(yyv4725) { + yyv4725 = yyv4725[:yyl4725] + yyc4725 = true } - yyj4751 := 0 - for ; yyj4751 < yyrr4751; yyj4751++ { - yyh4751.ElemContainerState(yyj4751) + yyj4725 := 0 + for ; yyj4725 < yyrr4725; yyj4725++ { + yyh4725.ElemContainerState(yyj4725) if r.TryDecodeAsNil() { - yyv4751[yyj4751] = ServicePort{} + yyv4725[yyj4725] = ServicePort{} } else { - yyv4752 := &yyv4751[yyj4751] - yyv4752.CodecDecodeSelf(d) + yyv4726 := &yyv4725[yyj4725] + yyv4726.CodecDecodeSelf(d) } } - if yyrt4751 { - for ; yyj4751 < yyl4751; yyj4751++ { - yyv4751 = append(yyv4751, ServicePort{}) - yyh4751.ElemContainerState(yyj4751) + if yyrt4725 { + for ; yyj4725 < yyl4725; yyj4725++ { + yyv4725 = append(yyv4725, ServicePort{}) + yyh4725.ElemContainerState(yyj4725) if r.TryDecodeAsNil() { - yyv4751[yyj4751] = ServicePort{} + yyv4725[yyj4725] = ServicePort{} } else { - yyv4753 := &yyv4751[yyj4751] - yyv4753.CodecDecodeSelf(d) + yyv4727 := &yyv4725[yyj4725] + yyv4727.CodecDecodeSelf(d) } } } } else { - yyj4751 := 0 - for ; !r.CheckBreak(); yyj4751++ { + yyj4725 := 0 + for ; !r.CheckBreak(); yyj4725++ { - if yyj4751 >= len(yyv4751) { - yyv4751 = append(yyv4751, ServicePort{}) // var yyz4751 ServicePort - yyc4751 = true + if yyj4725 >= len(yyv4725) { + yyv4725 = append(yyv4725, ServicePort{}) // var yyz4725 ServicePort + yyc4725 = true } - yyh4751.ElemContainerState(yyj4751) - if yyj4751 < len(yyv4751) { + yyh4725.ElemContainerState(yyj4725) + if yyj4725 < len(yyv4725) { if r.TryDecodeAsNil() { - yyv4751[yyj4751] = ServicePort{} + yyv4725[yyj4725] = ServicePort{} } else { - yyv4754 := &yyv4751[yyj4751] - yyv4754.CodecDecodeSelf(d) + yyv4728 := &yyv4725[yyj4725] + yyv4728.CodecDecodeSelf(d) } } else { @@ -60296,17 +59997,17 @@ func (x codecSelfer1234) decSliceServicePort(v *[]ServicePort, d *codec1978.Deco } } - if yyj4751 < len(yyv4751) { - yyv4751 = yyv4751[:yyj4751] - yyc4751 = true - } else if yyj4751 == 0 && yyv4751 == nil { - yyv4751 = []ServicePort{} - yyc4751 = true + if yyj4725 < len(yyv4725) { + yyv4725 = yyv4725[:yyj4725] + yyc4725 = true + } else if yyj4725 == 0 && yyv4725 == nil { + yyv4725 = []ServicePort{} + yyc4725 = true } } - yyh4751.End() - if yyc4751 { - *v = yyv4751 + yyh4725.End() + if yyc4725 { + *v = yyv4725 } } @@ -60315,10 +60016,10 @@ func (x codecSelfer1234) encSliceService(v []Service, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4755 := range v { + for _, yyv4729 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4756 := &yyv4755 - yy4756.CodecEncodeSelf(e) + yy4730 := &yyv4729 + yy4730.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60328,83 +60029,83 @@ func (x codecSelfer1234) decSliceService(v *[]Service, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4757 := *v - yyh4757, yyl4757 := z.DecSliceHelperStart() - var yyc4757 bool - if yyl4757 == 0 { - if yyv4757 == nil { - yyv4757 = []Service{} - yyc4757 = true - } else if len(yyv4757) != 0 { - yyv4757 = yyv4757[:0] - yyc4757 = true + yyv4731 := *v + yyh4731, yyl4731 := z.DecSliceHelperStart() + var yyc4731 bool + if yyl4731 == 0 { + if yyv4731 == nil { + yyv4731 = []Service{} + yyc4731 = true + } else if len(yyv4731) != 0 { + yyv4731 = yyv4731[:0] + yyc4731 = true } - } else if yyl4757 > 0 { - var yyrr4757, yyrl4757 int - var yyrt4757 bool - if yyl4757 > cap(yyv4757) { + } else if yyl4731 > 0 { + var yyrr4731, yyrl4731 int + var yyrt4731 bool + if yyl4731 > cap(yyv4731) { - yyrg4757 := len(yyv4757) > 0 - yyv24757 := yyv4757 - yyrl4757, yyrt4757 = z.DecInferLen(yyl4757, z.DecBasicHandle().MaxInitLen, 464) - if yyrt4757 { - if yyrl4757 <= cap(yyv4757) { - yyv4757 = yyv4757[:yyrl4757] + yyrg4731 := len(yyv4731) > 0 + yyv24731 := yyv4731 + yyrl4731, yyrt4731 = z.DecInferLen(yyl4731, z.DecBasicHandle().MaxInitLen, 464) + if yyrt4731 { + if yyrl4731 <= cap(yyv4731) { + yyv4731 = yyv4731[:yyrl4731] } else { - yyv4757 = make([]Service, yyrl4757) + yyv4731 = make([]Service, yyrl4731) } } else { - yyv4757 = make([]Service, yyrl4757) + yyv4731 = make([]Service, yyrl4731) } - yyc4757 = true - yyrr4757 = len(yyv4757) - if yyrg4757 { - copy(yyv4757, yyv24757) + yyc4731 = true + yyrr4731 = len(yyv4731) + if yyrg4731 { + copy(yyv4731, yyv24731) } - } else if yyl4757 != len(yyv4757) { - yyv4757 = yyv4757[:yyl4757] - yyc4757 = true + } else if yyl4731 != len(yyv4731) { + yyv4731 = yyv4731[:yyl4731] + yyc4731 = true } - yyj4757 := 0 - for ; yyj4757 < yyrr4757; yyj4757++ { - yyh4757.ElemContainerState(yyj4757) + yyj4731 := 0 + for ; yyj4731 < yyrr4731; yyj4731++ { + yyh4731.ElemContainerState(yyj4731) if r.TryDecodeAsNil() { - yyv4757[yyj4757] = Service{} + yyv4731[yyj4731] = Service{} } else { - yyv4758 := &yyv4757[yyj4757] - yyv4758.CodecDecodeSelf(d) + yyv4732 := &yyv4731[yyj4731] + yyv4732.CodecDecodeSelf(d) } } - if yyrt4757 { - for ; yyj4757 < yyl4757; yyj4757++ { - yyv4757 = append(yyv4757, Service{}) - yyh4757.ElemContainerState(yyj4757) + if yyrt4731 { + for ; yyj4731 < yyl4731; yyj4731++ { + yyv4731 = append(yyv4731, Service{}) + yyh4731.ElemContainerState(yyj4731) if r.TryDecodeAsNil() { - yyv4757[yyj4757] = Service{} + yyv4731[yyj4731] = Service{} } else { - yyv4759 := &yyv4757[yyj4757] - yyv4759.CodecDecodeSelf(d) + yyv4733 := &yyv4731[yyj4731] + yyv4733.CodecDecodeSelf(d) } } } } else { - yyj4757 := 0 - for ; !r.CheckBreak(); yyj4757++ { + yyj4731 := 0 + for ; !r.CheckBreak(); yyj4731++ { - if yyj4757 >= len(yyv4757) { - yyv4757 = append(yyv4757, Service{}) // var yyz4757 Service - yyc4757 = true + if yyj4731 >= len(yyv4731) { + yyv4731 = append(yyv4731, Service{}) // var yyz4731 Service + yyc4731 = true } - yyh4757.ElemContainerState(yyj4757) - if yyj4757 < len(yyv4757) { + yyh4731.ElemContainerState(yyj4731) + if yyj4731 < len(yyv4731) { if r.TryDecodeAsNil() { - yyv4757[yyj4757] = Service{} + yyv4731[yyj4731] = Service{} } else { - yyv4760 := &yyv4757[yyj4757] - yyv4760.CodecDecodeSelf(d) + yyv4734 := &yyv4731[yyj4731] + yyv4734.CodecDecodeSelf(d) } } else { @@ -60412,17 +60113,17 @@ func (x codecSelfer1234) decSliceService(v *[]Service, d *codec1978.Decoder) { } } - if yyj4757 < len(yyv4757) { - yyv4757 = yyv4757[:yyj4757] - yyc4757 = true - } else if yyj4757 == 0 && yyv4757 == nil { - yyv4757 = []Service{} - yyc4757 = true + if yyj4731 < len(yyv4731) { + yyv4731 = yyv4731[:yyj4731] + yyc4731 = true + } else if yyj4731 == 0 && yyv4731 == nil { + yyv4731 = []Service{} + yyc4731 = true } } - yyh4757.End() - if yyc4757 { - *v = yyv4757 + yyh4731.End() + if yyc4731 { + *v = yyv4731 } } @@ -60431,10 +60132,10 @@ func (x codecSelfer1234) encSliceObjectReference(v []ObjectReference, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4761 := range v { + for _, yyv4735 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4762 := &yyv4761 - yy4762.CodecEncodeSelf(e) + yy4736 := &yyv4735 + yy4736.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60444,83 +60145,83 @@ func (x codecSelfer1234) decSliceObjectReference(v *[]ObjectReference, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4763 := *v - yyh4763, yyl4763 := z.DecSliceHelperStart() - var yyc4763 bool - if yyl4763 == 0 { - if yyv4763 == nil { - yyv4763 = []ObjectReference{} - yyc4763 = true - } else if len(yyv4763) != 0 { - yyv4763 = yyv4763[:0] - yyc4763 = true + yyv4737 := *v + yyh4737, yyl4737 := z.DecSliceHelperStart() + var yyc4737 bool + if yyl4737 == 0 { + if yyv4737 == nil { + yyv4737 = []ObjectReference{} + yyc4737 = true + } else if len(yyv4737) != 0 { + yyv4737 = yyv4737[:0] + yyc4737 = true } - } else if yyl4763 > 0 { - var yyrr4763, yyrl4763 int - var yyrt4763 bool - if yyl4763 > cap(yyv4763) { + } else if yyl4737 > 0 { + var yyrr4737, yyrl4737 int + var yyrt4737 bool + if yyl4737 > cap(yyv4737) { - yyrg4763 := len(yyv4763) > 0 - yyv24763 := yyv4763 - yyrl4763, yyrt4763 = z.DecInferLen(yyl4763, z.DecBasicHandle().MaxInitLen, 112) - if yyrt4763 { - if yyrl4763 <= cap(yyv4763) { - yyv4763 = yyv4763[:yyrl4763] + yyrg4737 := len(yyv4737) > 0 + yyv24737 := yyv4737 + yyrl4737, yyrt4737 = z.DecInferLen(yyl4737, z.DecBasicHandle().MaxInitLen, 112) + if yyrt4737 { + if yyrl4737 <= cap(yyv4737) { + yyv4737 = yyv4737[:yyrl4737] } else { - yyv4763 = make([]ObjectReference, yyrl4763) + yyv4737 = make([]ObjectReference, yyrl4737) } } else { - yyv4763 = make([]ObjectReference, yyrl4763) + yyv4737 = make([]ObjectReference, yyrl4737) } - yyc4763 = true - yyrr4763 = len(yyv4763) - if yyrg4763 { - copy(yyv4763, yyv24763) + yyc4737 = true + yyrr4737 = len(yyv4737) + if yyrg4737 { + copy(yyv4737, yyv24737) } - } else if yyl4763 != len(yyv4763) { - yyv4763 = yyv4763[:yyl4763] - yyc4763 = true + } else if yyl4737 != len(yyv4737) { + yyv4737 = yyv4737[:yyl4737] + yyc4737 = true } - yyj4763 := 0 - for ; yyj4763 < yyrr4763; yyj4763++ { - yyh4763.ElemContainerState(yyj4763) + yyj4737 := 0 + for ; yyj4737 < yyrr4737; yyj4737++ { + yyh4737.ElemContainerState(yyj4737) if r.TryDecodeAsNil() { - yyv4763[yyj4763] = ObjectReference{} + yyv4737[yyj4737] = ObjectReference{} } else { - yyv4764 := &yyv4763[yyj4763] - yyv4764.CodecDecodeSelf(d) + yyv4738 := &yyv4737[yyj4737] + yyv4738.CodecDecodeSelf(d) } } - if yyrt4763 { - for ; yyj4763 < yyl4763; yyj4763++ { - yyv4763 = append(yyv4763, ObjectReference{}) - yyh4763.ElemContainerState(yyj4763) + if yyrt4737 { + for ; yyj4737 < yyl4737; yyj4737++ { + yyv4737 = append(yyv4737, ObjectReference{}) + yyh4737.ElemContainerState(yyj4737) if r.TryDecodeAsNil() { - yyv4763[yyj4763] = ObjectReference{} + yyv4737[yyj4737] = ObjectReference{} } else { - yyv4765 := &yyv4763[yyj4763] - yyv4765.CodecDecodeSelf(d) + yyv4739 := &yyv4737[yyj4737] + yyv4739.CodecDecodeSelf(d) } } } } else { - yyj4763 := 0 - for ; !r.CheckBreak(); yyj4763++ { + yyj4737 := 0 + for ; !r.CheckBreak(); yyj4737++ { - if yyj4763 >= len(yyv4763) { - yyv4763 = append(yyv4763, ObjectReference{}) // var yyz4763 ObjectReference - yyc4763 = true + if yyj4737 >= len(yyv4737) { + yyv4737 = append(yyv4737, ObjectReference{}) // var yyz4737 ObjectReference + yyc4737 = true } - yyh4763.ElemContainerState(yyj4763) - if yyj4763 < len(yyv4763) { + yyh4737.ElemContainerState(yyj4737) + if yyj4737 < len(yyv4737) { if r.TryDecodeAsNil() { - yyv4763[yyj4763] = ObjectReference{} + yyv4737[yyj4737] = ObjectReference{} } else { - yyv4766 := &yyv4763[yyj4763] - yyv4766.CodecDecodeSelf(d) + yyv4740 := &yyv4737[yyj4737] + yyv4740.CodecDecodeSelf(d) } } else { @@ -60528,17 +60229,17 @@ func (x codecSelfer1234) decSliceObjectReference(v *[]ObjectReference, d *codec1 } } - if yyj4763 < len(yyv4763) { - yyv4763 = yyv4763[:yyj4763] - yyc4763 = true - } else if yyj4763 == 0 && yyv4763 == nil { - yyv4763 = []ObjectReference{} - yyc4763 = true + if yyj4737 < len(yyv4737) { + yyv4737 = yyv4737[:yyj4737] + yyc4737 = true + } else if yyj4737 == 0 && yyv4737 == nil { + yyv4737 = []ObjectReference{} + yyc4737 = true } } - yyh4763.End() - if yyc4763 { - *v = yyv4763 + yyh4737.End() + if yyc4737 { + *v = yyv4737 } } @@ -60547,10 +60248,10 @@ func (x codecSelfer1234) encSliceServiceAccount(v []ServiceAccount, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4767 := range v { + for _, yyv4741 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4768 := &yyv4767 - yy4768.CodecEncodeSelf(e) + yy4742 := &yyv4741 + yy4742.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60560,83 +60261,83 @@ func (x codecSelfer1234) decSliceServiceAccount(v *[]ServiceAccount, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4769 := *v - yyh4769, yyl4769 := z.DecSliceHelperStart() - var yyc4769 bool - if yyl4769 == 0 { - if yyv4769 == nil { - yyv4769 = []ServiceAccount{} - yyc4769 = true - } else if len(yyv4769) != 0 { - yyv4769 = yyv4769[:0] - yyc4769 = true + yyv4743 := *v + yyh4743, yyl4743 := z.DecSliceHelperStart() + var yyc4743 bool + if yyl4743 == 0 { + if yyv4743 == nil { + yyv4743 = []ServiceAccount{} + yyc4743 = true + } else if len(yyv4743) != 0 { + yyv4743 = yyv4743[:0] + yyc4743 = true } - } else if yyl4769 > 0 { - var yyrr4769, yyrl4769 int - var yyrt4769 bool - if yyl4769 > cap(yyv4769) { + } else if yyl4743 > 0 { + var yyrr4743, yyrl4743 int + var yyrt4743 bool + if yyl4743 > cap(yyv4743) { - yyrg4769 := len(yyv4769) > 0 - yyv24769 := yyv4769 - yyrl4769, yyrt4769 = z.DecInferLen(yyl4769, z.DecBasicHandle().MaxInitLen, 304) - if yyrt4769 { - if yyrl4769 <= cap(yyv4769) { - yyv4769 = yyv4769[:yyrl4769] + yyrg4743 := len(yyv4743) > 0 + yyv24743 := yyv4743 + yyrl4743, yyrt4743 = z.DecInferLen(yyl4743, z.DecBasicHandle().MaxInitLen, 304) + if yyrt4743 { + if yyrl4743 <= cap(yyv4743) { + yyv4743 = yyv4743[:yyrl4743] } else { - yyv4769 = make([]ServiceAccount, yyrl4769) + yyv4743 = make([]ServiceAccount, yyrl4743) } } else { - yyv4769 = make([]ServiceAccount, yyrl4769) + yyv4743 = make([]ServiceAccount, yyrl4743) } - yyc4769 = true - yyrr4769 = len(yyv4769) - if yyrg4769 { - copy(yyv4769, yyv24769) + yyc4743 = true + yyrr4743 = len(yyv4743) + if yyrg4743 { + copy(yyv4743, yyv24743) } - } else if yyl4769 != len(yyv4769) { - yyv4769 = yyv4769[:yyl4769] - yyc4769 = true + } else if yyl4743 != len(yyv4743) { + yyv4743 = yyv4743[:yyl4743] + yyc4743 = true } - yyj4769 := 0 - for ; yyj4769 < yyrr4769; yyj4769++ { - yyh4769.ElemContainerState(yyj4769) + yyj4743 := 0 + for ; yyj4743 < yyrr4743; yyj4743++ { + yyh4743.ElemContainerState(yyj4743) if r.TryDecodeAsNil() { - yyv4769[yyj4769] = ServiceAccount{} + yyv4743[yyj4743] = ServiceAccount{} } else { - yyv4770 := &yyv4769[yyj4769] - yyv4770.CodecDecodeSelf(d) + yyv4744 := &yyv4743[yyj4743] + yyv4744.CodecDecodeSelf(d) } } - if yyrt4769 { - for ; yyj4769 < yyl4769; yyj4769++ { - yyv4769 = append(yyv4769, ServiceAccount{}) - yyh4769.ElemContainerState(yyj4769) + if yyrt4743 { + for ; yyj4743 < yyl4743; yyj4743++ { + yyv4743 = append(yyv4743, ServiceAccount{}) + yyh4743.ElemContainerState(yyj4743) if r.TryDecodeAsNil() { - yyv4769[yyj4769] = ServiceAccount{} + yyv4743[yyj4743] = ServiceAccount{} } else { - yyv4771 := &yyv4769[yyj4769] - yyv4771.CodecDecodeSelf(d) + yyv4745 := &yyv4743[yyj4743] + yyv4745.CodecDecodeSelf(d) } } } } else { - yyj4769 := 0 - for ; !r.CheckBreak(); yyj4769++ { + yyj4743 := 0 + for ; !r.CheckBreak(); yyj4743++ { - if yyj4769 >= len(yyv4769) { - yyv4769 = append(yyv4769, ServiceAccount{}) // var yyz4769 ServiceAccount - yyc4769 = true + if yyj4743 >= len(yyv4743) { + yyv4743 = append(yyv4743, ServiceAccount{}) // var yyz4743 ServiceAccount + yyc4743 = true } - yyh4769.ElemContainerState(yyj4769) - if yyj4769 < len(yyv4769) { + yyh4743.ElemContainerState(yyj4743) + if yyj4743 < len(yyv4743) { if r.TryDecodeAsNil() { - yyv4769[yyj4769] = ServiceAccount{} + yyv4743[yyj4743] = ServiceAccount{} } else { - yyv4772 := &yyv4769[yyj4769] - yyv4772.CodecDecodeSelf(d) + yyv4746 := &yyv4743[yyj4743] + yyv4746.CodecDecodeSelf(d) } } else { @@ -60644,17 +60345,17 @@ func (x codecSelfer1234) decSliceServiceAccount(v *[]ServiceAccount, d *codec197 } } - if yyj4769 < len(yyv4769) { - yyv4769 = yyv4769[:yyj4769] - yyc4769 = true - } else if yyj4769 == 0 && yyv4769 == nil { - yyv4769 = []ServiceAccount{} - yyc4769 = true + if yyj4743 < len(yyv4743) { + yyv4743 = yyv4743[:yyj4743] + yyc4743 = true + } else if yyj4743 == 0 && yyv4743 == nil { + yyv4743 = []ServiceAccount{} + yyc4743 = true } } - yyh4769.End() - if yyc4769 { - *v = yyv4769 + yyh4743.End() + if yyc4743 { + *v = yyv4743 } } @@ -60663,10 +60364,10 @@ func (x codecSelfer1234) encSliceEndpointSubset(v []EndpointSubset, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4773 := range v { + for _, yyv4747 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4774 := &yyv4773 - yy4774.CodecEncodeSelf(e) + yy4748 := &yyv4747 + yy4748.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60676,83 +60377,83 @@ func (x codecSelfer1234) decSliceEndpointSubset(v *[]EndpointSubset, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4775 := *v - yyh4775, yyl4775 := z.DecSliceHelperStart() - var yyc4775 bool - if yyl4775 == 0 { - if yyv4775 == nil { - yyv4775 = []EndpointSubset{} - yyc4775 = true - } else if len(yyv4775) != 0 { - yyv4775 = yyv4775[:0] - yyc4775 = true + yyv4749 := *v + yyh4749, yyl4749 := z.DecSliceHelperStart() + var yyc4749 bool + if yyl4749 == 0 { + if yyv4749 == nil { + yyv4749 = []EndpointSubset{} + yyc4749 = true + } else if len(yyv4749) != 0 { + yyv4749 = yyv4749[:0] + yyc4749 = true } - } else if yyl4775 > 0 { - var yyrr4775, yyrl4775 int - var yyrt4775 bool - if yyl4775 > cap(yyv4775) { + } else if yyl4749 > 0 { + var yyrr4749, yyrl4749 int + var yyrt4749 bool + if yyl4749 > cap(yyv4749) { - yyrg4775 := len(yyv4775) > 0 - yyv24775 := yyv4775 - yyrl4775, yyrt4775 = z.DecInferLen(yyl4775, z.DecBasicHandle().MaxInitLen, 72) - if yyrt4775 { - if yyrl4775 <= cap(yyv4775) { - yyv4775 = yyv4775[:yyrl4775] + yyrg4749 := len(yyv4749) > 0 + yyv24749 := yyv4749 + yyrl4749, yyrt4749 = z.DecInferLen(yyl4749, z.DecBasicHandle().MaxInitLen, 72) + if yyrt4749 { + if yyrl4749 <= cap(yyv4749) { + yyv4749 = yyv4749[:yyrl4749] } else { - yyv4775 = make([]EndpointSubset, yyrl4775) + yyv4749 = make([]EndpointSubset, yyrl4749) } } else { - yyv4775 = make([]EndpointSubset, yyrl4775) + yyv4749 = make([]EndpointSubset, yyrl4749) } - yyc4775 = true - yyrr4775 = len(yyv4775) - if yyrg4775 { - copy(yyv4775, yyv24775) + yyc4749 = true + yyrr4749 = len(yyv4749) + if yyrg4749 { + copy(yyv4749, yyv24749) } - } else if yyl4775 != len(yyv4775) { - yyv4775 = yyv4775[:yyl4775] - yyc4775 = true + } else if yyl4749 != len(yyv4749) { + yyv4749 = yyv4749[:yyl4749] + yyc4749 = true } - yyj4775 := 0 - for ; yyj4775 < yyrr4775; yyj4775++ { - yyh4775.ElemContainerState(yyj4775) + yyj4749 := 0 + for ; yyj4749 < yyrr4749; yyj4749++ { + yyh4749.ElemContainerState(yyj4749) if r.TryDecodeAsNil() { - yyv4775[yyj4775] = EndpointSubset{} + yyv4749[yyj4749] = EndpointSubset{} } else { - yyv4776 := &yyv4775[yyj4775] - yyv4776.CodecDecodeSelf(d) + yyv4750 := &yyv4749[yyj4749] + yyv4750.CodecDecodeSelf(d) } } - if yyrt4775 { - for ; yyj4775 < yyl4775; yyj4775++ { - yyv4775 = append(yyv4775, EndpointSubset{}) - yyh4775.ElemContainerState(yyj4775) + if yyrt4749 { + for ; yyj4749 < yyl4749; yyj4749++ { + yyv4749 = append(yyv4749, EndpointSubset{}) + yyh4749.ElemContainerState(yyj4749) if r.TryDecodeAsNil() { - yyv4775[yyj4775] = EndpointSubset{} + yyv4749[yyj4749] = EndpointSubset{} } else { - yyv4777 := &yyv4775[yyj4775] - yyv4777.CodecDecodeSelf(d) + yyv4751 := &yyv4749[yyj4749] + yyv4751.CodecDecodeSelf(d) } } } } else { - yyj4775 := 0 - for ; !r.CheckBreak(); yyj4775++ { + yyj4749 := 0 + for ; !r.CheckBreak(); yyj4749++ { - if yyj4775 >= len(yyv4775) { - yyv4775 = append(yyv4775, EndpointSubset{}) // var yyz4775 EndpointSubset - yyc4775 = true + if yyj4749 >= len(yyv4749) { + yyv4749 = append(yyv4749, EndpointSubset{}) // var yyz4749 EndpointSubset + yyc4749 = true } - yyh4775.ElemContainerState(yyj4775) - if yyj4775 < len(yyv4775) { + yyh4749.ElemContainerState(yyj4749) + if yyj4749 < len(yyv4749) { if r.TryDecodeAsNil() { - yyv4775[yyj4775] = EndpointSubset{} + yyv4749[yyj4749] = EndpointSubset{} } else { - yyv4778 := &yyv4775[yyj4775] - yyv4778.CodecDecodeSelf(d) + yyv4752 := &yyv4749[yyj4749] + yyv4752.CodecDecodeSelf(d) } } else { @@ -60760,17 +60461,17 @@ func (x codecSelfer1234) decSliceEndpointSubset(v *[]EndpointSubset, d *codec197 } } - if yyj4775 < len(yyv4775) { - yyv4775 = yyv4775[:yyj4775] - yyc4775 = true - } else if yyj4775 == 0 && yyv4775 == nil { - yyv4775 = []EndpointSubset{} - yyc4775 = true + if yyj4749 < len(yyv4749) { + yyv4749 = yyv4749[:yyj4749] + yyc4749 = true + } else if yyj4749 == 0 && yyv4749 == nil { + yyv4749 = []EndpointSubset{} + yyc4749 = true } } - yyh4775.End() - if yyc4775 { - *v = yyv4775 + yyh4749.End() + if yyc4749 { + *v = yyv4749 } } @@ -60779,10 +60480,10 @@ func (x codecSelfer1234) encSliceEndpointAddress(v []EndpointAddress, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4779 := range v { + for _, yyv4753 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4780 := &yyv4779 - yy4780.CodecEncodeSelf(e) + yy4754 := &yyv4753 + yy4754.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60792,83 +60493,83 @@ func (x codecSelfer1234) decSliceEndpointAddress(v *[]EndpointAddress, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4781 := *v - yyh4781, yyl4781 := z.DecSliceHelperStart() - var yyc4781 bool - if yyl4781 == 0 { - if yyv4781 == nil { - yyv4781 = []EndpointAddress{} - yyc4781 = true - } else if len(yyv4781) != 0 { - yyv4781 = yyv4781[:0] - yyc4781 = true + yyv4755 := *v + yyh4755, yyl4755 := z.DecSliceHelperStart() + var yyc4755 bool + if yyl4755 == 0 { + if yyv4755 == nil { + yyv4755 = []EndpointAddress{} + yyc4755 = true + } else if len(yyv4755) != 0 { + yyv4755 = yyv4755[:0] + yyc4755 = true } - } else if yyl4781 > 0 { - var yyrr4781, yyrl4781 int - var yyrt4781 bool - if yyl4781 > cap(yyv4781) { + } else if yyl4755 > 0 { + var yyrr4755, yyrl4755 int + var yyrt4755 bool + if yyl4755 > cap(yyv4755) { - yyrg4781 := len(yyv4781) > 0 - yyv24781 := yyv4781 - yyrl4781, yyrt4781 = z.DecInferLen(yyl4781, z.DecBasicHandle().MaxInitLen, 48) - if yyrt4781 { - if yyrl4781 <= cap(yyv4781) { - yyv4781 = yyv4781[:yyrl4781] + yyrg4755 := len(yyv4755) > 0 + yyv24755 := yyv4755 + yyrl4755, yyrt4755 = z.DecInferLen(yyl4755, z.DecBasicHandle().MaxInitLen, 48) + if yyrt4755 { + if yyrl4755 <= cap(yyv4755) { + yyv4755 = yyv4755[:yyrl4755] } else { - yyv4781 = make([]EndpointAddress, yyrl4781) + yyv4755 = make([]EndpointAddress, yyrl4755) } } else { - yyv4781 = make([]EndpointAddress, yyrl4781) + yyv4755 = make([]EndpointAddress, yyrl4755) } - yyc4781 = true - yyrr4781 = len(yyv4781) - if yyrg4781 { - copy(yyv4781, yyv24781) + yyc4755 = true + yyrr4755 = len(yyv4755) + if yyrg4755 { + copy(yyv4755, yyv24755) } - } else if yyl4781 != len(yyv4781) { - yyv4781 = yyv4781[:yyl4781] - yyc4781 = true + } else if yyl4755 != len(yyv4755) { + yyv4755 = yyv4755[:yyl4755] + yyc4755 = true } - yyj4781 := 0 - for ; yyj4781 < yyrr4781; yyj4781++ { - yyh4781.ElemContainerState(yyj4781) + yyj4755 := 0 + for ; yyj4755 < yyrr4755; yyj4755++ { + yyh4755.ElemContainerState(yyj4755) if r.TryDecodeAsNil() { - yyv4781[yyj4781] = EndpointAddress{} + yyv4755[yyj4755] = EndpointAddress{} } else { - yyv4782 := &yyv4781[yyj4781] - yyv4782.CodecDecodeSelf(d) + yyv4756 := &yyv4755[yyj4755] + yyv4756.CodecDecodeSelf(d) } } - if yyrt4781 { - for ; yyj4781 < yyl4781; yyj4781++ { - yyv4781 = append(yyv4781, EndpointAddress{}) - yyh4781.ElemContainerState(yyj4781) + if yyrt4755 { + for ; yyj4755 < yyl4755; yyj4755++ { + yyv4755 = append(yyv4755, EndpointAddress{}) + yyh4755.ElemContainerState(yyj4755) if r.TryDecodeAsNil() { - yyv4781[yyj4781] = EndpointAddress{} + yyv4755[yyj4755] = EndpointAddress{} } else { - yyv4783 := &yyv4781[yyj4781] - yyv4783.CodecDecodeSelf(d) + yyv4757 := &yyv4755[yyj4755] + yyv4757.CodecDecodeSelf(d) } } } } else { - yyj4781 := 0 - for ; !r.CheckBreak(); yyj4781++ { + yyj4755 := 0 + for ; !r.CheckBreak(); yyj4755++ { - if yyj4781 >= len(yyv4781) { - yyv4781 = append(yyv4781, EndpointAddress{}) // var yyz4781 EndpointAddress - yyc4781 = true + if yyj4755 >= len(yyv4755) { + yyv4755 = append(yyv4755, EndpointAddress{}) // var yyz4755 EndpointAddress + yyc4755 = true } - yyh4781.ElemContainerState(yyj4781) - if yyj4781 < len(yyv4781) { + yyh4755.ElemContainerState(yyj4755) + if yyj4755 < len(yyv4755) { if r.TryDecodeAsNil() { - yyv4781[yyj4781] = EndpointAddress{} + yyv4755[yyj4755] = EndpointAddress{} } else { - yyv4784 := &yyv4781[yyj4781] - yyv4784.CodecDecodeSelf(d) + yyv4758 := &yyv4755[yyj4755] + yyv4758.CodecDecodeSelf(d) } } else { @@ -60876,17 +60577,17 @@ func (x codecSelfer1234) decSliceEndpointAddress(v *[]EndpointAddress, d *codec1 } } - if yyj4781 < len(yyv4781) { - yyv4781 = yyv4781[:yyj4781] - yyc4781 = true - } else if yyj4781 == 0 && yyv4781 == nil { - yyv4781 = []EndpointAddress{} - yyc4781 = true + if yyj4755 < len(yyv4755) { + yyv4755 = yyv4755[:yyj4755] + yyc4755 = true + } else if yyj4755 == 0 && yyv4755 == nil { + yyv4755 = []EndpointAddress{} + yyc4755 = true } } - yyh4781.End() - if yyc4781 { - *v = yyv4781 + yyh4755.End() + if yyc4755 { + *v = yyv4755 } } @@ -60895,10 +60596,10 @@ func (x codecSelfer1234) encSliceEndpointPort(v []EndpointPort, e *codec1978.Enc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4785 := range v { + for _, yyv4759 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4786 := &yyv4785 - yy4786.CodecEncodeSelf(e) + yy4760 := &yyv4759 + yy4760.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -60908,83 +60609,83 @@ func (x codecSelfer1234) decSliceEndpointPort(v *[]EndpointPort, d *codec1978.De z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4787 := *v - yyh4787, yyl4787 := z.DecSliceHelperStart() - var yyc4787 bool - if yyl4787 == 0 { - if yyv4787 == nil { - yyv4787 = []EndpointPort{} - yyc4787 = true - } else if len(yyv4787) != 0 { - yyv4787 = yyv4787[:0] - yyc4787 = true + yyv4761 := *v + yyh4761, yyl4761 := z.DecSliceHelperStart() + var yyc4761 bool + if yyl4761 == 0 { + if yyv4761 == nil { + yyv4761 = []EndpointPort{} + yyc4761 = true + } else if len(yyv4761) != 0 { + yyv4761 = yyv4761[:0] + yyc4761 = true } - } else if yyl4787 > 0 { - var yyrr4787, yyrl4787 int - var yyrt4787 bool - if yyl4787 > cap(yyv4787) { + } else if yyl4761 > 0 { + var yyrr4761, yyrl4761 int + var yyrt4761 bool + if yyl4761 > cap(yyv4761) { - yyrg4787 := len(yyv4787) > 0 - yyv24787 := yyv4787 - yyrl4787, yyrt4787 = z.DecInferLen(yyl4787, z.DecBasicHandle().MaxInitLen, 40) - if yyrt4787 { - if yyrl4787 <= cap(yyv4787) { - yyv4787 = yyv4787[:yyrl4787] + yyrg4761 := len(yyv4761) > 0 + yyv24761 := yyv4761 + yyrl4761, yyrt4761 = z.DecInferLen(yyl4761, z.DecBasicHandle().MaxInitLen, 40) + if yyrt4761 { + if yyrl4761 <= cap(yyv4761) { + yyv4761 = yyv4761[:yyrl4761] } else { - yyv4787 = make([]EndpointPort, yyrl4787) + yyv4761 = make([]EndpointPort, yyrl4761) } } else { - yyv4787 = make([]EndpointPort, yyrl4787) + yyv4761 = make([]EndpointPort, yyrl4761) } - yyc4787 = true - yyrr4787 = len(yyv4787) - if yyrg4787 { - copy(yyv4787, yyv24787) + yyc4761 = true + yyrr4761 = len(yyv4761) + if yyrg4761 { + copy(yyv4761, yyv24761) } - } else if yyl4787 != len(yyv4787) { - yyv4787 = yyv4787[:yyl4787] - yyc4787 = true + } else if yyl4761 != len(yyv4761) { + yyv4761 = yyv4761[:yyl4761] + yyc4761 = true } - yyj4787 := 0 - for ; yyj4787 < yyrr4787; yyj4787++ { - yyh4787.ElemContainerState(yyj4787) + yyj4761 := 0 + for ; yyj4761 < yyrr4761; yyj4761++ { + yyh4761.ElemContainerState(yyj4761) if r.TryDecodeAsNil() { - yyv4787[yyj4787] = EndpointPort{} + yyv4761[yyj4761] = EndpointPort{} } else { - yyv4788 := &yyv4787[yyj4787] - yyv4788.CodecDecodeSelf(d) + yyv4762 := &yyv4761[yyj4761] + yyv4762.CodecDecodeSelf(d) } } - if yyrt4787 { - for ; yyj4787 < yyl4787; yyj4787++ { - yyv4787 = append(yyv4787, EndpointPort{}) - yyh4787.ElemContainerState(yyj4787) + if yyrt4761 { + for ; yyj4761 < yyl4761; yyj4761++ { + yyv4761 = append(yyv4761, EndpointPort{}) + yyh4761.ElemContainerState(yyj4761) if r.TryDecodeAsNil() { - yyv4787[yyj4787] = EndpointPort{} + yyv4761[yyj4761] = EndpointPort{} } else { - yyv4789 := &yyv4787[yyj4787] - yyv4789.CodecDecodeSelf(d) + yyv4763 := &yyv4761[yyj4761] + yyv4763.CodecDecodeSelf(d) } } } } else { - yyj4787 := 0 - for ; !r.CheckBreak(); yyj4787++ { + yyj4761 := 0 + for ; !r.CheckBreak(); yyj4761++ { - if yyj4787 >= len(yyv4787) { - yyv4787 = append(yyv4787, EndpointPort{}) // var yyz4787 EndpointPort - yyc4787 = true + if yyj4761 >= len(yyv4761) { + yyv4761 = append(yyv4761, EndpointPort{}) // var yyz4761 EndpointPort + yyc4761 = true } - yyh4787.ElemContainerState(yyj4787) - if yyj4787 < len(yyv4787) { + yyh4761.ElemContainerState(yyj4761) + if yyj4761 < len(yyv4761) { if r.TryDecodeAsNil() { - yyv4787[yyj4787] = EndpointPort{} + yyv4761[yyj4761] = EndpointPort{} } else { - yyv4790 := &yyv4787[yyj4787] - yyv4790.CodecDecodeSelf(d) + yyv4764 := &yyv4761[yyj4761] + yyv4764.CodecDecodeSelf(d) } } else { @@ -60992,17 +60693,17 @@ func (x codecSelfer1234) decSliceEndpointPort(v *[]EndpointPort, d *codec1978.De } } - if yyj4787 < len(yyv4787) { - yyv4787 = yyv4787[:yyj4787] - yyc4787 = true - } else if yyj4787 == 0 && yyv4787 == nil { - yyv4787 = []EndpointPort{} - yyc4787 = true + if yyj4761 < len(yyv4761) { + yyv4761 = yyv4761[:yyj4761] + yyc4761 = true + } else if yyj4761 == 0 && yyv4761 == nil { + yyv4761 = []EndpointPort{} + yyc4761 = true } } - yyh4787.End() - if yyc4787 { - *v = yyv4787 + yyh4761.End() + if yyc4761 { + *v = yyv4761 } } @@ -61011,10 +60712,10 @@ func (x codecSelfer1234) encSliceEndpoints(v []Endpoints, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4791 := range v { + for _, yyv4765 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4792 := &yyv4791 - yy4792.CodecEncodeSelf(e) + yy4766 := &yyv4765 + yy4766.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61024,83 +60725,83 @@ func (x codecSelfer1234) decSliceEndpoints(v *[]Endpoints, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4793 := *v - yyh4793, yyl4793 := z.DecSliceHelperStart() - var yyc4793 bool - if yyl4793 == 0 { - if yyv4793 == nil { - yyv4793 = []Endpoints{} - yyc4793 = true - } else if len(yyv4793) != 0 { - yyv4793 = yyv4793[:0] - yyc4793 = true + yyv4767 := *v + yyh4767, yyl4767 := z.DecSliceHelperStart() + var yyc4767 bool + if yyl4767 == 0 { + if yyv4767 == nil { + yyv4767 = []Endpoints{} + yyc4767 = true + } else if len(yyv4767) != 0 { + yyv4767 = yyv4767[:0] + yyc4767 = true } - } else if yyl4793 > 0 { - var yyrr4793, yyrl4793 int - var yyrt4793 bool - if yyl4793 > cap(yyv4793) { + } else if yyl4767 > 0 { + var yyrr4767, yyrl4767 int + var yyrt4767 bool + if yyl4767 > cap(yyv4767) { - yyrg4793 := len(yyv4793) > 0 - yyv24793 := yyv4793 - yyrl4793, yyrt4793 = z.DecInferLen(yyl4793, z.DecBasicHandle().MaxInitLen, 280) - if yyrt4793 { - if yyrl4793 <= cap(yyv4793) { - yyv4793 = yyv4793[:yyrl4793] + yyrg4767 := len(yyv4767) > 0 + yyv24767 := yyv4767 + yyrl4767, yyrt4767 = z.DecInferLen(yyl4767, z.DecBasicHandle().MaxInitLen, 280) + if yyrt4767 { + if yyrl4767 <= cap(yyv4767) { + yyv4767 = yyv4767[:yyrl4767] } else { - yyv4793 = make([]Endpoints, yyrl4793) + yyv4767 = make([]Endpoints, yyrl4767) } } else { - yyv4793 = make([]Endpoints, yyrl4793) + yyv4767 = make([]Endpoints, yyrl4767) } - yyc4793 = true - yyrr4793 = len(yyv4793) - if yyrg4793 { - copy(yyv4793, yyv24793) + yyc4767 = true + yyrr4767 = len(yyv4767) + if yyrg4767 { + copy(yyv4767, yyv24767) } - } else if yyl4793 != len(yyv4793) { - yyv4793 = yyv4793[:yyl4793] - yyc4793 = true + } else if yyl4767 != len(yyv4767) { + yyv4767 = yyv4767[:yyl4767] + yyc4767 = true } - yyj4793 := 0 - for ; yyj4793 < yyrr4793; yyj4793++ { - yyh4793.ElemContainerState(yyj4793) + yyj4767 := 0 + for ; yyj4767 < yyrr4767; yyj4767++ { + yyh4767.ElemContainerState(yyj4767) if r.TryDecodeAsNil() { - yyv4793[yyj4793] = Endpoints{} + yyv4767[yyj4767] = Endpoints{} } else { - yyv4794 := &yyv4793[yyj4793] - yyv4794.CodecDecodeSelf(d) + yyv4768 := &yyv4767[yyj4767] + yyv4768.CodecDecodeSelf(d) } } - if yyrt4793 { - for ; yyj4793 < yyl4793; yyj4793++ { - yyv4793 = append(yyv4793, Endpoints{}) - yyh4793.ElemContainerState(yyj4793) + if yyrt4767 { + for ; yyj4767 < yyl4767; yyj4767++ { + yyv4767 = append(yyv4767, Endpoints{}) + yyh4767.ElemContainerState(yyj4767) if r.TryDecodeAsNil() { - yyv4793[yyj4793] = Endpoints{} + yyv4767[yyj4767] = Endpoints{} } else { - yyv4795 := &yyv4793[yyj4793] - yyv4795.CodecDecodeSelf(d) + yyv4769 := &yyv4767[yyj4767] + yyv4769.CodecDecodeSelf(d) } } } } else { - yyj4793 := 0 - for ; !r.CheckBreak(); yyj4793++ { + yyj4767 := 0 + for ; !r.CheckBreak(); yyj4767++ { - if yyj4793 >= len(yyv4793) { - yyv4793 = append(yyv4793, Endpoints{}) // var yyz4793 Endpoints - yyc4793 = true + if yyj4767 >= len(yyv4767) { + yyv4767 = append(yyv4767, Endpoints{}) // var yyz4767 Endpoints + yyc4767 = true } - yyh4793.ElemContainerState(yyj4793) - if yyj4793 < len(yyv4793) { + yyh4767.ElemContainerState(yyj4767) + if yyj4767 < len(yyv4767) { if r.TryDecodeAsNil() { - yyv4793[yyj4793] = Endpoints{} + yyv4767[yyj4767] = Endpoints{} } else { - yyv4796 := &yyv4793[yyj4793] - yyv4796.CodecDecodeSelf(d) + yyv4770 := &yyv4767[yyj4767] + yyv4770.CodecDecodeSelf(d) } } else { @@ -61108,17 +60809,17 @@ func (x codecSelfer1234) decSliceEndpoints(v *[]Endpoints, d *codec1978.Decoder) } } - if yyj4793 < len(yyv4793) { - yyv4793 = yyv4793[:yyj4793] - yyc4793 = true - } else if yyj4793 == 0 && yyv4793 == nil { - yyv4793 = []Endpoints{} - yyc4793 = true + if yyj4767 < len(yyv4767) { + yyv4767 = yyv4767[:yyj4767] + yyc4767 = true + } else if yyj4767 == 0 && yyv4767 == nil { + yyv4767 = []Endpoints{} + yyc4767 = true } } - yyh4793.End() - if yyc4793 { - *v = yyv4793 + yyh4767.End() + if yyc4767 { + *v = yyv4767 } } @@ -61127,10 +60828,10 @@ func (x codecSelfer1234) encSliceNodeCondition(v []NodeCondition, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4797 := range v { + for _, yyv4771 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4798 := &yyv4797 - yy4798.CodecEncodeSelf(e) + yy4772 := &yyv4771 + yy4772.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61140,83 +60841,83 @@ func (x codecSelfer1234) decSliceNodeCondition(v *[]NodeCondition, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4799 := *v - yyh4799, yyl4799 := z.DecSliceHelperStart() - var yyc4799 bool - if yyl4799 == 0 { - if yyv4799 == nil { - yyv4799 = []NodeCondition{} - yyc4799 = true - } else if len(yyv4799) != 0 { - yyv4799 = yyv4799[:0] - yyc4799 = true + yyv4773 := *v + yyh4773, yyl4773 := z.DecSliceHelperStart() + var yyc4773 bool + if yyl4773 == 0 { + if yyv4773 == nil { + yyv4773 = []NodeCondition{} + yyc4773 = true + } else if len(yyv4773) != 0 { + yyv4773 = yyv4773[:0] + yyc4773 = true } - } else if yyl4799 > 0 { - var yyrr4799, yyrl4799 int - var yyrt4799 bool - if yyl4799 > cap(yyv4799) { + } else if yyl4773 > 0 { + var yyrr4773, yyrl4773 int + var yyrt4773 bool + if yyl4773 > cap(yyv4773) { - yyrg4799 := len(yyv4799) > 0 - yyv24799 := yyv4799 - yyrl4799, yyrt4799 = z.DecInferLen(yyl4799, z.DecBasicHandle().MaxInitLen, 112) - if yyrt4799 { - if yyrl4799 <= cap(yyv4799) { - yyv4799 = yyv4799[:yyrl4799] + yyrg4773 := len(yyv4773) > 0 + yyv24773 := yyv4773 + yyrl4773, yyrt4773 = z.DecInferLen(yyl4773, z.DecBasicHandle().MaxInitLen, 112) + if yyrt4773 { + if yyrl4773 <= cap(yyv4773) { + yyv4773 = yyv4773[:yyrl4773] } else { - yyv4799 = make([]NodeCondition, yyrl4799) + yyv4773 = make([]NodeCondition, yyrl4773) } } else { - yyv4799 = make([]NodeCondition, yyrl4799) + yyv4773 = make([]NodeCondition, yyrl4773) } - yyc4799 = true - yyrr4799 = len(yyv4799) - if yyrg4799 { - copy(yyv4799, yyv24799) + yyc4773 = true + yyrr4773 = len(yyv4773) + if yyrg4773 { + copy(yyv4773, yyv24773) } - } else if yyl4799 != len(yyv4799) { - yyv4799 = yyv4799[:yyl4799] - yyc4799 = true + } else if yyl4773 != len(yyv4773) { + yyv4773 = yyv4773[:yyl4773] + yyc4773 = true } - yyj4799 := 0 - for ; yyj4799 < yyrr4799; yyj4799++ { - yyh4799.ElemContainerState(yyj4799) + yyj4773 := 0 + for ; yyj4773 < yyrr4773; yyj4773++ { + yyh4773.ElemContainerState(yyj4773) if r.TryDecodeAsNil() { - yyv4799[yyj4799] = NodeCondition{} + yyv4773[yyj4773] = NodeCondition{} } else { - yyv4800 := &yyv4799[yyj4799] - yyv4800.CodecDecodeSelf(d) + yyv4774 := &yyv4773[yyj4773] + yyv4774.CodecDecodeSelf(d) } } - if yyrt4799 { - for ; yyj4799 < yyl4799; yyj4799++ { - yyv4799 = append(yyv4799, NodeCondition{}) - yyh4799.ElemContainerState(yyj4799) + if yyrt4773 { + for ; yyj4773 < yyl4773; yyj4773++ { + yyv4773 = append(yyv4773, NodeCondition{}) + yyh4773.ElemContainerState(yyj4773) if r.TryDecodeAsNil() { - yyv4799[yyj4799] = NodeCondition{} + yyv4773[yyj4773] = NodeCondition{} } else { - yyv4801 := &yyv4799[yyj4799] - yyv4801.CodecDecodeSelf(d) + yyv4775 := &yyv4773[yyj4773] + yyv4775.CodecDecodeSelf(d) } } } } else { - yyj4799 := 0 - for ; !r.CheckBreak(); yyj4799++ { + yyj4773 := 0 + for ; !r.CheckBreak(); yyj4773++ { - if yyj4799 >= len(yyv4799) { - yyv4799 = append(yyv4799, NodeCondition{}) // var yyz4799 NodeCondition - yyc4799 = true + if yyj4773 >= len(yyv4773) { + yyv4773 = append(yyv4773, NodeCondition{}) // var yyz4773 NodeCondition + yyc4773 = true } - yyh4799.ElemContainerState(yyj4799) - if yyj4799 < len(yyv4799) { + yyh4773.ElemContainerState(yyj4773) + if yyj4773 < len(yyv4773) { if r.TryDecodeAsNil() { - yyv4799[yyj4799] = NodeCondition{} + yyv4773[yyj4773] = NodeCondition{} } else { - yyv4802 := &yyv4799[yyj4799] - yyv4802.CodecDecodeSelf(d) + yyv4776 := &yyv4773[yyj4773] + yyv4776.CodecDecodeSelf(d) } } else { @@ -61224,17 +60925,17 @@ func (x codecSelfer1234) decSliceNodeCondition(v *[]NodeCondition, d *codec1978. } } - if yyj4799 < len(yyv4799) { - yyv4799 = yyv4799[:yyj4799] - yyc4799 = true - } else if yyj4799 == 0 && yyv4799 == nil { - yyv4799 = []NodeCondition{} - yyc4799 = true + if yyj4773 < len(yyv4773) { + yyv4773 = yyv4773[:yyj4773] + yyc4773 = true + } else if yyj4773 == 0 && yyv4773 == nil { + yyv4773 = []NodeCondition{} + yyc4773 = true } } - yyh4799.End() - if yyc4799 { - *v = yyv4799 + yyh4773.End() + if yyc4773 { + *v = yyv4773 } } @@ -61243,10 +60944,10 @@ func (x codecSelfer1234) encSliceNodeAddress(v []NodeAddress, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4803 := range v { + for _, yyv4777 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4804 := &yyv4803 - yy4804.CodecEncodeSelf(e) + yy4778 := &yyv4777 + yy4778.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61256,83 +60957,83 @@ func (x codecSelfer1234) decSliceNodeAddress(v *[]NodeAddress, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4805 := *v - yyh4805, yyl4805 := z.DecSliceHelperStart() - var yyc4805 bool - if yyl4805 == 0 { - if yyv4805 == nil { - yyv4805 = []NodeAddress{} - yyc4805 = true - } else if len(yyv4805) != 0 { - yyv4805 = yyv4805[:0] - yyc4805 = true + yyv4779 := *v + yyh4779, yyl4779 := z.DecSliceHelperStart() + var yyc4779 bool + if yyl4779 == 0 { + if yyv4779 == nil { + yyv4779 = []NodeAddress{} + yyc4779 = true + } else if len(yyv4779) != 0 { + yyv4779 = yyv4779[:0] + yyc4779 = true } - } else if yyl4805 > 0 { - var yyrr4805, yyrl4805 int - var yyrt4805 bool - if yyl4805 > cap(yyv4805) { + } else if yyl4779 > 0 { + var yyrr4779, yyrl4779 int + var yyrt4779 bool + if yyl4779 > cap(yyv4779) { - yyrg4805 := len(yyv4805) > 0 - yyv24805 := yyv4805 - yyrl4805, yyrt4805 = z.DecInferLen(yyl4805, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4805 { - if yyrl4805 <= cap(yyv4805) { - yyv4805 = yyv4805[:yyrl4805] + yyrg4779 := len(yyv4779) > 0 + yyv24779 := yyv4779 + yyrl4779, yyrt4779 = z.DecInferLen(yyl4779, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4779 { + if yyrl4779 <= cap(yyv4779) { + yyv4779 = yyv4779[:yyrl4779] } else { - yyv4805 = make([]NodeAddress, yyrl4805) + yyv4779 = make([]NodeAddress, yyrl4779) } } else { - yyv4805 = make([]NodeAddress, yyrl4805) + yyv4779 = make([]NodeAddress, yyrl4779) } - yyc4805 = true - yyrr4805 = len(yyv4805) - if yyrg4805 { - copy(yyv4805, yyv24805) + yyc4779 = true + yyrr4779 = len(yyv4779) + if yyrg4779 { + copy(yyv4779, yyv24779) } - } else if yyl4805 != len(yyv4805) { - yyv4805 = yyv4805[:yyl4805] - yyc4805 = true + } else if yyl4779 != len(yyv4779) { + yyv4779 = yyv4779[:yyl4779] + yyc4779 = true } - yyj4805 := 0 - for ; yyj4805 < yyrr4805; yyj4805++ { - yyh4805.ElemContainerState(yyj4805) + yyj4779 := 0 + for ; yyj4779 < yyrr4779; yyj4779++ { + yyh4779.ElemContainerState(yyj4779) if r.TryDecodeAsNil() { - yyv4805[yyj4805] = NodeAddress{} + yyv4779[yyj4779] = NodeAddress{} } else { - yyv4806 := &yyv4805[yyj4805] - yyv4806.CodecDecodeSelf(d) + yyv4780 := &yyv4779[yyj4779] + yyv4780.CodecDecodeSelf(d) } } - if yyrt4805 { - for ; yyj4805 < yyl4805; yyj4805++ { - yyv4805 = append(yyv4805, NodeAddress{}) - yyh4805.ElemContainerState(yyj4805) + if yyrt4779 { + for ; yyj4779 < yyl4779; yyj4779++ { + yyv4779 = append(yyv4779, NodeAddress{}) + yyh4779.ElemContainerState(yyj4779) if r.TryDecodeAsNil() { - yyv4805[yyj4805] = NodeAddress{} + yyv4779[yyj4779] = NodeAddress{} } else { - yyv4807 := &yyv4805[yyj4805] - yyv4807.CodecDecodeSelf(d) + yyv4781 := &yyv4779[yyj4779] + yyv4781.CodecDecodeSelf(d) } } } } else { - yyj4805 := 0 - for ; !r.CheckBreak(); yyj4805++ { + yyj4779 := 0 + for ; !r.CheckBreak(); yyj4779++ { - if yyj4805 >= len(yyv4805) { - yyv4805 = append(yyv4805, NodeAddress{}) // var yyz4805 NodeAddress - yyc4805 = true + if yyj4779 >= len(yyv4779) { + yyv4779 = append(yyv4779, NodeAddress{}) // var yyz4779 NodeAddress + yyc4779 = true } - yyh4805.ElemContainerState(yyj4805) - if yyj4805 < len(yyv4805) { + yyh4779.ElemContainerState(yyj4779) + if yyj4779 < len(yyv4779) { if r.TryDecodeAsNil() { - yyv4805[yyj4805] = NodeAddress{} + yyv4779[yyj4779] = NodeAddress{} } else { - yyv4808 := &yyv4805[yyj4805] - yyv4808.CodecDecodeSelf(d) + yyv4782 := &yyv4779[yyj4779] + yyv4782.CodecDecodeSelf(d) } } else { @@ -61340,17 +61041,17 @@ func (x codecSelfer1234) decSliceNodeAddress(v *[]NodeAddress, d *codec1978.Deco } } - if yyj4805 < len(yyv4805) { - yyv4805 = yyv4805[:yyj4805] - yyc4805 = true - } else if yyj4805 == 0 && yyv4805 == nil { - yyv4805 = []NodeAddress{} - yyc4805 = true + if yyj4779 < len(yyv4779) { + yyv4779 = yyv4779[:yyj4779] + yyc4779 = true + } else if yyj4779 == 0 && yyv4779 == nil { + yyv4779 = []NodeAddress{} + yyc4779 = true } } - yyh4805.End() - if yyc4805 { - *v = yyv4805 + yyh4779.End() + if yyc4779 { + *v = yyv4779 } } @@ -61359,10 +61060,10 @@ func (x codecSelfer1234) encSliceContainerImage(v []ContainerImage, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4809 := range v { + for _, yyv4783 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4810 := &yyv4809 - yy4810.CodecEncodeSelf(e) + yy4784 := &yyv4783 + yy4784.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61372,83 +61073,83 @@ func (x codecSelfer1234) decSliceContainerImage(v *[]ContainerImage, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4811 := *v - yyh4811, yyl4811 := z.DecSliceHelperStart() - var yyc4811 bool - if yyl4811 == 0 { - if yyv4811 == nil { - yyv4811 = []ContainerImage{} - yyc4811 = true - } else if len(yyv4811) != 0 { - yyv4811 = yyv4811[:0] - yyc4811 = true + yyv4785 := *v + yyh4785, yyl4785 := z.DecSliceHelperStart() + var yyc4785 bool + if yyl4785 == 0 { + if yyv4785 == nil { + yyv4785 = []ContainerImage{} + yyc4785 = true + } else if len(yyv4785) != 0 { + yyv4785 = yyv4785[:0] + yyc4785 = true } - } else if yyl4811 > 0 { - var yyrr4811, yyrl4811 int - var yyrt4811 bool - if yyl4811 > cap(yyv4811) { + } else if yyl4785 > 0 { + var yyrr4785, yyrl4785 int + var yyrt4785 bool + if yyl4785 > cap(yyv4785) { - yyrg4811 := len(yyv4811) > 0 - yyv24811 := yyv4811 - yyrl4811, yyrt4811 = z.DecInferLen(yyl4811, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4811 { - if yyrl4811 <= cap(yyv4811) { - yyv4811 = yyv4811[:yyrl4811] + yyrg4785 := len(yyv4785) > 0 + yyv24785 := yyv4785 + yyrl4785, yyrt4785 = z.DecInferLen(yyl4785, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4785 { + if yyrl4785 <= cap(yyv4785) { + yyv4785 = yyv4785[:yyrl4785] } else { - yyv4811 = make([]ContainerImage, yyrl4811) + yyv4785 = make([]ContainerImage, yyrl4785) } } else { - yyv4811 = make([]ContainerImage, yyrl4811) + yyv4785 = make([]ContainerImage, yyrl4785) } - yyc4811 = true - yyrr4811 = len(yyv4811) - if yyrg4811 { - copy(yyv4811, yyv24811) + yyc4785 = true + yyrr4785 = len(yyv4785) + if yyrg4785 { + copy(yyv4785, yyv24785) } - } else if yyl4811 != len(yyv4811) { - yyv4811 = yyv4811[:yyl4811] - yyc4811 = true + } else if yyl4785 != len(yyv4785) { + yyv4785 = yyv4785[:yyl4785] + yyc4785 = true } - yyj4811 := 0 - for ; yyj4811 < yyrr4811; yyj4811++ { - yyh4811.ElemContainerState(yyj4811) + yyj4785 := 0 + for ; yyj4785 < yyrr4785; yyj4785++ { + yyh4785.ElemContainerState(yyj4785) if r.TryDecodeAsNil() { - yyv4811[yyj4811] = ContainerImage{} + yyv4785[yyj4785] = ContainerImage{} } else { - yyv4812 := &yyv4811[yyj4811] - yyv4812.CodecDecodeSelf(d) + yyv4786 := &yyv4785[yyj4785] + yyv4786.CodecDecodeSelf(d) } } - if yyrt4811 { - for ; yyj4811 < yyl4811; yyj4811++ { - yyv4811 = append(yyv4811, ContainerImage{}) - yyh4811.ElemContainerState(yyj4811) + if yyrt4785 { + for ; yyj4785 < yyl4785; yyj4785++ { + yyv4785 = append(yyv4785, ContainerImage{}) + yyh4785.ElemContainerState(yyj4785) if r.TryDecodeAsNil() { - yyv4811[yyj4811] = ContainerImage{} + yyv4785[yyj4785] = ContainerImage{} } else { - yyv4813 := &yyv4811[yyj4811] - yyv4813.CodecDecodeSelf(d) + yyv4787 := &yyv4785[yyj4785] + yyv4787.CodecDecodeSelf(d) } } } } else { - yyj4811 := 0 - for ; !r.CheckBreak(); yyj4811++ { + yyj4785 := 0 + for ; !r.CheckBreak(); yyj4785++ { - if yyj4811 >= len(yyv4811) { - yyv4811 = append(yyv4811, ContainerImage{}) // var yyz4811 ContainerImage - yyc4811 = true + if yyj4785 >= len(yyv4785) { + yyv4785 = append(yyv4785, ContainerImage{}) // var yyz4785 ContainerImage + yyc4785 = true } - yyh4811.ElemContainerState(yyj4811) - if yyj4811 < len(yyv4811) { + yyh4785.ElemContainerState(yyj4785) + if yyj4785 < len(yyv4785) { if r.TryDecodeAsNil() { - yyv4811[yyj4811] = ContainerImage{} + yyv4785[yyj4785] = ContainerImage{} } else { - yyv4814 := &yyv4811[yyj4811] - yyv4814.CodecDecodeSelf(d) + yyv4788 := &yyv4785[yyj4785] + yyv4788.CodecDecodeSelf(d) } } else { @@ -61456,17 +61157,17 @@ func (x codecSelfer1234) decSliceContainerImage(v *[]ContainerImage, d *codec197 } } - if yyj4811 < len(yyv4811) { - yyv4811 = yyv4811[:yyj4811] - yyc4811 = true - } else if yyj4811 == 0 && yyv4811 == nil { - yyv4811 = []ContainerImage{} - yyc4811 = true + if yyj4785 < len(yyv4785) { + yyv4785 = yyv4785[:yyj4785] + yyc4785 = true + } else if yyj4785 == 0 && yyv4785 == nil { + yyv4785 = []ContainerImage{} + yyc4785 = true } } - yyh4811.End() - if yyc4811 { - *v = yyv4811 + yyh4785.End() + if yyc4785 { + *v = yyv4785 } } @@ -61475,9 +61176,9 @@ func (x codecSelfer1234) encSliceUniqueVolumeName(v []UniqueVolumeName, e *codec z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4815 := range v { + for _, yyv4789 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4815.CodecEncodeSelf(e) + yyv4789.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61487,75 +61188,75 @@ func (x codecSelfer1234) decSliceUniqueVolumeName(v *[]UniqueVolumeName, d *code z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4816 := *v - yyh4816, yyl4816 := z.DecSliceHelperStart() - var yyc4816 bool - if yyl4816 == 0 { - if yyv4816 == nil { - yyv4816 = []UniqueVolumeName{} - yyc4816 = true - } else if len(yyv4816) != 0 { - yyv4816 = yyv4816[:0] - yyc4816 = true + yyv4790 := *v + yyh4790, yyl4790 := z.DecSliceHelperStart() + var yyc4790 bool + if yyl4790 == 0 { + if yyv4790 == nil { + yyv4790 = []UniqueVolumeName{} + yyc4790 = true + } else if len(yyv4790) != 0 { + yyv4790 = yyv4790[:0] + yyc4790 = true } - } else if yyl4816 > 0 { - var yyrr4816, yyrl4816 int - var yyrt4816 bool - if yyl4816 > cap(yyv4816) { + } else if yyl4790 > 0 { + var yyrr4790, yyrl4790 int + var yyrt4790 bool + if yyl4790 > cap(yyv4790) { - yyrl4816, yyrt4816 = z.DecInferLen(yyl4816, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4816 { - if yyrl4816 <= cap(yyv4816) { - yyv4816 = yyv4816[:yyrl4816] + yyrl4790, yyrt4790 = z.DecInferLen(yyl4790, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4790 { + if yyrl4790 <= cap(yyv4790) { + yyv4790 = yyv4790[:yyrl4790] } else { - yyv4816 = make([]UniqueVolumeName, yyrl4816) + yyv4790 = make([]UniqueVolumeName, yyrl4790) } } else { - yyv4816 = make([]UniqueVolumeName, yyrl4816) + yyv4790 = make([]UniqueVolumeName, yyrl4790) } - yyc4816 = true - yyrr4816 = len(yyv4816) - } else if yyl4816 != len(yyv4816) { - yyv4816 = yyv4816[:yyl4816] - yyc4816 = true + yyc4790 = true + yyrr4790 = len(yyv4790) + } else if yyl4790 != len(yyv4790) { + yyv4790 = yyv4790[:yyl4790] + yyc4790 = true } - yyj4816 := 0 - for ; yyj4816 < yyrr4816; yyj4816++ { - yyh4816.ElemContainerState(yyj4816) + yyj4790 := 0 + for ; yyj4790 < yyrr4790; yyj4790++ { + yyh4790.ElemContainerState(yyj4790) if r.TryDecodeAsNil() { - yyv4816[yyj4816] = "" + yyv4790[yyj4790] = "" } else { - yyv4816[yyj4816] = UniqueVolumeName(r.DecodeString()) + yyv4790[yyj4790] = UniqueVolumeName(r.DecodeString()) } } - if yyrt4816 { - for ; yyj4816 < yyl4816; yyj4816++ { - yyv4816 = append(yyv4816, "") - yyh4816.ElemContainerState(yyj4816) + if yyrt4790 { + for ; yyj4790 < yyl4790; yyj4790++ { + yyv4790 = append(yyv4790, "") + yyh4790.ElemContainerState(yyj4790) if r.TryDecodeAsNil() { - yyv4816[yyj4816] = "" + yyv4790[yyj4790] = "" } else { - yyv4816[yyj4816] = UniqueVolumeName(r.DecodeString()) + yyv4790[yyj4790] = UniqueVolumeName(r.DecodeString()) } } } } else { - yyj4816 := 0 - for ; !r.CheckBreak(); yyj4816++ { + yyj4790 := 0 + for ; !r.CheckBreak(); yyj4790++ { - if yyj4816 >= len(yyv4816) { - yyv4816 = append(yyv4816, "") // var yyz4816 UniqueVolumeName - yyc4816 = true + if yyj4790 >= len(yyv4790) { + yyv4790 = append(yyv4790, "") // var yyz4790 UniqueVolumeName + yyc4790 = true } - yyh4816.ElemContainerState(yyj4816) - if yyj4816 < len(yyv4816) { + yyh4790.ElemContainerState(yyj4790) + if yyj4790 < len(yyv4790) { if r.TryDecodeAsNil() { - yyv4816[yyj4816] = "" + yyv4790[yyj4790] = "" } else { - yyv4816[yyj4816] = UniqueVolumeName(r.DecodeString()) + yyv4790[yyj4790] = UniqueVolumeName(r.DecodeString()) } } else { @@ -61563,17 +61264,17 @@ func (x codecSelfer1234) decSliceUniqueVolumeName(v *[]UniqueVolumeName, d *code } } - if yyj4816 < len(yyv4816) { - yyv4816 = yyv4816[:yyj4816] - yyc4816 = true - } else if yyj4816 == 0 && yyv4816 == nil { - yyv4816 = []UniqueVolumeName{} - yyc4816 = true + if yyj4790 < len(yyv4790) { + yyv4790 = yyv4790[:yyj4790] + yyc4790 = true + } else if yyj4790 == 0 && yyv4790 == nil { + yyv4790 = []UniqueVolumeName{} + yyc4790 = true } } - yyh4816.End() - if yyc4816 { - *v = yyv4816 + yyh4790.End() + if yyc4790 { + *v = yyv4790 } } @@ -61582,10 +61283,10 @@ func (x codecSelfer1234) encSliceAttachedVolume(v []AttachedVolume, e *codec1978 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4820 := range v { + for _, yyv4794 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4821 := &yyv4820 - yy4821.CodecEncodeSelf(e) + yy4795 := &yyv4794 + yy4795.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61595,83 +61296,83 @@ func (x codecSelfer1234) decSliceAttachedVolume(v *[]AttachedVolume, d *codec197 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4822 := *v - yyh4822, yyl4822 := z.DecSliceHelperStart() - var yyc4822 bool - if yyl4822 == 0 { - if yyv4822 == nil { - yyv4822 = []AttachedVolume{} - yyc4822 = true - } else if len(yyv4822) != 0 { - yyv4822 = yyv4822[:0] - yyc4822 = true + yyv4796 := *v + yyh4796, yyl4796 := z.DecSliceHelperStart() + var yyc4796 bool + if yyl4796 == 0 { + if yyv4796 == nil { + yyv4796 = []AttachedVolume{} + yyc4796 = true + } else if len(yyv4796) != 0 { + yyv4796 = yyv4796[:0] + yyc4796 = true } - } else if yyl4822 > 0 { - var yyrr4822, yyrl4822 int - var yyrt4822 bool - if yyl4822 > cap(yyv4822) { + } else if yyl4796 > 0 { + var yyrr4796, yyrl4796 int + var yyrt4796 bool + if yyl4796 > cap(yyv4796) { - yyrg4822 := len(yyv4822) > 0 - yyv24822 := yyv4822 - yyrl4822, yyrt4822 = z.DecInferLen(yyl4822, z.DecBasicHandle().MaxInitLen, 32) - if yyrt4822 { - if yyrl4822 <= cap(yyv4822) { - yyv4822 = yyv4822[:yyrl4822] + yyrg4796 := len(yyv4796) > 0 + yyv24796 := yyv4796 + yyrl4796, yyrt4796 = z.DecInferLen(yyl4796, z.DecBasicHandle().MaxInitLen, 32) + if yyrt4796 { + if yyrl4796 <= cap(yyv4796) { + yyv4796 = yyv4796[:yyrl4796] } else { - yyv4822 = make([]AttachedVolume, yyrl4822) + yyv4796 = make([]AttachedVolume, yyrl4796) } } else { - yyv4822 = make([]AttachedVolume, yyrl4822) + yyv4796 = make([]AttachedVolume, yyrl4796) } - yyc4822 = true - yyrr4822 = len(yyv4822) - if yyrg4822 { - copy(yyv4822, yyv24822) + yyc4796 = true + yyrr4796 = len(yyv4796) + if yyrg4796 { + copy(yyv4796, yyv24796) } - } else if yyl4822 != len(yyv4822) { - yyv4822 = yyv4822[:yyl4822] - yyc4822 = true + } else if yyl4796 != len(yyv4796) { + yyv4796 = yyv4796[:yyl4796] + yyc4796 = true } - yyj4822 := 0 - for ; yyj4822 < yyrr4822; yyj4822++ { - yyh4822.ElemContainerState(yyj4822) + yyj4796 := 0 + for ; yyj4796 < yyrr4796; yyj4796++ { + yyh4796.ElemContainerState(yyj4796) if r.TryDecodeAsNil() { - yyv4822[yyj4822] = AttachedVolume{} + yyv4796[yyj4796] = AttachedVolume{} } else { - yyv4823 := &yyv4822[yyj4822] - yyv4823.CodecDecodeSelf(d) + yyv4797 := &yyv4796[yyj4796] + yyv4797.CodecDecodeSelf(d) } } - if yyrt4822 { - for ; yyj4822 < yyl4822; yyj4822++ { - yyv4822 = append(yyv4822, AttachedVolume{}) - yyh4822.ElemContainerState(yyj4822) + if yyrt4796 { + for ; yyj4796 < yyl4796; yyj4796++ { + yyv4796 = append(yyv4796, AttachedVolume{}) + yyh4796.ElemContainerState(yyj4796) if r.TryDecodeAsNil() { - yyv4822[yyj4822] = AttachedVolume{} + yyv4796[yyj4796] = AttachedVolume{} } else { - yyv4824 := &yyv4822[yyj4822] - yyv4824.CodecDecodeSelf(d) + yyv4798 := &yyv4796[yyj4796] + yyv4798.CodecDecodeSelf(d) } } } } else { - yyj4822 := 0 - for ; !r.CheckBreak(); yyj4822++ { + yyj4796 := 0 + for ; !r.CheckBreak(); yyj4796++ { - if yyj4822 >= len(yyv4822) { - yyv4822 = append(yyv4822, AttachedVolume{}) // var yyz4822 AttachedVolume - yyc4822 = true + if yyj4796 >= len(yyv4796) { + yyv4796 = append(yyv4796, AttachedVolume{}) // var yyz4796 AttachedVolume + yyc4796 = true } - yyh4822.ElemContainerState(yyj4822) - if yyj4822 < len(yyv4822) { + yyh4796.ElemContainerState(yyj4796) + if yyj4796 < len(yyv4796) { if r.TryDecodeAsNil() { - yyv4822[yyj4822] = AttachedVolume{} + yyv4796[yyj4796] = AttachedVolume{} } else { - yyv4825 := &yyv4822[yyj4822] - yyv4825.CodecDecodeSelf(d) + yyv4799 := &yyv4796[yyj4796] + yyv4799.CodecDecodeSelf(d) } } else { @@ -61679,17 +61380,17 @@ func (x codecSelfer1234) decSliceAttachedVolume(v *[]AttachedVolume, d *codec197 } } - if yyj4822 < len(yyv4822) { - yyv4822 = yyv4822[:yyj4822] - yyc4822 = true - } else if yyj4822 == 0 && yyv4822 == nil { - yyv4822 = []AttachedVolume{} - yyc4822 = true + if yyj4796 < len(yyv4796) { + yyv4796 = yyv4796[:yyj4796] + yyc4796 = true + } else if yyj4796 == 0 && yyv4796 == nil { + yyv4796 = []AttachedVolume{} + yyc4796 = true } } - yyh4822.End() - if yyc4822 { - *v = yyv4822 + yyh4796.End() + if yyc4796 { + *v = yyv4796 } } @@ -61698,10 +61399,10 @@ func (x codecSelfer1234) encSlicePreferAvoidPodsEntry(v []PreferAvoidPodsEntry, z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4826 := range v { + for _, yyv4800 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4827 := &yyv4826 - yy4827.CodecEncodeSelf(e) + yy4801 := &yyv4800 + yy4801.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61711,83 +61412,83 @@ func (x codecSelfer1234) decSlicePreferAvoidPodsEntry(v *[]PreferAvoidPodsEntry, z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4828 := *v - yyh4828, yyl4828 := z.DecSliceHelperStart() - var yyc4828 bool - if yyl4828 == 0 { - if yyv4828 == nil { - yyv4828 = []PreferAvoidPodsEntry{} - yyc4828 = true - } else if len(yyv4828) != 0 { - yyv4828 = yyv4828[:0] - yyc4828 = true + yyv4802 := *v + yyh4802, yyl4802 := z.DecSliceHelperStart() + var yyc4802 bool + if yyl4802 == 0 { + if yyv4802 == nil { + yyv4802 = []PreferAvoidPodsEntry{} + yyc4802 = true + } else if len(yyv4802) != 0 { + yyv4802 = yyv4802[:0] + yyc4802 = true } - } else if yyl4828 > 0 { - var yyrr4828, yyrl4828 int - var yyrt4828 bool - if yyl4828 > cap(yyv4828) { + } else if yyl4802 > 0 { + var yyrr4802, yyrl4802 int + var yyrt4802 bool + if yyl4802 > cap(yyv4802) { - yyrg4828 := len(yyv4828) > 0 - yyv24828 := yyv4828 - yyrl4828, yyrt4828 = z.DecInferLen(yyl4828, z.DecBasicHandle().MaxInitLen, 64) - if yyrt4828 { - if yyrl4828 <= cap(yyv4828) { - yyv4828 = yyv4828[:yyrl4828] + yyrg4802 := len(yyv4802) > 0 + yyv24802 := yyv4802 + yyrl4802, yyrt4802 = z.DecInferLen(yyl4802, z.DecBasicHandle().MaxInitLen, 64) + if yyrt4802 { + if yyrl4802 <= cap(yyv4802) { + yyv4802 = yyv4802[:yyrl4802] } else { - yyv4828 = make([]PreferAvoidPodsEntry, yyrl4828) + yyv4802 = make([]PreferAvoidPodsEntry, yyrl4802) } } else { - yyv4828 = make([]PreferAvoidPodsEntry, yyrl4828) + yyv4802 = make([]PreferAvoidPodsEntry, yyrl4802) } - yyc4828 = true - yyrr4828 = len(yyv4828) - if yyrg4828 { - copy(yyv4828, yyv24828) + yyc4802 = true + yyrr4802 = len(yyv4802) + if yyrg4802 { + copy(yyv4802, yyv24802) } - } else if yyl4828 != len(yyv4828) { - yyv4828 = yyv4828[:yyl4828] - yyc4828 = true + } else if yyl4802 != len(yyv4802) { + yyv4802 = yyv4802[:yyl4802] + yyc4802 = true } - yyj4828 := 0 - for ; yyj4828 < yyrr4828; yyj4828++ { - yyh4828.ElemContainerState(yyj4828) + yyj4802 := 0 + for ; yyj4802 < yyrr4802; yyj4802++ { + yyh4802.ElemContainerState(yyj4802) if r.TryDecodeAsNil() { - yyv4828[yyj4828] = PreferAvoidPodsEntry{} + yyv4802[yyj4802] = PreferAvoidPodsEntry{} } else { - yyv4829 := &yyv4828[yyj4828] - yyv4829.CodecDecodeSelf(d) + yyv4803 := &yyv4802[yyj4802] + yyv4803.CodecDecodeSelf(d) } } - if yyrt4828 { - for ; yyj4828 < yyl4828; yyj4828++ { - yyv4828 = append(yyv4828, PreferAvoidPodsEntry{}) - yyh4828.ElemContainerState(yyj4828) + if yyrt4802 { + for ; yyj4802 < yyl4802; yyj4802++ { + yyv4802 = append(yyv4802, PreferAvoidPodsEntry{}) + yyh4802.ElemContainerState(yyj4802) if r.TryDecodeAsNil() { - yyv4828[yyj4828] = PreferAvoidPodsEntry{} + yyv4802[yyj4802] = PreferAvoidPodsEntry{} } else { - yyv4830 := &yyv4828[yyj4828] - yyv4830.CodecDecodeSelf(d) + yyv4804 := &yyv4802[yyj4802] + yyv4804.CodecDecodeSelf(d) } } } } else { - yyj4828 := 0 - for ; !r.CheckBreak(); yyj4828++ { + yyj4802 := 0 + for ; !r.CheckBreak(); yyj4802++ { - if yyj4828 >= len(yyv4828) { - yyv4828 = append(yyv4828, PreferAvoidPodsEntry{}) // var yyz4828 PreferAvoidPodsEntry - yyc4828 = true + if yyj4802 >= len(yyv4802) { + yyv4802 = append(yyv4802, PreferAvoidPodsEntry{}) // var yyz4802 PreferAvoidPodsEntry + yyc4802 = true } - yyh4828.ElemContainerState(yyj4828) - if yyj4828 < len(yyv4828) { + yyh4802.ElemContainerState(yyj4802) + if yyj4802 < len(yyv4802) { if r.TryDecodeAsNil() { - yyv4828[yyj4828] = PreferAvoidPodsEntry{} + yyv4802[yyj4802] = PreferAvoidPodsEntry{} } else { - yyv4831 := &yyv4828[yyj4828] - yyv4831.CodecDecodeSelf(d) + yyv4805 := &yyv4802[yyj4802] + yyv4805.CodecDecodeSelf(d) } } else { @@ -61795,17 +61496,17 @@ func (x codecSelfer1234) decSlicePreferAvoidPodsEntry(v *[]PreferAvoidPodsEntry, } } - if yyj4828 < len(yyv4828) { - yyv4828 = yyv4828[:yyj4828] - yyc4828 = true - } else if yyj4828 == 0 && yyv4828 == nil { - yyv4828 = []PreferAvoidPodsEntry{} - yyc4828 = true + if yyj4802 < len(yyv4802) { + yyv4802 = yyv4802[:yyj4802] + yyc4802 = true + } else if yyj4802 == 0 && yyv4802 == nil { + yyv4802 = []PreferAvoidPodsEntry{} + yyc4802 = true } } - yyh4828.End() - if yyc4828 { - *v = yyv4828 + yyh4802.End() + if yyc4802 { + *v = yyv4802 } } @@ -61814,19 +61515,19 @@ func (x codecSelfer1234) encResourceList(v ResourceList, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeMapStart(len(v)) - for yyk4832, yyv4832 := range v { + for yyk4806, yyv4806 := range v { z.EncSendContainerState(codecSelfer_containerMapKey1234) - yyk4832.CodecEncodeSelf(e) + yyk4806.CodecEncodeSelf(e) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy4833 := &yyv4832 - yym4834 := z.EncBinary() - _ = yym4834 + yy4807 := &yyv4806 + yym4808 := z.EncBinary() + _ = yym4808 if false { - } else if z.HasExtensions() && z.EncExt(yy4833) { - } else if !yym4834 && z.IsJSONHandle() { - z.EncJSONMarshal(yy4833) + } else if z.HasExtensions() && z.EncExt(yy4807) { + } else if !yym4808 && z.IsJSONHandle() { + z.EncJSONMarshal(yy4807) } else { - z.EncFallback(yy4833) + z.EncFallback(yy4807) } } z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -61837,86 +61538,86 @@ func (x codecSelfer1234) decResourceList(v *ResourceList, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4835 := *v - yyl4835 := r.ReadMapStart() - yybh4835 := z.DecBasicHandle() - if yyv4835 == nil { - yyrl4835, _ := z.DecInferLen(yyl4835, yybh4835.MaxInitLen, 72) - yyv4835 = make(map[ResourceName]pkg3_resource.Quantity, yyrl4835) - *v = yyv4835 + yyv4809 := *v + yyl4809 := r.ReadMapStart() + yybh4809 := z.DecBasicHandle() + if yyv4809 == nil { + yyrl4809, _ := z.DecInferLen(yyl4809, yybh4809.MaxInitLen, 72) + yyv4809 = make(map[ResourceName]pkg3_resource.Quantity, yyrl4809) + *v = yyv4809 } - var yymk4835 ResourceName - var yymv4835 pkg3_resource.Quantity - var yymg4835 bool - if yybh4835.MapValueReset { - yymg4835 = true + var yymk4809 ResourceName + var yymv4809 pkg3_resource.Quantity + var yymg4809 bool + if yybh4809.MapValueReset { + yymg4809 = true } - if yyl4835 > 0 { - for yyj4835 := 0; yyj4835 < yyl4835; yyj4835++ { + if yyl4809 > 0 { + for yyj4809 := 0; yyj4809 < yyl4809; yyj4809++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk4835 = "" + yymk4809 = "" } else { - yymk4835 = ResourceName(r.DecodeString()) + yymk4809 = ResourceName(r.DecodeString()) } - if yymg4835 { - yymv4835 = yyv4835[yymk4835] + if yymg4809 { + yymv4809 = yyv4809[yymk4809] } else { - yymv4835 = pkg3_resource.Quantity{} + yymv4809 = pkg3_resource.Quantity{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv4835 = pkg3_resource.Quantity{} + yymv4809 = pkg3_resource.Quantity{} } else { - yyv4837 := &yymv4835 - yym4838 := z.DecBinary() - _ = yym4838 + yyv4811 := &yymv4809 + yym4812 := z.DecBinary() + _ = yym4812 if false { - } else if z.HasExtensions() && z.DecExt(yyv4837) { - } else if !yym4838 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4837) + } else if z.HasExtensions() && z.DecExt(yyv4811) { + } else if !yym4812 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv4811) } else { - z.DecFallback(yyv4837, false) + z.DecFallback(yyv4811, false) } } - if yyv4835 != nil { - yyv4835[yymk4835] = yymv4835 + if yyv4809 != nil { + yyv4809[yymk4809] = yymv4809 } } - } else if yyl4835 < 0 { - for yyj4835 := 0; !r.CheckBreak(); yyj4835++ { + } else if yyl4809 < 0 { + for yyj4809 := 0; !r.CheckBreak(); yyj4809++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk4835 = "" + yymk4809 = "" } else { - yymk4835 = ResourceName(r.DecodeString()) + yymk4809 = ResourceName(r.DecodeString()) } - if yymg4835 { - yymv4835 = yyv4835[yymk4835] + if yymg4809 { + yymv4809 = yyv4809[yymk4809] } else { - yymv4835 = pkg3_resource.Quantity{} + yymv4809 = pkg3_resource.Quantity{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv4835 = pkg3_resource.Quantity{} + yymv4809 = pkg3_resource.Quantity{} } else { - yyv4840 := &yymv4835 - yym4841 := z.DecBinary() - _ = yym4841 + yyv4814 := &yymv4809 + yym4815 := z.DecBinary() + _ = yym4815 if false { - } else if z.HasExtensions() && z.DecExt(yyv4840) { - } else if !yym4841 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4840) + } else if z.HasExtensions() && z.DecExt(yyv4814) { + } else if !yym4815 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv4814) } else { - z.DecFallback(yyv4840, false) + z.DecFallback(yyv4814, false) } } - if yyv4835 != nil { - yyv4835[yymk4835] = yymv4835 + if yyv4809 != nil { + yyv4809[yymk4809] = yymv4809 } } } // else len==0: TODO: Should we clear map entries? @@ -61928,10 +61629,10 @@ func (x codecSelfer1234) encSliceNode(v []Node, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4842 := range v { + for _, yyv4816 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4843 := &yyv4842 - yy4843.CodecEncodeSelf(e) + yy4817 := &yyv4816 + yy4817.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -61941,83 +61642,83 @@ func (x codecSelfer1234) decSliceNode(v *[]Node, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4844 := *v - yyh4844, yyl4844 := z.DecSliceHelperStart() - var yyc4844 bool - if yyl4844 == 0 { - if yyv4844 == nil { - yyv4844 = []Node{} - yyc4844 = true - } else if len(yyv4844) != 0 { - yyv4844 = yyv4844[:0] - yyc4844 = true + yyv4818 := *v + yyh4818, yyl4818 := z.DecSliceHelperStart() + var yyc4818 bool + if yyl4818 == 0 { + if yyv4818 == nil { + yyv4818 = []Node{} + yyc4818 = true + } else if len(yyv4818) != 0 { + yyv4818 = yyv4818[:0] + yyc4818 = true } - } else if yyl4844 > 0 { - var yyrr4844, yyrl4844 int - var yyrt4844 bool - if yyl4844 > cap(yyv4844) { + } else if yyl4818 > 0 { + var yyrr4818, yyrl4818 int + var yyrt4818 bool + if yyl4818 > cap(yyv4818) { - yyrg4844 := len(yyv4844) > 0 - yyv24844 := yyv4844 - yyrl4844, yyrt4844 = z.DecInferLen(yyl4844, z.DecBasicHandle().MaxInitLen, 632) - if yyrt4844 { - if yyrl4844 <= cap(yyv4844) { - yyv4844 = yyv4844[:yyrl4844] + yyrg4818 := len(yyv4818) > 0 + yyv24818 := yyv4818 + yyrl4818, yyrt4818 = z.DecInferLen(yyl4818, z.DecBasicHandle().MaxInitLen, 632) + if yyrt4818 { + if yyrl4818 <= cap(yyv4818) { + yyv4818 = yyv4818[:yyrl4818] } else { - yyv4844 = make([]Node, yyrl4844) + yyv4818 = make([]Node, yyrl4818) } } else { - yyv4844 = make([]Node, yyrl4844) + yyv4818 = make([]Node, yyrl4818) } - yyc4844 = true - yyrr4844 = len(yyv4844) - if yyrg4844 { - copy(yyv4844, yyv24844) + yyc4818 = true + yyrr4818 = len(yyv4818) + if yyrg4818 { + copy(yyv4818, yyv24818) } - } else if yyl4844 != len(yyv4844) { - yyv4844 = yyv4844[:yyl4844] - yyc4844 = true + } else if yyl4818 != len(yyv4818) { + yyv4818 = yyv4818[:yyl4818] + yyc4818 = true } - yyj4844 := 0 - for ; yyj4844 < yyrr4844; yyj4844++ { - yyh4844.ElemContainerState(yyj4844) + yyj4818 := 0 + for ; yyj4818 < yyrr4818; yyj4818++ { + yyh4818.ElemContainerState(yyj4818) if r.TryDecodeAsNil() { - yyv4844[yyj4844] = Node{} + yyv4818[yyj4818] = Node{} } else { - yyv4845 := &yyv4844[yyj4844] - yyv4845.CodecDecodeSelf(d) + yyv4819 := &yyv4818[yyj4818] + yyv4819.CodecDecodeSelf(d) } } - if yyrt4844 { - for ; yyj4844 < yyl4844; yyj4844++ { - yyv4844 = append(yyv4844, Node{}) - yyh4844.ElemContainerState(yyj4844) + if yyrt4818 { + for ; yyj4818 < yyl4818; yyj4818++ { + yyv4818 = append(yyv4818, Node{}) + yyh4818.ElemContainerState(yyj4818) if r.TryDecodeAsNil() { - yyv4844[yyj4844] = Node{} + yyv4818[yyj4818] = Node{} } else { - yyv4846 := &yyv4844[yyj4844] - yyv4846.CodecDecodeSelf(d) + yyv4820 := &yyv4818[yyj4818] + yyv4820.CodecDecodeSelf(d) } } } } else { - yyj4844 := 0 - for ; !r.CheckBreak(); yyj4844++ { + yyj4818 := 0 + for ; !r.CheckBreak(); yyj4818++ { - if yyj4844 >= len(yyv4844) { - yyv4844 = append(yyv4844, Node{}) // var yyz4844 Node - yyc4844 = true + if yyj4818 >= len(yyv4818) { + yyv4818 = append(yyv4818, Node{}) // var yyz4818 Node + yyc4818 = true } - yyh4844.ElemContainerState(yyj4844) - if yyj4844 < len(yyv4844) { + yyh4818.ElemContainerState(yyj4818) + if yyj4818 < len(yyv4818) { if r.TryDecodeAsNil() { - yyv4844[yyj4844] = Node{} + yyv4818[yyj4818] = Node{} } else { - yyv4847 := &yyv4844[yyj4844] - yyv4847.CodecDecodeSelf(d) + yyv4821 := &yyv4818[yyj4818] + yyv4821.CodecDecodeSelf(d) } } else { @@ -62025,17 +61726,17 @@ func (x codecSelfer1234) decSliceNode(v *[]Node, d *codec1978.Decoder) { } } - if yyj4844 < len(yyv4844) { - yyv4844 = yyv4844[:yyj4844] - yyc4844 = true - } else if yyj4844 == 0 && yyv4844 == nil { - yyv4844 = []Node{} - yyc4844 = true + if yyj4818 < len(yyv4818) { + yyv4818 = yyv4818[:yyj4818] + yyc4818 = true + } else if yyj4818 == 0 && yyv4818 == nil { + yyv4818 = []Node{} + yyc4818 = true } } - yyh4844.End() - if yyc4844 { - *v = yyv4844 + yyh4818.End() + if yyc4818 { + *v = yyv4818 } } @@ -62044,9 +61745,9 @@ func (x codecSelfer1234) encSliceFinalizerName(v []FinalizerName, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4848 := range v { + for _, yyv4822 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4848.CodecEncodeSelf(e) + yyv4822.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -62056,75 +61757,75 @@ func (x codecSelfer1234) decSliceFinalizerName(v *[]FinalizerName, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4849 := *v - yyh4849, yyl4849 := z.DecSliceHelperStart() - var yyc4849 bool - if yyl4849 == 0 { - if yyv4849 == nil { - yyv4849 = []FinalizerName{} - yyc4849 = true - } else if len(yyv4849) != 0 { - yyv4849 = yyv4849[:0] - yyc4849 = true + yyv4823 := *v + yyh4823, yyl4823 := z.DecSliceHelperStart() + var yyc4823 bool + if yyl4823 == 0 { + if yyv4823 == nil { + yyv4823 = []FinalizerName{} + yyc4823 = true + } else if len(yyv4823) != 0 { + yyv4823 = yyv4823[:0] + yyc4823 = true } - } else if yyl4849 > 0 { - var yyrr4849, yyrl4849 int - var yyrt4849 bool - if yyl4849 > cap(yyv4849) { + } else if yyl4823 > 0 { + var yyrr4823, yyrl4823 int + var yyrt4823 bool + if yyl4823 > cap(yyv4823) { - yyrl4849, yyrt4849 = z.DecInferLen(yyl4849, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4849 { - if yyrl4849 <= cap(yyv4849) { - yyv4849 = yyv4849[:yyrl4849] + yyrl4823, yyrt4823 = z.DecInferLen(yyl4823, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4823 { + if yyrl4823 <= cap(yyv4823) { + yyv4823 = yyv4823[:yyrl4823] } else { - yyv4849 = make([]FinalizerName, yyrl4849) + yyv4823 = make([]FinalizerName, yyrl4823) } } else { - yyv4849 = make([]FinalizerName, yyrl4849) + yyv4823 = make([]FinalizerName, yyrl4823) } - yyc4849 = true - yyrr4849 = len(yyv4849) - } else if yyl4849 != len(yyv4849) { - yyv4849 = yyv4849[:yyl4849] - yyc4849 = true + yyc4823 = true + yyrr4823 = len(yyv4823) + } else if yyl4823 != len(yyv4823) { + yyv4823 = yyv4823[:yyl4823] + yyc4823 = true } - yyj4849 := 0 - for ; yyj4849 < yyrr4849; yyj4849++ { - yyh4849.ElemContainerState(yyj4849) + yyj4823 := 0 + for ; yyj4823 < yyrr4823; yyj4823++ { + yyh4823.ElemContainerState(yyj4823) if r.TryDecodeAsNil() { - yyv4849[yyj4849] = "" + yyv4823[yyj4823] = "" } else { - yyv4849[yyj4849] = FinalizerName(r.DecodeString()) + yyv4823[yyj4823] = FinalizerName(r.DecodeString()) } } - if yyrt4849 { - for ; yyj4849 < yyl4849; yyj4849++ { - yyv4849 = append(yyv4849, "") - yyh4849.ElemContainerState(yyj4849) + if yyrt4823 { + for ; yyj4823 < yyl4823; yyj4823++ { + yyv4823 = append(yyv4823, "") + yyh4823.ElemContainerState(yyj4823) if r.TryDecodeAsNil() { - yyv4849[yyj4849] = "" + yyv4823[yyj4823] = "" } else { - yyv4849[yyj4849] = FinalizerName(r.DecodeString()) + yyv4823[yyj4823] = FinalizerName(r.DecodeString()) } } } } else { - yyj4849 := 0 - for ; !r.CheckBreak(); yyj4849++ { + yyj4823 := 0 + for ; !r.CheckBreak(); yyj4823++ { - if yyj4849 >= len(yyv4849) { - yyv4849 = append(yyv4849, "") // var yyz4849 FinalizerName - yyc4849 = true + if yyj4823 >= len(yyv4823) { + yyv4823 = append(yyv4823, "") // var yyz4823 FinalizerName + yyc4823 = true } - yyh4849.ElemContainerState(yyj4849) - if yyj4849 < len(yyv4849) { + yyh4823.ElemContainerState(yyj4823) + if yyj4823 < len(yyv4823) { if r.TryDecodeAsNil() { - yyv4849[yyj4849] = "" + yyv4823[yyj4823] = "" } else { - yyv4849[yyj4849] = FinalizerName(r.DecodeString()) + yyv4823[yyj4823] = FinalizerName(r.DecodeString()) } } else { @@ -62132,17 +61833,17 @@ func (x codecSelfer1234) decSliceFinalizerName(v *[]FinalizerName, d *codec1978. } } - if yyj4849 < len(yyv4849) { - yyv4849 = yyv4849[:yyj4849] - yyc4849 = true - } else if yyj4849 == 0 && yyv4849 == nil { - yyv4849 = []FinalizerName{} - yyc4849 = true + if yyj4823 < len(yyv4823) { + yyv4823 = yyv4823[:yyj4823] + yyc4823 = true + } else if yyj4823 == 0 && yyv4823 == nil { + yyv4823 = []FinalizerName{} + yyc4823 = true } } - yyh4849.End() - if yyc4849 { - *v = yyv4849 + yyh4823.End() + if yyc4823 { + *v = yyv4823 } } @@ -62151,10 +61852,10 @@ func (x codecSelfer1234) encSliceNamespace(v []Namespace, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4853 := range v { + for _, yyv4827 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4854 := &yyv4853 - yy4854.CodecEncodeSelf(e) + yy4828 := &yyv4827 + yy4828.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -62164,83 +61865,83 @@ func (x codecSelfer1234) decSliceNamespace(v *[]Namespace, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4855 := *v - yyh4855, yyl4855 := z.DecSliceHelperStart() - var yyc4855 bool - if yyl4855 == 0 { - if yyv4855 == nil { - yyv4855 = []Namespace{} - yyc4855 = true - } else if len(yyv4855) != 0 { - yyv4855 = yyv4855[:0] - yyc4855 = true + yyv4829 := *v + yyh4829, yyl4829 := z.DecSliceHelperStart() + var yyc4829 bool + if yyl4829 == 0 { + if yyv4829 == nil { + yyv4829 = []Namespace{} + yyc4829 = true + } else if len(yyv4829) != 0 { + yyv4829 = yyv4829[:0] + yyc4829 = true } - } else if yyl4855 > 0 { - var yyrr4855, yyrl4855 int - var yyrt4855 bool - if yyl4855 > cap(yyv4855) { + } else if yyl4829 > 0 { + var yyrr4829, yyrl4829 int + var yyrt4829 bool + if yyl4829 > cap(yyv4829) { - yyrg4855 := len(yyv4855) > 0 - yyv24855 := yyv4855 - yyrl4855, yyrt4855 = z.DecInferLen(yyl4855, z.DecBasicHandle().MaxInitLen, 296) - if yyrt4855 { - if yyrl4855 <= cap(yyv4855) { - yyv4855 = yyv4855[:yyrl4855] + yyrg4829 := len(yyv4829) > 0 + yyv24829 := yyv4829 + yyrl4829, yyrt4829 = z.DecInferLen(yyl4829, z.DecBasicHandle().MaxInitLen, 296) + if yyrt4829 { + if yyrl4829 <= cap(yyv4829) { + yyv4829 = yyv4829[:yyrl4829] } else { - yyv4855 = make([]Namespace, yyrl4855) + yyv4829 = make([]Namespace, yyrl4829) } } else { - yyv4855 = make([]Namespace, yyrl4855) + yyv4829 = make([]Namespace, yyrl4829) } - yyc4855 = true - yyrr4855 = len(yyv4855) - if yyrg4855 { - copy(yyv4855, yyv24855) + yyc4829 = true + yyrr4829 = len(yyv4829) + if yyrg4829 { + copy(yyv4829, yyv24829) } - } else if yyl4855 != len(yyv4855) { - yyv4855 = yyv4855[:yyl4855] - yyc4855 = true + } else if yyl4829 != len(yyv4829) { + yyv4829 = yyv4829[:yyl4829] + yyc4829 = true } - yyj4855 := 0 - for ; yyj4855 < yyrr4855; yyj4855++ { - yyh4855.ElemContainerState(yyj4855) + yyj4829 := 0 + for ; yyj4829 < yyrr4829; yyj4829++ { + yyh4829.ElemContainerState(yyj4829) if r.TryDecodeAsNil() { - yyv4855[yyj4855] = Namespace{} + yyv4829[yyj4829] = Namespace{} } else { - yyv4856 := &yyv4855[yyj4855] - yyv4856.CodecDecodeSelf(d) + yyv4830 := &yyv4829[yyj4829] + yyv4830.CodecDecodeSelf(d) } } - if yyrt4855 { - for ; yyj4855 < yyl4855; yyj4855++ { - yyv4855 = append(yyv4855, Namespace{}) - yyh4855.ElemContainerState(yyj4855) + if yyrt4829 { + for ; yyj4829 < yyl4829; yyj4829++ { + yyv4829 = append(yyv4829, Namespace{}) + yyh4829.ElemContainerState(yyj4829) if r.TryDecodeAsNil() { - yyv4855[yyj4855] = Namespace{} + yyv4829[yyj4829] = Namespace{} } else { - yyv4857 := &yyv4855[yyj4855] - yyv4857.CodecDecodeSelf(d) + yyv4831 := &yyv4829[yyj4829] + yyv4831.CodecDecodeSelf(d) } } } } else { - yyj4855 := 0 - for ; !r.CheckBreak(); yyj4855++ { + yyj4829 := 0 + for ; !r.CheckBreak(); yyj4829++ { - if yyj4855 >= len(yyv4855) { - yyv4855 = append(yyv4855, Namespace{}) // var yyz4855 Namespace - yyc4855 = true + if yyj4829 >= len(yyv4829) { + yyv4829 = append(yyv4829, Namespace{}) // var yyz4829 Namespace + yyc4829 = true } - yyh4855.ElemContainerState(yyj4855) - if yyj4855 < len(yyv4855) { + yyh4829.ElemContainerState(yyj4829) + if yyj4829 < len(yyv4829) { if r.TryDecodeAsNil() { - yyv4855[yyj4855] = Namespace{} + yyv4829[yyj4829] = Namespace{} } else { - yyv4858 := &yyv4855[yyj4855] - yyv4858.CodecDecodeSelf(d) + yyv4832 := &yyv4829[yyj4829] + yyv4832.CodecDecodeSelf(d) } } else { @@ -62248,17 +61949,17 @@ func (x codecSelfer1234) decSliceNamespace(v *[]Namespace, d *codec1978.Decoder) } } - if yyj4855 < len(yyv4855) { - yyv4855 = yyv4855[:yyj4855] - yyc4855 = true - } else if yyj4855 == 0 && yyv4855 == nil { - yyv4855 = []Namespace{} - yyc4855 = true + if yyj4829 < len(yyv4829) { + yyv4829 = yyv4829[:yyj4829] + yyc4829 = true + } else if yyj4829 == 0 && yyv4829 == nil { + yyv4829 = []Namespace{} + yyc4829 = true } } - yyh4855.End() - if yyc4855 { - *v = yyv4855 + yyh4829.End() + if yyc4829 { + *v = yyv4829 } } @@ -62267,10 +61968,10 @@ func (x codecSelfer1234) encSliceEvent(v []Event, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4859 := range v { + for _, yyv4833 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4860 := &yyv4859 - yy4860.CodecEncodeSelf(e) + yy4834 := &yyv4833 + yy4834.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -62280,83 +61981,83 @@ func (x codecSelfer1234) decSliceEvent(v *[]Event, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4861 := *v - yyh4861, yyl4861 := z.DecSliceHelperStart() - var yyc4861 bool - if yyl4861 == 0 { - if yyv4861 == nil { - yyv4861 = []Event{} - yyc4861 = true - } else if len(yyv4861) != 0 { - yyv4861 = yyv4861[:0] - yyc4861 = true + yyv4835 := *v + yyh4835, yyl4835 := z.DecSliceHelperStart() + var yyc4835 bool + if yyl4835 == 0 { + if yyv4835 == nil { + yyv4835 = []Event{} + yyc4835 = true + } else if len(yyv4835) != 0 { + yyv4835 = yyv4835[:0] + yyc4835 = true } - } else if yyl4861 > 0 { - var yyrr4861, yyrl4861 int - var yyrt4861 bool - if yyl4861 > cap(yyv4861) { + } else if yyl4835 > 0 { + var yyrr4835, yyrl4835 int + var yyrt4835 bool + if yyl4835 > cap(yyv4835) { - yyrg4861 := len(yyv4861) > 0 - yyv24861 := yyv4861 - yyrl4861, yyrt4861 = z.DecInferLen(yyl4861, z.DecBasicHandle().MaxInitLen, 504) - if yyrt4861 { - if yyrl4861 <= cap(yyv4861) { - yyv4861 = yyv4861[:yyrl4861] + yyrg4835 := len(yyv4835) > 0 + yyv24835 := yyv4835 + yyrl4835, yyrt4835 = z.DecInferLen(yyl4835, z.DecBasicHandle().MaxInitLen, 504) + if yyrt4835 { + if yyrl4835 <= cap(yyv4835) { + yyv4835 = yyv4835[:yyrl4835] } else { - yyv4861 = make([]Event, yyrl4861) + yyv4835 = make([]Event, yyrl4835) } } else { - yyv4861 = make([]Event, yyrl4861) + yyv4835 = make([]Event, yyrl4835) } - yyc4861 = true - yyrr4861 = len(yyv4861) - if yyrg4861 { - copy(yyv4861, yyv24861) + yyc4835 = true + yyrr4835 = len(yyv4835) + if yyrg4835 { + copy(yyv4835, yyv24835) } - } else if yyl4861 != len(yyv4861) { - yyv4861 = yyv4861[:yyl4861] - yyc4861 = true + } else if yyl4835 != len(yyv4835) { + yyv4835 = yyv4835[:yyl4835] + yyc4835 = true } - yyj4861 := 0 - for ; yyj4861 < yyrr4861; yyj4861++ { - yyh4861.ElemContainerState(yyj4861) + yyj4835 := 0 + for ; yyj4835 < yyrr4835; yyj4835++ { + yyh4835.ElemContainerState(yyj4835) if r.TryDecodeAsNil() { - yyv4861[yyj4861] = Event{} + yyv4835[yyj4835] = Event{} } else { - yyv4862 := &yyv4861[yyj4861] - yyv4862.CodecDecodeSelf(d) + yyv4836 := &yyv4835[yyj4835] + yyv4836.CodecDecodeSelf(d) } } - if yyrt4861 { - for ; yyj4861 < yyl4861; yyj4861++ { - yyv4861 = append(yyv4861, Event{}) - yyh4861.ElemContainerState(yyj4861) + if yyrt4835 { + for ; yyj4835 < yyl4835; yyj4835++ { + yyv4835 = append(yyv4835, Event{}) + yyh4835.ElemContainerState(yyj4835) if r.TryDecodeAsNil() { - yyv4861[yyj4861] = Event{} + yyv4835[yyj4835] = Event{} } else { - yyv4863 := &yyv4861[yyj4861] - yyv4863.CodecDecodeSelf(d) + yyv4837 := &yyv4835[yyj4835] + yyv4837.CodecDecodeSelf(d) } } } } else { - yyj4861 := 0 - for ; !r.CheckBreak(); yyj4861++ { + yyj4835 := 0 + for ; !r.CheckBreak(); yyj4835++ { - if yyj4861 >= len(yyv4861) { - yyv4861 = append(yyv4861, Event{}) // var yyz4861 Event - yyc4861 = true + if yyj4835 >= len(yyv4835) { + yyv4835 = append(yyv4835, Event{}) // var yyz4835 Event + yyc4835 = true } - yyh4861.ElemContainerState(yyj4861) - if yyj4861 < len(yyv4861) { + yyh4835.ElemContainerState(yyj4835) + if yyj4835 < len(yyv4835) { if r.TryDecodeAsNil() { - yyv4861[yyj4861] = Event{} + yyv4835[yyj4835] = Event{} } else { - yyv4864 := &yyv4861[yyj4861] - yyv4864.CodecDecodeSelf(d) + yyv4838 := &yyv4835[yyj4835] + yyv4838.CodecDecodeSelf(d) } } else { @@ -62364,17 +62065,17 @@ func (x codecSelfer1234) decSliceEvent(v *[]Event, d *codec1978.Decoder) { } } - if yyj4861 < len(yyv4861) { - yyv4861 = yyv4861[:yyj4861] - yyc4861 = true - } else if yyj4861 == 0 && yyv4861 == nil { - yyv4861 = []Event{} - yyc4861 = true + if yyj4835 < len(yyv4835) { + yyv4835 = yyv4835[:yyj4835] + yyc4835 = true + } else if yyj4835 == 0 && yyv4835 == nil { + yyv4835 = []Event{} + yyc4835 = true } } - yyh4861.End() - if yyc4861 { - *v = yyv4861 + yyh4835.End() + if yyc4835 { + *v = yyv4835 } } @@ -62383,17 +62084,17 @@ func (x codecSelfer1234) encSliceruntime_RawExtension(v []pkg5_runtime.RawExtens z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4865 := range v { + for _, yyv4839 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4866 := &yyv4865 - yym4867 := z.EncBinary() - _ = yym4867 + yy4840 := &yyv4839 + yym4841 := z.EncBinary() + _ = yym4841 if false { - } else if z.HasExtensions() && z.EncExt(yy4866) { - } else if !yym4867 && z.IsJSONHandle() { - z.EncJSONMarshal(yy4866) + } else if z.HasExtensions() && z.EncExt(yy4840) { + } else if !yym4841 && z.IsJSONHandle() { + z.EncJSONMarshal(yy4840) } else { - z.EncFallback(yy4866) + z.EncFallback(yy4840) } } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) @@ -62404,12 +62105,491 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg5_runtime.RawExten z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r + yyv4842 := *v + yyh4842, yyl4842 := z.DecSliceHelperStart() + var yyc4842 bool + if yyl4842 == 0 { + if yyv4842 == nil { + yyv4842 = []pkg5_runtime.RawExtension{} + yyc4842 = true + } else if len(yyv4842) != 0 { + yyv4842 = yyv4842[:0] + yyc4842 = true + } + } else if yyl4842 > 0 { + var yyrr4842, yyrl4842 int + var yyrt4842 bool + if yyl4842 > cap(yyv4842) { + + yyrg4842 := len(yyv4842) > 0 + yyv24842 := yyv4842 + yyrl4842, yyrt4842 = z.DecInferLen(yyl4842, z.DecBasicHandle().MaxInitLen, 40) + if yyrt4842 { + if yyrl4842 <= cap(yyv4842) { + yyv4842 = yyv4842[:yyrl4842] + } else { + yyv4842 = make([]pkg5_runtime.RawExtension, yyrl4842) + } + } else { + yyv4842 = make([]pkg5_runtime.RawExtension, yyrl4842) + } + yyc4842 = true + yyrr4842 = len(yyv4842) + if yyrg4842 { + copy(yyv4842, yyv24842) + } + } else if yyl4842 != len(yyv4842) { + yyv4842 = yyv4842[:yyl4842] + yyc4842 = true + } + yyj4842 := 0 + for ; yyj4842 < yyrr4842; yyj4842++ { + yyh4842.ElemContainerState(yyj4842) + if r.TryDecodeAsNil() { + yyv4842[yyj4842] = pkg5_runtime.RawExtension{} + } else { + yyv4843 := &yyv4842[yyj4842] + yym4844 := z.DecBinary() + _ = yym4844 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4843) { + } else if !yym4844 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv4843) + } else { + z.DecFallback(yyv4843, false) + } + } + + } + if yyrt4842 { + for ; yyj4842 < yyl4842; yyj4842++ { + yyv4842 = append(yyv4842, pkg5_runtime.RawExtension{}) + yyh4842.ElemContainerState(yyj4842) + if r.TryDecodeAsNil() { + yyv4842[yyj4842] = pkg5_runtime.RawExtension{} + } else { + yyv4845 := &yyv4842[yyj4842] + yym4846 := z.DecBinary() + _ = yym4846 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4845) { + } else if !yym4846 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv4845) + } else { + z.DecFallback(yyv4845, false) + } + } + + } + } + + } else { + yyj4842 := 0 + for ; !r.CheckBreak(); yyj4842++ { + + if yyj4842 >= len(yyv4842) { + yyv4842 = append(yyv4842, pkg5_runtime.RawExtension{}) // var yyz4842 pkg5_runtime.RawExtension + yyc4842 = true + } + yyh4842.ElemContainerState(yyj4842) + if yyj4842 < len(yyv4842) { + if r.TryDecodeAsNil() { + yyv4842[yyj4842] = pkg5_runtime.RawExtension{} + } else { + yyv4847 := &yyv4842[yyj4842] + yym4848 := z.DecBinary() + _ = yym4848 + if false { + } else if z.HasExtensions() && z.DecExt(yyv4847) { + } else if !yym4848 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv4847) + } else { + z.DecFallback(yyv4847, false) + } + } + + } else { + z.DecSwallow() + } + + } + if yyj4842 < len(yyv4842) { + yyv4842 = yyv4842[:yyj4842] + yyc4842 = true + } else if yyj4842 == 0 && yyv4842 == nil { + yyv4842 = []pkg5_runtime.RawExtension{} + yyc4842 = true + } + } + yyh4842.End() + if yyc4842 { + *v = yyv4842 + } +} + +func (x codecSelfer1234) encSliceLimitRangeItem(v []LimitRangeItem, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv4849 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy4850 := &yyv4849 + yy4850.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceLimitRangeItem(v *[]LimitRangeItem, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv4851 := *v + yyh4851, yyl4851 := z.DecSliceHelperStart() + var yyc4851 bool + if yyl4851 == 0 { + if yyv4851 == nil { + yyv4851 = []LimitRangeItem{} + yyc4851 = true + } else if len(yyv4851) != 0 { + yyv4851 = yyv4851[:0] + yyc4851 = true + } + } else if yyl4851 > 0 { + var yyrr4851, yyrl4851 int + var yyrt4851 bool + if yyl4851 > cap(yyv4851) { + + yyrg4851 := len(yyv4851) > 0 + yyv24851 := yyv4851 + yyrl4851, yyrt4851 = z.DecInferLen(yyl4851, z.DecBasicHandle().MaxInitLen, 56) + if yyrt4851 { + if yyrl4851 <= cap(yyv4851) { + yyv4851 = yyv4851[:yyrl4851] + } else { + yyv4851 = make([]LimitRangeItem, yyrl4851) + } + } else { + yyv4851 = make([]LimitRangeItem, yyrl4851) + } + yyc4851 = true + yyrr4851 = len(yyv4851) + if yyrg4851 { + copy(yyv4851, yyv24851) + } + } else if yyl4851 != len(yyv4851) { + yyv4851 = yyv4851[:yyl4851] + yyc4851 = true + } + yyj4851 := 0 + for ; yyj4851 < yyrr4851; yyj4851++ { + yyh4851.ElemContainerState(yyj4851) + if r.TryDecodeAsNil() { + yyv4851[yyj4851] = LimitRangeItem{} + } else { + yyv4852 := &yyv4851[yyj4851] + yyv4852.CodecDecodeSelf(d) + } + + } + if yyrt4851 { + for ; yyj4851 < yyl4851; yyj4851++ { + yyv4851 = append(yyv4851, LimitRangeItem{}) + yyh4851.ElemContainerState(yyj4851) + if r.TryDecodeAsNil() { + yyv4851[yyj4851] = LimitRangeItem{} + } else { + yyv4853 := &yyv4851[yyj4851] + yyv4853.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj4851 := 0 + for ; !r.CheckBreak(); yyj4851++ { + + if yyj4851 >= len(yyv4851) { + yyv4851 = append(yyv4851, LimitRangeItem{}) // var yyz4851 LimitRangeItem + yyc4851 = true + } + yyh4851.ElemContainerState(yyj4851) + if yyj4851 < len(yyv4851) { + if r.TryDecodeAsNil() { + yyv4851[yyj4851] = LimitRangeItem{} + } else { + yyv4854 := &yyv4851[yyj4851] + yyv4854.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj4851 < len(yyv4851) { + yyv4851 = yyv4851[:yyj4851] + yyc4851 = true + } else if yyj4851 == 0 && yyv4851 == nil { + yyv4851 = []LimitRangeItem{} + yyc4851 = true + } + } + yyh4851.End() + if yyc4851 { + *v = yyv4851 + } +} + +func (x codecSelfer1234) encSliceLimitRange(v []LimitRange, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv4855 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy4856 := &yyv4855 + yy4856.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceLimitRange(v *[]LimitRange, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv4857 := *v + yyh4857, yyl4857 := z.DecSliceHelperStart() + var yyc4857 bool + if yyl4857 == 0 { + if yyv4857 == nil { + yyv4857 = []LimitRange{} + yyc4857 = true + } else if len(yyv4857) != 0 { + yyv4857 = yyv4857[:0] + yyc4857 = true + } + } else if yyl4857 > 0 { + var yyrr4857, yyrl4857 int + var yyrt4857 bool + if yyl4857 > cap(yyv4857) { + + yyrg4857 := len(yyv4857) > 0 + yyv24857 := yyv4857 + yyrl4857, yyrt4857 = z.DecInferLen(yyl4857, z.DecBasicHandle().MaxInitLen, 280) + if yyrt4857 { + if yyrl4857 <= cap(yyv4857) { + yyv4857 = yyv4857[:yyrl4857] + } else { + yyv4857 = make([]LimitRange, yyrl4857) + } + } else { + yyv4857 = make([]LimitRange, yyrl4857) + } + yyc4857 = true + yyrr4857 = len(yyv4857) + if yyrg4857 { + copy(yyv4857, yyv24857) + } + } else if yyl4857 != len(yyv4857) { + yyv4857 = yyv4857[:yyl4857] + yyc4857 = true + } + yyj4857 := 0 + for ; yyj4857 < yyrr4857; yyj4857++ { + yyh4857.ElemContainerState(yyj4857) + if r.TryDecodeAsNil() { + yyv4857[yyj4857] = LimitRange{} + } else { + yyv4858 := &yyv4857[yyj4857] + yyv4858.CodecDecodeSelf(d) + } + + } + if yyrt4857 { + for ; yyj4857 < yyl4857; yyj4857++ { + yyv4857 = append(yyv4857, LimitRange{}) + yyh4857.ElemContainerState(yyj4857) + if r.TryDecodeAsNil() { + yyv4857[yyj4857] = LimitRange{} + } else { + yyv4859 := &yyv4857[yyj4857] + yyv4859.CodecDecodeSelf(d) + } + + } + } + + } else { + yyj4857 := 0 + for ; !r.CheckBreak(); yyj4857++ { + + if yyj4857 >= len(yyv4857) { + yyv4857 = append(yyv4857, LimitRange{}) // var yyz4857 LimitRange + yyc4857 = true + } + yyh4857.ElemContainerState(yyj4857) + if yyj4857 < len(yyv4857) { + if r.TryDecodeAsNil() { + yyv4857[yyj4857] = LimitRange{} + } else { + yyv4860 := &yyv4857[yyj4857] + yyv4860.CodecDecodeSelf(d) + } + + } else { + z.DecSwallow() + } + + } + if yyj4857 < len(yyv4857) { + yyv4857 = yyv4857[:yyj4857] + yyc4857 = true + } else if yyj4857 == 0 && yyv4857 == nil { + yyv4857 = []LimitRange{} + yyc4857 = true + } + } + yyh4857.End() + if yyc4857 { + *v = yyv4857 + } +} + +func (x codecSelfer1234) encSliceResourceQuotaScope(v []ResourceQuotaScope, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv4861 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yyv4861.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceResourceQuotaScope(v *[]ResourceQuotaScope, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + + yyv4862 := *v + yyh4862, yyl4862 := z.DecSliceHelperStart() + var yyc4862 bool + if yyl4862 == 0 { + if yyv4862 == nil { + yyv4862 = []ResourceQuotaScope{} + yyc4862 = true + } else if len(yyv4862) != 0 { + yyv4862 = yyv4862[:0] + yyc4862 = true + } + } else if yyl4862 > 0 { + var yyrr4862, yyrl4862 int + var yyrt4862 bool + if yyl4862 > cap(yyv4862) { + + yyrl4862, yyrt4862 = z.DecInferLen(yyl4862, z.DecBasicHandle().MaxInitLen, 16) + if yyrt4862 { + if yyrl4862 <= cap(yyv4862) { + yyv4862 = yyv4862[:yyrl4862] + } else { + yyv4862 = make([]ResourceQuotaScope, yyrl4862) + } + } else { + yyv4862 = make([]ResourceQuotaScope, yyrl4862) + } + yyc4862 = true + yyrr4862 = len(yyv4862) + } else if yyl4862 != len(yyv4862) { + yyv4862 = yyv4862[:yyl4862] + yyc4862 = true + } + yyj4862 := 0 + for ; yyj4862 < yyrr4862; yyj4862++ { + yyh4862.ElemContainerState(yyj4862) + if r.TryDecodeAsNil() { + yyv4862[yyj4862] = "" + } else { + yyv4862[yyj4862] = ResourceQuotaScope(r.DecodeString()) + } + + } + if yyrt4862 { + for ; yyj4862 < yyl4862; yyj4862++ { + yyv4862 = append(yyv4862, "") + yyh4862.ElemContainerState(yyj4862) + if r.TryDecodeAsNil() { + yyv4862[yyj4862] = "" + } else { + yyv4862[yyj4862] = ResourceQuotaScope(r.DecodeString()) + } + + } + } + + } else { + yyj4862 := 0 + for ; !r.CheckBreak(); yyj4862++ { + + if yyj4862 >= len(yyv4862) { + yyv4862 = append(yyv4862, "") // var yyz4862 ResourceQuotaScope + yyc4862 = true + } + yyh4862.ElemContainerState(yyj4862) + if yyj4862 < len(yyv4862) { + if r.TryDecodeAsNil() { + yyv4862[yyj4862] = "" + } else { + yyv4862[yyj4862] = ResourceQuotaScope(r.DecodeString()) + } + + } else { + z.DecSwallow() + } + + } + if yyj4862 < len(yyv4862) { + yyv4862 = yyv4862[:yyj4862] + yyc4862 = true + } else if yyj4862 == 0 && yyv4862 == nil { + yyv4862 = []ResourceQuotaScope{} + yyc4862 = true + } + } + yyh4862.End() + if yyc4862 { + *v = yyv4862 + } +} + +func (x codecSelfer1234) encSliceResourceQuota(v []ResourceQuota, e *codec1978.Encoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperEncoder(e) + _, _, _ = h, z, r + r.EncodeArrayStart(len(v)) + for _, yyv4866 := range v { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy4867 := &yyv4866 + yy4867.CodecEncodeSelf(e) + } + z.EncSendContainerState(codecSelfer_containerArrayEnd1234) +} + +func (x codecSelfer1234) decSliceResourceQuota(v *[]ResourceQuota, d *codec1978.Decoder) { + var h codecSelfer1234 + z, r := codec1978.GenHelperDecoder(d) + _, _, _ = h, z, r + yyv4868 := *v yyh4868, yyl4868 := z.DecSliceHelperStart() var yyc4868 bool if yyl4868 == 0 { if yyv4868 == nil { - yyv4868 = []pkg5_runtime.RawExtension{} + yyv4868 = []ResourceQuota{} yyc4868 = true } else if len(yyv4868) != 0 { yyv4868 = yyv4868[:0] @@ -62422,15 +62602,15 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg5_runtime.RawExten yyrg4868 := len(yyv4868) > 0 yyv24868 := yyv4868 - yyrl4868, yyrt4868 = z.DecInferLen(yyl4868, z.DecBasicHandle().MaxInitLen, 40) + yyrl4868, yyrt4868 = z.DecInferLen(yyl4868, z.DecBasicHandle().MaxInitLen, 304) if yyrt4868 { if yyrl4868 <= cap(yyv4868) { yyv4868 = yyv4868[:yyrl4868] } else { - yyv4868 = make([]pkg5_runtime.RawExtension, yyrl4868) + yyv4868 = make([]ResourceQuota, yyrl4868) } } else { - yyv4868 = make([]pkg5_runtime.RawExtension, yyrl4868) + yyv4868 = make([]ResourceQuota, yyrl4868) } yyc4868 = true yyrr4868 = len(yyv4868) @@ -62445,38 +62625,22 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg5_runtime.RawExten for ; yyj4868 < yyrr4868; yyj4868++ { yyh4868.ElemContainerState(yyj4868) if r.TryDecodeAsNil() { - yyv4868[yyj4868] = pkg5_runtime.RawExtension{} + yyv4868[yyj4868] = ResourceQuota{} } else { yyv4869 := &yyv4868[yyj4868] - yym4870 := z.DecBinary() - _ = yym4870 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4869) { - } else if !yym4870 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4869) - } else { - z.DecFallback(yyv4869, false) - } + yyv4869.CodecDecodeSelf(d) } } if yyrt4868 { for ; yyj4868 < yyl4868; yyj4868++ { - yyv4868 = append(yyv4868, pkg5_runtime.RawExtension{}) + yyv4868 = append(yyv4868, ResourceQuota{}) yyh4868.ElemContainerState(yyj4868) if r.TryDecodeAsNil() { - yyv4868[yyj4868] = pkg5_runtime.RawExtension{} + yyv4868[yyj4868] = ResourceQuota{} } else { - yyv4871 := &yyv4868[yyj4868] - yym4872 := z.DecBinary() - _ = yym4872 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4871) { - } else if !yym4872 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4871) - } else { - z.DecFallback(yyv4871, false) - } + yyv4870 := &yyv4868[yyj4868] + yyv4870.CodecDecodeSelf(d) } } @@ -62487,24 +62651,16 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg5_runtime.RawExten for ; !r.CheckBreak(); yyj4868++ { if yyj4868 >= len(yyv4868) { - yyv4868 = append(yyv4868, pkg5_runtime.RawExtension{}) // var yyz4868 pkg5_runtime.RawExtension + yyv4868 = append(yyv4868, ResourceQuota{}) // var yyz4868 ResourceQuota yyc4868 = true } yyh4868.ElemContainerState(yyj4868) if yyj4868 < len(yyv4868) { if r.TryDecodeAsNil() { - yyv4868[yyj4868] = pkg5_runtime.RawExtension{} + yyv4868[yyj4868] = ResourceQuota{} } else { - yyv4873 := &yyv4868[yyj4868] - yym4874 := z.DecBinary() - _ = yym4874 - if false { - } else if z.HasExtensions() && z.DecExt(yyv4873) { - } else if !yym4874 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv4873) - } else { - z.DecFallback(yyv4873, false) - } + yyv4871 := &yyv4868[yyj4868] + yyv4871.CodecDecodeSelf(d) } } else { @@ -62516,7 +62672,7 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg5_runtime.RawExten yyv4868 = yyv4868[:yyj4868] yyc4868 = true } else if yyj4868 == 0 && yyv4868 == nil { - yyv4868 = []pkg5_runtime.RawExtension{} + yyv4868 = []ResourceQuota{} yyc4868 = true } } @@ -62526,483 +62682,28 @@ func (x codecSelfer1234) decSliceruntime_RawExtension(v *[]pkg5_runtime.RawExten } } -func (x codecSelfer1234) encSliceLimitRangeItem(v []LimitRangeItem, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv4875 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4876 := &yyv4875 - yy4876.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceLimitRangeItem(v *[]LimitRangeItem, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv4877 := *v - yyh4877, yyl4877 := z.DecSliceHelperStart() - var yyc4877 bool - if yyl4877 == 0 { - if yyv4877 == nil { - yyv4877 = []LimitRangeItem{} - yyc4877 = true - } else if len(yyv4877) != 0 { - yyv4877 = yyv4877[:0] - yyc4877 = true - } - } else if yyl4877 > 0 { - var yyrr4877, yyrl4877 int - var yyrt4877 bool - if yyl4877 > cap(yyv4877) { - - yyrg4877 := len(yyv4877) > 0 - yyv24877 := yyv4877 - yyrl4877, yyrt4877 = z.DecInferLen(yyl4877, z.DecBasicHandle().MaxInitLen, 56) - if yyrt4877 { - if yyrl4877 <= cap(yyv4877) { - yyv4877 = yyv4877[:yyrl4877] - } else { - yyv4877 = make([]LimitRangeItem, yyrl4877) - } - } else { - yyv4877 = make([]LimitRangeItem, yyrl4877) - } - yyc4877 = true - yyrr4877 = len(yyv4877) - if yyrg4877 { - copy(yyv4877, yyv24877) - } - } else if yyl4877 != len(yyv4877) { - yyv4877 = yyv4877[:yyl4877] - yyc4877 = true - } - yyj4877 := 0 - for ; yyj4877 < yyrr4877; yyj4877++ { - yyh4877.ElemContainerState(yyj4877) - if r.TryDecodeAsNil() { - yyv4877[yyj4877] = LimitRangeItem{} - } else { - yyv4878 := &yyv4877[yyj4877] - yyv4878.CodecDecodeSelf(d) - } - - } - if yyrt4877 { - for ; yyj4877 < yyl4877; yyj4877++ { - yyv4877 = append(yyv4877, LimitRangeItem{}) - yyh4877.ElemContainerState(yyj4877) - if r.TryDecodeAsNil() { - yyv4877[yyj4877] = LimitRangeItem{} - } else { - yyv4879 := &yyv4877[yyj4877] - yyv4879.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj4877 := 0 - for ; !r.CheckBreak(); yyj4877++ { - - if yyj4877 >= len(yyv4877) { - yyv4877 = append(yyv4877, LimitRangeItem{}) // var yyz4877 LimitRangeItem - yyc4877 = true - } - yyh4877.ElemContainerState(yyj4877) - if yyj4877 < len(yyv4877) { - if r.TryDecodeAsNil() { - yyv4877[yyj4877] = LimitRangeItem{} - } else { - yyv4880 := &yyv4877[yyj4877] - yyv4880.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj4877 < len(yyv4877) { - yyv4877 = yyv4877[:yyj4877] - yyc4877 = true - } else if yyj4877 == 0 && yyv4877 == nil { - yyv4877 = []LimitRangeItem{} - yyc4877 = true - } - } - yyh4877.End() - if yyc4877 { - *v = yyv4877 - } -} - -func (x codecSelfer1234) encSliceLimitRange(v []LimitRange, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv4881 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4882 := &yyv4881 - yy4882.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceLimitRange(v *[]LimitRange, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv4883 := *v - yyh4883, yyl4883 := z.DecSliceHelperStart() - var yyc4883 bool - if yyl4883 == 0 { - if yyv4883 == nil { - yyv4883 = []LimitRange{} - yyc4883 = true - } else if len(yyv4883) != 0 { - yyv4883 = yyv4883[:0] - yyc4883 = true - } - } else if yyl4883 > 0 { - var yyrr4883, yyrl4883 int - var yyrt4883 bool - if yyl4883 > cap(yyv4883) { - - yyrg4883 := len(yyv4883) > 0 - yyv24883 := yyv4883 - yyrl4883, yyrt4883 = z.DecInferLen(yyl4883, z.DecBasicHandle().MaxInitLen, 280) - if yyrt4883 { - if yyrl4883 <= cap(yyv4883) { - yyv4883 = yyv4883[:yyrl4883] - } else { - yyv4883 = make([]LimitRange, yyrl4883) - } - } else { - yyv4883 = make([]LimitRange, yyrl4883) - } - yyc4883 = true - yyrr4883 = len(yyv4883) - if yyrg4883 { - copy(yyv4883, yyv24883) - } - } else if yyl4883 != len(yyv4883) { - yyv4883 = yyv4883[:yyl4883] - yyc4883 = true - } - yyj4883 := 0 - for ; yyj4883 < yyrr4883; yyj4883++ { - yyh4883.ElemContainerState(yyj4883) - if r.TryDecodeAsNil() { - yyv4883[yyj4883] = LimitRange{} - } else { - yyv4884 := &yyv4883[yyj4883] - yyv4884.CodecDecodeSelf(d) - } - - } - if yyrt4883 { - for ; yyj4883 < yyl4883; yyj4883++ { - yyv4883 = append(yyv4883, LimitRange{}) - yyh4883.ElemContainerState(yyj4883) - if r.TryDecodeAsNil() { - yyv4883[yyj4883] = LimitRange{} - } else { - yyv4885 := &yyv4883[yyj4883] - yyv4885.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj4883 := 0 - for ; !r.CheckBreak(); yyj4883++ { - - if yyj4883 >= len(yyv4883) { - yyv4883 = append(yyv4883, LimitRange{}) // var yyz4883 LimitRange - yyc4883 = true - } - yyh4883.ElemContainerState(yyj4883) - if yyj4883 < len(yyv4883) { - if r.TryDecodeAsNil() { - yyv4883[yyj4883] = LimitRange{} - } else { - yyv4886 := &yyv4883[yyj4883] - yyv4886.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj4883 < len(yyv4883) { - yyv4883 = yyv4883[:yyj4883] - yyc4883 = true - } else if yyj4883 == 0 && yyv4883 == nil { - yyv4883 = []LimitRange{} - yyc4883 = true - } - } - yyh4883.End() - if yyc4883 { - *v = yyv4883 - } -} - -func (x codecSelfer1234) encSliceResourceQuotaScope(v []ResourceQuotaScope, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv4887 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv4887.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceResourceQuotaScope(v *[]ResourceQuotaScope, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv4888 := *v - yyh4888, yyl4888 := z.DecSliceHelperStart() - var yyc4888 bool - if yyl4888 == 0 { - if yyv4888 == nil { - yyv4888 = []ResourceQuotaScope{} - yyc4888 = true - } else if len(yyv4888) != 0 { - yyv4888 = yyv4888[:0] - yyc4888 = true - } - } else if yyl4888 > 0 { - var yyrr4888, yyrl4888 int - var yyrt4888 bool - if yyl4888 > cap(yyv4888) { - - yyrl4888, yyrt4888 = z.DecInferLen(yyl4888, z.DecBasicHandle().MaxInitLen, 16) - if yyrt4888 { - if yyrl4888 <= cap(yyv4888) { - yyv4888 = yyv4888[:yyrl4888] - } else { - yyv4888 = make([]ResourceQuotaScope, yyrl4888) - } - } else { - yyv4888 = make([]ResourceQuotaScope, yyrl4888) - } - yyc4888 = true - yyrr4888 = len(yyv4888) - } else if yyl4888 != len(yyv4888) { - yyv4888 = yyv4888[:yyl4888] - yyc4888 = true - } - yyj4888 := 0 - for ; yyj4888 < yyrr4888; yyj4888++ { - yyh4888.ElemContainerState(yyj4888) - if r.TryDecodeAsNil() { - yyv4888[yyj4888] = "" - } else { - yyv4888[yyj4888] = ResourceQuotaScope(r.DecodeString()) - } - - } - if yyrt4888 { - for ; yyj4888 < yyl4888; yyj4888++ { - yyv4888 = append(yyv4888, "") - yyh4888.ElemContainerState(yyj4888) - if r.TryDecodeAsNil() { - yyv4888[yyj4888] = "" - } else { - yyv4888[yyj4888] = ResourceQuotaScope(r.DecodeString()) - } - - } - } - - } else { - yyj4888 := 0 - for ; !r.CheckBreak(); yyj4888++ { - - if yyj4888 >= len(yyv4888) { - yyv4888 = append(yyv4888, "") // var yyz4888 ResourceQuotaScope - yyc4888 = true - } - yyh4888.ElemContainerState(yyj4888) - if yyj4888 < len(yyv4888) { - if r.TryDecodeAsNil() { - yyv4888[yyj4888] = "" - } else { - yyv4888[yyj4888] = ResourceQuotaScope(r.DecodeString()) - } - - } else { - z.DecSwallow() - } - - } - if yyj4888 < len(yyv4888) { - yyv4888 = yyv4888[:yyj4888] - yyc4888 = true - } else if yyj4888 == 0 && yyv4888 == nil { - yyv4888 = []ResourceQuotaScope{} - yyc4888 = true - } - } - yyh4888.End() - if yyc4888 { - *v = yyv4888 - } -} - -func (x codecSelfer1234) encSliceResourceQuota(v []ResourceQuota, e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - r.EncodeArrayStart(len(v)) - for _, yyv4892 := range v { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4893 := &yyv4892 - yy4893.CodecEncodeSelf(e) - } - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x codecSelfer1234) decSliceResourceQuota(v *[]ResourceQuota, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - - yyv4894 := *v - yyh4894, yyl4894 := z.DecSliceHelperStart() - var yyc4894 bool - if yyl4894 == 0 { - if yyv4894 == nil { - yyv4894 = []ResourceQuota{} - yyc4894 = true - } else if len(yyv4894) != 0 { - yyv4894 = yyv4894[:0] - yyc4894 = true - } - } else if yyl4894 > 0 { - var yyrr4894, yyrl4894 int - var yyrt4894 bool - if yyl4894 > cap(yyv4894) { - - yyrg4894 := len(yyv4894) > 0 - yyv24894 := yyv4894 - yyrl4894, yyrt4894 = z.DecInferLen(yyl4894, z.DecBasicHandle().MaxInitLen, 304) - if yyrt4894 { - if yyrl4894 <= cap(yyv4894) { - yyv4894 = yyv4894[:yyrl4894] - } else { - yyv4894 = make([]ResourceQuota, yyrl4894) - } - } else { - yyv4894 = make([]ResourceQuota, yyrl4894) - } - yyc4894 = true - yyrr4894 = len(yyv4894) - if yyrg4894 { - copy(yyv4894, yyv24894) - } - } else if yyl4894 != len(yyv4894) { - yyv4894 = yyv4894[:yyl4894] - yyc4894 = true - } - yyj4894 := 0 - for ; yyj4894 < yyrr4894; yyj4894++ { - yyh4894.ElemContainerState(yyj4894) - if r.TryDecodeAsNil() { - yyv4894[yyj4894] = ResourceQuota{} - } else { - yyv4895 := &yyv4894[yyj4894] - yyv4895.CodecDecodeSelf(d) - } - - } - if yyrt4894 { - for ; yyj4894 < yyl4894; yyj4894++ { - yyv4894 = append(yyv4894, ResourceQuota{}) - yyh4894.ElemContainerState(yyj4894) - if r.TryDecodeAsNil() { - yyv4894[yyj4894] = ResourceQuota{} - } else { - yyv4896 := &yyv4894[yyj4894] - yyv4896.CodecDecodeSelf(d) - } - - } - } - - } else { - yyj4894 := 0 - for ; !r.CheckBreak(); yyj4894++ { - - if yyj4894 >= len(yyv4894) { - yyv4894 = append(yyv4894, ResourceQuota{}) // var yyz4894 ResourceQuota - yyc4894 = true - } - yyh4894.ElemContainerState(yyj4894) - if yyj4894 < len(yyv4894) { - if r.TryDecodeAsNil() { - yyv4894[yyj4894] = ResourceQuota{} - } else { - yyv4897 := &yyv4894[yyj4894] - yyv4897.CodecDecodeSelf(d) - } - - } else { - z.DecSwallow() - } - - } - if yyj4894 < len(yyv4894) { - yyv4894 = yyv4894[:yyj4894] - yyc4894 = true - } else if yyj4894 == 0 && yyv4894 == nil { - yyv4894 = []ResourceQuota{} - yyc4894 = true - } - } - yyh4894.End() - if yyc4894 { - *v = yyv4894 - } -} - func (x codecSelfer1234) encMapstringSliceuint8(v map[string][]uint8, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeMapStart(len(v)) - for yyk4898, yyv4898 := range v { + for yyk4872, yyv4872 := range v { z.EncSendContainerState(codecSelfer_containerMapKey1234) - yym4899 := z.EncBinary() - _ = yym4899 + yym4873 := z.EncBinary() + _ = yym4873 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyk4898)) + r.EncodeString(codecSelferC_UTF81234, string(yyk4872)) } z.EncSendContainerState(codecSelfer_containerMapValue1234) - if yyv4898 == nil { + if yyv4872 == nil { r.EncodeNil() } else { - yym4900 := z.EncBinary() - _ = yym4900 + yym4874 := z.EncBinary() + _ = yym4874 if false { } else { - r.EncodeStringBytes(codecSelferC_RAW1234, []byte(yyv4898)) + r.EncodeStringBytes(codecSelferC_RAW1234, []byte(yyv4872)) } } } @@ -63014,80 +62715,80 @@ func (x codecSelfer1234) decMapstringSliceuint8(v *map[string][]uint8, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4901 := *v - yyl4901 := r.ReadMapStart() - yybh4901 := z.DecBasicHandle() - if yyv4901 == nil { - yyrl4901, _ := z.DecInferLen(yyl4901, yybh4901.MaxInitLen, 40) - yyv4901 = make(map[string][]uint8, yyrl4901) - *v = yyv4901 + yyv4875 := *v + yyl4875 := r.ReadMapStart() + yybh4875 := z.DecBasicHandle() + if yyv4875 == nil { + yyrl4875, _ := z.DecInferLen(yyl4875, yybh4875.MaxInitLen, 40) + yyv4875 = make(map[string][]uint8, yyrl4875) + *v = yyv4875 } - var yymk4901 string - var yymv4901 []uint8 - var yymg4901 bool - if yybh4901.MapValueReset { - yymg4901 = true + var yymk4875 string + var yymv4875 []uint8 + var yymg4875 bool + if yybh4875.MapValueReset { + yymg4875 = true } - if yyl4901 > 0 { - for yyj4901 := 0; yyj4901 < yyl4901; yyj4901++ { + if yyl4875 > 0 { + for yyj4875 := 0; yyj4875 < yyl4875; yyj4875++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk4901 = "" + yymk4875 = "" } else { - yymk4901 = string(r.DecodeString()) + yymk4875 = string(r.DecodeString()) } - if yymg4901 { - yymv4901 = yyv4901[yymk4901] + if yymg4875 { + yymv4875 = yyv4875[yymk4875] } else { - yymv4901 = nil + yymv4875 = nil } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv4901 = nil + yymv4875 = nil } else { - yyv4903 := &yymv4901 - yym4904 := z.DecBinary() - _ = yym4904 + yyv4877 := &yymv4875 + yym4878 := z.DecBinary() + _ = yym4878 if false { } else { - *yyv4903 = r.DecodeBytes(*(*[]byte)(yyv4903), false, false) + *yyv4877 = r.DecodeBytes(*(*[]byte)(yyv4877), false, false) } } - if yyv4901 != nil { - yyv4901[yymk4901] = yymv4901 + if yyv4875 != nil { + yyv4875[yymk4875] = yymv4875 } } - } else if yyl4901 < 0 { - for yyj4901 := 0; !r.CheckBreak(); yyj4901++ { + } else if yyl4875 < 0 { + for yyj4875 := 0; !r.CheckBreak(); yyj4875++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk4901 = "" + yymk4875 = "" } else { - yymk4901 = string(r.DecodeString()) + yymk4875 = string(r.DecodeString()) } - if yymg4901 { - yymv4901 = yyv4901[yymk4901] + if yymg4875 { + yymv4875 = yyv4875[yymk4875] } else { - yymv4901 = nil + yymv4875 = nil } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv4901 = nil + yymv4875 = nil } else { - yyv4906 := &yymv4901 - yym4907 := z.DecBinary() - _ = yym4907 + yyv4880 := &yymv4875 + yym4881 := z.DecBinary() + _ = yym4881 if false { } else { - *yyv4906 = r.DecodeBytes(*(*[]byte)(yyv4906), false, false) + *yyv4880 = r.DecodeBytes(*(*[]byte)(yyv4880), false, false) } } - if yyv4901 != nil { - yyv4901[yymk4901] = yymv4901 + if yyv4875 != nil { + yyv4875[yymk4875] = yymv4875 } } } // else len==0: TODO: Should we clear map entries? @@ -63099,10 +62800,10 @@ func (x codecSelfer1234) encSliceSecret(v []Secret, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4908 := range v { + for _, yyv4882 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4909 := &yyv4908 - yy4909.CodecEncodeSelf(e) + yy4883 := &yyv4882 + yy4883.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -63112,83 +62813,83 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4910 := *v - yyh4910, yyl4910 := z.DecSliceHelperStart() - var yyc4910 bool - if yyl4910 == 0 { - if yyv4910 == nil { - yyv4910 = []Secret{} - yyc4910 = true - } else if len(yyv4910) != 0 { - yyv4910 = yyv4910[:0] - yyc4910 = true + yyv4884 := *v + yyh4884, yyl4884 := z.DecSliceHelperStart() + var yyc4884 bool + if yyl4884 == 0 { + if yyv4884 == nil { + yyv4884 = []Secret{} + yyc4884 = true + } else if len(yyv4884) != 0 { + yyv4884 = yyv4884[:0] + yyc4884 = true } - } else if yyl4910 > 0 { - var yyrr4910, yyrl4910 int - var yyrt4910 bool - if yyl4910 > cap(yyv4910) { + } else if yyl4884 > 0 { + var yyrr4884, yyrl4884 int + var yyrt4884 bool + if yyl4884 > cap(yyv4884) { - yyrg4910 := len(yyv4910) > 0 - yyv24910 := yyv4910 - yyrl4910, yyrt4910 = z.DecInferLen(yyl4910, z.DecBasicHandle().MaxInitLen, 288) - if yyrt4910 { - if yyrl4910 <= cap(yyv4910) { - yyv4910 = yyv4910[:yyrl4910] + yyrg4884 := len(yyv4884) > 0 + yyv24884 := yyv4884 + yyrl4884, yyrt4884 = z.DecInferLen(yyl4884, z.DecBasicHandle().MaxInitLen, 288) + if yyrt4884 { + if yyrl4884 <= cap(yyv4884) { + yyv4884 = yyv4884[:yyrl4884] } else { - yyv4910 = make([]Secret, yyrl4910) + yyv4884 = make([]Secret, yyrl4884) } } else { - yyv4910 = make([]Secret, yyrl4910) + yyv4884 = make([]Secret, yyrl4884) } - yyc4910 = true - yyrr4910 = len(yyv4910) - if yyrg4910 { - copy(yyv4910, yyv24910) + yyc4884 = true + yyrr4884 = len(yyv4884) + if yyrg4884 { + copy(yyv4884, yyv24884) } - } else if yyl4910 != len(yyv4910) { - yyv4910 = yyv4910[:yyl4910] - yyc4910 = true + } else if yyl4884 != len(yyv4884) { + yyv4884 = yyv4884[:yyl4884] + yyc4884 = true } - yyj4910 := 0 - for ; yyj4910 < yyrr4910; yyj4910++ { - yyh4910.ElemContainerState(yyj4910) + yyj4884 := 0 + for ; yyj4884 < yyrr4884; yyj4884++ { + yyh4884.ElemContainerState(yyj4884) if r.TryDecodeAsNil() { - yyv4910[yyj4910] = Secret{} + yyv4884[yyj4884] = Secret{} } else { - yyv4911 := &yyv4910[yyj4910] - yyv4911.CodecDecodeSelf(d) + yyv4885 := &yyv4884[yyj4884] + yyv4885.CodecDecodeSelf(d) } } - if yyrt4910 { - for ; yyj4910 < yyl4910; yyj4910++ { - yyv4910 = append(yyv4910, Secret{}) - yyh4910.ElemContainerState(yyj4910) + if yyrt4884 { + for ; yyj4884 < yyl4884; yyj4884++ { + yyv4884 = append(yyv4884, Secret{}) + yyh4884.ElemContainerState(yyj4884) if r.TryDecodeAsNil() { - yyv4910[yyj4910] = Secret{} + yyv4884[yyj4884] = Secret{} } else { - yyv4912 := &yyv4910[yyj4910] - yyv4912.CodecDecodeSelf(d) + yyv4886 := &yyv4884[yyj4884] + yyv4886.CodecDecodeSelf(d) } } } } else { - yyj4910 := 0 - for ; !r.CheckBreak(); yyj4910++ { + yyj4884 := 0 + for ; !r.CheckBreak(); yyj4884++ { - if yyj4910 >= len(yyv4910) { - yyv4910 = append(yyv4910, Secret{}) // var yyz4910 Secret - yyc4910 = true + if yyj4884 >= len(yyv4884) { + yyv4884 = append(yyv4884, Secret{}) // var yyz4884 Secret + yyc4884 = true } - yyh4910.ElemContainerState(yyj4910) - if yyj4910 < len(yyv4910) { + yyh4884.ElemContainerState(yyj4884) + if yyj4884 < len(yyv4884) { if r.TryDecodeAsNil() { - yyv4910[yyj4910] = Secret{} + yyv4884[yyj4884] = Secret{} } else { - yyv4913 := &yyv4910[yyj4910] - yyv4913.CodecDecodeSelf(d) + yyv4887 := &yyv4884[yyj4884] + yyv4887.CodecDecodeSelf(d) } } else { @@ -63196,17 +62897,17 @@ func (x codecSelfer1234) decSliceSecret(v *[]Secret, d *codec1978.Decoder) { } } - if yyj4910 < len(yyv4910) { - yyv4910 = yyv4910[:yyj4910] - yyc4910 = true - } else if yyj4910 == 0 && yyv4910 == nil { - yyv4910 = []Secret{} - yyc4910 = true + if yyj4884 < len(yyv4884) { + yyv4884 = yyv4884[:yyj4884] + yyc4884 = true + } else if yyj4884 == 0 && yyv4884 == nil { + yyv4884 = []Secret{} + yyc4884 = true } } - yyh4910.End() - if yyc4910 { - *v = yyv4910 + yyh4884.End() + if yyc4884 { + *v = yyv4884 } } @@ -63215,10 +62916,10 @@ func (x codecSelfer1234) encSliceConfigMap(v []ConfigMap, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4914 := range v { + for _, yyv4888 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4915 := &yyv4914 - yy4915.CodecEncodeSelf(e) + yy4889 := &yyv4888 + yy4889.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -63228,83 +62929,83 @@ func (x codecSelfer1234) decSliceConfigMap(v *[]ConfigMap, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4916 := *v - yyh4916, yyl4916 := z.DecSliceHelperStart() - var yyc4916 bool - if yyl4916 == 0 { - if yyv4916 == nil { - yyv4916 = []ConfigMap{} - yyc4916 = true - } else if len(yyv4916) != 0 { - yyv4916 = yyv4916[:0] - yyc4916 = true + yyv4890 := *v + yyh4890, yyl4890 := z.DecSliceHelperStart() + var yyc4890 bool + if yyl4890 == 0 { + if yyv4890 == nil { + yyv4890 = []ConfigMap{} + yyc4890 = true + } else if len(yyv4890) != 0 { + yyv4890 = yyv4890[:0] + yyc4890 = true } - } else if yyl4916 > 0 { - var yyrr4916, yyrl4916 int - var yyrt4916 bool - if yyl4916 > cap(yyv4916) { + } else if yyl4890 > 0 { + var yyrr4890, yyrl4890 int + var yyrt4890 bool + if yyl4890 > cap(yyv4890) { - yyrg4916 := len(yyv4916) > 0 - yyv24916 := yyv4916 - yyrl4916, yyrt4916 = z.DecInferLen(yyl4916, z.DecBasicHandle().MaxInitLen, 264) - if yyrt4916 { - if yyrl4916 <= cap(yyv4916) { - yyv4916 = yyv4916[:yyrl4916] + yyrg4890 := len(yyv4890) > 0 + yyv24890 := yyv4890 + yyrl4890, yyrt4890 = z.DecInferLen(yyl4890, z.DecBasicHandle().MaxInitLen, 264) + if yyrt4890 { + if yyrl4890 <= cap(yyv4890) { + yyv4890 = yyv4890[:yyrl4890] } else { - yyv4916 = make([]ConfigMap, yyrl4916) + yyv4890 = make([]ConfigMap, yyrl4890) } } else { - yyv4916 = make([]ConfigMap, yyrl4916) + yyv4890 = make([]ConfigMap, yyrl4890) } - yyc4916 = true - yyrr4916 = len(yyv4916) - if yyrg4916 { - copy(yyv4916, yyv24916) + yyc4890 = true + yyrr4890 = len(yyv4890) + if yyrg4890 { + copy(yyv4890, yyv24890) } - } else if yyl4916 != len(yyv4916) { - yyv4916 = yyv4916[:yyl4916] - yyc4916 = true + } else if yyl4890 != len(yyv4890) { + yyv4890 = yyv4890[:yyl4890] + yyc4890 = true } - yyj4916 := 0 - for ; yyj4916 < yyrr4916; yyj4916++ { - yyh4916.ElemContainerState(yyj4916) + yyj4890 := 0 + for ; yyj4890 < yyrr4890; yyj4890++ { + yyh4890.ElemContainerState(yyj4890) if r.TryDecodeAsNil() { - yyv4916[yyj4916] = ConfigMap{} + yyv4890[yyj4890] = ConfigMap{} } else { - yyv4917 := &yyv4916[yyj4916] - yyv4917.CodecDecodeSelf(d) + yyv4891 := &yyv4890[yyj4890] + yyv4891.CodecDecodeSelf(d) } } - if yyrt4916 { - for ; yyj4916 < yyl4916; yyj4916++ { - yyv4916 = append(yyv4916, ConfigMap{}) - yyh4916.ElemContainerState(yyj4916) + if yyrt4890 { + for ; yyj4890 < yyl4890; yyj4890++ { + yyv4890 = append(yyv4890, ConfigMap{}) + yyh4890.ElemContainerState(yyj4890) if r.TryDecodeAsNil() { - yyv4916[yyj4916] = ConfigMap{} + yyv4890[yyj4890] = ConfigMap{} } else { - yyv4918 := &yyv4916[yyj4916] - yyv4918.CodecDecodeSelf(d) + yyv4892 := &yyv4890[yyj4890] + yyv4892.CodecDecodeSelf(d) } } } } else { - yyj4916 := 0 - for ; !r.CheckBreak(); yyj4916++ { + yyj4890 := 0 + for ; !r.CheckBreak(); yyj4890++ { - if yyj4916 >= len(yyv4916) { - yyv4916 = append(yyv4916, ConfigMap{}) // var yyz4916 ConfigMap - yyc4916 = true + if yyj4890 >= len(yyv4890) { + yyv4890 = append(yyv4890, ConfigMap{}) // var yyz4890 ConfigMap + yyc4890 = true } - yyh4916.ElemContainerState(yyj4916) - if yyj4916 < len(yyv4916) { + yyh4890.ElemContainerState(yyj4890) + if yyj4890 < len(yyv4890) { if r.TryDecodeAsNil() { - yyv4916[yyj4916] = ConfigMap{} + yyv4890[yyj4890] = ConfigMap{} } else { - yyv4919 := &yyv4916[yyj4916] - yyv4919.CodecDecodeSelf(d) + yyv4893 := &yyv4890[yyj4890] + yyv4893.CodecDecodeSelf(d) } } else { @@ -63312,17 +63013,17 @@ func (x codecSelfer1234) decSliceConfigMap(v *[]ConfigMap, d *codec1978.Decoder) } } - if yyj4916 < len(yyv4916) { - yyv4916 = yyv4916[:yyj4916] - yyc4916 = true - } else if yyj4916 == 0 && yyv4916 == nil { - yyv4916 = []ConfigMap{} - yyc4916 = true + if yyj4890 < len(yyv4890) { + yyv4890 = yyv4890[:yyj4890] + yyc4890 = true + } else if yyj4890 == 0 && yyv4890 == nil { + yyv4890 = []ConfigMap{} + yyc4890 = true } } - yyh4916.End() - if yyc4916 { - *v = yyv4916 + yyh4890.End() + if yyc4890 { + *v = yyv4890 } } @@ -63331,10 +63032,10 @@ func (x codecSelfer1234) encSliceComponentCondition(v []ComponentCondition, e *c z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4920 := range v { + for _, yyv4894 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4921 := &yyv4920 - yy4921.CodecEncodeSelf(e) + yy4895 := &yyv4894 + yy4895.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -63344,83 +63045,83 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4922 := *v - yyh4922, yyl4922 := z.DecSliceHelperStart() - var yyc4922 bool - if yyl4922 == 0 { - if yyv4922 == nil { - yyv4922 = []ComponentCondition{} - yyc4922 = true - } else if len(yyv4922) != 0 { - yyv4922 = yyv4922[:0] - yyc4922 = true + yyv4896 := *v + yyh4896, yyl4896 := z.DecSliceHelperStart() + var yyc4896 bool + if yyl4896 == 0 { + if yyv4896 == nil { + yyv4896 = []ComponentCondition{} + yyc4896 = true + } else if len(yyv4896) != 0 { + yyv4896 = yyv4896[:0] + yyc4896 = true } - } else if yyl4922 > 0 { - var yyrr4922, yyrl4922 int - var yyrt4922 bool - if yyl4922 > cap(yyv4922) { + } else if yyl4896 > 0 { + var yyrr4896, yyrl4896 int + var yyrt4896 bool + if yyl4896 > cap(yyv4896) { - yyrg4922 := len(yyv4922) > 0 - yyv24922 := yyv4922 - yyrl4922, yyrt4922 = z.DecInferLen(yyl4922, z.DecBasicHandle().MaxInitLen, 64) - if yyrt4922 { - if yyrl4922 <= cap(yyv4922) { - yyv4922 = yyv4922[:yyrl4922] + yyrg4896 := len(yyv4896) > 0 + yyv24896 := yyv4896 + yyrl4896, yyrt4896 = z.DecInferLen(yyl4896, z.DecBasicHandle().MaxInitLen, 64) + if yyrt4896 { + if yyrl4896 <= cap(yyv4896) { + yyv4896 = yyv4896[:yyrl4896] } else { - yyv4922 = make([]ComponentCondition, yyrl4922) + yyv4896 = make([]ComponentCondition, yyrl4896) } } else { - yyv4922 = make([]ComponentCondition, yyrl4922) + yyv4896 = make([]ComponentCondition, yyrl4896) } - yyc4922 = true - yyrr4922 = len(yyv4922) - if yyrg4922 { - copy(yyv4922, yyv24922) + yyc4896 = true + yyrr4896 = len(yyv4896) + if yyrg4896 { + copy(yyv4896, yyv24896) } - } else if yyl4922 != len(yyv4922) { - yyv4922 = yyv4922[:yyl4922] - yyc4922 = true + } else if yyl4896 != len(yyv4896) { + yyv4896 = yyv4896[:yyl4896] + yyc4896 = true } - yyj4922 := 0 - for ; yyj4922 < yyrr4922; yyj4922++ { - yyh4922.ElemContainerState(yyj4922) + yyj4896 := 0 + for ; yyj4896 < yyrr4896; yyj4896++ { + yyh4896.ElemContainerState(yyj4896) if r.TryDecodeAsNil() { - yyv4922[yyj4922] = ComponentCondition{} + yyv4896[yyj4896] = ComponentCondition{} } else { - yyv4923 := &yyv4922[yyj4922] - yyv4923.CodecDecodeSelf(d) + yyv4897 := &yyv4896[yyj4896] + yyv4897.CodecDecodeSelf(d) } } - if yyrt4922 { - for ; yyj4922 < yyl4922; yyj4922++ { - yyv4922 = append(yyv4922, ComponentCondition{}) - yyh4922.ElemContainerState(yyj4922) + if yyrt4896 { + for ; yyj4896 < yyl4896; yyj4896++ { + yyv4896 = append(yyv4896, ComponentCondition{}) + yyh4896.ElemContainerState(yyj4896) if r.TryDecodeAsNil() { - yyv4922[yyj4922] = ComponentCondition{} + yyv4896[yyj4896] = ComponentCondition{} } else { - yyv4924 := &yyv4922[yyj4922] - yyv4924.CodecDecodeSelf(d) + yyv4898 := &yyv4896[yyj4896] + yyv4898.CodecDecodeSelf(d) } } } } else { - yyj4922 := 0 - for ; !r.CheckBreak(); yyj4922++ { + yyj4896 := 0 + for ; !r.CheckBreak(); yyj4896++ { - if yyj4922 >= len(yyv4922) { - yyv4922 = append(yyv4922, ComponentCondition{}) // var yyz4922 ComponentCondition - yyc4922 = true + if yyj4896 >= len(yyv4896) { + yyv4896 = append(yyv4896, ComponentCondition{}) // var yyz4896 ComponentCondition + yyc4896 = true } - yyh4922.ElemContainerState(yyj4922) - if yyj4922 < len(yyv4922) { + yyh4896.ElemContainerState(yyj4896) + if yyj4896 < len(yyv4896) { if r.TryDecodeAsNil() { - yyv4922[yyj4922] = ComponentCondition{} + yyv4896[yyj4896] = ComponentCondition{} } else { - yyv4925 := &yyv4922[yyj4922] - yyv4925.CodecDecodeSelf(d) + yyv4899 := &yyv4896[yyj4896] + yyv4899.CodecDecodeSelf(d) } } else { @@ -63428,17 +63129,17 @@ func (x codecSelfer1234) decSliceComponentCondition(v *[]ComponentCondition, d * } } - if yyj4922 < len(yyv4922) { - yyv4922 = yyv4922[:yyj4922] - yyc4922 = true - } else if yyj4922 == 0 && yyv4922 == nil { - yyv4922 = []ComponentCondition{} - yyc4922 = true + if yyj4896 < len(yyv4896) { + yyv4896 = yyv4896[:yyj4896] + yyc4896 = true + } else if yyj4896 == 0 && yyv4896 == nil { + yyv4896 = []ComponentCondition{} + yyc4896 = true } } - yyh4922.End() - if yyc4922 { - *v = yyv4922 + yyh4896.End() + if yyc4896 { + *v = yyv4896 } } @@ -63447,10 +63148,10 @@ func (x codecSelfer1234) encSliceComponentStatus(v []ComponentStatus, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4926 := range v { + for _, yyv4900 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4927 := &yyv4926 - yy4927.CodecEncodeSelf(e) + yy4901 := &yyv4900 + yy4901.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -63460,83 +63161,83 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4928 := *v - yyh4928, yyl4928 := z.DecSliceHelperStart() - var yyc4928 bool - if yyl4928 == 0 { - if yyv4928 == nil { - yyv4928 = []ComponentStatus{} - yyc4928 = true - } else if len(yyv4928) != 0 { - yyv4928 = yyv4928[:0] - yyc4928 = true + yyv4902 := *v + yyh4902, yyl4902 := z.DecSliceHelperStart() + var yyc4902 bool + if yyl4902 == 0 { + if yyv4902 == nil { + yyv4902 = []ComponentStatus{} + yyc4902 = true + } else if len(yyv4902) != 0 { + yyv4902 = yyv4902[:0] + yyc4902 = true } - } else if yyl4928 > 0 { - var yyrr4928, yyrl4928 int - var yyrt4928 bool - if yyl4928 > cap(yyv4928) { + } else if yyl4902 > 0 { + var yyrr4902, yyrl4902 int + var yyrt4902 bool + if yyl4902 > cap(yyv4902) { - yyrg4928 := len(yyv4928) > 0 - yyv24928 := yyv4928 - yyrl4928, yyrt4928 = z.DecInferLen(yyl4928, z.DecBasicHandle().MaxInitLen, 280) - if yyrt4928 { - if yyrl4928 <= cap(yyv4928) { - yyv4928 = yyv4928[:yyrl4928] + yyrg4902 := len(yyv4902) > 0 + yyv24902 := yyv4902 + yyrl4902, yyrt4902 = z.DecInferLen(yyl4902, z.DecBasicHandle().MaxInitLen, 280) + if yyrt4902 { + if yyrl4902 <= cap(yyv4902) { + yyv4902 = yyv4902[:yyrl4902] } else { - yyv4928 = make([]ComponentStatus, yyrl4928) + yyv4902 = make([]ComponentStatus, yyrl4902) } } else { - yyv4928 = make([]ComponentStatus, yyrl4928) + yyv4902 = make([]ComponentStatus, yyrl4902) } - yyc4928 = true - yyrr4928 = len(yyv4928) - if yyrg4928 { - copy(yyv4928, yyv24928) + yyc4902 = true + yyrr4902 = len(yyv4902) + if yyrg4902 { + copy(yyv4902, yyv24902) } - } else if yyl4928 != len(yyv4928) { - yyv4928 = yyv4928[:yyl4928] - yyc4928 = true + } else if yyl4902 != len(yyv4902) { + yyv4902 = yyv4902[:yyl4902] + yyc4902 = true } - yyj4928 := 0 - for ; yyj4928 < yyrr4928; yyj4928++ { - yyh4928.ElemContainerState(yyj4928) + yyj4902 := 0 + for ; yyj4902 < yyrr4902; yyj4902++ { + yyh4902.ElemContainerState(yyj4902) if r.TryDecodeAsNil() { - yyv4928[yyj4928] = ComponentStatus{} + yyv4902[yyj4902] = ComponentStatus{} } else { - yyv4929 := &yyv4928[yyj4928] - yyv4929.CodecDecodeSelf(d) + yyv4903 := &yyv4902[yyj4902] + yyv4903.CodecDecodeSelf(d) } } - if yyrt4928 { - for ; yyj4928 < yyl4928; yyj4928++ { - yyv4928 = append(yyv4928, ComponentStatus{}) - yyh4928.ElemContainerState(yyj4928) + if yyrt4902 { + for ; yyj4902 < yyl4902; yyj4902++ { + yyv4902 = append(yyv4902, ComponentStatus{}) + yyh4902.ElemContainerState(yyj4902) if r.TryDecodeAsNil() { - yyv4928[yyj4928] = ComponentStatus{} + yyv4902[yyj4902] = ComponentStatus{} } else { - yyv4930 := &yyv4928[yyj4928] - yyv4930.CodecDecodeSelf(d) + yyv4904 := &yyv4902[yyj4902] + yyv4904.CodecDecodeSelf(d) } } } } else { - yyj4928 := 0 - for ; !r.CheckBreak(); yyj4928++ { + yyj4902 := 0 + for ; !r.CheckBreak(); yyj4902++ { - if yyj4928 >= len(yyv4928) { - yyv4928 = append(yyv4928, ComponentStatus{}) // var yyz4928 ComponentStatus - yyc4928 = true + if yyj4902 >= len(yyv4902) { + yyv4902 = append(yyv4902, ComponentStatus{}) // var yyz4902 ComponentStatus + yyc4902 = true } - yyh4928.ElemContainerState(yyj4928) - if yyj4928 < len(yyv4928) { + yyh4902.ElemContainerState(yyj4902) + if yyj4902 < len(yyv4902) { if r.TryDecodeAsNil() { - yyv4928[yyj4928] = ComponentStatus{} + yyv4902[yyj4902] = ComponentStatus{} } else { - yyv4931 := &yyv4928[yyj4928] - yyv4931.CodecDecodeSelf(d) + yyv4905 := &yyv4902[yyj4902] + yyv4905.CodecDecodeSelf(d) } } else { @@ -63544,17 +63245,17 @@ func (x codecSelfer1234) decSliceComponentStatus(v *[]ComponentStatus, d *codec1 } } - if yyj4928 < len(yyv4928) { - yyv4928 = yyv4928[:yyj4928] - yyc4928 = true - } else if yyj4928 == 0 && yyv4928 == nil { - yyv4928 = []ComponentStatus{} - yyc4928 = true + if yyj4902 < len(yyv4902) { + yyv4902 = yyv4902[:yyj4902] + yyc4902 = true + } else if yyj4902 == 0 && yyv4902 == nil { + yyv4902 = []ComponentStatus{} + yyc4902 = true } } - yyh4928.End() - if yyc4928 { - *v = yyv4928 + yyh4902.End() + if yyc4902 { + *v = yyv4902 } } @@ -63563,10 +63264,10 @@ func (x codecSelfer1234) encSliceDownwardAPIVolumeFile(v []DownwardAPIVolumeFile z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv4932 := range v { + for _, yyv4906 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy4933 := &yyv4932 - yy4933.CodecEncodeSelf(e) + yy4907 := &yyv4906 + yy4907.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -63576,83 +63277,83 @@ func (x codecSelfer1234) decSliceDownwardAPIVolumeFile(v *[]DownwardAPIVolumeFil z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv4934 := *v - yyh4934, yyl4934 := z.DecSliceHelperStart() - var yyc4934 bool - if yyl4934 == 0 { - if yyv4934 == nil { - yyv4934 = []DownwardAPIVolumeFile{} - yyc4934 = true - } else if len(yyv4934) != 0 { - yyv4934 = yyv4934[:0] - yyc4934 = true + yyv4908 := *v + yyh4908, yyl4908 := z.DecSliceHelperStart() + var yyc4908 bool + if yyl4908 == 0 { + if yyv4908 == nil { + yyv4908 = []DownwardAPIVolumeFile{} + yyc4908 = true + } else if len(yyv4908) != 0 { + yyv4908 = yyv4908[:0] + yyc4908 = true } - } else if yyl4934 > 0 { - var yyrr4934, yyrl4934 int - var yyrt4934 bool - if yyl4934 > cap(yyv4934) { + } else if yyl4908 > 0 { + var yyrr4908, yyrl4908 int + var yyrt4908 bool + if yyl4908 > cap(yyv4908) { - yyrg4934 := len(yyv4934) > 0 - yyv24934 := yyv4934 - yyrl4934, yyrt4934 = z.DecInferLen(yyl4934, z.DecBasicHandle().MaxInitLen, 40) - if yyrt4934 { - if yyrl4934 <= cap(yyv4934) { - yyv4934 = yyv4934[:yyrl4934] + yyrg4908 := len(yyv4908) > 0 + yyv24908 := yyv4908 + yyrl4908, yyrt4908 = z.DecInferLen(yyl4908, z.DecBasicHandle().MaxInitLen, 40) + if yyrt4908 { + if yyrl4908 <= cap(yyv4908) { + yyv4908 = yyv4908[:yyrl4908] } else { - yyv4934 = make([]DownwardAPIVolumeFile, yyrl4934) + yyv4908 = make([]DownwardAPIVolumeFile, yyrl4908) } } else { - yyv4934 = make([]DownwardAPIVolumeFile, yyrl4934) + yyv4908 = make([]DownwardAPIVolumeFile, yyrl4908) } - yyc4934 = true - yyrr4934 = len(yyv4934) - if yyrg4934 { - copy(yyv4934, yyv24934) + yyc4908 = true + yyrr4908 = len(yyv4908) + if yyrg4908 { + copy(yyv4908, yyv24908) } - } else if yyl4934 != len(yyv4934) { - yyv4934 = yyv4934[:yyl4934] - yyc4934 = true + } else if yyl4908 != len(yyv4908) { + yyv4908 = yyv4908[:yyl4908] + yyc4908 = true } - yyj4934 := 0 - for ; yyj4934 < yyrr4934; yyj4934++ { - yyh4934.ElemContainerState(yyj4934) + yyj4908 := 0 + for ; yyj4908 < yyrr4908; yyj4908++ { + yyh4908.ElemContainerState(yyj4908) if r.TryDecodeAsNil() { - yyv4934[yyj4934] = DownwardAPIVolumeFile{} + yyv4908[yyj4908] = DownwardAPIVolumeFile{} } else { - yyv4935 := &yyv4934[yyj4934] - yyv4935.CodecDecodeSelf(d) + yyv4909 := &yyv4908[yyj4908] + yyv4909.CodecDecodeSelf(d) } } - if yyrt4934 { - for ; yyj4934 < yyl4934; yyj4934++ { - yyv4934 = append(yyv4934, DownwardAPIVolumeFile{}) - yyh4934.ElemContainerState(yyj4934) + if yyrt4908 { + for ; yyj4908 < yyl4908; yyj4908++ { + yyv4908 = append(yyv4908, DownwardAPIVolumeFile{}) + yyh4908.ElemContainerState(yyj4908) if r.TryDecodeAsNil() { - yyv4934[yyj4934] = DownwardAPIVolumeFile{} + yyv4908[yyj4908] = DownwardAPIVolumeFile{} } else { - yyv4936 := &yyv4934[yyj4934] - yyv4936.CodecDecodeSelf(d) + yyv4910 := &yyv4908[yyj4908] + yyv4910.CodecDecodeSelf(d) } } } } else { - yyj4934 := 0 - for ; !r.CheckBreak(); yyj4934++ { + yyj4908 := 0 + for ; !r.CheckBreak(); yyj4908++ { - if yyj4934 >= len(yyv4934) { - yyv4934 = append(yyv4934, DownwardAPIVolumeFile{}) // var yyz4934 DownwardAPIVolumeFile - yyc4934 = true + if yyj4908 >= len(yyv4908) { + yyv4908 = append(yyv4908, DownwardAPIVolumeFile{}) // var yyz4908 DownwardAPIVolumeFile + yyc4908 = true } - yyh4934.ElemContainerState(yyj4934) - if yyj4934 < len(yyv4934) { + yyh4908.ElemContainerState(yyj4908) + if yyj4908 < len(yyv4908) { if r.TryDecodeAsNil() { - yyv4934[yyj4934] = DownwardAPIVolumeFile{} + yyv4908[yyj4908] = DownwardAPIVolumeFile{} } else { - yyv4937 := &yyv4934[yyj4934] - yyv4937.CodecDecodeSelf(d) + yyv4911 := &yyv4908[yyj4908] + yyv4911.CodecDecodeSelf(d) } } else { @@ -63660,16 +63361,16 @@ func (x codecSelfer1234) decSliceDownwardAPIVolumeFile(v *[]DownwardAPIVolumeFil } } - if yyj4934 < len(yyv4934) { - yyv4934 = yyv4934[:yyj4934] - yyc4934 = true - } else if yyj4934 == 0 && yyv4934 == nil { - yyv4934 = []DownwardAPIVolumeFile{} - yyc4934 = true + if yyj4908 < len(yyv4908) { + yyv4908 = yyv4908[:yyj4908] + yyc4908 = true + } else if yyj4908 == 0 && yyv4908 == nil { + yyv4908 = []DownwardAPIVolumeFile{} + yyc4908 = true } } - yyh4934.End() - if yyc4934 { - *v = yyv4934 + yyh4908.End() + if yyc4908 { + *v = yyv4908 } } diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types.go b/staging/src/k8s.io/client-go/pkg/api/v1/types.go index 870216293c7..c38a438dc0d 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/types.go @@ -18,7 +18,7 @@ package v1 import ( "k8s.io/client-go/pkg/api/resource" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/types" "k8s.io/client-go/pkg/util/intstr" @@ -147,7 +147,7 @@ type ObjectMeta struct { // Null for lists. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - CreationTimestamp unversioned.Time `json:"creationTimestamp,omitempty" protobuf:"bytes,8,opt,name=creationTimestamp"` + CreationTimestamp metav1.Time `json:"creationTimestamp,omitempty" protobuf:"bytes,8,opt,name=creationTimestamp"` // DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This // field is set by the server when a graceful deletion is requested by the user, and is not @@ -167,7 +167,7 @@ type ObjectMeta struct { // Read-only. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - DeletionTimestamp *unversioned.Time `json:"deletionTimestamp,omitempty" protobuf:"bytes,9,opt,name=deletionTimestamp"` + DeletionTimestamp *metav1.Time `json:"deletionTimestamp,omitempty" protobuf:"bytes,9,opt,name=deletionTimestamp"` // Number of seconds allowed for this object to gracefully terminate before // it will be removed from the system. Only set when deletionTimestamp is also set. @@ -418,7 +418,7 @@ type PersistentVolumeSource struct { // It is analogous to a node. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes type PersistentVolume struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -496,11 +496,11 @@ type PersistentVolumeStatus struct { // PersistentVolumeList is a list of PersistentVolume items. type PersistentVolumeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of persistent volumes. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes Items []PersistentVolume `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -510,7 +510,7 @@ type PersistentVolumeList struct { // PersistentVolumeClaim is a user's request for and claim to a persistent volume type PersistentVolumeClaim struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -530,11 +530,11 @@ type PersistentVolumeClaim struct { // PersistentVolumeClaimList is a list of PersistentVolumeClaim items. type PersistentVolumeClaimList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // A list of persistent volume claims. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#persistentvolumeclaims Items []PersistentVolumeClaim `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -549,7 +549,7 @@ type PersistentVolumeClaimSpec struct { AccessModes []PersistentVolumeAccessMode `json:"accessModes,omitempty" protobuf:"bytes,1,rep,name=accessModes,casttype=PersistentVolumeAccessMode"` // A label query over volumes to consider for binding. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` // Resources represents the minimum resources the volume should have. // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#resources // +optional @@ -1543,7 +1543,7 @@ type ContainerStateWaiting struct { type ContainerStateRunning struct { // Time at which the container was last (re-)started // +optional - StartedAt unversioned.Time `json:"startedAt,omitempty" protobuf:"bytes,1,opt,name=startedAt"` + StartedAt metav1.Time `json:"startedAt,omitempty" protobuf:"bytes,1,opt,name=startedAt"` } // ContainerStateTerminated is a terminated state of a container. @@ -1561,10 +1561,10 @@ type ContainerStateTerminated struct { Message string `json:"message,omitempty" protobuf:"bytes,4,opt,name=message"` // Time at which previous execution of the container started // +optional - StartedAt unversioned.Time `json:"startedAt,omitempty" protobuf:"bytes,5,opt,name=startedAt"` + StartedAt metav1.Time `json:"startedAt,omitempty" protobuf:"bytes,5,opt,name=startedAt"` // Time at which the container last terminated // +optional - FinishedAt unversioned.Time `json:"finishedAt,omitempty" protobuf:"bytes,6,opt,name=finishedAt"` + FinishedAt metav1.Time `json:"finishedAt,omitempty" protobuf:"bytes,6,opt,name=finishedAt"` // Container's ID in the format 'docker://' // +optional ContainerID string `json:"containerID,omitempty" protobuf:"bytes,7,opt,name=containerID"` @@ -1667,10 +1667,10 @@ type PodCondition struct { Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"` // Last time we probed the condition. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // Unique, one-word, CamelCase reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -1850,7 +1850,7 @@ type WeightedPodAffinityTerm struct { type PodAffinityTerm struct { // A label query over a set of resources, in this case pods. // +optional - LabelSelector *unversioned.LabelSelector `json:"labelSelector,omitempty" protobuf:"bytes,1,opt,name=labelSelector"` + LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty" protobuf:"bytes,1,opt,name=labelSelector"` // namespaces specifies which namespaces the labelSelector applies to (matches against); // nil list means "this pod's namespace," empty list means "all namespaces" // The json tag here is not "omitempty" since we need to distinguish nil and empty. @@ -2183,7 +2183,7 @@ type PodStatus struct { // RFC 3339 date and time at which the object was acknowledged by the Kubelet. // This is before the Kubelet pulled the container image(s) for the pod. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,7,opt,name=startTime"` + StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,7,opt,name=startTime"` // The list has one entry per init container in the manifest. The most recent successful // init container will have ready = true, the most recently started container will have @@ -2200,7 +2200,7 @@ type PodStatus struct { // PodStatusResult is a wrapper for PodStatus returned by kubelet that can be encode/decoded type PodStatusResult struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2219,7 +2219,7 @@ type PodStatusResult struct { // Pod is a collection of containers that can run on a host. This resource is created // by clients and scheduled onto hosts. type Pod struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2241,11 +2241,11 @@ type Pod struct { // PodList is a list of Pods. type PodList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of pods. // More info: http://kubernetes.io/docs/user-guide/pods @@ -2269,7 +2269,7 @@ type PodTemplateSpec struct { // PodTemplate describes a template for creating copies of a predefined pod. type PodTemplate struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2283,11 +2283,11 @@ type PodTemplate struct { // PodTemplateList is a list of PodTemplates. type PodTemplateList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of pod templates Items []PodTemplate `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -2375,7 +2375,7 @@ type ReplicationControllerCondition struct { Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"` // The last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"` // The reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` @@ -2388,7 +2388,7 @@ type ReplicationControllerCondition struct { // ReplicationController represents the configuration of a replication controller. type ReplicationController struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // If the Labels of a ReplicationController are empty, they are defaulted to // be the same as the Pod(s) that the replication controller manages. @@ -2412,11 +2412,11 @@ type ReplicationController struct { // ReplicationControllerList is a collection of replication controllers. type ReplicationControllerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of replication controllers. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -2623,7 +2623,7 @@ type ServicePort struct { // (for example 3306) that the proxy listens on, and the selector that determines which pods // will answer requests sent through the proxy. type Service struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2650,11 +2650,11 @@ const ( // ServiceList holds a list of services. type ServiceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of services Items []Service `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -2667,7 +2667,7 @@ type ServiceList struct { // * a principal that can be authenticated and authorized // * a set of secrets type ServiceAccount struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2688,11 +2688,11 @@ type ServiceAccount struct { // ServiceAccountList is a list of ServiceAccount objects type ServiceAccountList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of ServiceAccounts. // More info: http://releases.k8s.io/HEAD/docs/design/service_accounts.md#service-accounts @@ -2714,7 +2714,7 @@ type ServiceAccountList struct { // }, // ] type Endpoints struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -2795,11 +2795,11 @@ type EndpointPort struct { // EndpointsList is a list of endpoints. type EndpointsList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of endpoints. Items []Endpoints `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -2818,7 +2818,7 @@ type NodeSpec struct { // +optional ProviderID string `json:"providerID,omitempty" protobuf:"bytes,3,opt,name=providerID"` // Unschedulable controls node schedulability of new pods. By default, node is schedulable. - // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration" + // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration // +optional Unschedulable bool `json:"unschedulable,omitempty" protobuf:"varint,4,opt,name=unschedulable"` } @@ -2939,7 +2939,7 @@ type PreferAvoidPodsEntry struct { PodSignature PodSignature `json:"podSignature" protobuf:"bytes,1,opt,name=podSignature"` // Time at which this entry was added to the list. // +optional - EvictionTime unversioned.Time `json:"evictionTime,omitempty" protobuf:"bytes,2,opt,name=evictionTime"` + EvictionTime metav1.Time `json:"evictionTime,omitempty" protobuf:"bytes,2,opt,name=evictionTime"` // (brief) reason why this entry was added to the list. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,3,opt,name=reason"` @@ -3007,10 +3007,10 @@ type NodeCondition struct { Status ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=ConditionStatus"` // Last time we got an update on a given condition. // +optional - LastHeartbeatTime unversioned.Time `json:"lastHeartbeatTime,omitempty" protobuf:"bytes,3,opt,name=lastHeartbeatTime"` + LastHeartbeatTime metav1.Time `json:"lastHeartbeatTime,omitempty" protobuf:"bytes,3,opt,name=lastHeartbeatTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -3072,7 +3072,7 @@ type ResourceList map[ResourceName]resource.Quantity // Node is a worker node in Kubernetes. // Each node will have a unique identifier in the cache (i.e. in etcd). type Node struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3093,11 +3093,11 @@ type Node struct { // NodeList is the whole list of all Nodes which have been registered with master. type NodeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of nodes Items []Node `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -3143,7 +3143,7 @@ const ( // Namespace provides a scope for Names. // Use of multiple namespaces is optional. type Namespace struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3162,11 +3162,11 @@ type Namespace struct { // NamespaceList is a list of Namespaces. type NamespaceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Namespace objects in the list. // More info: http://kubernetes.io/docs/user-guide/namespaces @@ -3176,7 +3176,7 @@ type NamespaceList struct { // Binding ties one object to another. // For example, a pod is bound to a node by a scheduler. type Binding struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3195,7 +3195,7 @@ type Preconditions struct { // DeleteOptions may be provided when deleting an API object type DeleteOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // The duration in seconds before the object should be deleted. Value must be non-negative integer. // The value zero indicates delete immediately. If this value is nil, the default grace period for the @@ -3215,19 +3215,9 @@ type DeleteOptions struct { OrphanDependents *bool `json:"orphanDependents,omitempty" protobuf:"varint,3,opt,name=orphanDependents"` } -// ExportOptions is the query options to the standard REST get call. -type ExportOptions struct { - unversioned.TypeMeta `json:",inline"` - - // Should this value be exported. Export strips fields that a user can not specify. - Export bool `json:"export" protobuf:"varint,1,opt,name=export"` - // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace' - Exact bool `json:"exact" protobuf:"varint,2,opt,name=exact"` -} - // ListOptions is the query options to a standard REST list call. type ListOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // A selector to restrict the list of returned objects by their labels. // Defaults to everything. @@ -3252,7 +3242,7 @@ type ListOptions struct { // PodLogOptions is the query options for a Pod's logs REST call. type PodLogOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // The container for which to stream logs. Defaults to only container if there is one container in the pod. // +optional @@ -3274,7 +3264,7 @@ type PodLogOptions struct { // If this value is in the future, no logs will be returned. // Only one of sinceSeconds or sinceTime may be specified. // +optional - SinceTime *unversioned.Time `json:"sinceTime,omitempty" protobuf:"bytes,5,opt,name=sinceTime"` + SinceTime *metav1.Time `json:"sinceTime,omitempty" protobuf:"bytes,5,opt,name=sinceTime"` // If true, add an RFC3339 or RFC3339Nano timestamp at the beginning of every line // of log output. Defaults to false. // +optional @@ -3295,7 +3285,7 @@ type PodLogOptions struct { // TODO: merge w/ PodExecOptions below for stdin, stdout, etc // and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY type PodAttachOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Stdin if true, redirects the standard input stream of the pod for this call. // Defaults to false. @@ -3330,7 +3320,7 @@ type PodAttachOptions struct { // TODO: This is largely identical to PodAttachOptions above, make sure they stay in sync and see about merging // and also when we cut V2, we should export a "StreamOptions" or somesuch that contains Stdin, Stdout, Stder and TTY type PodExecOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Redirect the standard input stream of the pod for this call. // Defaults to false. @@ -3363,7 +3353,7 @@ type PodExecOptions struct { // PodProxyOptions is the query options to a Pod's proxy call. type PodProxyOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Path is the URL path to use for the current proxy request to pod. // +optional @@ -3372,7 +3362,7 @@ type PodProxyOptions struct { // NodeProxyOptions is the query options to a Node's proxy call. type NodeProxyOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Path is the URL path to use for the current proxy request to node. // +optional @@ -3381,7 +3371,7 @@ type NodeProxyOptions struct { // ServiceProxyOptions is the query options to a Service's proxy call. type ServiceProxyOptions struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Path is the part of URLs that include service endpoints, suffixes, // and parameters to use for the current proxy request to service. @@ -3462,7 +3452,7 @@ type LocalObjectReference struct { // SerializedReference is a reference to serialized object. type SerializedReference struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // The reference to an object in the system. // +optional Reference ObjectReference `json:"reference,omitempty" protobuf:"bytes,1,opt,name=reference"` @@ -3491,7 +3481,7 @@ const ( // Event is a report of an event somewhere in the cluster. // TODO: Decide whether to store these separately or with the object they apply to. type Event struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata ObjectMeta `json:"metadata" protobuf:"bytes,1,opt,name=metadata"` @@ -3516,11 +3506,11 @@ type Event struct { // The time at which the event was first recorded. (Time of server receipt is in TypeMeta.) // +optional - FirstTimestamp unversioned.Time `json:"firstTimestamp,omitempty" protobuf:"bytes,6,opt,name=firstTimestamp"` + FirstTimestamp metav1.Time `json:"firstTimestamp,omitempty" protobuf:"bytes,6,opt,name=firstTimestamp"` // The time at which the most recent occurrence of this event was recorded. // +optional - LastTimestamp unversioned.Time `json:"lastTimestamp,omitempty" protobuf:"bytes,7,opt,name=lastTimestamp"` + LastTimestamp metav1.Time `json:"lastTimestamp,omitempty" protobuf:"bytes,7,opt,name=lastTimestamp"` // The number of times this event has occurred. // +optional @@ -3533,11 +3523,11 @@ type Event struct { // EventList is a list of events. type EventList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of events Items []Event `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -3545,11 +3535,11 @@ type EventList struct { // List holds a list of objects, which may not be known by the server. type List struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of objects Items []runtime.RawExtension `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -3599,7 +3589,7 @@ type LimitRangeSpec struct { // LimitRange sets resource usage limits for each kind of resource in a Namespace. type LimitRange struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3613,11 +3603,11 @@ type LimitRange struct { // LimitRangeList is a list of LimitRange items. type LimitRangeList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of LimitRange objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_limit_range.md @@ -3697,7 +3687,7 @@ type ResourceQuotaStatus struct { // ResourceQuota sets aggregate quota restrictions enforced per namespace type ResourceQuota struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3716,11 +3706,11 @@ type ResourceQuota struct { // ResourceQuotaList is a list of ResourceQuota items. type ResourceQuotaList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of ResourceQuota objects. // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota @@ -3732,7 +3722,7 @@ type ResourceQuotaList struct { // Secret holds secret data of a certain type. The total bytes of the values in // the Data field must be less than MaxSecretSize bytes. type Secret struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3844,11 +3834,11 @@ const ( // SecretList is a list of Secret. type SecretList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of secret objects. // More info: http://kubernetes.io/docs/user-guide/secrets @@ -3859,7 +3849,7 @@ type SecretList struct { // ConfigMap holds configuration data for pods to consume. type ConfigMap struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3873,11 +3863,11 @@ type ConfigMap struct { // ConfigMapList is a resource containing a list of ConfigMap objects. type ConfigMapList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of ConfigMaps. Items []ConfigMap `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -3914,7 +3904,7 @@ type ComponentCondition struct { // ComponentStatus (and ComponentStatusList) holds the cluster validation info. type ComponentStatus struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -3927,11 +3917,11 @@ type ComponentStatus struct { // Status of all the conditions for the component as a list of ComponentStatus objects. type ComponentStatusList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of ComponentStatus objects. Items []ComponentStatus `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -4032,7 +4022,7 @@ type SELinuxOptions struct { // RangeAllocation is not a public type. type RangeAllocation struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -4056,5 +4046,5 @@ const ( // When the --failure-domains scheduler flag is not specified, // DefaultFailureDomains defines the set of label keys used when TopologyKey is empty in PreferredDuringScheduling anti-affinity. - DefaultFailureDomains string = unversioned.LabelHostname + "," + unversioned.LabelZoneFailureDomain + "," + unversioned.LabelZoneRegion + DefaultFailureDomains string = metav1.LabelHostname + "," + metav1.LabelZoneFailureDomain + "," + metav1.LabelZoneRegion ) diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go index 7322cea87eb..be05e69f514 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/types_swagger_doc_generated.go @@ -493,16 +493,6 @@ func (ExecAction) SwaggerDoc() map[string]string { return map_ExecAction } -var map_ExportOptions = map[string]string{ - "": "ExportOptions is the query options to the standard REST get call.", - "export": "Should this value be exported. Export strips fields that a user can not specify.", - "exact": "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'", -} - -func (ExportOptions) SwaggerDoc() map[string]string { - return map_ExportOptions -} - var map_FCVolumeSource = map[string]string{ "": "Represents a Fibre Channel volume. Fibre Channel volumes can only be mounted as read/write once. Fibre Channel volumes support ownership management and SELinux relabeling.", "targetWWNs": "Required: FC target worldwide names (WWNs)", @@ -901,7 +891,7 @@ var map_NodeSpec = map[string]string{ "podCIDR": "PodCIDR represents the pod IP range assigned to the node.", "externalID": "External ID of the node assigned by some machine database (e.g. a cloud provider). Deprecated.", "providerID": "ID of the node assigned by the cloud provider in the format: ://", - "unschedulable": "Unschedulable controls node schedulability of new pods. By default, node is schedulable. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration\"", + "unschedulable": "Unschedulable controls node schedulability of new pods. By default, node is schedulable. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#manual-node-administration", } func (NodeSpec) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.conversion.go index c630041e724..1f05047ebee 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.conversion.go @@ -22,7 +22,7 @@ package v1 import ( api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" conversion "k8s.io/client-go/pkg/conversion" runtime "k8s.io/client-go/pkg/runtime" types "k8s.io/client-go/pkg/types" @@ -119,8 +119,6 @@ func RegisterConversions(scheme *runtime.Scheme) error { Convert_api_EventSource_To_v1_EventSource, Convert_v1_ExecAction_To_api_ExecAction, Convert_api_ExecAction_To_v1_ExecAction, - Convert_v1_ExportOptions_To_api_ExportOptions, - Convert_api_ExportOptions_To_v1_ExportOptions, Convert_v1_FCVolumeSource_To_api_FCVolumeSource, Convert_api_FCVolumeSource_To_v1_FCVolumeSource, Convert_v1_FlexVolumeSource_To_api_FlexVolumeSource, @@ -1344,26 +1342,6 @@ func Convert_api_ExecAction_To_v1_ExecAction(in *api.ExecAction, out *ExecAction return autoConvert_api_ExecAction_To_v1_ExecAction(in, out, s) } -func autoConvert_v1_ExportOptions_To_api_ExportOptions(in *ExportOptions, out *api.ExportOptions, s conversion.Scope) error { - out.Export = in.Export - out.Exact = in.Exact - return nil -} - -func Convert_v1_ExportOptions_To_api_ExportOptions(in *ExportOptions, out *api.ExportOptions, s conversion.Scope) error { - return autoConvert_v1_ExportOptions_To_api_ExportOptions(in, out, s) -} - -func autoConvert_api_ExportOptions_To_v1_ExportOptions(in *api.ExportOptions, out *ExportOptions, s conversion.Scope) error { - out.Export = in.Export - out.Exact = in.Exact - return nil -} - -func Convert_api_ExportOptions_To_v1_ExportOptions(in *api.ExportOptions, out *ExportOptions, s conversion.Scope) error { - return autoConvert_api_ExportOptions_To_v1_ExportOptions(in, out, s) -} - func autoConvert_v1_FCVolumeSource_To_api_FCVolumeSource(in *FCVolumeSource, out *api.FCVolumeSource, s conversion.Scope) error { out.TargetWWNs = *(*[]string)(unsafe.Pointer(&in.TargetWWNs)) out.Lun = (*int32)(unsafe.Pointer(in.Lun)) @@ -2365,7 +2343,7 @@ func autoConvert_v1_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *api.Object out.ResourceVersion = in.ResourceVersion out.Generation = in.Generation out.CreationTimestamp = in.CreationTimestamp - out.DeletionTimestamp = (*unversioned.Time)(unsafe.Pointer(in.DeletionTimestamp)) + out.DeletionTimestamp = (*meta_v1.Time)(unsafe.Pointer(in.DeletionTimestamp)) out.DeletionGracePeriodSeconds = (*int64)(unsafe.Pointer(in.DeletionGracePeriodSeconds)) out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels)) out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations)) @@ -2388,7 +2366,7 @@ func autoConvert_api_ObjectMeta_To_v1_ObjectMeta(in *api.ObjectMeta, out *Object out.ResourceVersion = in.ResourceVersion out.Generation = in.Generation out.CreationTimestamp = in.CreationTimestamp - out.DeletionTimestamp = (*unversioned.Time)(unsafe.Pointer(in.DeletionTimestamp)) + out.DeletionTimestamp = (*meta_v1.Time)(unsafe.Pointer(in.DeletionTimestamp)) out.DeletionGracePeriodSeconds = (*int64)(unsafe.Pointer(in.DeletionGracePeriodSeconds)) out.Labels = *(*map[string]string)(unsafe.Pointer(&in.Labels)) out.Annotations = *(*map[string]string)(unsafe.Pointer(&in.Annotations)) @@ -2548,7 +2526,7 @@ func Convert_api_PersistentVolumeClaimList_To_v1_PersistentVolumeClaimList(in *a func autoConvert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *PersistentVolumeClaimSpec, out *api.PersistentVolumeClaimSpec, s conversion.Scope) error { out.AccessModes = *(*[]api.PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) if err := Convert_v1_ResourceRequirements_To_api_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } @@ -2562,7 +2540,7 @@ func Convert_v1_PersistentVolumeClaimSpec_To_api_PersistentVolumeClaimSpec(in *P func autoConvert_api_PersistentVolumeClaimSpec_To_v1_PersistentVolumeClaimSpec(in *api.PersistentVolumeClaimSpec, out *PersistentVolumeClaimSpec, s conversion.Scope) error { out.AccessModes = *(*[]PersistentVolumeAccessMode)(unsafe.Pointer(&in.AccessModes)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) if err := Convert_api_ResourceRequirements_To_v1_ResourceRequirements(&in.Resources, &out.Resources, s); err != nil { return err } @@ -2825,7 +2803,7 @@ func Convert_api_PodAffinity_To_v1_PodAffinity(in *api.PodAffinity, out *PodAffi } func autoConvert_v1_PodAffinityTerm_To_api_PodAffinityTerm(in *PodAffinityTerm, out *api.PodAffinityTerm, s conversion.Scope) error { - out.LabelSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.LabelSelector)) + out.LabelSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.LabelSelector)) out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) out.TopologyKey = in.TopologyKey return nil @@ -2836,7 +2814,7 @@ func Convert_v1_PodAffinityTerm_To_api_PodAffinityTerm(in *PodAffinityTerm, out } func autoConvert_api_PodAffinityTerm_To_v1_PodAffinityTerm(in *api.PodAffinityTerm, out *PodAffinityTerm, s conversion.Scope) error { - out.LabelSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.LabelSelector)) + out.LabelSelector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.LabelSelector)) out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) out.TopologyKey = in.TopologyKey return nil @@ -2993,7 +2971,7 @@ func autoConvert_v1_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out *a out.Follow = in.Follow out.Previous = in.Previous out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds)) - out.SinceTime = (*unversioned.Time)(unsafe.Pointer(in.SinceTime)) + out.SinceTime = (*meta_v1.Time)(unsafe.Pointer(in.SinceTime)) out.Timestamps = in.Timestamps out.TailLines = (*int64)(unsafe.Pointer(in.TailLines)) out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes)) @@ -3009,7 +2987,7 @@ func autoConvert_api_PodLogOptions_To_v1_PodLogOptions(in *api.PodLogOptions, ou out.Follow = in.Follow out.Previous = in.Previous out.SinceSeconds = (*int64)(unsafe.Pointer(in.SinceSeconds)) - out.SinceTime = (*unversioned.Time)(unsafe.Pointer(in.SinceTime)) + out.SinceTime = (*meta_v1.Time)(unsafe.Pointer(in.SinceTime)) out.Timestamps = in.Timestamps out.TailLines = (*int64)(unsafe.Pointer(in.TailLines)) out.LimitBytes = (*int64)(unsafe.Pointer(in.LimitBytes)) @@ -3160,7 +3138,7 @@ func autoConvert_v1_PodStatus_To_api_PodStatus(in *PodStatus, out *api.PodStatus out.Reason = in.Reason out.HostIP = in.HostIP out.PodIP = in.PodIP - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) + out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.InitContainerStatuses = *(*[]api.ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses)) out.ContainerStatuses = *(*[]api.ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses)) return nil @@ -3177,7 +3155,7 @@ func autoConvert_api_PodStatus_To_v1_PodStatus(in *api.PodStatus, out *PodStatus out.Reason = in.Reason out.HostIP = in.HostIP out.PodIP = in.PodIP - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) + out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) out.InitContainerStatuses = *(*[]ContainerStatus)(unsafe.Pointer(&in.InitContainerStatuses)) out.ContainerStatuses = *(*[]ContainerStatus)(unsafe.Pointer(&in.ContainerStatuses)) return nil diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..0ec41c6c22a --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/api/v1/zz_generated.deepcopy.go @@ -0,0 +1,3775 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1 + +import ( + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + types "k8s.io/client-go/pkg/types" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AWSElasticBlockStoreVolumeSource, InType: reflect.TypeOf(&AWSElasticBlockStoreVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Affinity, InType: reflect.TypeOf(&Affinity{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AttachedVolume, InType: reflect.TypeOf(&AttachedVolume{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AvoidPods, InType: reflect.TypeOf(&AvoidPods{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AzureDiskVolumeSource, InType: reflect.TypeOf(&AzureDiskVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_AzureFileVolumeSource, InType: reflect.TypeOf(&AzureFileVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Binding, InType: reflect.TypeOf(&Binding{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Capabilities, InType: reflect.TypeOf(&Capabilities{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_CephFSVolumeSource, InType: reflect.TypeOf(&CephFSVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_CinderVolumeSource, InType: reflect.TypeOf(&CinderVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ComponentCondition, InType: reflect.TypeOf(&ComponentCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ComponentStatus, InType: reflect.TypeOf(&ComponentStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ComponentStatusList, InType: reflect.TypeOf(&ComponentStatusList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ConfigMap, InType: reflect.TypeOf(&ConfigMap{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ConfigMapKeySelector, InType: reflect.TypeOf(&ConfigMapKeySelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ConfigMapList, InType: reflect.TypeOf(&ConfigMapList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ConfigMapVolumeSource, InType: reflect.TypeOf(&ConfigMapVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Container, InType: reflect.TypeOf(&Container{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerImage, InType: reflect.TypeOf(&ContainerImage{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerPort, InType: reflect.TypeOf(&ContainerPort{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerState, InType: reflect.TypeOf(&ContainerState{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerStateRunning, InType: reflect.TypeOf(&ContainerStateRunning{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerStateTerminated, InType: reflect.TypeOf(&ContainerStateTerminated{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerStateWaiting, InType: reflect.TypeOf(&ContainerStateWaiting{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ContainerStatus, InType: reflect.TypeOf(&ContainerStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_DaemonEndpoint, InType: reflect.TypeOf(&DaemonEndpoint{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_DeleteOptions, InType: reflect.TypeOf(&DeleteOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_DownwardAPIVolumeFile, InType: reflect.TypeOf(&DownwardAPIVolumeFile{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_DownwardAPIVolumeSource, InType: reflect.TypeOf(&DownwardAPIVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EmptyDirVolumeSource, InType: reflect.TypeOf(&EmptyDirVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EndpointAddress, InType: reflect.TypeOf(&EndpointAddress{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EndpointPort, InType: reflect.TypeOf(&EndpointPort{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EndpointSubset, InType: reflect.TypeOf(&EndpointSubset{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Endpoints, InType: reflect.TypeOf(&Endpoints{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EndpointsList, InType: reflect.TypeOf(&EndpointsList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EnvVar, InType: reflect.TypeOf(&EnvVar{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EnvVarSource, InType: reflect.TypeOf(&EnvVarSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Event, InType: reflect.TypeOf(&Event{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EventList, InType: reflect.TypeOf(&EventList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_EventSource, InType: reflect.TypeOf(&EventSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ExecAction, InType: reflect.TypeOf(&ExecAction{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FCVolumeSource, InType: reflect.TypeOf(&FCVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FlexVolumeSource, InType: reflect.TypeOf(&FlexVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_FlockerVolumeSource, InType: reflect.TypeOf(&FlockerVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_GCEPersistentDiskVolumeSource, InType: reflect.TypeOf(&GCEPersistentDiskVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_GitRepoVolumeSource, InType: reflect.TypeOf(&GitRepoVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_GlusterfsVolumeSource, InType: reflect.TypeOf(&GlusterfsVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HTTPGetAction, InType: reflect.TypeOf(&HTTPGetAction{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HTTPHeader, InType: reflect.TypeOf(&HTTPHeader{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Handler, InType: reflect.TypeOf(&Handler{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HostPathVolumeSource, InType: reflect.TypeOf(&HostPathVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ISCSIVolumeSource, InType: reflect.TypeOf(&ISCSIVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_KeyToPath, InType: reflect.TypeOf(&KeyToPath{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Lifecycle, InType: reflect.TypeOf(&Lifecycle{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LimitRange, InType: reflect.TypeOf(&LimitRange{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LimitRangeItem, InType: reflect.TypeOf(&LimitRangeItem{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LimitRangeList, InType: reflect.TypeOf(&LimitRangeList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LimitRangeSpec, InType: reflect.TypeOf(&LimitRangeSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_List, InType: reflect.TypeOf(&List{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ListOptions, InType: reflect.TypeOf(&ListOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LoadBalancerIngress, InType: reflect.TypeOf(&LoadBalancerIngress{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LoadBalancerStatus, InType: reflect.TypeOf(&LoadBalancerStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_LocalObjectReference, InType: reflect.TypeOf(&LocalObjectReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NFSVolumeSource, InType: reflect.TypeOf(&NFSVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Namespace, InType: reflect.TypeOf(&Namespace{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NamespaceList, InType: reflect.TypeOf(&NamespaceList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NamespaceSpec, InType: reflect.TypeOf(&NamespaceSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NamespaceStatus, InType: reflect.TypeOf(&NamespaceStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Node, InType: reflect.TypeOf(&Node{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeAddress, InType: reflect.TypeOf(&NodeAddress{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeAffinity, InType: reflect.TypeOf(&NodeAffinity{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeCondition, InType: reflect.TypeOf(&NodeCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeDaemonEndpoints, InType: reflect.TypeOf(&NodeDaemonEndpoints{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeList, InType: reflect.TypeOf(&NodeList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeProxyOptions, InType: reflect.TypeOf(&NodeProxyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeResources, InType: reflect.TypeOf(&NodeResources{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSelector, InType: reflect.TypeOf(&NodeSelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSelectorRequirement, InType: reflect.TypeOf(&NodeSelectorRequirement{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSelectorTerm, InType: reflect.TypeOf(&NodeSelectorTerm{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSpec, InType: reflect.TypeOf(&NodeSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeStatus, InType: reflect.TypeOf(&NodeStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_NodeSystemInfo, InType: reflect.TypeOf(&NodeSystemInfo{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ObjectFieldSelector, InType: reflect.TypeOf(&ObjectFieldSelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ObjectMeta, InType: reflect.TypeOf(&ObjectMeta{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ObjectReference, InType: reflect.TypeOf(&ObjectReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_OwnerReference, InType: reflect.TypeOf(&OwnerReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolume, InType: reflect.TypeOf(&PersistentVolume{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaim, InType: reflect.TypeOf(&PersistentVolumeClaim{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaimList, InType: reflect.TypeOf(&PersistentVolumeClaimList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaimSpec, InType: reflect.TypeOf(&PersistentVolumeClaimSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaimStatus, InType: reflect.TypeOf(&PersistentVolumeClaimStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeClaimVolumeSource, InType: reflect.TypeOf(&PersistentVolumeClaimVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeList, InType: reflect.TypeOf(&PersistentVolumeList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeSource, InType: reflect.TypeOf(&PersistentVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeSpec, InType: reflect.TypeOf(&PersistentVolumeSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PersistentVolumeStatus, InType: reflect.TypeOf(&PersistentVolumeStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PhotonPersistentDiskVolumeSource, InType: reflect.TypeOf(&PhotonPersistentDiskVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Pod, InType: reflect.TypeOf(&Pod{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodAffinity, InType: reflect.TypeOf(&PodAffinity{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodAffinityTerm, InType: reflect.TypeOf(&PodAffinityTerm{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodAntiAffinity, InType: reflect.TypeOf(&PodAntiAffinity{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodAttachOptions, InType: reflect.TypeOf(&PodAttachOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodCondition, InType: reflect.TypeOf(&PodCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodExecOptions, InType: reflect.TypeOf(&PodExecOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodList, InType: reflect.TypeOf(&PodList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodLogOptions, InType: reflect.TypeOf(&PodLogOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodProxyOptions, InType: reflect.TypeOf(&PodProxyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodSecurityContext, InType: reflect.TypeOf(&PodSecurityContext{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodSignature, InType: reflect.TypeOf(&PodSignature{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodSpec, InType: reflect.TypeOf(&PodSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodStatus, InType: reflect.TypeOf(&PodStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodStatusResult, InType: reflect.TypeOf(&PodStatusResult{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodTemplate, InType: reflect.TypeOf(&PodTemplate{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodTemplateList, InType: reflect.TypeOf(&PodTemplateList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PodTemplateSpec, InType: reflect.TypeOf(&PodTemplateSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Preconditions, InType: reflect.TypeOf(&Preconditions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PreferAvoidPodsEntry, InType: reflect.TypeOf(&PreferAvoidPodsEntry{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_PreferredSchedulingTerm, InType: reflect.TypeOf(&PreferredSchedulingTerm{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Probe, InType: reflect.TypeOf(&Probe{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_QuobyteVolumeSource, InType: reflect.TypeOf(&QuobyteVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_RBDVolumeSource, InType: reflect.TypeOf(&RBDVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_RangeAllocation, InType: reflect.TypeOf(&RangeAllocation{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationController, InType: reflect.TypeOf(&ReplicationController{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationControllerCondition, InType: reflect.TypeOf(&ReplicationControllerCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationControllerList, InType: reflect.TypeOf(&ReplicationControllerList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationControllerSpec, InType: reflect.TypeOf(&ReplicationControllerSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ReplicationControllerStatus, InType: reflect.TypeOf(&ReplicationControllerStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceFieldSelector, InType: reflect.TypeOf(&ResourceFieldSelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceQuota, InType: reflect.TypeOf(&ResourceQuota{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceQuotaList, InType: reflect.TypeOf(&ResourceQuotaList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceQuotaSpec, InType: reflect.TypeOf(&ResourceQuotaSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceQuotaStatus, InType: reflect.TypeOf(&ResourceQuotaStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ResourceRequirements, InType: reflect.TypeOf(&ResourceRequirements{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SELinuxOptions, InType: reflect.TypeOf(&SELinuxOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Secret, InType: reflect.TypeOf(&Secret{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SecretKeySelector, InType: reflect.TypeOf(&SecretKeySelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SecretList, InType: reflect.TypeOf(&SecretList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SecretVolumeSource, InType: reflect.TypeOf(&SecretVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SecurityContext, InType: reflect.TypeOf(&SecurityContext{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_SerializedReference, InType: reflect.TypeOf(&SerializedReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Service, InType: reflect.TypeOf(&Service{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceAccount, InType: reflect.TypeOf(&ServiceAccount{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceAccountList, InType: reflect.TypeOf(&ServiceAccountList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceList, InType: reflect.TypeOf(&ServiceList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServicePort, InType: reflect.TypeOf(&ServicePort{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceProxyOptions, InType: reflect.TypeOf(&ServiceProxyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceSpec, InType: reflect.TypeOf(&ServiceSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ServiceStatus, InType: reflect.TypeOf(&ServiceStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Sysctl, InType: reflect.TypeOf(&Sysctl{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_TCPSocketAction, InType: reflect.TypeOf(&TCPSocketAction{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Taint, InType: reflect.TypeOf(&Taint{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Toleration, InType: reflect.TypeOf(&Toleration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Volume, InType: reflect.TypeOf(&Volume{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_VolumeMount, InType: reflect.TypeOf(&VolumeMount{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_VolumeSource, InType: reflect.TypeOf(&VolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_VsphereVirtualDiskVolumeSource, InType: reflect.TypeOf(&VsphereVirtualDiskVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_WeightedPodAffinityTerm, InType: reflect.TypeOf(&WeightedPodAffinityTerm{})}, + ) +} + +func DeepCopy_v1_AWSElasticBlockStoreVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AWSElasticBlockStoreVolumeSource) + out := out.(*AWSElasticBlockStoreVolumeSource) + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_Affinity(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Affinity) + out := out.(*Affinity) + if in.NodeAffinity != nil { + in, out := &in.NodeAffinity, &out.NodeAffinity + *out = new(NodeAffinity) + if err := DeepCopy_v1_NodeAffinity(*in, *out, c); err != nil { + return err + } + } else { + out.NodeAffinity = nil + } + if in.PodAffinity != nil { + in, out := &in.PodAffinity, &out.PodAffinity + *out = new(PodAffinity) + if err := DeepCopy_v1_PodAffinity(*in, *out, c); err != nil { + return err + } + } else { + out.PodAffinity = nil + } + if in.PodAntiAffinity != nil { + in, out := &in.PodAntiAffinity, &out.PodAntiAffinity + *out = new(PodAntiAffinity) + if err := DeepCopy_v1_PodAntiAffinity(*in, *out, c); err != nil { + return err + } + } else { + out.PodAntiAffinity = nil + } + return nil + } +} + +func DeepCopy_v1_AttachedVolume(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AttachedVolume) + out := out.(*AttachedVolume) + out.Name = in.Name + out.DevicePath = in.DevicePath + return nil + } +} + +func DeepCopy_v1_AvoidPods(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AvoidPods) + out := out.(*AvoidPods) + if in.PreferAvoidPods != nil { + in, out := &in.PreferAvoidPods, &out.PreferAvoidPods + *out = make([]PreferAvoidPodsEntry, len(*in)) + for i := range *in { + if err := DeepCopy_v1_PreferAvoidPodsEntry(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.PreferAvoidPods = nil + } + return nil + } +} + +func DeepCopy_v1_AzureDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AzureDiskVolumeSource) + out := out.(*AzureDiskVolumeSource) + out.DiskName = in.DiskName + out.DataDiskURI = in.DataDiskURI + if in.CachingMode != nil { + in, out := &in.CachingMode, &out.CachingMode + *out = new(AzureDataDiskCachingMode) + **out = **in + } else { + out.CachingMode = nil + } + if in.FSType != nil { + in, out := &in.FSType, &out.FSType + *out = new(string) + **out = **in + } else { + out.FSType = nil + } + if in.ReadOnly != nil { + in, out := &in.ReadOnly, &out.ReadOnly + *out = new(bool) + **out = **in + } else { + out.ReadOnly = nil + } + return nil + } +} + +func DeepCopy_v1_AzureFileVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AzureFileVolumeSource) + out := out.(*AzureFileVolumeSource) + out.SecretName = in.SecretName + out.ShareName = in.ShareName + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_Binding(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Binding) + out := out.(*Binding) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Target = in.Target + return nil + } +} + +func DeepCopy_v1_Capabilities(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Capabilities) + out := out.(*Capabilities) + if in.Add != nil { + in, out := &in.Add, &out.Add + *out = make([]Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Add = nil + } + if in.Drop != nil { + in, out := &in.Drop, &out.Drop + *out = make([]Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Drop = nil + } + return nil + } +} + +func DeepCopy_v1_CephFSVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CephFSVolumeSource) + out := out.(*CephFSVolumeSource) + if in.Monitors != nil { + in, out := &in.Monitors, &out.Monitors + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Monitors = nil + } + out.Path = in.Path + out.User = in.User + out.SecretFile = in.SecretFile + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(LocalObjectReference) + **out = **in + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_CinderVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CinderVolumeSource) + out := out.(*CinderVolumeSource) + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_ComponentCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ComponentCondition) + out := out.(*ComponentCondition) + out.Type = in.Type + out.Status = in.Status + out.Message = in.Message + out.Error = in.Error + return nil + } +} + +func DeepCopy_v1_ComponentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ComponentStatus) + out := out.(*ComponentStatus) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ComponentCondition, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Conditions = nil + } + return nil + } +} + +func DeepCopy_v1_ComponentStatusList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ComponentStatusList) + out := out.(*ComponentStatusList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ComponentStatus, len(*in)) + for i := range *in { + if err := DeepCopy_v1_ComponentStatus(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_ConfigMap(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ConfigMap) + out := out.(*ConfigMap) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Data != nil { + in, out := &in.Data, &out.Data + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Data = nil + } + return nil + } +} + +func DeepCopy_v1_ConfigMapKeySelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ConfigMapKeySelector) + out := out.(*ConfigMapKeySelector) + out.LocalObjectReference = in.LocalObjectReference + out.Key = in.Key + return nil + } +} + +func DeepCopy_v1_ConfigMapList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ConfigMapList) + out := out.(*ConfigMapList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ConfigMap, len(*in)) + for i := range *in { + if err := DeepCopy_v1_ConfigMap(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_ConfigMapVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ConfigMapVolumeSource) + out := out.(*ConfigMapVolumeSource) + out.LocalObjectReference = in.LocalObjectReference + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]KeyToPath, len(*in)) + for i := range *in { + if err := DeepCopy_v1_KeyToPath(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + if in.DefaultMode != nil { + in, out := &in.DefaultMode, &out.DefaultMode + *out = new(int32) + **out = **in + } else { + out.DefaultMode = nil + } + return nil + } +} + +func DeepCopy_v1_Container(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Container) + out := out.(*Container) + out.Name = in.Name + out.Image = in.Image + if in.Command != nil { + in, out := &in.Command, &out.Command + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Command = nil + } + if in.Args != nil { + in, out := &in.Args, &out.Args + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Args = nil + } + out.WorkingDir = in.WorkingDir + if in.Ports != nil { + in, out := &in.Ports, &out.Ports + *out = make([]ContainerPort, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ports = nil + } + if in.Env != nil { + in, out := &in.Env, &out.Env + *out = make([]EnvVar, len(*in)) + for i := range *in { + if err := DeepCopy_v1_EnvVar(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Env = nil + } + if err := DeepCopy_v1_ResourceRequirements(&in.Resources, &out.Resources, c); err != nil { + return err + } + if in.VolumeMounts != nil { + in, out := &in.VolumeMounts, &out.VolumeMounts + *out = make([]VolumeMount, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.VolumeMounts = nil + } + if in.LivenessProbe != nil { + in, out := &in.LivenessProbe, &out.LivenessProbe + *out = new(Probe) + if err := DeepCopy_v1_Probe(*in, *out, c); err != nil { + return err + } + } else { + out.LivenessProbe = nil + } + if in.ReadinessProbe != nil { + in, out := &in.ReadinessProbe, &out.ReadinessProbe + *out = new(Probe) + if err := DeepCopy_v1_Probe(*in, *out, c); err != nil { + return err + } + } else { + out.ReadinessProbe = nil + } + if in.Lifecycle != nil { + in, out := &in.Lifecycle, &out.Lifecycle + *out = new(Lifecycle) + if err := DeepCopy_v1_Lifecycle(*in, *out, c); err != nil { + return err + } + } else { + out.Lifecycle = nil + } + out.TerminationMessagePath = in.TerminationMessagePath + out.ImagePullPolicy = in.ImagePullPolicy + if in.SecurityContext != nil { + in, out := &in.SecurityContext, &out.SecurityContext + *out = new(SecurityContext) + if err := DeepCopy_v1_SecurityContext(*in, *out, c); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + out.Stdin = in.Stdin + out.StdinOnce = in.StdinOnce + out.TTY = in.TTY + return nil + } +} + +func DeepCopy_v1_ContainerImage(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerImage) + out := out.(*ContainerImage) + if in.Names != nil { + in, out := &in.Names, &out.Names + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Names = nil + } + out.SizeBytes = in.SizeBytes + return nil + } +} + +func DeepCopy_v1_ContainerPort(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerPort) + out := out.(*ContainerPort) + out.Name = in.Name + out.HostPort = in.HostPort + out.ContainerPort = in.ContainerPort + out.Protocol = in.Protocol + out.HostIP = in.HostIP + return nil + } +} + +func DeepCopy_v1_ContainerState(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerState) + out := out.(*ContainerState) + if in.Waiting != nil { + in, out := &in.Waiting, &out.Waiting + *out = new(ContainerStateWaiting) + **out = **in + } else { + out.Waiting = nil + } + if in.Running != nil { + in, out := &in.Running, &out.Running + *out = new(ContainerStateRunning) + if err := DeepCopy_v1_ContainerStateRunning(*in, *out, c); err != nil { + return err + } + } else { + out.Running = nil + } + if in.Terminated != nil { + in, out := &in.Terminated, &out.Terminated + *out = new(ContainerStateTerminated) + if err := DeepCopy_v1_ContainerStateTerminated(*in, *out, c); err != nil { + return err + } + } else { + out.Terminated = nil + } + return nil + } +} + +func DeepCopy_v1_ContainerStateRunning(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerStateRunning) + out := out.(*ContainerStateRunning) + out.StartedAt = in.StartedAt.DeepCopy() + return nil + } +} + +func DeepCopy_v1_ContainerStateTerminated(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerStateTerminated) + out := out.(*ContainerStateTerminated) + out.ExitCode = in.ExitCode + out.Signal = in.Signal + out.Reason = in.Reason + out.Message = in.Message + out.StartedAt = in.StartedAt.DeepCopy() + out.FinishedAt = in.FinishedAt.DeepCopy() + out.ContainerID = in.ContainerID + return nil + } +} + +func DeepCopy_v1_ContainerStateWaiting(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerStateWaiting) + out := out.(*ContainerStateWaiting) + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1_ContainerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerStatus) + out := out.(*ContainerStatus) + out.Name = in.Name + if err := DeepCopy_v1_ContainerState(&in.State, &out.State, c); err != nil { + return err + } + if err := DeepCopy_v1_ContainerState(&in.LastTerminationState, &out.LastTerminationState, c); err != nil { + return err + } + out.Ready = in.Ready + out.RestartCount = in.RestartCount + out.Image = in.Image + out.ImageID = in.ImageID + out.ContainerID = in.ContainerID + return nil + } +} + +func DeepCopy_v1_DaemonEndpoint(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonEndpoint) + out := out.(*DaemonEndpoint) + out.Port = in.Port + return nil + } +} + +func DeepCopy_v1_DeleteOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeleteOptions) + out := out.(*DeleteOptions) + out.TypeMeta = in.TypeMeta + if in.GracePeriodSeconds != nil { + in, out := &in.GracePeriodSeconds, &out.GracePeriodSeconds + *out = new(int64) + **out = **in + } else { + out.GracePeriodSeconds = nil + } + if in.Preconditions != nil { + in, out := &in.Preconditions, &out.Preconditions + *out = new(Preconditions) + if err := DeepCopy_v1_Preconditions(*in, *out, c); err != nil { + return err + } + } else { + out.Preconditions = nil + } + if in.OrphanDependents != nil { + in, out := &in.OrphanDependents, &out.OrphanDependents + *out = new(bool) + **out = **in + } else { + out.OrphanDependents = nil + } + return nil + } +} + +func DeepCopy_v1_DownwardAPIVolumeFile(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DownwardAPIVolumeFile) + out := out.(*DownwardAPIVolumeFile) + out.Path = in.Path + if in.FieldRef != nil { + in, out := &in.FieldRef, &out.FieldRef + *out = new(ObjectFieldSelector) + **out = **in + } else { + out.FieldRef = nil + } + if in.ResourceFieldRef != nil { + in, out := &in.ResourceFieldRef, &out.ResourceFieldRef + *out = new(ResourceFieldSelector) + if err := DeepCopy_v1_ResourceFieldSelector(*in, *out, c); err != nil { + return err + } + } else { + out.ResourceFieldRef = nil + } + if in.Mode != nil { + in, out := &in.Mode, &out.Mode + *out = new(int32) + **out = **in + } else { + out.Mode = nil + } + return nil + } +} + +func DeepCopy_v1_DownwardAPIVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DownwardAPIVolumeSource) + out := out.(*DownwardAPIVolumeSource) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DownwardAPIVolumeFile, len(*in)) + for i := range *in { + if err := DeepCopy_v1_DownwardAPIVolumeFile(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + if in.DefaultMode != nil { + in, out := &in.DefaultMode, &out.DefaultMode + *out = new(int32) + **out = **in + } else { + out.DefaultMode = nil + } + return nil + } +} + +func DeepCopy_v1_EmptyDirVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EmptyDirVolumeSource) + out := out.(*EmptyDirVolumeSource) + out.Medium = in.Medium + return nil + } +} + +func DeepCopy_v1_EndpointAddress(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EndpointAddress) + out := out.(*EndpointAddress) + out.IP = in.IP + out.Hostname = in.Hostname + if in.NodeName != nil { + in, out := &in.NodeName, &out.NodeName + *out = new(string) + **out = **in + } else { + out.NodeName = nil + } + if in.TargetRef != nil { + in, out := &in.TargetRef, &out.TargetRef + *out = new(ObjectReference) + **out = **in + } else { + out.TargetRef = nil + } + return nil + } +} + +func DeepCopy_v1_EndpointPort(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EndpointPort) + out := out.(*EndpointPort) + out.Name = in.Name + out.Port = in.Port + out.Protocol = in.Protocol + return nil + } +} + +func DeepCopy_v1_EndpointSubset(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EndpointSubset) + out := out.(*EndpointSubset) + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]EndpointAddress, len(*in)) + for i := range *in { + if err := DeepCopy_v1_EndpointAddress(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Addresses = nil + } + if in.NotReadyAddresses != nil { + in, out := &in.NotReadyAddresses, &out.NotReadyAddresses + *out = make([]EndpointAddress, len(*in)) + for i := range *in { + if err := DeepCopy_v1_EndpointAddress(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.NotReadyAddresses = nil + } + if in.Ports != nil { + in, out := &in.Ports, &out.Ports + *out = make([]EndpointPort, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ports = nil + } + return nil + } +} + +func DeepCopy_v1_Endpoints(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Endpoints) + out := out.(*Endpoints) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Subsets != nil { + in, out := &in.Subsets, &out.Subsets + *out = make([]EndpointSubset, len(*in)) + for i := range *in { + if err := DeepCopy_v1_EndpointSubset(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Subsets = nil + } + return nil + } +} + +func DeepCopy_v1_EndpointsList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EndpointsList) + out := out.(*EndpointsList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Endpoints, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Endpoints(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_EnvVar(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EnvVar) + out := out.(*EnvVar) + out.Name = in.Name + out.Value = in.Value + if in.ValueFrom != nil { + in, out := &in.ValueFrom, &out.ValueFrom + *out = new(EnvVarSource) + if err := DeepCopy_v1_EnvVarSource(*in, *out, c); err != nil { + return err + } + } else { + out.ValueFrom = nil + } + return nil + } +} + +func DeepCopy_v1_EnvVarSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EnvVarSource) + out := out.(*EnvVarSource) + if in.FieldRef != nil { + in, out := &in.FieldRef, &out.FieldRef + *out = new(ObjectFieldSelector) + **out = **in + } else { + out.FieldRef = nil + } + if in.ResourceFieldRef != nil { + in, out := &in.ResourceFieldRef, &out.ResourceFieldRef + *out = new(ResourceFieldSelector) + if err := DeepCopy_v1_ResourceFieldSelector(*in, *out, c); err != nil { + return err + } + } else { + out.ResourceFieldRef = nil + } + if in.ConfigMapKeyRef != nil { + in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef + *out = new(ConfigMapKeySelector) + **out = **in + } else { + out.ConfigMapKeyRef = nil + } + if in.SecretKeyRef != nil { + in, out := &in.SecretKeyRef, &out.SecretKeyRef + *out = new(SecretKeySelector) + **out = **in + } else { + out.SecretKeyRef = nil + } + return nil + } +} + +func DeepCopy_v1_Event(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Event) + out := out.(*Event) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.InvolvedObject = in.InvolvedObject + out.Reason = in.Reason + out.Message = in.Message + out.Source = in.Source + out.FirstTimestamp = in.FirstTimestamp.DeepCopy() + out.LastTimestamp = in.LastTimestamp.DeepCopy() + out.Count = in.Count + out.Type = in.Type + return nil + } +} + +func DeepCopy_v1_EventList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EventList) + out := out.(*EventList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Event, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Event(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_EventSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EventSource) + out := out.(*EventSource) + out.Component = in.Component + out.Host = in.Host + return nil + } +} + +func DeepCopy_v1_ExecAction(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ExecAction) + out := out.(*ExecAction) + if in.Command != nil { + in, out := &in.Command, &out.Command + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Command = nil + } + return nil + } +} + +func DeepCopy_v1_FCVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*FCVolumeSource) + out := out.(*FCVolumeSource) + if in.TargetWWNs != nil { + in, out := &in.TargetWWNs, &out.TargetWWNs + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.TargetWWNs = nil + } + if in.Lun != nil { + in, out := &in.Lun, &out.Lun + *out = new(int32) + **out = **in + } else { + out.Lun = nil + } + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_FlexVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*FlexVolumeSource) + out := out.(*FlexVolumeSource) + out.Driver = in.Driver + out.FSType = in.FSType + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(LocalObjectReference) + **out = **in + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + if in.Options != nil { + in, out := &in.Options, &out.Options + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Options = nil + } + return nil + } +} + +func DeepCopy_v1_FlockerVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*FlockerVolumeSource) + out := out.(*FlockerVolumeSource) + out.DatasetName = in.DatasetName + out.DatasetUUID = in.DatasetUUID + return nil + } +} + +func DeepCopy_v1_GCEPersistentDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GCEPersistentDiskVolumeSource) + out := out.(*GCEPersistentDiskVolumeSource) + out.PDName = in.PDName + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_GitRepoVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GitRepoVolumeSource) + out := out.(*GitRepoVolumeSource) + out.Repository = in.Repository + out.Revision = in.Revision + out.Directory = in.Directory + return nil + } +} + +func DeepCopy_v1_GlusterfsVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GlusterfsVolumeSource) + out := out.(*GlusterfsVolumeSource) + out.EndpointsName = in.EndpointsName + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_HTTPGetAction(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HTTPGetAction) + out := out.(*HTTPGetAction) + out.Path = in.Path + out.Port = in.Port + out.Host = in.Host + out.Scheme = in.Scheme + if in.HTTPHeaders != nil { + in, out := &in.HTTPHeaders, &out.HTTPHeaders + *out = make([]HTTPHeader, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.HTTPHeaders = nil + } + return nil + } +} + +func DeepCopy_v1_HTTPHeader(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HTTPHeader) + out := out.(*HTTPHeader) + out.Name = in.Name + out.Value = in.Value + return nil + } +} + +func DeepCopy_v1_Handler(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Handler) + out := out.(*Handler) + if in.Exec != nil { + in, out := &in.Exec, &out.Exec + *out = new(ExecAction) + if err := DeepCopy_v1_ExecAction(*in, *out, c); err != nil { + return err + } + } else { + out.Exec = nil + } + if in.HTTPGet != nil { + in, out := &in.HTTPGet, &out.HTTPGet + *out = new(HTTPGetAction) + if err := DeepCopy_v1_HTTPGetAction(*in, *out, c); err != nil { + return err + } + } else { + out.HTTPGet = nil + } + if in.TCPSocket != nil { + in, out := &in.TCPSocket, &out.TCPSocket + *out = new(TCPSocketAction) + **out = **in + } else { + out.TCPSocket = nil + } + return nil + } +} + +func DeepCopy_v1_HostPathVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HostPathVolumeSource) + out := out.(*HostPathVolumeSource) + out.Path = in.Path + return nil + } +} + +func DeepCopy_v1_ISCSIVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ISCSIVolumeSource) + out := out.(*ISCSIVolumeSource) + out.TargetPortal = in.TargetPortal + out.IQN = in.IQN + out.Lun = in.Lun + out.ISCSIInterface = in.ISCSIInterface + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_KeyToPath(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KeyToPath) + out := out.(*KeyToPath) + out.Key = in.Key + out.Path = in.Path + if in.Mode != nil { + in, out := &in.Mode, &out.Mode + *out = new(int32) + **out = **in + } else { + out.Mode = nil + } + return nil + } +} + +func DeepCopy_v1_Lifecycle(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Lifecycle) + out := out.(*Lifecycle) + if in.PostStart != nil { + in, out := &in.PostStart, &out.PostStart + *out = new(Handler) + if err := DeepCopy_v1_Handler(*in, *out, c); err != nil { + return err + } + } else { + out.PostStart = nil + } + if in.PreStop != nil { + in, out := &in.PreStop, &out.PreStop + *out = new(Handler) + if err := DeepCopy_v1_Handler(*in, *out, c); err != nil { + return err + } + } else { + out.PreStop = nil + } + return nil + } +} + +func DeepCopy_v1_LimitRange(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LimitRange) + out := out.(*LimitRange) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_LimitRangeSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_LimitRangeItem(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LimitRangeItem) + out := out.(*LimitRangeItem) + out.Type = in.Type + if in.Max != nil { + in, out := &in.Max, &out.Max + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Max = nil + } + if in.Min != nil { + in, out := &in.Min, &out.Min + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Min = nil + } + if in.Default != nil { + in, out := &in.Default, &out.Default + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Default = nil + } + if in.DefaultRequest != nil { + in, out := &in.DefaultRequest, &out.DefaultRequest + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.DefaultRequest = nil + } + if in.MaxLimitRequestRatio != nil { + in, out := &in.MaxLimitRequestRatio, &out.MaxLimitRequestRatio + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.MaxLimitRequestRatio = nil + } + return nil + } +} + +func DeepCopy_v1_LimitRangeList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LimitRangeList) + out := out.(*LimitRangeList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]LimitRange, len(*in)) + for i := range *in { + if err := DeepCopy_v1_LimitRange(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_LimitRangeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LimitRangeSpec) + out := out.(*LimitRangeSpec) + if in.Limits != nil { + in, out := &in.Limits, &out.Limits + *out = make([]LimitRangeItem, len(*in)) + for i := range *in { + if err := DeepCopy_v1_LimitRangeItem(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Limits = nil + } + return nil + } +} + +func DeepCopy_v1_List(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*List) + out := out.(*List) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]runtime.RawExtension, len(*in)) + for i := range *in { + if err := runtime.DeepCopy_runtime_RawExtension(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_ListOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ListOptions) + out := out.(*ListOptions) + out.TypeMeta = in.TypeMeta + out.LabelSelector = in.LabelSelector + out.FieldSelector = in.FieldSelector + out.Watch = in.Watch + out.ResourceVersion = in.ResourceVersion + if in.TimeoutSeconds != nil { + in, out := &in.TimeoutSeconds, &out.TimeoutSeconds + *out = new(int64) + **out = **in + } else { + out.TimeoutSeconds = nil + } + return nil + } +} + +func DeepCopy_v1_LoadBalancerIngress(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LoadBalancerIngress) + out := out.(*LoadBalancerIngress) + out.IP = in.IP + out.Hostname = in.Hostname + return nil + } +} + +func DeepCopy_v1_LoadBalancerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LoadBalancerStatus) + out := out.(*LoadBalancerStatus) + if in.Ingress != nil { + in, out := &in.Ingress, &out.Ingress + *out = make([]LoadBalancerIngress, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ingress = nil + } + return nil + } +} + +func DeepCopy_v1_LocalObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LocalObjectReference) + out := out.(*LocalObjectReference) + out.Name = in.Name + return nil + } +} + +func DeepCopy_v1_NFSVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NFSVolumeSource) + out := out.(*NFSVolumeSource) + out.Server = in.Server + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_Namespace(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Namespace) + out := out.(*Namespace) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_NamespaceSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_v1_NamespaceList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NamespaceList) + out := out.(*NamespaceList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Namespace, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Namespace(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_NamespaceSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NamespaceSpec) + out := out.(*NamespaceSpec) + if in.Finalizers != nil { + in, out := &in.Finalizers, &out.Finalizers + *out = make([]FinalizerName, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Finalizers = nil + } + return nil + } +} + +func DeepCopy_v1_NamespaceStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NamespaceStatus) + out := out.(*NamespaceStatus) + out.Phase = in.Phase + return nil + } +} + +func DeepCopy_v1_Node(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Node) + out := out.(*Node) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Spec = in.Spec + if err := DeepCopy_v1_NodeStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_NodeAddress(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeAddress) + out := out.(*NodeAddress) + out.Type = in.Type + out.Address = in.Address + return nil + } +} + +func DeepCopy_v1_NodeAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeAffinity) + out := out.(*NodeAffinity) + if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution + *out = new(NodeSelector) + if err := DeepCopy_v1_NodeSelector(*in, *out, c); err != nil { + return err + } + } else { + out.RequiredDuringSchedulingIgnoredDuringExecution = nil + } + if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution + *out = make([]PreferredSchedulingTerm, len(*in)) + for i := range *in { + if err := DeepCopy_v1_PreferredSchedulingTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.PreferredDuringSchedulingIgnoredDuringExecution = nil + } + return nil + } +} + +func DeepCopy_v1_NodeCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeCondition) + out := out.(*NodeCondition) + out.Type = in.Type + out.Status = in.Status + out.LastHeartbeatTime = in.LastHeartbeatTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1_NodeDaemonEndpoints(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeDaemonEndpoints) + out := out.(*NodeDaemonEndpoints) + out.KubeletEndpoint = in.KubeletEndpoint + return nil + } +} + +func DeepCopy_v1_NodeList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeList) + out := out.(*NodeList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Node, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Node(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_NodeProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeProxyOptions) + out := out.(*NodeProxyOptions) + out.TypeMeta = in.TypeMeta + out.Path = in.Path + return nil + } +} + +func DeepCopy_v1_NodeResources(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeResources) + out := out.(*NodeResources) + if in.Capacity != nil { + in, out := &in.Capacity, &out.Capacity + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Capacity = nil + } + return nil + } +} + +func DeepCopy_v1_NodeSelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSelector) + out := out.(*NodeSelector) + if in.NodeSelectorTerms != nil { + in, out := &in.NodeSelectorTerms, &out.NodeSelectorTerms + *out = make([]NodeSelectorTerm, len(*in)) + for i := range *in { + if err := DeepCopy_v1_NodeSelectorTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.NodeSelectorTerms = nil + } + return nil + } +} + +func DeepCopy_v1_NodeSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSelectorRequirement) + out := out.(*NodeSelectorRequirement) + out.Key = in.Key + out.Operator = in.Operator + if in.Values != nil { + in, out := &in.Values, &out.Values + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Values = nil + } + return nil + } +} + +func DeepCopy_v1_NodeSelectorTerm(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSelectorTerm) + out := out.(*NodeSelectorTerm) + if in.MatchExpressions != nil { + in, out := &in.MatchExpressions, &out.MatchExpressions + *out = make([]NodeSelectorRequirement, len(*in)) + for i := range *in { + if err := DeepCopy_v1_NodeSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.MatchExpressions = nil + } + return nil + } +} + +func DeepCopy_v1_NodeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSpec) + out := out.(*NodeSpec) + out.PodCIDR = in.PodCIDR + out.ExternalID = in.ExternalID + out.ProviderID = in.ProviderID + out.Unschedulable = in.Unschedulable + return nil + } +} + +func DeepCopy_v1_NodeStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeStatus) + out := out.(*NodeStatus) + if in.Capacity != nil { + in, out := &in.Capacity, &out.Capacity + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Capacity = nil + } + if in.Allocatable != nil { + in, out := &in.Allocatable, &out.Allocatable + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Allocatable = nil + } + out.Phase = in.Phase + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]NodeCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v1_NodeCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]NodeAddress, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Addresses = nil + } + out.DaemonEndpoints = in.DaemonEndpoints + out.NodeInfo = in.NodeInfo + if in.Images != nil { + in, out := &in.Images, &out.Images + *out = make([]ContainerImage, len(*in)) + for i := range *in { + if err := DeepCopy_v1_ContainerImage(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Images = nil + } + if in.VolumesInUse != nil { + in, out := &in.VolumesInUse, &out.VolumesInUse + *out = make([]UniqueVolumeName, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.VolumesInUse = nil + } + if in.VolumesAttached != nil { + in, out := &in.VolumesAttached, &out.VolumesAttached + *out = make([]AttachedVolume, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.VolumesAttached = nil + } + return nil + } +} + +func DeepCopy_v1_NodeSystemInfo(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSystemInfo) + out := out.(*NodeSystemInfo) + out.MachineID = in.MachineID + out.SystemUUID = in.SystemUUID + out.BootID = in.BootID + out.KernelVersion = in.KernelVersion + out.OSImage = in.OSImage + out.ContainerRuntimeVersion = in.ContainerRuntimeVersion + out.KubeletVersion = in.KubeletVersion + out.KubeProxyVersion = in.KubeProxyVersion + out.OperatingSystem = in.OperatingSystem + out.Architecture = in.Architecture + return nil + } +} + +func DeepCopy_v1_ObjectFieldSelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ObjectFieldSelector) + out := out.(*ObjectFieldSelector) + out.APIVersion = in.APIVersion + out.FieldPath = in.FieldPath + return nil + } +} + +func DeepCopy_v1_ObjectMeta(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ObjectMeta) + out := out.(*ObjectMeta) + out.Name = in.Name + out.GenerateName = in.GenerateName + out.Namespace = in.Namespace + out.SelfLink = in.SelfLink + out.UID = in.UID + out.ResourceVersion = in.ResourceVersion + out.Generation = in.Generation + out.CreationTimestamp = in.CreationTimestamp.DeepCopy() + if in.DeletionTimestamp != nil { + in, out := &in.DeletionTimestamp, &out.DeletionTimestamp + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.DeletionTimestamp = nil + } + if in.DeletionGracePeriodSeconds != nil { + in, out := &in.DeletionGracePeriodSeconds, &out.DeletionGracePeriodSeconds + *out = new(int64) + **out = **in + } else { + out.DeletionGracePeriodSeconds = nil + } + if in.Labels != nil { + in, out := &in.Labels, &out.Labels + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Labels = nil + } + if in.Annotations != nil { + in, out := &in.Annotations, &out.Annotations + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Annotations = nil + } + if in.OwnerReferences != nil { + in, out := &in.OwnerReferences, &out.OwnerReferences + *out = make([]OwnerReference, len(*in)) + for i := range *in { + if err := DeepCopy_v1_OwnerReference(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.OwnerReferences = nil + } + if in.Finalizers != nil { + in, out := &in.Finalizers, &out.Finalizers + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Finalizers = nil + } + out.ClusterName = in.ClusterName + return nil + } +} + +func DeepCopy_v1_ObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ObjectReference) + out := out.(*ObjectReference) + out.Kind = in.Kind + out.Namespace = in.Namespace + out.Name = in.Name + out.UID = in.UID + out.APIVersion = in.APIVersion + out.ResourceVersion = in.ResourceVersion + out.FieldPath = in.FieldPath + return nil + } +} + +func DeepCopy_v1_OwnerReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*OwnerReference) + out := out.(*OwnerReference) + out.APIVersion = in.APIVersion + out.Kind = in.Kind + out.Name = in.Name + out.UID = in.UID + if in.Controller != nil { + in, out := &in.Controller, &out.Controller + *out = new(bool) + **out = **in + } else { + out.Controller = nil + } + return nil + } +} + +func DeepCopy_v1_PersistentVolume(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolume) + out := out.(*PersistentVolume) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_PersistentVolumeSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_v1_PersistentVolumeClaim(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaim) + out := out.(*PersistentVolumeClaim) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_PersistentVolumeClaimSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1_PersistentVolumeClaimStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_PersistentVolumeClaimList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaimList) + out := out.(*PersistentVolumeClaimList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PersistentVolumeClaim, len(*in)) + for i := range *in { + if err := DeepCopy_v1_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_PersistentVolumeClaimSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaimSpec) + out := out.(*PersistentVolumeClaimSpec) + if in.AccessModes != nil { + in, out := &in.AccessModes, &out.AccessModes + *out = make([]PersistentVolumeAccessMode, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.AccessModes = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := DeepCopy_v1_ResourceRequirements(&in.Resources, &out.Resources, c); err != nil { + return err + } + out.VolumeName = in.VolumeName + return nil + } +} + +func DeepCopy_v1_PersistentVolumeClaimStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaimStatus) + out := out.(*PersistentVolumeClaimStatus) + out.Phase = in.Phase + if in.AccessModes != nil { + in, out := &in.AccessModes, &out.AccessModes + *out = make([]PersistentVolumeAccessMode, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.AccessModes = nil + } + if in.Capacity != nil { + in, out := &in.Capacity, &out.Capacity + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Capacity = nil + } + return nil + } +} + +func DeepCopy_v1_PersistentVolumeClaimVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaimVolumeSource) + out := out.(*PersistentVolumeClaimVolumeSource) + out.ClaimName = in.ClaimName + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_PersistentVolumeList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeList) + out := out.(*PersistentVolumeList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PersistentVolume, len(*in)) + for i := range *in { + if err := DeepCopy_v1_PersistentVolume(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_PersistentVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeSource) + out := out.(*PersistentVolumeSource) + if in.GCEPersistentDisk != nil { + in, out := &in.GCEPersistentDisk, &out.GCEPersistentDisk + *out = new(GCEPersistentDiskVolumeSource) + **out = **in + } else { + out.GCEPersistentDisk = nil + } + if in.AWSElasticBlockStore != nil { + in, out := &in.AWSElasticBlockStore, &out.AWSElasticBlockStore + *out = new(AWSElasticBlockStoreVolumeSource) + **out = **in + } else { + out.AWSElasticBlockStore = nil + } + if in.HostPath != nil { + in, out := &in.HostPath, &out.HostPath + *out = new(HostPathVolumeSource) + **out = **in + } else { + out.HostPath = nil + } + if in.Glusterfs != nil { + in, out := &in.Glusterfs, &out.Glusterfs + *out = new(GlusterfsVolumeSource) + **out = **in + } else { + out.Glusterfs = nil + } + if in.NFS != nil { + in, out := &in.NFS, &out.NFS + *out = new(NFSVolumeSource) + **out = **in + } else { + out.NFS = nil + } + if in.RBD != nil { + in, out := &in.RBD, &out.RBD + *out = new(RBDVolumeSource) + if err := DeepCopy_v1_RBDVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.RBD = nil + } + if in.ISCSI != nil { + in, out := &in.ISCSI, &out.ISCSI + *out = new(ISCSIVolumeSource) + **out = **in + } else { + out.ISCSI = nil + } + if in.Cinder != nil { + in, out := &in.Cinder, &out.Cinder + *out = new(CinderVolumeSource) + **out = **in + } else { + out.Cinder = nil + } + if in.CephFS != nil { + in, out := &in.CephFS, &out.CephFS + *out = new(CephFSVolumeSource) + if err := DeepCopy_v1_CephFSVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.CephFS = nil + } + if in.FC != nil { + in, out := &in.FC, &out.FC + *out = new(FCVolumeSource) + if err := DeepCopy_v1_FCVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.FC = nil + } + if in.Flocker != nil { + in, out := &in.Flocker, &out.Flocker + *out = new(FlockerVolumeSource) + **out = **in + } else { + out.Flocker = nil + } + if in.FlexVolume != nil { + in, out := &in.FlexVolume, &out.FlexVolume + *out = new(FlexVolumeSource) + if err := DeepCopy_v1_FlexVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.FlexVolume = nil + } + if in.AzureFile != nil { + in, out := &in.AzureFile, &out.AzureFile + *out = new(AzureFileVolumeSource) + **out = **in + } else { + out.AzureFile = nil + } + if in.VsphereVolume != nil { + in, out := &in.VsphereVolume, &out.VsphereVolume + *out = new(VsphereVirtualDiskVolumeSource) + **out = **in + } else { + out.VsphereVolume = nil + } + if in.Quobyte != nil { + in, out := &in.Quobyte, &out.Quobyte + *out = new(QuobyteVolumeSource) + **out = **in + } else { + out.Quobyte = nil + } + if in.AzureDisk != nil { + in, out := &in.AzureDisk, &out.AzureDisk + *out = new(AzureDiskVolumeSource) + if err := DeepCopy_v1_AzureDiskVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.AzureDisk = nil + } + if in.PhotonPersistentDisk != nil { + in, out := &in.PhotonPersistentDisk, &out.PhotonPersistentDisk + *out = new(PhotonPersistentDiskVolumeSource) + **out = **in + } else { + out.PhotonPersistentDisk = nil + } + return nil + } +} + +func DeepCopy_v1_PersistentVolumeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeSpec) + out := out.(*PersistentVolumeSpec) + if in.Capacity != nil { + in, out := &in.Capacity, &out.Capacity + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Capacity = nil + } + if err := DeepCopy_v1_PersistentVolumeSource(&in.PersistentVolumeSource, &out.PersistentVolumeSource, c); err != nil { + return err + } + if in.AccessModes != nil { + in, out := &in.AccessModes, &out.AccessModes + *out = make([]PersistentVolumeAccessMode, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.AccessModes = nil + } + if in.ClaimRef != nil { + in, out := &in.ClaimRef, &out.ClaimRef + *out = new(ObjectReference) + **out = **in + } else { + out.ClaimRef = nil + } + out.PersistentVolumeReclaimPolicy = in.PersistentVolumeReclaimPolicy + return nil + } +} + +func DeepCopy_v1_PersistentVolumeStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeStatus) + out := out.(*PersistentVolumeStatus) + out.Phase = in.Phase + out.Message = in.Message + out.Reason = in.Reason + return nil + } +} + +func DeepCopy_v1_PhotonPersistentDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PhotonPersistentDiskVolumeSource) + out := out.(*PhotonPersistentDiskVolumeSource) + out.PdID = in.PdID + out.FSType = in.FSType + return nil + } +} + +func DeepCopy_v1_Pod(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Pod) + out := out.(*Pod) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_PodSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1_PodStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_PodAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodAffinity) + out := out.(*PodAffinity) + if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution + *out = make([]PodAffinityTerm, len(*in)) + for i := range *in { + if err := DeepCopy_v1_PodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.RequiredDuringSchedulingIgnoredDuringExecution = nil + } + if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution + *out = make([]WeightedPodAffinityTerm, len(*in)) + for i := range *in { + if err := DeepCopy_v1_WeightedPodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.PreferredDuringSchedulingIgnoredDuringExecution = nil + } + return nil + } +} + +func DeepCopy_v1_PodAffinityTerm(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodAffinityTerm) + out := out.(*PodAffinityTerm) + if in.LabelSelector != nil { + in, out := &in.LabelSelector, &out.LabelSelector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.LabelSelector = nil + } + if in.Namespaces != nil { + in, out := &in.Namespaces, &out.Namespaces + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Namespaces = nil + } + out.TopologyKey = in.TopologyKey + return nil + } +} + +func DeepCopy_v1_PodAntiAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodAntiAffinity) + out := out.(*PodAntiAffinity) + if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution + *out = make([]PodAffinityTerm, len(*in)) + for i := range *in { + if err := DeepCopy_v1_PodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.RequiredDuringSchedulingIgnoredDuringExecution = nil + } + if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution + *out = make([]WeightedPodAffinityTerm, len(*in)) + for i := range *in { + if err := DeepCopy_v1_WeightedPodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.PreferredDuringSchedulingIgnoredDuringExecution = nil + } + return nil + } +} + +func DeepCopy_v1_PodAttachOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodAttachOptions) + out := out.(*PodAttachOptions) + out.TypeMeta = in.TypeMeta + out.Stdin = in.Stdin + out.Stdout = in.Stdout + out.Stderr = in.Stderr + out.TTY = in.TTY + out.Container = in.Container + return nil + } +} + +func DeepCopy_v1_PodCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodCondition) + out := out.(*PodCondition) + out.Type = in.Type + out.Status = in.Status + out.LastProbeTime = in.LastProbeTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1_PodExecOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodExecOptions) + out := out.(*PodExecOptions) + out.TypeMeta = in.TypeMeta + out.Stdin = in.Stdin + out.Stdout = in.Stdout + out.Stderr = in.Stderr + out.TTY = in.TTY + out.Container = in.Container + if in.Command != nil { + in, out := &in.Command, &out.Command + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Command = nil + } + return nil + } +} + +func DeepCopy_v1_PodList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodList) + out := out.(*PodList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Pod, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Pod(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_PodLogOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodLogOptions) + out := out.(*PodLogOptions) + out.TypeMeta = in.TypeMeta + out.Container = in.Container + out.Follow = in.Follow + out.Previous = in.Previous + if in.SinceSeconds != nil { + in, out := &in.SinceSeconds, &out.SinceSeconds + *out = new(int64) + **out = **in + } else { + out.SinceSeconds = nil + } + if in.SinceTime != nil { + in, out := &in.SinceTime, &out.SinceTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.SinceTime = nil + } + out.Timestamps = in.Timestamps + if in.TailLines != nil { + in, out := &in.TailLines, &out.TailLines + *out = new(int64) + **out = **in + } else { + out.TailLines = nil + } + if in.LimitBytes != nil { + in, out := &in.LimitBytes, &out.LimitBytes + *out = new(int64) + **out = **in + } else { + out.LimitBytes = nil + } + return nil + } +} + +func DeepCopy_v1_PodProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodProxyOptions) + out := out.(*PodProxyOptions) + out.TypeMeta = in.TypeMeta + out.Path = in.Path + return nil + } +} + +func DeepCopy_v1_PodSecurityContext(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSecurityContext) + out := out.(*PodSecurityContext) + if in.SELinuxOptions != nil { + in, out := &in.SELinuxOptions, &out.SELinuxOptions + *out = new(SELinuxOptions) + **out = **in + } else { + out.SELinuxOptions = nil + } + if in.RunAsUser != nil { + in, out := &in.RunAsUser, &out.RunAsUser + *out = new(int64) + **out = **in + } else { + out.RunAsUser = nil + } + if in.RunAsNonRoot != nil { + in, out := &in.RunAsNonRoot, &out.RunAsNonRoot + *out = new(bool) + **out = **in + } else { + out.RunAsNonRoot = nil + } + if in.SupplementalGroups != nil { + in, out := &in.SupplementalGroups, &out.SupplementalGroups + *out = make([]int64, len(*in)) + copy(*out, *in) + } else { + out.SupplementalGroups = nil + } + if in.FSGroup != nil { + in, out := &in.FSGroup, &out.FSGroup + *out = new(int64) + **out = **in + } else { + out.FSGroup = nil + } + return nil + } +} + +func DeepCopy_v1_PodSignature(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSignature) + out := out.(*PodSignature) + if in.PodController != nil { + in, out := &in.PodController, &out.PodController + *out = new(OwnerReference) + if err := DeepCopy_v1_OwnerReference(*in, *out, c); err != nil { + return err + } + } else { + out.PodController = nil + } + return nil + } +} + +func DeepCopy_v1_PodSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSpec) + out := out.(*PodSpec) + if in.Volumes != nil { + in, out := &in.Volumes, &out.Volumes + *out = make([]Volume, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Volume(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Volumes = nil + } + if in.InitContainers != nil { + in, out := &in.InitContainers, &out.InitContainers + *out = make([]Container, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Container(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.InitContainers = nil + } + if in.Containers != nil { + in, out := &in.Containers, &out.Containers + *out = make([]Container, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Container(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Containers = nil + } + out.RestartPolicy = in.RestartPolicy + if in.TerminationGracePeriodSeconds != nil { + in, out := &in.TerminationGracePeriodSeconds, &out.TerminationGracePeriodSeconds + *out = new(int64) + **out = **in + } else { + out.TerminationGracePeriodSeconds = nil + } + if in.ActiveDeadlineSeconds != nil { + in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds + *out = new(int64) + **out = **in + } else { + out.ActiveDeadlineSeconds = nil + } + out.DNSPolicy = in.DNSPolicy + if in.NodeSelector != nil { + in, out := &in.NodeSelector, &out.NodeSelector + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.NodeSelector = nil + } + out.ServiceAccountName = in.ServiceAccountName + out.DeprecatedServiceAccount = in.DeprecatedServiceAccount + out.NodeName = in.NodeName + out.HostNetwork = in.HostNetwork + out.HostPID = in.HostPID + out.HostIPC = in.HostIPC + if in.SecurityContext != nil { + in, out := &in.SecurityContext, &out.SecurityContext + *out = new(PodSecurityContext) + if err := DeepCopy_v1_PodSecurityContext(*in, *out, c); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + if in.ImagePullSecrets != nil { + in, out := &in.ImagePullSecrets, &out.ImagePullSecrets + *out = make([]LocalObjectReference, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.ImagePullSecrets = nil + } + out.Hostname = in.Hostname + out.Subdomain = in.Subdomain + return nil + } +} + +func DeepCopy_v1_PodStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodStatus) + out := out.(*PodStatus) + out.Phase = in.Phase + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]PodCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v1_PodCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + out.Message = in.Message + out.Reason = in.Reason + out.HostIP = in.HostIP + out.PodIP = in.PodIP + if in.StartTime != nil { + in, out := &in.StartTime, &out.StartTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.StartTime = nil + } + if in.InitContainerStatuses != nil { + in, out := &in.InitContainerStatuses, &out.InitContainerStatuses + *out = make([]ContainerStatus, len(*in)) + for i := range *in { + if err := DeepCopy_v1_ContainerStatus(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.InitContainerStatuses = nil + } + if in.ContainerStatuses != nil { + in, out := &in.ContainerStatuses, &out.ContainerStatuses + *out = make([]ContainerStatus, len(*in)) + for i := range *in { + if err := DeepCopy_v1_ContainerStatus(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.ContainerStatuses = nil + } + return nil + } +} + +func DeepCopy_v1_PodStatusResult(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodStatusResult) + out := out.(*PodStatusResult) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_PodStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_PodTemplate(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodTemplate) + out := out.(*PodTemplate) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_PodTemplateList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodTemplateList) + out := out.(*PodTemplateList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PodTemplate, len(*in)) + for i := range *in { + if err := DeepCopy_v1_PodTemplate(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_PodTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodTemplateSpec) + out := out.(*PodTemplateSpec) + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_PodSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_Preconditions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Preconditions) + out := out.(*Preconditions) + if in.UID != nil { + in, out := &in.UID, &out.UID + *out = new(types.UID) + **out = **in + } else { + out.UID = nil + } + return nil + } +} + +func DeepCopy_v1_PreferAvoidPodsEntry(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PreferAvoidPodsEntry) + out := out.(*PreferAvoidPodsEntry) + if err := DeepCopy_v1_PodSignature(&in.PodSignature, &out.PodSignature, c); err != nil { + return err + } + out.EvictionTime = in.EvictionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1_PreferredSchedulingTerm(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PreferredSchedulingTerm) + out := out.(*PreferredSchedulingTerm) + out.Weight = in.Weight + if err := DeepCopy_v1_NodeSelectorTerm(&in.Preference, &out.Preference, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_Probe(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Probe) + out := out.(*Probe) + if err := DeepCopy_v1_Handler(&in.Handler, &out.Handler, c); err != nil { + return err + } + out.InitialDelaySeconds = in.InitialDelaySeconds + out.TimeoutSeconds = in.TimeoutSeconds + out.PeriodSeconds = in.PeriodSeconds + out.SuccessThreshold = in.SuccessThreshold + out.FailureThreshold = in.FailureThreshold + return nil + } +} + +func DeepCopy_v1_QuobyteVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*QuobyteVolumeSource) + out := out.(*QuobyteVolumeSource) + out.Registry = in.Registry + out.Volume = in.Volume + out.ReadOnly = in.ReadOnly + out.User = in.User + out.Group = in.Group + return nil + } +} + +func DeepCopy_v1_RBDVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RBDVolumeSource) + out := out.(*RBDVolumeSource) + if in.CephMonitors != nil { + in, out := &in.CephMonitors, &out.CephMonitors + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.CephMonitors = nil + } + out.RBDImage = in.RBDImage + out.FSType = in.FSType + out.RBDPool = in.RBDPool + out.RadosUser = in.RadosUser + out.Keyring = in.Keyring + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(LocalObjectReference) + **out = **in + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_v1_RangeAllocation(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RangeAllocation) + out := out.(*RangeAllocation) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Range = in.Range + if in.Data != nil { + in, out := &in.Data, &out.Data + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Data = nil + } + return nil + } +} + +func DeepCopy_v1_ReplicationController(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationController) + out := out.(*ReplicationController) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_ReplicationControllerSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1_ReplicationControllerStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_ReplicationControllerCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerCondition) + out := out.(*ReplicationControllerCondition) + out.Type = in.Type + out.Status = in.Status + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1_ReplicationControllerList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerList) + out := out.(*ReplicationControllerList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ReplicationController, len(*in)) + for i := range *in { + if err := DeepCopy_v1_ReplicationController(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_ReplicationControllerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerSpec) + out := out.(*ReplicationControllerSpec) + if in.Replicas != nil { + in, out := &in.Replicas, &out.Replicas + *out = new(int32) + **out = **in + } else { + out.Replicas = nil + } + out.MinReadySeconds = in.MinReadySeconds + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Selector = nil + } + if in.Template != nil { + in, out := &in.Template, &out.Template + *out = new(PodTemplateSpec) + if err := DeepCopy_v1_PodTemplateSpec(*in, *out, c); err != nil { + return err + } + } else { + out.Template = nil + } + return nil + } +} + +func DeepCopy_v1_ReplicationControllerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerStatus) + out := out.(*ReplicationControllerStatus) + out.Replicas = in.Replicas + out.FullyLabeledReplicas = in.FullyLabeledReplicas + out.ReadyReplicas = in.ReadyReplicas + out.AvailableReplicas = in.AvailableReplicas + out.ObservedGeneration = in.ObservedGeneration + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ReplicationControllerCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v1_ReplicationControllerCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + return nil + } +} + +func DeepCopy_v1_ResourceFieldSelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceFieldSelector) + out := out.(*ResourceFieldSelector) + out.ContainerName = in.ContainerName + out.Resource = in.Resource + out.Divisor = in.Divisor.DeepCopy() + return nil + } +} + +func DeepCopy_v1_ResourceQuota(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceQuota) + out := out.(*ResourceQuota) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_ResourceQuotaSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1_ResourceQuotaStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_ResourceQuotaList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceQuotaList) + out := out.(*ResourceQuotaList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ResourceQuota, len(*in)) + for i := range *in { + if err := DeepCopy_v1_ResourceQuota(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_ResourceQuotaSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceQuotaSpec) + out := out.(*ResourceQuotaSpec) + if in.Hard != nil { + in, out := &in.Hard, &out.Hard + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Hard = nil + } + if in.Scopes != nil { + in, out := &in.Scopes, &out.Scopes + *out = make([]ResourceQuotaScope, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Scopes = nil + } + return nil + } +} + +func DeepCopy_v1_ResourceQuotaStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceQuotaStatus) + out := out.(*ResourceQuotaStatus) + if in.Hard != nil { + in, out := &in.Hard, &out.Hard + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Hard = nil + } + if in.Used != nil { + in, out := &in.Used, &out.Used + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Used = nil + } + return nil + } +} + +func DeepCopy_v1_ResourceRequirements(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceRequirements) + out := out.(*ResourceRequirements) + if in.Limits != nil { + in, out := &in.Limits, &out.Limits + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Limits = nil + } + if in.Requests != nil { + in, out := &in.Requests, &out.Requests + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Requests = nil + } + return nil + } +} + +func DeepCopy_v1_SELinuxOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SELinuxOptions) + out := out.(*SELinuxOptions) + out.User = in.User + out.Role = in.Role + out.Type = in.Type + out.Level = in.Level + return nil + } +} + +func DeepCopy_v1_Secret(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Secret) + out := out.(*Secret) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Data != nil { + in, out := &in.Data, &out.Data + *out = make(map[string][]byte) + for key, val := range *in { + if newVal, err := c.DeepCopy(&val); err != nil { + return err + } else { + (*out)[key] = *newVal.(*[]byte) + } + } + } else { + out.Data = nil + } + if in.StringData != nil { + in, out := &in.StringData, &out.StringData + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.StringData = nil + } + out.Type = in.Type + return nil + } +} + +func DeepCopy_v1_SecretKeySelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SecretKeySelector) + out := out.(*SecretKeySelector) + out.LocalObjectReference = in.LocalObjectReference + out.Key = in.Key + return nil + } +} + +func DeepCopy_v1_SecretList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SecretList) + out := out.(*SecretList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Secret, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Secret(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_SecretVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SecretVolumeSource) + out := out.(*SecretVolumeSource) + out.SecretName = in.SecretName + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]KeyToPath, len(*in)) + for i := range *in { + if err := DeepCopy_v1_KeyToPath(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + if in.DefaultMode != nil { + in, out := &in.DefaultMode, &out.DefaultMode + *out = new(int32) + **out = **in + } else { + out.DefaultMode = nil + } + return nil + } +} + +func DeepCopy_v1_SecurityContext(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SecurityContext) + out := out.(*SecurityContext) + if in.Capabilities != nil { + in, out := &in.Capabilities, &out.Capabilities + *out = new(Capabilities) + if err := DeepCopy_v1_Capabilities(*in, *out, c); err != nil { + return err + } + } else { + out.Capabilities = nil + } + if in.Privileged != nil { + in, out := &in.Privileged, &out.Privileged + *out = new(bool) + **out = **in + } else { + out.Privileged = nil + } + if in.SELinuxOptions != nil { + in, out := &in.SELinuxOptions, &out.SELinuxOptions + *out = new(SELinuxOptions) + **out = **in + } else { + out.SELinuxOptions = nil + } + if in.RunAsUser != nil { + in, out := &in.RunAsUser, &out.RunAsUser + *out = new(int64) + **out = **in + } else { + out.RunAsUser = nil + } + if in.RunAsNonRoot != nil { + in, out := &in.RunAsNonRoot, &out.RunAsNonRoot + *out = new(bool) + **out = **in + } else { + out.RunAsNonRoot = nil + } + if in.ReadOnlyRootFilesystem != nil { + in, out := &in.ReadOnlyRootFilesystem, &out.ReadOnlyRootFilesystem + *out = new(bool) + **out = **in + } else { + out.ReadOnlyRootFilesystem = nil + } + return nil + } +} + +func DeepCopy_v1_SerializedReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SerializedReference) + out := out.(*SerializedReference) + out.TypeMeta = in.TypeMeta + out.Reference = in.Reference + return nil + } +} + +func DeepCopy_v1_Service(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Service) + out := out.(*Service) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_ServiceSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1_ServiceStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_ServiceAccount(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceAccount) + out := out.(*ServiceAccount) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Secrets != nil { + in, out := &in.Secrets, &out.Secrets + *out = make([]ObjectReference, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Secrets = nil + } + if in.ImagePullSecrets != nil { + in, out := &in.ImagePullSecrets, &out.ImagePullSecrets + *out = make([]LocalObjectReference, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.ImagePullSecrets = nil + } + return nil + } +} + +func DeepCopy_v1_ServiceAccountList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceAccountList) + out := out.(*ServiceAccountList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ServiceAccount, len(*in)) + for i := range *in { + if err := DeepCopy_v1_ServiceAccount(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_ServiceList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceList) + out := out.(*ServiceList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Service, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Service(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_ServicePort(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServicePort) + out := out.(*ServicePort) + out.Name = in.Name + out.Protocol = in.Protocol + out.Port = in.Port + out.TargetPort = in.TargetPort + out.NodePort = in.NodePort + return nil + } +} + +func DeepCopy_v1_ServiceProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceProxyOptions) + out := out.(*ServiceProxyOptions) + out.TypeMeta = in.TypeMeta + out.Path = in.Path + return nil + } +} + +func DeepCopy_v1_ServiceSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceSpec) + out := out.(*ServiceSpec) + if in.Ports != nil { + in, out := &in.Ports, &out.Ports + *out = make([]ServicePort, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ports = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Selector = nil + } + out.ClusterIP = in.ClusterIP + out.Type = in.Type + if in.ExternalIPs != nil { + in, out := &in.ExternalIPs, &out.ExternalIPs + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.ExternalIPs = nil + } + if in.DeprecatedPublicIPs != nil { + in, out := &in.DeprecatedPublicIPs, &out.DeprecatedPublicIPs + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.DeprecatedPublicIPs = nil + } + out.SessionAffinity = in.SessionAffinity + out.LoadBalancerIP = in.LoadBalancerIP + if in.LoadBalancerSourceRanges != nil { + in, out := &in.LoadBalancerSourceRanges, &out.LoadBalancerSourceRanges + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.LoadBalancerSourceRanges = nil + } + out.ExternalName = in.ExternalName + return nil + } +} + +func DeepCopy_v1_ServiceStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceStatus) + out := out.(*ServiceStatus) + if err := DeepCopy_v1_LoadBalancerStatus(&in.LoadBalancer, &out.LoadBalancer, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_Sysctl(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Sysctl) + out := out.(*Sysctl) + out.Name = in.Name + out.Value = in.Value + return nil + } +} + +func DeepCopy_v1_TCPSocketAction(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TCPSocketAction) + out := out.(*TCPSocketAction) + out.Port = in.Port + return nil + } +} + +func DeepCopy_v1_Taint(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Taint) + out := out.(*Taint) + out.Key = in.Key + out.Value = in.Value + out.Effect = in.Effect + return nil + } +} + +func DeepCopy_v1_Toleration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Toleration) + out := out.(*Toleration) + out.Key = in.Key + out.Operator = in.Operator + out.Value = in.Value + out.Effect = in.Effect + return nil + } +} + +func DeepCopy_v1_Volume(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Volume) + out := out.(*Volume) + out.Name = in.Name + if err := DeepCopy_v1_VolumeSource(&in.VolumeSource, &out.VolumeSource, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_VolumeMount(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*VolumeMount) + out := out.(*VolumeMount) + out.Name = in.Name + out.ReadOnly = in.ReadOnly + out.MountPath = in.MountPath + out.SubPath = in.SubPath + return nil + } +} + +func DeepCopy_v1_VolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*VolumeSource) + out := out.(*VolumeSource) + if in.HostPath != nil { + in, out := &in.HostPath, &out.HostPath + *out = new(HostPathVolumeSource) + **out = **in + } else { + out.HostPath = nil + } + if in.EmptyDir != nil { + in, out := &in.EmptyDir, &out.EmptyDir + *out = new(EmptyDirVolumeSource) + **out = **in + } else { + out.EmptyDir = nil + } + if in.GCEPersistentDisk != nil { + in, out := &in.GCEPersistentDisk, &out.GCEPersistentDisk + *out = new(GCEPersistentDiskVolumeSource) + **out = **in + } else { + out.GCEPersistentDisk = nil + } + if in.AWSElasticBlockStore != nil { + in, out := &in.AWSElasticBlockStore, &out.AWSElasticBlockStore + *out = new(AWSElasticBlockStoreVolumeSource) + **out = **in + } else { + out.AWSElasticBlockStore = nil + } + if in.GitRepo != nil { + in, out := &in.GitRepo, &out.GitRepo + *out = new(GitRepoVolumeSource) + **out = **in + } else { + out.GitRepo = nil + } + if in.Secret != nil { + in, out := &in.Secret, &out.Secret + *out = new(SecretVolumeSource) + if err := DeepCopy_v1_SecretVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.Secret = nil + } + if in.NFS != nil { + in, out := &in.NFS, &out.NFS + *out = new(NFSVolumeSource) + **out = **in + } else { + out.NFS = nil + } + if in.ISCSI != nil { + in, out := &in.ISCSI, &out.ISCSI + *out = new(ISCSIVolumeSource) + **out = **in + } else { + out.ISCSI = nil + } + if in.Glusterfs != nil { + in, out := &in.Glusterfs, &out.Glusterfs + *out = new(GlusterfsVolumeSource) + **out = **in + } else { + out.Glusterfs = nil + } + if in.PersistentVolumeClaim != nil { + in, out := &in.PersistentVolumeClaim, &out.PersistentVolumeClaim + *out = new(PersistentVolumeClaimVolumeSource) + **out = **in + } else { + out.PersistentVolumeClaim = nil + } + if in.RBD != nil { + in, out := &in.RBD, &out.RBD + *out = new(RBDVolumeSource) + if err := DeepCopy_v1_RBDVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.RBD = nil + } + if in.FlexVolume != nil { + in, out := &in.FlexVolume, &out.FlexVolume + *out = new(FlexVolumeSource) + if err := DeepCopy_v1_FlexVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.FlexVolume = nil + } + if in.Cinder != nil { + in, out := &in.Cinder, &out.Cinder + *out = new(CinderVolumeSource) + **out = **in + } else { + out.Cinder = nil + } + if in.CephFS != nil { + in, out := &in.CephFS, &out.CephFS + *out = new(CephFSVolumeSource) + if err := DeepCopy_v1_CephFSVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.CephFS = nil + } + if in.Flocker != nil { + in, out := &in.Flocker, &out.Flocker + *out = new(FlockerVolumeSource) + **out = **in + } else { + out.Flocker = nil + } + if in.DownwardAPI != nil { + in, out := &in.DownwardAPI, &out.DownwardAPI + *out = new(DownwardAPIVolumeSource) + if err := DeepCopy_v1_DownwardAPIVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.DownwardAPI = nil + } + if in.FC != nil { + in, out := &in.FC, &out.FC + *out = new(FCVolumeSource) + if err := DeepCopy_v1_FCVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.FC = nil + } + if in.AzureFile != nil { + in, out := &in.AzureFile, &out.AzureFile + *out = new(AzureFileVolumeSource) + **out = **in + } else { + out.AzureFile = nil + } + if in.ConfigMap != nil { + in, out := &in.ConfigMap, &out.ConfigMap + *out = new(ConfigMapVolumeSource) + if err := DeepCopy_v1_ConfigMapVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.ConfigMap = nil + } + if in.VsphereVolume != nil { + in, out := &in.VsphereVolume, &out.VsphereVolume + *out = new(VsphereVirtualDiskVolumeSource) + **out = **in + } else { + out.VsphereVolume = nil + } + if in.Quobyte != nil { + in, out := &in.Quobyte, &out.Quobyte + *out = new(QuobyteVolumeSource) + **out = **in + } else { + out.Quobyte = nil + } + if in.AzureDisk != nil { + in, out := &in.AzureDisk, &out.AzureDisk + *out = new(AzureDiskVolumeSource) + if err := DeepCopy_v1_AzureDiskVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.AzureDisk = nil + } + if in.PhotonPersistentDisk != nil { + in, out := &in.PhotonPersistentDisk, &out.PhotonPersistentDisk + *out = new(PhotonPersistentDiskVolumeSource) + **out = **in + } else { + out.PhotonPersistentDisk = nil + } + return nil + } +} + +func DeepCopy_v1_VsphereVirtualDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*VsphereVirtualDiskVolumeSource) + out := out.(*VsphereVirtualDiskVolumeSource) + out.VolumePath = in.VolumePath + out.FSType = in.FSType + return nil + } +} + +func DeepCopy_v1_WeightedPodAffinityTerm(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*WeightedPodAffinityTerm) + out := out.(*WeightedPodAffinityTerm) + out.Weight = in.Weight + if err := DeepCopy_v1_PodAffinityTerm(&in.PodAffinityTerm, &out.PodAffinityTerm, c); err != nil { + return err + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/api/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/api/zz_generated.deepcopy.go new file mode 100644 index 00000000000..4ccc8602f38 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/api/zz_generated.deepcopy.go @@ -0,0 +1,3792 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package api + +import ( + v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + fields "k8s.io/client-go/pkg/fields" + labels "k8s.io/client-go/pkg/labels" + runtime "k8s.io/client-go/pkg/runtime" + types "k8s.io/client-go/pkg/types" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AWSElasticBlockStoreVolumeSource, InType: reflect.TypeOf(&AWSElasticBlockStoreVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Affinity, InType: reflect.TypeOf(&Affinity{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AttachedVolume, InType: reflect.TypeOf(&AttachedVolume{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AvoidPods, InType: reflect.TypeOf(&AvoidPods{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AzureDiskVolumeSource, InType: reflect.TypeOf(&AzureDiskVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_AzureFileVolumeSource, InType: reflect.TypeOf(&AzureFileVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Binding, InType: reflect.TypeOf(&Binding{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Capabilities, InType: reflect.TypeOf(&Capabilities{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_CephFSVolumeSource, InType: reflect.TypeOf(&CephFSVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_CinderVolumeSource, InType: reflect.TypeOf(&CinderVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ComponentCondition, InType: reflect.TypeOf(&ComponentCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ComponentStatus, InType: reflect.TypeOf(&ComponentStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ComponentStatusList, InType: reflect.TypeOf(&ComponentStatusList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConfigMap, InType: reflect.TypeOf(&ConfigMap{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConfigMapKeySelector, InType: reflect.TypeOf(&ConfigMapKeySelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConfigMapList, InType: reflect.TypeOf(&ConfigMapList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConfigMapVolumeSource, InType: reflect.TypeOf(&ConfigMapVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Container, InType: reflect.TypeOf(&Container{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerImage, InType: reflect.TypeOf(&ContainerImage{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerPort, InType: reflect.TypeOf(&ContainerPort{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerState, InType: reflect.TypeOf(&ContainerState{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerStateRunning, InType: reflect.TypeOf(&ContainerStateRunning{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerStateTerminated, InType: reflect.TypeOf(&ContainerStateTerminated{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerStateWaiting, InType: reflect.TypeOf(&ContainerStateWaiting{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ContainerStatus, InType: reflect.TypeOf(&ContainerStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ConversionError, InType: reflect.TypeOf(&ConversionError{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_DaemonEndpoint, InType: reflect.TypeOf(&DaemonEndpoint{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_DeleteOptions, InType: reflect.TypeOf(&DeleteOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_DownwardAPIVolumeFile, InType: reflect.TypeOf(&DownwardAPIVolumeFile{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_DownwardAPIVolumeSource, InType: reflect.TypeOf(&DownwardAPIVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EmptyDirVolumeSource, InType: reflect.TypeOf(&EmptyDirVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EndpointAddress, InType: reflect.TypeOf(&EndpointAddress{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EndpointPort, InType: reflect.TypeOf(&EndpointPort{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EndpointSubset, InType: reflect.TypeOf(&EndpointSubset{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Endpoints, InType: reflect.TypeOf(&Endpoints{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EndpointsList, InType: reflect.TypeOf(&EndpointsList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EnvVar, InType: reflect.TypeOf(&EnvVar{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EnvVarSource, InType: reflect.TypeOf(&EnvVarSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Event, InType: reflect.TypeOf(&Event{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EventList, InType: reflect.TypeOf(&EventList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_EventSource, InType: reflect.TypeOf(&EventSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ExecAction, InType: reflect.TypeOf(&ExecAction{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FCVolumeSource, InType: reflect.TypeOf(&FCVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FlexVolumeSource, InType: reflect.TypeOf(&FlexVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_FlockerVolumeSource, InType: reflect.TypeOf(&FlockerVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_GCEPersistentDiskVolumeSource, InType: reflect.TypeOf(&GCEPersistentDiskVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_GitRepoVolumeSource, InType: reflect.TypeOf(&GitRepoVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_GlusterfsVolumeSource, InType: reflect.TypeOf(&GlusterfsVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_HTTPGetAction, InType: reflect.TypeOf(&HTTPGetAction{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_HTTPHeader, InType: reflect.TypeOf(&HTTPHeader{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Handler, InType: reflect.TypeOf(&Handler{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_HostPathVolumeSource, InType: reflect.TypeOf(&HostPathVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ISCSIVolumeSource, InType: reflect.TypeOf(&ISCSIVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_KeyToPath, InType: reflect.TypeOf(&KeyToPath{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Lifecycle, InType: reflect.TypeOf(&Lifecycle{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LimitRange, InType: reflect.TypeOf(&LimitRange{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LimitRangeItem, InType: reflect.TypeOf(&LimitRangeItem{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LimitRangeList, InType: reflect.TypeOf(&LimitRangeList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LimitRangeSpec, InType: reflect.TypeOf(&LimitRangeSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_List, InType: reflect.TypeOf(&List{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ListOptions, InType: reflect.TypeOf(&ListOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LoadBalancerIngress, InType: reflect.TypeOf(&LoadBalancerIngress{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LoadBalancerStatus, InType: reflect.TypeOf(&LoadBalancerStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_LocalObjectReference, InType: reflect.TypeOf(&LocalObjectReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NFSVolumeSource, InType: reflect.TypeOf(&NFSVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Namespace, InType: reflect.TypeOf(&Namespace{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NamespaceList, InType: reflect.TypeOf(&NamespaceList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NamespaceSpec, InType: reflect.TypeOf(&NamespaceSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NamespaceStatus, InType: reflect.TypeOf(&NamespaceStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Node, InType: reflect.TypeOf(&Node{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeAddress, InType: reflect.TypeOf(&NodeAddress{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeAffinity, InType: reflect.TypeOf(&NodeAffinity{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeCondition, InType: reflect.TypeOf(&NodeCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeDaemonEndpoints, InType: reflect.TypeOf(&NodeDaemonEndpoints{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeList, InType: reflect.TypeOf(&NodeList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeProxyOptions, InType: reflect.TypeOf(&NodeProxyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeResources, InType: reflect.TypeOf(&NodeResources{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSelector, InType: reflect.TypeOf(&NodeSelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSelectorRequirement, InType: reflect.TypeOf(&NodeSelectorRequirement{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSelectorTerm, InType: reflect.TypeOf(&NodeSelectorTerm{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSpec, InType: reflect.TypeOf(&NodeSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeStatus, InType: reflect.TypeOf(&NodeStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_NodeSystemInfo, InType: reflect.TypeOf(&NodeSystemInfo{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ObjectFieldSelector, InType: reflect.TypeOf(&ObjectFieldSelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ObjectMeta, InType: reflect.TypeOf(&ObjectMeta{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ObjectReference, InType: reflect.TypeOf(&ObjectReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_OwnerReference, InType: reflect.TypeOf(&OwnerReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolume, InType: reflect.TypeOf(&PersistentVolume{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaim, InType: reflect.TypeOf(&PersistentVolumeClaim{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaimList, InType: reflect.TypeOf(&PersistentVolumeClaimList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaimSpec, InType: reflect.TypeOf(&PersistentVolumeClaimSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaimStatus, InType: reflect.TypeOf(&PersistentVolumeClaimStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeClaimVolumeSource, InType: reflect.TypeOf(&PersistentVolumeClaimVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeList, InType: reflect.TypeOf(&PersistentVolumeList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeSource, InType: reflect.TypeOf(&PersistentVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeSpec, InType: reflect.TypeOf(&PersistentVolumeSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PersistentVolumeStatus, InType: reflect.TypeOf(&PersistentVolumeStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PhotonPersistentDiskVolumeSource, InType: reflect.TypeOf(&PhotonPersistentDiskVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Pod, InType: reflect.TypeOf(&Pod{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodAffinity, InType: reflect.TypeOf(&PodAffinity{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodAffinityTerm, InType: reflect.TypeOf(&PodAffinityTerm{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodAntiAffinity, InType: reflect.TypeOf(&PodAntiAffinity{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodAttachOptions, InType: reflect.TypeOf(&PodAttachOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodCondition, InType: reflect.TypeOf(&PodCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodExecOptions, InType: reflect.TypeOf(&PodExecOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodList, InType: reflect.TypeOf(&PodList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodLogOptions, InType: reflect.TypeOf(&PodLogOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodProxyOptions, InType: reflect.TypeOf(&PodProxyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSecurityContext, InType: reflect.TypeOf(&PodSecurityContext{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSignature, InType: reflect.TypeOf(&PodSignature{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodSpec, InType: reflect.TypeOf(&PodSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodStatus, InType: reflect.TypeOf(&PodStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodStatusResult, InType: reflect.TypeOf(&PodStatusResult{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodTemplate, InType: reflect.TypeOf(&PodTemplate{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodTemplateList, InType: reflect.TypeOf(&PodTemplateList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PodTemplateSpec, InType: reflect.TypeOf(&PodTemplateSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Preconditions, InType: reflect.TypeOf(&Preconditions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PreferAvoidPodsEntry, InType: reflect.TypeOf(&PreferAvoidPodsEntry{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_PreferredSchedulingTerm, InType: reflect.TypeOf(&PreferredSchedulingTerm{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Probe, InType: reflect.TypeOf(&Probe{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_QuobyteVolumeSource, InType: reflect.TypeOf(&QuobyteVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RBDVolumeSource, InType: reflect.TypeOf(&RBDVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_RangeAllocation, InType: reflect.TypeOf(&RangeAllocation{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationController, InType: reflect.TypeOf(&ReplicationController{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationControllerCondition, InType: reflect.TypeOf(&ReplicationControllerCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationControllerList, InType: reflect.TypeOf(&ReplicationControllerList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationControllerSpec, InType: reflect.TypeOf(&ReplicationControllerSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ReplicationControllerStatus, InType: reflect.TypeOf(&ReplicationControllerStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceFieldSelector, InType: reflect.TypeOf(&ResourceFieldSelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceQuota, InType: reflect.TypeOf(&ResourceQuota{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceQuotaList, InType: reflect.TypeOf(&ResourceQuotaList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceQuotaSpec, InType: reflect.TypeOf(&ResourceQuotaSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceQuotaStatus, InType: reflect.TypeOf(&ResourceQuotaStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ResourceRequirements, InType: reflect.TypeOf(&ResourceRequirements{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SELinuxOptions, InType: reflect.TypeOf(&SELinuxOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Secret, InType: reflect.TypeOf(&Secret{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SecretKeySelector, InType: reflect.TypeOf(&SecretKeySelector{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SecretList, InType: reflect.TypeOf(&SecretList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SecretVolumeSource, InType: reflect.TypeOf(&SecretVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SecurityContext, InType: reflect.TypeOf(&SecurityContext{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_SerializedReference, InType: reflect.TypeOf(&SerializedReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Service, InType: reflect.TypeOf(&Service{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceAccount, InType: reflect.TypeOf(&ServiceAccount{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceAccountList, InType: reflect.TypeOf(&ServiceAccountList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceList, InType: reflect.TypeOf(&ServiceList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServicePort, InType: reflect.TypeOf(&ServicePort{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceProxyOptions, InType: reflect.TypeOf(&ServiceProxyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceSpec, InType: reflect.TypeOf(&ServiceSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ServiceStatus, InType: reflect.TypeOf(&ServiceStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Sysctl, InType: reflect.TypeOf(&Sysctl{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_TCPSocketAction, InType: reflect.TypeOf(&TCPSocketAction{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Taint, InType: reflect.TypeOf(&Taint{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Toleration, InType: reflect.TypeOf(&Toleration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_Volume, InType: reflect.TypeOf(&Volume{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_VolumeMount, InType: reflect.TypeOf(&VolumeMount{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_VolumeSource, InType: reflect.TypeOf(&VolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_VsphereVirtualDiskVolumeSource, InType: reflect.TypeOf(&VsphereVirtualDiskVolumeSource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_WeightedPodAffinityTerm, InType: reflect.TypeOf(&WeightedPodAffinityTerm{})}, + ) +} + +func DeepCopy_api_AWSElasticBlockStoreVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AWSElasticBlockStoreVolumeSource) + out := out.(*AWSElasticBlockStoreVolumeSource) + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_Affinity(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Affinity) + out := out.(*Affinity) + if in.NodeAffinity != nil { + in, out := &in.NodeAffinity, &out.NodeAffinity + *out = new(NodeAffinity) + if err := DeepCopy_api_NodeAffinity(*in, *out, c); err != nil { + return err + } + } else { + out.NodeAffinity = nil + } + if in.PodAffinity != nil { + in, out := &in.PodAffinity, &out.PodAffinity + *out = new(PodAffinity) + if err := DeepCopy_api_PodAffinity(*in, *out, c); err != nil { + return err + } + } else { + out.PodAffinity = nil + } + if in.PodAntiAffinity != nil { + in, out := &in.PodAntiAffinity, &out.PodAntiAffinity + *out = new(PodAntiAffinity) + if err := DeepCopy_api_PodAntiAffinity(*in, *out, c); err != nil { + return err + } + } else { + out.PodAntiAffinity = nil + } + return nil + } +} + +func DeepCopy_api_AttachedVolume(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AttachedVolume) + out := out.(*AttachedVolume) + out.Name = in.Name + out.DevicePath = in.DevicePath + return nil + } +} + +func DeepCopy_api_AvoidPods(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AvoidPods) + out := out.(*AvoidPods) + if in.PreferAvoidPods != nil { + in, out := &in.PreferAvoidPods, &out.PreferAvoidPods + *out = make([]PreferAvoidPodsEntry, len(*in)) + for i := range *in { + if err := DeepCopy_api_PreferAvoidPodsEntry(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.PreferAvoidPods = nil + } + return nil + } +} + +func DeepCopy_api_AzureDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AzureDiskVolumeSource) + out := out.(*AzureDiskVolumeSource) + out.DiskName = in.DiskName + out.DataDiskURI = in.DataDiskURI + if in.CachingMode != nil { + in, out := &in.CachingMode, &out.CachingMode + *out = new(AzureDataDiskCachingMode) + **out = **in + } else { + out.CachingMode = nil + } + if in.FSType != nil { + in, out := &in.FSType, &out.FSType + *out = new(string) + **out = **in + } else { + out.FSType = nil + } + if in.ReadOnly != nil { + in, out := &in.ReadOnly, &out.ReadOnly + *out = new(bool) + **out = **in + } else { + out.ReadOnly = nil + } + return nil + } +} + +func DeepCopy_api_AzureFileVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*AzureFileVolumeSource) + out := out.(*AzureFileVolumeSource) + out.SecretName = in.SecretName + out.ShareName = in.ShareName + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_Binding(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Binding) + out := out.(*Binding) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Target = in.Target + return nil + } +} + +func DeepCopy_api_Capabilities(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Capabilities) + out := out.(*Capabilities) + if in.Add != nil { + in, out := &in.Add, &out.Add + *out = make([]Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Add = nil + } + if in.Drop != nil { + in, out := &in.Drop, &out.Drop + *out = make([]Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Drop = nil + } + return nil + } +} + +func DeepCopy_api_CephFSVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CephFSVolumeSource) + out := out.(*CephFSVolumeSource) + if in.Monitors != nil { + in, out := &in.Monitors, &out.Monitors + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Monitors = nil + } + out.Path = in.Path + out.User = in.User + out.SecretFile = in.SecretFile + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(LocalObjectReference) + **out = **in + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_CinderVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CinderVolumeSource) + out := out.(*CinderVolumeSource) + out.VolumeID = in.VolumeID + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_ComponentCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ComponentCondition) + out := out.(*ComponentCondition) + out.Type = in.Type + out.Status = in.Status + out.Message = in.Message + out.Error = in.Error + return nil + } +} + +func DeepCopy_api_ComponentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ComponentStatus) + out := out.(*ComponentStatus) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ComponentCondition, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Conditions = nil + } + return nil + } +} + +func DeepCopy_api_ComponentStatusList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ComponentStatusList) + out := out.(*ComponentStatusList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ComponentStatus, len(*in)) + for i := range *in { + if err := DeepCopy_api_ComponentStatus(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_ConfigMap(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ConfigMap) + out := out.(*ConfigMap) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Data != nil { + in, out := &in.Data, &out.Data + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Data = nil + } + return nil + } +} + +func DeepCopy_api_ConfigMapKeySelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ConfigMapKeySelector) + out := out.(*ConfigMapKeySelector) + out.LocalObjectReference = in.LocalObjectReference + out.Key = in.Key + return nil + } +} + +func DeepCopy_api_ConfigMapList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ConfigMapList) + out := out.(*ConfigMapList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ConfigMap, len(*in)) + for i := range *in { + if err := DeepCopy_api_ConfigMap(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_ConfigMapVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ConfigMapVolumeSource) + out := out.(*ConfigMapVolumeSource) + out.LocalObjectReference = in.LocalObjectReference + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]KeyToPath, len(*in)) + for i := range *in { + if err := DeepCopy_api_KeyToPath(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + if in.DefaultMode != nil { + in, out := &in.DefaultMode, &out.DefaultMode + *out = new(int32) + **out = **in + } else { + out.DefaultMode = nil + } + return nil + } +} + +func DeepCopy_api_Container(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Container) + out := out.(*Container) + out.Name = in.Name + out.Image = in.Image + if in.Command != nil { + in, out := &in.Command, &out.Command + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Command = nil + } + if in.Args != nil { + in, out := &in.Args, &out.Args + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Args = nil + } + out.WorkingDir = in.WorkingDir + if in.Ports != nil { + in, out := &in.Ports, &out.Ports + *out = make([]ContainerPort, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ports = nil + } + if in.Env != nil { + in, out := &in.Env, &out.Env + *out = make([]EnvVar, len(*in)) + for i := range *in { + if err := DeepCopy_api_EnvVar(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Env = nil + } + if err := DeepCopy_api_ResourceRequirements(&in.Resources, &out.Resources, c); err != nil { + return err + } + if in.VolumeMounts != nil { + in, out := &in.VolumeMounts, &out.VolumeMounts + *out = make([]VolumeMount, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.VolumeMounts = nil + } + if in.LivenessProbe != nil { + in, out := &in.LivenessProbe, &out.LivenessProbe + *out = new(Probe) + if err := DeepCopy_api_Probe(*in, *out, c); err != nil { + return err + } + } else { + out.LivenessProbe = nil + } + if in.ReadinessProbe != nil { + in, out := &in.ReadinessProbe, &out.ReadinessProbe + *out = new(Probe) + if err := DeepCopy_api_Probe(*in, *out, c); err != nil { + return err + } + } else { + out.ReadinessProbe = nil + } + if in.Lifecycle != nil { + in, out := &in.Lifecycle, &out.Lifecycle + *out = new(Lifecycle) + if err := DeepCopy_api_Lifecycle(*in, *out, c); err != nil { + return err + } + } else { + out.Lifecycle = nil + } + out.TerminationMessagePath = in.TerminationMessagePath + out.ImagePullPolicy = in.ImagePullPolicy + if in.SecurityContext != nil { + in, out := &in.SecurityContext, &out.SecurityContext + *out = new(SecurityContext) + if err := DeepCopy_api_SecurityContext(*in, *out, c); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + out.Stdin = in.Stdin + out.StdinOnce = in.StdinOnce + out.TTY = in.TTY + return nil + } +} + +func DeepCopy_api_ContainerImage(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerImage) + out := out.(*ContainerImage) + if in.Names != nil { + in, out := &in.Names, &out.Names + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Names = nil + } + out.SizeBytes = in.SizeBytes + return nil + } +} + +func DeepCopy_api_ContainerPort(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerPort) + out := out.(*ContainerPort) + out.Name = in.Name + out.HostPort = in.HostPort + out.ContainerPort = in.ContainerPort + out.Protocol = in.Protocol + out.HostIP = in.HostIP + return nil + } +} + +func DeepCopy_api_ContainerState(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerState) + out := out.(*ContainerState) + if in.Waiting != nil { + in, out := &in.Waiting, &out.Waiting + *out = new(ContainerStateWaiting) + **out = **in + } else { + out.Waiting = nil + } + if in.Running != nil { + in, out := &in.Running, &out.Running + *out = new(ContainerStateRunning) + if err := DeepCopy_api_ContainerStateRunning(*in, *out, c); err != nil { + return err + } + } else { + out.Running = nil + } + if in.Terminated != nil { + in, out := &in.Terminated, &out.Terminated + *out = new(ContainerStateTerminated) + if err := DeepCopy_api_ContainerStateTerminated(*in, *out, c); err != nil { + return err + } + } else { + out.Terminated = nil + } + return nil + } +} + +func DeepCopy_api_ContainerStateRunning(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerStateRunning) + out := out.(*ContainerStateRunning) + out.StartedAt = in.StartedAt.DeepCopy() + return nil + } +} + +func DeepCopy_api_ContainerStateTerminated(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerStateTerminated) + out := out.(*ContainerStateTerminated) + out.ExitCode = in.ExitCode + out.Signal = in.Signal + out.Reason = in.Reason + out.Message = in.Message + out.StartedAt = in.StartedAt.DeepCopy() + out.FinishedAt = in.FinishedAt.DeepCopy() + out.ContainerID = in.ContainerID + return nil + } +} + +func DeepCopy_api_ContainerStateWaiting(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerStateWaiting) + out := out.(*ContainerStateWaiting) + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_api_ContainerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ContainerStatus) + out := out.(*ContainerStatus) + out.Name = in.Name + if err := DeepCopy_api_ContainerState(&in.State, &out.State, c); err != nil { + return err + } + if err := DeepCopy_api_ContainerState(&in.LastTerminationState, &out.LastTerminationState, c); err != nil { + return err + } + out.Ready = in.Ready + out.RestartCount = in.RestartCount + out.Image = in.Image + out.ImageID = in.ImageID + out.ContainerID = in.ContainerID + return nil + } +} + +func DeepCopy_api_ConversionError(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ConversionError) + out := out.(*ConversionError) + if in.In == nil { + out.In = nil + } else if newVal, err := c.DeepCopy(&in.In); err != nil { + return err + } else { + out.In = *newVal.(*interface{}) + } + if in.Out == nil { + out.Out = nil + } else if newVal, err := c.DeepCopy(&in.Out); err != nil { + return err + } else { + out.Out = *newVal.(*interface{}) + } + out.Message = in.Message + return nil + } +} + +func DeepCopy_api_DaemonEndpoint(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonEndpoint) + out := out.(*DaemonEndpoint) + out.Port = in.Port + return nil + } +} + +func DeepCopy_api_DeleteOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeleteOptions) + out := out.(*DeleteOptions) + out.TypeMeta = in.TypeMeta + if in.GracePeriodSeconds != nil { + in, out := &in.GracePeriodSeconds, &out.GracePeriodSeconds + *out = new(int64) + **out = **in + } else { + out.GracePeriodSeconds = nil + } + if in.Preconditions != nil { + in, out := &in.Preconditions, &out.Preconditions + *out = new(Preconditions) + if err := DeepCopy_api_Preconditions(*in, *out, c); err != nil { + return err + } + } else { + out.Preconditions = nil + } + if in.OrphanDependents != nil { + in, out := &in.OrphanDependents, &out.OrphanDependents + *out = new(bool) + **out = **in + } else { + out.OrphanDependents = nil + } + return nil + } +} + +func DeepCopy_api_DownwardAPIVolumeFile(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DownwardAPIVolumeFile) + out := out.(*DownwardAPIVolumeFile) + out.Path = in.Path + if in.FieldRef != nil { + in, out := &in.FieldRef, &out.FieldRef + *out = new(ObjectFieldSelector) + **out = **in + } else { + out.FieldRef = nil + } + if in.ResourceFieldRef != nil { + in, out := &in.ResourceFieldRef, &out.ResourceFieldRef + *out = new(ResourceFieldSelector) + if err := DeepCopy_api_ResourceFieldSelector(*in, *out, c); err != nil { + return err + } + } else { + out.ResourceFieldRef = nil + } + if in.Mode != nil { + in, out := &in.Mode, &out.Mode + *out = new(int32) + **out = **in + } else { + out.Mode = nil + } + return nil + } +} + +func DeepCopy_api_DownwardAPIVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DownwardAPIVolumeSource) + out := out.(*DownwardAPIVolumeSource) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DownwardAPIVolumeFile, len(*in)) + for i := range *in { + if err := DeepCopy_api_DownwardAPIVolumeFile(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + if in.DefaultMode != nil { + in, out := &in.DefaultMode, &out.DefaultMode + *out = new(int32) + **out = **in + } else { + out.DefaultMode = nil + } + return nil + } +} + +func DeepCopy_api_EmptyDirVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EmptyDirVolumeSource) + out := out.(*EmptyDirVolumeSource) + out.Medium = in.Medium + return nil + } +} + +func DeepCopy_api_EndpointAddress(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EndpointAddress) + out := out.(*EndpointAddress) + out.IP = in.IP + out.Hostname = in.Hostname + if in.NodeName != nil { + in, out := &in.NodeName, &out.NodeName + *out = new(string) + **out = **in + } else { + out.NodeName = nil + } + if in.TargetRef != nil { + in, out := &in.TargetRef, &out.TargetRef + *out = new(ObjectReference) + **out = **in + } else { + out.TargetRef = nil + } + return nil + } +} + +func DeepCopy_api_EndpointPort(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EndpointPort) + out := out.(*EndpointPort) + out.Name = in.Name + out.Port = in.Port + out.Protocol = in.Protocol + return nil + } +} + +func DeepCopy_api_EndpointSubset(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EndpointSubset) + out := out.(*EndpointSubset) + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]EndpointAddress, len(*in)) + for i := range *in { + if err := DeepCopy_api_EndpointAddress(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Addresses = nil + } + if in.NotReadyAddresses != nil { + in, out := &in.NotReadyAddresses, &out.NotReadyAddresses + *out = make([]EndpointAddress, len(*in)) + for i := range *in { + if err := DeepCopy_api_EndpointAddress(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.NotReadyAddresses = nil + } + if in.Ports != nil { + in, out := &in.Ports, &out.Ports + *out = make([]EndpointPort, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ports = nil + } + return nil + } +} + +func DeepCopy_api_Endpoints(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Endpoints) + out := out.(*Endpoints) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Subsets != nil { + in, out := &in.Subsets, &out.Subsets + *out = make([]EndpointSubset, len(*in)) + for i := range *in { + if err := DeepCopy_api_EndpointSubset(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Subsets = nil + } + return nil + } +} + +func DeepCopy_api_EndpointsList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EndpointsList) + out := out.(*EndpointsList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Endpoints, len(*in)) + for i := range *in { + if err := DeepCopy_api_Endpoints(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_EnvVar(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EnvVar) + out := out.(*EnvVar) + out.Name = in.Name + out.Value = in.Value + if in.ValueFrom != nil { + in, out := &in.ValueFrom, &out.ValueFrom + *out = new(EnvVarSource) + if err := DeepCopy_api_EnvVarSource(*in, *out, c); err != nil { + return err + } + } else { + out.ValueFrom = nil + } + return nil + } +} + +func DeepCopy_api_EnvVarSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EnvVarSource) + out := out.(*EnvVarSource) + if in.FieldRef != nil { + in, out := &in.FieldRef, &out.FieldRef + *out = new(ObjectFieldSelector) + **out = **in + } else { + out.FieldRef = nil + } + if in.ResourceFieldRef != nil { + in, out := &in.ResourceFieldRef, &out.ResourceFieldRef + *out = new(ResourceFieldSelector) + if err := DeepCopy_api_ResourceFieldSelector(*in, *out, c); err != nil { + return err + } + } else { + out.ResourceFieldRef = nil + } + if in.ConfigMapKeyRef != nil { + in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef + *out = new(ConfigMapKeySelector) + **out = **in + } else { + out.ConfigMapKeyRef = nil + } + if in.SecretKeyRef != nil { + in, out := &in.SecretKeyRef, &out.SecretKeyRef + *out = new(SecretKeySelector) + **out = **in + } else { + out.SecretKeyRef = nil + } + return nil + } +} + +func DeepCopy_api_Event(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Event) + out := out.(*Event) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.InvolvedObject = in.InvolvedObject + out.Reason = in.Reason + out.Message = in.Message + out.Source = in.Source + out.FirstTimestamp = in.FirstTimestamp.DeepCopy() + out.LastTimestamp = in.LastTimestamp.DeepCopy() + out.Count = in.Count + out.Type = in.Type + return nil + } +} + +func DeepCopy_api_EventList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EventList) + out := out.(*EventList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Event, len(*in)) + for i := range *in { + if err := DeepCopy_api_Event(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_EventSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*EventSource) + out := out.(*EventSource) + out.Component = in.Component + out.Host = in.Host + return nil + } +} + +func DeepCopy_api_ExecAction(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ExecAction) + out := out.(*ExecAction) + if in.Command != nil { + in, out := &in.Command, &out.Command + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Command = nil + } + return nil + } +} + +func DeepCopy_api_FCVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*FCVolumeSource) + out := out.(*FCVolumeSource) + if in.TargetWWNs != nil { + in, out := &in.TargetWWNs, &out.TargetWWNs + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.TargetWWNs = nil + } + if in.Lun != nil { + in, out := &in.Lun, &out.Lun + *out = new(int32) + **out = **in + } else { + out.Lun = nil + } + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_FlexVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*FlexVolumeSource) + out := out.(*FlexVolumeSource) + out.Driver = in.Driver + out.FSType = in.FSType + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(LocalObjectReference) + **out = **in + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + if in.Options != nil { + in, out := &in.Options, &out.Options + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Options = nil + } + return nil + } +} + +func DeepCopy_api_FlockerVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*FlockerVolumeSource) + out := out.(*FlockerVolumeSource) + out.DatasetName = in.DatasetName + out.DatasetUUID = in.DatasetUUID + return nil + } +} + +func DeepCopy_api_GCEPersistentDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GCEPersistentDiskVolumeSource) + out := out.(*GCEPersistentDiskVolumeSource) + out.PDName = in.PDName + out.FSType = in.FSType + out.Partition = in.Partition + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_GitRepoVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GitRepoVolumeSource) + out := out.(*GitRepoVolumeSource) + out.Repository = in.Repository + out.Revision = in.Revision + out.Directory = in.Directory + return nil + } +} + +func DeepCopy_api_GlusterfsVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GlusterfsVolumeSource) + out := out.(*GlusterfsVolumeSource) + out.EndpointsName = in.EndpointsName + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_HTTPGetAction(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HTTPGetAction) + out := out.(*HTTPGetAction) + out.Path = in.Path + out.Port = in.Port + out.Host = in.Host + out.Scheme = in.Scheme + if in.HTTPHeaders != nil { + in, out := &in.HTTPHeaders, &out.HTTPHeaders + *out = make([]HTTPHeader, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.HTTPHeaders = nil + } + return nil + } +} + +func DeepCopy_api_HTTPHeader(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HTTPHeader) + out := out.(*HTTPHeader) + out.Name = in.Name + out.Value = in.Value + return nil + } +} + +func DeepCopy_api_Handler(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Handler) + out := out.(*Handler) + if in.Exec != nil { + in, out := &in.Exec, &out.Exec + *out = new(ExecAction) + if err := DeepCopy_api_ExecAction(*in, *out, c); err != nil { + return err + } + } else { + out.Exec = nil + } + if in.HTTPGet != nil { + in, out := &in.HTTPGet, &out.HTTPGet + *out = new(HTTPGetAction) + if err := DeepCopy_api_HTTPGetAction(*in, *out, c); err != nil { + return err + } + } else { + out.HTTPGet = nil + } + if in.TCPSocket != nil { + in, out := &in.TCPSocket, &out.TCPSocket + *out = new(TCPSocketAction) + **out = **in + } else { + out.TCPSocket = nil + } + return nil + } +} + +func DeepCopy_api_HostPathVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HostPathVolumeSource) + out := out.(*HostPathVolumeSource) + out.Path = in.Path + return nil + } +} + +func DeepCopy_api_ISCSIVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ISCSIVolumeSource) + out := out.(*ISCSIVolumeSource) + out.TargetPortal = in.TargetPortal + out.IQN = in.IQN + out.Lun = in.Lun + out.ISCSIInterface = in.ISCSIInterface + out.FSType = in.FSType + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_KeyToPath(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KeyToPath) + out := out.(*KeyToPath) + out.Key = in.Key + out.Path = in.Path + if in.Mode != nil { + in, out := &in.Mode, &out.Mode + *out = new(int32) + **out = **in + } else { + out.Mode = nil + } + return nil + } +} + +func DeepCopy_api_Lifecycle(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Lifecycle) + out := out.(*Lifecycle) + if in.PostStart != nil { + in, out := &in.PostStart, &out.PostStart + *out = new(Handler) + if err := DeepCopy_api_Handler(*in, *out, c); err != nil { + return err + } + } else { + out.PostStart = nil + } + if in.PreStop != nil { + in, out := &in.PreStop, &out.PreStop + *out = new(Handler) + if err := DeepCopy_api_Handler(*in, *out, c); err != nil { + return err + } + } else { + out.PreStop = nil + } + return nil + } +} + +func DeepCopy_api_LimitRange(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LimitRange) + out := out.(*LimitRange) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_LimitRangeSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_LimitRangeItem(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LimitRangeItem) + out := out.(*LimitRangeItem) + out.Type = in.Type + if in.Max != nil { + in, out := &in.Max, &out.Max + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Max = nil + } + if in.Min != nil { + in, out := &in.Min, &out.Min + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Min = nil + } + if in.Default != nil { + in, out := &in.Default, &out.Default + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Default = nil + } + if in.DefaultRequest != nil { + in, out := &in.DefaultRequest, &out.DefaultRequest + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.DefaultRequest = nil + } + if in.MaxLimitRequestRatio != nil { + in, out := &in.MaxLimitRequestRatio, &out.MaxLimitRequestRatio + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.MaxLimitRequestRatio = nil + } + return nil + } +} + +func DeepCopy_api_LimitRangeList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LimitRangeList) + out := out.(*LimitRangeList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]LimitRange, len(*in)) + for i := range *in { + if err := DeepCopy_api_LimitRange(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_LimitRangeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LimitRangeSpec) + out := out.(*LimitRangeSpec) + if in.Limits != nil { + in, out := &in.Limits, &out.Limits + *out = make([]LimitRangeItem, len(*in)) + for i := range *in { + if err := DeepCopy_api_LimitRangeItem(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Limits = nil + } + return nil + } +} + +func DeepCopy_api_List(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*List) + out := out.(*List) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]runtime.Object, len(*in)) + for i := range *in { + if newVal, err := c.DeepCopy(&(*in)[i]); err != nil { + return err + } else { + (*out)[i] = *newVal.(*runtime.Object) + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_ListOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ListOptions) + out := out.(*ListOptions) + out.TypeMeta = in.TypeMeta + if in.LabelSelector == nil { + out.LabelSelector = nil + } else if newVal, err := c.DeepCopy(&in.LabelSelector); err != nil { + return err + } else { + out.LabelSelector = *newVal.(*labels.Selector) + } + if in.FieldSelector == nil { + out.FieldSelector = nil + } else if newVal, err := c.DeepCopy(&in.FieldSelector); err != nil { + return err + } else { + out.FieldSelector = *newVal.(*fields.Selector) + } + out.Watch = in.Watch + out.ResourceVersion = in.ResourceVersion + if in.TimeoutSeconds != nil { + in, out := &in.TimeoutSeconds, &out.TimeoutSeconds + *out = new(int64) + **out = **in + } else { + out.TimeoutSeconds = nil + } + return nil + } +} + +func DeepCopy_api_LoadBalancerIngress(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LoadBalancerIngress) + out := out.(*LoadBalancerIngress) + out.IP = in.IP + out.Hostname = in.Hostname + return nil + } +} + +func DeepCopy_api_LoadBalancerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LoadBalancerStatus) + out := out.(*LoadBalancerStatus) + if in.Ingress != nil { + in, out := &in.Ingress, &out.Ingress + *out = make([]LoadBalancerIngress, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ingress = nil + } + return nil + } +} + +func DeepCopy_api_LocalObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LocalObjectReference) + out := out.(*LocalObjectReference) + out.Name = in.Name + return nil + } +} + +func DeepCopy_api_NFSVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NFSVolumeSource) + out := out.(*NFSVolumeSource) + out.Server = in.Server + out.Path = in.Path + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_Namespace(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Namespace) + out := out.(*Namespace) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_NamespaceSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_api_NamespaceList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NamespaceList) + out := out.(*NamespaceList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Namespace, len(*in)) + for i := range *in { + if err := DeepCopy_api_Namespace(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_NamespaceSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NamespaceSpec) + out := out.(*NamespaceSpec) + if in.Finalizers != nil { + in, out := &in.Finalizers, &out.Finalizers + *out = make([]FinalizerName, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Finalizers = nil + } + return nil + } +} + +func DeepCopy_api_NamespaceStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NamespaceStatus) + out := out.(*NamespaceStatus) + out.Phase = in.Phase + return nil + } +} + +func DeepCopy_api_Node(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Node) + out := out.(*Node) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Spec = in.Spec + if err := DeepCopy_api_NodeStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_NodeAddress(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeAddress) + out := out.(*NodeAddress) + out.Type = in.Type + out.Address = in.Address + return nil + } +} + +func DeepCopy_api_NodeAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeAffinity) + out := out.(*NodeAffinity) + if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution + *out = new(NodeSelector) + if err := DeepCopy_api_NodeSelector(*in, *out, c); err != nil { + return err + } + } else { + out.RequiredDuringSchedulingIgnoredDuringExecution = nil + } + if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution + *out = make([]PreferredSchedulingTerm, len(*in)) + for i := range *in { + if err := DeepCopy_api_PreferredSchedulingTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.PreferredDuringSchedulingIgnoredDuringExecution = nil + } + return nil + } +} + +func DeepCopy_api_NodeCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeCondition) + out := out.(*NodeCondition) + out.Type = in.Type + out.Status = in.Status + out.LastHeartbeatTime = in.LastHeartbeatTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_api_NodeDaemonEndpoints(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeDaemonEndpoints) + out := out.(*NodeDaemonEndpoints) + out.KubeletEndpoint = in.KubeletEndpoint + return nil + } +} + +func DeepCopy_api_NodeList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeList) + out := out.(*NodeList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Node, len(*in)) + for i := range *in { + if err := DeepCopy_api_Node(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_NodeProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeProxyOptions) + out := out.(*NodeProxyOptions) + out.TypeMeta = in.TypeMeta + out.Path = in.Path + return nil + } +} + +func DeepCopy_api_NodeResources(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeResources) + out := out.(*NodeResources) + if in.Capacity != nil { + in, out := &in.Capacity, &out.Capacity + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Capacity = nil + } + return nil + } +} + +func DeepCopy_api_NodeSelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSelector) + out := out.(*NodeSelector) + if in.NodeSelectorTerms != nil { + in, out := &in.NodeSelectorTerms, &out.NodeSelectorTerms + *out = make([]NodeSelectorTerm, len(*in)) + for i := range *in { + if err := DeepCopy_api_NodeSelectorTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.NodeSelectorTerms = nil + } + return nil + } +} + +func DeepCopy_api_NodeSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSelectorRequirement) + out := out.(*NodeSelectorRequirement) + out.Key = in.Key + out.Operator = in.Operator + if in.Values != nil { + in, out := &in.Values, &out.Values + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Values = nil + } + return nil + } +} + +func DeepCopy_api_NodeSelectorTerm(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSelectorTerm) + out := out.(*NodeSelectorTerm) + if in.MatchExpressions != nil { + in, out := &in.MatchExpressions, &out.MatchExpressions + *out = make([]NodeSelectorRequirement, len(*in)) + for i := range *in { + if err := DeepCopy_api_NodeSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.MatchExpressions = nil + } + return nil + } +} + +func DeepCopy_api_NodeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSpec) + out := out.(*NodeSpec) + out.PodCIDR = in.PodCIDR + out.ExternalID = in.ExternalID + out.ProviderID = in.ProviderID + out.Unschedulable = in.Unschedulable + return nil + } +} + +func DeepCopy_api_NodeStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeStatus) + out := out.(*NodeStatus) + if in.Capacity != nil { + in, out := &in.Capacity, &out.Capacity + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Capacity = nil + } + if in.Allocatable != nil { + in, out := &in.Allocatable, &out.Allocatable + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Allocatable = nil + } + out.Phase = in.Phase + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]NodeCondition, len(*in)) + for i := range *in { + if err := DeepCopy_api_NodeCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.Addresses != nil { + in, out := &in.Addresses, &out.Addresses + *out = make([]NodeAddress, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Addresses = nil + } + out.DaemonEndpoints = in.DaemonEndpoints + out.NodeInfo = in.NodeInfo + if in.Images != nil { + in, out := &in.Images, &out.Images + *out = make([]ContainerImage, len(*in)) + for i := range *in { + if err := DeepCopy_api_ContainerImage(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Images = nil + } + if in.VolumesInUse != nil { + in, out := &in.VolumesInUse, &out.VolumesInUse + *out = make([]UniqueVolumeName, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.VolumesInUse = nil + } + if in.VolumesAttached != nil { + in, out := &in.VolumesAttached, &out.VolumesAttached + *out = make([]AttachedVolume, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.VolumesAttached = nil + } + return nil + } +} + +func DeepCopy_api_NodeSystemInfo(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NodeSystemInfo) + out := out.(*NodeSystemInfo) + out.MachineID = in.MachineID + out.SystemUUID = in.SystemUUID + out.BootID = in.BootID + out.KernelVersion = in.KernelVersion + out.OSImage = in.OSImage + out.ContainerRuntimeVersion = in.ContainerRuntimeVersion + out.KubeletVersion = in.KubeletVersion + out.KubeProxyVersion = in.KubeProxyVersion + out.OperatingSystem = in.OperatingSystem + out.Architecture = in.Architecture + return nil + } +} + +func DeepCopy_api_ObjectFieldSelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ObjectFieldSelector) + out := out.(*ObjectFieldSelector) + out.APIVersion = in.APIVersion + out.FieldPath = in.FieldPath + return nil + } +} + +func DeepCopy_api_ObjectMeta(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ObjectMeta) + out := out.(*ObjectMeta) + out.Name = in.Name + out.GenerateName = in.GenerateName + out.Namespace = in.Namespace + out.SelfLink = in.SelfLink + out.UID = in.UID + out.ResourceVersion = in.ResourceVersion + out.Generation = in.Generation + out.CreationTimestamp = in.CreationTimestamp.DeepCopy() + if in.DeletionTimestamp != nil { + in, out := &in.DeletionTimestamp, &out.DeletionTimestamp + *out = new(v1.Time) + **out = (*in).DeepCopy() + } else { + out.DeletionTimestamp = nil + } + if in.DeletionGracePeriodSeconds != nil { + in, out := &in.DeletionGracePeriodSeconds, &out.DeletionGracePeriodSeconds + *out = new(int64) + **out = **in + } else { + out.DeletionGracePeriodSeconds = nil + } + if in.Labels != nil { + in, out := &in.Labels, &out.Labels + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Labels = nil + } + if in.Annotations != nil { + in, out := &in.Annotations, &out.Annotations + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Annotations = nil + } + if in.OwnerReferences != nil { + in, out := &in.OwnerReferences, &out.OwnerReferences + *out = make([]OwnerReference, len(*in)) + for i := range *in { + if err := DeepCopy_api_OwnerReference(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.OwnerReferences = nil + } + if in.Finalizers != nil { + in, out := &in.Finalizers, &out.Finalizers + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Finalizers = nil + } + out.ClusterName = in.ClusterName + return nil + } +} + +func DeepCopy_api_ObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ObjectReference) + out := out.(*ObjectReference) + out.Kind = in.Kind + out.Namespace = in.Namespace + out.Name = in.Name + out.UID = in.UID + out.APIVersion = in.APIVersion + out.ResourceVersion = in.ResourceVersion + out.FieldPath = in.FieldPath + return nil + } +} + +func DeepCopy_api_OwnerReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*OwnerReference) + out := out.(*OwnerReference) + out.APIVersion = in.APIVersion + out.Kind = in.Kind + out.Name = in.Name + out.UID = in.UID + if in.Controller != nil { + in, out := &in.Controller, &out.Controller + *out = new(bool) + **out = **in + } else { + out.Controller = nil + } + return nil + } +} + +func DeepCopy_api_PersistentVolume(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolume) + out := out.(*PersistentVolume) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_PersistentVolumeSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_api_PersistentVolumeClaim(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaim) + out := out.(*PersistentVolumeClaim) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_PersistentVolumeClaimSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_api_PersistentVolumeClaimStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_PersistentVolumeClaimList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaimList) + out := out.(*PersistentVolumeClaimList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PersistentVolumeClaim, len(*in)) + for i := range *in { + if err := DeepCopy_api_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_PersistentVolumeClaimSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaimSpec) + out := out.(*PersistentVolumeClaimSpec) + if in.AccessModes != nil { + in, out := &in.AccessModes, &out.AccessModes + *out = make([]PersistentVolumeAccessMode, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.AccessModes = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := DeepCopy_api_ResourceRequirements(&in.Resources, &out.Resources, c); err != nil { + return err + } + out.VolumeName = in.VolumeName + return nil + } +} + +func DeepCopy_api_PersistentVolumeClaimStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaimStatus) + out := out.(*PersistentVolumeClaimStatus) + out.Phase = in.Phase + if in.AccessModes != nil { + in, out := &in.AccessModes, &out.AccessModes + *out = make([]PersistentVolumeAccessMode, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.AccessModes = nil + } + if in.Capacity != nil { + in, out := &in.Capacity, &out.Capacity + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Capacity = nil + } + return nil + } +} + +func DeepCopy_api_PersistentVolumeClaimVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeClaimVolumeSource) + out := out.(*PersistentVolumeClaimVolumeSource) + out.ClaimName = in.ClaimName + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_PersistentVolumeList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeList) + out := out.(*PersistentVolumeList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PersistentVolume, len(*in)) + for i := range *in { + if err := DeepCopy_api_PersistentVolume(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_PersistentVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeSource) + out := out.(*PersistentVolumeSource) + if in.GCEPersistentDisk != nil { + in, out := &in.GCEPersistentDisk, &out.GCEPersistentDisk + *out = new(GCEPersistentDiskVolumeSource) + **out = **in + } else { + out.GCEPersistentDisk = nil + } + if in.AWSElasticBlockStore != nil { + in, out := &in.AWSElasticBlockStore, &out.AWSElasticBlockStore + *out = new(AWSElasticBlockStoreVolumeSource) + **out = **in + } else { + out.AWSElasticBlockStore = nil + } + if in.HostPath != nil { + in, out := &in.HostPath, &out.HostPath + *out = new(HostPathVolumeSource) + **out = **in + } else { + out.HostPath = nil + } + if in.Glusterfs != nil { + in, out := &in.Glusterfs, &out.Glusterfs + *out = new(GlusterfsVolumeSource) + **out = **in + } else { + out.Glusterfs = nil + } + if in.NFS != nil { + in, out := &in.NFS, &out.NFS + *out = new(NFSVolumeSource) + **out = **in + } else { + out.NFS = nil + } + if in.RBD != nil { + in, out := &in.RBD, &out.RBD + *out = new(RBDVolumeSource) + if err := DeepCopy_api_RBDVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.RBD = nil + } + if in.Quobyte != nil { + in, out := &in.Quobyte, &out.Quobyte + *out = new(QuobyteVolumeSource) + **out = **in + } else { + out.Quobyte = nil + } + if in.ISCSI != nil { + in, out := &in.ISCSI, &out.ISCSI + *out = new(ISCSIVolumeSource) + **out = **in + } else { + out.ISCSI = nil + } + if in.FlexVolume != nil { + in, out := &in.FlexVolume, &out.FlexVolume + *out = new(FlexVolumeSource) + if err := DeepCopy_api_FlexVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.FlexVolume = nil + } + if in.Cinder != nil { + in, out := &in.Cinder, &out.Cinder + *out = new(CinderVolumeSource) + **out = **in + } else { + out.Cinder = nil + } + if in.CephFS != nil { + in, out := &in.CephFS, &out.CephFS + *out = new(CephFSVolumeSource) + if err := DeepCopy_api_CephFSVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.CephFS = nil + } + if in.FC != nil { + in, out := &in.FC, &out.FC + *out = new(FCVolumeSource) + if err := DeepCopy_api_FCVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.FC = nil + } + if in.Flocker != nil { + in, out := &in.Flocker, &out.Flocker + *out = new(FlockerVolumeSource) + **out = **in + } else { + out.Flocker = nil + } + if in.AzureFile != nil { + in, out := &in.AzureFile, &out.AzureFile + *out = new(AzureFileVolumeSource) + **out = **in + } else { + out.AzureFile = nil + } + if in.VsphereVolume != nil { + in, out := &in.VsphereVolume, &out.VsphereVolume + *out = new(VsphereVirtualDiskVolumeSource) + **out = **in + } else { + out.VsphereVolume = nil + } + if in.AzureDisk != nil { + in, out := &in.AzureDisk, &out.AzureDisk + *out = new(AzureDiskVolumeSource) + if err := DeepCopy_api_AzureDiskVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.AzureDisk = nil + } + if in.PhotonPersistentDisk != nil { + in, out := &in.PhotonPersistentDisk, &out.PhotonPersistentDisk + *out = new(PhotonPersistentDiskVolumeSource) + **out = **in + } else { + out.PhotonPersistentDisk = nil + } + return nil + } +} + +func DeepCopy_api_PersistentVolumeSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeSpec) + out := out.(*PersistentVolumeSpec) + if in.Capacity != nil { + in, out := &in.Capacity, &out.Capacity + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Capacity = nil + } + if err := DeepCopy_api_PersistentVolumeSource(&in.PersistentVolumeSource, &out.PersistentVolumeSource, c); err != nil { + return err + } + if in.AccessModes != nil { + in, out := &in.AccessModes, &out.AccessModes + *out = make([]PersistentVolumeAccessMode, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.AccessModes = nil + } + if in.ClaimRef != nil { + in, out := &in.ClaimRef, &out.ClaimRef + *out = new(ObjectReference) + **out = **in + } else { + out.ClaimRef = nil + } + out.PersistentVolumeReclaimPolicy = in.PersistentVolumeReclaimPolicy + return nil + } +} + +func DeepCopy_api_PersistentVolumeStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeStatus) + out := out.(*PersistentVolumeStatus) + out.Phase = in.Phase + out.Message = in.Message + out.Reason = in.Reason + return nil + } +} + +func DeepCopy_api_PhotonPersistentDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PhotonPersistentDiskVolumeSource) + out := out.(*PhotonPersistentDiskVolumeSource) + out.PdID = in.PdID + out.FSType = in.FSType + return nil + } +} + +func DeepCopy_api_Pod(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Pod) + out := out.(*Pod) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_PodSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_api_PodStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_PodAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodAffinity) + out := out.(*PodAffinity) + if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution + *out = make([]PodAffinityTerm, len(*in)) + for i := range *in { + if err := DeepCopy_api_PodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.RequiredDuringSchedulingIgnoredDuringExecution = nil + } + if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution + *out = make([]WeightedPodAffinityTerm, len(*in)) + for i := range *in { + if err := DeepCopy_api_WeightedPodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.PreferredDuringSchedulingIgnoredDuringExecution = nil + } + return nil + } +} + +func DeepCopy_api_PodAffinityTerm(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodAffinityTerm) + out := out.(*PodAffinityTerm) + if in.LabelSelector != nil { + in, out := &in.LabelSelector, &out.LabelSelector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.LabelSelector = nil + } + if in.Namespaces != nil { + in, out := &in.Namespaces, &out.Namespaces + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Namespaces = nil + } + out.TopologyKey = in.TopologyKey + return nil + } +} + +func DeepCopy_api_PodAntiAffinity(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodAntiAffinity) + out := out.(*PodAntiAffinity) + if in.RequiredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.RequiredDuringSchedulingIgnoredDuringExecution, &out.RequiredDuringSchedulingIgnoredDuringExecution + *out = make([]PodAffinityTerm, len(*in)) + for i := range *in { + if err := DeepCopy_api_PodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.RequiredDuringSchedulingIgnoredDuringExecution = nil + } + if in.PreferredDuringSchedulingIgnoredDuringExecution != nil { + in, out := &in.PreferredDuringSchedulingIgnoredDuringExecution, &out.PreferredDuringSchedulingIgnoredDuringExecution + *out = make([]WeightedPodAffinityTerm, len(*in)) + for i := range *in { + if err := DeepCopy_api_WeightedPodAffinityTerm(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.PreferredDuringSchedulingIgnoredDuringExecution = nil + } + return nil + } +} + +func DeepCopy_api_PodAttachOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodAttachOptions) + out := out.(*PodAttachOptions) + out.TypeMeta = in.TypeMeta + out.Stdin = in.Stdin + out.Stdout = in.Stdout + out.Stderr = in.Stderr + out.TTY = in.TTY + out.Container = in.Container + return nil + } +} + +func DeepCopy_api_PodCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodCondition) + out := out.(*PodCondition) + out.Type = in.Type + out.Status = in.Status + out.LastProbeTime = in.LastProbeTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_api_PodExecOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodExecOptions) + out := out.(*PodExecOptions) + out.TypeMeta = in.TypeMeta + out.Stdin = in.Stdin + out.Stdout = in.Stdout + out.Stderr = in.Stderr + out.TTY = in.TTY + out.Container = in.Container + if in.Command != nil { + in, out := &in.Command, &out.Command + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Command = nil + } + return nil + } +} + +func DeepCopy_api_PodList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodList) + out := out.(*PodList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Pod, len(*in)) + for i := range *in { + if err := DeepCopy_api_Pod(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_PodLogOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodLogOptions) + out := out.(*PodLogOptions) + out.TypeMeta = in.TypeMeta + out.Container = in.Container + out.Follow = in.Follow + out.Previous = in.Previous + if in.SinceSeconds != nil { + in, out := &in.SinceSeconds, &out.SinceSeconds + *out = new(int64) + **out = **in + } else { + out.SinceSeconds = nil + } + if in.SinceTime != nil { + in, out := &in.SinceTime, &out.SinceTime + *out = new(v1.Time) + **out = (*in).DeepCopy() + } else { + out.SinceTime = nil + } + out.Timestamps = in.Timestamps + if in.TailLines != nil { + in, out := &in.TailLines, &out.TailLines + *out = new(int64) + **out = **in + } else { + out.TailLines = nil + } + if in.LimitBytes != nil { + in, out := &in.LimitBytes, &out.LimitBytes + *out = new(int64) + **out = **in + } else { + out.LimitBytes = nil + } + return nil + } +} + +func DeepCopy_api_PodProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodProxyOptions) + out := out.(*PodProxyOptions) + out.TypeMeta = in.TypeMeta + out.Path = in.Path + return nil + } +} + +func DeepCopy_api_PodSecurityContext(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSecurityContext) + out := out.(*PodSecurityContext) + out.HostNetwork = in.HostNetwork + out.HostPID = in.HostPID + out.HostIPC = in.HostIPC + if in.SELinuxOptions != nil { + in, out := &in.SELinuxOptions, &out.SELinuxOptions + *out = new(SELinuxOptions) + **out = **in + } else { + out.SELinuxOptions = nil + } + if in.RunAsUser != nil { + in, out := &in.RunAsUser, &out.RunAsUser + *out = new(int64) + **out = **in + } else { + out.RunAsUser = nil + } + if in.RunAsNonRoot != nil { + in, out := &in.RunAsNonRoot, &out.RunAsNonRoot + *out = new(bool) + **out = **in + } else { + out.RunAsNonRoot = nil + } + if in.SupplementalGroups != nil { + in, out := &in.SupplementalGroups, &out.SupplementalGroups + *out = make([]int64, len(*in)) + copy(*out, *in) + } else { + out.SupplementalGroups = nil + } + if in.FSGroup != nil { + in, out := &in.FSGroup, &out.FSGroup + *out = new(int64) + **out = **in + } else { + out.FSGroup = nil + } + return nil + } +} + +func DeepCopy_api_PodSignature(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSignature) + out := out.(*PodSignature) + if in.PodController != nil { + in, out := &in.PodController, &out.PodController + *out = new(OwnerReference) + if err := DeepCopy_api_OwnerReference(*in, *out, c); err != nil { + return err + } + } else { + out.PodController = nil + } + return nil + } +} + +func DeepCopy_api_PodSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSpec) + out := out.(*PodSpec) + if in.Volumes != nil { + in, out := &in.Volumes, &out.Volumes + *out = make([]Volume, len(*in)) + for i := range *in { + if err := DeepCopy_api_Volume(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Volumes = nil + } + if in.InitContainers != nil { + in, out := &in.InitContainers, &out.InitContainers + *out = make([]Container, len(*in)) + for i := range *in { + if err := DeepCopy_api_Container(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.InitContainers = nil + } + if in.Containers != nil { + in, out := &in.Containers, &out.Containers + *out = make([]Container, len(*in)) + for i := range *in { + if err := DeepCopy_api_Container(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Containers = nil + } + out.RestartPolicy = in.RestartPolicy + if in.TerminationGracePeriodSeconds != nil { + in, out := &in.TerminationGracePeriodSeconds, &out.TerminationGracePeriodSeconds + *out = new(int64) + **out = **in + } else { + out.TerminationGracePeriodSeconds = nil + } + if in.ActiveDeadlineSeconds != nil { + in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds + *out = new(int64) + **out = **in + } else { + out.ActiveDeadlineSeconds = nil + } + out.DNSPolicy = in.DNSPolicy + if in.NodeSelector != nil { + in, out := &in.NodeSelector, &out.NodeSelector + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.NodeSelector = nil + } + out.ServiceAccountName = in.ServiceAccountName + out.NodeName = in.NodeName + if in.SecurityContext != nil { + in, out := &in.SecurityContext, &out.SecurityContext + *out = new(PodSecurityContext) + if err := DeepCopy_api_PodSecurityContext(*in, *out, c); err != nil { + return err + } + } else { + out.SecurityContext = nil + } + if in.ImagePullSecrets != nil { + in, out := &in.ImagePullSecrets, &out.ImagePullSecrets + *out = make([]LocalObjectReference, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.ImagePullSecrets = nil + } + out.Hostname = in.Hostname + out.Subdomain = in.Subdomain + return nil + } +} + +func DeepCopy_api_PodStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodStatus) + out := out.(*PodStatus) + out.Phase = in.Phase + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]PodCondition, len(*in)) + for i := range *in { + if err := DeepCopy_api_PodCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + out.Message = in.Message + out.Reason = in.Reason + out.HostIP = in.HostIP + out.PodIP = in.PodIP + if in.StartTime != nil { + in, out := &in.StartTime, &out.StartTime + *out = new(v1.Time) + **out = (*in).DeepCopy() + } else { + out.StartTime = nil + } + if in.InitContainerStatuses != nil { + in, out := &in.InitContainerStatuses, &out.InitContainerStatuses + *out = make([]ContainerStatus, len(*in)) + for i := range *in { + if err := DeepCopy_api_ContainerStatus(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.InitContainerStatuses = nil + } + if in.ContainerStatuses != nil { + in, out := &in.ContainerStatuses, &out.ContainerStatuses + *out = make([]ContainerStatus, len(*in)) + for i := range *in { + if err := DeepCopy_api_ContainerStatus(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.ContainerStatuses = nil + } + return nil + } +} + +func DeepCopy_api_PodStatusResult(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodStatusResult) + out := out.(*PodStatusResult) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_PodStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_PodTemplate(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodTemplate) + out := out.(*PodTemplate) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_PodTemplateList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodTemplateList) + out := out.(*PodTemplateList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PodTemplate, len(*in)) + for i := range *in { + if err := DeepCopy_api_PodTemplate(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_PodTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodTemplateSpec) + out := out.(*PodTemplateSpec) + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_PodSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_Preconditions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Preconditions) + out := out.(*Preconditions) + if in.UID != nil { + in, out := &in.UID, &out.UID + *out = new(types.UID) + **out = **in + } else { + out.UID = nil + } + return nil + } +} + +func DeepCopy_api_PreferAvoidPodsEntry(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PreferAvoidPodsEntry) + out := out.(*PreferAvoidPodsEntry) + if err := DeepCopy_api_PodSignature(&in.PodSignature, &out.PodSignature, c); err != nil { + return err + } + out.EvictionTime = in.EvictionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_api_PreferredSchedulingTerm(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PreferredSchedulingTerm) + out := out.(*PreferredSchedulingTerm) + out.Weight = in.Weight + if err := DeepCopy_api_NodeSelectorTerm(&in.Preference, &out.Preference, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_Probe(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Probe) + out := out.(*Probe) + if err := DeepCopy_api_Handler(&in.Handler, &out.Handler, c); err != nil { + return err + } + out.InitialDelaySeconds = in.InitialDelaySeconds + out.TimeoutSeconds = in.TimeoutSeconds + out.PeriodSeconds = in.PeriodSeconds + out.SuccessThreshold = in.SuccessThreshold + out.FailureThreshold = in.FailureThreshold + return nil + } +} + +func DeepCopy_api_QuobyteVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*QuobyteVolumeSource) + out := out.(*QuobyteVolumeSource) + out.Registry = in.Registry + out.Volume = in.Volume + out.ReadOnly = in.ReadOnly + out.User = in.User + out.Group = in.Group + return nil + } +} + +func DeepCopy_api_RBDVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RBDVolumeSource) + out := out.(*RBDVolumeSource) + if in.CephMonitors != nil { + in, out := &in.CephMonitors, &out.CephMonitors + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.CephMonitors = nil + } + out.RBDImage = in.RBDImage + out.FSType = in.FSType + out.RBDPool = in.RBDPool + out.RadosUser = in.RadosUser + out.Keyring = in.Keyring + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(LocalObjectReference) + **out = **in + } else { + out.SecretRef = nil + } + out.ReadOnly = in.ReadOnly + return nil + } +} + +func DeepCopy_api_RangeAllocation(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RangeAllocation) + out := out.(*RangeAllocation) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Range = in.Range + if in.Data != nil { + in, out := &in.Data, &out.Data + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Data = nil + } + return nil + } +} + +func DeepCopy_api_ReplicationController(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationController) + out := out.(*ReplicationController) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_ReplicationControllerSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_api_ReplicationControllerStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_ReplicationControllerCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerCondition) + out := out.(*ReplicationControllerCondition) + out.Type = in.Type + out.Status = in.Status + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_api_ReplicationControllerList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerList) + out := out.(*ReplicationControllerList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ReplicationController, len(*in)) + for i := range *in { + if err := DeepCopy_api_ReplicationController(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_ReplicationControllerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerSpec) + out := out.(*ReplicationControllerSpec) + out.Replicas = in.Replicas + out.MinReadySeconds = in.MinReadySeconds + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Selector = nil + } + if in.Template != nil { + in, out := &in.Template, &out.Template + *out = new(PodTemplateSpec) + if err := DeepCopy_api_PodTemplateSpec(*in, *out, c); err != nil { + return err + } + } else { + out.Template = nil + } + return nil + } +} + +func DeepCopy_api_ReplicationControllerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerStatus) + out := out.(*ReplicationControllerStatus) + out.Replicas = in.Replicas + out.FullyLabeledReplicas = in.FullyLabeledReplicas + out.ReadyReplicas = in.ReadyReplicas + out.AvailableReplicas = in.AvailableReplicas + out.ObservedGeneration = in.ObservedGeneration + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ReplicationControllerCondition, len(*in)) + for i := range *in { + if err := DeepCopy_api_ReplicationControllerCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + return nil + } +} + +func DeepCopy_api_ResourceFieldSelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceFieldSelector) + out := out.(*ResourceFieldSelector) + out.ContainerName = in.ContainerName + out.Resource = in.Resource + out.Divisor = in.Divisor.DeepCopy() + return nil + } +} + +func DeepCopy_api_ResourceQuota(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceQuota) + out := out.(*ResourceQuota) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_ResourceQuotaSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_api_ResourceQuotaStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_ResourceQuotaList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceQuotaList) + out := out.(*ResourceQuotaList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ResourceQuota, len(*in)) + for i := range *in { + if err := DeepCopy_api_ResourceQuota(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_ResourceQuotaSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceQuotaSpec) + out := out.(*ResourceQuotaSpec) + if in.Hard != nil { + in, out := &in.Hard, &out.Hard + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Hard = nil + } + if in.Scopes != nil { + in, out := &in.Scopes, &out.Scopes + *out = make([]ResourceQuotaScope, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Scopes = nil + } + return nil + } +} + +func DeepCopy_api_ResourceQuotaStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceQuotaStatus) + out := out.(*ResourceQuotaStatus) + if in.Hard != nil { + in, out := &in.Hard, &out.Hard + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Hard = nil + } + if in.Used != nil { + in, out := &in.Used, &out.Used + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Used = nil + } + return nil + } +} + +func DeepCopy_api_ResourceRequirements(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceRequirements) + out := out.(*ResourceRequirements) + if in.Limits != nil { + in, out := &in.Limits, &out.Limits + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Limits = nil + } + if in.Requests != nil { + in, out := &in.Requests, &out.Requests + *out = make(ResourceList) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.Requests = nil + } + return nil + } +} + +func DeepCopy_api_SELinuxOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SELinuxOptions) + out := out.(*SELinuxOptions) + out.User = in.User + out.Role = in.Role + out.Type = in.Type + out.Level = in.Level + return nil + } +} + +func DeepCopy_api_Secret(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Secret) + out := out.(*Secret) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Data != nil { + in, out := &in.Data, &out.Data + *out = make(map[string][]byte) + for key, val := range *in { + if newVal, err := c.DeepCopy(&val); err != nil { + return err + } else { + (*out)[key] = *newVal.(*[]byte) + } + } + } else { + out.Data = nil + } + out.Type = in.Type + return nil + } +} + +func DeepCopy_api_SecretKeySelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SecretKeySelector) + out := out.(*SecretKeySelector) + out.LocalObjectReference = in.LocalObjectReference + out.Key = in.Key + return nil + } +} + +func DeepCopy_api_SecretList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SecretList) + out := out.(*SecretList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Secret, len(*in)) + for i := range *in { + if err := DeepCopy_api_Secret(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_SecretVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SecretVolumeSource) + out := out.(*SecretVolumeSource) + out.SecretName = in.SecretName + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]KeyToPath, len(*in)) + for i := range *in { + if err := DeepCopy_api_KeyToPath(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + if in.DefaultMode != nil { + in, out := &in.DefaultMode, &out.DefaultMode + *out = new(int32) + **out = **in + } else { + out.DefaultMode = nil + } + return nil + } +} + +func DeepCopy_api_SecurityContext(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SecurityContext) + out := out.(*SecurityContext) + if in.Capabilities != nil { + in, out := &in.Capabilities, &out.Capabilities + *out = new(Capabilities) + if err := DeepCopy_api_Capabilities(*in, *out, c); err != nil { + return err + } + } else { + out.Capabilities = nil + } + if in.Privileged != nil { + in, out := &in.Privileged, &out.Privileged + *out = new(bool) + **out = **in + } else { + out.Privileged = nil + } + if in.SELinuxOptions != nil { + in, out := &in.SELinuxOptions, &out.SELinuxOptions + *out = new(SELinuxOptions) + **out = **in + } else { + out.SELinuxOptions = nil + } + if in.RunAsUser != nil { + in, out := &in.RunAsUser, &out.RunAsUser + *out = new(int64) + **out = **in + } else { + out.RunAsUser = nil + } + if in.RunAsNonRoot != nil { + in, out := &in.RunAsNonRoot, &out.RunAsNonRoot + *out = new(bool) + **out = **in + } else { + out.RunAsNonRoot = nil + } + if in.ReadOnlyRootFilesystem != nil { + in, out := &in.ReadOnlyRootFilesystem, &out.ReadOnlyRootFilesystem + *out = new(bool) + **out = **in + } else { + out.ReadOnlyRootFilesystem = nil + } + return nil + } +} + +func DeepCopy_api_SerializedReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SerializedReference) + out := out.(*SerializedReference) + out.TypeMeta = in.TypeMeta + out.Reference = in.Reference + return nil + } +} + +func DeepCopy_api_Service(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Service) + out := out.(*Service) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_api_ServiceSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_api_ServiceStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_ServiceAccount(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceAccount) + out := out.(*ServiceAccount) + out.TypeMeta = in.TypeMeta + if err := DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Secrets != nil { + in, out := &in.Secrets, &out.Secrets + *out = make([]ObjectReference, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Secrets = nil + } + if in.ImagePullSecrets != nil { + in, out := &in.ImagePullSecrets, &out.ImagePullSecrets + *out = make([]LocalObjectReference, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.ImagePullSecrets = nil + } + return nil + } +} + +func DeepCopy_api_ServiceAccountList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceAccountList) + out := out.(*ServiceAccountList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ServiceAccount, len(*in)) + for i := range *in { + if err := DeepCopy_api_ServiceAccount(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_ServiceList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceList) + out := out.(*ServiceList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Service, len(*in)) + for i := range *in { + if err := DeepCopy_api_Service(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_api_ServicePort(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServicePort) + out := out.(*ServicePort) + out.Name = in.Name + out.Protocol = in.Protocol + out.Port = in.Port + out.TargetPort = in.TargetPort + out.NodePort = in.NodePort + return nil + } +} + +func DeepCopy_api_ServiceProxyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceProxyOptions) + out := out.(*ServiceProxyOptions) + out.TypeMeta = in.TypeMeta + out.Path = in.Path + return nil + } +} + +func DeepCopy_api_ServiceSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceSpec) + out := out.(*ServiceSpec) + out.Type = in.Type + if in.Ports != nil { + in, out := &in.Ports, &out.Ports + *out = make([]ServicePort, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ports = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Selector = nil + } + out.ClusterIP = in.ClusterIP + out.ExternalName = in.ExternalName + if in.ExternalIPs != nil { + in, out := &in.ExternalIPs, &out.ExternalIPs + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.ExternalIPs = nil + } + out.LoadBalancerIP = in.LoadBalancerIP + out.SessionAffinity = in.SessionAffinity + if in.LoadBalancerSourceRanges != nil { + in, out := &in.LoadBalancerSourceRanges, &out.LoadBalancerSourceRanges + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.LoadBalancerSourceRanges = nil + } + return nil + } +} + +func DeepCopy_api_ServiceStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServiceStatus) + out := out.(*ServiceStatus) + if err := DeepCopy_api_LoadBalancerStatus(&in.LoadBalancer, &out.LoadBalancer, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_Sysctl(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Sysctl) + out := out.(*Sysctl) + out.Name = in.Name + out.Value = in.Value + return nil + } +} + +func DeepCopy_api_TCPSocketAction(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TCPSocketAction) + out := out.(*TCPSocketAction) + out.Port = in.Port + return nil + } +} + +func DeepCopy_api_Taint(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Taint) + out := out.(*Taint) + out.Key = in.Key + out.Value = in.Value + out.Effect = in.Effect + return nil + } +} + +func DeepCopy_api_Toleration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Toleration) + out := out.(*Toleration) + out.Key = in.Key + out.Operator = in.Operator + out.Value = in.Value + out.Effect = in.Effect + return nil + } +} + +func DeepCopy_api_Volume(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Volume) + out := out.(*Volume) + out.Name = in.Name + if err := DeepCopy_api_VolumeSource(&in.VolumeSource, &out.VolumeSource, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_api_VolumeMount(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*VolumeMount) + out := out.(*VolumeMount) + out.Name = in.Name + out.ReadOnly = in.ReadOnly + out.MountPath = in.MountPath + out.SubPath = in.SubPath + return nil + } +} + +func DeepCopy_api_VolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*VolumeSource) + out := out.(*VolumeSource) + if in.HostPath != nil { + in, out := &in.HostPath, &out.HostPath + *out = new(HostPathVolumeSource) + **out = **in + } else { + out.HostPath = nil + } + if in.EmptyDir != nil { + in, out := &in.EmptyDir, &out.EmptyDir + *out = new(EmptyDirVolumeSource) + **out = **in + } else { + out.EmptyDir = nil + } + if in.GCEPersistentDisk != nil { + in, out := &in.GCEPersistentDisk, &out.GCEPersistentDisk + *out = new(GCEPersistentDiskVolumeSource) + **out = **in + } else { + out.GCEPersistentDisk = nil + } + if in.AWSElasticBlockStore != nil { + in, out := &in.AWSElasticBlockStore, &out.AWSElasticBlockStore + *out = new(AWSElasticBlockStoreVolumeSource) + **out = **in + } else { + out.AWSElasticBlockStore = nil + } + if in.GitRepo != nil { + in, out := &in.GitRepo, &out.GitRepo + *out = new(GitRepoVolumeSource) + **out = **in + } else { + out.GitRepo = nil + } + if in.Secret != nil { + in, out := &in.Secret, &out.Secret + *out = new(SecretVolumeSource) + if err := DeepCopy_api_SecretVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.Secret = nil + } + if in.NFS != nil { + in, out := &in.NFS, &out.NFS + *out = new(NFSVolumeSource) + **out = **in + } else { + out.NFS = nil + } + if in.ISCSI != nil { + in, out := &in.ISCSI, &out.ISCSI + *out = new(ISCSIVolumeSource) + **out = **in + } else { + out.ISCSI = nil + } + if in.Glusterfs != nil { + in, out := &in.Glusterfs, &out.Glusterfs + *out = new(GlusterfsVolumeSource) + **out = **in + } else { + out.Glusterfs = nil + } + if in.PersistentVolumeClaim != nil { + in, out := &in.PersistentVolumeClaim, &out.PersistentVolumeClaim + *out = new(PersistentVolumeClaimVolumeSource) + **out = **in + } else { + out.PersistentVolumeClaim = nil + } + if in.RBD != nil { + in, out := &in.RBD, &out.RBD + *out = new(RBDVolumeSource) + if err := DeepCopy_api_RBDVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.RBD = nil + } + if in.Quobyte != nil { + in, out := &in.Quobyte, &out.Quobyte + *out = new(QuobyteVolumeSource) + **out = **in + } else { + out.Quobyte = nil + } + if in.FlexVolume != nil { + in, out := &in.FlexVolume, &out.FlexVolume + *out = new(FlexVolumeSource) + if err := DeepCopy_api_FlexVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.FlexVolume = nil + } + if in.Cinder != nil { + in, out := &in.Cinder, &out.Cinder + *out = new(CinderVolumeSource) + **out = **in + } else { + out.Cinder = nil + } + if in.CephFS != nil { + in, out := &in.CephFS, &out.CephFS + *out = new(CephFSVolumeSource) + if err := DeepCopy_api_CephFSVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.CephFS = nil + } + if in.Flocker != nil { + in, out := &in.Flocker, &out.Flocker + *out = new(FlockerVolumeSource) + **out = **in + } else { + out.Flocker = nil + } + if in.DownwardAPI != nil { + in, out := &in.DownwardAPI, &out.DownwardAPI + *out = new(DownwardAPIVolumeSource) + if err := DeepCopy_api_DownwardAPIVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.DownwardAPI = nil + } + if in.FC != nil { + in, out := &in.FC, &out.FC + *out = new(FCVolumeSource) + if err := DeepCopy_api_FCVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.FC = nil + } + if in.AzureFile != nil { + in, out := &in.AzureFile, &out.AzureFile + *out = new(AzureFileVolumeSource) + **out = **in + } else { + out.AzureFile = nil + } + if in.ConfigMap != nil { + in, out := &in.ConfigMap, &out.ConfigMap + *out = new(ConfigMapVolumeSource) + if err := DeepCopy_api_ConfigMapVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.ConfigMap = nil + } + if in.VsphereVolume != nil { + in, out := &in.VsphereVolume, &out.VsphereVolume + *out = new(VsphereVirtualDiskVolumeSource) + **out = **in + } else { + out.VsphereVolume = nil + } + if in.AzureDisk != nil { + in, out := &in.AzureDisk, &out.AzureDisk + *out = new(AzureDiskVolumeSource) + if err := DeepCopy_api_AzureDiskVolumeSource(*in, *out, c); err != nil { + return err + } + } else { + out.AzureDisk = nil + } + if in.PhotonPersistentDisk != nil { + in, out := &in.PhotonPersistentDisk, &out.PhotonPersistentDisk + *out = new(PhotonPersistentDiskVolumeSource) + **out = **in + } else { + out.PhotonPersistentDisk = nil + } + return nil + } +} + +func DeepCopy_api_VsphereVirtualDiskVolumeSource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*VsphereVirtualDiskVolumeSource) + out := out.(*VsphereVirtualDiskVolumeSource) + out.VolumePath = in.VolumePath + out.FSType = in.FSType + return nil + } +} + +func DeepCopy_api_WeightedPodAffinityTerm(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*WeightedPodAffinityTerm) + out := out.(*WeightedPodAffinityTerm) + out.Weight = in.Weight + if err := DeepCopy_api_PodAffinityTerm(&in.PodAffinityTerm, &out.PodAffinityTerm, c); err != nil { + return err + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/apps/OWNERS new file mode 100755 index 00000000000..1cdc56eec04 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/OWNERS @@ -0,0 +1,21 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- deads2k +- caesarxuchao +- bprashanth +- pmorie +- sttts +- saad-ali +- ncdc +- timstclair +- timothysc +- dims +- errordeveloper +- mml +- m1093782566 +- mbohlool +- david-mcmahon +- kevin-wangzefeng +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/apps/types.generated.go index 391d2345b32..033162a0957 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/client-go/pkg/api" pkg4_resource "k8s.io/client-go/pkg/api/resource" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" pkg5_intstr "k8s.io/client-go/pkg/util/intstr" "reflect" @@ -67,7 +67,7 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.TypeMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -648,7 +648,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym54 := z.DecBinary() _ = yym54 @@ -730,7 +730,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym62 := z.DecBinary() _ = yym62 @@ -1265,7 +1265,7 @@ func (x *StatefulSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv108 := &x.ListMeta yym109 := z.DecBinary() @@ -1346,7 +1346,7 @@ func (x *StatefulSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv115 := &x.ListMeta yym116 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/types.go b/staging/src/k8s.io/client-go/pkg/apis/apps/types.go index 14b129fe4f1..a6afd769954 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/types.go @@ -18,7 +18,7 @@ package apps import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -30,7 +30,7 @@ import ( // The StatefulSet guarantees that a given network identity will always // map to the same storage identity. type StatefulSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -58,7 +58,7 @@ type StatefulSetSpec struct { // If empty, defaulted to labels on the pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Template is the object that describes the pod that will be created if // insufficient replicas are detected. Each pod stamped out by the StatefulSet @@ -96,8 +96,8 @@ type StatefulSetStatus struct { // StatefulSetList is a collection of StatefulSets. type StatefulSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` - Items []StatefulSet `json:"items"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []StatefulSet `json:"items"` } diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/conversion.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/conversion.go index caef334f17d..96bc1ebdc4d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/conversion.go @@ -20,9 +20,9 @@ import ( "fmt" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" v1 "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/apis/apps" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/runtime" ) @@ -58,7 +58,7 @@ func Convert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *StatefulSetSpec } if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) + *out = new(metav1.LabelSelector) if err := s.Convert(*in, *out, 0); err != nil { return err } @@ -88,7 +88,7 @@ func Convert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.StatefulSe *out.Replicas = in.Replicas if in.Selector != nil { in, out := &in.Selector, &out.Selector - *out = new(unversioned.LabelSelector) + *out = new(metav1.LabelSelector) if err := s.Convert(*in, *out, 0); err != nil { return err } diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/defaults.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/defaults.go index cfe7fed0dc7..0f453005d5b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/defaults.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" ) @@ -32,7 +32,7 @@ func SetDefaults_StatefulSet(obj *StatefulSet) { labels := obj.Spec.Template.Labels if labels != nil { if obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{ + obj.Spec.Selector = &metav1.LabelSelector{ MatchLabels: labels, } } diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go index 989b2922088..e031732b86b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go @@ -36,8 +36,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -354,7 +354,7 @@ func (this *StatefulSetList) String() string { return "nil" } s := strings.Join([]string{`&StatefulSetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StatefulSet", "StatefulSet", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -366,7 +366,7 @@ func (this *StatefulSetSpec) String() string { } s := strings.Join([]string{`&StatefulSetSpec{`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `VolumeClaimTemplates:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.VolumeClaimTemplates), "PersistentVolumeClaim", "k8s_io_kubernetes_pkg_api_v1.PersistentVolumeClaim", 1), `&`, ``, 1) + `,`, `ServiceName:` + fmt.Sprintf("%v", this.ServiceName) + `,`, @@ -720,7 +720,7 @@ func (m *StatefulSetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1032,45 +1032,45 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 637 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x86, 0xe3, 0xa4, 0xe9, 0x97, 0x6f, 0x52, 0xfe, 0x86, 0x0a, 0x45, 0x11, 0x72, 0xab, 0x6c, - 0x08, 0x52, 0x3b, 0x56, 0x4a, 0x2b, 0x2a, 0x96, 0x46, 0x02, 0x21, 0x01, 0x45, 0x0e, 0xaa, 0xa0, - 0x08, 0xa4, 0xb1, 0x73, 0x9a, 0x9a, 0xd8, 0x1e, 0xcb, 0x73, 0x9c, 0x35, 0x1b, 0x16, 0xec, 0xb8, - 0x0b, 0x2e, 0x81, 0x5b, 0xa8, 0xc4, 0xa6, 0x4b, 0x56, 0x15, 0x0d, 0x37, 0x82, 0x3c, 0x99, 0x24, - 0xa6, 0x4e, 0x4a, 0xd5, 0x9d, 0xcf, 0xcc, 0x79, 0x9f, 0xf3, 0x33, 0xaf, 0xc9, 0xc3, 0xc1, 0xae, - 0x64, 0xbe, 0xb0, 0x06, 0xa9, 0x0b, 0x49, 0x04, 0x08, 0xd2, 0x8a, 0x07, 0x7d, 0x8b, 0xc7, 0xbe, - 0xb4, 0x78, 0x1c, 0x4b, 0x6b, 0xd8, 0x71, 0x01, 0x79, 0xc7, 0xea, 0x43, 0x04, 0x09, 0x47, 0xe8, - 0xb1, 0x38, 0x11, 0x28, 0xe8, 0xbd, 0xb1, 0x90, 0xcd, 0x84, 0x2c, 0x1e, 0xf4, 0x59, 0x26, 0x64, - 0x99, 0x90, 0x69, 0x61, 0x73, 0xb3, 0xef, 0xe3, 0x51, 0xea, 0x32, 0x4f, 0x84, 0x56, 0x5f, 0xf4, - 0x85, 0xa5, 0xf4, 0x6e, 0x7a, 0xa8, 0x22, 0x15, 0xa8, 0xaf, 0x31, 0xb7, 0xb9, 0xb5, 0xb0, 0x21, - 0x2b, 0x01, 0x29, 0xd2, 0xc4, 0x83, 0xf3, 0xbd, 0x34, 0x77, 0x16, 0x6b, 0xd2, 0x68, 0x08, 0x89, - 0xf4, 0x45, 0x04, 0xbd, 0x82, 0x6c, 0x63, 0xb1, 0x6c, 0x58, 0x18, 0xb8, 0xb9, 0x39, 0x3f, 0x3b, - 0x49, 0x23, 0xf4, 0xc3, 0x62, 0x4f, 0xdb, 0x17, 0xa7, 0x4b, 0xef, 0x08, 0x42, 0x5e, 0x50, 0x75, - 0xe6, 0xab, 0x52, 0xf4, 0x03, 0xcb, 0x8f, 0x50, 0x62, 0x72, 0x5e, 0xd2, 0xfa, 0x56, 0x26, 0xf5, - 0x2e, 0x72, 0x84, 0xc3, 0x34, 0xe8, 0x02, 0xd2, 0x37, 0xa4, 0x16, 0x02, 0xf2, 0x1e, 0x47, 0xde, - 0x30, 0xd6, 0x8d, 0x76, 0x7d, 0xab, 0xcd, 0x16, 0xbe, 0x15, 0x1b, 0x76, 0xd8, 0x9e, 0xfb, 0x11, - 0x3c, 0x7c, 0x01, 0xc8, 0x6d, 0x7a, 0x7c, 0xba, 0x56, 0x1a, 0x9d, 0xae, 0x91, 0xd9, 0x99, 0x33, - 0xa5, 0xd1, 0x03, 0xb2, 0x24, 0x63, 0xf0, 0x1a, 0x65, 0x45, 0xdd, 0x65, 0x97, 0x74, 0x00, 0xcb, - 0x75, 0xd7, 0x8d, 0xc1, 0xb3, 0x57, 0x74, 0x95, 0xa5, 0x2c, 0x72, 0x14, 0x93, 0xba, 0x64, 0x59, - 0x22, 0xc7, 0x54, 0x36, 0x2a, 0x8a, 0xfe, 0xe8, 0x4a, 0x74, 0x45, 0xb0, 0xaf, 0x6b, 0xfe, 0xf2, - 0x38, 0x76, 0x34, 0xb9, 0xf5, 0xc3, 0x20, 0x37, 0x72, 0xd9, 0xcf, 0x7d, 0x89, 0xf4, 0x7d, 0x61, - 0x5b, 0xd6, 0x05, 0xdb, 0xca, 0xb9, 0x89, 0x65, 0x72, 0xb5, 0xb4, 0x9b, 0xba, 0x5c, 0x6d, 0x72, - 0x92, 0x5b, 0xd9, 0x5b, 0x52, 0xf5, 0x11, 0x42, 0xd9, 0x28, 0xaf, 0x57, 0xda, 0xf5, 0xad, 0xed, - 0xab, 0x4c, 0x65, 0x5f, 0xd3, 0x05, 0xaa, 0xcf, 0x32, 0x94, 0x33, 0x26, 0xb6, 0xbe, 0x57, 0xfe, - 0x9a, 0x26, 0xdb, 0x25, 0x6d, 0x93, 0x5a, 0x02, 0x71, 0xe0, 0x7b, 0x5c, 0xaa, 0x69, 0xaa, 0xf6, - 0x4a, 0xd6, 0x98, 0xa3, 0xcf, 0x9c, 0xe9, 0x2d, 0xfd, 0x40, 0x6a, 0x12, 0x02, 0xf0, 0x50, 0x24, - 0xfa, 0x3d, 0xb7, 0x2f, 0x3b, 0x37, 0x77, 0x21, 0xe8, 0x6a, 0xed, 0x98, 0x3f, 0x89, 0x9c, 0x29, - 0x93, 0xbe, 0x23, 0x35, 0x84, 0x30, 0x0e, 0x38, 0x82, 0x7e, 0xd1, 0xcd, 0x8b, 0x5d, 0xf8, 0x4a, - 0xf4, 0x5e, 0x6b, 0x81, 0x32, 0xc9, 0x74, 0xab, 0x93, 0x53, 0x67, 0x0a, 0xa4, 0x9f, 0x0d, 0xb2, - 0x3a, 0x14, 0x41, 0x1a, 0xc2, 0xe3, 0x80, 0xfb, 0xe1, 0x24, 0x43, 0x36, 0x96, 0xd4, 0x96, 0x1f, - 0xfc, 0xa3, 0x52, 0x36, 0x8a, 0x44, 0x88, 0x70, 0x7f, 0xc6, 0xb0, 0xef, 0xea, 0x7a, 0xab, 0xfb, - 0x73, 0xc0, 0xce, 0xdc, 0x72, 0x74, 0x87, 0xd4, 0x25, 0x24, 0x43, 0xdf, 0x83, 0x97, 0x3c, 0x84, - 0x46, 0x75, 0xdd, 0x68, 0xff, 0x6f, 0xdf, 0xd6, 0xa0, 0x7a, 0x77, 0x76, 0xe5, 0xe4, 0xf3, 0x5a, - 0x5f, 0x0c, 0x72, 0xab, 0xe0, 0x5a, 0xfa, 0x84, 0x50, 0xe1, 0x66, 0x69, 0xd0, 0x7b, 0x3a, 0xfe, - 0xc5, 0x7d, 0x11, 0xa9, 0x57, 0xac, 0xd8, 0x77, 0x46, 0xa7, 0x6b, 0x74, 0xaf, 0x70, 0xeb, 0xcc, - 0x51, 0xd0, 0x8d, 0x9c, 0x07, 0xca, 0xca, 0x03, 0xd3, 0x55, 0x16, 0x7d, 0x60, 0xdf, 0x3f, 0x3e, - 0x33, 0x4b, 0x27, 0x67, 0x66, 0xe9, 0xe7, 0x99, 0x59, 0xfa, 0x34, 0x32, 0x8d, 0xe3, 0x91, 0x69, - 0x9c, 0x8c, 0x4c, 0xe3, 0xd7, 0xc8, 0x34, 0xbe, 0xfe, 0x36, 0x4b, 0x07, 0xff, 0x69, 0x4b, 0xfe, - 0x09, 0x00, 0x00, 0xff, 0xff, 0x64, 0x32, 0x5a, 0xad, 0x2b, 0x06, 0x00, 0x00, + // 627 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcb, 0x6e, 0xd3, 0x4c, + 0x14, 0xc7, 0xe3, 0xa4, 0xe9, 0x97, 0x6f, 0x52, 0x6e, 0x43, 0x85, 0xa2, 0x0a, 0xb9, 0x55, 0x36, + 0x04, 0xa9, 0x1d, 0x2b, 0xa5, 0x88, 0x8a, 0xa5, 0x91, 0x40, 0x48, 0x40, 0x91, 0x83, 0x2a, 0x28, + 0xab, 0xb1, 0x73, 0x9a, 0x0e, 0xb1, 0x63, 0xcb, 0x73, 0x9c, 0x35, 0x1b, 0x16, 0xec, 0x78, 0x0b, + 0x5e, 0x80, 0x87, 0xc8, 0xb2, 0x4b, 0x56, 0x15, 0x0d, 0x2f, 0x82, 0x66, 0x32, 0xb9, 0x50, 0xbb, + 0xa1, 0xea, 0xce, 0xe7, 0xcc, 0xf9, 0xff, 0xce, 0xd5, 0xe4, 0x49, 0x7f, 0x5f, 0x32, 0x11, 0x3b, + 0xfd, 0xcc, 0x87, 0x74, 0x00, 0x08, 0xd2, 0x49, 0xfa, 0x3d, 0x87, 0x27, 0x42, 0x3a, 0x3c, 0x49, + 0xa4, 0x33, 0x6c, 0xfb, 0x80, 0xbc, 0xed, 0xf4, 0x60, 0x00, 0x29, 0x47, 0xe8, 0xb2, 0x24, 0x8d, + 0x31, 0xa6, 0x0f, 0x26, 0x42, 0x36, 0x17, 0xb2, 0xa4, 0xdf, 0x63, 0x4a, 0xc8, 0x94, 0x90, 0x19, + 0xe1, 0xc6, 0x4e, 0x4f, 0xe0, 0x49, 0xe6, 0xb3, 0x20, 0x8e, 0x9c, 0x5e, 0xdc, 0x8b, 0x1d, 0xad, + 0xf7, 0xb3, 0x63, 0x6d, 0x69, 0x43, 0x7f, 0x4d, 0xb8, 0x1b, 0xbb, 0x97, 0x16, 0xe4, 0xa4, 0x20, + 0xe3, 0x2c, 0x0d, 0xe0, 0x62, 0x2d, 0x1b, 0xdb, 0x97, 0x6b, 0x86, 0xb9, 0xca, 0x97, 0x64, 0x90, + 0x4e, 0x04, 0xc8, 0x8b, 0x34, 0x3b, 0xc5, 0x9a, 0x34, 0x1b, 0xa0, 0x88, 0xf2, 0x05, 0xed, 0x2d, + 0x0f, 0x97, 0xc1, 0x09, 0x44, 0x3c, 0xa7, 0x6a, 0x17, 0xab, 0x32, 0x14, 0xa1, 0x23, 0x06, 0x28, + 0x31, 0xbd, 0x28, 0x69, 0x7e, 0x2f, 0x93, 0x7a, 0x07, 0x39, 0xc2, 0x71, 0x16, 0x76, 0x00, 0xe9, + 0x7b, 0x52, 0x53, 0x2d, 0x74, 0x39, 0xf2, 0x86, 0xb5, 0x65, 0xb5, 0xea, 0xbb, 0x2d, 0x76, 0xe9, + 0xa2, 0xd8, 0xb0, 0xcd, 0x0e, 0xfc, 0x4f, 0x10, 0xe0, 0x6b, 0x40, 0xee, 0xd2, 0xd1, 0xd9, 0x66, + 0x69, 0x7c, 0xb6, 0x49, 0xe6, 0x3e, 0x6f, 0x46, 0xa3, 0x47, 0x64, 0x45, 0x26, 0x10, 0x34, 0xca, + 0x9a, 0xba, 0xcf, 0xae, 0xb8, 0x7e, 0xb6, 0x50, 0x5d, 0x27, 0x81, 0xc0, 0x5d, 0x33, 0x59, 0x56, + 0x94, 0xe5, 0x69, 0x26, 0xf5, 0xc9, 0xaa, 0x44, 0x8e, 0x99, 0x6c, 0x54, 0x34, 0xfd, 0xe9, 0xb5, + 0xe8, 0x9a, 0xe0, 0xde, 0x34, 0xfc, 0xd5, 0x89, 0xed, 0x19, 0x72, 0x73, 0x64, 0x91, 0x5b, 0x0b, + 0xd1, 0xaf, 0x84, 0x44, 0x7a, 0x94, 0x9b, 0xd6, 0xf6, 0xb2, 0xcc, 0x2a, 0x56, 0xcd, 0x4c, 0x69, + 0xf5, 0xc4, 0x6e, 0x9b, 0x5c, 0xb5, 0xa9, 0x67, 0x61, 0x5e, 0x1f, 0x48, 0x55, 0x20, 0x44, 0xb2, + 0x51, 0xde, 0xaa, 0xb4, 0xea, 0xbb, 0x7b, 0xd7, 0x69, 0xc9, 0xbd, 0x61, 0x12, 0x54, 0x5f, 0x2a, + 0x94, 0x37, 0x21, 0x36, 0x7f, 0x54, 0xfe, 0x6a, 0x45, 0x0d, 0x92, 0xb6, 0x48, 0x2d, 0x85, 0x24, + 0x14, 0x01, 0x97, 0xba, 0x95, 0xaa, 0xbb, 0xa6, 0x0a, 0xf3, 0x8c, 0xcf, 0x9b, 0xbd, 0xd2, 0x8f, + 0xa4, 0x26, 0x21, 0x84, 0x00, 0xe3, 0xd4, 0x2c, 0xb3, 0x7d, 0xa5, 0xa6, 0xb9, 0x0f, 0x61, 0xc7, + 0x08, 0x27, 0xf0, 0xa9, 0xe5, 0xcd, 0x80, 0x0a, 0x8e, 0x10, 0x25, 0x21, 0x47, 0x30, 0xbb, 0xdc, + 0x59, 0x7e, 0x7f, 0x6f, 0xe3, 0xee, 0x3b, 0x23, 0xd0, 0xe7, 0x31, 0x1b, 0xe9, 0xd4, 0xeb, 0xcd, + 0x80, 0xf4, 0x8b, 0x45, 0xd6, 0x87, 0x71, 0x98, 0x45, 0xf0, 0x2c, 0xe4, 0x22, 0x9a, 0x46, 0xc8, + 0xc6, 0x8a, 0x1e, 0xf1, 0xa3, 0x7f, 0x64, 0x82, 0x54, 0x0a, 0x89, 0x30, 0xc0, 0xc3, 0x39, 0xc3, + 0xbd, 0x6f, 0xf2, 0xad, 0x1f, 0x16, 0x80, 0xbd, 0xc2, 0x74, 0xf4, 0x31, 0xa9, 0x4b, 0x48, 0x87, + 0x22, 0x80, 0x37, 0x3c, 0x82, 0x46, 0x75, 0xcb, 0x6a, 0xfd, 0xef, 0xde, 0x35, 0xa0, 0x7a, 0x67, + 0xfe, 0xe4, 0x2d, 0xc6, 0x35, 0xbf, 0x5a, 0xe4, 0x4e, 0xee, 0x5e, 0xe9, 0x73, 0x42, 0x63, 0x5f, + 0x85, 0x41, 0xf7, 0xc5, 0xe4, 0xe7, 0x16, 0xf1, 0x40, 0xaf, 0xb0, 0xe2, 0xde, 0x1b, 0x9f, 0x6d, + 0xd2, 0x83, 0xdc, 0xab, 0x57, 0xa0, 0xa0, 0xdb, 0x0b, 0x07, 0x50, 0xd6, 0x07, 0x30, 0x1b, 0x65, + 0xfe, 0x08, 0xdc, 0x87, 0xa3, 0x73, 0xbb, 0x74, 0x7a, 0x6e, 0x97, 0x7e, 0x9e, 0xdb, 0xa5, 0xcf, + 0x63, 0xdb, 0x1a, 0x8d, 0x6d, 0xeb, 0x74, 0x6c, 0x5b, 0xbf, 0xc6, 0xb6, 0xf5, 0xed, 0xb7, 0x5d, + 0x3a, 0xfa, 0xcf, 0xdc, 0xe3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x47, 0x2a, 0x55, 0x22, + 0x06, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto index 960c5e6b5c3..0e58bfd78d7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.apps.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -54,7 +54,7 @@ message StatefulSet { // StatefulSetList is a collection of StatefulSets. message StatefulSetList { // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; repeated StatefulSet items = 2; } @@ -73,7 +73,7 @@ message StatefulSetSpec { // If empty, defaulted to labels on the pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; // Template is the object that describes the pod that will be created if // insufficient replicas are detected. Each pod stamped out by the StatefulSet diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/register.go index a91e498e3e6..4ba9d73c982 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/register.go @@ -18,6 +18,7 @@ package v1beta1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -29,6 +30,11 @@ const GroupName = "apps" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) AddToScheme = SchemeBuilder.AddToScheme @@ -41,7 +47,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &StatefulSetList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.generated.go index 6436d90a8d8..5415acadc67 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/client-go/pkg/api/resource" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" pkg5_intstr "k8s.io/client-go/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -668,7 +668,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym57 := z.DecBinary() _ = yym57 @@ -760,7 +760,7 @@ func (x *StatefulSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym66 := z.DecBinary() _ = yym66 @@ -1295,7 +1295,7 @@ func (x *StatefulSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv112 := &x.ListMeta yym113 := z.DecBinary() @@ -1376,7 +1376,7 @@ func (x *StatefulSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv119 := &x.ListMeta yym120 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go index 0db244eccfe..ec1eac121bb 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -30,7 +30,7 @@ import ( // The StatefulSet guarantees that a given network identity will always // map to the same storage identity. type StatefulSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -58,7 +58,7 @@ type StatefulSetSpec struct { // If empty, defaulted to labels on the pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` // Template is the object that describes the pod that will be created if // insufficient replicas are detected. Each pod stamped out by the StatefulSet @@ -96,8 +96,8 @@ type StatefulSetStatus struct { // StatefulSetList is a collection of StatefulSets. type StatefulSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` - Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` } diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go index 0f2f0519276..32d701becc9 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go @@ -22,9 +22,9 @@ package v1beta1 import ( api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" - v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/client-go/pkg/api/v1" apps "k8s.io/client-go/pkg/apis/apps" + v1 "k8s.io/client-go/pkg/apis/meta/v1" conversion "k8s.io/client-go/pkg/conversion" runtime "k8s.io/client-go/pkg/runtime" unsafe "unsafe" @@ -129,8 +129,8 @@ func autoConvert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *StatefulSet if err := api.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { return err } - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } out.VolumeClaimTemplates = *(*[]api.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) @@ -142,11 +142,11 @@ func autoConvert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.Statef if err := api.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { return err } - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } - out.VolumeClaimTemplates = *(*[]v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) + out.VolumeClaimTemplates = *(*[]api_v1.PersistentVolumeClaim)(unsafe.Pointer(&in.VolumeClaimTemplates)) out.ServiceName = in.ServiceName return nil } diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..c47ac2930d4 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go @@ -0,0 +1,138 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1beta1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StatefulSet, InType: reflect.TypeOf(&StatefulSet{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StatefulSetList, InType: reflect.TypeOf(&StatefulSetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StatefulSetSpec, InType: reflect.TypeOf(&StatefulSetSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StatefulSetStatus, InType: reflect.TypeOf(&StatefulSetStatus{})}, + ) +} + +func DeepCopy_v1beta1_StatefulSet(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatefulSet) + out := out.(*StatefulSet) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_StatefulSetSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_StatefulSetStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_StatefulSetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatefulSetList) + out := out.(*StatefulSetList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]StatefulSet, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_StatefulSet(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_StatefulSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatefulSetSpec) + out := out.(*StatefulSetSpec) + if in.Replicas != nil { + in, out := &in.Replicas, &out.Replicas + *out = new(int32) + **out = **in + } else { + out.Replicas = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + if in.VolumeClaimTemplates != nil { + in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates + *out = make([]v1.PersistentVolumeClaim, len(*in)) + for i := range *in { + if err := v1.DeepCopy_v1_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.VolumeClaimTemplates = nil + } + out.ServiceName = in.ServiceName + return nil + } +} + +func DeepCopy_v1beta1_StatefulSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatefulSetStatus) + out := out.(*StatefulSetStatus) + if in.ObservedGeneration != nil { + in, out := &in.ObservedGeneration, &out.ObservedGeneration + *out = new(int64) + **out = **in + } else { + out.ObservedGeneration = nil + } + out.Replicas = in.Replicas + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go new file mode 100644 index 00000000000..381fd9f7b1a --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/zz_generated.deepcopy.go @@ -0,0 +1,132 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package apps + +import ( + api "k8s.io/client-go/pkg/api" + v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_StatefulSet, InType: reflect.TypeOf(&StatefulSet{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_StatefulSetList, InType: reflect.TypeOf(&StatefulSetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_StatefulSetSpec, InType: reflect.TypeOf(&StatefulSetSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_apps_StatefulSetStatus, InType: reflect.TypeOf(&StatefulSetStatus{})}, + ) +} + +func DeepCopy_apps_StatefulSet(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatefulSet) + out := out.(*StatefulSet) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_apps_StatefulSetSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_apps_StatefulSetStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_apps_StatefulSetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatefulSetList) + out := out.(*StatefulSetList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]StatefulSet, len(*in)) + for i := range *in { + if err := DeepCopy_apps_StatefulSet(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_apps_StatefulSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatefulSetSpec) + out := out.(*StatefulSetSpec) + out.Replicas = in.Replicas + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + if in.VolumeClaimTemplates != nil { + in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates + *out = make([]api.PersistentVolumeClaim, len(*in)) + for i := range *in { + if err := api.DeepCopy_api_PersistentVolumeClaim(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.VolumeClaimTemplates = nil + } + out.ServiceName = in.ServiceName + return nil + } +} + +func DeepCopy_apps_StatefulSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatefulSetStatus) + out := out.(*StatefulSetStatus) + if in.ObservedGeneration != nil { + in, out := &in.ObservedGeneration, &out.ObservedGeneration + *out = new(int64) + **out = **in + } else { + out.ObservedGeneration = nil + } + out.Replicas = in.Replicas + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/authentication/OWNERS new file mode 100755 index 00000000000..c4f44e93076 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/OWNERS @@ -0,0 +1,8 @@ +reviewers: +- lavalamp +- wojtek-t +- deads2k +- sttts +- timothysc +- mbohlool +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/register.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/register.go index 9f5aca19047..6f2569d843c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/register.go @@ -18,6 +18,7 @@ package authentication import ( "k8s.io/client-go/pkg/api" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" ) @@ -47,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &api.ListOptions{}, &api.DeleteOptions{}, - &api.ExportOptions{}, + &metav1.ExportOptions{}, &TokenReview{}, ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/types.generated.go index b2c9ceb6d70..77b6b1419d3 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/client-go/pkg/api" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -784,7 +784,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv76 := &x.CreationTimestamp yym77 := z.DecBinary() @@ -801,7 +801,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -809,7 +809,7 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym79 := z.DecBinary() _ = yym79 @@ -1080,7 +1080,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv103 := &x.CreationTimestamp yym104 := z.DecBinary() @@ -1096,7 +1096,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj93++ if yyhl93 { @@ -1115,7 +1115,7 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym106 := z.DecBinary() _ = yym106 diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/types.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/types.go index 84edf83d952..dc8d22d01e6 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/types.go @@ -18,7 +18,7 @@ package authentication import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) const ( @@ -42,7 +42,7 @@ const ( // TokenReview attempts to authenticate a token to a known user. type TokenReview struct { - unversioned.TypeMeta + metav1.TypeMeta // ObjectMeta fulfills the meta.ObjectMetaAccessor interface so that the stock // REST handler paths work api.ObjectMeta diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.pb.go index e37a5b214d8..37cd991d3bd 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.pb.go @@ -1236,46 +1236,46 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 654 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x93, 0xcd, 0x6e, 0xd3, 0x4a, - 0x14, 0xc7, 0xed, 0x7c, 0xf4, 0x26, 0x93, 0xdb, 0x7b, 0xcb, 0x48, 0x48, 0x51, 0x24, 0x9c, 0x28, - 0x6c, 0x82, 0xd4, 0x8e, 0x95, 0x8a, 0x8f, 0xaa, 0x15, 0x8b, 0x5a, 0x2d, 0xa8, 0x0b, 0x84, 0x34, - 0xa5, 0x08, 0x21, 0xb1, 0x98, 0x38, 0xa7, 0xae, 0x71, 0x63, 0x5b, 0xe3, 0x99, 0x94, 0xee, 0xfa, - 0x08, 0x2c, 0x59, 0xf2, 0x1e, 0xbc, 0x40, 0x97, 0x5d, 0xb0, 0x60, 0x81, 0x2a, 0x12, 0x5e, 0x04, - 0xcd, 0x78, 0x68, 0xd2, 0xa6, 0x41, 0xa2, 0xdd, 0x79, 0xfe, 0x73, 0xfe, 0xbf, 0xf3, 0x31, 0x3e, - 0x68, 0x33, 0x5a, 0xcb, 0x48, 0x98, 0xb8, 0x91, 0xec, 0x01, 0x8f, 0x41, 0x40, 0xe6, 0xa6, 0x51, - 0xe0, 0xb2, 0x34, 0xcc, 0x5c, 0x26, 0xc5, 0x01, 0xc4, 0x22, 0xf4, 0x99, 0x08, 0x93, 0xd8, 0x1d, - 0x76, 0x7b, 0x20, 0x58, 0xd7, 0x0d, 0x20, 0x06, 0xce, 0x04, 0xf4, 0x49, 0xca, 0x13, 0x91, 0xe0, - 0x6e, 0x8e, 0x20, 0x13, 0x04, 0x49, 0xa3, 0x80, 0x28, 0x04, 0xb9, 0x8c, 0x20, 0x06, 0xd1, 0x58, - 0x09, 0x42, 0x71, 0x20, 0x7b, 0xc4, 0x4f, 0x06, 0x6e, 0x90, 0x04, 0x89, 0xab, 0x49, 0x3d, 0xb9, - 0xaf, 0x4f, 0xfa, 0xa0, 0xbf, 0xf2, 0x0c, 0x8d, 0xd5, 0xb9, 0x45, 0xba, 0x1c, 0xb2, 0x44, 0x72, - 0x1f, 0xae, 0x56, 0xd5, 0x78, 0x34, 0xdf, 0x23, 0xe3, 0x21, 0xf0, 0x2c, 0x4c, 0x62, 0xe8, 0xcf, - 0xd8, 0x96, 0xe7, 0xdb, 0x86, 0x33, 0xad, 0x37, 0x56, 0xae, 0x8f, 0xe6, 0x32, 0x16, 0xe1, 0x60, - 0xb6, 0xa6, 0x87, 0x7f, 0x0e, 0xcf, 0xfc, 0x03, 0x18, 0xb0, 0x19, 0x57, 0xf7, 0x7a, 0x97, 0x14, - 0xe1, 0xa1, 0x1b, 0xc6, 0x22, 0x13, 0xfc, 0xaa, 0xa5, 0xfd, 0x04, 0xa1, 0xed, 0x0f, 0x82, 0xb3, - 0xd7, 0xec, 0x50, 0x02, 0x6e, 0xa2, 0x72, 0x28, 0x60, 0x90, 0xd5, 0xed, 0x56, 0xb1, 0x53, 0xf5, - 0xaa, 0xe3, 0xf3, 0x66, 0x79, 0x47, 0x09, 0x34, 0xd7, 0xd7, 0x2b, 0x9f, 0x3e, 0x37, 0xad, 0x93, - 0xef, 0x2d, 0xab, 0xfd, 0xa5, 0x80, 0x6a, 0xaf, 0x92, 0x08, 0x62, 0x0a, 0xc3, 0x10, 0x8e, 0xf0, - 0x1b, 0x54, 0x19, 0x80, 0x60, 0x7d, 0x26, 0x58, 0xdd, 0x6e, 0xd9, 0x9d, 0xda, 0x6a, 0x87, 0xcc, - 0x7d, 0x6e, 0x32, 0xec, 0x92, 0x97, 0xbd, 0xf7, 0xe0, 0x8b, 0x17, 0x20, 0x98, 0x87, 0x4f, 0xcf, - 0x9b, 0xd6, 0xf8, 0xbc, 0x89, 0x26, 0x1a, 0xbd, 0xa0, 0xe1, 0x3e, 0x2a, 0x65, 0x29, 0xf8, 0xf5, - 0x82, 0xa6, 0x7a, 0xe4, 0xaf, 0x7f, 0x22, 0x32, 0x55, 0xe7, 0x6e, 0x0a, 0xbe, 0xf7, 0xaf, 0xc9, - 0x57, 0x52, 0x27, 0xaa, 0xe9, 0xf8, 0x10, 0x2d, 0x64, 0x82, 0x09, 0x99, 0xd5, 0x8b, 0x3a, 0xcf, - 0xd6, 0x2d, 0xf3, 0x68, 0x96, 0xf7, 0x9f, 0xc9, 0xb4, 0x90, 0x9f, 0xa9, 0xc9, 0xd1, 0x7e, 0x8c, - 0xfe, 0xbf, 0x52, 0x14, 0xbe, 0x8f, 0xca, 0x42, 0x49, 0x7a, 0x7a, 0x55, 0x6f, 0xd1, 0x38, 0xcb, - 0x79, 0x5c, 0x7e, 0xd7, 0xfe, 0x6a, 0xa3, 0x3b, 0x33, 0x59, 0xf0, 0x06, 0x5a, 0x9c, 0xaa, 0x08, - 0xfa, 0x1a, 0x51, 0xf1, 0xee, 0x1a, 0xc4, 0xe2, 0xe6, 0xf4, 0x25, 0xbd, 0x1c, 0x8b, 0xdf, 0xa1, - 0x92, 0xcc, 0x80, 0x9b, 0xf1, 0x6e, 0xdc, 0xa0, 0xed, 0xbd, 0x0c, 0xf8, 0x4e, 0xbc, 0x9f, 0x4c, - 0xe6, 0xaa, 0x14, 0xaa, 0xb1, 0xaa, 0x2d, 0xe0, 0x3c, 0xe1, 0x7a, 0xac, 0x53, 0x6d, 0x6d, 0x2b, - 0x91, 0xe6, 0x77, 0xed, 0x51, 0x01, 0x55, 0x7e, 0x53, 0xf0, 0x32, 0xaa, 0x28, 0x67, 0xcc, 0x06, - 0x60, 0x66, 0xb1, 0x64, 0x4c, 0x3a, 0x46, 0xe9, 0xf4, 0x22, 0x02, 0xdf, 0x43, 0x45, 0x19, 0xf6, - 0x75, 0xf5, 0x55, 0xaf, 0x66, 0x02, 0x8b, 0x7b, 0x3b, 0x5b, 0x54, 0xe9, 0xb8, 0x8d, 0x16, 0x02, - 0x9e, 0xc8, 0x54, 0x3d, 0xab, 0xfa, 0xa5, 0x91, 0x7a, 0x8c, 0xe7, 0x5a, 0xa1, 0xe6, 0x06, 0x47, - 0xa8, 0x0c, 0x6a, 0x07, 0xea, 0xa5, 0x56, 0xb1, 0x53, 0x5b, 0x7d, 0x76, 0x8b, 0x11, 0x10, 0xbd, - 0x4c, 0xdb, 0xb1, 0xe0, 0xc7, 0x53, 0xad, 0x2a, 0x8d, 0xe6, 0x39, 0x1a, 0x47, 0x66, 0xe1, 0x74, - 0x0c, 0x5e, 0x42, 0xc5, 0x08, 0x8e, 0xf3, 0x36, 0xa9, 0xfa, 0xc4, 0xbb, 0xa8, 0x3c, 0x54, 0xbb, - 0x68, 0xde, 0xe3, 0xe9, 0x0d, 0x8a, 0x99, 0x2c, 0x34, 0xcd, 0x59, 0xeb, 0x85, 0x35, 0xdb, 0x7b, - 0x70, 0x3a, 0x72, 0xac, 0xb3, 0x91, 0x63, 0x7d, 0x1b, 0x39, 0xd6, 0xc9, 0xd8, 0xb1, 0x4f, 0xc7, - 0x8e, 0x7d, 0x36, 0x76, 0xec, 0x1f, 0x63, 0xc7, 0xfe, 0xf8, 0xd3, 0xb1, 0xde, 0xfe, 0x63, 0x00, - 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xce, 0xcd, 0xc2, 0x6f, 0xeb, 0x05, 0x00, 0x00, + // 644 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x53, 0x4f, 0x4f, 0x13, 0x41, + 0x14, 0xdf, 0xed, 0x1f, 0x6c, 0xa7, 0xa2, 0x38, 0x89, 0x49, 0xd3, 0xc4, 0x6d, 0x53, 0x2f, 0x35, + 0x81, 0xd9, 0x94, 0x18, 0x25, 0x10, 0x0f, 0x6c, 0x40, 0xc3, 0xc1, 0x98, 0x0c, 0x62, 0x8c, 0x89, + 0x87, 0xe9, 0xf6, 0xb1, 0xac, 0x4b, 0x77, 0x37, 0x33, 0xb3, 0x45, 0x6e, 0x7c, 0x04, 0x8f, 0x1e, + 0xfd, 0x1e, 0x7e, 0x01, 0x8e, 0x1c, 0x3c, 0x78, 0x30, 0xc4, 0xd6, 0x2f, 0x62, 0x66, 0x76, 0xa4, + 0x85, 0x02, 0x89, 0x70, 0xdb, 0xf9, 0xcd, 0xfb, 0xfd, 0x79, 0x6f, 0xf6, 0xa1, 0xf5, 0x68, 0x45, + 0x90, 0x30, 0x71, 0xa3, 0xac, 0x07, 0x3c, 0x06, 0x09, 0xc2, 0x4d, 0xa3, 0xc0, 0x65, 0x69, 0x28, + 0x5c, 0x96, 0xc9, 0x3d, 0x88, 0x65, 0xe8, 0x33, 0x19, 0x26, 0xb1, 0x3b, 0xec, 0xf6, 0x40, 0xb2, + 0xae, 0x1b, 0x40, 0x0c, 0x9c, 0x49, 0xe8, 0x93, 0x94, 0x27, 0x32, 0xc1, 0xdd, 0x5c, 0x82, 0x4c, + 0x24, 0x48, 0x1a, 0x05, 0x44, 0x49, 0x90, 0xf3, 0x12, 0xc4, 0x48, 0x34, 0x96, 0x82, 0x50, 0xee, + 0x65, 0x3d, 0xe2, 0x27, 0x03, 0x37, 0x48, 0x82, 0xc4, 0xd5, 0x4a, 0xbd, 0x6c, 0x57, 0x9f, 0xf4, + 0x41, 0x7f, 0xe5, 0x0e, 0x8d, 0xe5, 0x2b, 0x43, 0xba, 0x1c, 0x44, 0x92, 0x71, 0x1f, 0x2e, 0xa6, + 0x6a, 0x2c, 0x5e, 0xcd, 0x19, 0xce, 0xf4, 0x70, 0x8d, 0x83, 0x70, 0x07, 0x20, 0xd9, 0x65, 0x9c, + 0xa5, 0xcb, 0x39, 0x3c, 0x8b, 0x65, 0x38, 0x98, 0x0d, 0xf4, 0xf4, 0xfa, 0x72, 0xe1, 0xef, 0xc1, + 0x80, 0xcd, 0xb0, 0xba, 0x97, 0xb3, 0x32, 0x19, 0xee, 0xbb, 0x61, 0x2c, 0x85, 0xe4, 0x17, 0x29, + 0xed, 0xe7, 0x08, 0x6d, 0x7e, 0x96, 0x9c, 0xbd, 0x63, 0xfb, 0x19, 0xe0, 0x26, 0x2a, 0x87, 0x12, + 0x06, 0xa2, 0x6e, 0xb7, 0x8a, 0x9d, 0xaa, 0x57, 0x1d, 0x9f, 0x36, 0xcb, 0x5b, 0x0a, 0xa0, 0x39, + 0xbe, 0x5a, 0xf9, 0xfa, 0xad, 0x69, 0x1d, 0xfd, 0x6a, 0x59, 0xed, 0xef, 0x05, 0x54, 0x7b, 0x9b, + 0x44, 0x10, 0x53, 0x18, 0x86, 0x70, 0x80, 0xdf, 0xa3, 0x8a, 0xea, 0xbd, 0xcf, 0x24, 0xab, 0xdb, + 0x2d, 0xbb, 0x53, 0x5b, 0xee, 0x90, 0x2b, 0xdf, 0x9a, 0x0c, 0xbb, 0xe4, 0x4d, 0xef, 0x13, 0xf8, + 0xf2, 0x35, 0x48, 0xe6, 0xe1, 0xe3, 0xd3, 0xa6, 0x35, 0x3e, 0x6d, 0xa2, 0x09, 0x46, 0xcf, 0xd4, + 0x70, 0x1f, 0x95, 0x44, 0x0a, 0x7e, 0xbd, 0xa0, 0x55, 0x3d, 0xf2, 0xdf, 0x7f, 0x10, 0x99, 0xca, + 0xb9, 0x9d, 0x82, 0xef, 0xdd, 0x35, 0x7e, 0x25, 0x75, 0xa2, 0x5a, 0x1d, 0xef, 0xa3, 0x39, 0x21, + 0x99, 0xcc, 0x44, 0xbd, 0xa8, 0x7d, 0x36, 0x6e, 0xe9, 0xa3, 0xb5, 0xbc, 0x7b, 0xc6, 0x69, 0x2e, + 0x3f, 0x53, 0xe3, 0xd1, 0x7e, 0x86, 0xee, 0x5f, 0x08, 0x85, 0x1f, 0xa3, 0xb2, 0x54, 0x90, 0x9e, + 0x5e, 0xd5, 0x9b, 0x37, 0xcc, 0x72, 0x5e, 0x97, 0xdf, 0xb5, 0x7f, 0xd8, 0xe8, 0xc1, 0x8c, 0x0b, + 0x5e, 0x43, 0xf3, 0x53, 0x89, 0xa0, 0xaf, 0x25, 0x2a, 0xde, 0x43, 0x23, 0x31, 0xbf, 0x3e, 0x7d, + 0x49, 0xcf, 0xd7, 0xe2, 0x8f, 0xa8, 0x94, 0x09, 0xe0, 0x66, 0xbc, 0x6b, 0x37, 0x68, 0x7b, 0x47, + 0x00, 0xdf, 0x8a, 0x77, 0x93, 0xc9, 0x5c, 0x15, 0x42, 0xb5, 0xac, 0x6a, 0x0b, 0x38, 0x4f, 0xb8, + 0x1e, 0xeb, 0x54, 0x5b, 0x9b, 0x0a, 0xa4, 0xf9, 0x5d, 0x7b, 0x54, 0x40, 0x95, 0x7f, 0x2a, 0x78, + 0x11, 0x55, 0x14, 0x33, 0x66, 0x03, 0x30, 0xb3, 0x58, 0x30, 0x24, 0x5d, 0xa3, 0x70, 0x7a, 0x56, + 0x81, 0x1f, 0xa1, 0x62, 0x16, 0xf6, 0x75, 0xfa, 0xaa, 0x57, 0x33, 0x85, 0xc5, 0x9d, 0xad, 0x0d, + 0xaa, 0x70, 0xdc, 0x46, 0x73, 0x01, 0x4f, 0xb2, 0x54, 0x3d, 0xab, 0xfa, 0xa5, 0x91, 0x7a, 0x8c, + 0x57, 0x1a, 0xa1, 0xe6, 0x06, 0x47, 0xa8, 0x0c, 0x6a, 0x07, 0xea, 0xa5, 0x56, 0xb1, 0x53, 0x5b, + 0x7e, 0x79, 0x8b, 0x11, 0x10, 0xbd, 0x4c, 0x9b, 0xb1, 0xe4, 0x87, 0x53, 0xad, 0x2a, 0x8c, 0xe6, + 0x1e, 0x8d, 0x03, 0xb3, 0x70, 0xba, 0x06, 0x2f, 0xa0, 0x62, 0x04, 0x87, 0x79, 0x9b, 0x54, 0x7d, + 0xe2, 0x6d, 0x54, 0x1e, 0xaa, 0x5d, 0x34, 0xef, 0xf1, 0xe2, 0x06, 0x61, 0x26, 0x0b, 0x4d, 0x73, + 0xad, 0xd5, 0xc2, 0x8a, 0xed, 0x3d, 0x39, 0x1e, 0x39, 0xd6, 0xc9, 0xc8, 0xb1, 0x7e, 0x8e, 0x1c, + 0xeb, 0x68, 0xec, 0xd8, 0xc7, 0x63, 0xc7, 0x3e, 0x19, 0x3b, 0xf6, 0xef, 0xb1, 0x63, 0x7f, 0xf9, + 0xe3, 0x58, 0x1f, 0xee, 0x18, 0x81, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x1c, 0x7a, 0x75, + 0xe8, 0x05, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.proto index 2fd8b0e2089..9aa00ff1067 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.authentication.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/register.go index 53a2aa0a296..8b1f3dfc833 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/register.go @@ -18,6 +18,7 @@ package v1beta1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" ) @@ -28,6 +29,11 @@ const GroupName = "authentication.k8s.io" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) AddToScheme = SchemeBuilder.AddToScheme @@ -38,7 +44,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, &TokenReview{}, ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/types.generated.go index 32f15d31bf2..e8e81c7366f 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/types.go index 0338902064d..f80e34fd6f9 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/types.go @@ -19,8 +19,8 @@ package v1beta1 import ( "fmt" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -31,7 +31,7 @@ import ( // Note: TokenReview requests may be cached by the webhook token authenticator // plugin in the kube-apiserver. type TokenReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..2d461d26035 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.deepcopy.go @@ -0,0 +1,111 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1beta1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_TokenReview, InType: reflect.TypeOf(&TokenReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_TokenReviewSpec, InType: reflect.TypeOf(&TokenReviewSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_TokenReviewStatus, InType: reflect.TypeOf(&TokenReviewStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_UserInfo, InType: reflect.TypeOf(&UserInfo{})}, + ) +} + +func DeepCopy_v1beta1_TokenReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TokenReview) + out := out.(*TokenReview) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Spec = in.Spec + if err := DeepCopy_v1beta1_TokenReviewStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_TokenReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TokenReviewSpec) + out := out.(*TokenReviewSpec) + out.Token = in.Token + return nil + } +} + +func DeepCopy_v1beta1_TokenReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TokenReviewStatus) + out := out.(*TokenReviewStatus) + out.Authenticated = in.Authenticated + if err := DeepCopy_v1beta1_UserInfo(&in.User, &out.User, c); err != nil { + return err + } + out.Error = in.Error + return nil + } +} + +func DeepCopy_v1beta1_UserInfo(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*UserInfo) + out := out.(*UserInfo) + out.Username = in.Username + out.UID = in.UID + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Groups = nil + } + if in.Extra != nil { + in, out := &in.Extra, &out.Extra + *out = make(map[string]ExtraValue) + for key, val := range *in { + if newVal, err := c.DeepCopy(&val); err != nil { + return err + } else { + (*out)[key] = *newVal.(*ExtraValue) + } + } + } else { + out.Extra = nil + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go new file mode 100644 index 00000000000..b86631cacf5 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/zz_generated.deepcopy.go @@ -0,0 +1,111 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package authentication + +import ( + api "k8s.io/client-go/pkg/api" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authentication_TokenReview, InType: reflect.TypeOf(&TokenReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authentication_TokenReviewSpec, InType: reflect.TypeOf(&TokenReviewSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authentication_TokenReviewStatus, InType: reflect.TypeOf(&TokenReviewStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authentication_UserInfo, InType: reflect.TypeOf(&UserInfo{})}, + ) +} + +func DeepCopy_authentication_TokenReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TokenReview) + out := out.(*TokenReview) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Spec = in.Spec + if err := DeepCopy_authentication_TokenReviewStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_authentication_TokenReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TokenReviewSpec) + out := out.(*TokenReviewSpec) + out.Token = in.Token + return nil + } +} + +func DeepCopy_authentication_TokenReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TokenReviewStatus) + out := out.(*TokenReviewStatus) + out.Authenticated = in.Authenticated + if err := DeepCopy_authentication_UserInfo(&in.User, &out.User, c); err != nil { + return err + } + out.Error = in.Error + return nil + } +} + +func DeepCopy_authentication_UserInfo(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*UserInfo) + out := out.(*UserInfo) + out.Username = in.Username + out.UID = in.UID + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Groups = nil + } + if in.Extra != nil { + in, out := &in.Extra, &out.Extra + *out = make(map[string]ExtraValue) + for key, val := range *in { + if newVal, err := c.DeepCopy(&val); err != nil { + return err + } else { + (*out)[key] = *newVal.(*ExtraValue) + } + } + } else { + out.Extra = nil + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/authorization/OWNERS new file mode 100755 index 00000000000..2fef50443b6 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/OWNERS @@ -0,0 +1,17 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- deads2k +- liggitt +- nikhiljindal +- erictune +- sttts +- ncdc +- timothysc +- dims +- mml +- mbohlool +- david-mcmahon +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/types.generated.go index 49bd9cfecba..bf6cdd3ad28 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/client-go/pkg/api" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -784,7 +784,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv76 := &x.CreationTimestamp yym77 := z.DecBinary() @@ -801,7 +801,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -809,7 +809,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym79 := z.DecBinary() _ = yym79 @@ -1080,7 +1080,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv103 := &x.CreationTimestamp yym104 := z.DecBinary() @@ -1096,7 +1096,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj93++ if yyhl93 { @@ -1115,7 +1115,7 @@ func (x *SubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.Decod } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym106 := z.DecBinary() _ = yym106 @@ -2025,7 +2025,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv195 := &x.CreationTimestamp yym196 := z.DecBinary() @@ -2042,7 +2042,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -2050,7 +2050,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym198 := z.DecBinary() _ = yym198 @@ -2321,7 +2321,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv222 := &x.CreationTimestamp yym223 := z.DecBinary() @@ -2337,7 +2337,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj212++ if yyhl212 { @@ -2356,7 +2356,7 @@ func (x *SelfSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym225 := z.DecBinary() _ = yym225 @@ -3266,7 +3266,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv314 := &x.CreationTimestamp yym315 := z.DecBinary() @@ -3283,7 +3283,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -3291,7 +3291,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromMap(l int, d *codec1978.De } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym317 := z.DecBinary() _ = yym317 @@ -3562,7 +3562,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978. } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv341 := &x.CreationTimestamp yym342 := z.DecBinary() @@ -3578,7 +3578,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978. } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj331++ if yyhl331 { @@ -3597,7 +3597,7 @@ func (x *LocalSubjectAccessReview) codecDecodeSelfFromArray(l int, d *codec1978. } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym344 := z.DecBinary() _ = yym344 diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/types.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/types.go index 2ac05589d08..551f91308b0 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/types.go @@ -18,7 +18,7 @@ package authorization import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -28,7 +28,7 @@ import ( // SubjectAccessReview checks whether or not a user or group can perform an action. Not filling in a // spec.namespace means "in all namespaces". type SubjectAccessReview struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Spec holds information about the request being evaluated @@ -46,7 +46,7 @@ type SubjectAccessReview struct { // spec.namespace means "in all namespaces". Self is a special case, because users should always be able // to check whether they can perform an action type SelfSubjectAccessReview struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Spec holds information about the request being evaluated. @@ -63,7 +63,7 @@ type SelfSubjectAccessReview struct { // Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions // checking. type LocalSubjectAccessReview struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Spec holds information about the request being evaluated. spec.namespace must be equal to the namespace diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.pb.go index 9c7771e3bba..2a3be1767c8 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.pb.go @@ -2283,61 +2283,60 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 884 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x41, 0x8f, 0xdb, 0x44, - 0x14, 0x8e, 0x93, 0x78, 0x37, 0x99, 0x05, 0xb6, 0x4c, 0x55, 0xd6, 0x0d, 0x92, 0x13, 0x05, 0x09, - 0x6d, 0xa5, 0xd6, 0x66, 0x57, 0x54, 0x54, 0x15, 0x07, 0xd6, 0x62, 0x55, 0x55, 0xd0, 0x82, 0x66, - 0x61, 0x85, 0xe0, 0x34, 0xf6, 0xbe, 0x26, 0x26, 0x89, 0xc7, 0x9a, 0x19, 0xbb, 0x2c, 0xa7, 0xfe, - 0x00, 0x0e, 0x1c, 0x7b, 0xe4, 0x2f, 0xf0, 0x07, 0xb8, 0xb2, 0xc7, 0x72, 0x41, 0x20, 0xa1, 0x88, - 0x35, 0xff, 0x82, 0x13, 0xf2, 0x78, 0x12, 0x37, 0x1b, 0xa7, 0x68, 0x61, 0x85, 0x38, 0xec, 0xcd, - 0xf3, 0xde, 0xf7, 0xde, 0xfb, 0x66, 0xe6, 0x1b, 0xbf, 0x87, 0xde, 0x1b, 0xdd, 0x11, 0x4e, 0xc8, - 0xdc, 0x51, 0xe2, 0x03, 0x8f, 0x40, 0x82, 0x70, 0xe3, 0xd1, 0xc0, 0xa5, 0x71, 0x28, 0x5c, 0x9a, - 0xc8, 0x21, 0xe3, 0xe1, 0xd7, 0x54, 0x86, 0x2c, 0x72, 0xd3, 0x1d, 0x1f, 0x24, 0xdd, 0x71, 0x07, - 0x10, 0x01, 0xa7, 0x12, 0x8e, 0x9c, 0x98, 0x33, 0xc9, 0xf0, 0x5b, 0x45, 0x06, 0xa7, 0xcc, 0xe0, - 0xc4, 0xa3, 0x81, 0x93, 0x67, 0x70, 0x16, 0x32, 0x38, 0x3a, 0x43, 0xe7, 0xd6, 0x20, 0x94, 0xc3, - 0xc4, 0x77, 0x02, 0x36, 0x71, 0x07, 0x6c, 0xc0, 0x5c, 0x95, 0xc8, 0x4f, 0x1e, 0xa9, 0x95, 0x5a, - 0xa8, 0xaf, 0xa2, 0x40, 0x67, 0x77, 0x25, 0x45, 0x97, 0x83, 0x60, 0x09, 0x0f, 0xe0, 0x2c, 0xa9, - 0xce, 0xed, 0xd5, 0x31, 0x49, 0x94, 0x02, 0x17, 0x21, 0x8b, 0xe0, 0x68, 0x29, 0xec, 0xe6, 0xea, - 0xb0, 0x74, 0x69, 0xe7, 0x9d, 0x5b, 0xd5, 0x68, 0x9e, 0x44, 0x32, 0x9c, 0x2c, 0x73, 0x7a, 0xfb, - 0xc5, 0x70, 0x11, 0x0c, 0x61, 0x42, 0x97, 0xa2, 0x76, 0xaa, 0xa3, 0x12, 0x19, 0x8e, 0xdd, 0x30, - 0x92, 0x42, 0xf2, 0xb3, 0x21, 0xfd, 0x77, 0x10, 0xda, 0xff, 0x4a, 0x72, 0x7a, 0x48, 0xc7, 0x09, - 0xe0, 0x2e, 0x32, 0x43, 0x09, 0x13, 0x61, 0x19, 0xbd, 0xc6, 0x76, 0xdb, 0x6b, 0x67, 0xd3, 0xae, - 0x79, 0x3f, 0x37, 0x90, 0xc2, 0x7e, 0xb7, 0xf5, 0xf4, 0xbb, 0x6e, 0xed, 0xc9, 0x6f, 0xbd, 0x5a, - 0xff, 0xe7, 0x3a, 0xb2, 0x3e, 0x64, 0x01, 0x1d, 0x1f, 0x24, 0xfe, 0x97, 0x10, 0xc8, 0xbd, 0x20, - 0x00, 0x21, 0x08, 0xa4, 0x21, 0x3c, 0xc6, 0x9f, 0xa1, 0xd6, 0x04, 0x24, 0x3d, 0xa2, 0x92, 0x5a, - 0x46, 0xcf, 0xd8, 0xde, 0xd8, 0xdd, 0x76, 0x56, 0x5e, 0xbd, 0x93, 0xee, 0x38, 0x1f, 0xa9, 0x1c, - 0x0f, 0x40, 0x52, 0x0f, 0x9f, 0x4c, 0xbb, 0xb5, 0x6c, 0xda, 0x45, 0xa5, 0x8d, 0xcc, 0xb3, 0xe1, - 0x11, 0x6a, 0x8a, 0x18, 0x02, 0xab, 0xae, 0xb2, 0xde, 0x77, 0xce, 0x2b, 0x28, 0xa7, 0x82, 0xee, - 0x41, 0x0c, 0x81, 0xf7, 0x92, 0x2e, 0xdb, 0xcc, 0x57, 0x44, 0x15, 0xc1, 0x02, 0xad, 0x09, 0x49, - 0x65, 0x22, 0xac, 0x86, 0x2a, 0xf7, 0xc1, 0xc5, 0x94, 0x53, 0x29, 0xbd, 0x57, 0x74, 0xc1, 0xb5, - 0x62, 0x4d, 0x74, 0xa9, 0xfe, 0x17, 0xe8, 0xda, 0x43, 0x16, 0x11, 0xad, 0xd6, 0x3d, 0x29, 0x79, - 0xe8, 0x27, 0x12, 0x04, 0xee, 0xa1, 0x66, 0x4c, 0xe5, 0x50, 0x1d, 0x68, 0xbb, 0xe4, 0xfb, 0x31, - 0x95, 0x43, 0xa2, 0x3c, 0x39, 0x22, 0x05, 0xee, 0xab, 0xc3, 0x79, 0x0e, 0x71, 0x08, 0xdc, 0x27, - 0xca, 0xd3, 0xff, 0xa1, 0x8e, 0x70, 0x45, 0x6a, 0x17, 0xb5, 0x23, 0x3a, 0x01, 0x11, 0xd3, 0x00, - 0x74, 0xfe, 0x57, 0x75, 0x74, 0xfb, 0xe1, 0xcc, 0x41, 0x4a, 0xcc, 0xdf, 0x57, 0xc2, 0x6f, 0x20, - 0x73, 0xc0, 0x59, 0x12, 0xab, 0xa3, 0x6b, 0x7b, 0x2f, 0x6b, 0x88, 0x79, 0x2f, 0x37, 0x92, 0xc2, - 0x87, 0x6f, 0xa0, 0x75, 0xfd, 0xc0, 0xac, 0xa6, 0x82, 0x6d, 0x6a, 0xd8, 0xfa, 0x61, 0x61, 0x26, - 0x33, 0x3f, 0xbe, 0x89, 0x5a, 0xb3, 0x17, 0x6c, 0x99, 0x0a, 0x7b, 0x45, 0x63, 0x5b, 0xb3, 0x0d, - 0x91, 0x39, 0x02, 0xdf, 0x46, 0x1b, 0x22, 0xf1, 0xe7, 0x01, 0x6b, 0x2a, 0xe0, 0xaa, 0x0e, 0xd8, - 0x38, 0x28, 0x5d, 0xe4, 0x79, 0x5c, 0xbe, 0xad, 0x7c, 0x8f, 0xd6, 0xfa, 0xe2, 0xb6, 0xf2, 0x23, - 0x20, 0xca, 0xd3, 0xff, 0xb5, 0x8e, 0xb6, 0x0e, 0x60, 0xfc, 0xe8, 0xbf, 0x55, 0x3d, 0x5b, 0x50, - 0xfd, 0x83, 0x7f, 0x20, 0xc3, 0x6a, 0xca, 0xff, 0x2f, 0xe5, 0xff, 0x58, 0x47, 0xaf, 0xbf, 0x80, - 0x28, 0xfe, 0xc6, 0x40, 0x98, 0x2f, 0x89, 0x57, 0x1f, 0xf5, 0xfb, 0xe7, 0x67, 0xb8, 0xfc, 0x10, - 0xbc, 0xd7, 0xb2, 0x69, 0xb7, 0xe2, 0x81, 0x90, 0x8a, 0xba, 0xf8, 0xa9, 0x81, 0xae, 0x45, 0x55, - 0x2f, 0x55, 0x5f, 0xd3, 0xbd, 0xf3, 0x33, 0xaa, 0x7c, 0xf8, 0xde, 0xf5, 0x6c, 0xda, 0xad, 0xfe, - 0x27, 0x90, 0x6a, 0x02, 0xfd, 0x9f, 0xea, 0xe8, 0xea, 0xe5, 0x7f, 0xf9, 0x62, 0xd5, 0xf9, 0x67, - 0x13, 0x6d, 0x5d, 0x2a, 0xf3, 0x5f, 0x2a, 0x73, 0xde, 0x38, 0x1a, 0x8b, 0x7f, 0xd8, 0x4f, 0x05, - 0x70, 0xdd, 0x38, 0x7a, 0xb3, 0xc6, 0xd1, 0x54, 0x33, 0x08, 0xca, 0xaf, 0x42, 0x35, 0x0d, 0x31, - 0xeb, 0x1a, 0xc7, 0xc8, 0x84, 0x7c, 0x66, 0xb1, 0xcc, 0x5e, 0x63, 0x7b, 0x63, 0xf7, 0x93, 0x0b, - 0x13, 0x9b, 0xa3, 0x46, 0xa1, 0xfd, 0x48, 0xf2, 0xe3, 0xb2, 0x61, 0x29, 0x1b, 0x29, 0x2a, 0x76, - 0x52, 0x3d, 0x2e, 0x29, 0x0c, 0xbe, 0x82, 0x1a, 0x23, 0x38, 0x2e, 0x1a, 0x26, 0xc9, 0x3f, 0x31, - 0x41, 0x66, 0x9a, 0x4f, 0x52, 0xfa, 0xa0, 0xdf, 0x3d, 0x3f, 0xb5, 0x72, 0x1a, 0x23, 0x45, 0xaa, - 0xbb, 0xf5, 0x3b, 0x46, 0xff, 0x7b, 0x03, 0x5d, 0x5f, 0x29, 0xd9, 0xbc, 0x8d, 0xd2, 0xf1, 0x98, - 0x3d, 0x86, 0x23, 0xc5, 0xa5, 0x55, 0xb6, 0xd1, 0xbd, 0xc2, 0x4c, 0x66, 0x7e, 0xfc, 0x26, 0x5a, - 0xe3, 0x40, 0x05, 0x8b, 0x74, 0xeb, 0x9e, 0xab, 0x9d, 0x28, 0x2b, 0xd1, 0x5e, 0xbc, 0x87, 0x36, - 0x21, 0x2f, 0xaf, 0xc8, 0xed, 0x73, 0xce, 0xb8, 0xbe, 0xb2, 0x2d, 0x1d, 0xb0, 0xb9, 0xbf, 0xe8, - 0x26, 0x67, 0xf1, 0xde, 0x8d, 0x93, 0x53, 0xbb, 0xf6, 0xec, 0xd4, 0xae, 0xfd, 0x72, 0x6a, 0xd7, - 0x9e, 0x64, 0xb6, 0x71, 0x92, 0xd9, 0xc6, 0xb3, 0xcc, 0x36, 0x7e, 0xcf, 0x6c, 0xe3, 0xdb, 0x3f, - 0xec, 0xda, 0xe7, 0xeb, 0x7a, 0xd3, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x06, 0x55, 0x79, 0xe0, - 0x5a, 0x0c, 0x00, 0x00, + // 880 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x8f, 0xdb, 0x44, + 0x14, 0x8f, 0x93, 0x78, 0x37, 0x99, 0x05, 0xb6, 0x4c, 0x55, 0xd6, 0x5d, 0x24, 0x27, 0x0a, 0x12, + 0xda, 0x4a, 0xad, 0xcd, 0xae, 0x40, 0x54, 0x15, 0x07, 0xd6, 0x62, 0x55, 0x55, 0xd0, 0x82, 0x66, + 0x61, 0x85, 0xe0, 0x34, 0xf6, 0xbe, 0x26, 0x26, 0x89, 0xc7, 0x9a, 0x19, 0xbb, 0x2c, 0xa7, 0x7e, + 0x00, 0x0e, 0x1c, 0x7b, 0xe4, 0x2b, 0xf0, 0x05, 0xb8, 0xb2, 0xc7, 0x72, 0x41, 0x20, 0xa1, 0x88, + 0x35, 0xdf, 0x82, 0x13, 0xf2, 0x78, 0x12, 0x37, 0x1b, 0x67, 0x51, 0x60, 0x85, 0x7a, 0xe8, 0xcd, + 0xf3, 0xfe, 0xfc, 0xde, 0x6f, 0xde, 0xfc, 0xc6, 0x6f, 0xd0, 0xfb, 0xc3, 0xdb, 0xc2, 0x09, 0x99, + 0x3b, 0x4c, 0x7c, 0xe0, 0x11, 0x48, 0x10, 0x6e, 0x3c, 0xec, 0xbb, 0x34, 0x0e, 0x85, 0x4b, 0x13, + 0x39, 0x60, 0x3c, 0xfc, 0x86, 0xca, 0x90, 0x45, 0x6e, 0xba, 0xeb, 0x83, 0xa4, 0xbb, 0x6e, 0x1f, + 0x22, 0xe0, 0x54, 0xc2, 0xb1, 0x13, 0x73, 0x26, 0x19, 0x7e, 0xab, 0x40, 0x70, 0x4a, 0x04, 0x27, + 0x1e, 0xf6, 0x9d, 0x1c, 0xc1, 0x99, 0x43, 0x70, 0x34, 0xc2, 0xf6, 0xad, 0x7e, 0x28, 0x07, 0x89, + 0xef, 0x04, 0x6c, 0xec, 0xf6, 0x59, 0x9f, 0xb9, 0x0a, 0xc8, 0x4f, 0x1e, 0xaa, 0x95, 0x5a, 0xa8, + 0xaf, 0xa2, 0xc0, 0xf6, 0xde, 0x52, 0x8a, 0x2e, 0x07, 0xc1, 0x12, 0x1e, 0xc0, 0x79, 0x52, 0xdb, + 0x37, 0x97, 0xe7, 0xa4, 0x0b, 0x5b, 0xb8, 0xa0, 0x82, 0x70, 0xc7, 0x20, 0x69, 0x55, 0xce, 0xad, + 0xea, 0x1c, 0x9e, 0x44, 0x32, 0x1c, 0x2f, 0x12, 0x7a, 0xfb, 0xe2, 0x70, 0x11, 0x0c, 0x60, 0x4c, + 0x17, 0xb2, 0x76, 0xab, 0xb3, 0x12, 0x19, 0x8e, 0xdc, 0x30, 0x92, 0x42, 0xf2, 0xf3, 0x29, 0xbd, + 0x77, 0x11, 0x3a, 0xf8, 0x5a, 0x72, 0x7a, 0x44, 0x47, 0x09, 0xe0, 0x0e, 0x32, 0x43, 0x09, 0x63, + 0x61, 0x19, 0xdd, 0xc6, 0x4e, 0xdb, 0x6b, 0x67, 0x93, 0x8e, 0x79, 0x2f, 0x37, 0x90, 0xc2, 0x7e, + 0xa7, 0xf5, 0xe4, 0xfb, 0x4e, 0xed, 0xf1, 0xef, 0xdd, 0x5a, 0xef, 0x97, 0x3a, 0xb2, 0x3e, 0x62, + 0x01, 0x1d, 0x1d, 0x26, 0xfe, 0x57, 0x10, 0xc8, 0xfd, 0x20, 0x00, 0x21, 0x08, 0xa4, 0x21, 0x3c, + 0xc2, 0x9f, 0xa3, 0x56, 0xde, 0x88, 0x63, 0x2a, 0xa9, 0x65, 0x74, 0x8d, 0x9d, 0x8d, 0xbd, 0x1d, + 0x67, 0xe9, 0xb9, 0x3b, 0xe9, 0xae, 0xf3, 0xb1, 0xc2, 0xb8, 0x0f, 0x92, 0x7a, 0xf8, 0x74, 0xd2, + 0xa9, 0x65, 0x93, 0x0e, 0x2a, 0x6d, 0x64, 0x86, 0x86, 0x87, 0xa8, 0x29, 0x62, 0x08, 0xac, 0xba, + 0x42, 0xbd, 0xe7, 0xac, 0xaa, 0x26, 0xa7, 0x82, 0xee, 0x61, 0x0c, 0x81, 0xf7, 0x92, 0x2e, 0xdb, + 0xcc, 0x57, 0x44, 0x15, 0xc1, 0x02, 0xad, 0x09, 0x49, 0x65, 0x22, 0xac, 0x86, 0x2a, 0xf7, 0xe1, + 0xe5, 0x94, 0x53, 0x90, 0xde, 0x2b, 0xba, 0xe0, 0x5a, 0xb1, 0x26, 0xba, 0x54, 0xef, 0x4b, 0x74, + 0xed, 0x01, 0x8b, 0x88, 0x96, 0xea, 0xbe, 0x94, 0x3c, 0xf4, 0x13, 0x09, 0x02, 0x77, 0x51, 0x33, + 0xa6, 0x72, 0xa0, 0x1a, 0xda, 0x2e, 0xf9, 0x7e, 0x42, 0xe5, 0x80, 0x28, 0x4f, 0x1e, 0x91, 0x02, + 0xf7, 0x55, 0x73, 0x9e, 0x89, 0x38, 0x02, 0xee, 0x13, 0xe5, 0xe9, 0xfd, 0x58, 0x47, 0xb8, 0x02, + 0xda, 0x45, 0xed, 0x88, 0x8e, 0x41, 0xc4, 0x34, 0x00, 0x8d, 0xff, 0xaa, 0xce, 0x6e, 0x3f, 0x98, + 0x3a, 0x48, 0x19, 0xf3, 0xcf, 0x95, 0xf0, 0x1b, 0xc8, 0xec, 0x73, 0x96, 0xc4, 0xaa, 0x75, 0x6d, + 0xef, 0x65, 0x1d, 0x62, 0xde, 0xcd, 0x8d, 0xa4, 0xf0, 0xe1, 0x1b, 0x68, 0x3d, 0x05, 0x2e, 0x42, + 0x16, 0x59, 0x4d, 0x15, 0xb6, 0xa9, 0xc3, 0xd6, 0x8f, 0x0a, 0x33, 0x99, 0xfa, 0xf1, 0x4d, 0xd4, + 0x9a, 0x5e, 0x5f, 0xcb, 0x54, 0xb1, 0x57, 0x74, 0x6c, 0x6b, 0xba, 0x21, 0x32, 0x8b, 0xc0, 0xef, + 0xa0, 0x0d, 0x91, 0xf8, 0xb3, 0x84, 0x35, 0x95, 0x70, 0x55, 0x27, 0x6c, 0x1c, 0x96, 0x2e, 0xf2, + 0x6c, 0x5c, 0xbe, 0xad, 0x7c, 0x8f, 0xd6, 0xfa, 0xfc, 0xb6, 0xf2, 0x16, 0x10, 0xe5, 0xe9, 0xfd, + 0x56, 0x47, 0x5b, 0x87, 0x30, 0x7a, 0xf8, 0xff, 0xaa, 0x9e, 0xcd, 0xa9, 0xfe, 0xfe, 0xbf, 0x90, + 0x61, 0x35, 0xe5, 0xe7, 0x4b, 0xf9, 0x3f, 0xd5, 0xd1, 0xeb, 0x17, 0x10, 0xc5, 0xdf, 0x1a, 0x08, + 0xf3, 0x05, 0xf1, 0xea, 0x56, 0x7f, 0xb0, 0x3a, 0xc3, 0xc5, 0x8b, 0xe0, 0xbd, 0x96, 0x4d, 0x3a, + 0x15, 0x17, 0x84, 0x54, 0xd4, 0xc5, 0x4f, 0x0c, 0x74, 0x2d, 0xaa, 0xba, 0xa9, 0xfa, 0x98, 0xee, + 0xae, 0xce, 0xa8, 0xf2, 0xe2, 0x7b, 0xd7, 0xb3, 0x49, 0xa7, 0xfa, 0x9f, 0x40, 0xaa, 0x09, 0xf4, + 0x7e, 0xae, 0xa3, 0xab, 0x2f, 0xfe, 0xcb, 0x97, 0xab, 0xce, 0xbf, 0x9a, 0x68, 0xeb, 0x85, 0x32, + 0xff, 0xa3, 0x32, 0x67, 0x83, 0xa3, 0x31, 0xff, 0x87, 0xfd, 0x4c, 0x00, 0xd7, 0x83, 0xa3, 0x3b, + 0x1d, 0x1c, 0x4d, 0xf5, 0x06, 0x41, 0xf9, 0x51, 0xa8, 0xa1, 0x21, 0xa6, 0x53, 0xe3, 0x04, 0x99, + 0x90, 0xbf, 0x59, 0x2c, 0xb3, 0xdb, 0xd8, 0xd9, 0xd8, 0xfb, 0xf4, 0xd2, 0xc4, 0xe6, 0xa8, 0xa7, + 0xd0, 0x41, 0x24, 0xf9, 0x49, 0x39, 0xb0, 0x94, 0x8d, 0x14, 0x15, 0xb7, 0x53, 0xfd, 0x5c, 0x52, + 0x31, 0xf8, 0x0a, 0x6a, 0x0c, 0xe1, 0xa4, 0x18, 0x98, 0x24, 0xff, 0xc4, 0x04, 0x99, 0x69, 0xfe, + 0x92, 0xd2, 0x8d, 0x7e, 0x6f, 0x75, 0x6a, 0xe5, 0x6b, 0x8c, 0x14, 0x50, 0x77, 0xea, 0xb7, 0x8d, + 0xde, 0x0f, 0x06, 0xba, 0xbe, 0x54, 0xb2, 0xf9, 0x18, 0xa5, 0xa3, 0x11, 0x7b, 0x04, 0xc7, 0x8a, + 0x4b, 0xab, 0x1c, 0xa3, 0xfb, 0x85, 0x99, 0x4c, 0xfd, 0xf8, 0x4d, 0xb4, 0xc6, 0x81, 0x0a, 0x16, + 0xe9, 0xd1, 0x3d, 0x53, 0x3b, 0x51, 0x56, 0xa2, 0xbd, 0x78, 0x1f, 0x6d, 0x42, 0x5e, 0x5e, 0x91, + 0x3b, 0xe0, 0x9c, 0x71, 0x7d, 0x64, 0x5b, 0x3a, 0x61, 0xf3, 0x60, 0xde, 0x4d, 0xce, 0xc7, 0x7b, + 0x37, 0x4e, 0xcf, 0xec, 0xda, 0xd3, 0x33, 0xbb, 0xf6, 0xeb, 0x99, 0x5d, 0x7b, 0x9c, 0xd9, 0xc6, + 0x69, 0x66, 0x1b, 0x4f, 0x33, 0xdb, 0xf8, 0x23, 0xb3, 0x8d, 0xef, 0xfe, 0xb4, 0x6b, 0x5f, 0xac, + 0xeb, 0x4d, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x8f, 0xa4, 0x81, 0x57, 0x0c, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.proto index 137e8c632ab..8552ead252e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.authorization.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go index 8cc147ef6c1..2d57c84183d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/register.go @@ -18,6 +18,7 @@ package v1beta1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -29,6 +30,11 @@ const GroupName = "authorization.k8s.io" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) AddToScheme = SchemeBuilder.AddToScheme @@ -39,7 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, &SelfSubjectAccessReview{}, &SubjectAccessReview{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/types.generated.go index 011c08fca71..1ab3506191a 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/types.go index b254b3b02c6..01e2491ca09 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/types.go @@ -19,8 +19,8 @@ package v1beta1 import ( "fmt" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -29,7 +29,7 @@ import ( // SubjectAccessReview checks whether or not a user or group can perform an action. type SubjectAccessReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -49,7 +49,7 @@ type SubjectAccessReview struct { // spec.namespace means "in all namespaces". Self is a special case, because users should always be able // to check whether they can perform an action type SelfSubjectAccessReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -68,7 +68,7 @@ type SelfSubjectAccessReview struct { // Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions // checking. type LocalSubjectAccessReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..373c279ec29 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go @@ -0,0 +1,196 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1beta1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_LocalSubjectAccessReview, InType: reflect.TypeOf(&LocalSubjectAccessReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NonResourceAttributes, InType: reflect.TypeOf(&NonResourceAttributes{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ResourceAttributes, InType: reflect.TypeOf(&ResourceAttributes{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SelfSubjectAccessReview, InType: reflect.TypeOf(&SelfSubjectAccessReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SelfSubjectAccessReviewSpec, InType: reflect.TypeOf(&SelfSubjectAccessReviewSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubjectAccessReview, InType: reflect.TypeOf(&SubjectAccessReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubjectAccessReviewSpec, InType: reflect.TypeOf(&SubjectAccessReviewSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubjectAccessReviewStatus, InType: reflect.TypeOf(&SubjectAccessReviewStatus{})}, + ) +} + +func DeepCopy_v1beta1_LocalSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LocalSubjectAccessReview) + out := out.(*LocalSubjectAccessReview) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_v1beta1_NonResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NonResourceAttributes) + out := out.(*NonResourceAttributes) + out.Path = in.Path + out.Verb = in.Verb + return nil + } +} + +func DeepCopy_v1beta1_ResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceAttributes) + out := out.(*ResourceAttributes) + out.Namespace = in.Namespace + out.Verb = in.Verb + out.Group = in.Group + out.Version = in.Version + out.Resource = in.Resource + out.Subresource = in.Subresource + out.Name = in.Name + return nil + } +} + +func DeepCopy_v1beta1_SelfSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SelfSubjectAccessReview) + out := out.(*SelfSubjectAccessReview) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_v1beta1_SelfSubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SelfSubjectAccessReviewSpec) + out := out.(*SelfSubjectAccessReviewSpec) + if in.ResourceAttributes != nil { + in, out := &in.ResourceAttributes, &out.ResourceAttributes + *out = new(ResourceAttributes) + **out = **in + } else { + out.ResourceAttributes = nil + } + if in.NonResourceAttributes != nil { + in, out := &in.NonResourceAttributes, &out.NonResourceAttributes + *out = new(NonResourceAttributes) + **out = **in + } else { + out.NonResourceAttributes = nil + } + return nil + } +} + +func DeepCopy_v1beta1_SubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SubjectAccessReview) + out := out.(*SubjectAccessReview) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_v1beta1_SubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SubjectAccessReviewSpec) + out := out.(*SubjectAccessReviewSpec) + if in.ResourceAttributes != nil { + in, out := &in.ResourceAttributes, &out.ResourceAttributes + *out = new(ResourceAttributes) + **out = **in + } else { + out.ResourceAttributes = nil + } + if in.NonResourceAttributes != nil { + in, out := &in.NonResourceAttributes, &out.NonResourceAttributes + *out = new(NonResourceAttributes) + **out = **in + } else { + out.NonResourceAttributes = nil + } + out.User = in.User + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Groups = nil + } + if in.Extra != nil { + in, out := &in.Extra, &out.Extra + *out = make(map[string]ExtraValue) + for key, val := range *in { + if newVal, err := c.DeepCopy(&val); err != nil { + return err + } else { + (*out)[key] = *newVal.(*ExtraValue) + } + } + } else { + out.Extra = nil + } + return nil + } +} + +func DeepCopy_v1beta1_SubjectAccessReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SubjectAccessReviewStatus) + out := out.(*SubjectAccessReviewStatus) + out.Allowed = in.Allowed + out.Reason = in.Reason + out.EvaluationError = in.EvaluationError + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go new file mode 100644 index 00000000000..ce703736f52 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/zz_generated.deepcopy.go @@ -0,0 +1,196 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package authorization + +import ( + api "k8s.io/client-go/pkg/api" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_LocalSubjectAccessReview, InType: reflect.TypeOf(&LocalSubjectAccessReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_NonResourceAttributes, InType: reflect.TypeOf(&NonResourceAttributes{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_ResourceAttributes, InType: reflect.TypeOf(&ResourceAttributes{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SelfSubjectAccessReview, InType: reflect.TypeOf(&SelfSubjectAccessReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SelfSubjectAccessReviewSpec, InType: reflect.TypeOf(&SelfSubjectAccessReviewSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SubjectAccessReview, InType: reflect.TypeOf(&SubjectAccessReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SubjectAccessReviewSpec, InType: reflect.TypeOf(&SubjectAccessReviewSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_authorization_SubjectAccessReviewStatus, InType: reflect.TypeOf(&SubjectAccessReviewStatus{})}, + ) +} + +func DeepCopy_authorization_LocalSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LocalSubjectAccessReview) + out := out.(*LocalSubjectAccessReview) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_authorization_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_authorization_NonResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NonResourceAttributes) + out := out.(*NonResourceAttributes) + out.Path = in.Path + out.Verb = in.Verb + return nil + } +} + +func DeepCopy_authorization_ResourceAttributes(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ResourceAttributes) + out := out.(*ResourceAttributes) + out.Namespace = in.Namespace + out.Verb = in.Verb + out.Group = in.Group + out.Version = in.Version + out.Resource = in.Resource + out.Subresource = in.Subresource + out.Name = in.Name + return nil + } +} + +func DeepCopy_authorization_SelfSubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SelfSubjectAccessReview) + out := out.(*SelfSubjectAccessReview) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_authorization_SelfSubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_authorization_SelfSubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SelfSubjectAccessReviewSpec) + out := out.(*SelfSubjectAccessReviewSpec) + if in.ResourceAttributes != nil { + in, out := &in.ResourceAttributes, &out.ResourceAttributes + *out = new(ResourceAttributes) + **out = **in + } else { + out.ResourceAttributes = nil + } + if in.NonResourceAttributes != nil { + in, out := &in.NonResourceAttributes, &out.NonResourceAttributes + *out = new(NonResourceAttributes) + **out = **in + } else { + out.NonResourceAttributes = nil + } + return nil + } +} + +func DeepCopy_authorization_SubjectAccessReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SubjectAccessReview) + out := out.(*SubjectAccessReview) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_authorization_SubjectAccessReviewSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_authorization_SubjectAccessReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SubjectAccessReviewSpec) + out := out.(*SubjectAccessReviewSpec) + if in.ResourceAttributes != nil { + in, out := &in.ResourceAttributes, &out.ResourceAttributes + *out = new(ResourceAttributes) + **out = **in + } else { + out.ResourceAttributes = nil + } + if in.NonResourceAttributes != nil { + in, out := &in.NonResourceAttributes, &out.NonResourceAttributes + *out = new(NonResourceAttributes) + **out = **in + } else { + out.NonResourceAttributes = nil + } + out.User = in.User + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Groups = nil + } + if in.Extra != nil { + in, out := &in.Extra, &out.Extra + *out = make(map[string]ExtraValue) + for key, val := range *in { + if newVal, err := c.DeepCopy(&val); err != nil { + return err + } else { + (*out)[key] = *newVal.(*ExtraValue) + } + } + } else { + out.Extra = nil + } + return nil + } +} + +func DeepCopy_authorization_SubjectAccessReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SubjectAccessReviewStatus) + out := out.(*SubjectAccessReviewStatus) + out.Allowed = in.Allowed + out.Reason = in.Reason + out.EvaluationError = in.EvaluationError + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/OWNERS new file mode 100755 index 00000000000..9fbc54e93a1 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/OWNERS @@ -0,0 +1,20 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- deads2k +- caesarxuchao +- erictune +- sttts +- ncdc +- timothysc +- piosz +- dims +- errordeveloper +- madhusudancs +- krousey +- mml +- mbohlool +- david-mcmahon +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/types.generated.go index 89e5ff87e44..19568b49f59 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/client-go/pkg/api" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1665,7 +1665,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19 } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym141 := z.DecBinary() _ = yym141 @@ -1764,7 +1764,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym150 := z.DecBinary() _ = yym150 @@ -2409,7 +2409,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv207 := &x.ListMeta yym208 := z.DecBinary() @@ -2490,7 +2490,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv214 := &x.ListMeta yym215 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/types.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/types.go index 438d82b4255..4c1a4ff22d8 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/types.go @@ -18,12 +18,12 @@ package autoscaling import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // Scale represents a scaling request for a resource. type Scale struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -93,7 +93,7 @@ type HorizontalPodAutoscalerStatus struct { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty"` + LastScaleTime *metav1.Time `json:"lastScaleTime,omitempty"` // current number of replicas of pods managed by this autoscaler. CurrentReplicas int32 `json:"currentReplicas"` @@ -111,7 +111,7 @@ type HorizontalPodAutoscalerStatus struct { // configuration of a horizontal pod autoscaler. type HorizontalPodAutoscaler struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -126,9 +126,9 @@ type HorizontalPodAutoscaler struct { // list of horizontal pod autoscaler objects. type HorizontalPodAutoscalerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // list of horizontal pod autoscaler objects. Items []HorizontalPodAutoscaler `json:"items"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.pb.go index 6ac4413245b..34c4c7404aa 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.pb.go @@ -40,7 +40,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -555,7 +555,7 @@ func (this *HorizontalPodAutoscalerList) String() string { return "nil" } s := strings.Join([]string{`&HorizontalPodAutoscalerList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -580,7 +580,7 @@ func (this *HorizontalPodAutoscalerStatus) String() string { } s := strings.Join([]string{`&HorizontalPodAutoscalerStatus{`, `ObservedGeneration:` + valueToStringGenerated(this.ObservedGeneration) + `,`, - `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `CurrentReplicas:` + fmt.Sprintf("%v", this.CurrentReplicas) + `,`, `DesiredReplicas:` + fmt.Sprintf("%v", this.DesiredReplicas) + `,`, `CurrentCPUUtilizationPercentage:` + valueToStringGenerated(this.CurrentCPUUtilizationPercentage) + `,`, @@ -1232,7 +1232,7 @@ func (m *HorizontalPodAutoscalerStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LastScaleTime == nil { - m.LastScaleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.LastScaleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.LastScaleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1730,58 +1730,58 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 845 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x8f, 0xdb, 0x44, - 0x14, 0x8f, 0xf3, 0x51, 0x6d, 0xc7, 0xec, 0x2e, 0x0c, 0x52, 0x1b, 0x6d, 0x85, 0xbd, 0x0a, 0x1c, - 0x16, 0xd1, 0xda, 0x4a, 0xd4, 0x22, 0x7a, 0x5c, 0x2f, 0x2a, 0xad, 0xe8, 0xd2, 0xd5, 0x6c, 0x5b, - 0x21, 0x24, 0x90, 0x26, 0xf6, 0xab, 0x77, 0x9a, 0xf8, 0x43, 0x33, 0xe3, 0x08, 0xf5, 0xc4, 0x89, - 0x33, 0x17, 0x0e, 0xfc, 0x3b, 0x9c, 0xf6, 0x46, 0x8f, 0x9c, 0x22, 0xd6, 0x88, 0xff, 0x82, 0x03, - 0xf2, 0x64, 0xea, 0x38, 0xc9, 0x3a, 0xdd, 0x08, 0xb8, 0x65, 0xe6, 0xfd, 0x3e, 0xde, 0x7b, 0xf3, - 0xfc, 0x82, 0xee, 0x8f, 0x3e, 0x13, 0x0e, 0x4b, 0xdc, 0x51, 0x36, 0x04, 0x1e, 0x83, 0x04, 0xe1, - 0xa6, 0xa3, 0xd0, 0xa5, 0x29, 0x13, 0x2e, 0xcd, 0x64, 0x22, 0x7c, 0x3a, 0x66, 0x71, 0xe8, 0x4e, - 0xfa, 0x6e, 0x08, 0x31, 0x70, 0x2a, 0x21, 0x70, 0x52, 0x9e, 0xc8, 0x04, 0x7f, 0x3c, 0xa3, 0x3a, - 0x73, 0xaa, 0x93, 0x8e, 0x42, 0xa7, 0xa0, 0x3a, 0x15, 0xaa, 0x33, 0xe9, 0xef, 0xdd, 0x09, 0x99, - 0x3c, 0xcb, 0x86, 0x8e, 0x9f, 0x44, 0x6e, 0x98, 0x84, 0x89, 0xab, 0x14, 0x86, 0xd9, 0x0b, 0x75, - 0x52, 0x07, 0xf5, 0x6b, 0xa6, 0xbc, 0x37, 0xa8, 0x4d, 0xca, 0xe5, 0x20, 0x92, 0x8c, 0xfb, 0xb0, - 0x9c, 0xcd, 0xde, 0xbd, 0x7a, 0x4e, 0x16, 0x4f, 0x80, 0x0b, 0x96, 0xc4, 0x10, 0xac, 0xd0, 0x6e, - 0xd7, 0xd3, 0x56, 0x4b, 0xde, 0xbb, 0x73, 0x39, 0x9a, 0x67, 0xb1, 0x64, 0xd1, 0x6a, 0x4e, 0x77, - 0xd7, 0xc3, 0x85, 0x7f, 0x06, 0x11, 0x5d, 0x61, 0xf5, 0x2f, 0x67, 0x65, 0x92, 0x8d, 0x5d, 0x16, - 0x4b, 0x21, 0xf9, 0x32, 0xa5, 0xf7, 0xb3, 0x81, 0x6e, 0x1d, 0xf1, 0x44, 0x88, 0xe7, 0xb3, 0x42, - 0x9f, 0x0c, 0x5f, 0x82, 0x2f, 0x09, 0xbc, 0x00, 0x0e, 0xb1, 0x0f, 0x78, 0x1f, 0xb5, 0x47, 0x2c, - 0x0e, 0xba, 0xc6, 0xbe, 0x71, 0x70, 0xdd, 0x7b, 0xe7, 0x7c, 0x6a, 0x37, 0xf2, 0xa9, 0xdd, 0xfe, - 0x92, 0xc5, 0x01, 0x51, 0x91, 0x02, 0x11, 0xd3, 0x08, 0xba, 0xcd, 0x45, 0xc4, 0x57, 0x34, 0x02, - 0xa2, 0x22, 0x78, 0x80, 0x10, 0x4d, 0x99, 0x36, 0xe8, 0xb6, 0x14, 0x0e, 0x6b, 0x1c, 0x3a, 0x3c, - 0x79, 0xa4, 0x23, 0xa4, 0x82, 0xea, 0xfd, 0xd6, 0x44, 0x37, 0x1f, 0x26, 0x9c, 0xbd, 0x4a, 0x62, - 0x49, 0xc7, 0x27, 0x49, 0x70, 0xa8, 0xe7, 0x02, 0x38, 0xfe, 0x1a, 0x6d, 0x45, 0x20, 0x69, 0x40, - 0x25, 0x55, 0x79, 0x99, 0x83, 0x03, 0xa7, 0x76, 0xa2, 0x9c, 0x49, 0xdf, 0x99, 0x15, 0x75, 0x0c, - 0x92, 0xce, 0x7d, 0xe7, 0x77, 0xa4, 0x54, 0xc3, 0x67, 0xa8, 0x2d, 0x52, 0xf0, 0x55, 0x2d, 0xe6, - 0xe0, 0x81, 0x73, 0xe5, 0x39, 0x75, 0x6a, 0x72, 0x3d, 0x4d, 0xc1, 0x9f, 0xf7, 0xa4, 0x38, 0x11, - 0xe5, 0x80, 0x53, 0x74, 0x4d, 0x48, 0x2a, 0x33, 0xa1, 0xfa, 0x61, 0x0e, 0x1e, 0xfe, 0x07, 0x5e, - 0x4a, 0xcf, 0xdb, 0xd1, 0x6e, 0xd7, 0x66, 0x67, 0xa2, 0x7d, 0x7a, 0x7f, 0x19, 0xe8, 0x56, 0x0d, - 0xf3, 0x31, 0x13, 0x12, 0x7f, 0xbb, 0xd2, 0x55, 0x77, 0x4d, 0x57, 0x2b, 0x5f, 0x86, 0x53, 0xd0, - 0x55, 0x73, 0xdf, 0xd5, 0xd6, 0x5b, 0x6f, 0x6e, 0x2a, 0xad, 0x0d, 0x51, 0x87, 0x49, 0x88, 0x44, - 0xb7, 0xb9, 0xdf, 0x3a, 0x30, 0x07, 0xde, 0xbf, 0xaf, 0xd7, 0xdb, 0xd6, 0x76, 0x9d, 0x47, 0x85, - 0x30, 0x99, 0xe9, 0xf7, 0xfe, 0x6e, 0xd6, 0xd6, 0x59, 0xf4, 0x1f, 0xff, 0x68, 0xa0, 0x1d, 0x75, - 0x7c, 0x4a, 0x79, 0x08, 0xc5, 0xa8, 0xeb, 0x72, 0x37, 0x79, 0xee, 0x35, 0x9f, 0x8c, 0x77, 0x43, - 0xa7, 0xb5, 0x73, 0xba, 0xe0, 0x42, 0x96, 0x5c, 0x71, 0x1f, 0x99, 0x11, 0x8b, 0x09, 0xa4, 0x63, - 0xe6, 0x53, 0xa1, 0x66, 0xae, 0xe3, 0xed, 0xe6, 0x53, 0xdb, 0x3c, 0x9e, 0x5f, 0x93, 0x2a, 0x06, - 0xdf, 0x43, 0x66, 0x44, 0xbf, 0x2f, 0x29, 0x2d, 0x45, 0x79, 0x5f, 0xfb, 0x99, 0xc7, 0xf3, 0x10, - 0xa9, 0xe2, 0xf0, 0x4b, 0x64, 0x49, 0x65, 0x7b, 0x74, 0xf2, 0xec, 0x99, 0x64, 0x63, 0xf6, 0x8a, - 0x4a, 0x96, 0xc4, 0x27, 0xc0, 0x7d, 0x88, 0x25, 0x0d, 0xa1, 0xdb, 0x56, 0x4a, 0xbd, 0x7c, 0x6a, - 0x5b, 0x4f, 0xd7, 0x22, 0xc9, 0x5b, 0x94, 0x7a, 0xbf, 0xb6, 0xd0, 0x07, 0x6b, 0x07, 0x14, 0x3f, - 0x40, 0x38, 0x19, 0x0a, 0xe0, 0x13, 0x08, 0xbe, 0x98, 0x6d, 0xa3, 0x62, 0x2d, 0x14, 0x6f, 0xd0, - 0xf2, 0x6e, 0xe4, 0x53, 0x1b, 0x3f, 0x59, 0x89, 0x92, 0x4b, 0x18, 0x38, 0x40, 0xdb, 0x63, 0x2a, - 0xe4, 0xac, 0xcb, 0x4c, 0x6f, 0x20, 0x73, 0xf0, 0xc9, 0x15, 0xa7, 0xb6, 0xa0, 0x78, 0xef, 0xe5, - 0x53, 0x7b, 0xfb, 0x71, 0x55, 0x85, 0x2c, 0x8a, 0xe2, 0x43, 0xb4, 0xeb, 0x67, 0x9c, 0x43, 0x2c, - 0x97, 0xda, 0x7e, 0x53, 0xb7, 0x7d, 0xf7, 0x68, 0x31, 0x4c, 0x96, 0xf1, 0x85, 0x44, 0x00, 0x82, - 0x71, 0x08, 0x4a, 0x89, 0xf6, 0xa2, 0xc4, 0xe7, 0x8b, 0x61, 0xb2, 0x8c, 0xc7, 0x11, 0xb2, 0xb5, - 0x6a, 0xed, 0x13, 0x76, 0x94, 0xe4, 0x87, 0xf9, 0xd4, 0xb6, 0x8f, 0xd6, 0x43, 0xc9, 0xdb, 0xb4, - 0x7a, 0xbf, 0x34, 0x51, 0x47, 0xb5, 0xe0, 0x7f, 0xdc, 0xb5, 0xcf, 0x17, 0x76, 0xed, 0xdd, 0x0d, - 0x3e, 0x3e, 0x95, 0x59, 0xed, 0x66, 0xfd, 0x6e, 0x69, 0xb3, 0x7e, 0xba, 0xb1, 0xf2, 0xfa, 0x3d, - 0x7a, 0x1f, 0x5d, 0x2f, 0x13, 0xc0, 0xb7, 0xd1, 0x16, 0x7f, 0xf3, 0xa6, 0x86, 0x7a, 0x80, 0x72, - 0x07, 0x96, 0x8f, 0x59, 0x22, 0x7a, 0x0c, 0x99, 0x15, 0x87, 0xcd, 0xc8, 0x05, 0x5a, 0xc0, 0x18, - 0x7c, 0x99, 0x70, 0xfd, 0x5f, 0x5b, 0xa2, 0x4f, 0xf5, 0x3d, 0x29, 0x11, 0xde, 0x47, 0xe7, 0x17, - 0x56, 0xe3, 0xf5, 0x85, 0xd5, 0xf8, 0xfd, 0xc2, 0x6a, 0xfc, 0x90, 0x5b, 0xc6, 0x79, 0x6e, 0x19, - 0xaf, 0x73, 0xcb, 0xf8, 0x23, 0xb7, 0x8c, 0x9f, 0xfe, 0xb4, 0x1a, 0xdf, 0x34, 0x27, 0xfd, 0x7f, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x11, 0x6a, 0xc0, 0x63, 0xc4, 0x09, 0x00, 0x00, + // 838 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6f, 0xdc, 0x44, + 0x14, 0x5f, 0xef, 0x47, 0x95, 0x8e, 0x49, 0x02, 0x83, 0xd4, 0xae, 0x52, 0x61, 0x47, 0x0b, 0x87, + 0x20, 0xa5, 0xb6, 0x76, 0x55, 0x10, 0x3d, 0xc6, 0x41, 0xa5, 0x15, 0x0d, 0x8d, 0x26, 0x6d, 0x85, + 0x7a, 0x40, 0x9a, 0xf5, 0xbe, 0x3a, 0xd3, 0x5d, 0x7b, 0xac, 0x99, 0xf1, 0x0a, 0xf5, 0xc4, 0x89, + 0x33, 0x17, 0x0e, 0xfc, 0x35, 0x5c, 0x73, 0xa3, 0x47, 0x4e, 0x2b, 0x62, 0xfe, 0x0d, 0x0e, 0xc8, + 0xb3, 0x53, 0xef, 0x57, 0xec, 0x12, 0x01, 0xb7, 0x9d, 0x79, 0xbf, 0x8f, 0x37, 0xef, 0x3d, 0xbf, + 0x45, 0xf7, 0xc7, 0x5f, 0x48, 0x8f, 0x71, 0x7f, 0x9c, 0x0d, 0x41, 0x24, 0xa0, 0x40, 0xfa, 0xe9, + 0x38, 0xf2, 0x69, 0xca, 0xa4, 0x4f, 0x33, 0xc5, 0x65, 0x48, 0x27, 0x2c, 0x89, 0xfc, 0x69, 0xdf, + 0x8f, 0x20, 0x01, 0x41, 0x15, 0x8c, 0xbc, 0x54, 0x70, 0xc5, 0xf1, 0xa7, 0x73, 0xaa, 0xb7, 0xa0, + 0x7a, 0xe9, 0x38, 0xf2, 0x0a, 0xaa, 0xb7, 0x44, 0xf5, 0xa6, 0xfd, 0xbd, 0xbb, 0x11, 0x53, 0xe7, + 0xd9, 0xd0, 0x0b, 0x79, 0xec, 0x47, 0x3c, 0xe2, 0xbe, 0x56, 0x18, 0x66, 0x2f, 0xf5, 0x49, 0x1f, + 0xf4, 0xaf, 0xb9, 0xf2, 0xde, 0xa0, 0x32, 0x29, 0x5f, 0x80, 0xe4, 0x99, 0x08, 0x61, 0x3d, 0x9b, + 0xbd, 0xc3, 0x6a, 0xce, 0x66, 0xee, 0x35, 0x0e, 0xd2, 0x8f, 0x41, 0xd1, 0xab, 0x38, 0x77, 0xaf, + 0xe6, 0x88, 0x2c, 0x51, 0x2c, 0xde, 0x4c, 0xe8, 0x5e, 0x3d, 0x5c, 0x86, 0xe7, 0x10, 0xd3, 0x0d, + 0x56, 0xff, 0x6a, 0x56, 0xa6, 0xd8, 0xc4, 0x67, 0x89, 0x92, 0x4a, 0xac, 0x53, 0x7a, 0x3f, 0x5b, + 0xe8, 0xce, 0xb1, 0xe0, 0x52, 0x3e, 0x07, 0x21, 0x19, 0x4f, 0x9e, 0x0c, 0x5f, 0x41, 0xa8, 0x08, + 0xbc, 0x04, 0x01, 0x49, 0x08, 0x78, 0x1f, 0xb5, 0xc7, 0x2c, 0x19, 0x75, 0xad, 0x7d, 0xeb, 0xe0, + 0x66, 0xf0, 0xde, 0xc5, 0xcc, 0x6d, 0xe4, 0x33, 0xb7, 0xfd, 0x35, 0x4b, 0x46, 0x44, 0x47, 0x0a, + 0x44, 0x42, 0x63, 0xe8, 0x36, 0x57, 0x11, 0xdf, 0xd0, 0x18, 0x88, 0x8e, 0xe0, 0x01, 0x42, 0x34, + 0x65, 0xc6, 0xa0, 0xdb, 0xd2, 0x38, 0x6c, 0x70, 0xe8, 0xe8, 0xf4, 0x91, 0x89, 0x90, 0x25, 0x54, + 0xef, 0xb7, 0x26, 0xba, 0xfd, 0x90, 0x0b, 0xf6, 0x9a, 0x27, 0x8a, 0x4e, 0x4e, 0xf9, 0xe8, 0xc8, + 0x0c, 0x05, 0x08, 0xfc, 0x2d, 0xda, 0x2a, 0xca, 0x3c, 0xa2, 0x8a, 0xea, 0xbc, 0xec, 0xc1, 0x81, + 0x57, 0x39, 0x4e, 0xde, 0xb4, 0xef, 0xcd, 0x1f, 0x75, 0x02, 0x8a, 0x2e, 0x7c, 0x17, 0x77, 0xa4, + 0x54, 0xc3, 0xe7, 0xa8, 0x2d, 0x53, 0x08, 0xf5, 0x5b, 0xec, 0xc1, 0x03, 0xef, 0x1f, 0x0f, 0xa9, + 0x57, 0x91, 0xeb, 0x59, 0x0a, 0xe1, 0xa2, 0x26, 0xc5, 0x89, 0x68, 0x07, 0x9c, 0xa2, 0x1b, 0x52, + 0x51, 0x95, 0x49, 0x5d, 0x0f, 0x7b, 0xf0, 0xf0, 0x3f, 0xf0, 0xd2, 0x7a, 0xc1, 0x8e, 0x71, 0xbb, + 0x31, 0x3f, 0x13, 0xe3, 0xd3, 0xcb, 0x2d, 0x74, 0xa7, 0x82, 0xf9, 0x98, 0x49, 0x85, 0x5f, 0x6c, + 0x54, 0xf5, 0xb0, 0x2e, 0xa7, 0x02, 0x5b, 0x24, 0x53, 0x70, 0x75, 0x65, 0xdf, 0x37, 0xbe, 0x5b, + 0x6f, 0x6f, 0x96, 0xea, 0x1a, 0xa1, 0x0e, 0x53, 0x10, 0xcb, 0x6e, 0x73, 0xbf, 0x75, 0x60, 0x0f, + 0x82, 0x7f, 0xff, 0xd8, 0x60, 0xdb, 0xd8, 0x75, 0x1e, 0x15, 0xc2, 0x64, 0xae, 0xdf, 0xfb, 0xab, + 0x59, 0xf9, 0xc8, 0xa2, 0xf8, 0xf8, 0x47, 0x0b, 0xed, 0xe8, 0xe3, 0x53, 0x2a, 0x22, 0x28, 0xe6, + 0xdc, 0xbc, 0xf5, 0x3a, 0xbd, 0xae, 0xf9, 0x5e, 0x82, 0x5b, 0x26, 0xad, 0x9d, 0xb3, 0x15, 0x17, + 0xb2, 0xe6, 0x8a, 0xfb, 0xc8, 0x8e, 0x59, 0x42, 0x20, 0x9d, 0xb0, 0x90, 0x4a, 0x3d, 0x70, 0x9d, + 0x60, 0x37, 0x9f, 0xb9, 0xf6, 0xc9, 0xe2, 0x9a, 0x2c, 0x63, 0xf0, 0x67, 0xc8, 0x8e, 0xe9, 0xf7, + 0x25, 0xa5, 0xa5, 0x29, 0x1f, 0x1a, 0x3f, 0xfb, 0x64, 0x11, 0x22, 0xcb, 0x38, 0xfc, 0x0a, 0x39, + 0x4a, 0xdb, 0x1e, 0x9f, 0x3e, 0x7b, 0xa6, 0xd8, 0x84, 0xbd, 0xa6, 0x8a, 0xf1, 0xe4, 0x14, 0x44, + 0x08, 0x89, 0xa2, 0x11, 0x74, 0xdb, 0x5a, 0xa9, 0x97, 0xcf, 0x5c, 0xe7, 0x69, 0x2d, 0x92, 0xbc, + 0x43, 0xa9, 0xf7, 0x6b, 0x0b, 0x7d, 0x54, 0x3b, 0x9d, 0xf8, 0x01, 0xc2, 0x7c, 0x28, 0x41, 0x4c, + 0x61, 0xf4, 0xd5, 0x7c, 0x15, 0x15, 0x3b, 0xa1, 0xe8, 0x41, 0x2b, 0xb8, 0x95, 0xcf, 0x5c, 0xfc, + 0x64, 0x23, 0x4a, 0xae, 0x60, 0x60, 0x8a, 0xb6, 0x27, 0x54, 0xaa, 0x79, 0x95, 0x99, 0x59, 0x3f, + 0xb5, 0x8b, 0x60, 0x31, 0xb2, 0x05, 0x3e, 0xf8, 0x20, 0x9f, 0xb9, 0xdb, 0x8f, 0x97, 0x25, 0xc8, + 0xaa, 0x22, 0x3e, 0x42, 0xbb, 0x61, 0x26, 0x04, 0x24, 0x6a, 0xad, 0xe6, 0xb7, 0x4d, 0xcd, 0x77, + 0x8f, 0x57, 0xc3, 0x64, 0x1d, 0x5f, 0x48, 0x8c, 0x40, 0x32, 0x01, 0xa3, 0x52, 0xa2, 0xbd, 0x2a, + 0xf1, 0xe5, 0x6a, 0x98, 0xac, 0xe3, 0x71, 0x8c, 0x5c, 0xa3, 0x5a, 0xd9, 0xbf, 0x8e, 0x96, 0xfc, + 0x38, 0x9f, 0xb9, 0xee, 0x71, 0x3d, 0x94, 0xbc, 0x4b, 0xab, 0xf7, 0x4b, 0x13, 0x75, 0x74, 0x09, + 0xfe, 0xc7, 0x2d, 0xfb, 0x7c, 0x65, 0xcb, 0xde, 0xbb, 0xc6, 0x97, 0xa7, 0x33, 0xab, 0xdc, 0xa9, + 0xdf, 0xad, 0xed, 0xd4, 0xcf, 0xaf, 0xad, 0x5c, 0xbf, 0x41, 0xef, 0xa3, 0x9b, 0x65, 0x02, 0xf8, + 0x10, 0x6d, 0x89, 0xb7, 0x3d, 0xb5, 0x74, 0x03, 0xca, 0x05, 0x58, 0x36, 0xb3, 0x44, 0xf4, 0x18, + 0xb2, 0x97, 0x1c, 0xae, 0x47, 0x2e, 0xd0, 0x12, 0x26, 0x10, 0x2a, 0x2e, 0xcc, 0xbf, 0x6c, 0x89, + 0x3e, 0x33, 0xf7, 0xa4, 0x44, 0x04, 0x9f, 0x5c, 0x5c, 0x3a, 0x8d, 0x37, 0x97, 0x4e, 0xe3, 0xf7, + 0x4b, 0xa7, 0xf1, 0x43, 0xee, 0x58, 0x17, 0xb9, 0x63, 0xbd, 0xc9, 0x1d, 0xeb, 0x8f, 0xdc, 0xb1, + 0x7e, 0xfa, 0xd3, 0x69, 0xbc, 0x68, 0x4e, 0xfb, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x62, + 0x6b, 0x34, 0xbb, 0x09, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.proto index 249ce57252b..20f864c1aa2 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.autoscaling.v1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -63,7 +63,7 @@ message HorizontalPodAutoscaler { message HorizontalPodAutoscalerList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // list of horizontal pod autoscaler objects. repeated HorizontalPodAutoscaler items = 2; @@ -97,7 +97,7 @@ message HorizontalPodAutoscalerStatus { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScaleTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScaleTime = 2; // current number of replicas of pods managed by this autoscaler. optional int32 currentReplicas = 3; diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/register.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/register.go index 84a2592b226..496a7fa3315 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/register.go @@ -18,6 +18,7 @@ package v1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -29,6 +30,11 @@ const GroupName = "autoscaling" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs) AddToScheme = SchemeBuilder.AddToScheme @@ -42,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Scale{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.generated.go index 9ffaf6b65d8..c86b9901481 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.Time - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.Time var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -943,7 +943,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19 } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym83 := z.DecBinary() _ = yym83 @@ -1042,7 +1042,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym92 := z.DecBinary() _ = yym92 @@ -1687,7 +1687,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv149 := &x.ListMeta yym150 := z.DecBinary() @@ -1768,7 +1768,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv156 := &x.ListMeta yym157 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.go index 444124aeaa7..b741c035c2d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // CrossVersionObjectReference contains enough information to let you identify the referred resource. @@ -57,7 +57,7 @@ type HorizontalPodAutoscalerStatus struct { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"` + LastScaleTime *metav1.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"` // current number of replicas of pods managed by this autoscaler. CurrentReplicas int32 `json:"currentReplicas" protobuf:"varint,3,opt,name=currentReplicas"` @@ -75,7 +75,7 @@ type HorizontalPodAutoscalerStatus struct { // configuration of a horizontal pod autoscaler. type HorizontalPodAutoscaler struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -91,10 +91,10 @@ type HorizontalPodAutoscaler struct { // list of horizontal pod autoscaler objects. type HorizontalPodAutoscalerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // list of horizontal pod autoscaler objects. Items []HorizontalPodAutoscaler `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -102,7 +102,7 @@ type HorizontalPodAutoscalerList struct { // Scale represents a scaling request for a resource. type Scale struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go index 070a291252a..5c02a883287 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go @@ -21,8 +21,8 @@ limitations under the License. package v1 import ( - unversioned "k8s.io/client-go/pkg/api/unversioned" autoscaling "k8s.io/client-go/pkg/apis/autoscaling" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" conversion "k8s.io/client-go/pkg/conversion" runtime "k8s.io/client-go/pkg/runtime" unsafe "unsafe" @@ -163,7 +163,7 @@ func Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscal func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error { out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) - out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) + out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) @@ -176,7 +176,7 @@ func Convert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutosc func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) - out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) + out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..d09f240fdf0 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.deepcopy.go @@ -0,0 +1,186 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1 + +import ( + api_v1 "k8s.io/client-go/pkg/api/v1" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_CrossVersionObjectReference, InType: reflect.TypeOf(&CrossVersionObjectReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscaler, InType: reflect.TypeOf(&HorizontalPodAutoscaler{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscalerList, InType: reflect.TypeOf(&HorizontalPodAutoscalerList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscalerSpec, InType: reflect.TypeOf(&HorizontalPodAutoscalerSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_HorizontalPodAutoscalerStatus, InType: reflect.TypeOf(&HorizontalPodAutoscalerStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Scale, InType: reflect.TypeOf(&Scale{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ScaleSpec, InType: reflect.TypeOf(&ScaleSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ScaleStatus, InType: reflect.TypeOf(&ScaleStatus{})}, + ) +} + +func DeepCopy_v1_CrossVersionObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CrossVersionObjectReference) + out := out.(*CrossVersionObjectReference) + out.Kind = in.Kind + out.Name = in.Name + out.APIVersion = in.APIVersion + return nil + } +} + +func DeepCopy_v1_HorizontalPodAutoscaler(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscaler) + out := out.(*HorizontalPodAutoscaler) + out.TypeMeta = in.TypeMeta + if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_HorizontalPodAutoscalerList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscalerList) + out := out.(*HorizontalPodAutoscalerList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]HorizontalPodAutoscaler, len(*in)) + for i := range *in { + if err := DeepCopy_v1_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_HorizontalPodAutoscalerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscalerSpec) + out := out.(*HorizontalPodAutoscalerSpec) + out.ScaleTargetRef = in.ScaleTargetRef + if in.MinReplicas != nil { + in, out := &in.MinReplicas, &out.MinReplicas + *out = new(int32) + **out = **in + } else { + out.MinReplicas = nil + } + out.MaxReplicas = in.MaxReplicas + if in.TargetCPUUtilizationPercentage != nil { + in, out := &in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage + *out = new(int32) + **out = **in + } else { + out.TargetCPUUtilizationPercentage = nil + } + return nil + } +} + +func DeepCopy_v1_HorizontalPodAutoscalerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscalerStatus) + out := out.(*HorizontalPodAutoscalerStatus) + if in.ObservedGeneration != nil { + in, out := &in.ObservedGeneration, &out.ObservedGeneration + *out = new(int64) + **out = **in + } else { + out.ObservedGeneration = nil + } + if in.LastScaleTime != nil { + in, out := &in.LastScaleTime, &out.LastScaleTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.LastScaleTime = nil + } + out.CurrentReplicas = in.CurrentReplicas + out.DesiredReplicas = in.DesiredReplicas + if in.CurrentCPUUtilizationPercentage != nil { + in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage + *out = new(int32) + **out = **in + } else { + out.CurrentCPUUtilizationPercentage = nil + } + return nil + } +} + +func DeepCopy_v1_Scale(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Scale) + out := out.(*Scale) + out.TypeMeta = in.TypeMeta + if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Spec = in.Spec + out.Status = in.Status + return nil + } +} + +func DeepCopy_v1_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ScaleSpec) + out := out.(*ScaleSpec) + out.Replicas = in.Replicas + return nil + } +} + +func DeepCopy_v1_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ScaleStatus) + out := out.(*ScaleStatus) + out.Replicas = in.Replicas + out.Selector = in.Selector + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go new file mode 100644 index 00000000000..afd2def453a --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/zz_generated.deepcopy.go @@ -0,0 +1,186 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package autoscaling + +import ( + api "k8s.io/client-go/pkg/api" + v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_CrossVersionObjectReference, InType: reflect.TypeOf(&CrossVersionObjectReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscaler, InType: reflect.TypeOf(&HorizontalPodAutoscaler{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscalerList, InType: reflect.TypeOf(&HorizontalPodAutoscalerList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscalerSpec, InType: reflect.TypeOf(&HorizontalPodAutoscalerSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_HorizontalPodAutoscalerStatus, InType: reflect.TypeOf(&HorizontalPodAutoscalerStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_Scale, InType: reflect.TypeOf(&Scale{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_ScaleSpec, InType: reflect.TypeOf(&ScaleSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_autoscaling_ScaleStatus, InType: reflect.TypeOf(&ScaleStatus{})}, + ) +} + +func DeepCopy_autoscaling_CrossVersionObjectReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CrossVersionObjectReference) + out := out.(*CrossVersionObjectReference) + out.Kind = in.Kind + out.Name = in.Name + out.APIVersion = in.APIVersion + return nil + } +} + +func DeepCopy_autoscaling_HorizontalPodAutoscaler(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscaler) + out := out.(*HorizontalPodAutoscaler) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_autoscaling_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_autoscaling_HorizontalPodAutoscalerList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscalerList) + out := out.(*HorizontalPodAutoscalerList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]HorizontalPodAutoscaler, len(*in)) + for i := range *in { + if err := DeepCopy_autoscaling_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_autoscaling_HorizontalPodAutoscalerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscalerSpec) + out := out.(*HorizontalPodAutoscalerSpec) + out.ScaleTargetRef = in.ScaleTargetRef + if in.MinReplicas != nil { + in, out := &in.MinReplicas, &out.MinReplicas + *out = new(int32) + **out = **in + } else { + out.MinReplicas = nil + } + out.MaxReplicas = in.MaxReplicas + if in.TargetCPUUtilizationPercentage != nil { + in, out := &in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage + *out = new(int32) + **out = **in + } else { + out.TargetCPUUtilizationPercentage = nil + } + return nil + } +} + +func DeepCopy_autoscaling_HorizontalPodAutoscalerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscalerStatus) + out := out.(*HorizontalPodAutoscalerStatus) + if in.ObservedGeneration != nil { + in, out := &in.ObservedGeneration, &out.ObservedGeneration + *out = new(int64) + **out = **in + } else { + out.ObservedGeneration = nil + } + if in.LastScaleTime != nil { + in, out := &in.LastScaleTime, &out.LastScaleTime + *out = new(v1.Time) + **out = (*in).DeepCopy() + } else { + out.LastScaleTime = nil + } + out.CurrentReplicas = in.CurrentReplicas + out.DesiredReplicas = in.DesiredReplicas + if in.CurrentCPUUtilizationPercentage != nil { + in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage + *out = new(int32) + **out = **in + } else { + out.CurrentCPUUtilizationPercentage = nil + } + return nil + } +} + +func DeepCopy_autoscaling_Scale(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Scale) + out := out.(*Scale) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Spec = in.Spec + out.Status = in.Status + return nil + } +} + +func DeepCopy_autoscaling_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ScaleSpec) + out := out.(*ScaleSpec) + out.Replicas = in.Replicas + return nil + } +} + +func DeepCopy_autoscaling_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ScaleStatus) + out := out.(*ScaleStatus) + out.Replicas = in.Replicas + out.Selector = in.Selector + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/batch/OWNERS new file mode 100755 index 00000000000..502f9077113 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/OWNERS @@ -0,0 +1,19 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- deads2k +- caesarxuchao +- erictune +- sttts +- saad-ali +- ncdc +- timothysc +- soltysh +- dims +- errordeveloper +- mml +- mbohlool +- david-mcmahon +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/batch/types.generated.go index 35a82920f5d..a4c1cc859b1 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/client-go/pkg/api" pkg4_resource "k8s.io/client-go/pkg/api/resource" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" pkg5_intstr "k8s.io/client-go/pkg/util/intstr" "reflect" @@ -67,7 +67,7 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.TypeMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv53 := &x.ListMeta yym54 := z.DecBinary() @@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv60 := &x.ListMeta yym61 := z.DecBinary() @@ -1605,7 +1605,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym144 := z.DecBinary() _ = yym144 @@ -1747,7 +1747,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym156 := z.DecBinary() _ = yym156 @@ -2126,7 +2126,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym186 := z.DecBinary() _ = yym186 @@ -2147,7 +2147,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym188 := z.DecBinary() _ = yym188 @@ -2232,7 +2232,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym196 := z.DecBinary() _ = yym196 @@ -2263,7 +2263,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym198 := z.DecBinary() _ = yym198 @@ -2630,7 +2630,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv231 := &x.LastProbeTime yym232 := z.DecBinary() @@ -2647,7 +2647,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv233 := &x.LastTransitionTime yym234 := z.DecBinary() @@ -2732,7 +2732,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv240 := &x.LastProbeTime yym241 := z.DecBinary() @@ -2759,7 +2759,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv242 := &x.LastTransitionTime yym243 := z.DecBinary() @@ -3379,7 +3379,7 @@ func (x *CronJobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv298 := &x.ListMeta yym299 := z.DecBinary() @@ -3460,7 +3460,7 @@ func (x *CronJobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv305 := &x.ListMeta yym306 := z.DecBinary() @@ -4114,7 +4114,7 @@ func (x *CronJobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym362 := z.DecBinary() _ = yym362 @@ -4181,7 +4181,7 @@ func (x *CronJobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym367 := z.DecBinary() _ = yym367 diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/types.go b/staging/src/k8s.io/client-go/pkg/apis/batch/types.go index 6015361a571..74a6f6abe01 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/types.go @@ -18,14 +18,14 @@ package batch import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true // Job represents the configuration of a single job. type Job struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -44,11 +44,11 @@ type Job struct { // JobList is a collection of jobs. type JobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of Job. Items []Job `json:"items"` @@ -56,7 +56,7 @@ type JobList struct { // JobTemplate describes a template for creating copies of a predefined pod. type JobTemplate struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -107,7 +107,7 @@ type JobSpec struct { // Selector is a label query over pods that should match the pod count. // Normally, the system sets this field for you. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -137,13 +137,13 @@ type JobStatus struct { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty"` + StartTime *metav1.Time `json:"startTime,omitempty"` // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - CompletionTime *unversioned.Time `json:"completionTime,omitempty"` + CompletionTime *metav1.Time `json:"completionTime,omitempty"` // Active is the number of actively running pods. // +optional @@ -176,10 +176,10 @@ type JobCondition struct { Status api.ConditionStatus `json:"status"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty"` @@ -192,7 +192,7 @@ type JobCondition struct { // CronJob represents the configuration of a single cron job. type CronJob struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -211,11 +211,11 @@ type CronJob struct { // CronJobList is a collection of cron jobs. type CronJobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of CronJob. Items []CronJob `json:"items"` @@ -272,5 +272,5 @@ type CronJobStatus struct { // LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // +optional - LastScheduleTime *unversioned.Time `json:"lastScheduleTime,omitempty"` + LastScheduleTime *metav1.Time `json:"lastScheduleTime,omitempty"` } diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.pb.go index f4b6ec4619d..53d3e62ac6d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.pb.go @@ -37,8 +37,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -481,8 +481,8 @@ func (this *JobCondition) String() string { s := strings.Join([]string{`&JobCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -494,7 +494,7 @@ func (this *JobList) String() string { return "nil" } s := strings.Join([]string{`&JobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -508,7 +508,7 @@ func (this *JobSpec) String() string { `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, @@ -521,8 +521,8 @@ func (this *JobStatus) String() string { } s := strings.Join([]string{`&JobStatus{`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, - `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, + `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, @@ -1131,7 +1131,7 @@ func (m *JobSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1296,7 +1296,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1329,7 +1329,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.CompletionTime == nil { - m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1519,60 +1519,59 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 872 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0xce, 0x8f, 0xa6, 0x4d, 0xa6, 0x3f, 0x76, 0x19, 0xa9, 0x52, 0xc8, 0x21, 0x59, 0x05, 0x84, - 0x16, 0xb1, 0x1d, 0x2b, 0xa5, 0x48, 0x88, 0x03, 0x12, 0x2e, 0x42, 0xa2, 0x6a, 0xd9, 0x6a, 0x52, - 0xa1, 0x15, 0x08, 0xa4, 0xb1, 0xfd, 0x36, 0x1d, 0x6a, 0x7b, 0x2c, 0xcf, 0x38, 0x68, 0x6f, 0xdc, - 0xb8, 0xf2, 0xd7, 0x80, 0xf8, 0x0f, 0x7a, 0x5c, 0x71, 0xe2, 0x14, 0x51, 0xf3, 0x5f, 0xec, 0x09, - 0x79, 0x3c, 0xb1, 0x9d, 0x26, 0x8d, 0xb2, 0xdc, 0x3c, 0xef, 0x7d, 0xdf, 0xf7, 0x9e, 0xe7, 0x7d, - 0xf3, 0xd0, 0xc7, 0x37, 0x9f, 0x4a, 0xc2, 0x85, 0x75, 0x93, 0x38, 0x10, 0x87, 0xa0, 0x40, 0x5a, - 0xd1, 0xcd, 0xc4, 0x62, 0x11, 0x97, 0x96, 0xc3, 0x94, 0x7b, 0x6d, 0x4d, 0x47, 0xd6, 0x04, 0x42, - 0x88, 0x99, 0x02, 0x8f, 0x44, 0xb1, 0x50, 0x02, 0xbf, 0x97, 0x93, 0x48, 0x49, 0x22, 0xd1, 0xcd, - 0x84, 0x64, 0x24, 0xa2, 0x49, 0x64, 0x3a, 0xea, 0x1d, 0x4d, 0xb8, 0xba, 0x4e, 0x1c, 0xe2, 0x8a, - 0xc0, 0x9a, 0x88, 0x89, 0xb0, 0x34, 0xd7, 0x49, 0x5e, 0xea, 0x93, 0x3e, 0xe8, 0xaf, 0x5c, 0xb3, - 0x77, 0xfc, 0x60, 0x23, 0x56, 0x0c, 0x52, 0x24, 0xb1, 0x0b, 0xf7, 0xfb, 0xe8, 0x7d, 0xf2, 0x30, - 0x27, 0x09, 0xa7, 0x10, 0x4b, 0x2e, 0x42, 0xf0, 0x96, 0x68, 0xcf, 0x1e, 0xa6, 0x2d, 0xff, 0x6c, - 0xef, 0x68, 0x35, 0x3a, 0x4e, 0x42, 0xc5, 0x83, 0xe5, 0x9e, 0x4e, 0xd6, 0xc3, 0xa5, 0x7b, 0x0d, - 0x01, 0x5b, 0x62, 0x8d, 0x56, 0xb3, 0x12, 0xc5, 0x7d, 0x8b, 0x87, 0x4a, 0xaa, 0xf8, 0x3e, 0x65, - 0xf8, 0x6b, 0x03, 0x35, 0xcf, 0x84, 0x83, 0x5f, 0xa0, 0x76, 0x00, 0x8a, 0x79, 0x4c, 0xb1, 0x6e, - 0xfd, 0x49, 0xfd, 0xe9, 0xee, 0xf1, 0x53, 0xf2, 0xe0, 0x7c, 0xc8, 0x74, 0x44, 0x9e, 0x3b, 0x3f, - 0x81, 0xab, 0x2e, 0x40, 0x31, 0x1b, 0xdf, 0xce, 0x06, 0xb5, 0x74, 0x36, 0x40, 0x65, 0x8c, 0x16, - 0x6a, 0xf8, 0x1b, 0xb4, 0x25, 0x23, 0x70, 0xbb, 0x0d, 0xad, 0xfa, 0x8c, 0x6c, 0x30, 0x75, 0x72, - 0x26, 0x9c, 0x71, 0x04, 0xae, 0xbd, 0x67, 0x94, 0xb7, 0xb2, 0x13, 0xd5, 0x3a, 0xf8, 0x5b, 0xb4, - 0x2d, 0x15, 0x53, 0x89, 0xec, 0x36, 0xb5, 0x22, 0xd9, 0x58, 0x51, 0xb3, 0xec, 0x03, 0xa3, 0xb9, - 0x9d, 0x9f, 0xa9, 0x51, 0x1b, 0xfe, 0xd5, 0x44, 0x7b, 0x67, 0xc2, 0x39, 0x15, 0xa1, 0xc7, 0x15, - 0x17, 0x21, 0x3e, 0x41, 0x5b, 0xea, 0x55, 0x04, 0xfa, 0x3a, 0x3a, 0xf6, 0x93, 0x79, 0x2b, 0x57, - 0xaf, 0x22, 0x78, 0x33, 0x1b, 0x3c, 0xae, 0x62, 0xb3, 0x18, 0xd5, 0xe8, 0x4a, 0x7b, 0x0d, 0xcd, - 0xfb, 0x7c, 0xb1, 0xdc, 0x9b, 0xd9, 0x60, 0xad, 0x71, 0x48, 0xa1, 0xb9, 0xd8, 0x1e, 0xbe, 0x46, - 0xfb, 0x3e, 0x93, 0xea, 0x32, 0x16, 0x0e, 0x5c, 0xf1, 0x00, 0xcc, 0xdf, 0x7f, 0xb4, 0x66, 0x4a, - 0x15, 0xf7, 0x92, 0x8c, 0x62, 0x1f, 0x9a, 0x5e, 0xf6, 0xcf, 0xab, 0x4a, 0x74, 0x51, 0x18, 0xff, - 0x8c, 0x70, 0x16, 0xb8, 0x8a, 0x59, 0x28, 0xf3, 0xbf, 0xcb, 0xca, 0x6d, 0xbd, 0x7d, 0xb9, 0x9e, - 0x29, 0x87, 0xcf, 0x97, 0xe4, 0xe8, 0x8a, 0x12, 0xf8, 0x03, 0xb4, 0x1d, 0x03, 0x93, 0x22, 0xec, - 0xb6, 0xf4, 0xd5, 0x15, 0x93, 0xa2, 0x3a, 0x4a, 0x4d, 0x16, 0x7f, 0x88, 0x76, 0x02, 0x90, 0x92, - 0x4d, 0xa0, 0xbb, 0xad, 0x81, 0x8f, 0x0c, 0x70, 0xe7, 0x22, 0x0f, 0xd3, 0x79, 0x7e, 0xf8, 0x47, - 0x1d, 0xed, 0x9c, 0x09, 0xe7, 0x9c, 0x4b, 0x85, 0x7f, 0x58, 0xb2, 0xb8, 0xb5, 0xe1, 0xdf, 0x64, - 0x74, 0xed, 0xf4, 0xc7, 0xa6, 0x50, 0x7b, 0x1e, 0xa9, 0xf8, 0xfc, 0x02, 0xb5, 0xb8, 0x82, 0x20, - 0x9b, 0x7b, 0x73, 0xfd, 0xf3, 0x59, 0xb4, 0xa5, 0xbd, 0x6f, 0x44, 0x5b, 0x5f, 0x67, 0x74, 0x9a, - 0xab, 0x0c, 0xff, 0x6c, 0xea, 0xce, 0x33, 0xe3, 0xe3, 0x11, 0xda, 0x8d, 0x58, 0xcc, 0x7c, 0x1f, - 0x7c, 0x2e, 0x03, 0xdd, 0x7c, 0xcb, 0x7e, 0x94, 0xce, 0x06, 0xbb, 0x97, 0x65, 0x98, 0x56, 0x31, - 0x19, 0xc5, 0x15, 0x41, 0xe4, 0x43, 0x76, 0xbb, 0xb9, 0x17, 0x0d, 0xe5, 0xb4, 0x0c, 0xd3, 0x2a, - 0x06, 0x3f, 0x47, 0x87, 0xcc, 0x55, 0x7c, 0x0a, 0x5f, 0x02, 0xf3, 0x7c, 0x1e, 0xc2, 0x18, 0x5c, - 0x11, 0x7a, 0xf9, 0x3b, 0x6b, 0xda, 0xef, 0xa6, 0xb3, 0xc1, 0xe1, 0x17, 0xab, 0x00, 0x74, 0x35, - 0x0f, 0xff, 0x88, 0xda, 0x12, 0x7c, 0x70, 0x95, 0x88, 0x8d, 0x7d, 0x4e, 0x36, 0xbd, 0x70, 0xe6, - 0x80, 0x3f, 0x36, 0x5c, 0x7b, 0x2f, 0xbb, 0xf1, 0xf9, 0x89, 0x16, 0x9a, 0xf8, 0x33, 0x74, 0x10, - 0xb0, 0x30, 0x61, 0x05, 0x52, 0xfb, 0xa6, 0x6d, 0xe3, 0x74, 0x36, 0x38, 0xb8, 0x58, 0xc8, 0xd0, - 0x7b, 0x48, 0xfc, 0x3d, 0x6a, 0x2b, 0x08, 0x22, 0x9f, 0xa9, 0xdc, 0x44, 0xbb, 0xc7, 0x47, 0xeb, - 0xf7, 0xdd, 0xa5, 0xf0, 0xae, 0x0c, 0x41, 0xaf, 0xa6, 0xc2, 0x0a, 0xf3, 0x28, 0x2d, 0x04, 0x87, - 0xbf, 0x37, 0x51, 0xa7, 0x58, 0x38, 0x18, 0x10, 0x72, 0xe7, 0x8f, 0x5a, 0x76, 0xeb, 0xda, 0x1d, - 0xa3, 0x4d, 0xdd, 0x51, 0xac, 0x83, 0x72, 0xcb, 0x16, 0x21, 0x49, 0x2b, 0xc2, 0xf8, 0x05, 0xea, - 0x48, 0xc5, 0x62, 0xa5, 0x5f, 0x6b, 0xe3, 0xed, 0x5f, 0xeb, 0x7e, 0x3a, 0x1b, 0x74, 0xc6, 0x73, - 0x05, 0x5a, 0x8a, 0xe1, 0x09, 0x3a, 0x28, 0x7d, 0xf2, 0x7f, 0x77, 0x8f, 0x1e, 0xca, 0xe9, 0x82, - 0x0c, 0xbd, 0x27, 0x9b, 0x2d, 0x80, 0xdc, 0x49, 0xda, 0x2e, 0xad, 0x72, 0x01, 0xe4, 0xb6, 0xa3, - 0x26, 0x8b, 0x2d, 0xd4, 0x91, 0x89, 0xeb, 0x02, 0x78, 0xe0, 0xe9, 0x99, 0xb7, 0xec, 0x77, 0x0c, - 0xb4, 0x33, 0x9e, 0x27, 0x68, 0x89, 0xc9, 0x84, 0x5f, 0x32, 0xee, 0x83, 0xa7, 0x67, 0x5d, 0x11, - 0xfe, 0x4a, 0x47, 0xa9, 0xc9, 0xda, 0xef, 0xdf, 0xde, 0xf5, 0x6b, 0xaf, 0xef, 0xfa, 0xb5, 0xbf, - 0xef, 0xfa, 0xb5, 0x5f, 0xd2, 0x7e, 0xfd, 0x36, 0xed, 0xd7, 0x5f, 0xa7, 0xfd, 0xfa, 0x3f, 0x69, - 0xbf, 0xfe, 0xdb, 0xbf, 0xfd, 0xda, 0x77, 0x8d, 0xe9, 0xe8, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x9f, 0xc8, 0x32, 0x84, 0xee, 0x08, 0x00, 0x00, + // 863 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x6f, 0xe3, 0x44, + 0x18, 0xce, 0x47, 0xd3, 0x36, 0xd3, 0x8f, 0x5d, 0x46, 0xaa, 0x14, 0x7a, 0x48, 0x56, 0x01, 0xa1, + 0x22, 0xb5, 0xb6, 0x5c, 0xf6, 0x80, 0x38, 0x20, 0xe1, 0x22, 0x24, 0xaa, 0x96, 0xad, 0x26, 0x05, + 0xa1, 0xe5, 0x34, 0xb6, 0xdf, 0x4d, 0x4d, 0x6d, 0x8f, 0xe5, 0x19, 0x47, 0xda, 0x1b, 0x37, 0xae, + 0xfc, 0x14, 0x0e, 0x88, 0xdf, 0xd0, 0x03, 0x87, 0x3d, 0x72, 0xb2, 0xa8, 0xf9, 0x17, 0x7b, 0x42, + 0x33, 0x1e, 0x7f, 0xa4, 0x49, 0x43, 0x76, 0x6f, 0xf6, 0x3b, 0xcf, 0xf3, 0xcc, 0x33, 0xf3, 0x3e, + 0xf3, 0xa2, 0xcf, 0x6e, 0x3f, 0xe7, 0x86, 0xcf, 0xcc, 0xdb, 0xd4, 0x81, 0x24, 0x02, 0x01, 0xdc, + 0x8c, 0x6f, 0xa7, 0x26, 0x8d, 0x7d, 0x6e, 0x3a, 0x54, 0xb8, 0x37, 0xe6, 0xcc, 0x32, 0xa7, 0x10, + 0x41, 0x42, 0x05, 0x78, 0x46, 0x9c, 0x30, 0xc1, 0xf0, 0x47, 0x05, 0xc9, 0xa8, 0x49, 0x46, 0x7c, + 0x3b, 0x35, 0x24, 0xc9, 0x50, 0x24, 0x63, 0x66, 0x1d, 0x9e, 0x4c, 0x7d, 0x71, 0x93, 0x3a, 0x86, + 0xcb, 0x42, 0x73, 0xca, 0xa6, 0xcc, 0x54, 0x5c, 0x27, 0x7d, 0xa5, 0xfe, 0xd4, 0x8f, 0xfa, 0x2a, + 0x34, 0x0f, 0x4f, 0x1f, 0x35, 0x62, 0x26, 0xc0, 0x59, 0x9a, 0xb8, 0xf0, 0xd0, 0xc7, 0xe1, 0xf1, + 0xe3, 0x9c, 0x45, 0xd7, 0x2b, 0x76, 0xe0, 0x66, 0x08, 0x82, 0x2e, 0xe3, 0x9c, 0x2c, 0xe7, 0x24, + 0x69, 0x24, 0xfc, 0x70, 0xd1, 0xd0, 0xf3, 0xd5, 0x70, 0xee, 0xde, 0x40, 0x48, 0x17, 0x58, 0xd6, + 0x72, 0x56, 0x2a, 0xfc, 0xc0, 0xf4, 0x23, 0xc1, 0x45, 0xf2, 0x90, 0x32, 0xfe, 0xb5, 0x83, 0xba, + 0xe7, 0xcc, 0xc1, 0x3f, 0xa2, 0x6d, 0x69, 0xdd, 0xa3, 0x82, 0x0e, 0xda, 0xcf, 0xda, 0x47, 0x3b, + 0xa7, 0x47, 0xc6, 0xa3, 0xcd, 0x31, 0x66, 0x96, 0xf1, 0xc2, 0xf9, 0x19, 0x5c, 0x71, 0x09, 0x82, + 0xda, 0xf8, 0x2e, 0x1b, 0xb5, 0xf2, 0x6c, 0x84, 0xea, 0x1a, 0xa9, 0xd4, 0xf0, 0x77, 0x68, 0x83, + 0xc7, 0xe0, 0x0e, 0x3a, 0x4a, 0xf5, 0xd8, 0x58, 0xa3, 0xe5, 0xc6, 0x39, 0x73, 0x26, 0x31, 0xb8, + 0xf6, 0xae, 0x56, 0xde, 0x90, 0x7f, 0x44, 0xe9, 0xe0, 0x1f, 0xd0, 0x26, 0x17, 0x54, 0xa4, 0x7c, + 0xd0, 0x55, 0x8a, 0xc6, 0xda, 0x8a, 0x8a, 0x65, 0xef, 0x6b, 0xcd, 0xcd, 0xe2, 0x9f, 0x68, 0xb5, + 0xf1, 0x5f, 0x5d, 0xb4, 0x7b, 0xce, 0x9c, 0x33, 0x16, 0x79, 0xbe, 0xf0, 0x59, 0x84, 0x9f, 0xa3, + 0x0d, 0xf1, 0x3a, 0x06, 0x75, 0x1d, 0x7d, 0xfb, 0x59, 0x69, 0xe5, 0xfa, 0x75, 0x0c, 0x6f, 0xb3, + 0xd1, 0xd3, 0x26, 0x56, 0xd6, 0x88, 0x42, 0x37, 0xec, 0x75, 0x14, 0xef, 0xcb, 0xf9, 0xed, 0xde, + 0x66, 0xa3, 0x95, 0x61, 0x33, 0x2a, 0xcd, 0x79, 0x7b, 0x18, 0xd0, 0x5e, 0x40, 0xb9, 0xb8, 0x4a, + 0x98, 0x03, 0xd7, 0x7e, 0x08, 0xfa, 0xf4, 0x47, 0xab, 0x4e, 0x2f, 0x7b, 0x20, 0x0f, 0x2f, 0xf1, + 0xf6, 0x81, 0x36, 0xb2, 0x77, 0xd1, 0x94, 0x21, 0xf3, 0xaa, 0x58, 0x20, 0x2c, 0x0b, 0xd7, 0x09, + 0x8d, 0x78, 0x71, 0x34, 0xb9, 0xd7, 0xc6, 0x3b, 0xee, 0x75, 0xa8, 0xf7, 0xc2, 0x17, 0x0b, 0x5a, + 0x64, 0x89, 0x3e, 0xfe, 0x04, 0x6d, 0x26, 0x40, 0x39, 0x8b, 0x06, 0x3d, 0x75, 0x69, 0x55, 0x8f, + 0x88, 0xaa, 0x12, 0xbd, 0x8a, 0x3f, 0x45, 0x5b, 0x21, 0x70, 0x4e, 0xa7, 0x30, 0xd8, 0x54, 0xc0, + 0x27, 0x1a, 0xb8, 0x75, 0x59, 0x94, 0x49, 0xb9, 0x3e, 0xfe, 0xa3, 0x8d, 0xb6, 0xce, 0x99, 0x73, + 0xe1, 0x73, 0x81, 0x5f, 0x2e, 0x84, 0xfb, 0x78, 0x9d, 0xa3, 0x48, 0xae, 0x0a, 0xf8, 0x53, 0xbd, + 0xcb, 0x76, 0x59, 0x69, 0xc4, 0xfb, 0x12, 0xf5, 0x7c, 0x01, 0xa1, 0x6c, 0x77, 0xf7, 0xff, 0xee, + 0xa8, 0x99, 0x46, 0x7b, 0x4f, 0x8b, 0xf6, 0xbe, 0x95, 0x74, 0x52, 0xa8, 0x8c, 0xff, 0xec, 0x2a, + 0xdb, 0x32, 0xef, 0xd8, 0x42, 0x3b, 0x31, 0x4d, 0x68, 0x10, 0x40, 0xe0, 0xf3, 0x50, 0x39, 0xef, + 0xd9, 0x4f, 0xf2, 0x6c, 0xb4, 0x73, 0x55, 0x97, 0x49, 0x13, 0x23, 0x29, 0x2e, 0x0b, 0xe3, 0x00, + 0xe4, 0xd5, 0x16, 0x11, 0xd4, 0x94, 0xb3, 0xba, 0x4c, 0x9a, 0x18, 0xfc, 0x02, 0x1d, 0x50, 0x57, + 0xf8, 0x33, 0xf8, 0x1a, 0xa8, 0x17, 0xf8, 0x11, 0x4c, 0xc0, 0x65, 0x91, 0x57, 0x3c, 0xaf, 0xae, + 0xfd, 0x61, 0x9e, 0x8d, 0x0e, 0xbe, 0x5a, 0x06, 0x20, 0xcb, 0x79, 0xf8, 0x27, 0xb4, 0xcd, 0x21, + 0x00, 0x57, 0xb0, 0x44, 0x07, 0xc7, 0x5a, 0xeb, 0xb6, 0xa9, 0x03, 0xc1, 0x44, 0x13, 0xed, 0x5d, + 0x79, 0xdd, 0xe5, 0x1f, 0xa9, 0x04, 0xf1, 0x17, 0x68, 0x3f, 0xa4, 0x51, 0x4a, 0x2b, 0xa4, 0x4a, + 0xcc, 0xb6, 0x8d, 0xf3, 0x6c, 0xb4, 0x7f, 0x39, 0xb7, 0x42, 0x1e, 0x20, 0xa5, 0x31, 0x01, 0x61, + 0x1c, 0x50, 0x51, 0xc4, 0x67, 0xe7, 0xf4, 0x64, 0xf5, 0x8c, 0xbb, 0x62, 0xde, 0xb5, 0x26, 0xa8, + 0x71, 0x54, 0xe5, 0xa0, 0xac, 0x92, 0x4a, 0x70, 0xfc, 0x7b, 0x17, 0xf5, 0xab, 0x21, 0x83, 0x01, + 0x21, 0xb7, 0x7c, 0xc8, 0x7c, 0xd0, 0x56, 0xd1, 0xb0, 0xd6, 0x8d, 0x46, 0x35, 0x02, 0xea, 0xc9, + 0x5a, 0x95, 0x38, 0x69, 0x08, 0xe3, 0xef, 0x51, 0x9f, 0x0b, 0x9a, 0x08, 0xf5, 0x48, 0x3b, 0xef, + 0xf8, 0x48, 0xf7, 0xf2, 0x6c, 0xd4, 0x9f, 0x94, 0x74, 0x52, 0x2b, 0x61, 0x0f, 0xed, 0xd7, 0x09, + 0x79, 0xaf, 0x61, 0xa3, 0xda, 0x71, 0x36, 0xa7, 0x41, 0x1e, 0x68, 0xca, 0x47, 0x5f, 0x04, 0x48, + 0xa5, 0xa4, 0x57, 0x3f, 0xfa, 0x22, 0x6d, 0x44, 0xaf, 0x62, 0x13, 0xf5, 0x79, 0xea, 0xba, 0x00, + 0x1e, 0x78, 0xaa, 0xdb, 0x3d, 0xfb, 0x03, 0x0d, 0xed, 0x4f, 0xca, 0x05, 0x52, 0x63, 0xa4, 0xf0, + 0x2b, 0xea, 0x07, 0xe0, 0xa9, 0x2e, 0x37, 0x84, 0xbf, 0x51, 0x55, 0xa2, 0x57, 0xed, 0x8f, 0xef, + 0xee, 0x87, 0xad, 0x37, 0xf7, 0xc3, 0xd6, 0xdf, 0xf7, 0xc3, 0xd6, 0x2f, 0xf9, 0xb0, 0x7d, 0x97, + 0x0f, 0xdb, 0x6f, 0xf2, 0x61, 0xfb, 0x9f, 0x7c, 0xd8, 0xfe, 0xed, 0xdf, 0x61, 0xeb, 0x65, 0x67, + 0x66, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x37, 0xe1, 0x87, 0xd9, 0x08, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.proto index 25957a999d0..62122e211ec 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.batch.v1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -59,11 +59,11 @@ message JobCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -79,7 +79,7 @@ message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Job. repeated Job items = 2; @@ -113,7 +113,7 @@ message JobSpec { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -145,13 +145,13 @@ message JobStatus { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3; // Active is the number of actively running pods. // +optional diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/register.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/register.go index 1a37cb92426..ae6144eb93a 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/register.go @@ -18,6 +18,7 @@ package v1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -29,6 +30,11 @@ const GroupName = "batch" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) AddToScheme = SchemeBuilder.AddToScheme @@ -41,7 +47,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &JobList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.generated.go index b6c6658d64b..92469a099ed 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/client-go/pkg/api/resource" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" pkg5_intstr "k8s.io/client-go/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv53 := &x.ListMeta yym54 := z.DecBinary() @@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv60 := &x.ListMeta yym61 := z.DecBinary() @@ -1099,7 +1099,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym102 := z.DecBinary() _ = yym102 @@ -1241,7 +1241,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym114 := z.DecBinary() _ = yym114 @@ -1620,7 +1620,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym144 := z.DecBinary() _ = yym144 @@ -1641,7 +1641,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym146 := z.DecBinary() _ = yym146 @@ -1726,7 +1726,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym154 := z.DecBinary() _ = yym154 @@ -1757,7 +1757,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym156 := z.DecBinary() _ = yym156 @@ -2124,7 +2124,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv189 := &x.LastProbeTime yym190 := z.DecBinary() @@ -2141,7 +2141,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv191 := &x.LastTransitionTime yym192 := z.DecBinary() @@ -2226,7 +2226,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv198 := &x.LastProbeTime yym199 := z.DecBinary() @@ -2253,7 +2253,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv200 := &x.LastTransitionTime yym201 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.go index ec44c4e4b28..44ca039d5d0 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.go @@ -17,15 +17,15 @@ limitations under the License. package v1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true // Job represents the configuration of a single job. type Job struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -44,11 +44,11 @@ type Job struct { // JobList is a collection of jobs. type JobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Job. Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -83,7 +83,7 @@ type JobSpec struct { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -116,13 +116,13 @@ type JobStatus struct { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` + StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - CompletionTime *unversioned.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` + CompletionTime *metav1.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` // Active is the number of actively running pods. // +optional @@ -155,10 +155,10 @@ type JobCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go index 4c3756ee1d0..e798cd205a1 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go @@ -22,9 +22,9 @@ package v1 import ( api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" api_v1 "k8s.io/client-go/pkg/api/v1" batch "k8s.io/client-go/pkg/apis/batch" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" conversion "k8s.io/client-go/pkg/conversion" runtime "k8s.io/client-go/pkg/runtime" unsafe "unsafe" @@ -159,7 +159,7 @@ func autoConvert_v1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err @@ -171,7 +171,7 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err @@ -181,8 +181,8 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s func autoConvert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error { out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed @@ -195,8 +195,8 @@ func Convert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error { out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*meta_v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*meta_v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..235132082a2 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go @@ -0,0 +1,182 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1 + +import ( + api_v1 "k8s.io/client-go/pkg/api/v1" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_Job, InType: reflect.TypeOf(&Job{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobCondition, InType: reflect.TypeOf(&JobCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobList, InType: reflect.TypeOf(&JobList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobSpec, InType: reflect.TypeOf(&JobSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_JobStatus, InType: reflect.TypeOf(&JobStatus{})}, + ) +} + +func DeepCopy_v1_Job(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Job) + out := out.(*Job) + out.TypeMeta = in.TypeMeta + if err := api_v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1_JobSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1_JobStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobCondition) + out := out.(*JobCondition) + out.Type = in.Type + out.Status = in.Status + out.LastProbeTime = in.LastProbeTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1_JobList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobList) + out := out.(*JobList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Job, len(*in)) + for i := range *in { + if err := DeepCopy_v1_Job(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobSpec) + out := out.(*JobSpec) + if in.Parallelism != nil { + in, out := &in.Parallelism, &out.Parallelism + *out = new(int32) + **out = **in + } else { + out.Parallelism = nil + } + if in.Completions != nil { + in, out := &in.Completions, &out.Completions + *out = new(int32) + **out = **in + } else { + out.Completions = nil + } + if in.ActiveDeadlineSeconds != nil { + in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds + *out = new(int64) + **out = **in + } else { + out.ActiveDeadlineSeconds = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if in.ManualSelector != nil { + in, out := &in.ManualSelector, &out.ManualSelector + *out = new(bool) + **out = **in + } else { + out.ManualSelector = nil + } + if err := api_v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobStatus) + out := out.(*JobStatus) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]JobCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v1_JobCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.StartTime != nil { + in, out := &in.StartTime, &out.StartTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.StartTime = nil + } + if in.CompletionTime != nil { + in, out := &in.CompletionTime, &out.CompletionTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.CompletionTime = nil + } + out.Active = in.Active + out.Succeeded = in.Succeeded + out.Failed = in.Failed + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.pb.go index 33f551d0085..376fe1d693d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.pb.go @@ -43,8 +43,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -832,7 +832,7 @@ func (this *CronJobList) String() string { return "nil" } s := strings.Join([]string{`&CronJobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CronJob", "CronJob", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -858,7 +858,7 @@ func (this *CronJobStatus) String() string { } s := strings.Join([]string{`&CronJobStatus{`, `Active:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Active), "ObjectReference", "k8s_io_kubernetes_pkg_api_v1.ObjectReference", 1), `&`, ``, 1) + `,`, - `LastScheduleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScheduleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `LastScheduleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScheduleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `}`, }, "") return s @@ -882,8 +882,8 @@ func (this *JobCondition) String() string { s := strings.Join([]string{`&JobCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -895,7 +895,7 @@ func (this *JobList) String() string { return "nil" } s := strings.Join([]string{`&JobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -909,7 +909,7 @@ func (this *JobSpec) String() string { `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `ManualSelector:` + valueToStringGenerated(this.ManualSelector) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, @@ -922,8 +922,8 @@ func (this *JobStatus) String() string { } s := strings.Join([]string{`&JobStatus{`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, - `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, + `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, @@ -1478,7 +1478,7 @@ func (m *CronJobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LastScheduleTime == nil { - m.LastScheduleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.LastScheduleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.LastScheduleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2098,7 +2098,7 @@ func (m *JobSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2263,7 +2263,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2296,7 +2296,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.CompletionTime == nil { - m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -2706,77 +2706,77 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 1149 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4d, 0x6f, 0xe3, 0x44, - 0x18, 0xae, 0x93, 0x36, 0x1f, 0x93, 0xed, 0xd7, 0x40, 0xb5, 0xa1, 0x48, 0x49, 0x15, 0x09, 0xd4, - 0x85, 0xad, 0xad, 0x46, 0x05, 0x96, 0x3d, 0x20, 0xad, 0x8b, 0x90, 0xa8, 0x5a, 0x6d, 0x35, 0xe9, - 0x42, 0x05, 0x0b, 0x62, 0x62, 0x4f, 0x13, 0x6f, 0x6d, 0x8f, 0xf1, 0x8c, 0x8b, 0x7a, 0xe3, 0xcc, - 0x09, 0x89, 0x1f, 0xc0, 0xef, 0x40, 0x82, 0x03, 0x07, 0xa4, 0x1e, 0x17, 0x24, 0x24, 0x4e, 0x11, - 0x35, 0xff, 0xa2, 0x27, 0xe4, 0xf1, 0xf8, 0x23, 0x5f, 0xa5, 0x29, 0x5a, 0x24, 0x6e, 0xf1, 0x3b, - 0xcf, 0xf3, 0xcc, 0x3b, 0xf3, 0x3e, 0xf3, 0xbe, 0x01, 0xef, 0x9e, 0x3e, 0x60, 0xaa, 0x45, 0xb5, - 0xd3, 0xa0, 0x4b, 0x7c, 0x97, 0x70, 0xc2, 0x34, 0xef, 0xb4, 0xa7, 0x61, 0xcf, 0x62, 0x5a, 0x17, - 0x73, 0xa3, 0xaf, 0x9d, 0xb5, 0xb1, 0xed, 0xf5, 0xf1, 0xb6, 0xd6, 0x23, 0x2e, 0xf1, 0x31, 0x27, - 0xa6, 0xea, 0xf9, 0x94, 0x53, 0x78, 0x2f, 0xa6, 0xaa, 0x19, 0x55, 0xf5, 0x4e, 0x7b, 0x6a, 0x44, - 0x55, 0x05, 0x55, 0x4d, 0xa8, 0xeb, 0x5b, 0x3d, 0x8b, 0xf7, 0x83, 0xae, 0x6a, 0x50, 0x47, 0xeb, - 0xd1, 0x1e, 0xd5, 0x84, 0x42, 0x37, 0x38, 0x11, 0x5f, 0xe2, 0x43, 0xfc, 0x8a, 0x95, 0xd7, 0xdb, - 0x53, 0x93, 0xd2, 0x7c, 0xc2, 0x68, 0xe0, 0x1b, 0x64, 0x34, 0x9b, 0xf5, 0xb7, 0xa6, 0x73, 0x02, - 0xf7, 0x8c, 0xf8, 0xcc, 0xa2, 0x2e, 0x31, 0xc7, 0x68, 0xf7, 0xa7, 0xd3, 0xce, 0xc6, 0x8e, 0xbc, - 0xbe, 0x35, 0x19, 0xed, 0x07, 0x2e, 0xb7, 0x9c, 0xf1, 0x9c, 0x76, 0xae, 0x87, 0x33, 0xa3, 0x4f, - 0x1c, 0x3c, 0xc6, 0xda, 0x9e, 0xcc, 0x0a, 0xb8, 0x65, 0x6b, 0x96, 0xcb, 0x19, 0xf7, 0x47, 0x29, - 0xad, 0xef, 0x0b, 0xa0, 0xbc, 0xeb, 0x53, 0x77, 0x8f, 0x76, 0xe1, 0x31, 0xa8, 0x38, 0x84, 0x63, - 0x13, 0x73, 0x5c, 0x57, 0x36, 0x94, 0xcd, 0x5a, 0x7b, 0x53, 0x9d, 0x5a, 0x29, 0xf5, 0x6c, 0x5b, - 0x7d, 0xdc, 0x7d, 0x46, 0x0c, 0x7e, 0x40, 0x38, 0xd6, 0xe1, 0xc5, 0xa0, 0x39, 0x17, 0x0e, 0x9a, - 0x20, 0x8b, 0xa1, 0x54, 0x0d, 0x1e, 0x83, 0x79, 0xe6, 0x11, 0xa3, 0x5e, 0x10, 0xaa, 0x6f, 0xab, - 0x37, 0xae, 0xbf, 0x2a, 0x73, 0xeb, 0x78, 0xc4, 0xd0, 0xef, 0xc8, 0x3d, 0xe6, 0xa3, 0x2f, 0x24, - 0x14, 0xe1, 0x17, 0xa0, 0xc4, 0x38, 0xe6, 0x01, 0xab, 0x17, 0x85, 0xf6, 0x83, 0x5b, 0x68, 0x0b, - 0xbe, 0xbe, 0x24, 0xd5, 0x4b, 0xf1, 0x37, 0x92, 0xba, 0xad, 0x5f, 0x14, 0x50, 0x93, 0xc8, 0x7d, - 0x8b, 0x71, 0xf8, 0xd9, 0xd8, 0x2d, 0x69, 0xd7, 0xdc, 0x52, 0xce, 0x41, 0x6a, 0x44, 0x17, 0x97, - 0xb5, 0x22, 0xb7, 0xaa, 0x24, 0x91, 0xdc, 0x55, 0x7d, 0x0c, 0x16, 0x2c, 0x4e, 0x1c, 0x56, 0x2f, - 0x6c, 0x14, 0x37, 0x6b, 0xed, 0xf6, 0xec, 0xe7, 0xd1, 0x17, 0xa5, 0xfc, 0xc2, 0x87, 0x91, 0x10, - 0x8a, 0xf5, 0x5a, 0xdf, 0x14, 0xd3, 0x73, 0x44, 0xf7, 0x07, 0xef, 0x83, 0x4a, 0x64, 0x23, 0x33, - 0xb0, 0x89, 0x38, 0x47, 0x35, 0x4b, 0xab, 0x23, 0xe3, 0x28, 0x45, 0xc0, 0x27, 0xe0, 0x2e, 0xe3, - 0xd8, 0xe7, 0x96, 0xdb, 0x7b, 0x9f, 0x60, 0xd3, 0xb6, 0x5c, 0xd2, 0x21, 0x06, 0x75, 0x4d, 0x26, - 0x8a, 0x5a, 0xd4, 0x5f, 0x0d, 0x07, 0xcd, 0xbb, 0x9d, 0xc9, 0x10, 0x34, 0x8d, 0x0b, 0x9f, 0x82, - 0x55, 0x83, 0xba, 0x46, 0xe0, 0xfb, 0xc4, 0x35, 0xce, 0x0f, 0xa9, 0x6d, 0x19, 0xe7, 0xa2, 0x92, - 0x55, 0x5d, 0x95, 0xd9, 0xac, 0xee, 0x8e, 0x02, 0xae, 0x26, 0x05, 0xd1, 0xb8, 0x10, 0x7c, 0x0d, - 0x94, 0x59, 0xc0, 0x3c, 0xe2, 0x9a, 0xf5, 0xf9, 0x0d, 0x65, 0xb3, 0xa2, 0xd7, 0xc2, 0x41, 0xb3, - 0xdc, 0x89, 0x43, 0x28, 0x59, 0x83, 0x5f, 0x82, 0xda, 0x33, 0xda, 0x3d, 0x22, 0x8e, 0x67, 0x63, - 0x4e, 0xea, 0x0b, 0xa2, 0xa8, 0x0f, 0x67, 0xb8, 0xf8, 0xbd, 0x8c, 0x2d, 0x8c, 0xfa, 0x92, 0x4c, - 0xbd, 0x96, 0x5b, 0x40, 0xf9, 0x3d, 0x5a, 0xbf, 0x2b, 0x60, 0x71, 0xc8, 0x7e, 0xf0, 0x09, 0x28, - 0x61, 0x83, 0x5b, 0x67, 0x51, 0x31, 0xa2, 0xc2, 0x6f, 0xdd, 0xe4, 0xe9, 0x21, 0x72, 0x42, 0xa2, - 0x03, 0x93, 0xcc, 0xbd, 0x8f, 0x84, 0x08, 0x92, 0x62, 0xd0, 0x01, 0x2b, 0x36, 0x66, 0x3c, 0xa9, - 0xe8, 0x91, 0xe5, 0x10, 0x71, 0x17, 0xb5, 0xf6, 0x9b, 0x37, 0x74, 0x6d, 0x44, 0xd1, 0x5f, 0x0e, - 0x07, 0xcd, 0x95, 0xfd, 0x11, 0x21, 0x34, 0x26, 0xdd, 0xfa, 0xae, 0x00, 0x8a, 0x2f, 0xb6, 0x95, - 0x1c, 0x0d, 0xb5, 0x92, 0xf6, 0x6c, 0x55, 0x9a, 0xda, 0x46, 0x9e, 0x8e, 0xb4, 0x91, 0x9d, 0x19, - 0x75, 0xaf, 0x6f, 0x21, 0xbf, 0x15, 0xc1, 0x9d, 0x3d, 0xda, 0xdd, 0xa5, 0xae, 0x69, 0x71, 0x8b, - 0xba, 0x70, 0x07, 0xcc, 0xf3, 0x73, 0x2f, 0x79, 0x77, 0x1b, 0x49, 0x42, 0x47, 0xe7, 0x1e, 0xb9, - 0x1a, 0x34, 0x57, 0xf2, 0xd8, 0x28, 0x86, 0x04, 0x1a, 0x7e, 0x94, 0x26, 0x59, 0x10, 0xbc, 0xf7, - 0x86, 0xb7, 0xbb, 0x1a, 0x34, 0xaf, 0x9d, 0x49, 0x6a, 0xaa, 0x39, 0x9c, 0x1e, 0xec, 0x83, 0xc5, - 0xa8, 0x90, 0x87, 0x3e, 0xed, 0xc6, 0x06, 0x29, 0xce, 0x6e, 0x90, 0x35, 0x99, 0xcb, 0xe2, 0x7e, - 0x5e, 0x09, 0x0d, 0x0b, 0xc3, 0xaf, 0x00, 0x8c, 0x02, 0x47, 0x3e, 0x76, 0x59, 0x7c, 0xba, 0x5b, - 0xfa, 0x71, 0x5d, 0x6e, 0x07, 0xf7, 0xc7, 0xe4, 0xd0, 0x84, 0x2d, 0xe0, 0xeb, 0xa0, 0xe4, 0x13, - 0xcc, 0xa8, 0x2b, 0x5e, 0x77, 0x35, 0xab, 0x14, 0x12, 0x51, 0x24, 0x57, 0xe1, 0x3d, 0x50, 0x76, - 0x08, 0x63, 0xb8, 0x47, 0xea, 0x25, 0x01, 0x5c, 0x96, 0xc0, 0xf2, 0x41, 0x1c, 0x46, 0xc9, 0x7a, - 0xeb, 0x27, 0x05, 0x94, 0xff, 0xa3, 0x99, 0xd0, 0x19, 0x9e, 0x09, 0xea, 0x6c, 0xe6, 0x9c, 0x32, - 0x0f, 0x7e, 0x28, 0x8a, 0xfc, 0xc5, 0x2c, 0xd8, 0x06, 0x35, 0x0f, 0xfb, 0xd8, 0xb6, 0x89, 0x6d, - 0x31, 0x47, 0x1c, 0x61, 0x41, 0x5f, 0x8e, 0x3a, 0xd8, 0x61, 0x16, 0x46, 0x79, 0x4c, 0x44, 0x31, - 0xa8, 0xe3, 0xd9, 0x24, 0xba, 0xe3, 0xd8, 0x91, 0x92, 0xb2, 0x9b, 0x85, 0x51, 0x1e, 0x03, 0x1f, - 0x83, 0xb5, 0xb8, 0x2b, 0x8d, 0x4e, 0x90, 0xa2, 0x98, 0x20, 0xaf, 0x84, 0x83, 0xe6, 0xda, 0xa3, - 0x49, 0x00, 0x34, 0x99, 0x07, 0x3f, 0x07, 0x15, 0x46, 0x6c, 0x62, 0x70, 0xea, 0x4b, 0x13, 0xed, - 0xdc, 0xf4, 0xda, 0x71, 0x97, 0xd8, 0x1d, 0xc9, 0xd5, 0xef, 0x88, 0xa1, 0x27, 0xbf, 0x50, 0xaa, - 0x09, 0x1f, 0x82, 0x25, 0x07, 0xbb, 0x01, 0x4e, 0x91, 0xc2, 0x3d, 0x15, 0x1d, 0x86, 0x83, 0xe6, - 0xd2, 0xc1, 0xd0, 0x0a, 0x1a, 0x41, 0xc2, 0x4f, 0x41, 0x85, 0x27, 0x13, 0xa5, 0x24, 0x72, 0xfb, - 0x87, 0x8e, 0x7e, 0x48, 0xcd, 0xa1, 0x21, 0x92, 0x1a, 0x22, 0x9d, 0x20, 0xa9, 0x60, 0xeb, 0xc7, - 0x22, 0xa8, 0x66, 0xa3, 0xe3, 0x14, 0x00, 0x23, 0x79, 0xda, 0x4c, 0x8e, 0x8f, 0x77, 0x66, 0xf3, - 0x48, 0xda, 0x1a, 0xb2, 0xee, 0x9b, 0x86, 0x18, 0xca, 0xc9, 0xc3, 0x63, 0x50, 0x15, 0xc3, 0x5c, - 0xbc, 0xdc, 0xc2, 0xec, 0x2f, 0x77, 0x31, 0x1c, 0x34, 0xab, 0x9d, 0x44, 0x01, 0x65, 0x62, 0xb0, - 0x07, 0x96, 0x32, 0xb7, 0xdc, 0xb6, 0x0f, 0x89, 0xd2, 0xec, 0x0e, 0xc9, 0xa0, 0x11, 0xd9, 0xa8, - 0x19, 0xc8, 0x51, 0x3b, 0x2f, 0x5c, 0x3b, 0x6d, 0x76, 0x6a, 0xa0, 0xca, 0x02, 0xc3, 0x20, 0xc4, - 0x24, 0xa6, 0xa8, 0xfc, 0x82, 0xbe, 0x2a, 0xa1, 0xd5, 0x4e, 0xb2, 0x80, 0x32, 0x4c, 0x24, 0x7c, - 0x82, 0x2d, 0x9b, 0x98, 0xa2, 0xe2, 0x39, 0xe1, 0x0f, 0x44, 0x14, 0xc9, 0xd5, 0xd6, 0xaf, 0x0a, - 0xc8, 0xff, 0x35, 0x78, 0x81, 0xd3, 0xb2, 0x9f, 0x73, 0x61, 0xe1, 0x5f, 0xff, 0xaf, 0xb9, 0xce, - 0x92, 0x3f, 0x2b, 0x60, 0x79, 0x04, 0xff, 0x7f, 0xfb, 0x17, 0xa0, 0xbf, 0x71, 0x71, 0xd9, 0x98, - 0x7b, 0x7e, 0xd9, 0x98, 0xfb, 0xe3, 0xb2, 0x31, 0xf7, 0x75, 0xd8, 0x50, 0x2e, 0xc2, 0x86, 0xf2, - 0x3c, 0x6c, 0x28, 0x7f, 0x86, 0x0d, 0xe5, 0xdb, 0xbf, 0x1a, 0x73, 0x9f, 0x54, 0x12, 0x9d, 0xbf, - 0x03, 0x00, 0x00, 0xff, 0xff, 0x74, 0x47, 0xe8, 0xb0, 0xff, 0x0e, 0x00, 0x00, + // 1137 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x56, 0x4b, 0x6f, 0x23, 0x45, + 0x17, 0x4d, 0xdb, 0x89, 0x1f, 0xe5, 0x3c, 0xeb, 0xfb, 0xa2, 0x31, 0x41, 0xb2, 0x23, 0x4b, 0xa0, + 0x0c, 0x4a, 0xba, 0x15, 0x2b, 0x82, 0x61, 0x16, 0x48, 0xd3, 0x41, 0x48, 0x44, 0x89, 0x26, 0x2a, + 0x27, 0x30, 0x1a, 0x66, 0x41, 0xb9, 0xbb, 0xe2, 0x74, 0xd2, 0xee, 0x6a, 0xba, 0xaa, 0x23, 0x65, + 0xc7, 0x9a, 0x15, 0x12, 0x3f, 0x80, 0x7f, 0xc1, 0x82, 0x1d, 0xac, 0xb2, 0x60, 0x31, 0xb0, 0x62, + 0x65, 0x91, 0xe6, 0x5f, 0x64, 0x85, 0xaa, 0x5c, 0xfd, 0xf0, 0x93, 0x38, 0x68, 0x90, 0xd8, 0xb9, + 0x6f, 0x9d, 0x73, 0xea, 0x56, 0xdd, 0x53, 0xf7, 0x1a, 0x7c, 0x78, 0xf9, 0x84, 0xe9, 0x0e, 0x35, + 0x2e, 0xc3, 0x36, 0x09, 0x3c, 0xc2, 0x09, 0x33, 0xfc, 0xcb, 0x8e, 0x81, 0x7d, 0x87, 0x19, 0x6d, + 0xcc, 0xad, 0x73, 0xe3, 0xaa, 0x89, 0x5d, 0xff, 0x1c, 0xef, 0x1a, 0x1d, 0xe2, 0x91, 0x00, 0x73, + 0x62, 0xeb, 0x7e, 0x40, 0x39, 0x85, 0x8f, 0xfb, 0x54, 0x3d, 0xa5, 0xea, 0xfe, 0x65, 0x47, 0x17, + 0x54, 0x5d, 0x52, 0xf5, 0x98, 0xba, 0xb1, 0xd3, 0x71, 0xf8, 0x79, 0xd8, 0xd6, 0x2d, 0xda, 0x35, + 0x3a, 0xb4, 0x43, 0x0d, 0xa9, 0xd0, 0x0e, 0xcf, 0xe4, 0x97, 0xfc, 0x90, 0xbf, 0xfa, 0xca, 0x1b, + 0xcd, 0x89, 0x49, 0x19, 0x01, 0x61, 0x34, 0x0c, 0x2c, 0x32, 0x9c, 0xcd, 0xc6, 0xf6, 0x64, 0xce, + 0xd5, 0x48, 0xee, 0x53, 0x76, 0x60, 0x46, 0x97, 0x70, 0x3c, 0x8e, 0xb3, 0x33, 0x9e, 0x13, 0x84, + 0x1e, 0x77, 0xba, 0xa3, 0x09, 0xed, 0x4d, 0x87, 0x33, 0xeb, 0x9c, 0x74, 0xf1, 0x08, 0x6b, 0x77, + 0x3c, 0x2b, 0xe4, 0x8e, 0x6b, 0x38, 0x1e, 0x67, 0x3c, 0x18, 0xa6, 0x34, 0xbe, 0xcf, 0x81, 0xe2, + 0x7e, 0x40, 0xbd, 0x03, 0xda, 0x86, 0x2f, 0x40, 0x49, 0xa4, 0x6f, 0x63, 0x8e, 0xab, 0xda, 0xa6, + 0xb6, 0x55, 0x69, 0x6e, 0xe9, 0x13, 0xcb, 0xa4, 0x5f, 0xed, 0xea, 0xcf, 0xdb, 0x17, 0xc4, 0xe2, + 0x47, 0x84, 0x63, 0x13, 0xde, 0xf4, 0xea, 0x73, 0x51, 0xaf, 0x0e, 0xd2, 0x18, 0x4a, 0xd4, 0xe0, + 0x0b, 0x30, 0xcf, 0x7c, 0x62, 0x55, 0x73, 0x52, 0xf5, 0x7d, 0xfd, 0xde, 0xc5, 0xd7, 0x55, 0x6e, + 0x2d, 0x9f, 0x58, 0xe6, 0xa2, 0xda, 0x63, 0x5e, 0x7c, 0x21, 0xa9, 0x08, 0xbf, 0x04, 0x05, 0xc6, + 0x31, 0x0f, 0x59, 0x35, 0x2f, 0xb5, 0x9f, 0x3c, 0x40, 0x5b, 0xf2, 0xcd, 0x65, 0xa5, 0x5e, 0xe8, + 0x7f, 0x23, 0xa5, 0xdb, 0xf8, 0x59, 0x03, 0x15, 0x85, 0x3c, 0x74, 0x18, 0x87, 0x2f, 0x47, 0x6e, + 0x69, 0x7b, 0xda, 0x9e, 0x02, 0x2b, 0xee, 0x4a, 0x70, 0xe5, 0x4d, 0xad, 0xaa, 0x7d, 0x4a, 0x71, + 0x24, 0x73, 0x4f, 0x9f, 0x83, 0x05, 0x87, 0x93, 0x2e, 0xab, 0xe6, 0x36, 0xf3, 0x5b, 0x95, 0x66, + 0x73, 0xf6, 0xc3, 0x98, 0x4b, 0x4a, 0x7e, 0xe1, 0x53, 0x21, 0x84, 0xfa, 0x7a, 0x8d, 0x6f, 0xf2, + 0xc9, 0x21, 0xc4, 0xe5, 0xc1, 0x6d, 0x50, 0x12, 0x1e, 0xb2, 0x43, 0x97, 0xc8, 0x43, 0x94, 0xd3, + 0xb4, 0x5a, 0x2a, 0x8e, 0x12, 0x04, 0x3c, 0x05, 0x8f, 0x18, 0xc7, 0x01, 0x77, 0xbc, 0xce, 0xc7, + 0x04, 0xdb, 0xae, 0xe3, 0x91, 0x16, 0xb1, 0xa8, 0x67, 0x33, 0x59, 0xd1, 0xbc, 0xf9, 0x76, 0xd4, + 0xab, 0x3f, 0x6a, 0x8d, 0x87, 0xa0, 0x49, 0x5c, 0xf8, 0x0a, 0xac, 0x59, 0xd4, 0xb3, 0xc2, 0x20, + 0x20, 0x9e, 0x75, 0x7d, 0x4c, 0x5d, 0xc7, 0xba, 0x96, 0x65, 0x2c, 0x9b, 0xba, 0xca, 0x66, 0x6d, + 0x7f, 0x18, 0x70, 0x37, 0x2e, 0x88, 0x46, 0x85, 0xe0, 0x3b, 0xa0, 0xc8, 0x42, 0xe6, 0x13, 0xcf, + 0xae, 0xce, 0x6f, 0x6a, 0x5b, 0x25, 0xb3, 0x12, 0xf5, 0xea, 0xc5, 0x56, 0x3f, 0x84, 0xe2, 0x35, + 0xf8, 0x15, 0xa8, 0x5c, 0xd0, 0xf6, 0x09, 0xe9, 0xfa, 0x2e, 0xe6, 0xa4, 0xba, 0x20, 0x2b, 0xfa, + 0x74, 0x86, 0x8b, 0x3f, 0x48, 0xd9, 0xd2, 0xa5, 0xff, 0x53, 0xa9, 0x57, 0x32, 0x0b, 0x28, 0xbb, + 0x47, 0xe3, 0x37, 0x0d, 0x2c, 0x0d, 0x78, 0x0f, 0x9e, 0x82, 0x02, 0xb6, 0xb8, 0x73, 0x25, 0x8a, + 0x21, 0x0a, 0xbf, 0x73, 0x9f, 0x77, 0x87, 0xc8, 0x19, 0x11, 0x07, 0x26, 0xa9, 0x75, 0x9f, 0x49, + 0x11, 0xa4, 0xc4, 0xe0, 0x05, 0x58, 0x75, 0x31, 0xe3, 0x71, 0x45, 0x4f, 0x9c, 0x2e, 0x91, 0x77, + 0x31, 0xf5, 0x61, 0xa7, 0x96, 0x15, 0x78, 0xf3, 0xff, 0x51, 0xaf, 0xbe, 0x7a, 0x38, 0xa4, 0x82, + 0x46, 0x74, 0x1b, 0xdf, 0xe5, 0x40, 0xfe, 0xcd, 0x36, 0x91, 0x93, 0x81, 0x26, 0xd2, 0x9c, 0xad, + 0x44, 0x13, 0x1b, 0xc8, 0xab, 0xa1, 0x06, 0xb2, 0x37, 0xa3, 0xee, 0xf4, 0xe6, 0xf1, 0x4b, 0x1e, + 0x2c, 0x1e, 0xd0, 0xf6, 0x3e, 0xf5, 0x6c, 0x87, 0x3b, 0xd4, 0x83, 0x7b, 0x60, 0x9e, 0x5f, 0xfb, + 0xf1, 0xa3, 0xdb, 0x8c, 0x13, 0x3a, 0xb9, 0xf6, 0xc9, 0x5d, 0xaf, 0xbe, 0x9a, 0xc5, 0x8a, 0x18, + 0x92, 0x68, 0xf8, 0x59, 0x92, 0x64, 0x4e, 0xf2, 0x3e, 0x1a, 0xdc, 0xee, 0xae, 0x57, 0x9f, 0x3a, + 0xc1, 0xf4, 0x44, 0x73, 0x30, 0x3d, 0x48, 0xc0, 0x92, 0x28, 0xe4, 0x71, 0x40, 0xdb, 0x7d, 0x77, + 0xe4, 0x67, 0x74, 0xc7, 0xba, 0x4a, 0x64, 0xe9, 0x30, 0x2b, 0x83, 0x06, 0x55, 0x21, 0x07, 0x50, + 0x04, 0x4e, 0x02, 0xec, 0xb1, 0xfe, 0xd1, 0x1e, 0xe2, 0xc4, 0x0d, 0xb5, 0x17, 0x3c, 0x1c, 0xd1, + 0x42, 0x63, 0xf4, 0xe1, 0xbb, 0xa0, 0x10, 0x10, 0xcc, 0xa8, 0x27, 0x1f, 0x75, 0x39, 0xad, 0x11, + 0x92, 0x51, 0xa4, 0x56, 0xe1, 0x63, 0x50, 0xec, 0x12, 0xc6, 0x70, 0x87, 0x54, 0x0b, 0x12, 0xb8, + 0xa2, 0x80, 0xc5, 0xa3, 0x7e, 0x18, 0xc5, 0xeb, 0x8d, 0x1f, 0x35, 0x50, 0xfc, 0x37, 0xe6, 0x40, + 0x6b, 0x70, 0x0e, 0xe8, 0xb3, 0x79, 0x72, 0xc2, 0x0c, 0xf8, 0x21, 0x2f, 0x93, 0x97, 0xfd, 0x7f, + 0x17, 0x54, 0x7c, 0x1c, 0x60, 0xd7, 0x25, 0xae, 0xc3, 0xba, 0x32, 0xff, 0x05, 0x73, 0x45, 0x74, + 0xad, 0xe3, 0x34, 0x8c, 0xb2, 0x18, 0x41, 0xb1, 0x68, 0xd7, 0x77, 0x89, 0xb8, 0xe0, 0xbe, 0x11, + 0x15, 0x65, 0x3f, 0x0d, 0xa3, 0x2c, 0x06, 0x3e, 0x07, 0xeb, 0xfd, 0x4e, 0x34, 0x3c, 0x35, 0xf2, + 0x72, 0x6a, 0xbc, 0x15, 0xf5, 0xea, 0xeb, 0xcf, 0xc6, 0x01, 0xd0, 0x78, 0x1e, 0xfc, 0x02, 0x94, + 0x18, 0x71, 0x89, 0xc5, 0x69, 0xa0, 0xec, 0xb3, 0x7b, 0xaf, 0x3b, 0xc7, 0x6d, 0xe2, 0xb6, 0x14, + 0xd1, 0x5c, 0x94, 0x53, 0x4e, 0x7d, 0xa1, 0x44, 0x10, 0x3e, 0x05, 0xcb, 0x5d, 0xec, 0x85, 0x38, + 0x41, 0x4a, 0xdf, 0x94, 0x4c, 0x18, 0xf5, 0xea, 0xcb, 0x47, 0x03, 0x2b, 0x68, 0x08, 0x29, 0x12, + 0xe3, 0xf1, 0x08, 0x29, 0xc8, 0xc4, 0xfe, 0xa6, 0x85, 0x1f, 0x53, 0x7b, 0x60, 0x6a, 0x24, 0x6e, + 0x48, 0x46, 0x46, 0x22, 0x28, 0x0a, 0x57, 0x4e, 0x67, 0xc5, 0x25, 0x00, 0x56, 0xfc, 0x9c, 0x99, + 0x9a, 0x17, 0x1f, 0xcc, 0x66, 0x90, 0xa4, 0x1d, 0xa4, 0x1d, 0x37, 0x09, 0x31, 0x94, 0x91, 0x87, + 0xa7, 0xa0, 0x2c, 0xa7, 0xb7, 0x7c, 0xb0, 0xb9, 0x19, 0x1f, 0xec, 0x52, 0xd4, 0xab, 0x97, 0x5b, + 0x31, 0x1d, 0xa5, 0x4a, 0xd0, 0x06, 0xcb, 0xa9, 0x4f, 0x1e, 0xd4, 0x78, 0x64, 0x51, 0xf6, 0x07, + 0x34, 0xd0, 0x90, 0xa6, 0x68, 0x00, 0x6a, 0xaa, 0xce, 0x4b, 0xb3, 0x4e, 0x1a, 0x93, 0x06, 0x28, + 0xb3, 0xd0, 0xb2, 0x08, 0xb1, 0x89, 0x2d, 0x6b, 0xbe, 0x60, 0xae, 0x29, 0x68, 0xb9, 0x15, 0x2f, + 0xa0, 0x14, 0x23, 0x84, 0xcf, 0xb0, 0xe3, 0x12, 0x5b, 0xd6, 0x3a, 0x23, 0xfc, 0x89, 0x8c, 0x22, + 0xb5, 0xda, 0xf8, 0x55, 0x03, 0xd9, 0x7f, 0x01, 0x6f, 0x70, 0x36, 0x9e, 0x67, 0xfc, 0x97, 0xfb, + 0xc7, 0x7f, 0x61, 0xa6, 0x99, 0xf1, 0x27, 0x0d, 0xac, 0x0c, 0xe1, 0xff, 0x6b, 0x33, 0xdf, 0x7c, + 0xef, 0xe6, 0xb6, 0x36, 0xf7, 0xfa, 0xb6, 0x36, 0xf7, 0xfb, 0x6d, 0x6d, 0xee, 0xeb, 0xa8, 0xa6, + 0xdd, 0x44, 0x35, 0xed, 0x75, 0x54, 0xd3, 0xfe, 0x88, 0x6a, 0xda, 0xb7, 0x7f, 0xd6, 0xe6, 0x5e, + 0x96, 0x62, 0x9d, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x1c, 0xb0, 0x5a, 0xe4, 0x0e, 0x00, + 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.proto index ffa7f5ae4f9..46d1223c1e2 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.batch.v2alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -54,7 +54,7 @@ message CronJobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of CronJob. repeated CronJob items = 2; @@ -92,7 +92,7 @@ message CronJobStatus { // LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScheduleTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScheduleTime = 4; } // Job represents the configuration of a single job. @@ -123,11 +123,11 @@ message JobCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -143,7 +143,7 @@ message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Job. repeated Job items = 2; @@ -177,7 +177,7 @@ message JobSpec { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -209,13 +209,13 @@ message JobStatus { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3; // Active is the number of actively running pods. // +optional diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/register.go index 5577e3af0ac..de9cd26a2a0 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/register.go @@ -29,6 +29,11 @@ const GroupName = "batch" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v2alpha1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) AddToScheme = SchemeBuilder.AddToScheme diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.generated.go index f2fa2a6b51e..41cbc653b2b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/client-go/pkg/api/resource" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" pkg5_intstr "k8s.io/client-go/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -632,7 +632,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv53 := &x.ListMeta yym54 := z.DecBinary() @@ -713,7 +713,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv60 := &x.ListMeta yym61 := z.DecBinary() @@ -1605,7 +1605,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym144 := z.DecBinary() _ = yym144 @@ -1747,7 +1747,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym156 := z.DecBinary() _ = yym156 @@ -2126,7 +2126,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym186 := z.DecBinary() _ = yym186 @@ -2147,7 +2147,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym188 := z.DecBinary() _ = yym188 @@ -2232,7 +2232,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym196 := z.DecBinary() _ = yym196 @@ -2263,7 +2263,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym198 := z.DecBinary() _ = yym198 @@ -2630,7 +2630,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv231 := &x.LastProbeTime yym232 := z.DecBinary() @@ -2647,7 +2647,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv233 := &x.LastTransitionTime yym234 := z.DecBinary() @@ -2732,7 +2732,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv240 := &x.LastProbeTime yym241 := z.DecBinary() @@ -2759,7 +2759,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv242 := &x.LastTransitionTime yym243 := z.DecBinary() @@ -3379,7 +3379,7 @@ func (x *CronJobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv298 := &x.ListMeta yym299 := z.DecBinary() @@ -3460,7 +3460,7 @@ func (x *CronJobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv305 := &x.ListMeta yym306 := z.DecBinary() @@ -4114,7 +4114,7 @@ func (x *CronJobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym362 := z.DecBinary() _ = yym362 @@ -4181,7 +4181,7 @@ func (x *CronJobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.LastScheduleTime == nil { - x.LastScheduleTime = new(pkg1_unversioned.Time) + x.LastScheduleTime = new(pkg1_v1.Time) } yym367 := z.DecBinary() _ = yym367 diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go index a610272e35c..897b89cf04f 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go @@ -17,15 +17,15 @@ limitations under the License. package v2alpha1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true // Job represents the configuration of a single job. type Job struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -44,11 +44,11 @@ type Job struct { // JobList is a collection of jobs. type JobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Job. Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -56,7 +56,7 @@ type JobList struct { // JobTemplate describes a template for creating copies of a predefined pod. type JobTemplate struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -110,7 +110,7 @@ type JobSpec struct { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` // ManualSelector controls generation of pod labels and pod selectors. // Leave `manualSelector` unset unless you are certain what you are doing. @@ -143,13 +143,13 @@ type JobStatus struct { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` + StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - CompletionTime *unversioned.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` + CompletionTime *metav1.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` // Active is the number of actively running pods. // +optional @@ -182,10 +182,10 @@ type JobCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -198,7 +198,7 @@ type JobCondition struct { // CronJob represents the configuration of a single cron job. type CronJob struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -217,11 +217,11 @@ type CronJob struct { // CronJobList is a collection of cron jobs. type CronJobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of CronJob. Items []CronJob `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -278,5 +278,5 @@ type CronJobStatus struct { // LastScheduleTime keeps information of when was the last time the job was successfully scheduled. // +optional - LastScheduleTime *unversioned.Time `json:"lastScheduleTime,omitempty" protobuf:"bytes,4,opt,name=lastScheduleTime"` + LastScheduleTime *metav1.Time `json:"lastScheduleTime,omitempty" protobuf:"bytes,4,opt,name=lastScheduleTime"` } diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go index 431e0b46755..e6175b7c58c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go @@ -22,9 +22,9 @@ package v2alpha1 import ( api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" - v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/client-go/pkg/api/v1" batch "k8s.io/client-go/pkg/apis/batch" + v1 "k8s.io/client-go/pkg/apis/meta/v1" conversion "k8s.io/client-go/pkg/conversion" runtime "k8s.io/client-go/pkg/runtime" unsafe "unsafe" @@ -171,7 +171,7 @@ func Convert_batch_CronJobSpec_To_v2alpha1_CronJobSpec(in *batch.CronJobSpec, ou func autoConvert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *CronJobStatus, out *batch.CronJobStatus, s conversion.Scope) error { out.Active = *(*[]api.ObjectReference)(unsafe.Pointer(&in.Active)) - out.LastScheduleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScheduleTime)) + out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime)) return nil } @@ -180,8 +180,8 @@ func Convert_v2alpha1_CronJobStatus_To_batch_CronJobStatus(in *CronJobStatus, ou } func autoConvert_batch_CronJobStatus_To_v2alpha1_CronJobStatus(in *batch.CronJobStatus, out *CronJobStatus, s conversion.Scope) error { - out.Active = *(*[]v1.ObjectReference)(unsafe.Pointer(&in.Active)) - out.LastScheduleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScheduleTime)) + out.Active = *(*[]api_v1.ObjectReference)(unsafe.Pointer(&in.Active)) + out.LastScheduleTime = (*v1.Time)(unsafe.Pointer(in.LastScheduleTime)) return nil } @@ -241,7 +241,7 @@ func Convert_v2alpha1_JobCondition_To_batch_JobCondition(in *JobCondition, out * func autoConvert_batch_JobCondition_To_v2alpha1_JobCondition(in *batch.JobCondition, out *JobCondition, s conversion.Scope) error { out.Type = JobConditionType(in.Type) - out.Status = v1.ConditionStatus(in.Status) + out.Status = api_v1.ConditionStatus(in.Status) out.LastProbeTime = in.LastProbeTime out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason @@ -297,9 +297,9 @@ func autoConvert_v2alpha1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSp out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -309,9 +309,9 @@ func autoConvert_batch_JobSpec_To_v2alpha1_JobSpec(in *batch.JobSpec, out *JobSp out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) out.ManualSelector = (*bool)(unsafe.Pointer(in.ManualSelector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -319,8 +319,8 @@ func autoConvert_batch_JobSpec_To_v2alpha1_JobSpec(in *batch.JobSpec, out *JobSp func autoConvert_v2alpha1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error { out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed @@ -333,8 +333,8 @@ func Convert_v2alpha1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.Job func autoConvert_batch_JobStatus_To_v2alpha1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error { out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..4d415a94487 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go @@ -0,0 +1,307 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v2alpha1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_CronJob, InType: reflect.TypeOf(&CronJob{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_CronJobList, InType: reflect.TypeOf(&CronJobList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_CronJobSpec, InType: reflect.TypeOf(&CronJobSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_CronJobStatus, InType: reflect.TypeOf(&CronJobStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_Job, InType: reflect.TypeOf(&Job{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobCondition, InType: reflect.TypeOf(&JobCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobList, InType: reflect.TypeOf(&JobList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobSpec, InType: reflect.TypeOf(&JobSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobStatus, InType: reflect.TypeOf(&JobStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobTemplate, InType: reflect.TypeOf(&JobTemplate{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v2alpha1_JobTemplateSpec, InType: reflect.TypeOf(&JobTemplateSpec{})}, + ) +} + +func DeepCopy_v2alpha1_CronJob(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CronJob) + out := out.(*CronJob) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v2alpha1_CronJobSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v2alpha1_CronJobStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v2alpha1_CronJobList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CronJobList) + out := out.(*CronJobList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CronJob, len(*in)) + for i := range *in { + if err := DeepCopy_v2alpha1_CronJob(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v2alpha1_CronJobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CronJobSpec) + out := out.(*CronJobSpec) + out.Schedule = in.Schedule + if in.StartingDeadlineSeconds != nil { + in, out := &in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds + *out = new(int64) + **out = **in + } else { + out.StartingDeadlineSeconds = nil + } + out.ConcurrencyPolicy = in.ConcurrencyPolicy + if in.Suspend != nil { + in, out := &in.Suspend, &out.Suspend + *out = new(bool) + **out = **in + } else { + out.Suspend = nil + } + if err := DeepCopy_v2alpha1_JobTemplateSpec(&in.JobTemplate, &out.JobTemplate, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v2alpha1_CronJobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CronJobStatus) + out := out.(*CronJobStatus) + if in.Active != nil { + in, out := &in.Active, &out.Active + *out = make([]v1.ObjectReference, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Active = nil + } + if in.LastScheduleTime != nil { + in, out := &in.LastScheduleTime, &out.LastScheduleTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.LastScheduleTime = nil + } + return nil + } +} + +func DeepCopy_v2alpha1_Job(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Job) + out := out.(*Job) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v2alpha1_JobSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v2alpha1_JobStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v2alpha1_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobCondition) + out := out.(*JobCondition) + out.Type = in.Type + out.Status = in.Status + out.LastProbeTime = in.LastProbeTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v2alpha1_JobList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobList) + out := out.(*JobList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Job, len(*in)) + for i := range *in { + if err := DeepCopy_v2alpha1_Job(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v2alpha1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobSpec) + out := out.(*JobSpec) + if in.Parallelism != nil { + in, out := &in.Parallelism, &out.Parallelism + *out = new(int32) + **out = **in + } else { + out.Parallelism = nil + } + if in.Completions != nil { + in, out := &in.Completions, &out.Completions + *out = new(int32) + **out = **in + } else { + out.Completions = nil + } + if in.ActiveDeadlineSeconds != nil { + in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds + *out = new(int64) + **out = **in + } else { + out.ActiveDeadlineSeconds = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if in.ManualSelector != nil { + in, out := &in.ManualSelector, &out.ManualSelector + *out = new(bool) + **out = **in + } else { + out.ManualSelector = nil + } + if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v2alpha1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobStatus) + out := out.(*JobStatus) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]JobCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v2alpha1_JobCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.StartTime != nil { + in, out := &in.StartTime, &out.StartTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.StartTime = nil + } + if in.CompletionTime != nil { + in, out := &in.CompletionTime, &out.CompletionTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.CompletionTime = nil + } + out.Active = in.Active + out.Succeeded = in.Succeeded + out.Failed = in.Failed + return nil + } +} + +func DeepCopy_v2alpha1_JobTemplate(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobTemplate) + out := out.(*JobTemplate) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v2alpha1_JobTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v2alpha1_JobTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobTemplateSpec) + out := out.(*JobTemplateSpec) + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v2alpha1_JobSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go new file mode 100644 index 00000000000..d1d7179220a --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/zz_generated.deepcopy.go @@ -0,0 +1,307 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package batch + +import ( + api "k8s.io/client-go/pkg/api" + v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_CronJob, InType: reflect.TypeOf(&CronJob{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_CronJobList, InType: reflect.TypeOf(&CronJobList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_CronJobSpec, InType: reflect.TypeOf(&CronJobSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_CronJobStatus, InType: reflect.TypeOf(&CronJobStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_Job, InType: reflect.TypeOf(&Job{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobCondition, InType: reflect.TypeOf(&JobCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobList, InType: reflect.TypeOf(&JobList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobSpec, InType: reflect.TypeOf(&JobSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobStatus, InType: reflect.TypeOf(&JobStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobTemplate, InType: reflect.TypeOf(&JobTemplate{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_batch_JobTemplateSpec, InType: reflect.TypeOf(&JobTemplateSpec{})}, + ) +} + +func DeepCopy_batch_CronJob(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CronJob) + out := out.(*CronJob) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_batch_CronJobSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_batch_CronJobStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_batch_CronJobList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CronJobList) + out := out.(*CronJobList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CronJob, len(*in)) + for i := range *in { + if err := DeepCopy_batch_CronJob(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_batch_CronJobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CronJobSpec) + out := out.(*CronJobSpec) + out.Schedule = in.Schedule + if in.StartingDeadlineSeconds != nil { + in, out := &in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds + *out = new(int64) + **out = **in + } else { + out.StartingDeadlineSeconds = nil + } + out.ConcurrencyPolicy = in.ConcurrencyPolicy + if in.Suspend != nil { + in, out := &in.Suspend, &out.Suspend + *out = new(bool) + **out = **in + } else { + out.Suspend = nil + } + if err := DeepCopy_batch_JobTemplateSpec(&in.JobTemplate, &out.JobTemplate, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_batch_CronJobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CronJobStatus) + out := out.(*CronJobStatus) + if in.Active != nil { + in, out := &in.Active, &out.Active + *out = make([]api.ObjectReference, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Active = nil + } + if in.LastScheduleTime != nil { + in, out := &in.LastScheduleTime, &out.LastScheduleTime + *out = new(v1.Time) + **out = (*in).DeepCopy() + } else { + out.LastScheduleTime = nil + } + return nil + } +} + +func DeepCopy_batch_Job(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Job) + out := out.(*Job) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_batch_JobSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_batch_JobStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_batch_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobCondition) + out := out.(*JobCondition) + out.Type = in.Type + out.Status = in.Status + out.LastProbeTime = in.LastProbeTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_batch_JobList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobList) + out := out.(*JobList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Job, len(*in)) + for i := range *in { + if err := DeepCopy_batch_Job(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_batch_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobSpec) + out := out.(*JobSpec) + if in.Parallelism != nil { + in, out := &in.Parallelism, &out.Parallelism + *out = new(int32) + **out = **in + } else { + out.Parallelism = nil + } + if in.Completions != nil { + in, out := &in.Completions, &out.Completions + *out = new(int32) + **out = **in + } else { + out.Completions = nil + } + if in.ActiveDeadlineSeconds != nil { + in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds + *out = new(int64) + **out = **in + } else { + out.ActiveDeadlineSeconds = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if in.ManualSelector != nil { + in, out := &in.ManualSelector, &out.ManualSelector + *out = new(bool) + **out = **in + } else { + out.ManualSelector = nil + } + if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_batch_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobStatus) + out := out.(*JobStatus) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]JobCondition, len(*in)) + for i := range *in { + if err := DeepCopy_batch_JobCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.StartTime != nil { + in, out := &in.StartTime, &out.StartTime + *out = new(v1.Time) + **out = (*in).DeepCopy() + } else { + out.StartTime = nil + } + if in.CompletionTime != nil { + in, out := &in.CompletionTime, &out.CompletionTime + *out = new(v1.Time) + **out = (*in).DeepCopy() + } else { + out.CompletionTime = nil + } + out.Active = in.Active + out.Succeeded = in.Succeeded + out.Failed = in.Failed + return nil + } +} + +func DeepCopy_batch_JobTemplate(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobTemplate) + out := out.(*JobTemplate) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_batch_JobTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_batch_JobTemplateSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobTemplateSpec) + out := out.(*JobTemplateSpec) + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_batch_JobSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/certificates/OWNERS new file mode 100755 index 00000000000..c67bd1172a1 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/OWNERS @@ -0,0 +1,14 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- deads2k +- caesarxuchao +- liggitt +- sttts +- timothysc +- dims +- errordeveloper +- mbohlool +- david-mcmahon +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/types.generated.go index 5c17d300f3d..a07f656a0f8 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/client-go/pkg/api" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1253,7 +1253,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromMap(l int, d *co } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv104 := &x.LastUpdateTime yym105 := z.DecBinary() @@ -1342,7 +1342,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv110 := &x.LastUpdateTime yym111 := z.DecBinary() @@ -1594,7 +1594,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromMap(l int, d *codec19 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv133 := &x.ListMeta yym134 := z.DecBinary() @@ -1675,7 +1675,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromArray(l int, d *codec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv140 := &x.ListMeta yym141 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/types.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/types.go index 4fb5b01faf3..2624acd5abe 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/types.go @@ -18,7 +18,7 @@ package certificates import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -26,7 +26,7 @@ import ( // Describes a certificate signing request type CertificateSigningRequest struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -85,13 +85,13 @@ type CertificateSigningRequestCondition struct { Message string `json:"message,omitempty"` // timestamp for the last update to this condition // +optional - LastUpdateTime unversioned.Time `json:"lastUpdateTime,omitempty"` + LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"` } type CertificateSigningRequestList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // +optional Items []CertificateSigningRequest `json:"items,omitempty"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/generated.pb.go index 038ff256f7f..e599768205b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/generated.pb.go @@ -425,7 +425,7 @@ func (this *CertificateSigningRequestCondition) String() string { `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -435,7 +435,7 @@ func (this *CertificateSigningRequestList) String() string { return "nil" } s := strings.Join([]string{`&CertificateSigningRequestList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "CertificateSigningRequest", "CertificateSigningRequest", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1277,49 +1277,49 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 700 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x4f, 0x13, 0x41, - 0x14, 0xef, 0xb6, 0xa5, 0xb4, 0x53, 0x04, 0x33, 0x31, 0xa6, 0x36, 0x61, 0x4b, 0x1a, 0x35, 0x55, - 0x61, 0xd6, 0x12, 0x4d, 0x38, 0x9a, 0xc5, 0xc4, 0x10, 0x21, 0xc4, 0x01, 0x12, 0x63, 0xe2, 0x61, - 0xba, 0x7d, 0x2c, 0x63, 0xd9, 0x3f, 0xec, 0xcc, 0x36, 0xe1, 0xe6, 0xd1, 0xa3, 0x9f, 0xc0, 0xaf, - 0xe1, 0x57, 0xe0, 0xc8, 0xd1, 0x53, 0x95, 0xf2, 0x05, 0x3c, 0x7b, 0x32, 0x3b, 0x9d, 0xfe, 0xb1, - 0x65, 0x51, 0x13, 0x6e, 0xfb, 0x7e, 0xf3, 0x7e, 0xbf, 0xdf, 0x7b, 0x6f, 0xde, 0x2c, 0x7a, 0xd1, - 0xd9, 0x10, 0x84, 0x07, 0x56, 0x27, 0x6e, 0x41, 0xe4, 0x83, 0x04, 0x61, 0x85, 0x1d, 0xd7, 0x62, - 0x21, 0x17, 0x96, 0x03, 0x91, 0xe4, 0x87, 0xdc, 0x61, 0x09, 0xda, 0x6d, 0xb2, 0xe3, 0xf0, 0x88, - 0x35, 0x2d, 0x17, 0x7c, 0x88, 0x98, 0x84, 0x36, 0x09, 0xa3, 0x40, 0x06, 0xf8, 0xe9, 0x40, 0x81, - 0x8c, 0x15, 0x48, 0xd8, 0x71, 0x49, 0xa2, 0x40, 0x26, 0x15, 0xc8, 0x50, 0xa1, 0xba, 0xe6, 0x72, - 0x79, 0x14, 0xb7, 0x88, 0x13, 0x78, 0x96, 0x1b, 0xb8, 0x81, 0xa5, 0x84, 0x5a, 0xf1, 0xa1, 0x8a, - 0x54, 0xa0, 0xbe, 0x06, 0x06, 0xd5, 0xf5, 0xd4, 0x12, 0xad, 0x08, 0x44, 0x10, 0x47, 0x0e, 0x4c, - 0x17, 0x55, 0x7d, 0x9e, 0xce, 0x89, 0xfd, 0x2e, 0x44, 0x82, 0x07, 0x3e, 0xb4, 0x67, 0x68, 0xab, - 0xe9, 0xb4, 0xee, 0x4c, 0xe7, 0xd5, 0xb5, 0xab, 0xb3, 0xa3, 0xd8, 0x97, 0xdc, 0x9b, 0xad, 0xe9, - 0xd9, 0xf5, 0xe9, 0xc2, 0x39, 0x02, 0x8f, 0xcd, 0xb0, 0x9a, 0x57, 0xb3, 0x62, 0xc9, 0x8f, 0x2d, - 0xee, 0x4b, 0x21, 0xa3, 0x69, 0x4a, 0xfd, 0x32, 0x8b, 0xee, 0x6d, 0x8e, 0x27, 0xbf, 0xc7, 0x5d, - 0x9f, 0xfb, 0x2e, 0x85, 0x93, 0x18, 0x84, 0xc4, 0x6f, 0x51, 0xd1, 0x03, 0xc9, 0xda, 0x4c, 0xb2, - 0x8a, 0xb1, 0x62, 0x34, 0xca, 0xeb, 0x0d, 0x92, 0x7a, 0x85, 0xa4, 0xdb, 0x24, 0xbb, 0xad, 0x0f, - 0xe0, 0xc8, 0x1d, 0x90, 0xcc, 0xc6, 0x67, 0xbd, 0x5a, 0xa6, 0xdf, 0xab, 0xa1, 0x31, 0x46, 0x47, - 0x6a, 0xf8, 0x04, 0xe5, 0x45, 0x08, 0x4e, 0x25, 0xab, 0x54, 0x77, 0xc9, 0xff, 0x2e, 0x06, 0x49, - 0x2d, 0x7a, 0x2f, 0x04, 0xc7, 0x5e, 0xd0, 0xe6, 0xf9, 0x24, 0xa2, 0xca, 0x0a, 0x9f, 0xa2, 0x82, - 0x90, 0x4c, 0xc6, 0xa2, 0x92, 0x53, 0xa6, 0x6f, 0x6e, 0xd2, 0x54, 0x09, 0xdb, 0x8b, 0xda, 0xb6, - 0x30, 0x88, 0xa9, 0x36, 0xac, 0x7f, 0xc9, 0xa2, 0x7a, 0x2a, 0x77, 0x33, 0xf0, 0xdb, 0x5c, 0xf2, - 0xc0, 0xc7, 0x1b, 0x28, 0x2f, 0x4f, 0x43, 0x50, 0xa3, 0x2e, 0xd9, 0xf7, 0x87, 0x3d, 0xec, 0x9f, - 0x86, 0xf0, 0xab, 0x57, 0xbb, 0x33, 0x9d, 0x9f, 0xe0, 0x54, 0x31, 0xf0, 0x43, 0x54, 0x88, 0x80, - 0x89, 0xc0, 0x57, 0x03, 0x2d, 0x8d, 0x0b, 0xa1, 0x0a, 0xa5, 0xfa, 0x14, 0x3f, 0x42, 0xf3, 0x1e, - 0x08, 0xc1, 0x5c, 0x50, 0x43, 0x28, 0xd9, 0x4b, 0x3a, 0x71, 0x7e, 0x67, 0x00, 0xd3, 0xe1, 0x39, - 0xee, 0xa0, 0xc5, 0x63, 0x26, 0xe4, 0x41, 0xd8, 0x66, 0x12, 0xf6, 0xb9, 0x07, 0x95, 0xbc, 0x1a, - 0xdb, 0x93, 0x6b, 0x36, 0x60, 0xe2, 0xbd, 0x90, 0x84, 0x62, 0xdf, 0xd5, 0xf2, 0x8b, 0xdb, 0x7f, - 0x48, 0xd1, 0x29, 0xe9, 0xfa, 0x4f, 0x03, 0x2d, 0xa7, 0x0e, 0x68, 0x9b, 0x0b, 0x89, 0xdf, 0xcf, - 0xac, 0xa2, 0xf5, 0x8f, 0x85, 0x24, 0x74, 0xb5, 0x91, 0xb7, 0x75, 0x31, 0xc5, 0x21, 0x32, 0xb1, - 0x8f, 0x21, 0x9a, 0xe3, 0x12, 0x3c, 0x51, 0xc9, 0xae, 0xe4, 0x1a, 0xe5, 0xf5, 0xd7, 0x37, 0xb8, - 0x1b, 0xf6, 0x2d, 0xed, 0x3b, 0xb7, 0x95, 0x38, 0xd0, 0x81, 0x51, 0xfd, 0xeb, 0x75, 0x2d, 0x27, - 0x6b, 0x8b, 0x1f, 0xa0, 0xf9, 0x68, 0x10, 0xaa, 0x8e, 0x17, 0xec, 0x72, 0x72, 0x51, 0x3a, 0x83, - 0x0e, 0xcf, 0xf0, 0x2a, 0x2a, 0xc6, 0x02, 0x22, 0x9f, 0x79, 0xa0, 0x6f, 0x7f, 0xd4, 0xe8, 0x81, - 0xc6, 0xe9, 0x28, 0x03, 0x2f, 0xa3, 0x5c, 0xcc, 0xdb, 0xfa, 0xf6, 0xcb, 0x3a, 0x31, 0x77, 0xb0, - 0xf5, 0x92, 0x26, 0x38, 0xae, 0xa3, 0x82, 0x1b, 0x05, 0x71, 0x28, 0x2a, 0xf9, 0x95, 0x5c, 0xa3, - 0x64, 0xa3, 0x64, 0x89, 0x5e, 0x29, 0x84, 0xea, 0x93, 0xfa, 0x77, 0x03, 0xd5, 0xfe, 0xf2, 0x12, - 0xf0, 0x27, 0x03, 0x21, 0x67, 0xb8, 0xa8, 0xa2, 0x62, 0xa8, 0xa9, 0xee, 0xdf, 0xe0, 0x54, 0x47, - 0xaf, 0x60, 0xfc, 0xa3, 0x19, 0x41, 0x82, 0x4e, 0x78, 0xe3, 0x26, 0x2a, 0x4f, 0x68, 0xab, 0x11, - 0x2d, 0xd8, 0x4b, 0xfd, 0x5e, 0xad, 0x3c, 0x21, 0x4e, 0x27, 0x73, 0xec, 0xc7, 0x67, 0x17, 0x66, - 0xe6, 0xfc, 0xc2, 0xcc, 0x7c, 0xbb, 0x30, 0x33, 0x1f, 0xfb, 0xa6, 0x71, 0xd6, 0x37, 0x8d, 0xf3, - 0xbe, 0x69, 0xfc, 0xe8, 0x9b, 0xc6, 0xe7, 0x4b, 0x33, 0xf3, 0xae, 0x38, 0xac, 0xf0, 0x77, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xa5, 0xb0, 0x36, 0xc9, 0x16, 0x07, 0x00, 0x00, + // 691 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4f, 0x4f, 0x13, 0x4f, + 0x18, 0xee, 0xb6, 0xa5, 0xb4, 0x53, 0x7e, 0xf0, 0xcb, 0xc4, 0x98, 0x4a, 0xc2, 0x96, 0x34, 0x6a, + 0xaa, 0x81, 0x59, 0x4b, 0x3c, 0x70, 0x34, 0x8b, 0x89, 0x21, 0x42, 0x88, 0x03, 0x24, 0x86, 0xdb, + 0x74, 0xfb, 0xb2, 0x1d, 0xcb, 0xfe, 0x61, 0x67, 0x96, 0x84, 0x9b, 0x47, 0x8f, 0xde, 0xfd, 0x20, + 0x7e, 0x05, 0x8e, 0x1c, 0x3d, 0x55, 0x29, 0x67, 0xbf, 0x80, 0x27, 0x33, 0xd3, 0xe9, 0x1f, 0x5b, + 0x0a, 0x9a, 0x70, 0xeb, 0xfb, 0xcc, 0xfb, 0x3e, 0xcf, 0xfb, 0xe7, 0xe9, 0xa2, 0x57, 0x9d, 0x4d, + 0x41, 0x78, 0xe4, 0x74, 0xd2, 0x26, 0x24, 0x21, 0x48, 0x10, 0x4e, 0xdc, 0xf1, 0x1d, 0x16, 0x73, + 0xe1, 0x78, 0x90, 0x48, 0x7e, 0xcc, 0x3d, 0xa6, 0xd0, 0xb3, 0x06, 0x3b, 0x89, 0xdb, 0xac, 0xe1, + 0xf8, 0x10, 0x42, 0xc2, 0x24, 0xb4, 0x48, 0x9c, 0x44, 0x32, 0xc2, 0x2f, 0xfa, 0x0c, 0x64, 0xc4, + 0x40, 0xe2, 0x8e, 0x4f, 0x14, 0x03, 0x19, 0x67, 0x20, 0x03, 0x86, 0xe5, 0x75, 0x9f, 0xcb, 0x76, + 0xda, 0x24, 0x5e, 0x14, 0x38, 0x7e, 0xe4, 0x47, 0x8e, 0x26, 0x6a, 0xa6, 0xc7, 0x3a, 0xd2, 0x81, + 0xfe, 0xd5, 0x17, 0x58, 0xde, 0x98, 0xd9, 0xa2, 0x93, 0x80, 0x88, 0xd2, 0xc4, 0x83, 0xc9, 0xa6, + 0x96, 0xd7, 0x66, 0xd7, 0x9c, 0x4d, 0x8d, 0x70, 0x8b, 0x82, 0x70, 0x02, 0x90, 0xec, 0xa6, 0x9a, + 0xf5, 0x9b, 0x6b, 0x92, 0x34, 0x94, 0x3c, 0x98, 0x6e, 0xe8, 0xe5, 0xed, 0xe9, 0xc2, 0x6b, 0x43, + 0xc0, 0xa6, 0xaa, 0x1a, 0x37, 0x57, 0xa5, 0x92, 0x9f, 0x38, 0x3c, 0x94, 0x42, 0x26, 0x93, 0x25, + 0xb5, 0xeb, 0x2c, 0x7a, 0xb4, 0x35, 0x5a, 0xfb, 0x3e, 0xf7, 0x43, 0x1e, 0xfa, 0x14, 0x4e, 0x53, + 0x10, 0x12, 0xbf, 0x47, 0x45, 0x35, 0x50, 0x8b, 0x49, 0x56, 0xb1, 0x56, 0xad, 0x7a, 0x79, 0xa3, + 0x4e, 0x66, 0xde, 0x8f, 0x9c, 0x35, 0xc8, 0x5e, 0xf3, 0x03, 0x78, 0x72, 0x17, 0x24, 0x73, 0xf1, + 0x45, 0xb7, 0x9a, 0xe9, 0x75, 0xab, 0x68, 0x84, 0xd1, 0x21, 0x1b, 0x3e, 0x45, 0x79, 0x11, 0x83, + 0x57, 0xc9, 0x6a, 0xd6, 0x3d, 0xf2, 0xaf, 0xae, 0x20, 0x33, 0x9b, 0xde, 0x8f, 0xc1, 0x73, 0x17, + 0x8c, 0x78, 0x5e, 0x45, 0x54, 0x4b, 0xe1, 0x73, 0x54, 0x10, 0x92, 0xc9, 0x54, 0x54, 0x72, 0x5a, + 0xf4, 0xdd, 0x7d, 0x8a, 0x6a, 0x62, 0x77, 0xd1, 0xc8, 0x16, 0xfa, 0x31, 0x35, 0x82, 0xb5, 0x2f, + 0x59, 0x54, 0x9b, 0x59, 0xbb, 0x15, 0x85, 0x2d, 0x2e, 0x79, 0x14, 0xe2, 0x4d, 0x94, 0x97, 0xe7, + 0x31, 0xe8, 0x55, 0x97, 0xdc, 0xc7, 0x83, 0x19, 0x0e, 0xce, 0x63, 0xf8, 0xd5, 0xad, 0x3e, 0x98, + 0xcc, 0x57, 0x38, 0xd5, 0x15, 0xf8, 0x29, 0x2a, 0x24, 0xc0, 0x44, 0x14, 0xea, 0x85, 0x96, 0x46, + 0x8d, 0x50, 0x8d, 0x52, 0xf3, 0x8a, 0x9f, 0xa1, 0xf9, 0x00, 0x84, 0x60, 0x3e, 0xe8, 0x25, 0x94, + 0xdc, 0x25, 0x93, 0x38, 0xbf, 0xdb, 0x87, 0xe9, 0xe0, 0x1d, 0xb7, 0xd1, 0xe2, 0x09, 0x13, 0xf2, + 0x30, 0x6e, 0x31, 0x09, 0x07, 0x3c, 0x80, 0x4a, 0xfe, 0x2e, 0x07, 0x08, 0xa2, 0xee, 0xab, 0x7c, + 0xa0, 0xf2, 0xdd, 0x87, 0x86, 0x7b, 0x71, 0xe7, 0x0f, 0x1e, 0x3a, 0xc1, 0x5b, 0xfb, 0x69, 0xa1, + 0x95, 0x99, 0xdb, 0xd9, 0xe1, 0x42, 0xe2, 0xa3, 0x29, 0x1f, 0xae, 0xfd, 0x4d, 0x17, 0xaa, 0x56, + 0x7b, 0xf1, 0x7f, 0xd3, 0x49, 0x71, 0x80, 0x8c, 0x39, 0x31, 0x46, 0x73, 0x5c, 0x42, 0x20, 0x2a, + 0xd9, 0xd5, 0x5c, 0xbd, 0xbc, 0xf1, 0xf6, 0x1e, 0x5d, 0xe1, 0xfe, 0x67, 0x74, 0xe7, 0xb6, 0x95, + 0x02, 0xed, 0x0b, 0xd5, 0xbe, 0xde, 0x36, 0xaf, 0x32, 0x2c, 0x7e, 0x82, 0xe6, 0x93, 0x7e, 0xa8, + 0xc7, 0x5d, 0x70, 0xcb, 0xea, 0x44, 0x26, 0x83, 0x0e, 0xde, 0xf0, 0x1a, 0x2a, 0xa6, 0x02, 0x92, + 0x90, 0x05, 0x60, 0xee, 0x3e, 0x1c, 0xf4, 0xd0, 0xe0, 0x74, 0x98, 0x81, 0x57, 0x50, 0x2e, 0xe5, + 0x2d, 0x73, 0xf7, 0xb2, 0x49, 0xcc, 0x1d, 0x6e, 0xbf, 0xa6, 0x0a, 0xc7, 0x35, 0x54, 0xf0, 0x93, + 0x28, 0x8d, 0x45, 0x25, 0xbf, 0x9a, 0xab, 0x97, 0x5c, 0xa4, 0xec, 0xf3, 0x46, 0x23, 0xd4, 0xbc, + 0xd4, 0xbe, 0x5b, 0xa8, 0x7a, 0xc7, 0x7f, 0x00, 0x7f, 0xb2, 0x10, 0xf2, 0x06, 0x16, 0x15, 0x15, + 0x4b, 0x6f, 0xf5, 0xe0, 0x1e, 0xb7, 0x3a, 0xf4, 0xff, 0xe8, 0x13, 0x33, 0x84, 0x04, 0x1d, 0xd3, + 0xc6, 0x0d, 0x54, 0x1e, 0xe3, 0xd6, 0x2b, 0x5a, 0x70, 0x97, 0x7a, 0xdd, 0x6a, 0x79, 0x8c, 0x9c, + 0x8e, 0xe7, 0xb8, 0xcf, 0x2f, 0xae, 0xec, 0xcc, 0xe5, 0x95, 0x9d, 0xf9, 0x76, 0x65, 0x67, 0x3e, + 0xf6, 0x6c, 0xeb, 0xa2, 0x67, 0x5b, 0x97, 0x3d, 0xdb, 0xfa, 0xd1, 0xb3, 0xad, 0xcf, 0xd7, 0x76, + 0xe6, 0xa8, 0x38, 0xe8, 0xf0, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x02, 0x0e, 0x3c, 0x0d, + 0x07, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/generated.proto index 6939a912fa3..ae88f9f6e9e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.certificates.v1alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -59,12 +59,12 @@ message CertificateSigningRequestCondition { // timestamp for the last update to this condition // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastUpdateTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastUpdateTime = 4; } message CertificateSigningRequestList { // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; repeated CertificateSigningRequest items = 2; } diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/register.go index a34b2ea99e2..e15957197d9 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/register.go @@ -18,6 +18,7 @@ package v1alpha1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -51,7 +52,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &CertificateSigningRequestList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, ) // Add the watch version that applies diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.generated.go index 78f2d6086b5..2f1512ab177 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -1253,7 +1253,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromMap(l int, d *co } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv104 := &x.LastUpdateTime yym105 := z.DecBinary() @@ -1342,7 +1342,7 @@ func (x *CertificateSigningRequestCondition) codecDecodeSelfFromArray(l int, d * } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv110 := &x.LastUpdateTime yym111 := z.DecBinary() @@ -1587,7 +1587,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromMap(l int, d *codec19 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv133 := &x.ListMeta yym134 := z.DecBinary() @@ -1668,7 +1668,7 @@ func (x *CertificateSigningRequestList) codecDecodeSelfFromArray(l int, d *codec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv140 := &x.ListMeta yym141 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.go index fb1a4d3415f..12cab362234 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -26,7 +26,7 @@ import ( // Describes a certificate signing request type CertificateSigningRequest struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -85,13 +85,13 @@ type CertificateSigningRequestCondition struct { Message string `json:"message,omitempty" protobuf:"bytes,3,opt,name=message"` // timestamp for the last update to this condition // +optional - LastUpdateTime unversioned.Time `json:"lastUpdateTime,omitempty" protobuf:"bytes,4,opt,name=lastUpdateTime"` + LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty" protobuf:"bytes,4,opt,name=lastUpdateTime"` } type CertificateSigningRequestList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` Items []CertificateSigningRequest `json:"items" protobuf:"bytes,2,rep,name=items"` } diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..f6991dff34f --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/zz_generated.deepcopy.go @@ -0,0 +1,145 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1alpha1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequest, InType: reflect.TypeOf(&CertificateSigningRequest{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestCondition, InType: reflect.TypeOf(&CertificateSigningRequestCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestList, InType: reflect.TypeOf(&CertificateSigningRequestList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestSpec, InType: reflect.TypeOf(&CertificateSigningRequestSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CertificateSigningRequestStatus, InType: reflect.TypeOf(&CertificateSigningRequestStatus{})}, + ) +} + +func DeepCopy_v1alpha1_CertificateSigningRequest(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequest) + out := out.(*CertificateSigningRequest) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1alpha1_CertificateSigningRequestSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1alpha1_CertificateSigningRequestStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1alpha1_CertificateSigningRequestCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequestCondition) + out := out.(*CertificateSigningRequestCondition) + out.Type = in.Type + out.Reason = in.Reason + out.Message = in.Message + out.LastUpdateTime = in.LastUpdateTime.DeepCopy() + return nil + } +} + +func DeepCopy_v1alpha1_CertificateSigningRequestList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequestList) + out := out.(*CertificateSigningRequestList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CertificateSigningRequest, len(*in)) + for i := range *in { + if err := DeepCopy_v1alpha1_CertificateSigningRequest(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_CertificateSigningRequestSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequestSpec) + out := out.(*CertificateSigningRequestSpec) + if in.Request != nil { + in, out := &in.Request, &out.Request + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Request = nil + } + out.Username = in.Username + out.UID = in.UID + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Groups = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_CertificateSigningRequestStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequestStatus) + out := out.(*CertificateSigningRequestStatus) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]CertificateSigningRequestCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v1alpha1_CertificateSigningRequestCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.Certificate != nil { + in, out := &in.Certificate, &out.Certificate + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Certificate = nil + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go new file mode 100644 index 00000000000..6b4580c01cd --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/zz_generated.deepcopy.go @@ -0,0 +1,145 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package certificates + +import ( + api "k8s.io/client-go/pkg/api" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequest, InType: reflect.TypeOf(&CertificateSigningRequest{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestCondition, InType: reflect.TypeOf(&CertificateSigningRequestCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestList, InType: reflect.TypeOf(&CertificateSigningRequestList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestSpec, InType: reflect.TypeOf(&CertificateSigningRequestSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_certificates_CertificateSigningRequestStatus, InType: reflect.TypeOf(&CertificateSigningRequestStatus{})}, + ) +} + +func DeepCopy_certificates_CertificateSigningRequest(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequest) + out := out.(*CertificateSigningRequest) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_certificates_CertificateSigningRequestSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_certificates_CertificateSigningRequestStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_certificates_CertificateSigningRequestCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequestCondition) + out := out.(*CertificateSigningRequestCondition) + out.Type = in.Type + out.Reason = in.Reason + out.Message = in.Message + out.LastUpdateTime = in.LastUpdateTime.DeepCopy() + return nil + } +} + +func DeepCopy_certificates_CertificateSigningRequestList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequestList) + out := out.(*CertificateSigningRequestList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CertificateSigningRequest, len(*in)) + for i := range *in { + if err := DeepCopy_certificates_CertificateSigningRequest(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_certificates_CertificateSigningRequestSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequestSpec) + out := out.(*CertificateSigningRequestSpec) + if in.Request != nil { + in, out := &in.Request, &out.Request + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Request = nil + } + out.Username = in.Username + out.UID = in.UID + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Groups = nil + } + return nil + } +} + +func DeepCopy_certificates_CertificateSigningRequestStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CertificateSigningRequestStatus) + out := out.(*CertificateSigningRequestStatus) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]CertificateSigningRequestCondition, len(*in)) + for i := range *in { + if err := DeepCopy_certificates_CertificateSigningRequestCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.Certificate != nil { + in, out := &in.Certificate, &out.Certificate + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Certificate = nil + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/OWNERS new file mode 100755 index 00000000000..1c3f47f47d2 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/OWNERS @@ -0,0 +1,41 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- deads2k +- yujuhong +- derekwaynecarr +- caesarxuchao +- vishh +- mikedanese +- liggitt +- nikhiljindal +- bprashanth +- gmarek +- sttts +- dchen1107 +- saad-ali +- luxas +- justinsb +- pwittrock +- ncdc +- yifan-gu +- mwielgus +- timothysc +- feiskyer +- dims +- errordeveloper +- mtaufen +- markturansky +- freehan +- mml +- ingvagabund +- cjcullen +- mbohlool +- jessfraz +- david-mcmahon +- therc +- '249043822' +- mqliang +- mfanjie diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/types.generated.go index ba4d8fb89de..b9d528f0a4e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/types.generated.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg2_config "k8s.io/client-go/pkg/util/config" "reflect" "runtime" @@ -62,7 +62,7 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta + var v0 pkg1_v1.TypeMeta var v1 pkg2_config.ConfigurationMap var v2 time.Duration _, _, _ = v0, v1, v2 @@ -721,7 +721,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "iptablesSyncPeriodSeconds": if r.TryDecodeAsNil() { - x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesSyncPeriod = pkg1_v1.Duration{} } else { yyv96 := &x.IPTablesSyncPeriod yym97 := z.DecBinary() @@ -736,7 +736,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "iptablesMinSyncPeriodSeconds": if r.TryDecodeAsNil() { - x.IPTablesMinSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesMinSyncPeriod = pkg1_v1.Duration{} } else { yyv98 := &x.IPTablesMinSyncPeriod yym99 := z.DecBinary() @@ -803,7 +803,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "udpTimeoutMilliseconds": if r.TryDecodeAsNil() { - x.UDPIdleTimeout = pkg1_unversioned.Duration{} + x.UDPIdleTimeout = pkg1_v1.Duration{} } else { yyv108 := &x.UDPIdleTimeout yym109 := z.DecBinary() @@ -836,7 +836,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "conntrackTCPEstablishedTimeout": if r.TryDecodeAsNil() { - x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPEstablishedTimeout = pkg1_v1.Duration{} } else { yyv113 := &x.ConntrackTCPEstablishedTimeout yym114 := z.DecBinary() @@ -851,7 +851,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "conntrackTCPCloseWaitTimeout": if r.TryDecodeAsNil() { - x.ConntrackTCPCloseWaitTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPCloseWaitTimeout = pkg1_v1.Duration{} } else { yyv115 := &x.ConntrackTCPCloseWaitTimeout yym116 := z.DecBinary() @@ -1028,7 +1028,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.IPTablesSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesSyncPeriod = pkg1_v1.Duration{} } else { yyv127 := &x.IPTablesSyncPeriod yym128 := z.DecBinary() @@ -1053,7 +1053,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.IPTablesMinSyncPeriod = pkg1_unversioned.Duration{} + x.IPTablesMinSyncPeriod = pkg1_v1.Duration{} } else { yyv129 := &x.IPTablesMinSyncPeriod yym130 := z.DecBinary() @@ -1200,7 +1200,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.UDPIdleTimeout = pkg1_unversioned.Duration{} + x.UDPIdleTimeout = pkg1_v1.Duration{} } else { yyv139 := &x.UDPIdleTimeout yym140 := z.DecBinary() @@ -1273,7 +1273,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ConntrackTCPEstablishedTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPEstablishedTimeout = pkg1_v1.Duration{} } else { yyv144 := &x.ConntrackTCPEstablishedTimeout yym145 := z.DecBinary() @@ -1298,7 +1298,7 @@ func (x *KubeProxyConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ConntrackTCPCloseWaitTimeout = pkg1_unversioned.Duration{} + x.ConntrackTCPCloseWaitTimeout = pkg1_v1.Duration{} } else { yyv146 := &x.ConntrackTCPCloseWaitTimeout yym147 := z.DecBinary() @@ -3958,7 +3958,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "syncFrequency": if r.TryDecodeAsNil() { - x.SyncFrequency = pkg1_unversioned.Duration{} + x.SyncFrequency = pkg1_v1.Duration{} } else { yyv521 := &x.SyncFrequency yym522 := z.DecBinary() @@ -3973,7 +3973,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "fileCheckFrequency": if r.TryDecodeAsNil() { - x.FileCheckFrequency = pkg1_unversioned.Duration{} + x.FileCheckFrequency = pkg1_v1.Duration{} } else { yyv523 := &x.FileCheckFrequency yym524 := z.DecBinary() @@ -3988,7 +3988,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "httpCheckFrequency": if r.TryDecodeAsNil() { - x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + x.HTTPCheckFrequency = pkg1_v1.Duration{} } else { yyv525 := &x.HTTPCheckFrequency yym526 := z.DecBinary() @@ -4173,7 +4173,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "minimumGCAge": if r.TryDecodeAsNil() { - x.MinimumGCAge = pkg1_unversioned.Duration{} + x.MinimumGCAge = pkg1_v1.Duration{} } else { yyv555 := &x.MinimumGCAge yym556 := z.DecBinary() @@ -4248,7 +4248,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "streamingConnectionIdleTimeout": if r.TryDecodeAsNil() { - x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} + x.StreamingConnectionIdleTimeout = pkg1_v1.Duration{} } else { yyv567 := &x.StreamingConnectionIdleTimeout yym568 := z.DecBinary() @@ -4263,7 +4263,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "nodeStatusUpdateFrequency": if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} + x.NodeStatusUpdateFrequency = pkg1_v1.Duration{} } else { yyv569 := &x.NodeStatusUpdateFrequency yym570 := z.DecBinary() @@ -4278,7 +4278,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "imageMinimumGCAge": if r.TryDecodeAsNil() { - x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + x.ImageMinimumGCAge = pkg1_v1.Duration{} } else { yyv571 := &x.ImageMinimumGCAge yym572 := z.DecBinary() @@ -4311,7 +4311,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "volumeStatsAggPeriod": if r.TryDecodeAsNil() { - x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} + x.VolumeStatsAggPeriod = pkg1_v1.Duration{} } else { yyv576 := &x.VolumeStatsAggPeriod yym577 := z.DecBinary() @@ -4428,7 +4428,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "runtimeRequestTimeout": if r.TryDecodeAsNil() { - x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} + x.RuntimeRequestTimeout = pkg1_v1.Duration{} } else { yyv595 := &x.RuntimeRequestTimeout yym596 := z.DecBinary() @@ -4575,7 +4575,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "outOfDiskTransitionFrequency": if r.TryDecodeAsNil() { - x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} + x.OutOfDiskTransitionFrequency = pkg1_v1.Duration{} } else { yyv619 := &x.OutOfDiskTransitionFrequency yym620 := z.DecBinary() @@ -4638,7 +4638,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decode } case "evictionPressureTransitionPeriod": if r.TryDecodeAsNil() { - x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} + x.EvictionPressureTransitionPeriod = pkg1_v1.Duration{} } else { yyv629 := &x.EvictionPressureTransitionPeriod yym630 := z.DecBinary() @@ -4835,7 +4835,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.SyncFrequency = pkg1_unversioned.Duration{} + x.SyncFrequency = pkg1_v1.Duration{} } else { yyv653 := &x.SyncFrequency yym654 := z.DecBinary() @@ -4860,7 +4860,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.FileCheckFrequency = pkg1_unversioned.Duration{} + x.FileCheckFrequency = pkg1_v1.Duration{} } else { yyv655 := &x.FileCheckFrequency yym656 := z.DecBinary() @@ -4885,7 +4885,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.HTTPCheckFrequency = pkg1_unversioned.Duration{} + x.HTTPCheckFrequency = pkg1_v1.Duration{} } else { yyv657 := &x.HTTPCheckFrequency yym658 := z.DecBinary() @@ -5330,7 +5330,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.MinimumGCAge = pkg1_unversioned.Duration{} + x.MinimumGCAge = pkg1_v1.Duration{} } else { yyv687 := &x.MinimumGCAge yym688 := z.DecBinary() @@ -5515,7 +5515,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.StreamingConnectionIdleTimeout = pkg1_unversioned.Duration{} + x.StreamingConnectionIdleTimeout = pkg1_v1.Duration{} } else { yyv699 := &x.StreamingConnectionIdleTimeout yym700 := z.DecBinary() @@ -5540,7 +5540,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeStatusUpdateFrequency = pkg1_unversioned.Duration{} + x.NodeStatusUpdateFrequency = pkg1_v1.Duration{} } else { yyv701 := &x.NodeStatusUpdateFrequency yym702 := z.DecBinary() @@ -5565,7 +5565,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ImageMinimumGCAge = pkg1_unversioned.Duration{} + x.ImageMinimumGCAge = pkg1_v1.Duration{} } else { yyv703 := &x.ImageMinimumGCAge yym704 := z.DecBinary() @@ -5638,7 +5638,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.VolumeStatsAggPeriod = pkg1_unversioned.Duration{} + x.VolumeStatsAggPeriod = pkg1_v1.Duration{} } else { yyv708 := &x.VolumeStatsAggPeriod yym709 := z.DecBinary() @@ -5935,7 +5935,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RuntimeRequestTimeout = pkg1_unversioned.Duration{} + x.RuntimeRequestTimeout = pkg1_v1.Duration{} } else { yyv727 := &x.RuntimeRequestTimeout yym728 := z.DecBinary() @@ -6312,7 +6312,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.OutOfDiskTransitionFrequency = pkg1_unversioned.Duration{} + x.OutOfDiskTransitionFrequency = pkg1_v1.Duration{} } else { yyv751 := &x.OutOfDiskTransitionFrequency yym752 := z.DecBinary() @@ -6455,7 +6455,7 @@ func (x *KubeletConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Deco } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.EvictionPressureTransitionPeriod = pkg1_unversioned.Duration{} + x.EvictionPressureTransitionPeriod = pkg1_v1.Duration{} } else { yyv761 := &x.EvictionPressureTransitionPeriod yym762 := z.DecBinary() @@ -7104,7 +7104,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromMap(l int, d *codec1978 switch yys811 { case "cacheAuthorizedTTL": if r.TryDecodeAsNil() { - x.CacheAuthorizedTTL = pkg1_unversioned.Duration{} + x.CacheAuthorizedTTL = pkg1_v1.Duration{} } else { yyv812 := &x.CacheAuthorizedTTL yym813 := z.DecBinary() @@ -7119,7 +7119,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromMap(l int, d *codec1978 } case "cacheUnauthorizedTTL": if r.TryDecodeAsNil() { - x.CacheUnauthorizedTTL = pkg1_unversioned.Duration{} + x.CacheUnauthorizedTTL = pkg1_v1.Duration{} } else { yyv814 := &x.CacheUnauthorizedTTL yym815 := z.DecBinary() @@ -7158,7 +7158,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CacheAuthorizedTTL = pkg1_unversioned.Duration{} + x.CacheAuthorizedTTL = pkg1_v1.Duration{} } else { yyv817 := &x.CacheAuthorizedTTL yym818 := z.DecBinary() @@ -7183,7 +7183,7 @@ func (x *KubeletWebhookAuthorization) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CacheUnauthorizedTTL = pkg1_unversioned.Duration{} + x.CacheUnauthorizedTTL = pkg1_v1.Duration{} } else { yyv819 := &x.CacheUnauthorizedTTL yym820 := z.DecBinary() @@ -7745,7 +7745,7 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromMap(l int, d *codec197 } case "cacheTTL": if r.TryDecodeAsNil() { - x.CacheTTL = pkg1_unversioned.Duration{} + x.CacheTTL = pkg1_v1.Duration{} } else { yyv867 := &x.CacheTTL yym868 := z.DecBinary() @@ -7800,7 +7800,7 @@ func (x *KubeletWebhookAuthentication) codecDecodeSelfFromArray(l int, d *codec1 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CacheTTL = pkg1_unversioned.Duration{} + x.CacheTTL = pkg1_v1.Duration{} } else { yyv871 := &x.CacheTTL yym872 := z.DecBinary() @@ -8005,16 +8005,16 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep885 := !z.EncBinary() yy2arr885 := z.EncBasicHandle().StructToArray - var yyq885 [14]bool + var yyq885 [15]bool _, _, _ = yysep885, yyq885, yy2arr885 const yyr885 bool = false yyq885[0] = x.Kind != "" yyq885[1] = x.APIVersion != "" var yynn885 int if yyr885 || yy2arr885 { - r.EncodeArrayStart(14) + r.EncodeArrayStart(15) } else { - yynn885 = 12 + yynn885 = 13 for _, b := range yyq885 { if b { yynn885++ @@ -8174,17 +8174,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym908 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) + r.EncodeBool(bool(x.EnableContentionProfiling)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("contentType")) + r.EncodeString(codecSelferC_UTF81234, string("enableContentionProfiling")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym909 := z.EncBinary() _ = yym909 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) + r.EncodeBool(bool(x.EnableContentionProfiling)) } } if yyr885 || yy2arr885 { @@ -8193,17 +8193,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym911 if false { } else { - r.EncodeFloat32(float32(x.KubeAPIQPS)) + r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) + r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym912 := z.EncBinary() _ = yym912 if false { } else { - r.EncodeFloat32(float32(x.KubeAPIQPS)) + r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } if yyr885 || yy2arr885 { @@ -8212,17 +8212,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym914 if false { } else { - r.EncodeInt(int64(x.KubeAPIBurst)) + r.EncodeFloat32(float32(x.KubeAPIQPS)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) + r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym915 := z.EncBinary() _ = yym915 if false { } else { - r.EncodeInt(int64(x.KubeAPIBurst)) + r.EncodeFloat32(float32(x.KubeAPIQPS)) } } if yyr885 || yy2arr885 { @@ -8231,17 +8231,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym917 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) + r.EncodeInt(int64(x.KubeAPIBurst)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("schedulerName")) + r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym918 := z.EncBinary() _ = yym918 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) + r.EncodeInt(int64(x.KubeAPIBurst)) } } if yyr885 || yy2arr885 { @@ -8250,17 +8250,17 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym920 if false { } else { - r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) + r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("hardPodAffinitySymmetricWeight")) + r.EncodeString(codecSelferC_UTF81234, string("schedulerName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) yym921 := z.EncBinary() _ = yym921 if false { } else { - r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) + r.EncodeString(codecSelferC_UTF81234, string(x.SchedulerName)) } } if yyr885 || yy2arr885 { @@ -8268,6 +8268,25 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { yym923 := z.EncBinary() _ = yym923 if false { + } else { + r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("hardPodAffinitySymmetricWeight")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym924 := z.EncBinary() + _ = yym924 + if false { + } else { + r.EncodeInt(int64(x.HardPodAffinitySymmetricWeight)) + } + } + if yyr885 || yy2arr885 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym926 := z.EncBinary() + _ = yym926 + if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FailureDomains)) } @@ -8275,8 +8294,8 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("failureDomains")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym924 := z.EncBinary() - _ = yym924 + yym927 := z.EncBinary() + _ = yym927 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FailureDomains)) @@ -8284,14 +8303,14 @@ func (x *KubeSchedulerConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr885 || yy2arr885 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy926 := &x.LeaderElection - yy926.CodecEncodeSelf(e) + yy929 := &x.LeaderElection + yy929.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy927 := &x.LeaderElection - yy927.CodecEncodeSelf(e) + yy930 := &x.LeaderElection + yy930.CodecEncodeSelf(e) } if yyr885 || yy2arr885 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) @@ -8306,25 +8325,25 @@ func (x *KubeSchedulerConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym928 := z.DecBinary() - _ = yym928 + yym931 := z.DecBinary() + _ = yym931 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct929 := r.ContainerType() - if yyct929 == codecSelferValueTypeMap1234 { - yyl929 := r.ReadMapStart() - if yyl929 == 0 { + yyct932 := r.ContainerType() + if yyct932 == codecSelferValueTypeMap1234 { + yyl932 := r.ReadMapStart() + if yyl932 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl929, d) + x.codecDecodeSelfFromMap(yyl932, d) } - } else if yyct929 == codecSelferValueTypeArray1234 { - yyl929 := r.ReadArrayStart() - if yyl929 == 0 { + } else if yyct932 == codecSelferValueTypeArray1234 { + yyl932 := r.ReadArrayStart() + if yyl932 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl929, d) + x.codecDecodeSelfFromArray(yyl932, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -8336,12 +8355,12 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys930Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys930Slc - var yyhl930 bool = l >= 0 - for yyj930 := 0; ; yyj930++ { - if yyhl930 { - if yyj930 >= l { + var yys933Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys933Slc + var yyhl933 bool = l >= 0 + for yyj933 := 0; ; yyj933++ { + if yyhl933 { + if yyj933 >= l { break } } else { @@ -8350,10 +8369,10 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys930Slc = r.DecodeBytes(yys930Slc, true, true) - yys930 := string(yys930Slc) + yys933Slc = r.DecodeBytes(yys933Slc, true, true) + yys933 := string(yys933Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys930 { + switch yys933 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -8396,6 +8415,12 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. } else { x.EnableProfiling = bool(r.DecodeBool()) } + case "enableContentionProfiling": + if r.TryDecodeAsNil() { + x.EnableContentionProfiling = false + } else { + x.EnableContentionProfiling = bool(r.DecodeBool()) + } case "contentType": if r.TryDecodeAsNil() { x.ContentType = "" @@ -8436,13 +8461,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromMap(l int, d *codec1978. if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv944 := &x.LeaderElection - yyv944.CodecDecodeSelf(d) + yyv948 := &x.LeaderElection + yyv948.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys930) - } // end switch yys930 - } // end for yyj930 + z.DecStructFieldNotFound(-1, yys933) + } // end switch yys933 + } // end for yyj933 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -8450,16 +8475,16 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj945 int - var yyb945 bool - var yyhl945 bool = l >= 0 - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + var yyj949 int + var yyb949 bool + var yyhl949 bool = l >= 0 + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8469,13 +8494,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Kind = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8485,13 +8510,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.APIVersion = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8501,13 +8526,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Port = int32(r.DecodeInt(32)) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8517,13 +8542,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.Address = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8533,13 +8558,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.AlgorithmProvider = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8549,13 +8574,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.PolicyConfigFile = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8565,13 +8590,29 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.EnableProfiling = bool(r.DecodeBool()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.EnableContentionProfiling = false + } else { + x.EnableContentionProfiling = bool(r.DecodeBool()) + } + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l + } else { + yyb949 = r.CheckBreak() + } + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8581,13 +8622,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.ContentType = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8597,13 +8638,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8613,13 +8654,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8629,13 +8670,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.SchedulerName = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8645,13 +8686,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.HardPodAffinitySymmetricWeight = int(r.DecodeInt(codecSelferBitsize1234)) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8661,13 +8702,13 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 } else { x.FailureDomains = string(r.DecodeString()) } - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8675,21 +8716,21 @@ func (x *KubeSchedulerConfiguration) codecDecodeSelfFromArray(l int, d *codec197 if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv959 := &x.LeaderElection - yyv959.CodecDecodeSelf(d) + yyv964 := &x.LeaderElection + yyv964.CodecDecodeSelf(d) } for { - yyj945++ - if yyhl945 { - yyb945 = yyj945 > l + yyj949++ + if yyhl949 { + yyb949 = yyj949 > l } else { - yyb945 = r.CheckBreak() + yyb949 = r.CheckBreak() } - if yyb945 { + if yyb949 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj945-1, "") + z.DecStructFieldNotFound(yyj949-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -8701,33 +8742,33 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym960 := z.EncBinary() - _ = yym960 + yym965 := z.EncBinary() + _ = yym965 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep961 := !z.EncBinary() - yy2arr961 := z.EncBasicHandle().StructToArray - var yyq961 [4]bool - _, _, _ = yysep961, yyq961, yy2arr961 - const yyr961 bool = false - var yynn961 int - if yyr961 || yy2arr961 { + yysep966 := !z.EncBinary() + yy2arr966 := z.EncBasicHandle().StructToArray + var yyq966 [4]bool + _, _, _ = yysep966, yyq966, yy2arr966 + const yyr966 bool = false + var yynn966 int + if yyr966 || yy2arr966 { r.EncodeArrayStart(4) } else { - yynn961 = 4 - for _, b := range yyq961 { + yynn966 = 4 + for _, b := range yyq966 { if b { - yynn961++ + yynn966++ } } - r.EncodeMapStart(yynn961) - yynn961 = 0 + r.EncodeMapStart(yynn966) + yynn966 = 0 } - if yyr961 || yy2arr961 { + if yyr966 || yy2arr966 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym963 := z.EncBinary() - _ = yym963 + yym968 := z.EncBinary() + _ = yym968 if false { } else { r.EncodeBool(bool(x.LeaderElect)) @@ -8736,43 +8777,16 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElect")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym964 := z.EncBinary() - _ = yym964 + yym969 := z.EncBinary() + _ = yym969 if false { } else { r.EncodeBool(bool(x.LeaderElect)) } } - if yyr961 || yy2arr961 { + if yyr966 || yy2arr966 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy966 := &x.LeaseDuration - yym967 := z.EncBinary() - _ = yym967 - if false { - } else if z.HasExtensions() && z.EncExt(yy966) { - } else if !yym967 && z.IsJSONHandle() { - z.EncJSONMarshal(yy966) - } else { - z.EncFallback(yy966) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("leaseDuration")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy968 := &x.LeaseDuration - yym969 := z.EncBinary() - _ = yym969 - if false { - } else if z.HasExtensions() && z.EncExt(yy968) { - } else if !yym969 && z.IsJSONHandle() { - z.EncJSONMarshal(yy968) - } else { - z.EncFallback(yy968) - } - } - if yyr961 || yy2arr961 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy971 := &x.RenewDeadline + yy971 := &x.LeaseDuration yym972 := z.EncBinary() _ = yym972 if false { @@ -8784,9 +8798,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("renewDeadline")) + r.EncodeString(codecSelferC_UTF81234, string("leaseDuration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy973 := &x.RenewDeadline + yy973 := &x.LeaseDuration yym974 := z.EncBinary() _ = yym974 if false { @@ -8797,9 +8811,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy973) } } - if yyr961 || yy2arr961 { + if yyr966 || yy2arr966 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy976 := &x.RetryPeriod + yy976 := &x.RenewDeadline yym977 := z.EncBinary() _ = yym977 if false { @@ -8811,9 +8825,9 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("retryPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("renewDeadline")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy978 := &x.RetryPeriod + yy978 := &x.RenewDeadline yym979 := z.EncBinary() _ = yym979 if false { @@ -8824,7 +8838,34 @@ func (x *LeaderElectionConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncFallback(yy978) } } - if yyr961 || yy2arr961 { + if yyr966 || yy2arr966 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yy981 := &x.RetryPeriod + yym982 := z.EncBinary() + _ = yym982 + if false { + } else if z.HasExtensions() && z.EncExt(yy981) { + } else if !yym982 && z.IsJSONHandle() { + z.EncJSONMarshal(yy981) + } else { + z.EncFallback(yy981) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("retryPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy983 := &x.RetryPeriod + yym984 := z.EncBinary() + _ = yym984 + if false { + } else if z.HasExtensions() && z.EncExt(yy983) { + } else if !yym984 && z.IsJSONHandle() { + z.EncJSONMarshal(yy983) + } else { + z.EncFallback(yy983) + } + } + if yyr966 || yy2arr966 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -8837,25 +8878,25 @@ func (x *LeaderElectionConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym980 := z.DecBinary() - _ = yym980 + yym985 := z.DecBinary() + _ = yym985 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct981 := r.ContainerType() - if yyct981 == codecSelferValueTypeMap1234 { - yyl981 := r.ReadMapStart() - if yyl981 == 0 { + yyct986 := r.ContainerType() + if yyct986 == codecSelferValueTypeMap1234 { + yyl986 := r.ReadMapStart() + if yyl986 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl981, d) + x.codecDecodeSelfFromMap(yyl986, d) } - } else if yyct981 == codecSelferValueTypeArray1234 { - yyl981 := r.ReadArrayStart() - if yyl981 == 0 { + } else if yyct986 == codecSelferValueTypeArray1234 { + yyl986 := r.ReadArrayStart() + if yyl986 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl981, d) + x.codecDecodeSelfFromArray(yyl986, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -8867,12 +8908,12 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys982Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys982Slc - var yyhl982 bool = l >= 0 - for yyj982 := 0; ; yyj982++ { - if yyhl982 { - if yyj982 >= l { + var yys987Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys987Slc + var yyhl987 bool = l >= 0 + for yyj987 := 0; ; yyj987++ { + if yyhl987 { + if yyj987 >= l { break } } else { @@ -8881,10 +8922,10 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys982Slc = r.DecodeBytes(yys982Slc, true, true) - yys982 := string(yys982Slc) + yys987Slc = r.DecodeBytes(yys987Slc, true, true) + yys987 := string(yys987Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys982 { + switch yys987 { case "leaderElect": if r.TryDecodeAsNil() { x.LeaderElect = false @@ -8893,53 +8934,53 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromMap(l int, d *codec1978 } case "leaseDuration": if r.TryDecodeAsNil() { - x.LeaseDuration = pkg1_unversioned.Duration{} + x.LeaseDuration = pkg1_v1.Duration{} } else { - yyv984 := &x.LeaseDuration - yym985 := z.DecBinary() - _ = yym985 + yyv989 := &x.LeaseDuration + yym990 := z.DecBinary() + _ = yym990 if false { - } else if z.HasExtensions() && z.DecExt(yyv984) { - } else if !yym985 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv984) + } else if z.HasExtensions() && z.DecExt(yyv989) { + } else if !yym990 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv989) } else { - z.DecFallback(yyv984, false) + z.DecFallback(yyv989, false) } } case "renewDeadline": if r.TryDecodeAsNil() { - x.RenewDeadline = pkg1_unversioned.Duration{} + x.RenewDeadline = pkg1_v1.Duration{} } else { - yyv986 := &x.RenewDeadline - yym987 := z.DecBinary() - _ = yym987 + yyv991 := &x.RenewDeadline + yym992 := z.DecBinary() + _ = yym992 if false { - } else if z.HasExtensions() && z.DecExt(yyv986) { - } else if !yym987 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv986) + } else if z.HasExtensions() && z.DecExt(yyv991) { + } else if !yym992 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv991) } else { - z.DecFallback(yyv986, false) + z.DecFallback(yyv991, false) } } case "retryPeriod": if r.TryDecodeAsNil() { - x.RetryPeriod = pkg1_unversioned.Duration{} + x.RetryPeriod = pkg1_v1.Duration{} } else { - yyv988 := &x.RetryPeriod - yym989 := z.DecBinary() - _ = yym989 + yyv993 := &x.RetryPeriod + yym994 := z.DecBinary() + _ = yym994 if false { - } else if z.HasExtensions() && z.DecExt(yyv988) { - } else if !yym989 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv988) + } else if z.HasExtensions() && z.DecExt(yyv993) { + } else if !yym994 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv993) } else { - z.DecFallback(yyv988, false) + z.DecFallback(yyv993, false) } } default: - z.DecStructFieldNotFound(-1, yys982) - } // end switch yys982 - } // end for yyj982 + z.DecStructFieldNotFound(-1, yys987) + } // end switch yys987 + } // end for yyj987 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -8947,16 +8988,16 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj990 int - var yyb990 bool - var yyhl990 bool = l >= 0 - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + var yyj995 int + var yyb995 bool + var yyhl995 bool = l >= 0 + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -8966,93 +9007,93 @@ func (x *LeaderElectionConfiguration) codecDecodeSelfFromArray(l int, d *codec19 } else { x.LeaderElect = bool(r.DecodeBool()) } - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LeaseDuration = pkg1_unversioned.Duration{} + x.LeaseDuration = pkg1_v1.Duration{} } else { - yyv992 := &x.LeaseDuration - yym993 := z.DecBinary() - _ = yym993 + yyv997 := &x.LeaseDuration + yym998 := z.DecBinary() + _ = yym998 if false { - } else if z.HasExtensions() && z.DecExt(yyv992) { - } else if !yym993 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv992) + } else if z.HasExtensions() && z.DecExt(yyv997) { + } else if !yym998 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv997) } else { - z.DecFallback(yyv992, false) + z.DecFallback(yyv997, false) } } - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RenewDeadline = pkg1_unversioned.Duration{} + x.RenewDeadline = pkg1_v1.Duration{} } else { - yyv994 := &x.RenewDeadline - yym995 := z.DecBinary() - _ = yym995 + yyv999 := &x.RenewDeadline + yym1000 := z.DecBinary() + _ = yym1000 if false { - } else if z.HasExtensions() && z.DecExt(yyv994) { - } else if !yym995 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv994) + } else if z.HasExtensions() && z.DecExt(yyv999) { + } else if !yym1000 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv999) } else { - z.DecFallback(yyv994, false) + z.DecFallback(yyv999, false) } } - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RetryPeriod = pkg1_unversioned.Duration{} + x.RetryPeriod = pkg1_v1.Duration{} } else { - yyv996 := &x.RetryPeriod - yym997 := z.DecBinary() - _ = yym997 + yyv1001 := &x.RetryPeriod + yym1002 := z.DecBinary() + _ = yym1002 if false { - } else if z.HasExtensions() && z.DecExt(yyv996) { - } else if !yym997 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv996) + } else if z.HasExtensions() && z.DecExt(yyv1001) { + } else if !yym1002 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1001) } else { - z.DecFallback(yyv996, false) + z.DecFallback(yyv1001, false) } } for { - yyj990++ - if yyhl990 { - yyb990 = yyj990 > l + yyj995++ + if yyhl995 { + yyb995 = yyj995 > l } else { - yyb990 = r.CheckBreak() + yyb995 = r.CheckBreak() } - if yyb990 { + if yyb995 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj990-1, "") + z.DecStructFieldNotFound(yyj995-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -9064,36 +9105,36 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode if x == nil { r.EncodeNil() } else { - yym998 := z.EncBinary() - _ = yym998 + yym1003 := z.EncBinary() + _ = yym1003 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep999 := !z.EncBinary() - yy2arr999 := z.EncBasicHandle().StructToArray - var yyq999 [61]bool - _, _, _ = yysep999, yyq999, yy2arr999 - const yyr999 bool = false - yyq999[0] = x.Kind != "" - yyq999[1] = x.APIVersion != "" - var yynn999 int - if yyr999 || yy2arr999 { + yysep1004 := !z.EncBinary() + yy2arr1004 := z.EncBasicHandle().StructToArray + var yyq1004 [61]bool + _, _, _ = yysep1004, yyq1004, yy2arr1004 + const yyr1004 bool = false + yyq1004[0] = x.Kind != "" + yyq1004[1] = x.APIVersion != "" + var yynn1004 int + if yyr1004 || yy2arr1004 { r.EncodeArrayStart(61) } else { - yynn999 = 59 - for _, b := range yyq999 { + yynn1004 = 59 + for _, b := range yyq1004 { if b { - yynn999++ + yynn1004++ } } - r.EncodeMapStart(yynn999) - yynn999 = 0 + r.EncodeMapStart(yynn1004) + yynn1004 = 0 } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq999[0] { - yym1001 := z.EncBinary() - _ = yym1001 + if yyq1004[0] { + yym1006 := z.EncBinary() + _ = yym1006 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -9102,23 +9143,23 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq999[0] { + if yyq1004[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1002 := z.EncBinary() - _ = yym1002 + yym1007 := z.EncBinary() + _ = yym1007 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq999[1] { - yym1004 := z.EncBinary() - _ = yym1004 + if yyq1004[1] { + yym1009 := z.EncBinary() + _ = yym1009 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -9127,22 +9168,22 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq999[1] { + if yyq1004[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1005 := z.EncBinary() - _ = yym1005 + yym1010 := z.EncBinary() + _ = yym1010 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1007 := z.EncBinary() - _ = yym1007 + yym1012 := z.EncBinary() + _ = yym1012 if false { } else { r.EncodeInt(int64(x.Port)) @@ -9151,17 +9192,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1008 := z.EncBinary() - _ = yym1008 + yym1013 := z.EncBinary() + _ = yym1013 if false { } else { r.EncodeInt(int64(x.Port)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1010 := z.EncBinary() - _ = yym1010 + yym1015 := z.EncBinary() + _ = yym1015 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) @@ -9170,17 +9211,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("address")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1011 := z.EncBinary() - _ = yym1011 + yym1016 := z.EncBinary() + _ = yym1016 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Address)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1013 := z.EncBinary() - _ = yym1013 + yym1018 := z.EncBinary() + _ = yym1018 if false { } else { r.EncodeBool(bool(x.UseServiceAccountCredentials)) @@ -9189,17 +9230,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("useServiceAccountCredentials")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1014 := z.EncBinary() - _ = yym1014 + yym1019 := z.EncBinary() + _ = yym1019 if false { } else { r.EncodeBool(bool(x.UseServiceAccountCredentials)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1016 := z.EncBinary() - _ = yym1016 + yym1021 := z.EncBinary() + _ = yym1021 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) @@ -9208,17 +9249,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudProvider")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1017 := z.EncBinary() - _ = yym1017 + yym1022 := z.EncBinary() + _ = yym1022 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudProvider)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1019 := z.EncBinary() - _ = yym1019 + yym1024 := z.EncBinary() + _ = yym1024 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) @@ -9227,17 +9268,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("cloudConfigFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1020 := z.EncBinary() - _ = yym1020 + yym1025 := z.EncBinary() + _ = yym1025 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.CloudConfigFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1022 := z.EncBinary() - _ = yym1022 + yym1027 := z.EncBinary() + _ = yym1027 if false { } else { r.EncodeInt(int64(x.ConcurrentEndpointSyncs)) @@ -9246,17 +9287,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentEndpointSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1023 := z.EncBinary() - _ = yym1023 + yym1028 := z.EncBinary() + _ = yym1028 if false { } else { r.EncodeInt(int64(x.ConcurrentEndpointSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1025 := z.EncBinary() - _ = yym1025 + yym1030 := z.EncBinary() + _ = yym1030 if false { } else { r.EncodeInt(int64(x.ConcurrentRSSyncs)) @@ -9265,17 +9306,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentRSSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1026 := z.EncBinary() - _ = yym1026 + yym1031 := z.EncBinary() + _ = yym1031 if false { } else { r.EncodeInt(int64(x.ConcurrentRSSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1028 := z.EncBinary() - _ = yym1028 + yym1033 := z.EncBinary() + _ = yym1033 if false { } else { r.EncodeInt(int64(x.ConcurrentRCSyncs)) @@ -9284,17 +9325,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentRCSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1029 := z.EncBinary() - _ = yym1029 + yym1034 := z.EncBinary() + _ = yym1034 if false { } else { r.EncodeInt(int64(x.ConcurrentRCSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1031 := z.EncBinary() - _ = yym1031 + yym1036 := z.EncBinary() + _ = yym1036 if false { } else { r.EncodeInt(int64(x.ConcurrentServiceSyncs)) @@ -9303,17 +9344,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentServiceSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1032 := z.EncBinary() - _ = yym1032 + yym1037 := z.EncBinary() + _ = yym1037 if false { } else { r.EncodeInt(int64(x.ConcurrentServiceSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1034 := z.EncBinary() - _ = yym1034 + yym1039 := z.EncBinary() + _ = yym1039 if false { } else { r.EncodeInt(int64(x.ConcurrentResourceQuotaSyncs)) @@ -9322,17 +9363,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentResourceQuotaSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1035 := z.EncBinary() - _ = yym1035 + yym1040 := z.EncBinary() + _ = yym1040 if false { } else { r.EncodeInt(int64(x.ConcurrentResourceQuotaSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1037 := z.EncBinary() - _ = yym1037 + yym1042 := z.EncBinary() + _ = yym1042 if false { } else { r.EncodeInt(int64(x.ConcurrentDeploymentSyncs)) @@ -9341,17 +9382,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentDeploymentSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1038 := z.EncBinary() - _ = yym1038 + yym1043 := z.EncBinary() + _ = yym1043 if false { } else { r.EncodeInt(int64(x.ConcurrentDeploymentSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1040 := z.EncBinary() - _ = yym1040 + yym1045 := z.EncBinary() + _ = yym1045 if false { } else { r.EncodeInt(int64(x.ConcurrentDaemonSetSyncs)) @@ -9360,17 +9401,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentDaemonSetSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1041 := z.EncBinary() - _ = yym1041 + yym1046 := z.EncBinary() + _ = yym1046 if false { } else { r.EncodeInt(int64(x.ConcurrentDaemonSetSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1043 := z.EncBinary() - _ = yym1043 + yym1048 := z.EncBinary() + _ = yym1048 if false { } else { r.EncodeInt(int64(x.ConcurrentJobSyncs)) @@ -9379,17 +9420,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentJobSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1044 := z.EncBinary() - _ = yym1044 + yym1049 := z.EncBinary() + _ = yym1049 if false { } else { r.EncodeInt(int64(x.ConcurrentJobSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1046 := z.EncBinary() - _ = yym1046 + yym1051 := z.EncBinary() + _ = yym1051 if false { } else { r.EncodeInt(int64(x.ConcurrentNamespaceSyncs)) @@ -9398,17 +9439,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentNamespaceSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1047 := z.EncBinary() - _ = yym1047 + yym1052 := z.EncBinary() + _ = yym1052 if false { } else { r.EncodeInt(int64(x.ConcurrentNamespaceSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1049 := z.EncBinary() - _ = yym1049 + yym1054 := z.EncBinary() + _ = yym1054 if false { } else { r.EncodeInt(int64(x.ConcurrentSATokenSyncs)) @@ -9417,17 +9458,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentSATokenSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1050 := z.EncBinary() - _ = yym1050 + yym1055 := z.EncBinary() + _ = yym1055 if false { } else { r.EncodeInt(int64(x.ConcurrentSATokenSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1052 := z.EncBinary() - _ = yym1052 + yym1057 := z.EncBinary() + _ = yym1057 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRC)) @@ -9436,17 +9477,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForRC")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1053 := z.EncBinary() - _ = yym1053 + yym1058 := z.EncBinary() + _ = yym1058 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRC)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1055 := z.EncBinary() - _ = yym1055 + yym1060 := z.EncBinary() + _ = yym1060 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRS)) @@ -9455,17 +9496,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForRS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1056 := z.EncBinary() - _ = yym1056 + yym1061 := z.EncBinary() + _ = yym1061 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForRS)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1058 := z.EncBinary() - _ = yym1058 + yym1063 := z.EncBinary() + _ = yym1063 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForDaemonSet)) @@ -9474,43 +9515,16 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lookupCacheSizeForDaemonSet")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1059 := z.EncBinary() - _ = yym1059 + yym1064 := z.EncBinary() + _ = yym1064 if false { } else { r.EncodeInt(int64(x.LookupCacheSizeForDaemonSet)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1061 := &x.ServiceSyncPeriod - yym1062 := z.EncBinary() - _ = yym1062 - if false { - } else if z.HasExtensions() && z.EncExt(yy1061) { - } else if !yym1062 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1061) - } else { - z.EncFallback(yy1061) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("serviceSyncPeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1063 := &x.ServiceSyncPeriod - yym1064 := z.EncBinary() - _ = yym1064 - if false { - } else if z.HasExtensions() && z.EncExt(yy1063) { - } else if !yym1064 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1063) - } else { - z.EncFallback(yy1063) - } - } - if yyr999 || yy2arr999 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1066 := &x.NodeSyncPeriod + yy1066 := &x.ServiceSyncPeriod yym1067 := z.EncBinary() _ = yym1067 if false { @@ -9522,9 +9536,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("serviceSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1068 := &x.NodeSyncPeriod + yy1068 := &x.ServiceSyncPeriod yym1069 := z.EncBinary() _ = yym1069 if false { @@ -9535,9 +9549,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1068) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1071 := &x.RouteReconciliationPeriod + yy1071 := &x.NodeSyncPeriod yym1072 := z.EncBinary() _ = yym1072 if false { @@ -9549,9 +9563,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("routeReconciliationPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("nodeSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1073 := &x.RouteReconciliationPeriod + yy1073 := &x.NodeSyncPeriod yym1074 := z.EncBinary() _ = yym1074 if false { @@ -9562,9 +9576,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1073) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1076 := &x.ResourceQuotaSyncPeriod + yy1076 := &x.RouteReconciliationPeriod yym1077 := z.EncBinary() _ = yym1077 if false { @@ -9576,9 +9590,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("resourceQuotaSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("routeReconciliationPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1078 := &x.ResourceQuotaSyncPeriod + yy1078 := &x.RouteReconciliationPeriod yym1079 := z.EncBinary() _ = yym1079 if false { @@ -9589,9 +9603,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1078) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1081 := &x.NamespaceSyncPeriod + yy1081 := &x.ResourceQuotaSyncPeriod yym1082 := z.EncBinary() _ = yym1082 if false { @@ -9603,9 +9617,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("namespaceSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("resourceQuotaSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1083 := &x.NamespaceSyncPeriod + yy1083 := &x.ResourceQuotaSyncPeriod yym1084 := z.EncBinary() _ = yym1084 if false { @@ -9616,9 +9630,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1083) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1086 := &x.PVClaimBinderSyncPeriod + yy1086 := &x.NamespaceSyncPeriod yym1087 := z.EncBinary() _ = yym1087 if false { @@ -9630,9 +9644,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("pvClaimBinderSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("namespaceSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1088 := &x.PVClaimBinderSyncPeriod + yy1088 := &x.NamespaceSyncPeriod yym1089 := z.EncBinary() _ = yym1089 if false { @@ -9643,9 +9657,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1088) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1091 := &x.MinResyncPeriod + yy1091 := &x.PVClaimBinderSyncPeriod yym1092 := z.EncBinary() _ = yym1092 if false { @@ -9657,9 +9671,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("minResyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("pvClaimBinderSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1093 := &x.MinResyncPeriod + yy1093 := &x.PVClaimBinderSyncPeriod yym1094 := z.EncBinary() _ = yym1094 if false { @@ -9670,10 +9684,37 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1093) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1096 := z.EncBinary() - _ = yym1096 + yy1096 := &x.MinResyncPeriod + yym1097 := z.EncBinary() + _ = yym1097 + if false { + } else if z.HasExtensions() && z.EncExt(yy1096) { + } else if !yym1097 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1096) + } else { + z.EncFallback(yy1096) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("minResyncPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy1098 := &x.MinResyncPeriod + yym1099 := z.EncBinary() + _ = yym1099 + if false { + } else if z.HasExtensions() && z.EncExt(yy1098) { + } else if !yym1099 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1098) + } else { + z.EncFallback(yy1098) + } + } + if yyr1004 || yy2arr1004 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym1101 := z.EncBinary() + _ = yym1101 if false { } else { r.EncodeInt(int64(x.TerminatedPodGCThreshold)) @@ -9682,43 +9723,16 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("terminatedPodGCThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1097 := z.EncBinary() - _ = yym1097 + yym1102 := z.EncBinary() + _ = yym1102 if false { } else { r.EncodeInt(int64(x.TerminatedPodGCThreshold)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1099 := &x.HorizontalPodAutoscalerSyncPeriod - yym1100 := z.EncBinary() - _ = yym1100 - if false { - } else if z.HasExtensions() && z.EncExt(yy1099) { - } else if !yym1100 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1099) - } else { - z.EncFallback(yy1099) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("horizontalPodAutoscalerSyncPeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1101 := &x.HorizontalPodAutoscalerSyncPeriod - yym1102 := z.EncBinary() - _ = yym1102 - if false { - } else if z.HasExtensions() && z.EncExt(yy1101) { - } else if !yym1102 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1101) - } else { - z.EncFallback(yy1101) - } - } - if yyr999 || yy2arr999 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1104 := &x.DeploymentControllerSyncPeriod + yy1104 := &x.HorizontalPodAutoscalerSyncPeriod yym1105 := z.EncBinary() _ = yym1105 if false { @@ -9730,9 +9744,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("deploymentControllerSyncPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("horizontalPodAutoscalerSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1106 := &x.DeploymentControllerSyncPeriod + yy1106 := &x.HorizontalPodAutoscalerSyncPeriod yym1107 := z.EncBinary() _ = yym1107 if false { @@ -9743,9 +9757,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1106) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1109 := &x.PodEvictionTimeout + yy1109 := &x.DeploymentControllerSyncPeriod yym1110 := z.EncBinary() _ = yym1110 if false { @@ -9757,9 +9771,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("podEvictionTimeout")) + r.EncodeString(codecSelferC_UTF81234, string("deploymentControllerSyncPeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1111 := &x.PodEvictionTimeout + yy1111 := &x.DeploymentControllerSyncPeriod yym1112 := z.EncBinary() _ = yym1112 if false { @@ -9770,10 +9784,37 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1111) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1114 := z.EncBinary() - _ = yym1114 + yy1114 := &x.PodEvictionTimeout + yym1115 := z.EncBinary() + _ = yym1115 + if false { + } else if z.HasExtensions() && z.EncExt(yy1114) { + } else if !yym1115 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1114) + } else { + z.EncFallback(yy1114) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("podEvictionTimeout")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy1116 := &x.PodEvictionTimeout + yym1117 := z.EncBinary() + _ = yym1117 + if false { + } else if z.HasExtensions() && z.EncExt(yy1116) { + } else if !yym1117 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1116) + } else { + z.EncFallback(yy1116) + } + } + if yyr1004 || yy2arr1004 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym1119 := z.EncBinary() + _ = yym1119 if false { } else { r.EncodeFloat32(float32(x.DeletingPodsQps)) @@ -9782,17 +9823,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("deletingPodsQps")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1115 := z.EncBinary() - _ = yym1115 + yym1120 := z.EncBinary() + _ = yym1120 if false { } else { r.EncodeFloat32(float32(x.DeletingPodsQps)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1117 := z.EncBinary() - _ = yym1117 + yym1122 := z.EncBinary() + _ = yym1122 if false { } else { r.EncodeInt(int64(x.DeletingPodsBurst)) @@ -9801,44 +9842,44 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("deletingPodsBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1118 := z.EncBinary() - _ = yym1118 + yym1123 := z.EncBinary() + _ = yym1123 if false { } else { r.EncodeInt(int64(x.DeletingPodsBurst)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1120 := &x.NodeMonitorGracePeriod - yym1121 := z.EncBinary() - _ = yym1121 + yy1125 := &x.NodeMonitorGracePeriod + yym1126 := z.EncBinary() + _ = yym1126 if false { - } else if z.HasExtensions() && z.EncExt(yy1120) { - } else if !yym1121 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1120) + } else if z.HasExtensions() && z.EncExt(yy1125) { + } else if !yym1126 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1125) } else { - z.EncFallback(yy1120) + z.EncFallback(yy1125) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1122 := &x.NodeMonitorGracePeriod - yym1123 := z.EncBinary() - _ = yym1123 + yy1127 := &x.NodeMonitorGracePeriod + yym1128 := z.EncBinary() + _ = yym1128 if false { - } else if z.HasExtensions() && z.EncExt(yy1122) { - } else if !yym1123 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1122) + } else if z.HasExtensions() && z.EncExt(yy1127) { + } else if !yym1128 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1127) } else { - z.EncFallback(yy1122) + z.EncFallback(yy1127) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1125 := z.EncBinary() - _ = yym1125 + yym1130 := z.EncBinary() + _ = yym1130 if false { } else { r.EncodeInt(int64(x.RegisterRetryCount)) @@ -9847,43 +9888,16 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("registerRetryCount")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1126 := z.EncBinary() - _ = yym1126 + yym1131 := z.EncBinary() + _ = yym1131 if false { } else { r.EncodeInt(int64(x.RegisterRetryCount)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1128 := &x.NodeStartupGracePeriod - yym1129 := z.EncBinary() - _ = yym1129 - if false { - } else if z.HasExtensions() && z.EncExt(yy1128) { - } else if !yym1129 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1128) - } else { - z.EncFallback(yy1128) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeStartupGracePeriod")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1130 := &x.NodeStartupGracePeriod - yym1131 := z.EncBinary() - _ = yym1131 - if false { - } else if z.HasExtensions() && z.EncExt(yy1130) { - } else if !yym1131 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1130) - } else { - z.EncFallback(yy1130) - } - } - if yyr999 || yy2arr999 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1133 := &x.NodeMonitorPeriod + yy1133 := &x.NodeStartupGracePeriod yym1134 := z.EncBinary() _ = yym1134 if false { @@ -9895,9 +9909,9 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorPeriod")) + r.EncodeString(codecSelferC_UTF81234, string("nodeStartupGracePeriod")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1135 := &x.NodeMonitorPeriod + yy1135 := &x.NodeStartupGracePeriod yym1136 := z.EncBinary() _ = yym1136 if false { @@ -9908,10 +9922,37 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncFallback(yy1135) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1138 := z.EncBinary() - _ = yym1138 + yy1138 := &x.NodeMonitorPeriod + yym1139 := z.EncBinary() + _ = yym1139 + if false { + } else if z.HasExtensions() && z.EncExt(yy1138) { + } else if !yym1139 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1138) + } else { + z.EncFallback(yy1138) + } + } else { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("nodeMonitorPeriod")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yy1140 := &x.NodeMonitorPeriod + yym1141 := z.EncBinary() + _ = yym1141 + if false { + } else if z.HasExtensions() && z.EncExt(yy1140) { + } else if !yym1141 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1140) + } else { + z.EncFallback(yy1140) + } + } + if yyr1004 || yy2arr1004 { + z.EncSendContainerState(codecSelfer_containerArrayElem1234) + yym1143 := z.EncBinary() + _ = yym1143 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceAccountKeyFile)) @@ -9920,17 +9961,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serviceAccountKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1139 := z.EncBinary() - _ = yym1139 + yym1144 := z.EncBinary() + _ = yym1144 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceAccountKeyFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1141 := z.EncBinary() - _ = yym1141 + yym1146 := z.EncBinary() + _ = yym1146 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningCertFile)) @@ -9939,17 +9980,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterSigningCertFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1142 := z.EncBinary() - _ = yym1142 + yym1147 := z.EncBinary() + _ = yym1147 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningCertFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1144 := z.EncBinary() - _ = yym1144 + yym1149 := z.EncBinary() + _ = yym1149 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningKeyFile)) @@ -9958,17 +9999,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterSigningKeyFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1145 := z.EncBinary() - _ = yym1145 + yym1150 := z.EncBinary() + _ = yym1150 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterSigningKeyFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1147 := z.EncBinary() - _ = yym1147 + yym1152 := z.EncBinary() + _ = yym1152 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ApproveAllKubeletCSRsForGroup)) @@ -9977,17 +10018,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("approveAllKubeletCSRsForGroup")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1148 := z.EncBinary() - _ = yym1148 + yym1153 := z.EncBinary() + _ = yym1153 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ApproveAllKubeletCSRsForGroup)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1150 := z.EncBinary() - _ = yym1150 + yym1155 := z.EncBinary() + _ = yym1155 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) @@ -9996,17 +10037,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableProfiling")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1151 := z.EncBinary() - _ = yym1151 + yym1156 := z.EncBinary() + _ = yym1156 if false { } else { r.EncodeBool(bool(x.EnableProfiling)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1153 := z.EncBinary() - _ = yym1153 + yym1158 := z.EncBinary() + _ = yym1158 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterName)) @@ -10015,17 +10056,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterName")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1154 := z.EncBinary() - _ = yym1154 + yym1159 := z.EncBinary() + _ = yym1159 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterName)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1156 := z.EncBinary() - _ = yym1156 + yym1161 := z.EncBinary() + _ = yym1161 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterCIDR)) @@ -10034,17 +10075,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("clusterCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1157 := z.EncBinary() - _ = yym1157 + yym1162 := z.EncBinary() + _ = yym1162 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ClusterCIDR)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1159 := z.EncBinary() - _ = yym1159 + yym1164 := z.EncBinary() + _ = yym1164 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceCIDR)) @@ -10053,17 +10094,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("serviceCIDR")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1160 := z.EncBinary() - _ = yym1160 + yym1165 := z.EncBinary() + _ = yym1165 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ServiceCIDR)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1162 := z.EncBinary() - _ = yym1162 + yym1167 := z.EncBinary() + _ = yym1167 if false { } else { r.EncodeInt(int64(x.NodeCIDRMaskSize)) @@ -10072,17 +10113,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeCIDRMaskSize")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1163 := z.EncBinary() - _ = yym1163 + yym1168 := z.EncBinary() + _ = yym1168 if false { } else { r.EncodeInt(int64(x.NodeCIDRMaskSize)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1165 := z.EncBinary() - _ = yym1165 + yym1170 := z.EncBinary() + _ = yym1170 if false { } else { r.EncodeBool(bool(x.AllocateNodeCIDRs)) @@ -10091,17 +10132,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("allocateNodeCIDRs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1166 := z.EncBinary() - _ = yym1166 + yym1171 := z.EncBinary() + _ = yym1171 if false { } else { r.EncodeBool(bool(x.AllocateNodeCIDRs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1168 := z.EncBinary() - _ = yym1168 + yym1173 := z.EncBinary() + _ = yym1173 if false { } else { r.EncodeBool(bool(x.ConfigureCloudRoutes)) @@ -10110,17 +10151,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("configureCloudRoutes")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1169 := z.EncBinary() - _ = yym1169 + yym1174 := z.EncBinary() + _ = yym1174 if false { } else { r.EncodeBool(bool(x.ConfigureCloudRoutes)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1171 := z.EncBinary() - _ = yym1171 + yym1176 := z.EncBinary() + _ = yym1176 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootCAFile)) @@ -10129,17 +10170,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rootCAFile")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1172 := z.EncBinary() - _ = yym1172 + yym1177 := z.EncBinary() + _ = yym1177 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.RootCAFile)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1174 := z.EncBinary() - _ = yym1174 + yym1179 := z.EncBinary() + _ = yym1179 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) @@ -10148,17 +10189,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("contentType")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1175 := z.EncBinary() - _ = yym1175 + yym1180 := z.EncBinary() + _ = yym1180 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.ContentType)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1177 := z.EncBinary() - _ = yym1177 + yym1182 := z.EncBinary() + _ = yym1182 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) @@ -10167,17 +10208,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIQPS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1178 := z.EncBinary() - _ = yym1178 + yym1183 := z.EncBinary() + _ = yym1183 if false { } else { r.EncodeFloat32(float32(x.KubeAPIQPS)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1180 := z.EncBinary() - _ = yym1180 + yym1185 := z.EncBinary() + _ = yym1185 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) @@ -10186,66 +10227,66 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kubeAPIBurst")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1181 := z.EncBinary() - _ = yym1181 + yym1186 := z.EncBinary() + _ = yym1186 if false { } else { r.EncodeInt(int64(x.KubeAPIBurst)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1183 := &x.LeaderElection - yy1183.CodecEncodeSelf(e) + yy1188 := &x.LeaderElection + yy1188.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("leaderElection")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1184 := &x.LeaderElection - yy1184.CodecEncodeSelf(e) + yy1189 := &x.LeaderElection + yy1189.CodecEncodeSelf(e) } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1186 := &x.VolumeConfiguration - yy1186.CodecEncodeSelf(e) + yy1191 := &x.VolumeConfiguration + yy1191.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumeConfiguration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1187 := &x.VolumeConfiguration - yy1187.CodecEncodeSelf(e) + yy1192 := &x.VolumeConfiguration + yy1192.CodecEncodeSelf(e) } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1189 := &x.ControllerStartInterval - yym1190 := z.EncBinary() - _ = yym1190 + yy1194 := &x.ControllerStartInterval + yym1195 := z.EncBinary() + _ = yym1195 if false { - } else if z.HasExtensions() && z.EncExt(yy1189) { - } else if !yym1190 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1189) + } else if z.HasExtensions() && z.EncExt(yy1194) { + } else if !yym1195 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1194) } else { - z.EncFallback(yy1189) + z.EncFallback(yy1194) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("controllerStartInterval")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1191 := &x.ControllerStartInterval - yym1192 := z.EncBinary() - _ = yym1192 + yy1196 := &x.ControllerStartInterval + yym1197 := z.EncBinary() + _ = yym1197 if false { - } else if z.HasExtensions() && z.EncExt(yy1191) { - } else if !yym1192 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1191) + } else if z.HasExtensions() && z.EncExt(yy1196) { + } else if !yym1197 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1196) } else { - z.EncFallback(yy1191) + z.EncFallback(yy1196) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1194 := z.EncBinary() - _ = yym1194 + yym1199 := z.EncBinary() + _ = yym1199 if false { } else { r.EncodeBool(bool(x.EnableGarbageCollector)) @@ -10254,17 +10295,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableGarbageCollector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1195 := z.EncBinary() - _ = yym1195 + yym1200 := z.EncBinary() + _ = yym1200 if false { } else { r.EncodeBool(bool(x.EnableGarbageCollector)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1197 := z.EncBinary() - _ = yym1197 + yym1202 := z.EncBinary() + _ = yym1202 if false { } else { r.EncodeInt(int64(x.ConcurrentGCSyncs)) @@ -10273,17 +10314,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("concurrentGCSyncs")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1198 := z.EncBinary() - _ = yym1198 + yym1203 := z.EncBinary() + _ = yym1203 if false { } else { r.EncodeInt(int64(x.ConcurrentGCSyncs)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1200 := z.EncBinary() - _ = yym1200 + yym1205 := z.EncBinary() + _ = yym1205 if false { } else { r.EncodeFloat32(float32(x.NodeEvictionRate)) @@ -10292,17 +10333,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("nodeEvictionRate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1201 := z.EncBinary() - _ = yym1201 + yym1206 := z.EncBinary() + _ = yym1206 if false { } else { r.EncodeFloat32(float32(x.NodeEvictionRate)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1203 := z.EncBinary() - _ = yym1203 + yym1208 := z.EncBinary() + _ = yym1208 if false { } else { r.EncodeFloat32(float32(x.SecondaryNodeEvictionRate)) @@ -10311,17 +10352,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("secondaryNodeEvictionRate")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1204 := z.EncBinary() - _ = yym1204 + yym1209 := z.EncBinary() + _ = yym1209 if false { } else { r.EncodeFloat32(float32(x.SecondaryNodeEvictionRate)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1206 := z.EncBinary() - _ = yym1206 + yym1211 := z.EncBinary() + _ = yym1211 if false { } else { r.EncodeInt(int64(x.LargeClusterSizeThreshold)) @@ -10330,17 +10371,17 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("largeClusterSizeThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1207 := z.EncBinary() - _ = yym1207 + yym1212 := z.EncBinary() + _ = yym1212 if false { } else { r.EncodeInt(int64(x.LargeClusterSizeThreshold)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1209 := z.EncBinary() - _ = yym1209 + yym1214 := z.EncBinary() + _ = yym1214 if false { } else { r.EncodeFloat32(float32(x.UnhealthyZoneThreshold)) @@ -10349,14 +10390,14 @@ func (x *KubeControllerManagerConfiguration) CodecEncodeSelf(e *codec1978.Encode z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("unhealthyZoneThreshold")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1210 := z.EncBinary() - _ = yym1210 + yym1215 := z.EncBinary() + _ = yym1215 if false { } else { r.EncodeFloat32(float32(x.UnhealthyZoneThreshold)) } } - if yyr999 || yy2arr999 { + if yyr1004 || yy2arr1004 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -10369,25 +10410,25 @@ func (x *KubeControllerManagerConfiguration) CodecDecodeSelf(d *codec1978.Decode var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1211 := z.DecBinary() - _ = yym1211 + yym1216 := z.DecBinary() + _ = yym1216 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1212 := r.ContainerType() - if yyct1212 == codecSelferValueTypeMap1234 { - yyl1212 := r.ReadMapStart() - if yyl1212 == 0 { + yyct1217 := r.ContainerType() + if yyct1217 == codecSelferValueTypeMap1234 { + yyl1217 := r.ReadMapStart() + if yyl1217 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1212, d) + x.codecDecodeSelfFromMap(yyl1217, d) } - } else if yyct1212 == codecSelferValueTypeArray1234 { - yyl1212 := r.ReadArrayStart() - if yyl1212 == 0 { + } else if yyct1217 == codecSelferValueTypeArray1234 { + yyl1217 := r.ReadArrayStart() + if yyl1217 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1212, d) + x.codecDecodeSelfFromArray(yyl1217, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -10399,12 +10440,12 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1213Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1213Slc - var yyhl1213 bool = l >= 0 - for yyj1213 := 0; ; yyj1213++ { - if yyhl1213 { - if yyj1213 >= l { + var yys1218Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1218Slc + var yyhl1218 bool = l >= 0 + for yyj1218 := 0; ; yyj1218++ { + if yyhl1218 { + if yyj1218 >= l { break } } else { @@ -10413,10 +10454,10 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1213Slc = r.DecodeBytes(yys1213Slc, true, true) - yys1213 := string(yys1213Slc) + yys1218Slc = r.DecodeBytes(yys1218Slc, true, true) + yys1218 := string(yys1218Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1213 { + switch yys1218 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -10539,120 +10580,84 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "serviceSyncPeriod": if r.TryDecodeAsNil() { - x.ServiceSyncPeriod = pkg1_unversioned.Duration{} + x.ServiceSyncPeriod = pkg1_v1.Duration{} } else { - yyv1234 := &x.ServiceSyncPeriod - yym1235 := z.DecBinary() - _ = yym1235 + yyv1239 := &x.ServiceSyncPeriod + yym1240 := z.DecBinary() + _ = yym1240 if false { - } else if z.HasExtensions() && z.DecExt(yyv1234) { - } else if !yym1235 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1234) + } else if z.HasExtensions() && z.DecExt(yyv1239) { + } else if !yym1240 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1239) } else { - z.DecFallback(yyv1234, false) + z.DecFallback(yyv1239, false) } } case "nodeSyncPeriod": if r.TryDecodeAsNil() { - x.NodeSyncPeriod = pkg1_unversioned.Duration{} + x.NodeSyncPeriod = pkg1_v1.Duration{} } else { - yyv1236 := &x.NodeSyncPeriod - yym1237 := z.DecBinary() - _ = yym1237 + yyv1241 := &x.NodeSyncPeriod + yym1242 := z.DecBinary() + _ = yym1242 if false { - } else if z.HasExtensions() && z.DecExt(yyv1236) { - } else if !yym1237 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1236) + } else if z.HasExtensions() && z.DecExt(yyv1241) { + } else if !yym1242 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1241) } else { - z.DecFallback(yyv1236, false) + z.DecFallback(yyv1241, false) } } case "routeReconciliationPeriod": if r.TryDecodeAsNil() { - x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} + x.RouteReconciliationPeriod = pkg1_v1.Duration{} } else { - yyv1238 := &x.RouteReconciliationPeriod - yym1239 := z.DecBinary() - _ = yym1239 + yyv1243 := &x.RouteReconciliationPeriod + yym1244 := z.DecBinary() + _ = yym1244 if false { - } else if z.HasExtensions() && z.DecExt(yyv1238) { - } else if !yym1239 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1238) + } else if z.HasExtensions() && z.DecExt(yyv1243) { + } else if !yym1244 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1243) } else { - z.DecFallback(yyv1238, false) + z.DecFallback(yyv1243, false) } } case "resourceQuotaSyncPeriod": if r.TryDecodeAsNil() { - x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} + x.ResourceQuotaSyncPeriod = pkg1_v1.Duration{} } else { - yyv1240 := &x.ResourceQuotaSyncPeriod - yym1241 := z.DecBinary() - _ = yym1241 + yyv1245 := &x.ResourceQuotaSyncPeriod + yym1246 := z.DecBinary() + _ = yym1246 if false { - } else if z.HasExtensions() && z.DecExt(yyv1240) { - } else if !yym1241 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1240) + } else if z.HasExtensions() && z.DecExt(yyv1245) { + } else if !yym1246 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1245) } else { - z.DecFallback(yyv1240, false) + z.DecFallback(yyv1245, false) } } case "namespaceSyncPeriod": if r.TryDecodeAsNil() { - x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} + x.NamespaceSyncPeriod = pkg1_v1.Duration{} } else { - yyv1242 := &x.NamespaceSyncPeriod - yym1243 := z.DecBinary() - _ = yym1243 + yyv1247 := &x.NamespaceSyncPeriod + yym1248 := z.DecBinary() + _ = yym1248 if false { - } else if z.HasExtensions() && z.DecExt(yyv1242) { - } else if !yym1243 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1242) + } else if z.HasExtensions() && z.DecExt(yyv1247) { + } else if !yym1248 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1247) } else { - z.DecFallback(yyv1242, false) + z.DecFallback(yyv1247, false) } } case "pvClaimBinderSyncPeriod": if r.TryDecodeAsNil() { - x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} + x.PVClaimBinderSyncPeriod = pkg1_v1.Duration{} } else { - yyv1244 := &x.PVClaimBinderSyncPeriod - yym1245 := z.DecBinary() - _ = yym1245 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1244) { - } else if !yym1245 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1244) - } else { - z.DecFallback(yyv1244, false) - } - } - case "minResyncPeriod": - if r.TryDecodeAsNil() { - x.MinResyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1246 := &x.MinResyncPeriod - yym1247 := z.DecBinary() - _ = yym1247 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1246) { - } else if !yym1247 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1246) - } else { - z.DecFallback(yyv1246, false) - } - } - case "terminatedPodGCThreshold": - if r.TryDecodeAsNil() { - x.TerminatedPodGCThreshold = 0 - } else { - x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) - } - case "horizontalPodAutoscalerSyncPeriod": - if r.TryDecodeAsNil() { - x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1249 := &x.HorizontalPodAutoscalerSyncPeriod + yyv1249 := &x.PVClaimBinderSyncPeriod yym1250 := z.DecBinary() _ = yym1250 if false { @@ -10663,11 +10668,11 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co z.DecFallback(yyv1249, false) } } - case "deploymentControllerSyncPeriod": + case "minResyncPeriod": if r.TryDecodeAsNil() { - x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + x.MinResyncPeriod = pkg1_v1.Duration{} } else { - yyv1251 := &x.DeploymentControllerSyncPeriod + yyv1251 := &x.MinResyncPeriod yym1252 := z.DecBinary() _ = yym1252 if false { @@ -10678,19 +10683,55 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co z.DecFallback(yyv1251, false) } } + case "terminatedPodGCThreshold": + if r.TryDecodeAsNil() { + x.TerminatedPodGCThreshold = 0 + } else { + x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) + } + case "horizontalPodAutoscalerSyncPeriod": + if r.TryDecodeAsNil() { + x.HorizontalPodAutoscalerSyncPeriod = pkg1_v1.Duration{} + } else { + yyv1254 := &x.HorizontalPodAutoscalerSyncPeriod + yym1255 := z.DecBinary() + _ = yym1255 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1254) { + } else if !yym1255 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1254) + } else { + z.DecFallback(yyv1254, false) + } + } + case "deploymentControllerSyncPeriod": + if r.TryDecodeAsNil() { + x.DeploymentControllerSyncPeriod = pkg1_v1.Duration{} + } else { + yyv1256 := &x.DeploymentControllerSyncPeriod + yym1257 := z.DecBinary() + _ = yym1257 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1256) { + } else if !yym1257 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1256) + } else { + z.DecFallback(yyv1256, false) + } + } case "podEvictionTimeout": if r.TryDecodeAsNil() { - x.PodEvictionTimeout = pkg1_unversioned.Duration{} + x.PodEvictionTimeout = pkg1_v1.Duration{} } else { - yyv1253 := &x.PodEvictionTimeout - yym1254 := z.DecBinary() - _ = yym1254 + yyv1258 := &x.PodEvictionTimeout + yym1259 := z.DecBinary() + _ = yym1259 if false { - } else if z.HasExtensions() && z.DecExt(yyv1253) { - } else if !yym1254 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1253) + } else if z.HasExtensions() && z.DecExt(yyv1258) { + } else if !yym1259 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1258) } else { - z.DecFallback(yyv1253, false) + z.DecFallback(yyv1258, false) } } case "deletingPodsQps": @@ -10707,17 +10748,17 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeMonitorGracePeriod": if r.TryDecodeAsNil() { - x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} + x.NodeMonitorGracePeriod = pkg1_v1.Duration{} } else { - yyv1257 := &x.NodeMonitorGracePeriod - yym1258 := z.DecBinary() - _ = yym1258 + yyv1262 := &x.NodeMonitorGracePeriod + yym1263 := z.DecBinary() + _ = yym1263 if false { - } else if z.HasExtensions() && z.DecExt(yyv1257) { - } else if !yym1258 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1257) + } else if z.HasExtensions() && z.DecExt(yyv1262) { + } else if !yym1263 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1262) } else { - z.DecFallback(yyv1257, false) + z.DecFallback(yyv1262, false) } } case "registerRetryCount": @@ -10728,32 +10769,32 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co } case "nodeStartupGracePeriod": if r.TryDecodeAsNil() { - x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} + x.NodeStartupGracePeriod = pkg1_v1.Duration{} } else { - yyv1260 := &x.NodeStartupGracePeriod - yym1261 := z.DecBinary() - _ = yym1261 + yyv1265 := &x.NodeStartupGracePeriod + yym1266 := z.DecBinary() + _ = yym1266 if false { - } else if z.HasExtensions() && z.DecExt(yyv1260) { - } else if !yym1261 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1260) + } else if z.HasExtensions() && z.DecExt(yyv1265) { + } else if !yym1266 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1265) } else { - z.DecFallback(yyv1260, false) + z.DecFallback(yyv1265, false) } } case "nodeMonitorPeriod": if r.TryDecodeAsNil() { - x.NodeMonitorPeriod = pkg1_unversioned.Duration{} + x.NodeMonitorPeriod = pkg1_v1.Duration{} } else { - yyv1262 := &x.NodeMonitorPeriod - yym1263 := z.DecBinary() - _ = yym1263 + yyv1267 := &x.NodeMonitorPeriod + yym1268 := z.DecBinary() + _ = yym1268 if false { - } else if z.HasExtensions() && z.DecExt(yyv1262) { - } else if !yym1263 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1262) + } else if z.HasExtensions() && z.DecExt(yyv1267) { + } else if !yym1268 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1267) } else { - z.DecFallback(yyv1262, false) + z.DecFallback(yyv1267, false) } } case "serviceAccountKeyFile": @@ -10850,29 +10891,29 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv1279 := &x.LeaderElection - yyv1279.CodecDecodeSelf(d) + yyv1284 := &x.LeaderElection + yyv1284.CodecDecodeSelf(d) } case "volumeConfiguration": if r.TryDecodeAsNil() { x.VolumeConfiguration = VolumeConfiguration{} } else { - yyv1280 := &x.VolumeConfiguration - yyv1280.CodecDecodeSelf(d) + yyv1285 := &x.VolumeConfiguration + yyv1285.CodecDecodeSelf(d) } case "controllerStartInterval": if r.TryDecodeAsNil() { - x.ControllerStartInterval = pkg1_unversioned.Duration{} + x.ControllerStartInterval = pkg1_v1.Duration{} } else { - yyv1281 := &x.ControllerStartInterval - yym1282 := z.DecBinary() - _ = yym1282 + yyv1286 := &x.ControllerStartInterval + yym1287 := z.DecBinary() + _ = yym1287 if false { - } else if z.HasExtensions() && z.DecExt(yyv1281) { - } else if !yym1282 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1281) + } else if z.HasExtensions() && z.DecExt(yyv1286) { + } else if !yym1287 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1286) } else { - z.DecFallback(yyv1281, false) + z.DecFallback(yyv1286, false) } } case "enableGarbageCollector": @@ -10912,9 +10953,9 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromMap(l int, d *co x.UnhealthyZoneThreshold = float32(r.DecodeFloat(true)) } default: - z.DecStructFieldNotFound(-1, yys1213) - } // end switch yys1213 - } // end for yyj1213 + z.DecStructFieldNotFound(-1, yys1218) + } // end switch yys1218 + } // end for yyj1218 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -10922,16 +10963,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1289 int - var yyb1289 bool - var yyhl1289 bool = l >= 0 - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + var yyj1294 int + var yyb1294 bool + var yyhl1294 bool = l >= 0 + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10941,13 +10982,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Kind = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10957,13 +10998,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.APIVersion = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10973,13 +11014,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Port = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -10989,13 +11030,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.Address = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11005,13 +11046,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.UseServiceAccountCredentials = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11021,13 +11062,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.CloudProvider = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11037,13 +11078,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.CloudConfigFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11053,13 +11094,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentEndpointSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11069,13 +11110,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentRSSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11085,13 +11126,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentRCSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11101,13 +11142,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentServiceSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11117,13 +11158,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentResourceQuotaSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11133,13 +11174,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentDeploymentSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11149,13 +11190,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentDaemonSetSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11165,13 +11206,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentJobSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11181,13 +11222,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentNamespaceSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11197,13 +11238,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentSATokenSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11213,13 +11254,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForRC = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11229,13 +11270,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForRS = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11245,212 +11286,146 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LookupCacheSizeForDaemonSet = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ServiceSyncPeriod = pkg1_unversioned.Duration{} + x.ServiceSyncPeriod = pkg1_v1.Duration{} } else { - yyv1310 := &x.ServiceSyncPeriod - yym1311 := z.DecBinary() - _ = yym1311 + yyv1315 := &x.ServiceSyncPeriod + yym1316 := z.DecBinary() + _ = yym1316 if false { - } else if z.HasExtensions() && z.DecExt(yyv1310) { - } else if !yym1311 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1310) + } else if z.HasExtensions() && z.DecExt(yyv1315) { + } else if !yym1316 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1315) } else { - z.DecFallback(yyv1310, false) + z.DecFallback(yyv1315, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeSyncPeriod = pkg1_unversioned.Duration{} + x.NodeSyncPeriod = pkg1_v1.Duration{} } else { - yyv1312 := &x.NodeSyncPeriod - yym1313 := z.DecBinary() - _ = yym1313 + yyv1317 := &x.NodeSyncPeriod + yym1318 := z.DecBinary() + _ = yym1318 if false { - } else if z.HasExtensions() && z.DecExt(yyv1312) { - } else if !yym1313 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1312) + } else if z.HasExtensions() && z.DecExt(yyv1317) { + } else if !yym1318 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1317) } else { - z.DecFallback(yyv1312, false) + z.DecFallback(yyv1317, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.RouteReconciliationPeriod = pkg1_unversioned.Duration{} + x.RouteReconciliationPeriod = pkg1_v1.Duration{} } else { - yyv1314 := &x.RouteReconciliationPeriod - yym1315 := z.DecBinary() - _ = yym1315 + yyv1319 := &x.RouteReconciliationPeriod + yym1320 := z.DecBinary() + _ = yym1320 if false { - } else if z.HasExtensions() && z.DecExt(yyv1314) { - } else if !yym1315 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1314) + } else if z.HasExtensions() && z.DecExt(yyv1319) { + } else if !yym1320 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1319) } else { - z.DecFallback(yyv1314, false) + z.DecFallback(yyv1319, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ResourceQuotaSyncPeriod = pkg1_unversioned.Duration{} + x.ResourceQuotaSyncPeriod = pkg1_v1.Duration{} } else { - yyv1316 := &x.ResourceQuotaSyncPeriod - yym1317 := z.DecBinary() - _ = yym1317 + yyv1321 := &x.ResourceQuotaSyncPeriod + yym1322 := z.DecBinary() + _ = yym1322 if false { - } else if z.HasExtensions() && z.DecExt(yyv1316) { - } else if !yym1317 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1316) + } else if z.HasExtensions() && z.DecExt(yyv1321) { + } else if !yym1322 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1321) } else { - z.DecFallback(yyv1316, false) + z.DecFallback(yyv1321, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NamespaceSyncPeriod = pkg1_unversioned.Duration{} + x.NamespaceSyncPeriod = pkg1_v1.Duration{} } else { - yyv1318 := &x.NamespaceSyncPeriod - yym1319 := z.DecBinary() - _ = yym1319 + yyv1323 := &x.NamespaceSyncPeriod + yym1324 := z.DecBinary() + _ = yym1324 if false { - } else if z.HasExtensions() && z.DecExt(yyv1318) { - } else if !yym1319 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1318) + } else if z.HasExtensions() && z.DecExt(yyv1323) { + } else if !yym1324 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1323) } else { - z.DecFallback(yyv1318, false) + z.DecFallback(yyv1323, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PVClaimBinderSyncPeriod = pkg1_unversioned.Duration{} + x.PVClaimBinderSyncPeriod = pkg1_v1.Duration{} } else { - yyv1320 := &x.PVClaimBinderSyncPeriod - yym1321 := z.DecBinary() - _ = yym1321 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1320) { - } else if !yym1321 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1320) - } else { - z.DecFallback(yyv1320, false) - } - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.MinResyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1322 := &x.MinResyncPeriod - yym1323 := z.DecBinary() - _ = yym1323 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1322) { - } else if !yym1323 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1322) - } else { - z.DecFallback(yyv1322, false) - } - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.TerminatedPodGCThreshold = 0 - } else { - x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.HorizontalPodAutoscalerSyncPeriod = pkg1_unversioned.Duration{} - } else { - yyv1325 := &x.HorizontalPodAutoscalerSyncPeriod + yyv1325 := &x.PVClaimBinderSyncPeriod yym1326 := z.DecBinary() _ = yym1326 if false { @@ -11461,21 +11436,21 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1325, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.DeploymentControllerSyncPeriod = pkg1_unversioned.Duration{} + x.MinResyncPeriod = pkg1_v1.Duration{} } else { - yyv1327 := &x.DeploymentControllerSyncPeriod + yyv1327 := &x.MinResyncPeriod yym1328 := z.DecBinary() _ = yym1328 if false { @@ -11486,38 +11461,104 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1327, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PodEvictionTimeout = pkg1_unversioned.Duration{} + x.TerminatedPodGCThreshold = 0 } else { - yyv1329 := &x.PodEvictionTimeout - yym1330 := z.DecBinary() - _ = yym1330 + x.TerminatedPodGCThreshold = int32(r.DecodeInt(32)) + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.HorizontalPodAutoscalerSyncPeriod = pkg1_v1.Duration{} + } else { + yyv1330 := &x.HorizontalPodAutoscalerSyncPeriod + yym1331 := z.DecBinary() + _ = yym1331 if false { - } else if z.HasExtensions() && z.DecExt(yyv1329) { - } else if !yym1330 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1329) + } else if z.HasExtensions() && z.DecExt(yyv1330) { + } else if !yym1331 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1330) } else { - z.DecFallback(yyv1329, false) + z.DecFallback(yyv1330, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.DeploymentControllerSyncPeriod = pkg1_v1.Duration{} + } else { + yyv1332 := &x.DeploymentControllerSyncPeriod + yym1333 := z.DecBinary() + _ = yym1333 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1332) { + } else if !yym1333 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1332) + } else { + z.DecFallback(yyv1332, false) + } + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.PodEvictionTimeout = pkg1_v1.Duration{} + } else { + yyv1334 := &x.PodEvictionTimeout + yym1335 := z.DecBinary() + _ = yym1335 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1334) { + } else if !yym1335 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1334) + } else { + z.DecFallback(yyv1334, false) + } + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11527,13 +11568,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.DeletingPodsQps = float32(r.DecodeFloat(true)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11543,87 +11584,21 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.DeletingPodsBurst = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.NodeMonitorGracePeriod = pkg1_unversioned.Duration{} + x.NodeMonitorGracePeriod = pkg1_v1.Duration{} } else { - yyv1333 := &x.NodeMonitorGracePeriod - yym1334 := z.DecBinary() - _ = yym1334 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1333) { - } else if !yym1334 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1333) - } else { - z.DecFallback(yyv1333, false) - } - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.RegisterRetryCount = 0 - } else { - x.RegisterRetryCount = int32(r.DecodeInt(32)) - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeStartupGracePeriod = pkg1_unversioned.Duration{} - } else { - yyv1336 := &x.NodeStartupGracePeriod - yym1337 := z.DecBinary() - _ = yym1337 - if false { - } else if z.HasExtensions() && z.DecExt(yyv1336) { - } else if !yym1337 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1336) - } else { - z.DecFallback(yyv1336, false) - } - } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l - } else { - yyb1289 = r.CheckBreak() - } - if yyb1289 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.NodeMonitorPeriod = pkg1_unversioned.Duration{} - } else { - yyv1338 := &x.NodeMonitorPeriod + yyv1338 := &x.NodeMonitorGracePeriod yym1339 := z.DecBinary() _ = yym1339 if false { @@ -11634,13 +11609,79 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * z.DecFallback(yyv1338, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.RegisterRetryCount = 0 + } else { + x.RegisterRetryCount = int32(r.DecodeInt(32)) + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeStartupGracePeriod = pkg1_v1.Duration{} + } else { + yyv1341 := &x.NodeStartupGracePeriod + yym1342 := z.DecBinary() + _ = yym1342 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1341) { + } else if !yym1342 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1341) + } else { + z.DecFallback(yyv1341, false) + } + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { + z.DecSendContainerState(codecSelfer_containerArrayEnd1234) + return + } + z.DecSendContainerState(codecSelfer_containerArrayElem1234) + if r.TryDecodeAsNil() { + x.NodeMonitorPeriod = pkg1_v1.Duration{} + } else { + yyv1343 := &x.NodeMonitorPeriod + yym1344 := z.DecBinary() + _ = yym1344 + if false { + } else if z.HasExtensions() && z.DecExt(yyv1343) { + } else if !yym1344 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1343) + } else { + z.DecFallback(yyv1343, false) + } + } + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l + } else { + yyb1294 = r.CheckBreak() + } + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11650,13 +11691,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ServiceAccountKeyFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11666,13 +11707,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterSigningCertFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11682,13 +11723,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterSigningKeyFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11698,13 +11739,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ApproveAllKubeletCSRsForGroup = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11714,13 +11755,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.EnableProfiling = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11730,13 +11771,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterName = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11746,13 +11787,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ClusterCIDR = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11762,13 +11803,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ServiceCIDR = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11778,13 +11819,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.NodeCIDRMaskSize = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11794,13 +11835,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.AllocateNodeCIDRs = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11810,13 +11851,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConfigureCloudRoutes = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11826,13 +11867,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.RootCAFile = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11842,13 +11883,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ContentType = string(r.DecodeString()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11858,13 +11899,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.KubeAPIQPS = float32(r.DecodeFloat(true)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11874,13 +11915,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.KubeAPIBurst = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11888,16 +11929,16 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.LeaderElection = LeaderElectionConfiguration{} } else { - yyv1355 := &x.LeaderElection - yyv1355.CodecDecodeSelf(d) + yyv1360 := &x.LeaderElection + yyv1360.CodecDecodeSelf(d) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11905,41 +11946,41 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * if r.TryDecodeAsNil() { x.VolumeConfiguration = VolumeConfiguration{} } else { - yyv1356 := &x.VolumeConfiguration - yyv1356.CodecDecodeSelf(d) + yyv1361 := &x.VolumeConfiguration + yyv1361.CodecDecodeSelf(d) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ControllerStartInterval = pkg1_unversioned.Duration{} + x.ControllerStartInterval = pkg1_v1.Duration{} } else { - yyv1357 := &x.ControllerStartInterval - yym1358 := z.DecBinary() - _ = yym1358 + yyv1362 := &x.ControllerStartInterval + yym1363 := z.DecBinary() + _ = yym1363 if false { - } else if z.HasExtensions() && z.DecExt(yyv1357) { - } else if !yym1358 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1357) + } else if z.HasExtensions() && z.DecExt(yyv1362) { + } else if !yym1363 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1362) } else { - z.DecFallback(yyv1357, false) + z.DecFallback(yyv1362, false) } } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11949,13 +11990,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.EnableGarbageCollector = bool(r.DecodeBool()) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11965,13 +12006,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.ConcurrentGCSyncs = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11981,13 +12022,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.NodeEvictionRate = float32(r.DecodeFloat(true)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -11997,13 +12038,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.SecondaryNodeEvictionRate = float32(r.DecodeFloat(true)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12013,13 +12054,13 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * } else { x.LargeClusterSizeThreshold = int32(r.DecodeInt(32)) } - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12030,17 +12071,17 @@ func (x *KubeControllerManagerConfiguration) codecDecodeSelfFromArray(l int, d * x.UnhealthyZoneThreshold = float32(r.DecodeFloat(true)) } for { - yyj1289++ - if yyhl1289 { - yyb1289 = yyj1289 > l + yyj1294++ + if yyhl1294 { + yyb1294 = yyj1294 > l } else { - yyb1289 = r.CheckBreak() + yyb1294 = r.CheckBreak() } - if yyb1289 { + if yyb1294 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1289-1, "") + z.DecStructFieldNotFound(yyj1294-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -12052,33 +12093,33 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1365 := z.EncBinary() - _ = yym1365 + yym1370 := z.EncBinary() + _ = yym1370 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1366 := !z.EncBinary() - yy2arr1366 := z.EncBasicHandle().StructToArray - var yyq1366 [4]bool - _, _, _ = yysep1366, yyq1366, yy2arr1366 - const yyr1366 bool = false - var yynn1366 int - if yyr1366 || yy2arr1366 { + yysep1371 := !z.EncBinary() + yy2arr1371 := z.EncBasicHandle().StructToArray + var yyq1371 [4]bool + _, _, _ = yysep1371, yyq1371, yy2arr1371 + const yyr1371 bool = false + var yynn1371 int + if yyr1371 || yy2arr1371 { r.EncodeArrayStart(4) } else { - yynn1366 = 4 - for _, b := range yyq1366 { + yynn1371 = 4 + for _, b := range yyq1371 { if b { - yynn1366++ + yynn1371++ } } - r.EncodeMapStart(yynn1366) - yynn1366 = 0 + r.EncodeMapStart(yynn1371) + yynn1371 = 0 } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1368 := z.EncBinary() - _ = yym1368 + yym1373 := z.EncBinary() + _ = yym1373 if false { } else { r.EncodeBool(bool(x.EnableHostPathProvisioning)) @@ -12087,17 +12128,17 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableHostPathProvisioning")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1369 := z.EncBinary() - _ = yym1369 + yym1374 := z.EncBinary() + _ = yym1374 if false { } else { r.EncodeBool(bool(x.EnableHostPathProvisioning)) } } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1371 := z.EncBinary() - _ = yym1371 + yym1376 := z.EncBinary() + _ = yym1376 if false { } else { r.EncodeBool(bool(x.EnableDynamicProvisioning)) @@ -12106,28 +12147,28 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("enableDynamicProvisioning")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1372 := z.EncBinary() - _ = yym1372 + yym1377 := z.EncBinary() + _ = yym1377 if false { } else { r.EncodeBool(bool(x.EnableDynamicProvisioning)) } } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1374 := &x.PersistentVolumeRecyclerConfiguration - yy1374.CodecEncodeSelf(e) + yy1379 := &x.PersistentVolumeRecyclerConfiguration + yy1379.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("persitentVolumeRecyclerConfiguration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1375 := &x.PersistentVolumeRecyclerConfiguration - yy1375.CodecEncodeSelf(e) + yy1380 := &x.PersistentVolumeRecyclerConfiguration + yy1380.CodecEncodeSelf(e) } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1377 := z.EncBinary() - _ = yym1377 + yym1382 := z.EncBinary() + _ = yym1382 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FlexVolumePluginDir)) @@ -12136,14 +12177,14 @@ func (x *VolumeConfiguration) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("flexVolumePluginDir")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1378 := z.EncBinary() - _ = yym1378 + yym1383 := z.EncBinary() + _ = yym1383 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.FlexVolumePluginDir)) } } - if yyr1366 || yy2arr1366 { + if yyr1371 || yy2arr1371 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -12156,25 +12197,25 @@ func (x *VolumeConfiguration) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1379 := z.DecBinary() - _ = yym1379 + yym1384 := z.DecBinary() + _ = yym1384 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1380 := r.ContainerType() - if yyct1380 == codecSelferValueTypeMap1234 { - yyl1380 := r.ReadMapStart() - if yyl1380 == 0 { + yyct1385 := r.ContainerType() + if yyct1385 == codecSelferValueTypeMap1234 { + yyl1385 := r.ReadMapStart() + if yyl1385 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1380, d) + x.codecDecodeSelfFromMap(yyl1385, d) } - } else if yyct1380 == codecSelferValueTypeArray1234 { - yyl1380 := r.ReadArrayStart() - if yyl1380 == 0 { + } else if yyct1385 == codecSelferValueTypeArray1234 { + yyl1385 := r.ReadArrayStart() + if yyl1385 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1380, d) + x.codecDecodeSelfFromArray(yyl1385, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -12186,12 +12227,12 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1381Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1381Slc - var yyhl1381 bool = l >= 0 - for yyj1381 := 0; ; yyj1381++ { - if yyhl1381 { - if yyj1381 >= l { + var yys1386Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1386Slc + var yyhl1386 bool = l >= 0 + for yyj1386 := 0; ; yyj1386++ { + if yyhl1386 { + if yyj1386 >= l { break } } else { @@ -12200,10 +12241,10 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1381Slc = r.DecodeBytes(yys1381Slc, true, true) - yys1381 := string(yys1381Slc) + yys1386Slc = r.DecodeBytes(yys1386Slc, true, true) + yys1386 := string(yys1386Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1381 { + switch yys1386 { case "enableHostPathProvisioning": if r.TryDecodeAsNil() { x.EnableHostPathProvisioning = false @@ -12220,8 +12261,8 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.PersistentVolumeRecyclerConfiguration = PersistentVolumeRecyclerConfiguration{} } else { - yyv1384 := &x.PersistentVolumeRecyclerConfiguration - yyv1384.CodecDecodeSelf(d) + yyv1389 := &x.PersistentVolumeRecyclerConfiguration + yyv1389.CodecDecodeSelf(d) } case "flexVolumePluginDir": if r.TryDecodeAsNil() { @@ -12230,9 +12271,9 @@ func (x *VolumeConfiguration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder x.FlexVolumePluginDir = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys1381) - } // end switch yys1381 - } // end for yyj1381 + z.DecStructFieldNotFound(-1, yys1386) + } // end switch yys1386 + } // end for yyj1386 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -12240,16 +12281,16 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1386 int - var yyb1386 bool - var yyhl1386 bool = l >= 0 - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + var yyj1391 int + var yyb1391 bool + var yyhl1391 bool = l >= 0 + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12259,13 +12300,13 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.EnableHostPathProvisioning = bool(r.DecodeBool()) } - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12275,13 +12316,13 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.EnableDynamicProvisioning = bool(r.DecodeBool()) } - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12289,16 +12330,16 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.PersistentVolumeRecyclerConfiguration = PersistentVolumeRecyclerConfiguration{} } else { - yyv1389 := &x.PersistentVolumeRecyclerConfiguration - yyv1389.CodecDecodeSelf(d) + yyv1394 := &x.PersistentVolumeRecyclerConfiguration + yyv1394.CodecDecodeSelf(d) } - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12309,17 +12350,17 @@ func (x *VolumeConfiguration) codecDecodeSelfFromArray(l int, d *codec1978.Decod x.FlexVolumePluginDir = string(r.DecodeString()) } for { - yyj1386++ - if yyhl1386 { - yyb1386 = yyj1386 > l + yyj1391++ + if yyhl1391 { + yyb1391 = yyj1391 > l } else { - yyb1386 = r.CheckBreak() + yyb1391 = r.CheckBreak() } - if yyb1386 { + if yyb1391 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1386-1, "") + z.DecStructFieldNotFound(yyj1391-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -12331,33 +12372,33 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc if x == nil { r.EncodeNil() } else { - yym1391 := z.EncBinary() - _ = yym1391 + yym1396 := z.EncBinary() + _ = yym1396 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1392 := !z.EncBinary() - yy2arr1392 := z.EncBasicHandle().StructToArray - var yyq1392 [7]bool - _, _, _ = yysep1392, yyq1392, yy2arr1392 - const yyr1392 bool = false - var yynn1392 int - if yyr1392 || yy2arr1392 { + yysep1397 := !z.EncBinary() + yy2arr1397 := z.EncBasicHandle().StructToArray + var yyq1397 [7]bool + _, _, _ = yysep1397, yyq1397, yy2arr1397 + const yyr1397 bool = false + var yynn1397 int + if yyr1397 || yy2arr1397 { r.EncodeArrayStart(7) } else { - yynn1392 = 7 - for _, b := range yyq1392 { + yynn1397 = 7 + for _, b := range yyq1397 { if b { - yynn1392++ + yynn1397++ } } - r.EncodeMapStart(yynn1392) - yynn1392 = 0 + r.EncodeMapStart(yynn1397) + yynn1397 = 0 } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1394 := z.EncBinary() - _ = yym1394 + yym1399 := z.EncBinary() + _ = yym1399 if false { } else { r.EncodeInt(int64(x.MaximumRetry)) @@ -12366,17 +12407,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("maximumRetry")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1395 := z.EncBinary() - _ = yym1395 + yym1400 := z.EncBinary() + _ = yym1400 if false { } else { r.EncodeInt(int64(x.MaximumRetry)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1397 := z.EncBinary() - _ = yym1397 + yym1402 := z.EncBinary() + _ = yym1402 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutNFS)) @@ -12385,17 +12426,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumTimeoutNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1398 := z.EncBinary() - _ = yym1398 + yym1403 := z.EncBinary() + _ = yym1403 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutNFS)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1400 := z.EncBinary() - _ = yym1400 + yym1405 := z.EncBinary() + _ = yym1405 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathNFS)) @@ -12404,17 +12445,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podTemplateFilePathNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1401 := z.EncBinary() - _ = yym1401 + yym1406 := z.EncBinary() + _ = yym1406 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathNFS)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1403 := z.EncBinary() - _ = yym1403 + yym1408 := z.EncBinary() + _ = yym1408 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutNFS)) @@ -12423,17 +12464,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("incrementTimeoutNFS")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1404 := z.EncBinary() - _ = yym1404 + yym1409 := z.EncBinary() + _ = yym1409 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutNFS)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1406 := z.EncBinary() - _ = yym1406 + yym1411 := z.EncBinary() + _ = yym1411 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathHostPath)) @@ -12442,17 +12483,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podTemplateFilePathHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1407 := z.EncBinary() - _ = yym1407 + yym1412 := z.EncBinary() + _ = yym1412 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.PodTemplateFilePathHostPath)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1409 := z.EncBinary() - _ = yym1409 + yym1414 := z.EncBinary() + _ = yym1414 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutHostPath)) @@ -12461,17 +12502,17 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minimumTimeoutHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1410 := z.EncBinary() - _ = yym1410 + yym1415 := z.EncBinary() + _ = yym1415 if false { } else { r.EncodeInt(int64(x.MinimumTimeoutHostPath)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1412 := z.EncBinary() - _ = yym1412 + yym1417 := z.EncBinary() + _ = yym1417 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutHostPath)) @@ -12480,14 +12521,14 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecEncodeSelf(e *codec1978.Enc z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("incrementTimeoutHostPath")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1413 := z.EncBinary() - _ = yym1413 + yym1418 := z.EncBinary() + _ = yym1418 if false { } else { r.EncodeInt(int64(x.IncrementTimeoutHostPath)) } } - if yyr1392 || yy2arr1392 { + if yyr1397 || yy2arr1397 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -12500,25 +12541,25 @@ func (x *PersistentVolumeRecyclerConfiguration) CodecDecodeSelf(d *codec1978.Dec var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1414 := z.DecBinary() - _ = yym1414 + yym1419 := z.DecBinary() + _ = yym1419 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1415 := r.ContainerType() - if yyct1415 == codecSelferValueTypeMap1234 { - yyl1415 := r.ReadMapStart() - if yyl1415 == 0 { + yyct1420 := r.ContainerType() + if yyct1420 == codecSelferValueTypeMap1234 { + yyl1420 := r.ReadMapStart() + if yyl1420 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1415, d) + x.codecDecodeSelfFromMap(yyl1420, d) } - } else if yyct1415 == codecSelferValueTypeArray1234 { - yyl1415 := r.ReadArrayStart() - if yyl1415 == 0 { + } else if yyct1420 == codecSelferValueTypeArray1234 { + yyl1420 := r.ReadArrayStart() + if yyl1420 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1415, d) + x.codecDecodeSelfFromArray(yyl1420, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -12530,12 +12571,12 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1416Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1416Slc - var yyhl1416 bool = l >= 0 - for yyj1416 := 0; ; yyj1416++ { - if yyhl1416 { - if yyj1416 >= l { + var yys1421Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1421Slc + var yyhl1421 bool = l >= 0 + for yyj1421 := 0; ; yyj1421++ { + if yyhl1421 { + if yyj1421 >= l { break } } else { @@ -12544,10 +12585,10 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1416Slc = r.DecodeBytes(yys1416Slc, true, true) - yys1416 := string(yys1416Slc) + yys1421Slc = r.DecodeBytes(yys1421Slc, true, true) + yys1421 := string(yys1421Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1416 { + switch yys1421 { case "maximumRetry": if r.TryDecodeAsNil() { x.MaximumRetry = 0 @@ -12591,9 +12632,9 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromMap(l int, d x.IncrementTimeoutHostPath = int32(r.DecodeInt(32)) } default: - z.DecStructFieldNotFound(-1, yys1416) - } // end switch yys1416 - } // end for yyj1416 + z.DecStructFieldNotFound(-1, yys1421) + } // end switch yys1421 + } // end for yyj1421 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -12601,16 +12642,16 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1424 int - var yyb1424 bool - var yyhl1424 bool = l >= 0 - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + var yyj1429 int + var yyb1429 bool + var yyhl1429 bool = l >= 0 + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12620,13 +12661,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MaximumRetry = int32(r.DecodeInt(32)) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12636,13 +12677,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MinimumTimeoutNFS = int32(r.DecodeInt(32)) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12652,13 +12693,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.PodTemplateFilePathNFS = string(r.DecodeString()) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12668,13 +12709,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.IncrementTimeoutNFS = int32(r.DecodeInt(32)) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12684,13 +12725,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.PodTemplateFilePathHostPath = string(r.DecodeString()) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12700,13 +12741,13 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, } else { x.MinimumTimeoutHostPath = int32(r.DecodeInt(32)) } - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -12717,17 +12758,17 @@ func (x *PersistentVolumeRecyclerConfiguration) codecDecodeSelfFromArray(l int, x.IncrementTimeoutHostPath = int32(r.DecodeInt(32)) } for { - yyj1424++ - if yyhl1424 { - yyb1424 = yyj1424 > l + yyj1429++ + if yyhl1429 { + yyb1429 = yyj1429 > l } else { - yyb1424 = r.CheckBreak() + yyb1429 = r.CheckBreak() } - if yyb1424 { + if yyb1429 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1424-1, "") + z.DecStructFieldNotFound(yyj1429-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -12737,20 +12778,20 @@ func (x codecSelfer1234) encconfig_ConfigurationMap(v pkg2_config.ConfigurationM z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeMapStart(len(v)) - for yyk1432, yyv1432 := range v { + for yyk1437, yyv1437 := range v { z.EncSendContainerState(codecSelfer_containerMapKey1234) - yym1433 := z.EncBinary() - _ = yym1433 + yym1438 := z.EncBinary() + _ = yym1438 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyk1432)) + r.EncodeString(codecSelferC_UTF81234, string(yyk1437)) } z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1434 := z.EncBinary() - _ = yym1434 + yym1439 := z.EncBinary() + _ = yym1439 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyv1432)) + r.EncodeString(codecSelferC_UTF81234, string(yyv1437)) } } z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -12761,63 +12802,63 @@ func (x codecSelfer1234) decconfig_ConfigurationMap(v *pkg2_config.Configuration z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1435 := *v - yyl1435 := r.ReadMapStart() - yybh1435 := z.DecBasicHandle() - if yyv1435 == nil { - yyrl1435, _ := z.DecInferLen(yyl1435, yybh1435.MaxInitLen, 32) - yyv1435 = make(map[string]string, yyrl1435) - *v = yyv1435 + yyv1440 := *v + yyl1440 := r.ReadMapStart() + yybh1440 := z.DecBasicHandle() + if yyv1440 == nil { + yyrl1440, _ := z.DecInferLen(yyl1440, yybh1440.MaxInitLen, 32) + yyv1440 = make(map[string]string, yyrl1440) + *v = yyv1440 } - var yymk1435 string - var yymv1435 string - var yymg1435 bool - if yybh1435.MapValueReset { + var yymk1440 string + var yymv1440 string + var yymg1440 bool + if yybh1440.MapValueReset { } - if yyl1435 > 0 { - for yyj1435 := 0; yyj1435 < yyl1435; yyj1435++ { + if yyl1440 > 0 { + for yyj1440 := 0; yyj1440 < yyl1440; yyj1440++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk1435 = "" + yymk1440 = "" } else { - yymk1435 = string(r.DecodeString()) + yymk1440 = string(r.DecodeString()) } - if yymg1435 { - yymv1435 = yyv1435[yymk1435] + if yymg1440 { + yymv1440 = yyv1440[yymk1440] } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv1435 = "" + yymv1440 = "" } else { - yymv1435 = string(r.DecodeString()) + yymv1440 = string(r.DecodeString()) } - if yyv1435 != nil { - yyv1435[yymk1435] = yymv1435 + if yyv1440 != nil { + yyv1440[yymk1440] = yymv1440 } } - } else if yyl1435 < 0 { - for yyj1435 := 0; !r.CheckBreak(); yyj1435++ { + } else if yyl1440 < 0 { + for yyj1440 := 0; !r.CheckBreak(); yyj1440++ { z.DecSendContainerState(codecSelfer_containerMapKey1234) if r.TryDecodeAsNil() { - yymk1435 = "" + yymk1440 = "" } else { - yymk1435 = string(r.DecodeString()) + yymk1440 = string(r.DecodeString()) } - if yymg1435 { - yymv1435 = yyv1435[yymk1435] + if yymg1440 { + yymv1440 = yyv1440[yymk1440] } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv1435 = "" + yymv1440 = "" } else { - yymv1435 = string(r.DecodeString()) + yymv1440 = string(r.DecodeString()) } - if yyv1435 != nil { - yyv1435[yymk1435] = yymv1435 + if yyv1440 != nil { + yyv1440[yymk1440] = yymv1440 } } } // else len==0: TODO: Should we clear map entries? diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/types.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/types.go index db7778cff21..ed0141f64c0 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/types.go @@ -17,12 +17,12 @@ limitations under the License. package componentconfig import ( - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" utilconfig "k8s.io/client-go/pkg/util/config" ) type KubeProxyConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // bindAddress is the IP address for the proxy server to serve on (set to 0.0.0.0 // for all interfaces) @@ -43,10 +43,10 @@ type KubeProxyConfiguration struct { IPTablesMasqueradeBit *int32 `json:"iptablesMasqueradeBit"` // iptablesSyncPeriod is the period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). Must be greater than 0. - IPTablesSyncPeriod unversioned.Duration `json:"iptablesSyncPeriodSeconds"` + IPTablesSyncPeriod metav1.Duration `json:"iptablesSyncPeriodSeconds"` // iptablesMinSyncPeriod is the minimum period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). - IPTablesMinSyncPeriod unversioned.Duration `json:"iptablesMinSyncPeriodSeconds"` + IPTablesMinSyncPeriod metav1.Duration `json:"iptablesMinSyncPeriodSeconds"` // kubeconfigPath is the path to the kubeconfig file with authorization information (the // master location is set by the master flag). KubeconfigPath string `json:"kubeconfigPath"` @@ -67,7 +67,7 @@ type KubeProxyConfiguration struct { ResourceContainer string `json:"resourceContainer"` // udpIdleTimeout is how long an idle UDP connection will be kept open (e.g. '250ms', '2s'). // Must be greater than 0. Only applicable for proxyMode=userspace. - UDPIdleTimeout unversioned.Duration `json:"udpTimeoutMilliseconds"` + UDPIdleTimeout metav1.Duration `json:"udpTimeoutMilliseconds"` // conntrackMax is the maximum number of NAT connections to track (0 to // leave as-is). This takes precedence over conntrackMaxPerCore and conntrackMin. ConntrackMax int32 `json:"conntrackMax"` @@ -79,11 +79,11 @@ type KubeProxyConfiguration struct { ConntrackMin int32 `json:"conntrackMin"` // conntrackTCPEstablishedTimeout is how long an idle TCP connection will be kept open // (e.g. '2s'). Must be greater than 0. - ConntrackTCPEstablishedTimeout unversioned.Duration `json:"conntrackTCPEstablishedTimeout"` + ConntrackTCPEstablishedTimeout metav1.Duration `json:"conntrackTCPEstablishedTimeout"` // conntrackTCPCloseWaitTimeout is how long an idle conntrack entry // in CLOSE_WAIT state will remain in the conntrack // table. (e.g. '60s'). Must be greater than 0 to set. - ConntrackTCPCloseWaitTimeout unversioned.Duration `json:"conntrackTCPCloseWaitTimeout"` + ConntrackTCPCloseWaitTimeout metav1.Duration `json:"conntrackTCPCloseWaitTimeout"` } // Currently two modes of proxying are available: 'userspace' (older, stable) or 'iptables' @@ -119,19 +119,19 @@ const ( // TODO: curate the ordering and structure of this config object type KubeletConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // podManifestPath is the path to the directory containing pod manifests to // run, or the path to a single manifest file PodManifestPath string `json:"podManifestPath"` // syncFrequency is the max period between synchronizing running // containers and config - SyncFrequency unversioned.Duration `json:"syncFrequency"` + SyncFrequency metav1.Duration `json:"syncFrequency"` // fileCheckFrequency is the duration between checking config files for // new data - FileCheckFrequency unversioned.Duration `json:"fileCheckFrequency"` + FileCheckFrequency metav1.Duration `json:"fileCheckFrequency"` // httpCheckFrequency is the duration between checking http for new data - HTTPCheckFrequency unversioned.Duration `json:"httpCheckFrequency"` + HTTPCheckFrequency metav1.Duration `json:"httpCheckFrequency"` // manifestURL is the URL for accessing the container manifest ManifestURL string `json:"manifestURL"` // manifestURLHeader is the HTTP header to use when accessing the manifest @@ -209,7 +209,7 @@ type KubeletConfiguration struct { EnableDebuggingHandlers bool `json:"enableDebuggingHandlers"` // minimumGCAge is the minimum age for a finished container before it is // garbage collected. - MinimumGCAge unversioned.Duration `json:"minimumGCAge"` + MinimumGCAge metav1.Duration `json:"minimumGCAge"` // maxPerPodContainerCount is the maximum number of old instances to // retain per container. Each container takes up some disk space. MaxPerPodContainerCount int32 `json:"maxPerPodContainerCount"` @@ -241,14 +241,14 @@ type KubeletConfiguration struct { ClusterDNS string `json:"clusterDNS"` // streamingConnectionIdleTimeout is the maximum time a streaming connection // can be idle before the connection is automatically closed. - StreamingConnectionIdleTimeout unversioned.Duration `json:"streamingConnectionIdleTimeout"` + StreamingConnectionIdleTimeout metav1.Duration `json:"streamingConnectionIdleTimeout"` // nodeStatusUpdateFrequency is the frequency that kubelet posts node // status to master. Note: be cautious when changing the constant, it // must work with nodeMonitorGracePeriod in nodecontroller. - NodeStatusUpdateFrequency unversioned.Duration `json:"nodeStatusUpdateFrequency"` + NodeStatusUpdateFrequency metav1.Duration `json:"nodeStatusUpdateFrequency"` // imageMinimumGCAge is the minimum age for an unused image before it is // garbage collected. - ImageMinimumGCAge unversioned.Duration `json:"imageMinimumGCAge"` + ImageMinimumGCAge metav1.Duration `json:"imageMinimumGCAge"` // imageGCHighThresholdPercent is the percent of disk usage after which // image garbage collection is always run. ImageGCHighThresholdPercent int32 `json:"imageGCHighThresholdPercent"` @@ -261,7 +261,7 @@ type KubeletConfiguration struct { // be rejected. LowDiskSpaceThresholdMB int32 `json:"lowDiskSpaceThresholdMB"` // How frequently to calculate and cache volume disk usage for all pods - VolumeStatsAggPeriod unversioned.Duration `json:"volumeStatsAggPeriod"` + VolumeStatsAggPeriod metav1.Duration `json:"volumeStatsAggPeriod"` // networkPluginName is the name of the network plugin to be invoked for // various events in kubelet/pod lifecycle NetworkPluginName string `json:"networkPluginName"` @@ -319,7 +319,7 @@ type KubeletConfiguration struct { // runtimeRequestTimeout is the timeout for all runtime requests except long running // requests - pull, logs, exec and attach. // +optional - RuntimeRequestTimeout unversioned.Duration `json:"runtimeRequestTimeout,omitempty"` + RuntimeRequestTimeout metav1.Duration `json:"runtimeRequestTimeout,omitempty"` // rktPath is the path of rkt binary. Leave empty to use the first rkt in // $PATH. // +optional @@ -395,7 +395,7 @@ type KubeletConfiguration struct { // outOfDiskTransitionFrequency is duration for which the kubelet has to // wait before transitioning out of out-of-disk node condition status. // +optional - OutOfDiskTransitionFrequency unversioned.Duration `json:"outOfDiskTransitionFrequency,omitempty"` + OutOfDiskTransitionFrequency metav1.Duration `json:"outOfDiskTransitionFrequency,omitempty"` // nodeIP is IP address of the node. If set, kubelet will use this IP // address for the node. // +optional @@ -417,7 +417,7 @@ type KubeletConfiguration struct { EvictionSoftGracePeriod string `json:"evictionSoftGracePeriod,omitempty"` // Duration for which the kubelet has to wait before transitioning out of an eviction pressure condition. // +optional - EvictionPressureTransitionPeriod unversioned.Duration `json:"evictionPressureTransitionPeriod,omitempty"` + EvictionPressureTransitionPeriod metav1.Duration `json:"evictionPressureTransitionPeriod,omitempty"` // Maximum allowed grace period (in seconds) to use when terminating pods in response to a soft eviction threshold being met. // +optional EvictionMaxPodGracePeriod int32 `json:"evictionMaxPodGracePeriod,omitempty"` @@ -493,9 +493,9 @@ type KubeletAuthorization struct { type KubeletWebhookAuthorization struct { // cacheAuthorizedTTL is the duration to cache 'authorized' responses from the webhook authorizer. - CacheAuthorizedTTL unversioned.Duration `json:"cacheAuthorizedTTL"` + CacheAuthorizedTTL metav1.Duration `json:"cacheAuthorizedTTL"` // cacheUnauthorizedTTL is the duration to cache 'unauthorized' responses from the webhook authorizer. - CacheUnauthorizedTTL unversioned.Duration `json:"cacheUnauthorizedTTL"` + CacheUnauthorizedTTL metav1.Duration `json:"cacheUnauthorizedTTL"` } type KubeletAuthentication struct { @@ -518,7 +518,7 @@ type KubeletWebhookAuthentication struct { // enabled allows bearer token authentication backed by the tokenreviews.authentication.k8s.io API Enabled bool `json:"enabled"` // cacheTTL enables caching of authentication results - CacheTTL unversioned.Duration `json:"cacheTTL"` + CacheTTL metav1.Duration `json:"cacheTTL"` } type KubeletAnonymousAuthentication struct { @@ -529,7 +529,7 @@ type KubeletAnonymousAuthentication struct { } type KubeSchedulerConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // port is the port that the scheduler's http service runs on. Port int32 `json:"port"` @@ -541,6 +541,8 @@ type KubeSchedulerConfiguration struct { PolicyConfigFile string `json:"policyConfigFile"` // enableProfiling enables profiling via web interface. EnableProfiling bool `json:"enableProfiling"` + // enableContentionProfiling enables lock contention profiling, if enableProfiling is true. + EnableContentionProfiling bool `json:"enableContentionProfiling"` // contentType is contentType of requests sent to apiserver. ContentType string `json:"contentType"` // kubeAPIQPS is the QPS to use while talking with kubernetes apiserver. @@ -574,20 +576,20 @@ type LeaderElectionConfiguration struct { // maximum duration that a leader can be stopped before it is replaced // by another candidate. This is only applicable if leader election is // enabled. - LeaseDuration unversioned.Duration `json:"leaseDuration"` + LeaseDuration metav1.Duration `json:"leaseDuration"` // renewDeadline is the interval between attempts by the acting master to // renew a leadership slot before it stops leading. This must be less // than or equal to the lease duration. This is only applicable if leader // election is enabled. - RenewDeadline unversioned.Duration `json:"renewDeadline"` + RenewDeadline metav1.Duration `json:"renewDeadline"` // retryPeriod is the duration the clients should wait between attempting // acquisition and renewal of a leadership. This is only applicable if // leader election is enabled. - RetryPeriod unversioned.Duration `json:"retryPeriod"` + RetryPeriod metav1.Duration `json:"retryPeriod"` } type KubeControllerManagerConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // port is the port that the controller-manager's http service runs on. Port int32 `json:"port"` @@ -649,36 +651,36 @@ type KubeControllerManagerConfiguration struct { LookupCacheSizeForDaemonSet int32 `json:"lookupCacheSizeForDaemonSet"` // serviceSyncPeriod is the period for syncing services with their external // load balancers. - ServiceSyncPeriod unversioned.Duration `json:"serviceSyncPeriod"` + ServiceSyncPeriod metav1.Duration `json:"serviceSyncPeriod"` // nodeSyncPeriod is the period for syncing nodes from cloudprovider. Longer // periods will result in fewer calls to cloud provider, but may delay addition // of new nodes to cluster. - NodeSyncPeriod unversioned.Duration `json:"nodeSyncPeriod"` + NodeSyncPeriod metav1.Duration `json:"nodeSyncPeriod"` // routeReconciliationPeriod is the period for reconciling routes created for Nodes by cloud provider.. - RouteReconciliationPeriod unversioned.Duration `json:"routeReconciliationPeriod"` + RouteReconciliationPeriod metav1.Duration `json:"routeReconciliationPeriod"` // resourceQuotaSyncPeriod is the period for syncing quota usage status // in the system. - ResourceQuotaSyncPeriod unversioned.Duration `json:"resourceQuotaSyncPeriod"` + ResourceQuotaSyncPeriod metav1.Duration `json:"resourceQuotaSyncPeriod"` // namespaceSyncPeriod is the period for syncing namespace life-cycle // updates. - NamespaceSyncPeriod unversioned.Duration `json:"namespaceSyncPeriod"` + NamespaceSyncPeriod metav1.Duration `json:"namespaceSyncPeriod"` // pvClaimBinderSyncPeriod is the period for syncing persistent volumes // and persistent volume claims. - PVClaimBinderSyncPeriod unversioned.Duration `json:"pvClaimBinderSyncPeriod"` + PVClaimBinderSyncPeriod metav1.Duration `json:"pvClaimBinderSyncPeriod"` // minResyncPeriod is the resync period in reflectors; will be random between // minResyncPeriod and 2*minResyncPeriod. - MinResyncPeriod unversioned.Duration `json:"minResyncPeriod"` + MinResyncPeriod metav1.Duration `json:"minResyncPeriod"` // terminatedPodGCThreshold is the number of terminated pods that can exist // before the terminated pod garbage collector starts deleting terminated pods. // If <= 0, the terminated pod garbage collector is disabled. TerminatedPodGCThreshold int32 `json:"terminatedPodGCThreshold"` // horizontalPodAutoscalerSyncPeriod is the period for syncing the number of // pods in horizontal pod autoscaler. - HorizontalPodAutoscalerSyncPeriod unversioned.Duration `json:"horizontalPodAutoscalerSyncPeriod"` + HorizontalPodAutoscalerSyncPeriod metav1.Duration `json:"horizontalPodAutoscalerSyncPeriod"` // deploymentControllerSyncPeriod is the period for syncing the deployments. - DeploymentControllerSyncPeriod unversioned.Duration `json:"deploymentControllerSyncPeriod"` + DeploymentControllerSyncPeriod metav1.Duration `json:"deploymentControllerSyncPeriod"` // podEvictionTimeout is the grace period for deleting pods on failed nodes. - PodEvictionTimeout unversioned.Duration `json:"podEvictionTimeout"` + PodEvictionTimeout metav1.Duration `json:"podEvictionTimeout"` // DEPRECATED: deletingPodsQps is the number of nodes per second on which pods are deleted in // case of node failure. DeletingPodsQps float32 `json:"deletingPodsQps"` @@ -689,15 +691,15 @@ type KubeControllerManagerConfiguration struct { // unresponsive before marking it unhealthy. Must be N times more than kubelet's // nodeStatusUpdateFrequency, where N means number of retries allowed for kubelet // to post node status. - NodeMonitorGracePeriod unversioned.Duration `json:"nodeMonitorGracePeriod"` + NodeMonitorGracePeriod metav1.Duration `json:"nodeMonitorGracePeriod"` // registerRetryCount is the number of retries for initial node registration. // Retry interval equals node-sync-period. RegisterRetryCount int32 `json:"registerRetryCount"` // nodeStartupGracePeriod is the amount of time which we allow starting a node to // be unresponsive before marking it unhealthy. - NodeStartupGracePeriod unversioned.Duration `json:"nodeStartupGracePeriod"` + NodeStartupGracePeriod metav1.Duration `json:"nodeStartupGracePeriod"` // nodeMonitorPeriod is the period for syncing NodeStatus in NodeController. - NodeMonitorPeriod unversioned.Duration `json:"nodeMonitorPeriod"` + NodeMonitorPeriod metav1.Duration `json:"nodeMonitorPeriod"` // serviceAccountKeyFile is the filename containing a PEM-encoded private RSA key // used to sign service account tokens. ServiceAccountKeyFile string `json:"serviceAccountKeyFile"` @@ -743,7 +745,7 @@ type KubeControllerManagerConfiguration struct { // volumeConfiguration holds configuration for volume related features. VolumeConfiguration VolumeConfiguration `json:"volumeConfiguration"` // How long to wait between starting controller managers - ControllerStartInterval unversioned.Duration `json:"controllerStartInterval"` + ControllerStartInterval metav1.Duration `json:"controllerStartInterval"` // enables the generic garbage collector. MUST be synced with the // corresponding flag of the kube-apiserver. WARNING: the generic garbage // collector is an alpha feature. diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/defaults.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/defaults.go index 9e230cb987e..8e746dfa153 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/defaults.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/kubelet/qos" kubetypes "k8s.io/client-go/pkg/kubelet/types" "k8s.io/client-go/pkg/master/ports" @@ -48,7 +48,7 @@ const ( defaultIPTablesDropBit = 15 ) -var zeroDuration = unversioned.Duration{} +var zeroDuration = metav1.Duration{} func addDefaultingFuncs(scheme *kruntime.Scheme) error { RegisterDefaults(scheme) @@ -78,11 +78,11 @@ func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) { obj.ResourceContainer = "/kube-proxy" } if obj.IPTablesSyncPeriod.Duration == 0 { - obj.IPTablesSyncPeriod = unversioned.Duration{Duration: 30 * time.Second} + obj.IPTablesSyncPeriod = metav1.Duration{Duration: 30 * time.Second} } - zero := unversioned.Duration{} + zero := metav1.Duration{} if obj.UDPIdleTimeout == zero { - obj.UDPIdleTimeout = unversioned.Duration{Duration: 250 * time.Millisecond} + obj.UDPIdleTimeout = metav1.Duration{Duration: 250 * time.Millisecond} } // If ConntrackMax is set, respect it. if obj.ConntrackMax == 0 { @@ -99,7 +99,7 @@ func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) { obj.IPTablesMasqueradeBit = &temp } if obj.ConntrackTCPEstablishedTimeout == zero { - obj.ConntrackTCPEstablishedTimeout = unversioned.Duration{Duration: 24 * time.Hour} // 1 day (1/5 default) + obj.ConntrackTCPEstablishedTimeout = metav1.Duration{Duration: 24 * time.Hour} // 1 day (1/5 default) } if obj.ConntrackTCPCloseWaitTimeout == zero { // See https://github.com/kubernetes/kubernetes/issues/32551. @@ -122,7 +122,7 @@ func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) { // // We set CLOSE_WAIT to one hour by default to better match // typical server timeouts. - obj.ConntrackTCPCloseWaitTimeout = unversioned.Duration{Duration: 1 * time.Hour} + obj.ConntrackTCPCloseWaitTimeout = metav1.Duration{Duration: 1 * time.Hour} } } @@ -157,15 +157,15 @@ func SetDefaults_KubeSchedulerConfiguration(obj *KubeSchedulerConfiguration) { } func SetDefaults_LeaderElectionConfiguration(obj *LeaderElectionConfiguration) { - zero := unversioned.Duration{} + zero := metav1.Duration{} if obj.LeaseDuration == zero { - obj.LeaseDuration = unversioned.Duration{Duration: 15 * time.Second} + obj.LeaseDuration = metav1.Duration{Duration: 15 * time.Second} } if obj.RenewDeadline == zero { - obj.RenewDeadline = unversioned.Duration{Duration: 10 * time.Second} + obj.RenewDeadline = metav1.Duration{Duration: 10 * time.Second} } if obj.RetryPeriod == zero { - obj.RetryPeriod = unversioned.Duration{Duration: 2 * time.Second} + obj.RetryPeriod = metav1.Duration{Duration: 2 * time.Second} } } @@ -177,16 +177,16 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.Authentication.Webhook.Enabled = boolVar(false) } if obj.Authentication.Webhook.CacheTTL == zeroDuration { - obj.Authentication.Webhook.CacheTTL = unversioned.Duration{Duration: 2 * time.Minute} + obj.Authentication.Webhook.CacheTTL = metav1.Duration{Duration: 2 * time.Minute} } if obj.Authorization.Mode == "" { obj.Authorization.Mode = KubeletAuthorizationModeAlwaysAllow } if obj.Authorization.Webhook.CacheAuthorizedTTL == zeroDuration { - obj.Authorization.Webhook.CacheAuthorizedTTL = unversioned.Duration{Duration: 5 * time.Minute} + obj.Authorization.Webhook.CacheAuthorizedTTL = metav1.Duration{Duration: 5 * time.Minute} } if obj.Authorization.Webhook.CacheUnauthorizedTTL == zeroDuration { - obj.Authorization.Webhook.CacheUnauthorizedTTL = unversioned.Duration{Duration: 30 * time.Second} + obj.Authorization.Webhook.CacheUnauthorizedTTL = metav1.Duration{Duration: 30 * time.Second} } if obj.Address == "" { @@ -199,7 +199,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.CAdvisorPort = 4194 } if obj.VolumeStatsAggPeriod == zeroDuration { - obj.VolumeStatsAggPeriod = unversioned.Duration{Duration: time.Minute} + obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute} } if obj.CertDirectory == "" { obj.CertDirectory = "/var/run/kubernetes" @@ -211,7 +211,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.ContainerRuntime = "docker" } if obj.RuntimeRequestTimeout == zeroDuration { - obj.RuntimeRequestTimeout = unversioned.Duration{Duration: 2 * time.Minute} + obj.RuntimeRequestTimeout = metav1.Duration{Duration: 2 * time.Minute} } if obj.CPUCFSQuota == nil { obj.CPUCFSQuota = boolVar(true) @@ -239,7 +239,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.EnableServer = boolVar(true) } if obj.FileCheckFrequency == zeroDuration { - obj.FileCheckFrequency = unversioned.Duration{Duration: 20 * time.Second} + obj.FileCheckFrequency = metav1.Duration{Duration: 20 * time.Second} } if obj.HealthzBindAddress == "" { obj.HealthzBindAddress = "127.0.0.1" @@ -257,10 +257,10 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.HostIPCSources = []string{kubetypes.AllSource} } if obj.HTTPCheckFrequency == zeroDuration { - obj.HTTPCheckFrequency = unversioned.Duration{Duration: 20 * time.Second} + obj.HTTPCheckFrequency = metav1.Duration{Duration: 20 * time.Second} } if obj.ImageMinimumGCAge == zeroDuration { - obj.ImageMinimumGCAge = unversioned.Duration{Duration: 2 * time.Minute} + obj.ImageMinimumGCAge = metav1.Duration{Duration: 2 * time.Minute} } if obj.ImageGCHighThresholdPercent == nil { temp := int32(90) @@ -290,7 +290,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.MaxPods = 110 } if obj.MinimumGCAge == zeroDuration { - obj.MinimumGCAge = unversioned.Duration{Duration: 0} + obj.MinimumGCAge = metav1.Duration{Duration: 0} } if obj.NonMasqueradeCIDR == "" { obj.NonMasqueradeCIDR = "10.0.0.0/8" @@ -299,7 +299,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.VolumePluginDir = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/" } if obj.NodeStatusUpdateFrequency == zeroDuration { - obj.NodeStatusUpdateFrequency = unversioned.Duration{Duration: 10 * time.Second} + obj.NodeStatusUpdateFrequency = metav1.Duration{Duration: 10 * time.Second} } if obj.OOMScoreAdj == nil { temp := int32(qos.KubeletOOMScoreAdj) @@ -343,10 +343,10 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.SeccompProfileRoot = filepath.Join(defaultRootDir, "seccomp") } if obj.StreamingConnectionIdleTimeout == zeroDuration { - obj.StreamingConnectionIdleTimeout = unversioned.Duration{Duration: 4 * time.Hour} + obj.StreamingConnectionIdleTimeout = metav1.Duration{Duration: 4 * time.Hour} } if obj.SyncFrequency == zeroDuration { - obj.SyncFrequency = unversioned.Duration{Duration: 1 * time.Minute} + obj.SyncFrequency = metav1.Duration{Duration: 1 * time.Minute} } if obj.ReconcileCIDR == nil { obj.ReconcileCIDR = boolVar(true) @@ -362,7 +362,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.KubeAPIBurst = 10 } if obj.OutOfDiskTransitionFrequency == zeroDuration { - obj.OutOfDiskTransitionFrequency = unversioned.Duration{Duration: 5 * time.Minute} + obj.OutOfDiskTransitionFrequency = metav1.Duration{Duration: 5 * time.Minute} } if string(obj.HairpinMode) == "" { obj.HairpinMode = PromiscuousBridge @@ -372,7 +372,7 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) { obj.EvictionHard = &temp } if obj.EvictionPressureTransitionPeriod == zeroDuration { - obj.EvictionPressureTransitionPeriod = unversioned.Duration{Duration: 5 * time.Minute} + obj.EvictionPressureTransitionPeriod = metav1.Duration{Duration: 5 * time.Minute} } if obj.SystemReserved == nil { obj.SystemReserved = make(map[string]string) diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/types.go index 61bfed4e7b5..ddaef7629c6 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/types.go @@ -16,10 +16,12 @@ limitations under the License. package v1alpha1 -import "k8s.io/client-go/pkg/api/unversioned" +import ( + metav1 "k8s.io/client-go/pkg/apis/meta/v1" +) type KubeProxyConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // bindAddress is the IP address for the proxy server to serve on (set to 0.0.0.0 // for all interfaces) @@ -40,10 +42,10 @@ type KubeProxyConfiguration struct { IPTablesMasqueradeBit *int32 `json:"iptablesMasqueradeBit"` // iptablesSyncPeriod is the period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). Must be greater than 0. - IPTablesSyncPeriod unversioned.Duration `json:"iptablesSyncPeriodSeconds"` + IPTablesSyncPeriod metav1.Duration `json:"iptablesSyncPeriodSeconds"` // iptablesMinSyncPeriod is the minimum period that iptables rules are refreshed (e.g. '5s', '1m', // '2h22m'). - IPTablesMinSyncPeriod unversioned.Duration `json:"iptablesMinSyncPeriodSeconds"` + IPTablesMinSyncPeriod metav1.Duration `json:"iptablesMinSyncPeriodSeconds"` // kubeconfigPath is the path to the kubeconfig file with authorization information (the // master location is set by the master flag). KubeconfigPath string `json:"kubeconfigPath"` @@ -64,7 +66,7 @@ type KubeProxyConfiguration struct { ResourceContainer string `json:"resourceContainer"` // udpIdleTimeout is how long an idle UDP connection will be kept open (e.g. '250ms', '2s'). // Must be greater than 0. Only applicable for proxyMode=userspace. - UDPIdleTimeout unversioned.Duration `json:"udpTimeoutMilliseconds"` + UDPIdleTimeout metav1.Duration `json:"udpTimeoutMilliseconds"` // conntrackMax is the maximum number of NAT connections to track (0 to // leave as-is). This takes precedence over conntrackMaxPerCore and conntrackMin. ConntrackMax int32 `json:"conntrackMax"` @@ -76,11 +78,11 @@ type KubeProxyConfiguration struct { ConntrackMin int32 `json:"conntrackMin"` // conntrackTCPEstablishedTimeout is how long an idle TCP connection // will be kept open (e.g. '2s'). Must be greater than 0. - ConntrackTCPEstablishedTimeout unversioned.Duration `json:"conntrackTCPEstablishedTimeout"` + ConntrackTCPEstablishedTimeout metav1.Duration `json:"conntrackTCPEstablishedTimeout"` // conntrackTCPCloseWaitTimeout is how long an idle conntrack entry // in CLOSE_WAIT state will remain in the conntrack // table. (e.g. '60s'). Must be greater than 0 to set. - ConntrackTCPCloseWaitTimeout unversioned.Duration `json:"conntrackTCPCloseWaitTimeout"` + ConntrackTCPCloseWaitTimeout metav1.Duration `json:"conntrackTCPCloseWaitTimeout"` } // Currently two modes of proxying are available: 'userspace' (older, stable) or 'iptables' @@ -97,7 +99,7 @@ const ( ) type KubeSchedulerConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // port is the port that the scheduler's http service runs on. Port int `json:"port"` @@ -109,6 +111,8 @@ type KubeSchedulerConfiguration struct { PolicyConfigFile string `json:"policyConfigFile"` // enableProfiling enables profiling via web interface. EnableProfiling *bool `json:"enableProfiling"` + // enableContentionProfiling enables lock contention profiling, if enableProfiling is true. + EnableContentionProfiling bool `json:"enableContentionProfiling"` // contentType is contentType of requests sent to apiserver. ContentType string `json:"contentType"` // kubeAPIQPS is the QPS to use while talking with kubernetes apiserver. @@ -160,32 +164,32 @@ type LeaderElectionConfiguration struct { // maximum duration that a leader can be stopped before it is replaced // by another candidate. This is only applicable if leader election is // enabled. - LeaseDuration unversioned.Duration `json:"leaseDuration"` + LeaseDuration metav1.Duration `json:"leaseDuration"` // renewDeadline is the interval between attempts by the acting master to // renew a leadership slot before it stops leading. This must be less // than or equal to the lease duration. This is only applicable if leader // election is enabled. - RenewDeadline unversioned.Duration `json:"renewDeadline"` + RenewDeadline metav1.Duration `json:"renewDeadline"` // retryPeriod is the duration the clients should wait between attempting // acquisition and renewal of a leadership. This is only applicable if // leader election is enabled. - RetryPeriod unversioned.Duration `json:"retryPeriod"` + RetryPeriod metav1.Duration `json:"retryPeriod"` } type KubeletConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta // podManifestPath is the path to the directory containing pod manifests to // run, or the path to a single manifest file PodManifestPath string `json:"podManifestPath"` // syncFrequency is the max period between synchronizing running // containers and config - SyncFrequency unversioned.Duration `json:"syncFrequency"` + SyncFrequency metav1.Duration `json:"syncFrequency"` // fileCheckFrequency is the duration between checking config files for // new data - FileCheckFrequency unversioned.Duration `json:"fileCheckFrequency"` + FileCheckFrequency metav1.Duration `json:"fileCheckFrequency"` // httpCheckFrequency is the duration between checking http for new data - HTTPCheckFrequency unversioned.Duration `json:"httpCheckFrequency"` + HTTPCheckFrequency metav1.Duration `json:"httpCheckFrequency"` // manifestURL is the URL for accessing the container manifest ManifestURL string `json:"manifestURL"` // manifestURLHeader is the HTTP header to use when accessing the manifest @@ -263,7 +267,7 @@ type KubeletConfiguration struct { EnableDebuggingHandlers *bool `json:"enableDebuggingHandlers"` // minimumGCAge is the minimum age for a finished container before it is // garbage collected. - MinimumGCAge unversioned.Duration `json:"minimumGCAge"` + MinimumGCAge metav1.Duration `json:"minimumGCAge"` // maxPerPodContainerCount is the maximum number of old instances to // retain per container. Each container takes up some disk space. MaxPerPodContainerCount int32 `json:"maxPerPodContainerCount"` @@ -295,14 +299,14 @@ type KubeletConfiguration struct { ClusterDNS string `json:"clusterDNS"` // streamingConnectionIdleTimeout is the maximum time a streaming connection // can be idle before the connection is automatically closed. - StreamingConnectionIdleTimeout unversioned.Duration `json:"streamingConnectionIdleTimeout"` + StreamingConnectionIdleTimeout metav1.Duration `json:"streamingConnectionIdleTimeout"` // nodeStatusUpdateFrequency is the frequency that kubelet posts node // status to master. Note: be cautious when changing the constant, it // must work with nodeMonitorGracePeriod in nodecontroller. - NodeStatusUpdateFrequency unversioned.Duration `json:"nodeStatusUpdateFrequency"` + NodeStatusUpdateFrequency metav1.Duration `json:"nodeStatusUpdateFrequency"` // imageMinimumGCAge is the minimum age for an unused image before it is // garbage collected. - ImageMinimumGCAge unversioned.Duration `json:"imageMinimumGCAge"` + ImageMinimumGCAge metav1.Duration `json:"imageMinimumGCAge"` // imageGCHighThresholdPercent is the percent of disk usage after which // image garbage collection is always run. The percent is calculated as // this field value out of 100. @@ -316,7 +320,7 @@ type KubeletConfiguration struct { // be rejected. LowDiskSpaceThresholdMB int32 `json:"lowDiskSpaceThresholdMB"` // How frequently to calculate and cache volume disk usage for all pods - VolumeStatsAggPeriod unversioned.Duration `json:"volumeStatsAggPeriod"` + VolumeStatsAggPeriod metav1.Duration `json:"volumeStatsAggPeriod"` // networkPluginName is the name of the network plugin to be invoked for // various events in kubelet/pod lifecycle NetworkPluginName string `json:"networkPluginName"` @@ -367,7 +371,7 @@ type KubeletConfiguration struct { RemoteImageEndpoint string `json:"remoteImageEndpoint"` // runtimeRequestTimeout is the timeout for all runtime requests except long running // requests - pull, logs, exec and attach. - RuntimeRequestTimeout unversioned.Duration `json:"runtimeRequestTimeout"` + RuntimeRequestTimeout metav1.Duration `json:"runtimeRequestTimeout"` // rktPath is the path of rkt binary. Leave empty to use the first rkt in // $PATH. RktPath string `json:"rktPath"` @@ -440,7 +444,7 @@ type KubeletConfiguration struct { SerializeImagePulls *bool `json:"serializeImagePulls"` // outOfDiskTransitionFrequency is duration for which the kubelet has to // wait before transitioning out of out-of-disk node condition status. - OutOfDiskTransitionFrequency unversioned.Duration `json:"outOfDiskTransitionFrequency"` + OutOfDiskTransitionFrequency metav1.Duration `json:"outOfDiskTransitionFrequency"` // nodeIP is IP address of the node. If set, kubelet will use this IP // address for the node. NodeIP string `json:"nodeIP"` @@ -457,7 +461,7 @@ type KubeletConfiguration struct { // Comma-delimeted list of grace periods for each soft eviction signal. For example, 'memory.available=30s'. EvictionSoftGracePeriod string `json:"evictionSoftGracePeriod"` // Duration for which the kubelet has to wait before transitioning out of an eviction pressure condition. - EvictionPressureTransitionPeriod unversioned.Duration `json:"evictionPressureTransitionPeriod"` + EvictionPressureTransitionPeriod metav1.Duration `json:"evictionPressureTransitionPeriod"` // Maximum allowed grace period (in seconds) to use when terminating pods in response to a soft eviction threshold being met. EvictionMaxPodGracePeriod int32 `json:"evictionMaxPodGracePeriod"` // Comma-delimited list of minimum reclaims (e.g. imagefs.available=2Gi) that describes the minimum amount of resource the kubelet will reclaim when performing a pod eviction if that resource is under pressure. @@ -532,9 +536,9 @@ type KubeletAuthorization struct { type KubeletWebhookAuthorization struct { // cacheAuthorizedTTL is the duration to cache 'authorized' responses from the webhook authorizer. - CacheAuthorizedTTL unversioned.Duration `json:"cacheAuthorizedTTL"` + CacheAuthorizedTTL metav1.Duration `json:"cacheAuthorizedTTL"` // cacheUnauthorizedTTL is the duration to cache 'unauthorized' responses from the webhook authorizer. - CacheUnauthorizedTTL unversioned.Duration `json:"cacheUnauthorizedTTL"` + CacheUnauthorizedTTL metav1.Duration `json:"cacheUnauthorizedTTL"` } type KubeletAuthentication struct { @@ -557,7 +561,7 @@ type KubeletWebhookAuthentication struct { // enabled allows bearer token authentication backed by the tokenreviews.authentication.k8s.io API Enabled *bool `json:"enabled"` // cacheTTL enables caching of authentication results - CacheTTL unversioned.Duration `json:"cacheTTL"` + CacheTTL metav1.Duration `json:"cacheTTL"` } type KubeletAnonymousAuthentication struct { diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go index b2b6e21405c..1d1f4a30fe1 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go @@ -126,6 +126,7 @@ func autoConvert_v1alpha1_KubeSchedulerConfiguration_To_componentconfig_KubeSche if err := api.Convert_Pointer_bool_To_bool(&in.EnableProfiling, &out.EnableProfiling, s); err != nil { return err } + out.EnableContentionProfiling = in.EnableContentionProfiling out.ContentType = in.ContentType out.KubeAPIQPS = in.KubeAPIQPS out.KubeAPIBurst = int32(in.KubeAPIBurst) @@ -150,6 +151,7 @@ func autoConvert_componentconfig_KubeSchedulerConfiguration_To_v1alpha1_KubeSche if err := api.Convert_bool_To_Pointer_bool(&in.EnableProfiling, &out.EnableProfiling, s); err != nil { return err } + out.EnableContentionProfiling = in.EnableContentionProfiling out.ContentType = in.ContentType out.KubeAPIQPS = in.KubeAPIQPS out.KubeAPIBurst = int(in.KubeAPIBurst) diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..2413d6d8d86 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go @@ -0,0 +1,521 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1alpha1 + +import ( + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeProxyConfiguration, InType: reflect.TypeOf(&KubeProxyConfiguration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeSchedulerConfiguration, InType: reflect.TypeOf(&KubeSchedulerConfiguration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletAnonymousAuthentication, InType: reflect.TypeOf(&KubeletAnonymousAuthentication{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletAuthentication, InType: reflect.TypeOf(&KubeletAuthentication{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletAuthorization, InType: reflect.TypeOf(&KubeletAuthorization{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletConfiguration, InType: reflect.TypeOf(&KubeletConfiguration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletWebhookAuthentication, InType: reflect.TypeOf(&KubeletWebhookAuthentication{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletWebhookAuthorization, InType: reflect.TypeOf(&KubeletWebhookAuthorization{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_KubeletX509Authentication, InType: reflect.TypeOf(&KubeletX509Authentication{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_LeaderElectionConfiguration, InType: reflect.TypeOf(&LeaderElectionConfiguration{})}, + ) +} + +func DeepCopy_v1alpha1_KubeProxyConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeProxyConfiguration) + out := out.(*KubeProxyConfiguration) + out.TypeMeta = in.TypeMeta + out.BindAddress = in.BindAddress + out.ClusterCIDR = in.ClusterCIDR + out.HealthzBindAddress = in.HealthzBindAddress + out.HealthzPort = in.HealthzPort + out.HostnameOverride = in.HostnameOverride + if in.IPTablesMasqueradeBit != nil { + in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit + *out = new(int32) + **out = **in + } else { + out.IPTablesMasqueradeBit = nil + } + out.IPTablesSyncPeriod = in.IPTablesSyncPeriod + out.IPTablesMinSyncPeriod = in.IPTablesMinSyncPeriod + out.KubeconfigPath = in.KubeconfigPath + out.MasqueradeAll = in.MasqueradeAll + out.Master = in.Master + if in.OOMScoreAdj != nil { + in, out := &in.OOMScoreAdj, &out.OOMScoreAdj + *out = new(int32) + **out = **in + } else { + out.OOMScoreAdj = nil + } + out.Mode = in.Mode + out.PortRange = in.PortRange + out.ResourceContainer = in.ResourceContainer + out.UDPIdleTimeout = in.UDPIdleTimeout + out.ConntrackMax = in.ConntrackMax + out.ConntrackMaxPerCore = in.ConntrackMaxPerCore + out.ConntrackMin = in.ConntrackMin + out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout + out.ConntrackTCPCloseWaitTimeout = in.ConntrackTCPCloseWaitTimeout + return nil + } +} + +func DeepCopy_v1alpha1_KubeSchedulerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeSchedulerConfiguration) + out := out.(*KubeSchedulerConfiguration) + out.TypeMeta = in.TypeMeta + out.Port = in.Port + out.Address = in.Address + out.AlgorithmProvider = in.AlgorithmProvider + out.PolicyConfigFile = in.PolicyConfigFile + if in.EnableProfiling != nil { + in, out := &in.EnableProfiling, &out.EnableProfiling + *out = new(bool) + **out = **in + } else { + out.EnableProfiling = nil + } + out.EnableContentionProfiling = in.EnableContentionProfiling + out.ContentType = in.ContentType + out.KubeAPIQPS = in.KubeAPIQPS + out.KubeAPIBurst = in.KubeAPIBurst + out.SchedulerName = in.SchedulerName + out.HardPodAffinitySymmetricWeight = in.HardPodAffinitySymmetricWeight + out.FailureDomains = in.FailureDomains + if err := DeepCopy_v1alpha1_LeaderElectionConfiguration(&in.LeaderElection, &out.LeaderElection, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1alpha1_KubeletAnonymousAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletAnonymousAuthentication) + out := out.(*KubeletAnonymousAuthentication) + if in.Enabled != nil { + in, out := &in.Enabled, &out.Enabled + *out = new(bool) + **out = **in + } else { + out.Enabled = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_KubeletAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletAuthentication) + out := out.(*KubeletAuthentication) + out.X509 = in.X509 + if err := DeepCopy_v1alpha1_KubeletWebhookAuthentication(&in.Webhook, &out.Webhook, c); err != nil { + return err + } + if err := DeepCopy_v1alpha1_KubeletAnonymousAuthentication(&in.Anonymous, &out.Anonymous, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1alpha1_KubeletAuthorization(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletAuthorization) + out := out.(*KubeletAuthorization) + out.Mode = in.Mode + out.Webhook = in.Webhook + return nil + } +} + +func DeepCopy_v1alpha1_KubeletConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletConfiguration) + out := out.(*KubeletConfiguration) + out.TypeMeta = in.TypeMeta + out.PodManifestPath = in.PodManifestPath + out.SyncFrequency = in.SyncFrequency + out.FileCheckFrequency = in.FileCheckFrequency + out.HTTPCheckFrequency = in.HTTPCheckFrequency + out.ManifestURL = in.ManifestURL + out.ManifestURLHeader = in.ManifestURLHeader + if in.EnableServer != nil { + in, out := &in.EnableServer, &out.EnableServer + *out = new(bool) + **out = **in + } else { + out.EnableServer = nil + } + out.Address = in.Address + out.Port = in.Port + out.ReadOnlyPort = in.ReadOnlyPort + out.TLSCertFile = in.TLSCertFile + out.TLSPrivateKeyFile = in.TLSPrivateKeyFile + out.CertDirectory = in.CertDirectory + if err := DeepCopy_v1alpha1_KubeletAuthentication(&in.Authentication, &out.Authentication, c); err != nil { + return err + } + out.Authorization = in.Authorization + out.HostnameOverride = in.HostnameOverride + out.PodInfraContainerImage = in.PodInfraContainerImage + out.DockerEndpoint = in.DockerEndpoint + out.RootDirectory = in.RootDirectory + out.SeccompProfileRoot = in.SeccompProfileRoot + if in.AllowPrivileged != nil { + in, out := &in.AllowPrivileged, &out.AllowPrivileged + *out = new(bool) + **out = **in + } else { + out.AllowPrivileged = nil + } + if in.HostNetworkSources != nil { + in, out := &in.HostNetworkSources, &out.HostNetworkSources + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.HostNetworkSources = nil + } + if in.HostPIDSources != nil { + in, out := &in.HostPIDSources, &out.HostPIDSources + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.HostPIDSources = nil + } + if in.HostIPCSources != nil { + in, out := &in.HostIPCSources, &out.HostIPCSources + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.HostIPCSources = nil + } + if in.RegistryPullQPS != nil { + in, out := &in.RegistryPullQPS, &out.RegistryPullQPS + *out = new(int32) + **out = **in + } else { + out.RegistryPullQPS = nil + } + out.RegistryBurst = in.RegistryBurst + if in.EventRecordQPS != nil { + in, out := &in.EventRecordQPS, &out.EventRecordQPS + *out = new(int32) + **out = **in + } else { + out.EventRecordQPS = nil + } + out.EventBurst = in.EventBurst + if in.EnableDebuggingHandlers != nil { + in, out := &in.EnableDebuggingHandlers, &out.EnableDebuggingHandlers + *out = new(bool) + **out = **in + } else { + out.EnableDebuggingHandlers = nil + } + out.MinimumGCAge = in.MinimumGCAge + out.MaxPerPodContainerCount = in.MaxPerPodContainerCount + if in.MaxContainerCount != nil { + in, out := &in.MaxContainerCount, &out.MaxContainerCount + *out = new(int32) + **out = **in + } else { + out.MaxContainerCount = nil + } + out.CAdvisorPort = in.CAdvisorPort + out.HealthzPort = in.HealthzPort + out.HealthzBindAddress = in.HealthzBindAddress + if in.OOMScoreAdj != nil { + in, out := &in.OOMScoreAdj, &out.OOMScoreAdj + *out = new(int32) + **out = **in + } else { + out.OOMScoreAdj = nil + } + if in.RegisterNode != nil { + in, out := &in.RegisterNode, &out.RegisterNode + *out = new(bool) + **out = **in + } else { + out.RegisterNode = nil + } + out.ClusterDomain = in.ClusterDomain + out.MasterServiceNamespace = in.MasterServiceNamespace + out.ClusterDNS = in.ClusterDNS + out.StreamingConnectionIdleTimeout = in.StreamingConnectionIdleTimeout + out.NodeStatusUpdateFrequency = in.NodeStatusUpdateFrequency + out.ImageMinimumGCAge = in.ImageMinimumGCAge + if in.ImageGCHighThresholdPercent != nil { + in, out := &in.ImageGCHighThresholdPercent, &out.ImageGCHighThresholdPercent + *out = new(int32) + **out = **in + } else { + out.ImageGCHighThresholdPercent = nil + } + if in.ImageGCLowThresholdPercent != nil { + in, out := &in.ImageGCLowThresholdPercent, &out.ImageGCLowThresholdPercent + *out = new(int32) + **out = **in + } else { + out.ImageGCLowThresholdPercent = nil + } + out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB + out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod + out.NetworkPluginName = in.NetworkPluginName + out.NetworkPluginDir = in.NetworkPluginDir + out.CNIConfDir = in.CNIConfDir + out.CNIBinDir = in.CNIBinDir + out.NetworkPluginMTU = in.NetworkPluginMTU + out.VolumePluginDir = in.VolumePluginDir + out.CloudProvider = in.CloudProvider + out.CloudConfigFile = in.CloudConfigFile + out.KubeletCgroups = in.KubeletCgroups + out.RuntimeCgroups = in.RuntimeCgroups + out.SystemCgroups = in.SystemCgroups + out.CgroupRoot = in.CgroupRoot + if in.ExperimentalCgroupsPerQOS != nil { + in, out := &in.ExperimentalCgroupsPerQOS, &out.ExperimentalCgroupsPerQOS + *out = new(bool) + **out = **in + } else { + out.ExperimentalCgroupsPerQOS = nil + } + out.CgroupDriver = in.CgroupDriver + out.ContainerRuntime = in.ContainerRuntime + out.RemoteRuntimeEndpoint = in.RemoteRuntimeEndpoint + out.RemoteImageEndpoint = in.RemoteImageEndpoint + out.RuntimeRequestTimeout = in.RuntimeRequestTimeout + out.RktPath = in.RktPath + out.ExperimentalMounterPath = in.ExperimentalMounterPath + out.RktAPIEndpoint = in.RktAPIEndpoint + out.RktStage1Image = in.RktStage1Image + if in.LockFilePath != nil { + in, out := &in.LockFilePath, &out.LockFilePath + *out = new(string) + **out = **in + } else { + out.LockFilePath = nil + } + out.ExitOnLockContention = in.ExitOnLockContention + out.HairpinMode = in.HairpinMode + out.BabysitDaemons = in.BabysitDaemons + out.MaxPods = in.MaxPods + out.NvidiaGPUs = in.NvidiaGPUs + out.DockerExecHandlerName = in.DockerExecHandlerName + out.PodCIDR = in.PodCIDR + out.ResolverConfig = in.ResolverConfig + if in.CPUCFSQuota != nil { + in, out := &in.CPUCFSQuota, &out.CPUCFSQuota + *out = new(bool) + **out = **in + } else { + out.CPUCFSQuota = nil + } + if in.Containerized != nil { + in, out := &in.Containerized, &out.Containerized + *out = new(bool) + **out = **in + } else { + out.Containerized = nil + } + out.MaxOpenFiles = in.MaxOpenFiles + if in.ReconcileCIDR != nil { + in, out := &in.ReconcileCIDR, &out.ReconcileCIDR + *out = new(bool) + **out = **in + } else { + out.ReconcileCIDR = nil + } + if in.RegisterSchedulable != nil { + in, out := &in.RegisterSchedulable, &out.RegisterSchedulable + *out = new(bool) + **out = **in + } else { + out.RegisterSchedulable = nil + } + out.ContentType = in.ContentType + if in.KubeAPIQPS != nil { + in, out := &in.KubeAPIQPS, &out.KubeAPIQPS + *out = new(int32) + **out = **in + } else { + out.KubeAPIQPS = nil + } + out.KubeAPIBurst = in.KubeAPIBurst + if in.SerializeImagePulls != nil { + in, out := &in.SerializeImagePulls, &out.SerializeImagePulls + *out = new(bool) + **out = **in + } else { + out.SerializeImagePulls = nil + } + out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency + out.NodeIP = in.NodeIP + if in.NodeLabels != nil { + in, out := &in.NodeLabels, &out.NodeLabels + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.NodeLabels = nil + } + out.NonMasqueradeCIDR = in.NonMasqueradeCIDR + out.EnableCustomMetrics = in.EnableCustomMetrics + if in.EvictionHard != nil { + in, out := &in.EvictionHard, &out.EvictionHard + *out = new(string) + **out = **in + } else { + out.EvictionHard = nil + } + out.EvictionSoft = in.EvictionSoft + out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod + out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod + out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod + out.EvictionMinimumReclaim = in.EvictionMinimumReclaim + out.PodsPerCore = in.PodsPerCore + if in.EnableControllerAttachDetach != nil { + in, out := &in.EnableControllerAttachDetach, &out.EnableControllerAttachDetach + *out = new(bool) + **out = **in + } else { + out.EnableControllerAttachDetach = nil + } + if in.SystemReserved != nil { + in, out := &in.SystemReserved, &out.SystemReserved + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.SystemReserved = nil + } + if in.KubeReserved != nil { + in, out := &in.KubeReserved, &out.KubeReserved + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.KubeReserved = nil + } + out.ProtectKernelDefaults = in.ProtectKernelDefaults + if in.MakeIPTablesUtilChains != nil { + in, out := &in.MakeIPTablesUtilChains, &out.MakeIPTablesUtilChains + *out = new(bool) + **out = **in + } else { + out.MakeIPTablesUtilChains = nil + } + if in.IPTablesMasqueradeBit != nil { + in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit + *out = new(int32) + **out = **in + } else { + out.IPTablesMasqueradeBit = nil + } + if in.IPTablesDropBit != nil { + in, out := &in.IPTablesDropBit, &out.IPTablesDropBit + *out = new(int32) + **out = **in + } else { + out.IPTablesDropBit = nil + } + if in.AllowedUnsafeSysctls != nil { + in, out := &in.AllowedUnsafeSysctls, &out.AllowedUnsafeSysctls + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.AllowedUnsafeSysctls = nil + } + out.FeatureGates = in.FeatureGates + out.EnableCRI = in.EnableCRI + out.ExperimentalFailSwapOn = in.ExperimentalFailSwapOn + out.ExperimentalCheckNodeCapabilitiesBeforeMount = in.ExperimentalCheckNodeCapabilitiesBeforeMount + return nil + } +} + +func DeepCopy_v1alpha1_KubeletWebhookAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletWebhookAuthentication) + out := out.(*KubeletWebhookAuthentication) + if in.Enabled != nil { + in, out := &in.Enabled, &out.Enabled + *out = new(bool) + **out = **in + } else { + out.Enabled = nil + } + out.CacheTTL = in.CacheTTL + return nil + } +} + +func DeepCopy_v1alpha1_KubeletWebhookAuthorization(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletWebhookAuthorization) + out := out.(*KubeletWebhookAuthorization) + out.CacheAuthorizedTTL = in.CacheAuthorizedTTL + out.CacheUnauthorizedTTL = in.CacheUnauthorizedTTL + return nil + } +} + +func DeepCopy_v1alpha1_KubeletX509Authentication(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletX509Authentication) + out := out.(*KubeletX509Authentication) + out.ClientCAFile = in.ClientCAFile + return nil + } +} + +func DeepCopy_v1alpha1_LeaderElectionConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LeaderElectionConfiguration) + out := out.(*LeaderElectionConfiguration) + if in.LeaderElect != nil { + in, out := &in.LeaderElect, &out.LeaderElect + *out = new(bool) + **out = **in + } else { + out.LeaderElect = nil + } + out.LeaseDuration = in.LeaseDuration + out.RenewDeadline = in.RenewDeadline + out.RetryPeriod = in.RetryPeriod + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go new file mode 100644 index 00000000000..0908e072d6b --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go @@ -0,0 +1,482 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package componentconfig + +import ( + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + config "k8s.io/client-go/pkg/util/config" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_IPVar, InType: reflect.TypeOf(&IPVar{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeControllerManagerConfiguration, InType: reflect.TypeOf(&KubeControllerManagerConfiguration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeProxyConfiguration, InType: reflect.TypeOf(&KubeProxyConfiguration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeSchedulerConfiguration, InType: reflect.TypeOf(&KubeSchedulerConfiguration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletAnonymousAuthentication, InType: reflect.TypeOf(&KubeletAnonymousAuthentication{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletAuthentication, InType: reflect.TypeOf(&KubeletAuthentication{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletAuthorization, InType: reflect.TypeOf(&KubeletAuthorization{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletConfiguration, InType: reflect.TypeOf(&KubeletConfiguration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletWebhookAuthentication, InType: reflect.TypeOf(&KubeletWebhookAuthentication{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletWebhookAuthorization, InType: reflect.TypeOf(&KubeletWebhookAuthorization{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_KubeletX509Authentication, InType: reflect.TypeOf(&KubeletX509Authentication{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_LeaderElectionConfiguration, InType: reflect.TypeOf(&LeaderElectionConfiguration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_PersistentVolumeRecyclerConfiguration, InType: reflect.TypeOf(&PersistentVolumeRecyclerConfiguration{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_PortRangeVar, InType: reflect.TypeOf(&PortRangeVar{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_componentconfig_VolumeConfiguration, InType: reflect.TypeOf(&VolumeConfiguration{})}, + ) +} + +func DeepCopy_componentconfig_IPVar(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IPVar) + out := out.(*IPVar) + if in.Val != nil { + in, out := &in.Val, &out.Val + *out = new(string) + **out = **in + } else { + out.Val = nil + } + return nil + } +} + +func DeepCopy_componentconfig_KubeControllerManagerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeControllerManagerConfiguration) + out := out.(*KubeControllerManagerConfiguration) + out.TypeMeta = in.TypeMeta + out.Port = in.Port + out.Address = in.Address + out.UseServiceAccountCredentials = in.UseServiceAccountCredentials + out.CloudProvider = in.CloudProvider + out.CloudConfigFile = in.CloudConfigFile + out.ConcurrentEndpointSyncs = in.ConcurrentEndpointSyncs + out.ConcurrentRSSyncs = in.ConcurrentRSSyncs + out.ConcurrentRCSyncs = in.ConcurrentRCSyncs + out.ConcurrentServiceSyncs = in.ConcurrentServiceSyncs + out.ConcurrentResourceQuotaSyncs = in.ConcurrentResourceQuotaSyncs + out.ConcurrentDeploymentSyncs = in.ConcurrentDeploymentSyncs + out.ConcurrentDaemonSetSyncs = in.ConcurrentDaemonSetSyncs + out.ConcurrentJobSyncs = in.ConcurrentJobSyncs + out.ConcurrentNamespaceSyncs = in.ConcurrentNamespaceSyncs + out.ConcurrentSATokenSyncs = in.ConcurrentSATokenSyncs + out.LookupCacheSizeForRC = in.LookupCacheSizeForRC + out.LookupCacheSizeForRS = in.LookupCacheSizeForRS + out.LookupCacheSizeForDaemonSet = in.LookupCacheSizeForDaemonSet + out.ServiceSyncPeriod = in.ServiceSyncPeriod + out.NodeSyncPeriod = in.NodeSyncPeriod + out.RouteReconciliationPeriod = in.RouteReconciliationPeriod + out.ResourceQuotaSyncPeriod = in.ResourceQuotaSyncPeriod + out.NamespaceSyncPeriod = in.NamespaceSyncPeriod + out.PVClaimBinderSyncPeriod = in.PVClaimBinderSyncPeriod + out.MinResyncPeriod = in.MinResyncPeriod + out.TerminatedPodGCThreshold = in.TerminatedPodGCThreshold + out.HorizontalPodAutoscalerSyncPeriod = in.HorizontalPodAutoscalerSyncPeriod + out.DeploymentControllerSyncPeriod = in.DeploymentControllerSyncPeriod + out.PodEvictionTimeout = in.PodEvictionTimeout + out.DeletingPodsQps = in.DeletingPodsQps + out.DeletingPodsBurst = in.DeletingPodsBurst + out.NodeMonitorGracePeriod = in.NodeMonitorGracePeriod + out.RegisterRetryCount = in.RegisterRetryCount + out.NodeStartupGracePeriod = in.NodeStartupGracePeriod + out.NodeMonitorPeriod = in.NodeMonitorPeriod + out.ServiceAccountKeyFile = in.ServiceAccountKeyFile + out.ClusterSigningCertFile = in.ClusterSigningCertFile + out.ClusterSigningKeyFile = in.ClusterSigningKeyFile + out.ApproveAllKubeletCSRsForGroup = in.ApproveAllKubeletCSRsForGroup + out.EnableProfiling = in.EnableProfiling + out.ClusterName = in.ClusterName + out.ClusterCIDR = in.ClusterCIDR + out.ServiceCIDR = in.ServiceCIDR + out.NodeCIDRMaskSize = in.NodeCIDRMaskSize + out.AllocateNodeCIDRs = in.AllocateNodeCIDRs + out.ConfigureCloudRoutes = in.ConfigureCloudRoutes + out.RootCAFile = in.RootCAFile + out.ContentType = in.ContentType + out.KubeAPIQPS = in.KubeAPIQPS + out.KubeAPIBurst = in.KubeAPIBurst + out.LeaderElection = in.LeaderElection + out.VolumeConfiguration = in.VolumeConfiguration + out.ControllerStartInterval = in.ControllerStartInterval + out.EnableGarbageCollector = in.EnableGarbageCollector + out.ConcurrentGCSyncs = in.ConcurrentGCSyncs + out.NodeEvictionRate = in.NodeEvictionRate + out.SecondaryNodeEvictionRate = in.SecondaryNodeEvictionRate + out.LargeClusterSizeThreshold = in.LargeClusterSizeThreshold + out.UnhealthyZoneThreshold = in.UnhealthyZoneThreshold + return nil + } +} + +func DeepCopy_componentconfig_KubeProxyConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeProxyConfiguration) + out := out.(*KubeProxyConfiguration) + out.TypeMeta = in.TypeMeta + out.BindAddress = in.BindAddress + out.ClusterCIDR = in.ClusterCIDR + out.HealthzBindAddress = in.HealthzBindAddress + out.HealthzPort = in.HealthzPort + out.HostnameOverride = in.HostnameOverride + if in.IPTablesMasqueradeBit != nil { + in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit + *out = new(int32) + **out = **in + } else { + out.IPTablesMasqueradeBit = nil + } + out.IPTablesSyncPeriod = in.IPTablesSyncPeriod + out.IPTablesMinSyncPeriod = in.IPTablesMinSyncPeriod + out.KubeconfigPath = in.KubeconfigPath + out.MasqueradeAll = in.MasqueradeAll + out.Master = in.Master + if in.OOMScoreAdj != nil { + in, out := &in.OOMScoreAdj, &out.OOMScoreAdj + *out = new(int32) + **out = **in + } else { + out.OOMScoreAdj = nil + } + out.Mode = in.Mode + out.PortRange = in.PortRange + out.ResourceContainer = in.ResourceContainer + out.UDPIdleTimeout = in.UDPIdleTimeout + out.ConntrackMax = in.ConntrackMax + out.ConntrackMaxPerCore = in.ConntrackMaxPerCore + out.ConntrackMin = in.ConntrackMin + out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout + out.ConntrackTCPCloseWaitTimeout = in.ConntrackTCPCloseWaitTimeout + return nil + } +} + +func DeepCopy_componentconfig_KubeSchedulerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeSchedulerConfiguration) + out := out.(*KubeSchedulerConfiguration) + out.TypeMeta = in.TypeMeta + out.Port = in.Port + out.Address = in.Address + out.AlgorithmProvider = in.AlgorithmProvider + out.PolicyConfigFile = in.PolicyConfigFile + out.EnableProfiling = in.EnableProfiling + out.EnableContentionProfiling = in.EnableContentionProfiling + out.ContentType = in.ContentType + out.KubeAPIQPS = in.KubeAPIQPS + out.KubeAPIBurst = in.KubeAPIBurst + out.SchedulerName = in.SchedulerName + out.HardPodAffinitySymmetricWeight = in.HardPodAffinitySymmetricWeight + out.FailureDomains = in.FailureDomains + out.LeaderElection = in.LeaderElection + return nil + } +} + +func DeepCopy_componentconfig_KubeletAnonymousAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletAnonymousAuthentication) + out := out.(*KubeletAnonymousAuthentication) + out.Enabled = in.Enabled + return nil + } +} + +func DeepCopy_componentconfig_KubeletAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletAuthentication) + out := out.(*KubeletAuthentication) + out.X509 = in.X509 + out.Webhook = in.Webhook + out.Anonymous = in.Anonymous + return nil + } +} + +func DeepCopy_componentconfig_KubeletAuthorization(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletAuthorization) + out := out.(*KubeletAuthorization) + out.Mode = in.Mode + out.Webhook = in.Webhook + return nil + } +} + +func DeepCopy_componentconfig_KubeletConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletConfiguration) + out := out.(*KubeletConfiguration) + out.TypeMeta = in.TypeMeta + out.PodManifestPath = in.PodManifestPath + out.SyncFrequency = in.SyncFrequency + out.FileCheckFrequency = in.FileCheckFrequency + out.HTTPCheckFrequency = in.HTTPCheckFrequency + out.ManifestURL = in.ManifestURL + out.ManifestURLHeader = in.ManifestURLHeader + out.EnableServer = in.EnableServer + out.Address = in.Address + out.Port = in.Port + out.ReadOnlyPort = in.ReadOnlyPort + out.TLSCertFile = in.TLSCertFile + out.TLSPrivateKeyFile = in.TLSPrivateKeyFile + out.CertDirectory = in.CertDirectory + out.Authentication = in.Authentication + out.Authorization = in.Authorization + out.HostnameOverride = in.HostnameOverride + out.PodInfraContainerImage = in.PodInfraContainerImage + out.DockerEndpoint = in.DockerEndpoint + out.RootDirectory = in.RootDirectory + out.SeccompProfileRoot = in.SeccompProfileRoot + out.AllowPrivileged = in.AllowPrivileged + if in.HostNetworkSources != nil { + in, out := &in.HostNetworkSources, &out.HostNetworkSources + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.HostNetworkSources = nil + } + if in.HostPIDSources != nil { + in, out := &in.HostPIDSources, &out.HostPIDSources + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.HostPIDSources = nil + } + if in.HostIPCSources != nil { + in, out := &in.HostIPCSources, &out.HostIPCSources + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.HostIPCSources = nil + } + out.RegistryPullQPS = in.RegistryPullQPS + out.RegistryBurst = in.RegistryBurst + out.EventRecordQPS = in.EventRecordQPS + out.EventBurst = in.EventBurst + out.EnableDebuggingHandlers = in.EnableDebuggingHandlers + out.MinimumGCAge = in.MinimumGCAge + out.MaxPerPodContainerCount = in.MaxPerPodContainerCount + out.MaxContainerCount = in.MaxContainerCount + out.CAdvisorPort = in.CAdvisorPort + out.HealthzPort = in.HealthzPort + out.HealthzBindAddress = in.HealthzBindAddress + out.OOMScoreAdj = in.OOMScoreAdj + out.RegisterNode = in.RegisterNode + out.ClusterDomain = in.ClusterDomain + out.MasterServiceNamespace = in.MasterServiceNamespace + out.ClusterDNS = in.ClusterDNS + out.StreamingConnectionIdleTimeout = in.StreamingConnectionIdleTimeout + out.NodeStatusUpdateFrequency = in.NodeStatusUpdateFrequency + out.ImageMinimumGCAge = in.ImageMinimumGCAge + out.ImageGCHighThresholdPercent = in.ImageGCHighThresholdPercent + out.ImageGCLowThresholdPercent = in.ImageGCLowThresholdPercent + out.LowDiskSpaceThresholdMB = in.LowDiskSpaceThresholdMB + out.VolumeStatsAggPeriod = in.VolumeStatsAggPeriod + out.NetworkPluginName = in.NetworkPluginName + out.NetworkPluginMTU = in.NetworkPluginMTU + out.NetworkPluginDir = in.NetworkPluginDir + out.CNIConfDir = in.CNIConfDir + out.CNIBinDir = in.CNIBinDir + out.VolumePluginDir = in.VolumePluginDir + out.CloudProvider = in.CloudProvider + out.CloudConfigFile = in.CloudConfigFile + out.KubeletCgroups = in.KubeletCgroups + out.ExperimentalCgroupsPerQOS = in.ExperimentalCgroupsPerQOS + out.CgroupDriver = in.CgroupDriver + out.RuntimeCgroups = in.RuntimeCgroups + out.SystemCgroups = in.SystemCgroups + out.CgroupRoot = in.CgroupRoot + out.ContainerRuntime = in.ContainerRuntime + out.RemoteRuntimeEndpoint = in.RemoteRuntimeEndpoint + out.RemoteImageEndpoint = in.RemoteImageEndpoint + out.RuntimeRequestTimeout = in.RuntimeRequestTimeout + out.RktPath = in.RktPath + out.ExperimentalMounterPath = in.ExperimentalMounterPath + out.RktAPIEndpoint = in.RktAPIEndpoint + out.RktStage1Image = in.RktStage1Image + out.LockFilePath = in.LockFilePath + out.ExitOnLockContention = in.ExitOnLockContention + out.HairpinMode = in.HairpinMode + out.BabysitDaemons = in.BabysitDaemons + out.MaxPods = in.MaxPods + out.NvidiaGPUs = in.NvidiaGPUs + out.DockerExecHandlerName = in.DockerExecHandlerName + out.PodCIDR = in.PodCIDR + out.ResolverConfig = in.ResolverConfig + out.CPUCFSQuota = in.CPUCFSQuota + out.Containerized = in.Containerized + out.MaxOpenFiles = in.MaxOpenFiles + out.ReconcileCIDR = in.ReconcileCIDR + out.RegisterSchedulable = in.RegisterSchedulable + out.ContentType = in.ContentType + out.KubeAPIQPS = in.KubeAPIQPS + out.KubeAPIBurst = in.KubeAPIBurst + out.SerializeImagePulls = in.SerializeImagePulls + out.OutOfDiskTransitionFrequency = in.OutOfDiskTransitionFrequency + out.NodeIP = in.NodeIP + if in.NodeLabels != nil { + in, out := &in.NodeLabels, &out.NodeLabels + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.NodeLabels = nil + } + out.NonMasqueradeCIDR = in.NonMasqueradeCIDR + out.EnableCustomMetrics = in.EnableCustomMetrics + out.EvictionHard = in.EvictionHard + out.EvictionSoft = in.EvictionSoft + out.EvictionSoftGracePeriod = in.EvictionSoftGracePeriod + out.EvictionPressureTransitionPeriod = in.EvictionPressureTransitionPeriod + out.EvictionMaxPodGracePeriod = in.EvictionMaxPodGracePeriod + out.EvictionMinimumReclaim = in.EvictionMinimumReclaim + out.PodsPerCore = in.PodsPerCore + out.EnableControllerAttachDetach = in.EnableControllerAttachDetach + if in.SystemReserved != nil { + in, out := &in.SystemReserved, &out.SystemReserved + *out = make(config.ConfigurationMap) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.SystemReserved = nil + } + if in.KubeReserved != nil { + in, out := &in.KubeReserved, &out.KubeReserved + *out = make(config.ConfigurationMap) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.KubeReserved = nil + } + out.ProtectKernelDefaults = in.ProtectKernelDefaults + out.MakeIPTablesUtilChains = in.MakeIPTablesUtilChains + out.IPTablesMasqueradeBit = in.IPTablesMasqueradeBit + out.IPTablesDropBit = in.IPTablesDropBit + if in.AllowedUnsafeSysctls != nil { + in, out := &in.AllowedUnsafeSysctls, &out.AllowedUnsafeSysctls + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.AllowedUnsafeSysctls = nil + } + out.FeatureGates = in.FeatureGates + out.EnableCRI = in.EnableCRI + out.ExperimentalFailSwapOn = in.ExperimentalFailSwapOn + out.ExperimentalCheckNodeCapabilitiesBeforeMount = in.ExperimentalCheckNodeCapabilitiesBeforeMount + return nil + } +} + +func DeepCopy_componentconfig_KubeletWebhookAuthentication(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletWebhookAuthentication) + out := out.(*KubeletWebhookAuthentication) + out.Enabled = in.Enabled + out.CacheTTL = in.CacheTTL + return nil + } +} + +func DeepCopy_componentconfig_KubeletWebhookAuthorization(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletWebhookAuthorization) + out := out.(*KubeletWebhookAuthorization) + out.CacheAuthorizedTTL = in.CacheAuthorizedTTL + out.CacheUnauthorizedTTL = in.CacheUnauthorizedTTL + return nil + } +} + +func DeepCopy_componentconfig_KubeletX509Authentication(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*KubeletX509Authentication) + out := out.(*KubeletX509Authentication) + out.ClientCAFile = in.ClientCAFile + return nil + } +} + +func DeepCopy_componentconfig_LeaderElectionConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LeaderElectionConfiguration) + out := out.(*LeaderElectionConfiguration) + out.LeaderElect = in.LeaderElect + out.LeaseDuration = in.LeaseDuration + out.RenewDeadline = in.RenewDeadline + out.RetryPeriod = in.RetryPeriod + return nil + } +} + +func DeepCopy_componentconfig_PersistentVolumeRecyclerConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PersistentVolumeRecyclerConfiguration) + out := out.(*PersistentVolumeRecyclerConfiguration) + out.MaximumRetry = in.MaximumRetry + out.MinimumTimeoutNFS = in.MinimumTimeoutNFS + out.PodTemplateFilePathNFS = in.PodTemplateFilePathNFS + out.IncrementTimeoutNFS = in.IncrementTimeoutNFS + out.PodTemplateFilePathHostPath = in.PodTemplateFilePathHostPath + out.MinimumTimeoutHostPath = in.MinimumTimeoutHostPath + out.IncrementTimeoutHostPath = in.IncrementTimeoutHostPath + return nil + } +} + +func DeepCopy_componentconfig_PortRangeVar(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PortRangeVar) + out := out.(*PortRangeVar) + if in.Val != nil { + in, out := &in.Val, &out.Val + *out = new(string) + **out = **in + } else { + out.Val = nil + } + return nil + } +} + +func DeepCopy_componentconfig_VolumeConfiguration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*VolumeConfiguration) + out := out.(*VolumeConfiguration) + out.EnableHostPathProvisioning = in.EnableHostPathProvisioning + out.EnableDynamicProvisioning = in.EnableDynamicProvisioning + out.PersistentVolumeRecyclerConfiguration = in.PersistentVolumeRecyclerConfiguration + out.FlexVolumePluginDir = in.FlexVolumePluginDir + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/extensions/OWNERS new file mode 100755 index 00000000000..494763a6934 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/OWNERS @@ -0,0 +1,41 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- wojtek-t +- deads2k +- brendandburns +- derekwaynecarr +- caesarxuchao +- mikedanese +- liggitt +- nikhiljindal +- bprashanth +- erictune +- pmorie +- sttts +- kargakis +- saad-ali +- janetkuo +- justinsb +- ncdc +- timstclair +- mwielgus +- timothysc +- soltysh +- piosz +- dims +- errordeveloper +- madhusudancs +- rootfs +- jszczepkowski +- mml +- resouer +- mbohlool +- david-mcmahon +- therc +- pweil- +- tmrts +- mqliang +- lukaszo +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/register.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/register.go index 0255fc17bcf..16a047c1843 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/register.go @@ -20,6 +20,7 @@ import ( "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/apis/autoscaling" "k8s.io/client-go/pkg/apis/batch" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" ) @@ -71,7 +72,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.DeleteOptions{}, &ReplicaSet{}, &ReplicaSetList{}, - &api.ExportOptions{}, + &metav1.ExportOptions{}, &PodSecurityPolicy{}, &PodSecurityPolicyList{}, &NetworkPolicy{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/types.generated.go index 7f5ab239635..2ebcb6e3673 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/types.generated.go @@ -27,7 +27,7 @@ import ( codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/client-go/pkg/api" pkg4_resource "k8s.io/client-go/pkg/api/resource" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" pkg5_intstr "k8s.io/client-go/pkg/util/intstr" "reflect" @@ -67,7 +67,7 @@ func init() { if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta var v1 pkg4_resource.Quantity - var v2 pkg1_unversioned.LabelSelector + var v2 pkg1_v1.LabelSelector var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -403,7 +403,7 @@ func (x *ScaleStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym25 := z.DecBinary() _ = yym25 @@ -460,7 +460,7 @@ func (x *ScaleStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym29 := z.DecBinary() _ = yym29 @@ -2457,7 +2457,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv197 := &x.ListMeta yym198 := z.DecBinary() @@ -2538,7 +2538,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv204 := &x.ListMeta yym205 := z.DecBinary() @@ -3769,7 +3769,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym314 := z.DecBinary() _ = yym314 @@ -3895,7 +3895,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym327 := z.DecBinary() _ = yym327 @@ -5818,7 +5818,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv486 := &x.LastUpdateTime yym487 := z.DecBinary() @@ -5835,7 +5835,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv488 := &x.LastTransitionTime yym489 := z.DecBinary() @@ -5920,7 +5920,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv495 := &x.LastUpdateTime yym496 := z.DecBinary() @@ -5947,7 +5947,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv497 := &x.LastTransitionTime yym498 := z.DecBinary() @@ -6224,7 +6224,7 @@ func (x *DeploymentList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv522 := &x.ListMeta yym523 := z.DecBinary() @@ -6305,7 +6305,7 @@ func (x *DeploymentList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv529 := &x.ListMeta yym530 := z.DecBinary() @@ -6499,7 +6499,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym545 := z.DecBinary() _ = yym545 @@ -6547,7 +6547,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym549 := z.DecBinary() _ = yym549 @@ -7432,7 +7432,7 @@ func (x *DaemonSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv629 := &x.ListMeta yym630 := z.DecBinary() @@ -7513,7 +7513,7 @@ func (x *DaemonSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv636 := &x.ListMeta yym637 := z.DecBinary() @@ -7776,7 +7776,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromMap(l int, d *codec1978. } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv661 := &x.ListMeta yym662 := z.DecBinary() @@ -7857,7 +7857,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromArray(l int, d *codec197 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv668 := &x.ListMeta yym669 := z.DecBinary() @@ -8463,7 +8463,7 @@ func (x *IngressList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv724 := &x.ListMeta yym725 := z.DecBinary() @@ -8544,7 +8544,7 @@ func (x *IngressList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv731 := &x.ListMeta yym732 := z.DecBinary() @@ -10900,7 +10900,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv911 := &x.ListMeta yym912 := z.DecBinary() @@ -10981,7 +10981,7 @@ func (x *ReplicaSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv918 := &x.ListMeta yym919 := z.DecBinary() @@ -11239,7 +11239,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym942 := z.DecBinary() _ = yym942 @@ -11319,7 +11319,7 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym948 := z.DecBinary() _ = yym948 @@ -12035,7 +12035,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1012 := &x.LastTransitionTime yym1013 := z.DecBinary() @@ -12120,7 +12120,7 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1019 := &x.LastTransitionTime yym1020 := z.DecBinary() @@ -14957,7 +14957,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decod } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1258 := &x.ListMeta yym1259 := z.DecBinary() @@ -15038,7 +15038,7 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Dec } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1265 := &x.ListMeta yym1266 := z.DecBinary() @@ -15538,7 +15538,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) switch yys1307 { case "podSelector": if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1308 := &x.PodSelector yym1309 := z.DecBinary() @@ -15587,7 +15587,7 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { yyv1313 := &x.PodSelector yym1314 := z.DecBinary() @@ -16342,7 +16342,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1369 := z.DecBinary() _ = yym1369 @@ -16359,7 +16359,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1371 := z.DecBinary() _ = yym1371 @@ -16400,7 +16400,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } yym1374 := z.DecBinary() _ = yym1374 @@ -16427,7 +16427,7 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } yym1376 := z.DecBinary() _ = yym1376 @@ -16667,7 +16667,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1398 := &x.ListMeta yym1399 := z.DecBinary() @@ -16748,7 +16748,7 @@ func (x *NetworkPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1405 := &x.ListMeta yym1406 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/types.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/types.go index 3cae03f3ee4..05c0af945c7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/types.go @@ -31,7 +31,7 @@ package extensions import ( "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/resource" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/util/intstr" ) @@ -57,7 +57,7 @@ type ScaleStatus struct { // label query over pods that should match the replicas count. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` } // +genclient=true @@ -65,7 +65,7 @@ type ScaleStatus struct { // represents a scaling request for a resource. type Scale struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -81,7 +81,7 @@ type Scale struct { // Dummy definition type ReplicationControllerDummy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` } // Alpha-level support for Custom Metrics in HPA (as annotations). @@ -113,7 +113,7 @@ type CustomMetricCurrentStatusList struct { // A ThirdPartyResource is a generic representation of a resource, it is used by add-ons and plugins to add new resource // types to the API. It consists of one or more Versions of the api. type ThirdPartyResource struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata // +optional @@ -128,18 +128,18 @@ type ThirdPartyResource struct { } type ThirdPartyResourceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of horizontal pod autoscalers. Items []ThirdPartyResource `json:"items"` } // An APIVersion represents a single concrete version of an object model. -// TODO: we should consider merge this struct with GroupVersion in unversioned.go +// TODO: we should consider merge this struct with GroupVersion in metav1.go type APIVersion struct { // Name of this version (e.g. 'v1'). Name string `json:"name,omitempty"` @@ -147,7 +147,7 @@ type APIVersion struct { // An internal object, used for versioned storage in etcd. Not exposed to the end user. type ThirdPartyResourceData struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -160,7 +160,7 @@ type ThirdPartyResourceData struct { // +genclient=true type Deployment struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -182,7 +182,7 @@ type DeploymentSpec struct { // Label selector for pods. Existing ReplicaSets whose pods are // selected by this will be the ones affected by this deployment. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Template describes the pods that will be created. Template api.PodTemplateSpec `json:"template"` @@ -223,7 +223,7 @@ type DeploymentSpec struct { // DeploymentRollback stores the information required to rollback a deployment. type DeploymentRollback struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Required: This must match the Name of a deployment. Name string `json:"name"` // The annotations to be updated to a deployment @@ -274,7 +274,7 @@ const ( type RollingUpdateDeployment struct { // The maximum number of pods that can be unavailable during the update. // Value can be an absolute number (ex: 5) or a percentage of total pods at the start of update (ex: 10%). - // Absolute number is calculated from percentage by rounding up. + // Absolute number is calculated from percentage by rounding down. // This can not be 0 if MaxSurge is 0. // By default, a fixed value of 1 is used. // Example: when this is set to 30%, the old RC can be scaled down by 30% @@ -348,9 +348,9 @@ type DeploymentCondition struct { // Status of the condition, one of True, False, Unknown. Status api.ConditionStatus `json:"status"` // The last time this condition was updated. - LastUpdateTime unversioned.Time `json:"lastUpdateTime,omitempty"` + LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"` // Last time the condition transitioned from one status to another. - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // The reason for the condition's last transition. Reason string `json:"reason,omitempty"` // A human readable message indicating details about the transition. @@ -358,9 +358,9 @@ type DeploymentCondition struct { } type DeploymentList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of deployments. Items []Deployment `json:"items"` @@ -423,7 +423,7 @@ type DaemonSetSpec struct { // If empty, defaulted to labels on Pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Template is the object that describes the pod that will be created. // The DaemonSet will create exactly one copy of this pod on every node @@ -480,7 +480,7 @@ type DaemonSetStatus struct { // DaemonSet represents the configuration of a daemon set. type DaemonSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -502,22 +502,22 @@ type DaemonSet struct { // DaemonSetList is a collection of daemon sets. type DaemonSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is a list of daemon sets. Items []DaemonSet `json:"items"` } type ThirdPartyResourceDataList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is a list of third party objects Items []ThirdPartyResourceData `json:"items"` } @@ -529,7 +529,7 @@ type ThirdPartyResourceDataList struct { // externally-reachable urls, load balance traffic, terminate SSL, offer name // based virtual hosting etc. type Ingress struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -548,11 +548,11 @@ type Ingress struct { // IngressList is a collection of Ingress. type IngressList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of Ingress. Items []Ingress `json:"items"` @@ -692,7 +692,7 @@ type IngressBackend struct { // ReplicaSet represents the configuration of a replica set. type ReplicaSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -708,9 +708,9 @@ type ReplicaSet struct { // ReplicaSetList is a collection of ReplicaSets. type ReplicaSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []ReplicaSet `json:"items"` } @@ -733,7 +733,7 @@ type ReplicaSetSpec struct { // If empty, defaulted to labels on pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` // Template is the object that describes the pod that will be created if // insufficient replicas are detected. @@ -785,7 +785,7 @@ type ReplicaSetCondition struct { Status api.ConditionStatus `json:"status"` // The last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // The reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty"` @@ -800,7 +800,7 @@ type ReplicaSetCondition struct { // PodSecurityPolicy governs the ability to make requests that affect the SecurityContext // that will be applied to a pod and container. type PodSecurityPolicy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -997,9 +997,9 @@ const ( // PodSecurityPolicyList is a list of PodSecurityPolicy objects. type PodSecurityPolicyList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []PodSecurityPolicy `json:"items"` } @@ -1007,7 +1007,7 @@ type PodSecurityPolicyList struct { // +genclient=true type NetworkPolicy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -1022,7 +1022,7 @@ type NetworkPolicySpec struct { // same set of pods. In this case, the ingress rules for each are combined additively. // This field is NOT optional and follows standard label selector semantics. // An empty podSelector matches all pods in this namespace. - PodSelector unversioned.LabelSelector `json:"podSelector"` + PodSelector metav1.LabelSelector `json:"podSelector"` // List of ingress rules to be applied to the selected pods. // Traffic is allowed to a pod if namespace.networkPolicy.ingress.isolation is undefined and cluster policy allows it, @@ -1082,7 +1082,7 @@ type NetworkPolicyPeer struct { // If not provided, this selector selects no pods. // If present but empty, this selector selects all pods in this namespace. // +optional - PodSelector *unversioned.LabelSelector `json:"podSelector,omitempty"` + PodSelector *metav1.LabelSelector `json:"podSelector,omitempty"` // Selects Namespaces using cluster scoped-labels. This // matches all pods in all namespaces selected by this label selector. @@ -1090,14 +1090,14 @@ type NetworkPolicyPeer struct { // If omitted, this selector selects no namespaces. // If present but empty, this selector selects all namespaces. // +optional - NamespaceSelector *unversioned.LabelSelector `json:"namespaceSelector,omitempty"` + NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector,omitempty"` } // NetworkPolicyList is a list of NetworkPolicy objects. type NetworkPolicyList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` Items []NetworkPolicy `json:"items"` } diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/conversion.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/conversion.go index 38f7a2766ea..ff847bb4922 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/conversion.go @@ -20,11 +20,11 @@ import ( "fmt" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" v1 "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/apis/autoscaling" "k8s.io/client-go/pkg/apis/batch" "k8s.io/client-go/pkg/apis/extensions" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/conversion" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/util/intstr" @@ -96,7 +96,7 @@ func Convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in *extensions.ScaleS out.Selector = in.Selector.MatchLabels } - selector, err := unversioned.LabelSelectorAsSelector(in.Selector) + selector, err := metav1.LabelSelectorAsSelector(in.Selector) if err != nil { return fmt.Errorf("invalid label selector: %v", err) } @@ -113,14 +113,14 @@ func Convert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(in *ScaleStatus, out // new field can be expected to know about the old field (though that's not quite true, due // to kubectl apply). However, these fields are readonly, so any non-nil value should work. if in.TargetSelector != "" { - labelSelector, err := unversioned.ParseToLabelSelector(in.TargetSelector) + labelSelector, err := metav1.ParseToLabelSelector(in.TargetSelector) if err != nil { out.Selector = nil return fmt.Errorf("failed to parse target selector: %v", err) } out.Selector = labelSelector } else if in.Selector != nil { - out.Selector = new(unversioned.LabelSelector) + out.Selector = new(metav1.LabelSelector) selector := make(map[string]string) for key, val := range in.Selector { selector[key] = val diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/defaults.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/defaults.go index 2704d67f3f5..76c8bdb67dd 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/defaults.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/util/intstr" ) @@ -41,7 +41,7 @@ func SetDefaults_DaemonSet(obj *DaemonSet) { // TODO: support templates defined elsewhere when we support them in the API if labels != nil { if obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{ + obj.Spec.Selector = &metav1.LabelSelector{ MatchLabels: labels, } } @@ -57,7 +57,7 @@ func SetDefaults_Deployment(obj *Deployment) { if labels != nil { if obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{MatchLabels: labels} + obj.Spec.Selector = &metav1.LabelSelector{MatchLabels: labels} } if len(obj.Labels) == 0 { obj.Labels = labels @@ -103,7 +103,7 @@ func SetDefaults_Job(obj *Job) { // and default behavior for an unspecified manual selector is to use the pod template labels if manualSelector && obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{ + obj.Spec.Selector = &metav1.LabelSelector{ MatchLabels: labels, } } @@ -141,7 +141,7 @@ func SetDefaults_ReplicaSet(obj *ReplicaSet) { // TODO: support templates defined elsewhere when we support them in the API if labels != nil { if obj.Spec.Selector == nil { - obj.Spec.Selector = &unversioned.LabelSelector{ + obj.Spec.Selector = &metav1.LabelSelector{ MatchLabels: labels, } } diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go index facef552224..e8041575a3b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go @@ -42,7 +42,6 @@ limitations under the License. DeploymentSpec DeploymentStatus DeploymentStrategy - ExportOptions FSGroupStrategyOptions HTTPIngressPath HTTPIngressRuleValue @@ -100,8 +99,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" import k8s_io_kubernetes_pkg_util_intstr "k8s.io/client-go/pkg/util/intstr" @@ -192,229 +191,225 @@ func (m *DeploymentStrategy) Reset() { *m = DeploymentStrateg func (*DeploymentStrategy) ProtoMessage() {} func (*DeploymentStrategy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{16} } -func (m *ExportOptions) Reset() { *m = ExportOptions{} } -func (*ExportOptions) ProtoMessage() {} -func (*ExportOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{17} } - func (m *FSGroupStrategyOptions) Reset() { *m = FSGroupStrategyOptions{} } func (*FSGroupStrategyOptions) ProtoMessage() {} -func (*FSGroupStrategyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{18} } +func (*FSGroupStrategyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{17} } func (m *HTTPIngressPath) Reset() { *m = HTTPIngressPath{} } func (*HTTPIngressPath) ProtoMessage() {} -func (*HTTPIngressPath) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{19} } +func (*HTTPIngressPath) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{18} } func (m *HTTPIngressRuleValue) Reset() { *m = HTTPIngressRuleValue{} } func (*HTTPIngressRuleValue) ProtoMessage() {} -func (*HTTPIngressRuleValue) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{20} } +func (*HTTPIngressRuleValue) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{19} } func (m *HorizontalPodAutoscaler) Reset() { *m = HorizontalPodAutoscaler{} } func (*HorizontalPodAutoscaler) ProtoMessage() {} func (*HorizontalPodAutoscaler) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{21} + return fileDescriptorGenerated, []int{20} } func (m *HorizontalPodAutoscalerList) Reset() { *m = HorizontalPodAutoscalerList{} } func (*HorizontalPodAutoscalerList) ProtoMessage() {} func (*HorizontalPodAutoscalerList) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{22} + return fileDescriptorGenerated, []int{21} } func (m *HorizontalPodAutoscalerSpec) Reset() { *m = HorizontalPodAutoscalerSpec{} } func (*HorizontalPodAutoscalerSpec) ProtoMessage() {} func (*HorizontalPodAutoscalerSpec) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{23} + return fileDescriptorGenerated, []int{22} } func (m *HorizontalPodAutoscalerStatus) Reset() { *m = HorizontalPodAutoscalerStatus{} } func (*HorizontalPodAutoscalerStatus) ProtoMessage() {} func (*HorizontalPodAutoscalerStatus) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{24} + return fileDescriptorGenerated, []int{23} } func (m *HostPortRange) Reset() { *m = HostPortRange{} } func (*HostPortRange) ProtoMessage() {} -func (*HostPortRange) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{25} } +func (*HostPortRange) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{24} } func (m *IDRange) Reset() { *m = IDRange{} } func (*IDRange) ProtoMessage() {} -func (*IDRange) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{26} } +func (*IDRange) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{25} } func (m *Ingress) Reset() { *m = Ingress{} } func (*Ingress) ProtoMessage() {} -func (*Ingress) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{27} } +func (*Ingress) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{26} } func (m *IngressBackend) Reset() { *m = IngressBackend{} } func (*IngressBackend) ProtoMessage() {} -func (*IngressBackend) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{28} } +func (*IngressBackend) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{27} } func (m *IngressList) Reset() { *m = IngressList{} } func (*IngressList) ProtoMessage() {} -func (*IngressList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{29} } +func (*IngressList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{28} } func (m *IngressRule) Reset() { *m = IngressRule{} } func (*IngressRule) ProtoMessage() {} -func (*IngressRule) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{30} } +func (*IngressRule) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{29} } func (m *IngressRuleValue) Reset() { *m = IngressRuleValue{} } func (*IngressRuleValue) ProtoMessage() {} -func (*IngressRuleValue) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{31} } +func (*IngressRuleValue) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{30} } func (m *IngressSpec) Reset() { *m = IngressSpec{} } func (*IngressSpec) ProtoMessage() {} -func (*IngressSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{32} } +func (*IngressSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{31} } func (m *IngressStatus) Reset() { *m = IngressStatus{} } func (*IngressStatus) ProtoMessage() {} -func (*IngressStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{33} } +func (*IngressStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{32} } func (m *IngressTLS) Reset() { *m = IngressTLS{} } func (*IngressTLS) ProtoMessage() {} -func (*IngressTLS) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{34} } +func (*IngressTLS) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{33} } func (m *Job) Reset() { *m = Job{} } func (*Job) ProtoMessage() {} -func (*Job) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{35} } +func (*Job) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{34} } func (m *JobCondition) Reset() { *m = JobCondition{} } func (*JobCondition) ProtoMessage() {} -func (*JobCondition) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{36} } +func (*JobCondition) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{35} } func (m *JobList) Reset() { *m = JobList{} } func (*JobList) ProtoMessage() {} -func (*JobList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{37} } +func (*JobList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{36} } func (m *JobSpec) Reset() { *m = JobSpec{} } func (*JobSpec) ProtoMessage() {} -func (*JobSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{38} } +func (*JobSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{37} } func (m *JobStatus) Reset() { *m = JobStatus{} } func (*JobStatus) ProtoMessage() {} -func (*JobStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{39} } +func (*JobStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{38} } func (m *NetworkPolicy) Reset() { *m = NetworkPolicy{} } func (*NetworkPolicy) ProtoMessage() {} -func (*NetworkPolicy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{40} } +func (*NetworkPolicy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{39} } func (m *NetworkPolicyIngressRule) Reset() { *m = NetworkPolicyIngressRule{} } func (*NetworkPolicyIngressRule) ProtoMessage() {} func (*NetworkPolicyIngressRule) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{41} + return fileDescriptorGenerated, []int{40} } func (m *NetworkPolicyList) Reset() { *m = NetworkPolicyList{} } func (*NetworkPolicyList) ProtoMessage() {} -func (*NetworkPolicyList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{42} } +func (*NetworkPolicyList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{41} } func (m *NetworkPolicyPeer) Reset() { *m = NetworkPolicyPeer{} } func (*NetworkPolicyPeer) ProtoMessage() {} -func (*NetworkPolicyPeer) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{43} } +func (*NetworkPolicyPeer) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{42} } func (m *NetworkPolicyPort) Reset() { *m = NetworkPolicyPort{} } func (*NetworkPolicyPort) ProtoMessage() {} -func (*NetworkPolicyPort) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{44} } +func (*NetworkPolicyPort) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{43} } func (m *NetworkPolicySpec) Reset() { *m = NetworkPolicySpec{} } func (*NetworkPolicySpec) ProtoMessage() {} -func (*NetworkPolicySpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{45} } +func (*NetworkPolicySpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{44} } func (m *PodSecurityPolicy) Reset() { *m = PodSecurityPolicy{} } func (*PodSecurityPolicy) ProtoMessage() {} -func (*PodSecurityPolicy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{46} } +func (*PodSecurityPolicy) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{45} } func (m *PodSecurityPolicyList) Reset() { *m = PodSecurityPolicyList{} } func (*PodSecurityPolicyList) ProtoMessage() {} -func (*PodSecurityPolicyList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{47} } +func (*PodSecurityPolicyList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{46} } func (m *PodSecurityPolicySpec) Reset() { *m = PodSecurityPolicySpec{} } func (*PodSecurityPolicySpec) ProtoMessage() {} -func (*PodSecurityPolicySpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{48} } +func (*PodSecurityPolicySpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{47} } func (m *ReplicaSet) Reset() { *m = ReplicaSet{} } func (*ReplicaSet) ProtoMessage() {} -func (*ReplicaSet) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{49} } +func (*ReplicaSet) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{48} } func (m *ReplicaSetCondition) Reset() { *m = ReplicaSetCondition{} } func (*ReplicaSetCondition) ProtoMessage() {} -func (*ReplicaSetCondition) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{50} } +func (*ReplicaSetCondition) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{49} } func (m *ReplicaSetList) Reset() { *m = ReplicaSetList{} } func (*ReplicaSetList) ProtoMessage() {} -func (*ReplicaSetList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{51} } +func (*ReplicaSetList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{50} } func (m *ReplicaSetSpec) Reset() { *m = ReplicaSetSpec{} } func (*ReplicaSetSpec) ProtoMessage() {} -func (*ReplicaSetSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{52} } +func (*ReplicaSetSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{51} } func (m *ReplicaSetStatus) Reset() { *m = ReplicaSetStatus{} } func (*ReplicaSetStatus) ProtoMessage() {} -func (*ReplicaSetStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{53} } +func (*ReplicaSetStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{52} } func (m *ReplicationControllerDummy) Reset() { *m = ReplicationControllerDummy{} } func (*ReplicationControllerDummy) ProtoMessage() {} func (*ReplicationControllerDummy) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{54} + return fileDescriptorGenerated, []int{53} } func (m *RollbackConfig) Reset() { *m = RollbackConfig{} } func (*RollbackConfig) ProtoMessage() {} -func (*RollbackConfig) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{55} } +func (*RollbackConfig) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{54} } func (m *RollingUpdateDeployment) Reset() { *m = RollingUpdateDeployment{} } func (*RollingUpdateDeployment) ProtoMessage() {} func (*RollingUpdateDeployment) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{56} + return fileDescriptorGenerated, []int{55} } func (m *RunAsUserStrategyOptions) Reset() { *m = RunAsUserStrategyOptions{} } func (*RunAsUserStrategyOptions) ProtoMessage() {} func (*RunAsUserStrategyOptions) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{57} + return fileDescriptorGenerated, []int{56} } func (m *SELinuxStrategyOptions) Reset() { *m = SELinuxStrategyOptions{} } func (*SELinuxStrategyOptions) ProtoMessage() {} -func (*SELinuxStrategyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{58} } +func (*SELinuxStrategyOptions) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{57} } func (m *Scale) Reset() { *m = Scale{} } func (*Scale) ProtoMessage() {} -func (*Scale) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{59} } +func (*Scale) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{58} } func (m *ScaleSpec) Reset() { *m = ScaleSpec{} } func (*ScaleSpec) ProtoMessage() {} -func (*ScaleSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{60} } +func (*ScaleSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{59} } func (m *ScaleStatus) Reset() { *m = ScaleStatus{} } func (*ScaleStatus) ProtoMessage() {} -func (*ScaleStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{61} } +func (*ScaleStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{60} } func (m *SubresourceReference) Reset() { *m = SubresourceReference{} } func (*SubresourceReference) ProtoMessage() {} -func (*SubresourceReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{62} } +func (*SubresourceReference) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{61} } func (m *SupplementalGroupsStrategyOptions) Reset() { *m = SupplementalGroupsStrategyOptions{} } func (*SupplementalGroupsStrategyOptions) ProtoMessage() {} func (*SupplementalGroupsStrategyOptions) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{63} + return fileDescriptorGenerated, []int{62} } func (m *ThirdPartyResource) Reset() { *m = ThirdPartyResource{} } func (*ThirdPartyResource) ProtoMessage() {} -func (*ThirdPartyResource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{64} } +func (*ThirdPartyResource) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{63} } func (m *ThirdPartyResourceData) Reset() { *m = ThirdPartyResourceData{} } func (*ThirdPartyResourceData) ProtoMessage() {} -func (*ThirdPartyResourceData) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{65} } +func (*ThirdPartyResourceData) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{64} } func (m *ThirdPartyResourceDataList) Reset() { *m = ThirdPartyResourceDataList{} } func (*ThirdPartyResourceDataList) ProtoMessage() {} func (*ThirdPartyResourceDataList) Descriptor() ([]byte, []int) { - return fileDescriptorGenerated, []int{66} + return fileDescriptorGenerated, []int{65} } func (m *ThirdPartyResourceList) Reset() { *m = ThirdPartyResourceList{} } func (*ThirdPartyResourceList) ProtoMessage() {} -func (*ThirdPartyResourceList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{67} } +func (*ThirdPartyResourceList) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{66} } func init() { proto.RegisterType((*APIVersion)(nil), "k8s.io.client-go.pkg.apis.extensions.v1beta1.APIVersion") @@ -434,7 +429,6 @@ func init() { proto.RegisterType((*DeploymentSpec)(nil), "k8s.io.client-go.pkg.apis.extensions.v1beta1.DeploymentSpec") proto.RegisterType((*DeploymentStatus)(nil), "k8s.io.client-go.pkg.apis.extensions.v1beta1.DeploymentStatus") proto.RegisterType((*DeploymentStrategy)(nil), "k8s.io.client-go.pkg.apis.extensions.v1beta1.DeploymentStrategy") - proto.RegisterType((*ExportOptions)(nil), "k8s.io.client-go.pkg.apis.extensions.v1beta1.ExportOptions") proto.RegisterType((*FSGroupStrategyOptions)(nil), "k8s.io.client-go.pkg.apis.extensions.v1beta1.FSGroupStrategyOptions") proto.RegisterType((*HTTPIngressPath)(nil), "k8s.io.client-go.pkg.apis.extensions.v1beta1.HTTPIngressPath") proto.RegisterType((*HTTPIngressRuleValue)(nil), "k8s.io.client-go.pkg.apis.extensions.v1beta1.HTTPIngressRuleValue") @@ -1129,40 +1123,6 @@ func (m *DeploymentStrategy) MarshalTo(data []byte) (int, error) { return i, nil } -func (m *ExportOptions) Marshal() (data []byte, err error) { - size := m.Size() - data = make([]byte, size) - n, err := m.MarshalTo(data) - if err != nil { - return nil, err - } - return data[:n], nil -} - -func (m *ExportOptions) MarshalTo(data []byte) (int, error) { - var i int - _ = i - var l int - _ = l - data[i] = 0x8 - i++ - if m.Export { - data[i] = 1 - } else { - data[i] = 0 - } - i++ - data[i] = 0x10 - i++ - if m.Exact { - data[i] = 1 - } else { - data[i] = 0 - } - i++ - return i, nil -} - func (m *FSGroupStrategyOptions) Marshal() (data []byte, err error) { size := m.Size() data = make([]byte, size) @@ -3395,14 +3355,6 @@ func (m *DeploymentStrategy) Size() (n int) { return n } -func (m *ExportOptions) Size() (n int) { - var l int - _ = l - n += 2 - n += 2 - return n -} - func (m *FSGroupStrategyOptions) Size() (n int) { var l int _ = l @@ -4203,7 +4155,7 @@ func (this *DaemonSetList) String() string { return "nil" } s := strings.Join([]string{`&DaemonSetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "DaemonSet", "DaemonSet", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4214,7 +4166,7 @@ func (this *DaemonSetSpec) String() string { return "nil" } s := strings.Join([]string{`&DaemonSetSpec{`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4254,8 +4206,8 @@ func (this *DeploymentCondition) String() string { `Status:` + fmt.Sprintf("%v", this.Status) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, - `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastUpdateTime:` + strings.Replace(strings.Replace(this.LastUpdateTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -4265,7 +4217,7 @@ func (this *DeploymentList) String() string { return "nil" } s := strings.Join([]string{`&DeploymentList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Deployment", "Deployment", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4299,7 +4251,7 @@ func (this *DeploymentSpec) String() string { } s := strings.Join([]string{`&DeploymentSpec{`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `Strategy:` + strings.Replace(strings.Replace(this.Strategy.String(), "DeploymentStrategy", "DeploymentStrategy", 1), `&`, ``, 1) + `,`, `MinReadySeconds:` + fmt.Sprintf("%v", this.MinReadySeconds) + `,`, @@ -4337,17 +4289,6 @@ func (this *DeploymentStrategy) String() string { }, "") return s } -func (this *ExportOptions) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ExportOptions{`, - `Export:` + fmt.Sprintf("%v", this.Export) + `,`, - `Exact:` + fmt.Sprintf("%v", this.Exact) + `,`, - `}`, - }, "") - return s -} func (this *FSGroupStrategyOptions) String() string { if this == nil { return "nil" @@ -4397,7 +4338,7 @@ func (this *HorizontalPodAutoscalerList) String() string { return "nil" } s := strings.Join([]string{`&HorizontalPodAutoscalerList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "HorizontalPodAutoscaler", "HorizontalPodAutoscaler", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4422,7 +4363,7 @@ func (this *HorizontalPodAutoscalerStatus) String() string { } s := strings.Join([]string{`&HorizontalPodAutoscalerStatus{`, `ObservedGeneration:` + valueToStringGenerated(this.ObservedGeneration) + `,`, - `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `LastScaleTime:` + strings.Replace(fmt.Sprintf("%v", this.LastScaleTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `CurrentReplicas:` + fmt.Sprintf("%v", this.CurrentReplicas) + `,`, `DesiredReplicas:` + fmt.Sprintf("%v", this.DesiredReplicas) + `,`, `CurrentCPUUtilizationPercentage:` + valueToStringGenerated(this.CurrentCPUUtilizationPercentage) + `,`, @@ -4480,7 +4421,7 @@ func (this *IngressList) String() string { return "nil" } s := strings.Join([]string{`&IngressList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Ingress", "Ingress", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4559,8 +4500,8 @@ func (this *JobCondition) String() string { s := strings.Join([]string{`&JobCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -4572,7 +4513,7 @@ func (this *JobList) String() string { return "nil" } s := strings.Join([]string{`&JobList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Job", "Job", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4586,7 +4527,7 @@ func (this *JobSpec) String() string { `Parallelism:` + valueToStringGenerated(this.Parallelism) + `,`, `Completions:` + valueToStringGenerated(this.Completions) + `,`, `ActiveDeadlineSeconds:` + valueToStringGenerated(this.ActiveDeadlineSeconds) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `AutoSelector:` + valueToStringGenerated(this.AutoSelector) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `}`, @@ -4599,8 +4540,8 @@ func (this *JobStatus) String() string { } s := strings.Join([]string{`&JobStatus{`, `Conditions:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Conditions), "JobCondition", "JobCondition", 1), `&`, ``, 1) + `,`, - `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, - `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1) + `,`, + `StartTime:` + strings.Replace(fmt.Sprintf("%v", this.StartTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, + `CompletionTime:` + strings.Replace(fmt.Sprintf("%v", this.CompletionTime), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1) + `,`, `Active:` + fmt.Sprintf("%v", this.Active) + `,`, `Succeeded:` + fmt.Sprintf("%v", this.Succeeded) + `,`, `Failed:` + fmt.Sprintf("%v", this.Failed) + `,`, @@ -4635,7 +4576,7 @@ func (this *NetworkPolicyList) String() string { return "nil" } s := strings.Join([]string{`&NetworkPolicyList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "NetworkPolicy", "NetworkPolicy", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4646,8 +4587,8 @@ func (this *NetworkPolicyPeer) String() string { return "nil" } s := strings.Join([]string{`&NetworkPolicyPeer{`, - `PodSelector:` + strings.Replace(fmt.Sprintf("%v", this.PodSelector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, - `NamespaceSelector:` + strings.Replace(fmt.Sprintf("%v", this.NamespaceSelector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `PodSelector:` + strings.Replace(fmt.Sprintf("%v", this.PodSelector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, + `NamespaceSelector:` + strings.Replace(fmt.Sprintf("%v", this.NamespaceSelector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") return s @@ -4668,7 +4609,7 @@ func (this *NetworkPolicySpec) String() string { return "nil" } s := strings.Join([]string{`&NetworkPolicySpec{`, - `PodSelector:` + strings.Replace(strings.Replace(this.PodSelector.String(), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1), `&`, ``, 1) + `,`, + `PodSelector:` + strings.Replace(strings.Replace(this.PodSelector.String(), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1), `&`, ``, 1) + `,`, `Ingress:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Ingress), "NetworkPolicyIngressRule", "NetworkPolicyIngressRule", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4690,7 +4631,7 @@ func (this *PodSecurityPolicyList) String() string { return "nil" } s := strings.Join([]string{`&PodSecurityPolicyList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodSecurityPolicy", "PodSecurityPolicy", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4738,7 +4679,7 @@ func (this *ReplicaSetCondition) String() string { s := strings.Join([]string{`&ReplicaSetCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -4750,7 +4691,7 @@ func (this *ReplicaSetList) String() string { return "nil" } s := strings.Join([]string{`&ReplicaSetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ReplicaSet", "ReplicaSet", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4762,7 +4703,7 @@ func (this *ReplicaSetSpec) String() string { } s := strings.Join([]string{`&ReplicaSetSpec{`, `Replicas:` + valueToStringGenerated(this.Replicas) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `Template:` + strings.Replace(strings.Replace(this.Template.String(), "PodTemplateSpec", "k8s_io_kubernetes_pkg_api_v1.PodTemplateSpec", 1), `&`, ``, 1) + `,`, `MinReadySeconds:` + fmt.Sprintf("%v", this.MinReadySeconds) + `,`, `}`, @@ -4932,7 +4873,7 @@ func (this *ThirdPartyResourceDataList) String() string { return "nil" } s := strings.Join([]string{`&ThirdPartyResourceDataList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ThirdPartyResourceData", "ThirdPartyResourceData", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -4943,7 +4884,7 @@ func (this *ThirdPartyResourceList) String() string { return "nil" } s := strings.Join([]string{`&ThirdPartyResourceList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ThirdPartyResource", "ThirdPartyResource", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -5792,7 +5733,7 @@ func (m *DaemonSetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -6748,7 +6689,7 @@ func (m *DeploymentSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -7235,96 +7176,6 @@ func (m *DeploymentStrategy) Unmarshal(data []byte) error { } return nil } -func (m *ExportOptions) Unmarshal(data []byte) error { - l := len(data) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := data[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ExportOptions: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ExportOptions: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Export", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := data[iNdEx] - iNdEx++ - v |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - m.Export = bool(v != 0) - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Exact", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := data[iNdEx] - iNdEx++ - v |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - m.Exact = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipGenerated(data[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *FSGroupStrategyOptions) Unmarshal(data []byte) error { l := len(data) iNdEx := 0 @@ -8104,7 +7955,7 @@ func (m *HorizontalPodAutoscalerStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.LastScaleTime == nil { - m.LastScaleTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.LastScaleTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.LastScaleTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -9843,7 +9694,7 @@ func (m *JobSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -10008,7 +9859,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.StartTime == nil { - m.StartTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.StartTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.StartTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -10041,7 +9892,7 @@ func (m *JobStatus) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.CompletionTime == nil { - m.CompletionTime = &k8s_io_kubernetes_pkg_api_unversioned.Time{} + m.CompletionTime = &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} } if err := m.CompletionTime.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -10514,7 +10365,7 @@ func (m *NetworkPolicyPeer) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.PodSelector == nil { - m.PodSelector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.PodSelector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.PodSelector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -10547,7 +10398,7 @@ func (m *NetworkPolicyPeer) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.NamespaceSelector == nil { - m.NamespaceSelector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.NamespaceSelector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.NamespaceSelector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -11959,7 +11810,7 @@ func (m *ReplicaSetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -13941,250 +13792,247 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 3919 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe4, 0x5b, 0x5d, 0x6c, 0x24, 0xd9, - 0x55, 0x9e, 0xea, 0x76, 0xdb, 0xed, 0xd3, 0x63, 0x8f, 0xe7, 0x8e, 0xc7, 0xd3, 0xeb, 0xdd, 0x75, - 0x4f, 0x6a, 0xc5, 0x66, 0x22, 0x76, 0xdb, 0xcc, 0xb0, 0x13, 0x36, 0xbb, 0x9b, 0x4d, 0xdc, 0xf6, - 0xfc, 0x62, 0xcf, 0x74, 0x6e, 0xdb, 0x93, 0x21, 0xd9, 0x6c, 0xa8, 0xee, 0xba, 0x6e, 0xd7, 0xba, - 0xfe, 0xb6, 0xea, 0x96, 0xd7, 0x9d, 0x08, 0x25, 0x12, 0xe2, 0x35, 0xe4, 0x0d, 0x24, 0xe0, 0x81, - 0x07, 0xc4, 0x13, 0x11, 0x11, 0x48, 0x91, 0x78, 0x02, 0x04, 0x62, 0x91, 0x40, 0x04, 0x24, 0x04, - 0x0f, 0xd0, 0xcb, 0x3a, 0x42, 0x11, 0xef, 0x08, 0xa4, 0xe1, 0x05, 0xdd, 0x5b, 0xb7, 0x7e, 0xbb, - 0xaa, 0xc7, 0xd5, 0xfe, 0x91, 0x10, 0x6f, 0xdd, 0xf7, 0x9e, 0xf3, 0x9d, 0x73, 0x4f, 0x9d, 0x3a, - 0xe7, 0xdc, 0x7b, 0x4f, 0xc1, 0x17, 0xf7, 0xdf, 0x74, 0x9b, 0x9a, 0xb5, 0xba, 0xef, 0x75, 0x89, - 0x63, 0x12, 0x4a, 0xdc, 0x55, 0x7b, 0xbf, 0xbf, 0xaa, 0xd8, 0x9a, 0xbb, 0x4a, 0x0e, 0x29, 0x31, - 0x5d, 0xcd, 0x32, 0xdd, 0xd5, 0x83, 0x9b, 0x5d, 0x42, 0x95, 0x9b, 0xab, 0x7d, 0x62, 0x12, 0x47, - 0xa1, 0x44, 0x6d, 0xda, 0x8e, 0x45, 0x2d, 0xf4, 0xba, 0xcf, 0xde, 0x8c, 0xd8, 0x9b, 0xf6, 0x7e, - 0xbf, 0xc9, 0xd8, 0x9b, 0x11, 0x7b, 0x53, 0xb0, 0x2f, 0xbf, 0xde, 0xd7, 0xe8, 0x9e, 0xd7, 0x6d, - 0xf6, 0x2c, 0x63, 0xb5, 0x6f, 0xf5, 0xad, 0x55, 0x8e, 0xd2, 0xf5, 0x76, 0xf9, 0x3f, 0xfe, 0x87, - 0xff, 0xf2, 0xd1, 0x97, 0x6f, 0xe5, 0x2a, 0xb7, 0xea, 0x10, 0xd7, 0xf2, 0x9c, 0x1e, 0x49, 0x6b, - 0xb4, 0x7c, 0x3b, 0x9f, 0xc7, 0x33, 0x0f, 0x88, 0xc3, 0x14, 0x22, 0xea, 0x08, 0xdb, 0x6b, 0xf9, - 0x6c, 0x07, 0x23, 0xcb, 0x5e, 0x7e, 0x3d, 0x9b, 0xda, 0xf1, 0x4c, 0xaa, 0x19, 0xa3, 0x3a, 0xbd, - 0x31, 0x9e, 0xdc, 0xed, 0xed, 0x11, 0x43, 0x19, 0xe1, 0xba, 0x99, 0xcd, 0xe5, 0x51, 0x4d, 0x5f, - 0xd5, 0x4c, 0xea, 0x52, 0x27, 0xcd, 0x22, 0x37, 0x01, 0xd6, 0xda, 0x0f, 0x9e, 0xf8, 0xab, 0x44, - 0xd7, 0x61, 0xca, 0x54, 0x0c, 0x52, 0x97, 0xae, 0x4b, 0x37, 0x66, 0x5b, 0x17, 0x3f, 0x1e, 0x36, - 0x2e, 0x1c, 0x0d, 0x1b, 0x53, 0x8f, 0x14, 0x83, 0x60, 0x3e, 0x23, 0xbf, 0x07, 0x8b, 0xeb, 0xed, - 0x9d, 0x6d, 0xc5, 0xe9, 0x13, 0xba, 0x43, 0x35, 0x5d, 0xfb, 0x96, 0x42, 0x19, 0xe7, 0x06, 0x2c, - 0x50, 0x3e, 0xd8, 0x26, 0x4e, 0x8f, 0x98, 0x54, 0xe9, 0xfb, 0x28, 0x95, 0x56, 0x5d, 0xa0, 0x2c, - 0x6c, 0xa7, 0xe6, 0xf1, 0x08, 0x87, 0xfc, 0x1b, 0x12, 0xbc, 0xb0, 0xee, 0xb9, 0xd4, 0x32, 0xb6, - 0x08, 0x75, 0xb4, 0xde, 0xba, 0xe7, 0x38, 0xc4, 0xa4, 0x1d, 0xaa, 0x50, 0xcf, 0x7d, 0xbe, 0x76, - 0xe8, 0x29, 0x54, 0x0e, 0x14, 0xdd, 0x23, 0xf5, 0xd2, 0x75, 0xe9, 0x46, 0xed, 0xd6, 0x6b, 0xcd, - 0x5c, 0x67, 0x6b, 0x06, 0xee, 0xd0, 0xfc, 0x8a, 0xa7, 0x98, 0x54, 0xa3, 0x83, 0xd6, 0xa2, 0x00, - 0xbc, 0x28, 0xa4, 0x3e, 0x61, 0x48, 0xd8, 0x07, 0x94, 0xbf, 0x27, 0xc1, 0xcb, 0xb9, 0x9a, 0x6d, - 0x6a, 0x2e, 0x45, 0x06, 0x54, 0x34, 0x4a, 0x0c, 0xb7, 0x2e, 0x5d, 0x2f, 0xdf, 0xa8, 0xdd, 0xba, - 0xdf, 0x2c, 0xe4, 0xe8, 0xcd, 0x5c, 0xf0, 0xd6, 0x9c, 0xd0, 0xab, 0xf2, 0x80, 0xc1, 0x63, 0x5f, - 0x8a, 0xfc, 0xeb, 0x12, 0xa0, 0x38, 0x8f, 0x6f, 0xdd, 0x63, 0xd8, 0xe8, 0xab, 0x27, 0xb1, 0xd1, - 0x15, 0x01, 0x58, 0xf3, 0xc5, 0x25, 0x4c, 0xf4, 0x5d, 0x09, 0x96, 0x46, 0x35, 0xe2, 0xb6, 0xd9, - 0x4d, 0xda, 0x66, 0xed, 0x04, 0xb6, 0xf1, 0x51, 0x73, 0x8c, 0xf2, 0x07, 0x25, 0x98, 0xdd, 0x50, - 0x88, 0x61, 0x99, 0x1d, 0x42, 0xd1, 0x53, 0xa8, 0x1a, 0x84, 0x2a, 0xaa, 0x42, 0x15, 0x6e, 0x8f, - 0xda, 0xad, 0x1b, 0x63, 0x16, 0x7b, 0x70, 0xb3, 0xf9, 0xb8, 0xfb, 0x01, 0xe9, 0xd1, 0x2d, 0x42, - 0x95, 0x16, 0x12, 0xf8, 0x10, 0x8d, 0xe1, 0x10, 0x0d, 0xbd, 0x0f, 0x53, 0xae, 0x4d, 0x7a, 0xc2, - 0x84, 0xef, 0x14, 0x5c, 0x4e, 0xa8, 0x61, 0xc7, 0x26, 0xbd, 0xe8, 0x19, 0xb1, 0x7f, 0x98, 0xe3, - 0xa2, 0x5d, 0x98, 0x76, 0xf9, 0xc3, 0xaf, 0x97, 0xb9, 0x84, 0x77, 0x27, 0x96, 0xe0, 0xbb, 0xd0, - 0xbc, 0x90, 0x31, 0xed, 0xff, 0xc7, 0x02, 0x5d, 0xfe, 0x5b, 0x09, 0xe6, 0x42, 0x5a, 0xfe, 0xa4, - 0xbe, 0x31, 0x62, 0xb3, 0xd5, 0x31, 0x36, 0x8b, 0xc5, 0xc7, 0x26, 0x63, 0xe7, 0xa6, 0x5b, 0x10, - 0xc2, 0xaa, 0xc1, 0x48, 0xcc, 0x70, 0xdf, 0x08, 0x1c, 0xa1, 0xc4, 0x1d, 0xe1, 0xcd, 0x49, 0xd7, - 0x95, 0xf3, 0xfc, 0xff, 0x26, 0xbe, 0x1e, 0x66, 0x4f, 0xf4, 0x3e, 0x54, 0x5d, 0xa2, 0x93, 0x1e, - 0xb5, 0x1c, 0xb1, 0x9e, 0x37, 0x8e, 0xbb, 0x1e, 0xa5, 0x4b, 0xf4, 0x8e, 0xe0, 0x6d, 0x5d, 0x64, - 0x0b, 0x0a, 0xfe, 0xe1, 0x10, 0x13, 0x7d, 0x1d, 0xaa, 0x94, 0x18, 0xb6, 0xae, 0xd0, 0xe0, 0x85, - 0x7a, 0x7d, 0xbc, 0x8f, 0xb5, 0x2d, 0x75, 0x5b, 0x30, 0xf0, 0xc7, 0x1f, 0x5a, 0x2b, 0x18, 0xc5, - 0x21, 0xa0, 0xfc, 0x17, 0x25, 0xb8, 0x94, 0x7a, 0x94, 0xe8, 0x09, 0x2c, 0xf5, 0xfc, 0xf0, 0xf0, - 0xc8, 0x33, 0xba, 0xc4, 0xe9, 0xf4, 0xf6, 0x88, 0xea, 0xe9, 0x44, 0x15, 0xe1, 0x76, 0x45, 0xe0, - 0x2d, 0xad, 0x67, 0x52, 0xe1, 0x1c, 0x6e, 0xf4, 0x10, 0x90, 0xc9, 0x87, 0xb6, 0x34, 0xd7, 0x0d, - 0x31, 0x4b, 0x1c, 0x73, 0x59, 0x60, 0xa2, 0x47, 0x23, 0x14, 0x38, 0x83, 0x8b, 0xe9, 0xa8, 0x12, - 0x57, 0x73, 0x88, 0x9a, 0xd6, 0xb1, 0x9c, 0xd4, 0x71, 0x23, 0x93, 0x0a, 0xe7, 0x70, 0xa3, 0xdb, - 0x50, 0xf3, 0xa5, 0x61, 0xa2, 0xa8, 0x83, 0xfa, 0x14, 0x07, 0x0b, 0x43, 0xd2, 0xa3, 0x68, 0x0a, - 0xc7, 0xe9, 0xe4, 0x3f, 0x2c, 0x01, 0x6c, 0x10, 0x5b, 0xb7, 0x06, 0x06, 0x31, 0xcf, 0x32, 0x2c, - 0x7c, 0x33, 0x11, 0x16, 0xbe, 0x58, 0xd4, 0xb9, 0x43, 0x15, 0x73, 0xe3, 0x42, 0x3f, 0x15, 0x17, - 0xbe, 0x34, 0xb9, 0x88, 0xf1, 0x81, 0xe1, 0x27, 0x65, 0xb8, 0x12, 0x11, 0xaf, 0x5b, 0xa6, 0xaa, - 0xf1, 0x34, 0xff, 0x36, 0x4c, 0xd1, 0x81, 0x1d, 0xa4, 0x97, 0xcf, 0x06, 0x2a, 0x6e, 0x0f, 0x6c, - 0xf2, 0x6c, 0xd8, 0xb8, 0x96, 0xc1, 0xc2, 0xa6, 0x30, 0x67, 0x42, 0x4f, 0x42, 0xed, 0x4b, 0x9c, - 0xfd, 0xdd, 0xa4, 0xf0, 0x67, 0xc3, 0xc6, 0xd8, 0x9a, 0xaa, 0x19, 0x62, 0x26, 0x95, 0x45, 0xaf, - 0xc2, 0xb4, 0x43, 0x14, 0xd7, 0x32, 0xb9, 0x47, 0xcc, 0x46, 0x8b, 0xc2, 0x7c, 0x14, 0x8b, 0x59, - 0xf4, 0x39, 0x98, 0x31, 0x88, 0xeb, 0xb2, 0xd2, 0xa4, 0xc2, 0x09, 0x2f, 0x09, 0xc2, 0x99, 0x2d, - 0x7f, 0x18, 0x07, 0xf3, 0x68, 0x1f, 0xe6, 0x75, 0xc5, 0xa5, 0x3b, 0xb6, 0xaa, 0x50, 0xb2, 0xad, - 0x19, 0xa4, 0x3e, 0xcd, 0x0d, 0xfe, 0xb3, 0xc7, 0x0c, 0x1e, 0x8c, 0xa5, 0xb5, 0x24, 0xe0, 0xe7, - 0x37, 0x13, 0x50, 0x38, 0x05, 0x8d, 0x3e, 0x02, 0xc4, 0x46, 0xb6, 0x1d, 0xc5, 0x74, 0x7d, 0x9b, - 0x31, 0x81, 0x33, 0xc5, 0x05, 0x86, 0xef, 0xe9, 0xe6, 0x08, 0x1c, 0xce, 0x10, 0x21, 0xff, 0x9d, - 0x04, 0xf3, 0xd1, 0x23, 0x3b, 0x8f, 0xf8, 0xff, 0x7e, 0x32, 0xfe, 0x7f, 0x61, 0x62, 0xff, 0xcd, - 0x49, 0x00, 0xbf, 0x59, 0x06, 0x14, 0x11, 0x61, 0x4b, 0xd7, 0xbb, 0x4a, 0x6f, 0xff, 0x18, 0x55, - 0xd1, 0xef, 0x49, 0x80, 0x3c, 0xfe, 0x48, 0xd4, 0x35, 0xd3, 0xb4, 0x28, 0xaf, 0x6a, 0x03, 0x35, - 0x7f, 0x69, 0x62, 0x35, 0x03, 0x0d, 0x9a, 0x3b, 0x23, 0xd8, 0x77, 0x4c, 0xea, 0x0c, 0xa2, 0x47, - 0x36, 0x4a, 0x80, 0x33, 0x14, 0x42, 0x1f, 0x02, 0x38, 0x02, 0x73, 0xdb, 0x12, 0x51, 0xa0, 0x68, - 0xa0, 0x09, 0x94, 0x5a, 0xb7, 0xcc, 0x5d, 0xad, 0x1f, 0xc5, 0x34, 0x1c, 0x02, 0xe3, 0x98, 0x90, - 0xe5, 0x3b, 0x70, 0x2d, 0x47, 0x7b, 0xb4, 0x00, 0xe5, 0x7d, 0x32, 0xf0, 0xcd, 0x8a, 0xd9, 0x4f, - 0xb4, 0x18, 0xaf, 0x2e, 0x67, 0x45, 0x69, 0xf8, 0x56, 0xe9, 0x4d, 0x49, 0xfe, 0x69, 0x25, 0xee, - 0x6c, 0x3c, 0x39, 0xdf, 0x80, 0xaa, 0x43, 0x6c, 0x5d, 0xeb, 0x29, 0xae, 0xc8, 0x5e, 0x3c, 0xcd, - 0x62, 0x31, 0x86, 0xc3, 0xd9, 0x44, 0x1a, 0x2f, 0x9d, 0x71, 0x1a, 0x2f, 0x9f, 0x72, 0x1a, 0x47, - 0x16, 0x54, 0x5d, 0xca, 0x36, 0x5d, 0x7d, 0x3f, 0x67, 0x15, 0x2f, 0x80, 0xe3, 0x71, 0xdb, 0x07, - 0x8a, 0x04, 0x06, 0x23, 0x38, 0x14, 0x82, 0xd6, 0xe0, 0x92, 0xa1, 0x99, 0x3c, 0xf9, 0x75, 0x48, - 0xcf, 0x32, 0x55, 0x97, 0x07, 0xbc, 0x4a, 0xeb, 0x9a, 0x60, 0xba, 0xb4, 0x95, 0x9c, 0xc6, 0x69, - 0x7a, 0xb4, 0x09, 0x8b, 0x0e, 0x39, 0xd0, 0x98, 0x1a, 0xf7, 0x35, 0x97, 0x5a, 0xce, 0x60, 0x53, - 0x33, 0x34, 0xca, 0xc3, 0x60, 0xa5, 0x55, 0x3f, 0x1a, 0x36, 0x16, 0x71, 0xc6, 0x3c, 0xce, 0xe4, - 0x62, 0x11, 0xda, 0x56, 0x3c, 0x97, 0xa8, 0x3c, 0xaa, 0x55, 0xa3, 0x08, 0xdd, 0xe6, 0xa3, 0x58, - 0xcc, 0x22, 0x23, 0xe1, 0xdd, 0xd5, 0xd3, 0xf0, 0xee, 0xf9, 0x7c, 0xcf, 0x46, 0x3b, 0x70, 0xcd, - 0x76, 0xac, 0xbe, 0x43, 0x5c, 0x77, 0x83, 0x28, 0xaa, 0xae, 0x99, 0x24, 0xb0, 0xd7, 0x2c, 0x5f, - 0xe7, 0x8b, 0x47, 0xc3, 0xc6, 0xb5, 0x76, 0x36, 0x09, 0xce, 0xe3, 0x95, 0x3f, 0x29, 0xc3, 0x42, - 0x3a, 0xd3, 0xb2, 0xfa, 0xca, 0xea, 0xba, 0xc4, 0x39, 0x20, 0xea, 0x3d, 0x7f, 0x0f, 0xae, 0x59, - 0x26, 0xf7, 0xfa, 0x72, 0x14, 0x04, 0x1e, 0x8f, 0x50, 0xe0, 0x0c, 0x2e, 0xf4, 0x5a, 0xec, 0xbd, - 0xf1, 0x2b, 0xb4, 0xd0, 0x1b, 0x32, 0xde, 0x9d, 0x35, 0xb8, 0x24, 0x02, 0x49, 0x30, 0x29, 0xca, - 0xb0, 0xd0, 0x1b, 0x76, 0x92, 0xd3, 0x38, 0x4d, 0x8f, 0xee, 0xc1, 0x65, 0xe5, 0x40, 0xd1, 0x74, - 0xa5, 0xab, 0x93, 0x10, 0xc4, 0x2f, 0xbf, 0x5e, 0x10, 0x20, 0x97, 0xd7, 0xd2, 0x04, 0x78, 0x94, - 0x07, 0x6d, 0xc1, 0x15, 0xcf, 0x1c, 0x85, 0xf2, 0xbd, 0xf3, 0x45, 0x01, 0x75, 0x65, 0x67, 0x94, - 0x04, 0x67, 0xf1, 0xa1, 0x03, 0x80, 0x5e, 0x50, 0x14, 0xb8, 0xf5, 0x69, 0x1e, 0xac, 0x5b, 0x13, - 0xbf, 0x5b, 0x61, 0x7d, 0x11, 0x85, 0xc4, 0x70, 0xc8, 0xc5, 0x31, 0x49, 0xf2, 0xdf, 0x4b, 0xf1, - 0x34, 0x13, 0xbc, 0x81, 0xe8, 0xad, 0x44, 0x75, 0xf4, 0x6a, 0xaa, 0x3a, 0x5a, 0x1a, 0xe5, 0x88, - 0x15, 0x47, 0xdf, 0x81, 0x39, 0xe6, 0x99, 0x9a, 0xd9, 0xf7, 0x9f, 0x86, 0x08, 0x73, 0x77, 0x27, - 0xf0, 0xfe, 0x10, 0x23, 0x96, 0x2e, 0x2f, 0x1f, 0x0d, 0x1b, 0x73, 0x89, 0x49, 0x9c, 0x94, 0x27, - 0xbf, 0x07, 0x73, 0x77, 0x0e, 0x6d, 0xcb, 0xa1, 0x8f, 0x6d, 0x3f, 0xd5, 0xbc, 0x0a, 0xd3, 0x84, - 0x0f, 0xf0, 0xf5, 0xc4, 0x5e, 0x5a, 0x9f, 0x0c, 0x8b, 0x59, 0xf4, 0x0a, 0x54, 0xc8, 0xa1, 0xd2, - 0xa3, 0x5c, 0xe3, 0x6a, 0x94, 0x98, 0xef, 0xb0, 0x41, 0xec, 0xcf, 0xc9, 0x3f, 0x94, 0x60, 0xe9, - 0x6e, 0xe7, 0x9e, 0x63, 0x79, 0x76, 0xb0, 0xf8, 0x40, 0xce, 0x2f, 0xc0, 0x94, 0xe3, 0xe9, 0x81, - 0xd5, 0x5e, 0x09, 0xac, 0x86, 0x3d, 0x9d, 0x59, 0xed, 0x4a, 0x8a, 0xcb, 0x37, 0x19, 0x63, 0x40, - 0xef, 0xc3, 0xb4, 0xa3, 0x98, 0x7d, 0x12, 0xa4, 0xe9, 0xcf, 0x17, 0xb4, 0xd5, 0x83, 0x0d, 0xcc, - 0xd8, 0x63, 0xf5, 0x22, 0x47, 0xc3, 0x02, 0x55, 0xfe, 0x1d, 0x09, 0x2e, 0xdd, 0xdf, 0xde, 0x6e, - 0x3f, 0x30, 0xf9, 0x6b, 0xde, 0x56, 0xe8, 0x1e, 0xab, 0x24, 0x6c, 0x85, 0xee, 0xa5, 0x2b, 0x09, - 0x36, 0x87, 0xf9, 0x0c, 0xda, 0x83, 0x19, 0x16, 0x5e, 0x88, 0xa9, 0x4e, 0xb8, 0x0f, 0x10, 0xe2, - 0x5a, 0x3e, 0x48, 0x54, 0xa4, 0x8a, 0x01, 0x1c, 0xc0, 0xcb, 0xdf, 0x86, 0xc5, 0x98, 0x7a, 0xcc, - 0x5e, 0xfc, 0x3c, 0x06, 0xf5, 0xa0, 0xc2, 0x34, 0x09, 0x4e, 0x5b, 0x8a, 0x1e, 0x1e, 0xa4, 0x96, - 0x1c, 0x3d, 0x50, 0xf6, 0xcf, 0xc5, 0x3e, 0xb6, 0xfc, 0x4f, 0x25, 0xb8, 0x76, 0xdf, 0x72, 0xb4, - 0x6f, 0x59, 0x26, 0x55, 0xf4, 0xb6, 0xa5, 0xae, 0x79, 0xd4, 0x72, 0x7b, 0x8a, 0x4e, 0x9c, 0x33, - 0xdc, 0x61, 0xe9, 0x89, 0x1d, 0xd6, 0xc3, 0xa2, 0x2b, 0xcb, 0xd6, 0x37, 0x77, 0xbb, 0x45, 0x53, - 0xdb, 0xad, 0xcd, 0x53, 0x92, 0x37, 0x7e, 0xef, 0xf5, 0x1f, 0x12, 0xbc, 0x98, 0xc3, 0x79, 0x1e, - 0x25, 0xfa, 0x7e, 0xb2, 0x44, 0xbf, 0x7b, 0x3a, 0x6b, 0xce, 0xa9, 0xd7, 0xff, 0xa7, 0x94, 0xbb, - 0x56, 0x5e, 0x21, 0x7e, 0x08, 0x55, 0xfe, 0x0f, 0x93, 0x5d, 0xb1, 0xd6, 0xf5, 0x82, 0xfa, 0x74, - 0xbc, 0x6e, 0x70, 0x8c, 0x89, 0xc9, 0x2e, 0x71, 0x88, 0xd9, 0x23, 0xb1, 0xe2, 0x49, 0x80, 0xe3, - 0x50, 0x0c, 0xba, 0x09, 0x35, 0x5e, 0x0c, 0x25, 0xf2, 0xeb, 0xa5, 0xa3, 0x61, 0xa3, 0xb6, 0x15, - 0x0d, 0xe3, 0x38, 0x0d, 0xba, 0x0d, 0x35, 0x43, 0x39, 0x4c, 0x65, 0xd7, 0xf0, 0x5c, 0x62, 0x2b, - 0x9a, 0xc2, 0x71, 0x3a, 0xf4, 0x1d, 0x98, 0xef, 0xd9, 0x5e, 0xec, 0x14, 0x5d, 0x54, 0x87, 0x45, - 0x97, 0x98, 0x75, 0x20, 0xdf, 0x42, 0x6c, 0xe3, 0xb9, 0xde, 0xde, 0x89, 0x8d, 0xe1, 0x94, 0x38, - 0xf9, 0xcf, 0xcb, 0xf0, 0xf2, 0x58, 0x1f, 0x45, 0x77, 0xc7, 0x54, 0x2d, 0x4b, 0x05, 0x2a, 0x16, - 0x15, 0xe6, 0xd8, 0xfe, 0x93, 0x9b, 0x9b, 0xef, 0x6e, 0x4b, 0xc5, 0x77, 0xb7, 0x3c, 0x85, 0x6d, - 0xc6, 0x51, 0x70, 0x12, 0x94, 0x55, 0x3a, 0xe2, 0x74, 0x2b, 0xaf, 0xd2, 0x59, 0x4f, 0x4e, 0xe3, - 0x34, 0x3d, 0x83, 0x10, 0x87, 0x4f, 0xa9, 0x3a, 0x27, 0x84, 0xd8, 0x48, 0x4e, 0xe3, 0x34, 0x3d, - 0x32, 0xa0, 0x21, 0x50, 0x93, 0xe6, 0x8f, 0xdd, 0x8c, 0xf8, 0xf5, 0xce, 0x2b, 0x47, 0xc3, 0x46, - 0x63, 0x7d, 0x3c, 0x29, 0x7e, 0x1e, 0x96, 0xbc, 0x05, 0x73, 0xf7, 0x2d, 0x97, 0xb6, 0x59, 0x4a, - 0x66, 0x79, 0x0b, 0xbd, 0x0c, 0x65, 0x43, 0x33, 0xc5, 0x86, 0xaa, 0x26, 0xd4, 0x2e, 0x33, 0xe7, - 0x65, 0xe3, 0x7c, 0x5a, 0x39, 0x14, 0x7e, 0x1d, 0x4d, 0x2b, 0x87, 0x98, 0x8d, 0xcb, 0xf7, 0x60, - 0x46, 0xe4, 0xc5, 0x38, 0x50, 0x79, 0x3c, 0x50, 0x39, 0x03, 0xe8, 0xf7, 0x4b, 0x30, 0x23, 0xd2, - 0xc8, 0x19, 0x26, 0x84, 0xf7, 0x12, 0x09, 0xe1, 0xad, 0xc9, 0x52, 0x6d, 0x6e, 0x02, 0x50, 0x53, - 0x09, 0xe0, 0x9d, 0x09, 0xf1, 0xc7, 0x07, 0xfc, 0x1f, 0x48, 0x30, 0x9f, 0x4c, 0xfa, 0x2c, 0xa2, - 0xb0, 0x77, 0x48, 0xeb, 0x91, 0x47, 0xd1, 0xb9, 0x45, 0x18, 0x51, 0x3a, 0xd1, 0x14, 0x8e, 0xd3, - 0x21, 0x12, 0xb2, 0x31, 0x77, 0x10, 0x46, 0x69, 0xe6, 0x28, 0xed, 0x51, 0x4d, 0x6f, 0xfa, 0xd7, - 0x82, 0xcd, 0x07, 0x26, 0x7d, 0xec, 0x74, 0xa8, 0xa3, 0x99, 0xfd, 0x11, 0x31, 0xdc, 0xb3, 0xe2, - 0xb8, 0xf2, 0x5f, 0x4b, 0x50, 0x13, 0x0a, 0x9f, 0x47, 0x46, 0xfa, 0x7a, 0x32, 0x23, 0x7d, 0x7e, - 0xc2, 0x7a, 0x2a, 0x3b, 0x03, 0xfd, 0x28, 0x5a, 0x0b, 0xab, 0xa0, 0x58, 0x81, 0xb7, 0x67, 0xb9, - 0x34, 0x5d, 0xe0, 0xb1, 0x57, 0x0c, 0xf3, 0x19, 0xf4, 0x6b, 0x12, 0x2c, 0x68, 0xa9, 0x9a, 0x4b, - 0x98, 0xfa, 0x4b, 0x93, 0xa9, 0x16, 0xc2, 0x44, 0x97, 0xa5, 0xe9, 0x19, 0x3c, 0x22, 0x52, 0xf6, - 0x60, 0x84, 0x0a, 0x29, 0x30, 0xb5, 0x47, 0xa9, 0x3d, 0x61, 0xae, 0xcc, 0xaa, 0x26, 0x5b, 0x55, - 0xbe, 0xfc, 0xed, 0xed, 0x36, 0xe6, 0xd0, 0xf2, 0x0f, 0x4a, 0xa1, 0xc1, 0x3a, 0xfe, 0x3b, 0x12, - 0xd6, 0xbb, 0xd2, 0x69, 0xd4, 0xbb, 0xb5, 0xac, 0x5a, 0x17, 0x3d, 0x85, 0x32, 0xd5, 0x27, 0x3d, - 0x36, 0x14, 0x12, 0xb6, 0x37, 0x3b, 0x51, 0x9c, 0xda, 0xde, 0xec, 0x60, 0x06, 0x89, 0xbe, 0x09, - 0x15, 0xb6, 0x9b, 0x60, 0xaf, 0x78, 0x79, 0xf2, 0x10, 0xc2, 0xec, 0x15, 0x79, 0x18, 0xfb, 0xe7, - 0x62, 0x1f, 0x57, 0xfe, 0x36, 0xcc, 0x25, 0xe2, 0x00, 0xfa, 0x00, 0x2e, 0xea, 0x96, 0xa2, 0xb6, - 0x14, 0x5d, 0x31, 0x7b, 0x24, 0xb8, 0x97, 0xfa, 0xb9, 0xf1, 0x11, 0x71, 0x33, 0xc6, 0x21, 0xe2, - 0x49, 0x78, 0x61, 0x1d, 0x9f, 0xc3, 0x09, 0x6c, 0x59, 0x01, 0x88, 0x56, 0x8f, 0x1a, 0x50, 0x61, - 0x2e, 0xec, 0xef, 0x0c, 0x66, 0x5b, 0xb3, 0x4c, 0x57, 0xe6, 0xd9, 0x2e, 0xf6, 0xc7, 0xd1, 0x2d, - 0x00, 0x97, 0xf4, 0x1c, 0x42, 0x79, 0xd8, 0xf1, 0x8f, 0xe9, 0xc3, 0x00, 0xdc, 0x09, 0x67, 0x70, - 0x8c, 0x4a, 0xfe, 0xad, 0x12, 0x94, 0x1f, 0x5a, 0xdd, 0x33, 0x0c, 0xf2, 0x4f, 0x13, 0x41, 0xbe, - 0xe8, 0xfb, 0xff, 0xd0, 0xea, 0xe6, 0x06, 0xf8, 0x5f, 0x4e, 0x05, 0xf8, 0x37, 0x27, 0xc0, 0x1e, - 0x1f, 0xdc, 0xff, 0xa1, 0x0c, 0x17, 0x1f, 0x5a, 0xdd, 0xe8, 0x0a, 0xe5, 0x8d, 0xc4, 0x21, 0xc1, - 0xf5, 0xd4, 0x21, 0xc1, 0x42, 0x9c, 0xf6, 0x1c, 0xee, 0x4e, 0xf6, 0xfc, 0xc2, 0xac, 0xed, 0x58, - 0x5d, 0xbf, 0x30, 0x2b, 0x17, 0x2f, 0xcc, 0xae, 0x0a, 0x5d, 0x78, 0x71, 0x16, 0x22, 0xe1, 0x24, - 0x70, 0xce, 0x2d, 0xc7, 0xd4, 0x99, 0xdf, 0x72, 0xc4, 0xae, 0x87, 0x2a, 0xc7, 0xbd, 0x1e, 0x9a, - 0x1e, 0x7f, 0x3d, 0x24, 0xff, 0x99, 0x04, 0x33, 0x0f, 0xad, 0xee, 0x79, 0x24, 0xbf, 0xaf, 0x26, - 0x93, 0xdf, 0xad, 0xe2, 0x0e, 0x9a, 0x93, 0xf8, 0xfe, 0xa8, 0xcc, 0xd7, 0xc0, 0x63, 0xf8, 0x4d, - 0xa8, 0xd9, 0x8a, 0xa3, 0xe8, 0x3a, 0xd1, 0x35, 0xd7, 0x10, 0xa5, 0x23, 0xdf, 0xf3, 0xb4, 0xa3, - 0x61, 0x1c, 0xa7, 0x61, 0x2c, 0x3d, 0xcb, 0xb0, 0x75, 0x12, 0x5c, 0x94, 0x84, 0x2c, 0xeb, 0xd1, - 0x30, 0x8e, 0xd3, 0xa0, 0xc7, 0x70, 0x55, 0xe9, 0x51, 0xed, 0x80, 0xa4, 0x0f, 0x5b, 0xcb, 0xbc, - 0x84, 0x7c, 0xe1, 0x68, 0xd8, 0xb8, 0xba, 0x96, 0x45, 0x80, 0xb3, 0xf9, 0x12, 0xb7, 0x02, 0x53, - 0x67, 0x70, 0x2b, 0xf0, 0x06, 0x5c, 0x54, 0x3c, 0x6a, 0x05, 0x33, 0xdc, 0x7f, 0xaa, 0xad, 0x05, - 0x16, 0x72, 0xd7, 0x62, 0xe3, 0x38, 0x41, 0x95, 0xb8, 0x4b, 0x98, 0x3e, 0xed, 0x96, 0x80, 0x3f, - 0x2d, 0xc3, 0x6c, 0x18, 0x74, 0x90, 0x95, 0x38, 0xff, 0xf4, 0x8f, 0x7b, 0xde, 0x2e, 0xee, 0x21, - 0xc7, 0x3e, 0xf8, 0x44, 0x4f, 0x61, 0xd6, 0xa5, 0x8a, 0x43, 0x27, 0xdd, 0xc3, 0xcd, 0x1d, 0x0d, - 0x1b, 0xb3, 0x9d, 0x00, 0x01, 0x47, 0x60, 0xa8, 0x0f, 0xf3, 0x91, 0xaf, 0x4c, 0x1a, 0x89, 0xfc, - 0x4d, 0x6f, 0x02, 0x06, 0xa7, 0x60, 0x59, 0x38, 0xf0, 0xbd, 0x49, 0x6c, 0xec, 0xc2, 0x70, 0xe0, - 0xbb, 0x1e, 0x16, 0xb3, 0x68, 0x15, 0x66, 0x5d, 0xaf, 0xd7, 0x23, 0x44, 0x25, 0xaa, 0xd8, 0xb0, - 0x5d, 0x16, 0xa4, 0xb3, 0x9d, 0x60, 0x02, 0x47, 0x34, 0x0c, 0x78, 0x57, 0xd1, 0x74, 0xa2, 0x8a, - 0x4b, 0x92, 0x10, 0xf8, 0x2e, 0x1f, 0xc5, 0x62, 0x96, 0x37, 0xdd, 0x3c, 0x22, 0xf4, 0x23, 0xcb, - 0xd9, 0x6f, 0x5b, 0xba, 0xd6, 0x1b, 0x9c, 0x61, 0xe6, 0xec, 0x26, 0x32, 0xe7, 0x97, 0x0b, 0xba, - 0x46, 0x42, 0xcb, 0xbc, 0x1c, 0x2a, 0xff, 0xbb, 0x04, 0xf5, 0x04, 0x65, 0xbc, 0x9c, 0x26, 0x50, - 0xb1, 0x2d, 0x87, 0x06, 0xce, 0x79, 0x22, 0x0d, 0xd8, 0xde, 0x23, 0x76, 0x1a, 0xc9, 0x60, 0xb1, - 0x8f, 0xce, 0xd6, 0xb9, 0xeb, 0x58, 0x86, 0x08, 0x92, 0x27, 0x93, 0x42, 0x88, 0x13, 0xad, 0xf3, - 0xae, 0x63, 0x19, 0x98, 0x63, 0xcb, 0xff, 0x28, 0xc1, 0xe5, 0x04, 0xe5, 0x79, 0x84, 0x7f, 0x25, - 0x19, 0xfe, 0xdf, 0x39, 0xc9, 0xca, 0x72, 0x12, 0xc1, 0x7f, 0xa7, 0xd7, 0xc5, 0x2c, 0x80, 0xfa, - 0x50, 0xb3, 0x2d, 0xb5, 0x73, 0x1a, 0xbd, 0x53, 0x7e, 0x22, 0x89, 0xc0, 0x70, 0x1c, 0x19, 0x0d, - 0xe0, 0xb2, 0xa9, 0x18, 0xc4, 0xb5, 0x95, 0x1e, 0xe9, 0x9c, 0xc6, 0x1d, 0xef, 0xd5, 0xa3, 0x61, - 0xe3, 0xf2, 0xa3, 0x34, 0x24, 0x1e, 0x95, 0x22, 0xff, 0xf1, 0xc8, 0xca, 0x2d, 0x87, 0xa2, 0xaf, - 0x40, 0x95, 0xf7, 0xc6, 0xf6, 0x2c, 0x5d, 0x14, 0x69, 0xb7, 0xd9, 0xc3, 0x69, 0x8b, 0xb1, 0x67, - 0xc3, 0xc6, 0xcf, 0x8c, 0x2d, 0xb5, 0x02, 0x42, 0x1c, 0xc2, 0xa0, 0x4d, 0x98, 0xb2, 0x27, 0xdf, - 0x90, 0xf3, 0x1d, 0x18, 0xdf, 0x85, 0x73, 0x14, 0xf9, 0x3f, 0xd3, 0x6a, 0xf3, 0x1c, 0xbe, 0x7f, - 0x7a, 0x0f, 0x2c, 0x3c, 0x01, 0xc8, 0x7d, 0x68, 0x0e, 0xcc, 0x88, 0xfd, 0xa8, 0x70, 0xcc, 0x7b, - 0x27, 0x71, 0xcc, 0xf8, 0x1e, 0x2a, 0x2c, 0xba, 0x82, 0xc1, 0x40, 0x10, 0x7f, 0xff, 0xb8, 0x42, - 0x3d, 0xcf, 0xd1, 0xe8, 0xe0, 0xcc, 0x63, 0xe7, 0x6e, 0x22, 0x76, 0x6e, 0x14, 0x5c, 0xe0, 0x88, - 0xa6, 0xb9, 0xf1, 0xf3, 0x5f, 0x25, 0xb8, 0x3a, 0x42, 0x7d, 0x1e, 0xb1, 0x85, 0x24, 0x63, 0xcb, - 0x97, 0x4f, 0xba, 0xc2, 0x9c, 0xf8, 0xf2, 0x31, 0x64, 0xac, 0x8f, 0xbb, 0xec, 0x2d, 0x00, 0xdb, - 0xd1, 0x0e, 0x34, 0x9d, 0xf4, 0x45, 0xff, 0x62, 0x35, 0x7a, 0x26, 0xed, 0x70, 0x06, 0xc7, 0xa8, - 0xd0, 0xaf, 0xc0, 0x92, 0x4a, 0x76, 0x15, 0x4f, 0xa7, 0x6b, 0xaa, 0xba, 0xae, 0xd8, 0x4a, 0x57, - 0xd3, 0x35, 0xaa, 0x89, 0x4b, 0xc0, 0xd9, 0xd6, 0x1d, 0xbf, 0xaf, 0x30, 0x8b, 0xe2, 0xd9, 0xb0, - 0xf1, 0xd9, 0xf1, 0x9b, 0xa4, 0x80, 0x78, 0x80, 0x73, 0x84, 0xa0, 0x5f, 0x95, 0xa0, 0xee, 0x90, - 0x0f, 0x3d, 0xcd, 0x21, 0xea, 0x86, 0x63, 0xd9, 0x09, 0x0d, 0xca, 0x5c, 0x83, 0x7b, 0x47, 0xc3, - 0x46, 0x1d, 0xe7, 0xd0, 0x14, 0xd1, 0x21, 0x57, 0x10, 0xa2, 0x70, 0x45, 0xd1, 0x75, 0xeb, 0x23, - 0x92, 0xb4, 0xc0, 0x14, 0x97, 0xdf, 0x3a, 0x1a, 0x36, 0xae, 0xac, 0x8d, 0x4e, 0x17, 0x11, 0x9d, - 0x05, 0x8f, 0x56, 0x61, 0xe6, 0xc0, 0xd2, 0x3d, 0x83, 0xb8, 0xf5, 0x0a, 0x97, 0xc4, 0x22, 0xed, - 0xcc, 0x13, 0x7f, 0xe8, 0x19, 0x2b, 0x74, 0x3a, 0x7c, 0xc7, 0x1a, 0x50, 0xa1, 0xdb, 0x50, 0xdb, - 0xb3, 0x5c, 0x2a, 0xde, 0x75, 0x5e, 0x16, 0x55, 0xa3, 0xe0, 0x72, 0x3f, 0x9a, 0xc2, 0x71, 0x3a, - 0x64, 0xc0, 0xec, 0x9e, 0x38, 0xd1, 0x76, 0xeb, 0x33, 0x13, 0xe5, 0xbd, 0xc4, 0x89, 0x78, 0x54, - 0xb7, 0x05, 0xc3, 0x2e, 0x8e, 0x24, 0xb0, 0x7d, 0x1f, 0xff, 0xf3, 0x60, 0x83, 0x77, 0x9c, 0x54, - 0xa3, 0x10, 0x74, 0xdf, 0x1f, 0xc6, 0xc1, 0x7c, 0x40, 0xfa, 0xa0, 0xbd, 0xce, 0x1b, 0x44, 0x52, - 0xa4, 0x0f, 0xda, 0xeb, 0x38, 0x98, 0x47, 0x36, 0xcc, 0xb8, 0x64, 0x53, 0x33, 0xbd, 0xc3, 0x3a, - 0xf0, 0x57, 0xf7, 0x4e, 0xd1, 0x8b, 0xab, 0x3b, 0x9c, 0x3b, 0x75, 0x5b, 0x1e, 0x49, 0x14, 0xf3, - 0x38, 0x10, 0x83, 0x0e, 0x61, 0xd6, 0xf1, 0xcc, 0x35, 0x77, 0xc7, 0x25, 0x4e, 0xbd, 0xc6, 0x65, - 0x16, 0x8d, 0xca, 0x38, 0xe0, 0x4f, 0x4b, 0x0d, 0x2d, 0x18, 0x52, 0xe0, 0x48, 0x18, 0xfa, 0x6d, - 0x09, 0x90, 0xeb, 0xd9, 0xb6, 0x4e, 0x0c, 0x62, 0x52, 0x45, 0xe7, 0x17, 0xf6, 0x6e, 0xfd, 0x22, - 0xd7, 0xa1, 0x5d, 0xf8, 0xc2, 0x2e, 0x0d, 0x94, 0x56, 0x26, 0x3c, 0x00, 0x18, 0x25, 0xc5, 0x19, - 0x7a, 0xb0, 0x47, 0xb1, 0xeb, 0xf2, 0xdf, 0xf5, 0xb9, 0x89, 0x1e, 0x45, 0x76, 0xe3, 0x42, 0xf4, - 0x28, 0xc4, 0x3c, 0x0e, 0xc4, 0xa0, 0x27, 0xb0, 0xe4, 0x10, 0x45, 0x7d, 0x6c, 0xea, 0x03, 0x6c, - 0x59, 0xf4, 0xae, 0xa6, 0x13, 0x77, 0xe0, 0x52, 0x62, 0xd4, 0xe7, 0xb9, 0xdb, 0x84, 0x0d, 0xd0, - 0x38, 0x93, 0x0a, 0xe7, 0x70, 0xf3, 0x4e, 0x66, 0x71, 0xcf, 0x74, 0xb6, 0x1f, 0x38, 0x9c, 0xac, - 0x93, 0x39, 0x52, 0xf1, 0xcc, 0x3a, 0x99, 0x63, 0x22, 0xc6, 0x9f, 0xbf, 0xfd, 0x57, 0x09, 0xae, - 0x44, 0xc4, 0xc7, 0xee, 0x64, 0xce, 0x60, 0x39, 0x87, 0xd3, 0xb8, 0xec, 0x33, 0xb2, 0xf2, 0x79, - 0x9e, 0x91, 0x9d, 0x56, 0x0b, 0x35, 0x6f, 0x2e, 0x8e, 0xac, 0xf8, 0x7f, 0xa0, 0xb9, 0x38, 0x52, - 0x36, 0xa7, 0x90, 0xf9, 0x93, 0x52, 0x7c, 0x45, 0xff, 0x9f, 0x3a, 0x58, 0x33, 0x1a, 0x4a, 0xa7, - 0x8a, 0x35, 0x94, 0xca, 0xff, 0x52, 0x86, 0x85, 0xf4, 0x4b, 0x9b, 0x68, 0x64, 0x94, 0x9e, 0xdb, - 0xc8, 0xd8, 0x86, 0xc5, 0x5d, 0x4f, 0xd7, 0x07, 0xdc, 0x20, 0xb1, 0x0b, 0x7a, 0xff, 0xec, 0xf1, - 0x25, 0xc1, 0xb9, 0x78, 0x37, 0x83, 0x06, 0x67, 0x72, 0xe6, 0x34, 0x65, 0x96, 0x27, 0x6a, 0xca, - 0x7c, 0x1b, 0xe6, 0x1c, 0xfe, 0xed, 0x49, 0xb2, 0x6f, 0x20, 0x3c, 0x1c, 0xc7, 0xf1, 0x49, 0x9c, - 0xa4, 0xcd, 0x6e, 0xb0, 0xac, 0x4c, 0xd0, 0x60, 0x79, 0x1a, 0x1d, 0x91, 0x19, 0xb1, 0xef, 0xb9, - 0x1d, 0x91, 0x2f, 0xc1, 0xb2, 0x60, 0x63, 0xff, 0xd7, 0x2d, 0x93, 0x3a, 0x96, 0xae, 0x13, 0x67, - 0xc3, 0x33, 0x8c, 0x81, 0xfc, 0x2e, 0xcc, 0x27, 0xdb, 0x72, 0xfd, 0x27, 0xef, 0x77, 0x0a, 0x8b, - 0x06, 0x83, 0xd8, 0x93, 0xf7, 0xc7, 0x71, 0x48, 0x21, 0x7f, 0x22, 0xc1, 0xb5, 0x9c, 0xce, 0x46, - 0xf4, 0x01, 0xcc, 0x1b, 0xca, 0x61, 0xac, 0x65, 0x54, 0x84, 0x96, 0xa2, 0xbb, 0x6c, 0x7e, 0x76, - 0xb8, 0x95, 0x40, 0xc2, 0x29, 0x64, 0x9e, 0x70, 0x95, 0xc3, 0x8e, 0xe7, 0xf4, 0xc9, 0x84, 0x7b, - 0x79, 0xfe, 0xfa, 0x6e, 0x09, 0x0c, 0x1c, 0xa2, 0xc9, 0x3f, 0x94, 0xa0, 0x9e, 0x57, 0x7d, 0xa1, - 0xdb, 0x89, 0x0e, 0xc9, 0xcf, 0xa4, 0x3a, 0x24, 0x2f, 0x8f, 0xf0, 0x9d, 0x53, 0x7f, 0xe4, 0x8f, - 0x24, 0x58, 0xca, 0xae, 0x52, 0xd1, 0xcf, 0x27, 0x34, 0x6e, 0xa4, 0x34, 0xbe, 0x94, 0xe2, 0x12, - 0xfa, 0xee, 0xc1, 0xbc, 0xa8, 0x65, 0x05, 0xcc, 0x31, 0x3e, 0x51, 0x3d, 0x08, 0x0b, 0xe5, 0xa0, - 0x2a, 0xe3, 0xcf, 0x31, 0x39, 0x86, 0x53, 0xb8, 0xf2, 0xef, 0x96, 0xa0, 0xc2, 0xdb, 0x86, 0xce, - 0xb0, 0x84, 0xfa, 0x5a, 0xa2, 0x84, 0x2a, 0x7a, 0xb1, 0xc8, 0xb5, 0xcb, 0xad, 0x9e, 0xba, 0xa9, - 0xea, 0xe9, 0xad, 0x89, 0xd0, 0xc7, 0x17, 0x4e, 0x5f, 0x80, 0xd9, 0x50, 0x89, 0x62, 0x81, 0x9a, - 0x95, 0xa9, 0xb5, 0x98, 0x88, 0x82, 0x61, 0xfe, 0x20, 0x91, 0x29, 0x27, 0xf9, 0x96, 0x3a, 0x26, - 0xbb, 0x19, 0xa4, 0x4a, 0xff, 0x73, 0x9b, 0xa8, 0xf1, 0x6f, 0x34, 0x83, 0xbe, 0x0b, 0xf3, 0xfe, - 0x07, 0xe9, 0xe1, 0x19, 0x5a, 0x99, 0x7b, 0x6f, 0xf8, 0x19, 0xd7, 0x76, 0x62, 0x16, 0xa7, 0xa8, - 0x97, 0xdf, 0x86, 0xb9, 0x84, 0xb0, 0x42, 0x5f, 0xc7, 0xfc, 0xa5, 0x04, 0x8b, 0x59, 0xad, 0x8a, - 0xe8, 0x3a, 0x4c, 0xed, 0x6b, 0xa2, 0xb7, 0x22, 0xd6, 0x8f, 0xf2, 0x8b, 0x9a, 0xa9, 0x62, 0x3e, - 0x13, 0x7e, 0xdc, 0x54, 0xca, 0xfd, 0xb8, 0xe9, 0x16, 0x80, 0x62, 0x6b, 0xe2, 0x23, 0x7f, 0xb1, - 0xaa, 0xd0, 0x79, 0xa3, 0xcf, 0xff, 0x71, 0x8c, 0x8a, 0x77, 0x20, 0x45, 0xfa, 0x88, 0xb2, 0x30, - 0x6a, 0x0d, 0x8a, 0xa9, 0x1a, 0xa7, 0x93, 0xff, 0x4a, 0x82, 0xcf, 0x3c, 0x77, 0x07, 0x87, 0x5a, - 0x89, 0xf0, 0xd0, 0x4c, 0x85, 0x87, 0x95, 0x7c, 0x80, 0x73, 0xec, 0xfe, 0xfe, 0x5e, 0x09, 0xd0, - 0xf6, 0x9e, 0xe6, 0xa8, 0x6d, 0xc5, 0xa1, 0x03, 0x2c, 0x16, 0x78, 0x86, 0x01, 0xe3, 0x36, 0xd4, - 0x54, 0xe2, 0xf6, 0x1c, 0x8d, 0x1b, 0x49, 0x3c, 0xce, 0xd0, 0xe2, 0x1b, 0xd1, 0x14, 0x8e, 0xd3, - 0xa1, 0x3e, 0x54, 0x45, 0xad, 0x18, 0xb4, 0xb0, 0x14, 0x2d, 0x7c, 0x23, 0x0f, 0x88, 0xde, 0x0f, - 0x31, 0xe0, 0xe2, 0x10, 0x5c, 0xfe, 0xbe, 0x04, 0x4b, 0xa3, 0x06, 0xd9, 0xf0, 0x1b, 0x34, 0xce, - 0xca, 0x28, 0x2f, 0xc1, 0x14, 0x47, 0x65, 0xd6, 0xb8, 0xe8, 0x9f, 0x84, 0x33, 0x89, 0x98, 0x8f, - 0xca, 0x3f, 0x95, 0x60, 0x39, 0x5b, 0xa5, 0xf3, 0xd8, 0x6f, 0x7c, 0x90, 0xdc, 0x6f, 0x14, 0x3d, - 0x55, 0xc8, 0x56, 0x3c, 0x67, 0xef, 0xf1, 0x49, 0xa6, 0xf1, 0xcf, 0x63, 0x95, 0xbb, 0xc9, 0x55, - 0xae, 0x9d, 0x78, 0x95, 0xd9, 0x2b, 0x6c, 0x7d, 0xee, 0xe3, 0x4f, 0x57, 0x2e, 0xfc, 0xf8, 0xd3, - 0x95, 0x0b, 0xff, 0xfc, 0xe9, 0xca, 0x85, 0xef, 0x1e, 0xad, 0x48, 0x1f, 0x1f, 0xad, 0x48, 0x3f, - 0x3e, 0x5a, 0x91, 0xfe, 0xed, 0x68, 0x45, 0xfa, 0xfe, 0x4f, 0x56, 0x2e, 0x7c, 0x6d, 0x46, 0x60, - 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x92, 0xb7, 0x3c, 0x83, 0x46, 0x00, 0x00, + // 3866 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe4, 0x5b, 0x4d, 0x6c, 0x1c, 0xc9, + 0x75, 0x56, 0xcf, 0x90, 0x22, 0xf9, 0x46, 0xa4, 0xc8, 0x12, 0x45, 0xcd, 0x6a, 0x77, 0x39, 0x72, + 0x1b, 0xb1, 0x65, 0x60, 0x77, 0x18, 0x29, 0x2b, 0x67, 0xbd, 0xbb, 0x5e, 0x9b, 0x43, 0xea, 0x37, + 0xa4, 0x34, 0xae, 0x21, 0xe5, 0xcd, 0xda, 0x59, 0xa7, 0x66, 0xba, 0x38, 0xec, 0x65, 0xff, 0x6d, + 0x77, 0x35, 0xcd, 0xb1, 0x11, 0xd8, 0x40, 0x90, 0xab, 0xe3, 0x5b, 0x02, 0x24, 0x39, 0xe4, 0x10, + 0xe4, 0x14, 0xc3, 0x06, 0x02, 0x18, 0xc8, 0x21, 0xb9, 0xe4, 0x47, 0x09, 0x1c, 0xc0, 0x09, 0x10, + 0x24, 0x08, 0x1c, 0x3a, 0xcb, 0x38, 0xb9, 0x07, 0xb9, 0x29, 0x97, 0xa0, 0xaa, 0xab, 0x7f, 0xa7, + 0x7b, 0xa4, 0x1e, 0x72, 0x84, 0x00, 0xbe, 0xcd, 0x54, 0xbd, 0xf7, 0xbd, 0x57, 0x55, 0xaf, 0xde, + 0x7b, 0x55, 0xf5, 0x1a, 0x3e, 0x7f, 0xf0, 0xa6, 0xd7, 0xd4, 0xed, 0xb5, 0x03, 0xbf, 0x4b, 0x5d, + 0x8b, 0x32, 0xea, 0xad, 0x39, 0x07, 0xfd, 0x35, 0xe2, 0xe8, 0xde, 0x1a, 0x3d, 0x62, 0xd4, 0xf2, + 0x74, 0xdb, 0xf2, 0xd6, 0x0e, 0x6f, 0x74, 0x29, 0x23, 0x37, 0xd6, 0xfa, 0xd4, 0xa2, 0x2e, 0x61, + 0x54, 0x6b, 0x3a, 0xae, 0xcd, 0x6c, 0xf4, 0x7a, 0xc0, 0xde, 0x8c, 0xd9, 0x9b, 0xce, 0x41, 0xbf, + 0xc9, 0xd9, 0x9b, 0x31, 0x7b, 0x53, 0xb2, 0x5f, 0x7d, 0xbd, 0xaf, 0xb3, 0x7d, 0xbf, 0xdb, 0xec, + 0xd9, 0xe6, 0x5a, 0xdf, 0xee, 0xdb, 0x6b, 0x02, 0xa5, 0xeb, 0xef, 0x89, 0x7f, 0xe2, 0x8f, 0xf8, + 0x15, 0xa0, 0x5f, 0xbd, 0x59, 0xa8, 0xdc, 0x9a, 0x4b, 0x3d, 0xdb, 0x77, 0x7b, 0x34, 0xab, 0xd1, + 0xd5, 0xd7, 0x8a, 0x79, 0x0e, 0x87, 0xf4, 0x1f, 0x21, 0xc1, 0x5b, 0x33, 0x29, 0x23, 0x79, 0x3c, + 0xaf, 0xe7, 0xf3, 0xb8, 0xbe, 0xc5, 0x74, 0x73, 0x58, 0xa1, 0x37, 0x46, 0x93, 0x7b, 0xbd, 0x7d, + 0x6a, 0x92, 0x21, 0xae, 0x1b, 0xf9, 0x5c, 0x3e, 0xd3, 0x8d, 0x35, 0xdd, 0x62, 0x1e, 0x73, 0xb3, + 0x2c, 0x6a, 0x13, 0x60, 0xbd, 0x7d, 0xff, 0x31, 0x75, 0xf9, 0x9c, 0xa3, 0x6b, 0x30, 0x65, 0x11, + 0x93, 0xd6, 0x95, 0x6b, 0xca, 0xf5, 0xb9, 0xd6, 0x85, 0x27, 0xc7, 0x8d, 0x73, 0x27, 0xc7, 0x8d, + 0xa9, 0x87, 0xc4, 0xa4, 0x58, 0xf4, 0xa8, 0x5f, 0x85, 0xe5, 0x8d, 0xf6, 0xee, 0x0e, 0x71, 0xfb, + 0x94, 0xed, 0x32, 0xdd, 0xd0, 0xbf, 0x41, 0x18, 0xe7, 0xdc, 0x84, 0x45, 0x26, 0x1a, 0xdb, 0xd4, + 0xed, 0x51, 0x8b, 0x91, 0x7e, 0x80, 0x32, 0xdd, 0xaa, 0x4b, 0x94, 0xc5, 0x9d, 0x4c, 0x3f, 0x1e, + 0xe2, 0x50, 0x7f, 0x47, 0x81, 0x97, 0x36, 0x7c, 0x8f, 0xd9, 0xe6, 0x36, 0x65, 0xae, 0xde, 0xdb, + 0xf0, 0x5d, 0x97, 0x5a, 0xac, 0xc3, 0x08, 0xf3, 0xbd, 0x67, 0x6b, 0x87, 0xde, 0x83, 0xe9, 0x43, + 0x62, 0xf8, 0xb4, 0x5e, 0xb9, 0xa6, 0x5c, 0xaf, 0xdd, 0x7c, 0xad, 0x59, 0x68, 0x69, 0xcd, 0xd0, + 0x16, 0x9a, 0x5f, 0xf2, 0x89, 0xc5, 0x74, 0x36, 0x68, 0x2d, 0x4b, 0xc0, 0x0b, 0x52, 0xea, 0x63, + 0x8e, 0x84, 0x03, 0x40, 0xf5, 0x3b, 0x0a, 0xbc, 0x5a, 0xa8, 0xd9, 0x96, 0xee, 0x31, 0x64, 0xc2, + 0xb4, 0xce, 0xa8, 0xe9, 0xd5, 0x95, 0x6b, 0xd5, 0xeb, 0xb5, 0x9b, 0xf7, 0x9a, 0xa5, 0xac, 0xbc, + 0x59, 0x08, 0xde, 0x9a, 0x97, 0x7a, 0x4d, 0xdf, 0xe7, 0xf0, 0x38, 0x90, 0xa2, 0xfe, 0xb6, 0x02, + 0x28, 0xc9, 0x13, 0xcc, 0xee, 0x73, 0xcc, 0xd1, 0x97, 0x4f, 0x33, 0x47, 0x97, 0x24, 0x60, 0x2d, + 0x10, 0x97, 0x9a, 0xa2, 0x6f, 0x2b, 0xb0, 0x32, 0xac, 0x91, 0x98, 0x9b, 0xbd, 0xf4, 0xdc, 0xac, + 0x9f, 0x62, 0x6e, 0x02, 0xd4, 0x82, 0x49, 0xf9, 0x93, 0x0a, 0xcc, 0x6d, 0x12, 0x6a, 0xda, 0x56, + 0x87, 0x32, 0xf4, 0x1e, 0xcc, 0xf2, 0xed, 0xa8, 0x11, 0x46, 0xc4, 0x7c, 0xd4, 0x6e, 0x5e, 0x1f, + 0x31, 0xd8, 0xc3, 0x1b, 0xcd, 0x47, 0xdd, 0x0f, 0x69, 0x8f, 0x6d, 0x53, 0x46, 0x5a, 0x48, 0xe2, + 0x43, 0xdc, 0x86, 0x23, 0x34, 0xf4, 0x01, 0x4c, 0x79, 0x0e, 0xed, 0xc9, 0x29, 0x7c, 0xa7, 0xe4, + 0x70, 0x22, 0x0d, 0x3b, 0x0e, 0xed, 0xc5, 0x6b, 0xc4, 0xff, 0x61, 0x81, 0x8b, 0xf6, 0xe0, 0xbc, + 0x27, 0x16, 0xbf, 0x5e, 0x15, 0x12, 0xde, 0x1d, 0x5b, 0x42, 0x60, 0x42, 0x0b, 0x52, 0xc6, 0xf9, + 0xe0, 0x3f, 0x96, 0xe8, 0xea, 0xdf, 0x29, 0x30, 0x1f, 0xd1, 0x8a, 0x95, 0x7a, 0x7f, 0x68, 0xce, + 0x5e, 0x1b, 0x25, 0x9b, 0xd3, 0xf2, 0x99, 0xe3, 0xbc, 0x62, 0xde, 0x16, 0xa5, 0xa4, 0xd9, 0xb0, + 0x25, 0x31, 0x6b, 0xbf, 0x16, 0x5a, 0x41, 0x45, 0x58, 0xc1, 0x9b, 0xe3, 0x0e, 0xaa, 0x60, 0xf1, + 0xff, 0x36, 0x39, 0x18, 0x3e, 0x99, 0xe8, 0x2b, 0x30, 0xeb, 0x51, 0x83, 0xf6, 0x98, 0xed, 0xca, + 0xc1, 0xdc, 0x78, 0xae, 0xc1, 0x90, 0x2e, 0x35, 0x3a, 0x92, 0xb1, 0x75, 0x81, 0x8f, 0x26, 0xfc, + 0x87, 0x23, 0x40, 0x0e, 0xce, 0xa8, 0xe9, 0x18, 0x84, 0x85, 0x5b, 0xe9, 0xf5, 0xd1, 0xd6, 0xd5, + 0xb6, 0xb5, 0x1d, 0xc9, 0x20, 0x16, 0x3e, 0x9a, 0xaa, 0xb0, 0x15, 0x47, 0x80, 0xea, 0x5f, 0x56, + 0xe0, 0x62, 0x66, 0x11, 0xd1, 0x63, 0x58, 0xe9, 0x05, 0x8e, 0xe1, 0xa1, 0x6f, 0x76, 0xa9, 0xdb, + 0xe9, 0xed, 0x53, 0xcd, 0x37, 0xa8, 0x26, 0x1d, 0xed, 0xaa, 0xc4, 0x5b, 0xd9, 0xc8, 0xa5, 0xc2, + 0x05, 0xdc, 0xe8, 0x01, 0x20, 0x4b, 0x34, 0x6d, 0xeb, 0x9e, 0x17, 0x61, 0x56, 0x04, 0xe6, 0x55, + 0x89, 0x89, 0x1e, 0x0e, 0x51, 0xe0, 0x1c, 0x2e, 0xae, 0xa3, 0x46, 0x3d, 0xdd, 0xa5, 0x5a, 0x56, + 0xc7, 0x6a, 0x5a, 0xc7, 0xcd, 0x5c, 0x2a, 0x5c, 0xc0, 0x8d, 0x6e, 0x41, 0x2d, 0x90, 0x86, 0x29, + 0xd1, 0x06, 0xf5, 0x29, 0x01, 0x16, 0x39, 0xa3, 0x87, 0x71, 0x17, 0x4e, 0xd2, 0xa9, 0xdf, 0xaf, + 0x00, 0x6c, 0x52, 0xc7, 0xb0, 0x07, 0x26, 0xb5, 0x26, 0xe9, 0x10, 0xbe, 0x96, 0x72, 0x08, 0x9f, + 0x2f, 0x6b, 0xd9, 0x91, 0x8a, 0x85, 0x1e, 0xa1, 0x9f, 0xf1, 0x08, 0x5f, 0x18, 0x5f, 0xc4, 0x68, + 0x97, 0xf0, 0x6f, 0x55, 0xb8, 0x14, 0x13, 0x6f, 0xd8, 0x96, 0xa6, 0x8b, 0x00, 0xff, 0x36, 0x4c, + 0xb1, 0x81, 0x13, 0x06, 0x96, 0x4f, 0x87, 0x2a, 0xee, 0x0c, 0x1c, 0xfa, 0xf4, 0xb8, 0x71, 0x25, + 0x87, 0x85, 0x77, 0x61, 0xc1, 0x84, 0x1e, 0x47, 0xda, 0x57, 0x04, 0xfb, 0xbb, 0x69, 0xe1, 0x4f, + 0x8f, 0x1b, 0x23, 0x33, 0xb0, 0x66, 0x84, 0x99, 0x56, 0x16, 0x7d, 0x0a, 0xce, 0xbb, 0x94, 0x78, + 0xb6, 0x25, 0x2c, 0x62, 0x2e, 0x1e, 0x14, 0x16, 0xad, 0x58, 0xf6, 0xa2, 0xcf, 0xc0, 0x8c, 0x49, + 0x3d, 0x8f, 0x27, 0x25, 0xd3, 0x82, 0xf0, 0xa2, 0x24, 0x9c, 0xd9, 0x0e, 0x9a, 0x71, 0xd8, 0x8f, + 0xf6, 0x61, 0xc1, 0x20, 0x1e, 0xdb, 0x75, 0x34, 0xc2, 0xe8, 0x8e, 0x6e, 0xd2, 0xfa, 0xf9, 0x67, + 0x59, 0x4a, 0xec, 0x39, 0x38, 0x7d, 0x6b, 0x45, 0x62, 0x2f, 0x6c, 0xa5, 0x70, 0x70, 0x06, 0x17, + 0x31, 0x40, 0xbc, 0x65, 0xc7, 0x25, 0x96, 0x17, 0x4c, 0x18, 0x97, 0x36, 0x53, 0x52, 0x5a, 0xb4, + 0x43, 0xb7, 0x86, 0xb0, 0x70, 0x0e, 0xbe, 0xfa, 0x23, 0x05, 0x16, 0xe2, 0xc5, 0x9a, 0xb8, 0xcf, + 0xff, 0x20, 0xed, 0xf3, 0x3f, 0x37, 0xb6, 0xd9, 0x16, 0x38, 0xfd, 0xdf, 0xad, 0x02, 0x8a, 0x89, + 0xb0, 0x6d, 0x18, 0x5d, 0xd2, 0x3b, 0x78, 0x8e, 0x34, 0xe8, 0x8f, 0x14, 0x40, 0xbe, 0x58, 0x0c, + 0x6d, 0xdd, 0xb2, 0x6c, 0x26, 0xd2, 0xd8, 0x50, 0xcd, 0x5f, 0x1d, 0x5b, 0xcd, 0x50, 0x83, 0xe6, + 0xee, 0x10, 0xf6, 0x6d, 0x8b, 0xb9, 0x83, 0x78, 0xbd, 0x86, 0x09, 0x70, 0x8e, 0x42, 0xe8, 0x23, + 0x00, 0x57, 0x62, 0xee, 0xd8, 0x72, 0xf3, 0x97, 0xf5, 0x2f, 0xa1, 0x52, 0x1b, 0xb6, 0xb5, 0xa7, + 0xf7, 0x63, 0x57, 0x86, 0x23, 0x60, 0x9c, 0x10, 0x72, 0xf5, 0x36, 0x5c, 0x29, 0xd0, 0x1e, 0x2d, + 0x42, 0xf5, 0x80, 0x0e, 0x82, 0x69, 0xc5, 0xfc, 0x27, 0x5a, 0x4e, 0xa6, 0x93, 0x73, 0x32, 0x17, + 0x7c, 0xab, 0xf2, 0xa6, 0xa2, 0xfe, 0x6c, 0x3a, 0x69, 0x69, 0x22, 0x20, 0x5f, 0x87, 0x59, 0x97, + 0x3a, 0x86, 0xde, 0x23, 0x9e, 0x0c, 0x5a, 0x22, 0xba, 0x62, 0xd9, 0x86, 0xa3, 0xde, 0x54, 0xe8, + 0xae, 0x4c, 0x32, 0x74, 0x57, 0xcf, 0x38, 0x74, 0x23, 0x1b, 0x66, 0x3d, 0xc6, 0x8f, 0x58, 0xfd, + 0x20, 0x4e, 0x95, 0x4f, 0x77, 0x93, 0xbe, 0x3a, 0x00, 0x8a, 0x05, 0x86, 0x2d, 0x38, 0x12, 0x82, + 0xd6, 0xe1, 0xa2, 0xa9, 0x5b, 0x22, 0xe0, 0x75, 0x68, 0xcf, 0xb6, 0x34, 0x4f, 0x38, 0xb9, 0xe9, + 0xd6, 0x15, 0xc9, 0x74, 0x71, 0x3b, 0xdd, 0x8d, 0xb3, 0xf4, 0x68, 0x0b, 0x96, 0x5d, 0x7a, 0xa8, + 0x73, 0x35, 0xee, 0xe9, 0x1e, 0xb3, 0xdd, 0xc1, 0x96, 0x6e, 0xea, 0x4c, 0xb8, 0xbe, 0xe9, 0x56, + 0xfd, 0xe4, 0xb8, 0xb1, 0x8c, 0x73, 0xfa, 0x71, 0x2e, 0x17, 0xf7, 0xca, 0x0e, 0xf1, 0x3d, 0xaa, + 0x09, 0x67, 0x36, 0x1b, 0x7b, 0xe5, 0xb6, 0x68, 0xc5, 0xb2, 0x17, 0x99, 0x29, 0xd3, 0x9e, 0x3d, + 0x0b, 0xd3, 0x5e, 0x28, 0x36, 0x6b, 0xb4, 0x0b, 0x57, 0x1c, 0xd7, 0xee, 0xbb, 0xd4, 0xf3, 0x36, + 0x29, 0xd1, 0x0c, 0xdd, 0xa2, 0xe1, 0x7c, 0xcd, 0x89, 0x71, 0xbe, 0x7c, 0x72, 0xdc, 0xb8, 0xd2, + 0xce, 0x27, 0xc1, 0x45, 0xbc, 0xea, 0x4f, 0xab, 0xb0, 0x98, 0x8d, 0xae, 0x3c, 0xa7, 0xb2, 0xbb, + 0x1e, 0x75, 0x0f, 0xa9, 0x76, 0x37, 0x38, 0x71, 0xeb, 0xb6, 0x25, 0x4c, 0xbe, 0x1a, 0x7b, 0x80, + 0x47, 0x43, 0x14, 0x38, 0x87, 0x0b, 0xbd, 0x96, 0xd8, 0x34, 0x41, 0x56, 0x16, 0x59, 0x43, 0xce, + 0xc6, 0x59, 0x87, 0x8b, 0xd2, 0x8b, 0x84, 0x9d, 0x32, 0xf5, 0x8a, 0xac, 0x61, 0x37, 0xdd, 0x8d, + 0xb3, 0xf4, 0xe8, 0x2e, 0x2c, 0x91, 0x43, 0xa2, 0x1b, 0xa4, 0x6b, 0xd0, 0x08, 0x24, 0x48, 0xb9, + 0x5e, 0x92, 0x20, 0x4b, 0xeb, 0x59, 0x02, 0x3c, 0xcc, 0x83, 0xb6, 0xe1, 0x92, 0x6f, 0x0d, 0x43, + 0x05, 0xd6, 0xf9, 0xb2, 0x84, 0xba, 0xb4, 0x3b, 0x4c, 0x82, 0xf3, 0xf8, 0xd0, 0x21, 0x40, 0x2f, + 0x4c, 0x04, 0xbc, 0xfa, 0x79, 0xe1, 0xa9, 0x5b, 0x63, 0xef, 0xad, 0x28, 0xa7, 0x88, 0xfd, 0x61, + 0xd4, 0xe4, 0xe1, 0x84, 0x24, 0xf5, 0x1f, 0x94, 0x64, 0x8c, 0x09, 0x77, 0x20, 0x7a, 0x2b, 0x95, + 0x11, 0x7d, 0x2a, 0x93, 0x11, 0xad, 0x0c, 0x73, 0x24, 0x12, 0xa2, 0x6f, 0xc1, 0x3c, 0xb7, 0x4c, + 0xdd, 0xea, 0x07, 0xab, 0x21, 0x7d, 0xdc, 0x9d, 0x31, 0xac, 0x3f, 0xc2, 0x48, 0xc4, 0xca, 0xa5, + 0x93, 0xe3, 0xc6, 0x7c, 0xaa, 0x13, 0xa7, 0xe5, 0xa9, 0x3f, 0x50, 0x60, 0xe5, 0x4e, 0xe7, 0xae, + 0x6b, 0xfb, 0x4e, 0xa8, 0xde, 0x23, 0x27, 0x88, 0x38, 0xbf, 0x0c, 0x53, 0xae, 0x6f, 0x84, 0xe3, + 0xfa, 0x64, 0x38, 0x2e, 0xec, 0x1b, 0x7c, 0x5c, 0x97, 0x32, 0x5c, 0xc1, 0xa0, 0x38, 0x03, 0xfa, + 0x00, 0xce, 0xbb, 0xc4, 0xea, 0xd3, 0x30, 0x8a, 0x7e, 0xb6, 0xe4, 0x68, 0xee, 0x6f, 0x62, 0xce, + 0x9e, 0xc8, 0xe2, 0x04, 0x1a, 0x96, 0xa8, 0xea, 0x1f, 0x28, 0x70, 0xf1, 0xde, 0xce, 0x4e, 0xfb, + 0xbe, 0x25, 0x36, 0x62, 0x9b, 0xb0, 0x7d, 0x1e, 0xe8, 0x1d, 0xc2, 0xf6, 0xb3, 0x81, 0x9e, 0xf7, + 0x61, 0xd1, 0x83, 0xf6, 0x61, 0x86, 0x3b, 0x00, 0x6a, 0x69, 0x63, 0x66, 0xe7, 0x52, 0x5c, 0x2b, + 0x00, 0x89, 0x53, 0x47, 0xd9, 0x80, 0x43, 0x78, 0xf5, 0x9b, 0xb0, 0x9c, 0x50, 0x8f, 0xcf, 0x97, + 0xb8, 0x1f, 0x41, 0x3d, 0x98, 0xe6, 0x9a, 0x84, 0xb7, 0x1f, 0x65, 0x0f, 0xf3, 0x99, 0x21, 0xc7, + 0x89, 0x10, 0xff, 0xe7, 0xe1, 0x00, 0x5b, 0xfd, 0xe7, 0x0a, 0x5c, 0xb9, 0x67, 0xbb, 0xfa, 0x37, + 0x6c, 0x8b, 0x11, 0xa3, 0x6d, 0x6b, 0xeb, 0x3e, 0xb3, 0xbd, 0x1e, 0x31, 0xa8, 0x3b, 0xc1, 0x73, + 0x8f, 0x91, 0x3a, 0xf7, 0x3c, 0x28, 0x3b, 0xb2, 0x7c, 0x7d, 0x0b, 0x0f, 0x41, 0x2c, 0x73, 0x08, + 0xda, 0x3a, 0x23, 0x79, 0xa3, 0x4f, 0x44, 0xff, 0xa5, 0xc0, 0xcb, 0x05, 0x9c, 0x13, 0x4f, 0x9f, + 0x0f, 0xd2, 0xe9, 0xf3, 0x9d, 0xb3, 0x19, 0x70, 0x41, 0x2e, 0xfd, 0xbf, 0x95, 0xc2, 0x81, 0x8a, + 0xec, 0xed, 0x23, 0x98, 0x15, 0xff, 0x30, 0xdd, 0x93, 0x03, 0xdd, 0x28, 0xa9, 0x4f, 0xc7, 0xef, + 0x86, 0x77, 0x8a, 0x98, 0xee, 0x51, 0x97, 0x5a, 0x3d, 0x9a, 0xc8, 0x6d, 0x24, 0x38, 0x8e, 0xc4, + 0xa0, 0x1b, 0x50, 0x13, 0xb9, 0x4a, 0x2a, 0xfc, 0x5d, 0xe4, 0x67, 0xfe, 0xed, 0xb8, 0x19, 0x27, + 0x69, 0xd0, 0x2d, 0xa8, 0x99, 0xe4, 0x28, 0x13, 0xfc, 0xa2, 0xab, 0x82, 0xed, 0xb8, 0x0b, 0x27, + 0xe9, 0xd0, 0xb7, 0x60, 0xa1, 0xe7, 0xf8, 0x89, 0x2b, 0x6d, 0x99, 0xbc, 0x95, 0x1d, 0x62, 0xde, + 0xed, 0x78, 0x0b, 0xf1, 0xe3, 0xe0, 0x46, 0x7b, 0x37, 0xd1, 0x86, 0x33, 0xe2, 0xd4, 0xbf, 0xa8, + 0xc2, 0xab, 0x23, 0x0d, 0x14, 0xdd, 0x19, 0x91, 0x54, 0xac, 0x94, 0x48, 0x28, 0x08, 0xcc, 0xf3, + 0x83, 0xa1, 0x98, 0x6e, 0x71, 0xe6, 0xac, 0x94, 0x3c, 0x73, 0x8a, 0xf0, 0xb2, 0x95, 0x84, 0xc0, + 0x69, 0x44, 0x9e, 0x85, 0xc8, 0xdb, 0xa6, 0xa2, 0x2c, 0x64, 0x23, 0xdd, 0x8d, 0xb3, 0xf4, 0x1c, + 0x42, 0x5e, 0x06, 0x65, 0x72, 0x90, 0x08, 0x62, 0x33, 0xdd, 0x8d, 0xb3, 0xf4, 0xc8, 0x84, 0x86, + 0x44, 0x4d, 0xcf, 0x7d, 0xe2, 0x8d, 0x22, 0xc8, 0x45, 0x3e, 0x79, 0x72, 0xdc, 0x68, 0x6c, 0x8c, + 0x26, 0xc5, 0xcf, 0xc2, 0x52, 0xb7, 0x61, 0xfe, 0x9e, 0xed, 0xb1, 0xb6, 0xed, 0x32, 0x11, 0xb9, + 0xd0, 0xab, 0x50, 0x35, 0x75, 0x4b, 0x9e, 0x74, 0x6a, 0x52, 0xed, 0x2a, 0xb7, 0x5c, 0xde, 0x2e, + 0xba, 0xc9, 0x91, 0x34, 0xea, 0xb8, 0x9b, 0x1c, 0x61, 0xde, 0xae, 0xde, 0x85, 0x19, 0x19, 0x11, + 0x93, 0x40, 0xd5, 0xd1, 0x40, 0xd5, 0x1c, 0xa0, 0x3f, 0xae, 0xc0, 0x8c, 0x0c, 0x20, 0x13, 0x0c, + 0x05, 0x5f, 0x4d, 0x85, 0x82, 0xb7, 0xc6, 0x0b, 0xb2, 0x85, 0xae, 0x5f, 0xcb, 0xb8, 0xfe, 0x77, + 0xc6, 0xc4, 0x1f, 0xed, 0xea, 0xbf, 0xa7, 0xc0, 0x42, 0x3a, 0xdc, 0x73, 0x77, 0xc2, 0x37, 0x90, + 0xde, 0xa3, 0x0f, 0xe3, 0x0b, 0x85, 0xc8, 0x9d, 0x74, 0xe2, 0x2e, 0x9c, 0xa4, 0x43, 0x34, 0x62, + 0xe3, 0xe6, 0x20, 0x27, 0xa5, 0x59, 0xa0, 0xb4, 0xcf, 0x74, 0xa3, 0x19, 0x3c, 0xd0, 0x35, 0xef, + 0x5b, 0xec, 0x91, 0xdb, 0x61, 0xae, 0x6e, 0xf5, 0x87, 0xc4, 0x08, 0xcb, 0x4a, 0xe2, 0xaa, 0x7f, + 0xad, 0x40, 0x4d, 0x2a, 0x3c, 0xf1, 0x58, 0xf4, 0x95, 0x74, 0x2c, 0xfa, 0xec, 0x98, 0x69, 0x54, + 0x7e, 0xec, 0xf9, 0x61, 0x3c, 0x10, 0x9e, 0x38, 0xf1, 0xbc, 0x6e, 0xdf, 0xf6, 0x58, 0x36, 0xaf, + 0xe3, 0xfb, 0x0b, 0x8b, 0x1e, 0xf4, 0x5b, 0x0a, 0x2c, 0xea, 0x99, 0x54, 0x4b, 0xce, 0xf3, 0x17, + 0xc6, 0x53, 0x2d, 0x82, 0x89, 0xdf, 0x2c, 0xb3, 0x3d, 0x78, 0x48, 0xa4, 0xea, 0xc3, 0x10, 0x15, + 0x22, 0x30, 0xb5, 0xcf, 0x98, 0x33, 0x66, 0x94, 0xcc, 0x4b, 0x22, 0x5b, 0xb3, 0x62, 0xf8, 0x3b, + 0x3b, 0x6d, 0x2c, 0xa0, 0xd5, 0xef, 0x55, 0xa2, 0x09, 0xeb, 0x04, 0x1b, 0x24, 0x4a, 0x73, 0x95, + 0xb3, 0x48, 0x73, 0x6b, 0x79, 0x29, 0x2e, 0x7a, 0x0f, 0xaa, 0xcc, 0x18, 0xf7, 0x32, 0x4f, 0x4a, + 0xd8, 0xd9, 0xea, 0xc4, 0x4e, 0x6a, 0x67, 0xab, 0x83, 0x39, 0x24, 0xfa, 0x1a, 0x4c, 0xf3, 0x43, + 0x04, 0xdf, 0xdf, 0xd5, 0xf1, 0xfd, 0x07, 0x9f, 0xaf, 0xd8, 0xc2, 0xf8, 0x3f, 0x0f, 0x07, 0xb8, + 0xea, 0x37, 0x61, 0x3e, 0xe5, 0x04, 0xd0, 0x87, 0x70, 0xc1, 0xb0, 0x89, 0xd6, 0x22, 0x06, 0xb1, + 0x7a, 0x34, 0x7c, 0x21, 0xfa, 0xc5, 0xd1, 0xee, 0x70, 0x2b, 0xc1, 0x21, 0x9d, 0x49, 0xf4, 0x6e, + 0x9c, 0xec, 0xc3, 0x29, 0x6c, 0x95, 0x00, 0xc4, 0xa3, 0x47, 0x0d, 0x98, 0xe6, 0x26, 0x1c, 0x1c, + 0x08, 0xe6, 0x5a, 0x73, 0x5c, 0x57, 0x6e, 0xd9, 0x1e, 0x0e, 0xda, 0xd1, 0x4d, 0x00, 0x8f, 0xf6, + 0x5c, 0xca, 0x84, 0xcf, 0x09, 0xee, 0xcc, 0x23, 0xef, 0xdb, 0x89, 0x7a, 0x70, 0x82, 0x4a, 0xfd, + 0xbd, 0x0a, 0x54, 0x1f, 0xd8, 0xdd, 0x09, 0x7a, 0xf8, 0xf7, 0x52, 0x1e, 0xbe, 0xec, 0xfe, 0x7f, + 0x60, 0x77, 0x0b, 0xbd, 0xfb, 0xaf, 0x67, 0xbc, 0xfb, 0x9b, 0x63, 0x60, 0x8f, 0xf6, 0xec, 0x3f, + 0xaa, 0xc2, 0x85, 0x07, 0x76, 0x37, 0x7e, 0xcf, 0x78, 0x23, 0x75, 0x7a, 0xbf, 0x96, 0x39, 0xbd, + 0x2f, 0x26, 0x69, 0x5f, 0xc0, 0x43, 0x06, 0x0d, 0x52, 0xb2, 0xb6, 0x6b, 0x77, 0x83, 0x94, 0xac, + 0x5a, 0x32, 0x25, 0xbb, 0x2c, 0x15, 0x11, 0x69, 0x59, 0x04, 0x83, 0xd3, 0xa8, 0x05, 0x4f, 0x0e, + 0x53, 0x93, 0x7d, 0x72, 0x48, 0xbc, 0xd2, 0x4c, 0x3f, 0xef, 0x2b, 0xcd, 0xf9, 0xd1, 0xaf, 0x34, + 0xea, 0x9f, 0x2b, 0x30, 0xf3, 0xc0, 0xee, 0x4e, 0x3c, 0xe6, 0x7d, 0x39, 0x1d, 0xf3, 0x6e, 0x96, + 0xb7, 0xcb, 0x82, 0x78, 0xf7, 0xfd, 0xaa, 0x18, 0x80, 0x70, 0xdd, 0x37, 0xa0, 0xe6, 0x10, 0x97, + 0x18, 0x06, 0x35, 0x74, 0xcf, 0x94, 0xe9, 0xa2, 0x38, 0xe4, 0xb4, 0xe3, 0x66, 0x9c, 0xa4, 0xe1, + 0x2c, 0x3d, 0xdb, 0x74, 0x0c, 0x1a, 0xbe, 0x5a, 0x44, 0x2c, 0x1b, 0x71, 0x33, 0x4e, 0xd2, 0xa0, + 0x47, 0x70, 0x99, 0xf4, 0x98, 0x7e, 0x48, 0xb3, 0x97, 0x9f, 0x55, 0x91, 0x36, 0xbe, 0x74, 0x72, + 0xdc, 0xb8, 0xbc, 0x9e, 0x47, 0x80, 0xf3, 0xf9, 0x52, 0x57, 0xf4, 0x53, 0x67, 0x7d, 0x45, 0xff, + 0x06, 0x5c, 0x20, 0x3e, 0xb3, 0xc3, 0x1e, 0x61, 0x39, 0xb3, 0xad, 0x45, 0xee, 0x66, 0xd7, 0x13, + 0xed, 0x38, 0x45, 0x95, 0xba, 0xd8, 0x3f, 0x7f, 0xd6, 0x6f, 0xf2, 0x7f, 0x56, 0x85, 0xb9, 0xc8, + 0xd1, 0x20, 0x3b, 0x75, 0x19, 0x19, 0xdc, 0xec, 0xbc, 0x5d, 0xde, 0x3c, 0x9e, 0xfb, 0x16, 0x12, + 0xed, 0xc2, 0x9c, 0xc7, 0x88, 0xcb, 0xc6, 0x3a, 0xb1, 0xcd, 0x9f, 0x1c, 0x37, 0xe6, 0x3a, 0x21, + 0x3b, 0x8e, 0x91, 0x90, 0x06, 0x0b, 0xb1, 0x95, 0x8c, 0xe5, 0x7a, 0x82, 0xc3, 0x6d, 0x0a, 0x03, + 0x67, 0x30, 0xb9, 0x0b, 0x08, 0x8c, 0x48, 0x9e, 0xe1, 0x22, 0x17, 0x10, 0x58, 0x1c, 0x96, 0xbd, + 0x68, 0x0d, 0xe6, 0x3c, 0xbf, 0xd7, 0xa3, 0x54, 0xa3, 0x9a, 0x3c, 0x9b, 0x2d, 0x49, 0xd2, 0xb9, + 0x4e, 0xd8, 0x81, 0x63, 0x1a, 0x0e, 0xbc, 0x47, 0x74, 0x83, 0x6a, 0xf2, 0xad, 0x22, 0x02, 0xbe, + 0x23, 0x5a, 0xb1, 0xec, 0x55, 0xff, 0x5e, 0x81, 0xf9, 0x87, 0x94, 0x7d, 0xdd, 0x76, 0x0f, 0xda, + 0xb6, 0xa1, 0xf7, 0x06, 0x13, 0x8c, 0x93, 0xdd, 0x54, 0x9c, 0xfc, 0x62, 0x49, 0xa3, 0x48, 0x69, + 0x59, 0x14, 0x31, 0xd5, 0xff, 0x54, 0xa0, 0x9e, 0xa2, 0x4c, 0x26, 0xcf, 0x14, 0xa6, 0x1d, 0xdb, + 0x65, 0xa1, 0x59, 0x9e, 0x4a, 0x03, 0x7e, 0xcc, 0x48, 0x5c, 0x39, 0x72, 0x58, 0x1c, 0xa0, 0xf3, + 0x71, 0xee, 0xb9, 0xb6, 0x29, 0x7d, 0xe3, 0xe9, 0xa4, 0x50, 0xea, 0xc6, 0xe3, 0xbc, 0xe3, 0xda, + 0x26, 0x16, 0xd8, 0xea, 0x3f, 0x2a, 0xb0, 0x94, 0xa2, 0x9c, 0xb8, 0xcb, 0x27, 0x69, 0x97, 0xff, + 0xce, 0x69, 0x86, 0x55, 0xe0, 0xfc, 0xff, 0x3b, 0x3b, 0x28, 0x3e, 0x7c, 0xa4, 0x41, 0xcd, 0xb1, + 0xb5, 0xce, 0xa9, 0x0b, 0x96, 0x82, 0xc8, 0x11, 0x23, 0xe1, 0x24, 0x2c, 0x3a, 0x84, 0x25, 0x8b, + 0x98, 0xd4, 0x73, 0x48, 0x8f, 0x76, 0x4e, 0xfd, 0xc2, 0x7a, 0xf9, 0xe4, 0xb8, 0xb1, 0xf4, 0x30, + 0x8b, 0x87, 0x87, 0x45, 0xa8, 0x7f, 0x3a, 0x34, 0x66, 0xdb, 0x65, 0xe8, 0x4b, 0x30, 0x2b, 0xea, + 0x50, 0x7b, 0xb6, 0x21, 0x33, 0xb1, 0x5b, 0x7c, 0x59, 0xda, 0xb2, 0xed, 0xe9, 0x71, 0xe3, 0x17, + 0x46, 0xe6, 0x53, 0x21, 0x21, 0x8e, 0x60, 0xd0, 0x16, 0x4c, 0x39, 0xe3, 0x1f, 0xb9, 0xc5, 0x31, + 0x4b, 0x9c, 0xb3, 0x05, 0xca, 0xf0, 0x52, 0x89, 0x88, 0xbd, 0x7f, 0x46, 0x4b, 0x15, 0x1d, 0xf0, + 0x0b, 0x97, 0xcb, 0x85, 0x19, 0x79, 0xe2, 0x94, 0xf6, 0x78, 0xf7, 0x34, 0xf6, 0x98, 0x3c, 0x25, + 0x45, 0xc9, 0x55, 0xd8, 0x18, 0x0a, 0x52, 0xff, 0x49, 0x81, 0x25, 0xa1, 0x50, 0xcf, 0x77, 0x75, + 0x36, 0x98, 0xb8, 0xbf, 0xdc, 0x4b, 0xf9, 0xcb, 0xcd, 0x92, 0x03, 0x1c, 0xd2, 0xb4, 0xd0, 0x67, + 0xfe, 0xab, 0x02, 0x97, 0x87, 0xa8, 0x27, 0xee, 0x4f, 0x68, 0xda, 0x9f, 0x7c, 0xf1, 0xb4, 0xc3, + 0x2b, 0xf0, 0x29, 0x4f, 0x20, 0x67, 0x70, 0xc2, 0x58, 0x6f, 0x02, 0x38, 0xae, 0x7e, 0xa8, 0x1b, + 0xb4, 0x2f, 0x6b, 0x05, 0x67, 0xe3, 0x05, 0x69, 0x47, 0x3d, 0x38, 0x41, 0x85, 0x7e, 0x03, 0x56, + 0x34, 0xba, 0x47, 0x7c, 0x83, 0xad, 0x6b, 0xda, 0x06, 0x71, 0x48, 0x57, 0x37, 0x74, 0xa6, 0xcb, + 0xa7, 0xbd, 0xb9, 0xd6, 0xed, 0xa0, 0x86, 0x2f, 0x8f, 0xe2, 0xe9, 0x71, 0xe3, 0xd3, 0xa3, 0xcf, + 0x40, 0x21, 0xf1, 0x00, 0x17, 0x08, 0x41, 0xbf, 0xa9, 0x40, 0xdd, 0xa5, 0x1f, 0xf9, 0xba, 0x4b, + 0xb5, 0x4d, 0xd7, 0x76, 0x52, 0x1a, 0x54, 0x85, 0x06, 0x77, 0x4f, 0x8e, 0x1b, 0x75, 0x5c, 0x40, + 0x53, 0x46, 0x87, 0x42, 0x41, 0x88, 0xc1, 0x25, 0x62, 0x18, 0xf6, 0xd7, 0x69, 0x7a, 0x06, 0xa6, + 0x84, 0xfc, 0xd6, 0xc9, 0x71, 0xe3, 0xd2, 0xfa, 0x70, 0x77, 0x19, 0xd1, 0x79, 0xf0, 0x68, 0x0d, + 0x66, 0x0e, 0x6d, 0xc3, 0x37, 0xa9, 0x57, 0x9f, 0x16, 0x92, 0xb8, 0x8f, 0x9d, 0x79, 0x1c, 0x34, + 0x3d, 0xe5, 0x99, 0x4d, 0x47, 0x1c, 0x48, 0x43, 0x2a, 0x74, 0x0b, 0x6a, 0xfb, 0xb6, 0xc7, 0xe4, + 0x46, 0x17, 0x79, 0xd0, 0x6c, 0xec, 0x59, 0xee, 0xc5, 0x5d, 0x38, 0x49, 0x87, 0x4c, 0x98, 0xdb, + 0x97, 0xb7, 0xd5, 0x5e, 0x7d, 0x66, 0xac, 0x58, 0x97, 0xba, 0xed, 0x8e, 0x13, 0xb5, 0xb0, 0xd9, + 0xc3, 0xb1, 0x04, 0x7e, 0xb8, 0x13, 0x7f, 0xee, 0x6f, 0x8a, 0x4a, 0x8f, 0xd9, 0xd8, 0xff, 0xdc, + 0x0b, 0x9a, 0x71, 0xd8, 0x1f, 0x92, 0xde, 0x6f, 0x6f, 0x88, 0xc2, 0x8c, 0x0c, 0xe9, 0xfd, 0xf6, + 0x06, 0x0e, 0xfb, 0x91, 0x03, 0x33, 0x1e, 0xdd, 0xd2, 0x2d, 0xff, 0xa8, 0x0e, 0x62, 0xdf, 0xde, + 0x2e, 0xfb, 0x22, 0x75, 0x5b, 0x70, 0x67, 0xde, 0xc0, 0x63, 0x89, 0xb2, 0x1f, 0x87, 0x62, 0xd0, + 0x11, 0xcc, 0xb9, 0xbe, 0xb5, 0xee, 0xed, 0x7a, 0xd4, 0xad, 0xd7, 0x84, 0xcc, 0xb2, 0x2e, 0x19, + 0x87, 0xfc, 0x59, 0xa9, 0xd1, 0x0c, 0x46, 0x14, 0x38, 0x16, 0x86, 0x7e, 0x5f, 0x01, 0xe4, 0xf9, + 0x8e, 0x63, 0x50, 0x93, 0x5a, 0x8c, 0x18, 0xe2, 0x19, 0xde, 0xab, 0x5f, 0x10, 0x3a, 0xb4, 0x4b, + 0xbf, 0xc4, 0x65, 0x81, 0xb2, 0xca, 0x44, 0xa7, 0xfc, 0x61, 0x52, 0x9c, 0xa3, 0x07, 0x5f, 0x8a, + 0x3d, 0x4f, 0xfc, 0xae, 0xcf, 0x8f, 0xb5, 0x14, 0xf9, 0xe5, 0x08, 0xf1, 0x52, 0xc8, 0x7e, 0x1c, + 0x8a, 0x41, 0x8f, 0x61, 0xc5, 0xa5, 0x44, 0x7b, 0x64, 0x19, 0x03, 0x6c, 0xdb, 0xec, 0x8e, 0x6e, + 0x50, 0x6f, 0xe0, 0x31, 0x6a, 0xd6, 0x17, 0x84, 0xd9, 0x44, 0xc5, 0xc6, 0x38, 0x97, 0x0a, 0x17, + 0x70, 0x8b, 0xaa, 0x61, 0xf9, 0x86, 0x34, 0xd9, 0xcf, 0x08, 0x4e, 0x57, 0x35, 0x1c, 0xab, 0x38, + 0xb1, 0xaa, 0xe1, 0x84, 0x88, 0xd1, 0xd7, 0x6b, 0xff, 0x53, 0x81, 0x4b, 0x31, 0xf1, 0x73, 0x57, + 0x0d, 0xe7, 0xb0, 0xbc, 0x80, 0xcb, 0xb6, 0xfc, 0x5b, 0xb0, 0xea, 0x0b, 0xbb, 0x05, 0x3b, 0xab, + 0x5a, 0x65, 0x51, 0xcb, 0x1b, 0x4f, 0xe1, 0xff, 0xf7, 0x5a, 0xde, 0x58, 0xd3, 0xa2, 0x37, 0xa0, + 0x4a, 0x72, 0x38, 0x3f, 0x37, 0x05, 0xa3, 0x39, 0xf5, 0x9b, 0x53, 0xe5, 0xea, 0x37, 0xd5, 0x9f, + 0x54, 0x61, 0x31, 0xbb, 0x57, 0x53, 0x75, 0x83, 0xca, 0x33, 0xeb, 0x06, 0xdb, 0xb0, 0xbc, 0xe7, + 0x1b, 0xc6, 0x40, 0x4c, 0x48, 0xe2, 0xcd, 0x3d, 0xb8, 0x5a, 0x7c, 0x45, 0x72, 0x2e, 0xdf, 0xc9, + 0xa1, 0xc1, 0xb9, 0x9c, 0x05, 0x35, 0x90, 0xd5, 0xb1, 0x6a, 0x20, 0xdf, 0x86, 0x79, 0x57, 0x7c, + 0xde, 0x91, 0x2e, 0x05, 0x88, 0x6e, 0xbd, 0x71, 0xb2, 0x13, 0xa7, 0x69, 0xf3, 0xeb, 0x19, 0xa7, + 0xc7, 0xa8, 0x67, 0x3c, 0x8b, 0x02, 0xc4, 0x1c, 0x97, 0xf7, 0xcc, 0x02, 0xc4, 0x57, 0xe0, 0xaa, + 0x64, 0xe3, 0xff, 0x37, 0x6c, 0x8b, 0xb9, 0xb6, 0x61, 0x50, 0x77, 0xd3, 0x37, 0xcd, 0x81, 0xfa, + 0x2e, 0x2c, 0xa4, 0xab, 0x60, 0x83, 0x95, 0x0f, 0x0a, 0x73, 0x65, 0xcd, 0x40, 0x62, 0xe5, 0x83, + 0x76, 0x1c, 0x51, 0xa8, 0x3f, 0x55, 0xe0, 0x4a, 0x41, 0x21, 0x21, 0xfa, 0x10, 0x16, 0x4c, 0x72, + 0x94, 0xa8, 0xd0, 0x94, 0x4e, 0xa5, 0xec, 0xb1, 0x5a, 0xdc, 0x11, 0x6e, 0xa7, 0x90, 0x70, 0x06, + 0x59, 0xc4, 0x59, 0x72, 0xd4, 0xf1, 0xdd, 0x3e, 0x1d, 0xf3, 0xf0, 0x2e, 0xb6, 0xef, 0xb6, 0xc4, + 0xc0, 0x11, 0x9a, 0xfa, 0x03, 0x05, 0xea, 0x45, 0x49, 0x17, 0xba, 0x95, 0x2a, 0x77, 0xfc, 0x44, + 0xa6, 0xdc, 0x71, 0x69, 0x88, 0xef, 0x05, 0x15, 0x3b, 0xfe, 0x50, 0x81, 0x95, 0xfc, 0xe4, 0x14, + 0xfd, 0x52, 0x4a, 0xe3, 0x46, 0x46, 0xe3, 0x8b, 0x19, 0x2e, 0xa9, 0xef, 0x3e, 0x2c, 0xc8, 0x14, + 0x56, 0xc2, 0x3c, 0xc7, 0xf7, 0x9f, 0x87, 0x51, 0x7e, 0x1c, 0x26, 0x63, 0x62, 0x1d, 0xd3, 0x6d, + 0x38, 0x83, 0xab, 0xfe, 0x61, 0x05, 0xa6, 0x45, 0x25, 0xd0, 0x04, 0x33, 0xa7, 0xf7, 0x53, 0x99, + 0x53, 0xd9, 0xe7, 0x42, 0xa1, 0x5d, 0x61, 0xd2, 0xd4, 0xcd, 0x24, 0x4d, 0x6f, 0x8d, 0x85, 0x3e, + 0x3a, 0x5f, 0xfa, 0x1c, 0xcc, 0x45, 0x4a, 0x94, 0x73, 0xd4, 0x3c, 0x3b, 0xad, 0x25, 0x44, 0x94, + 0x74, 0xf3, 0x87, 0xa9, 0x30, 0x39, 0xce, 0x87, 0xca, 0x09, 0xd9, 0xcd, 0x30, 0x54, 0x06, 0x9f, + 0xb6, 0xc4, 0x85, 0x7c, 0xc3, 0x11, 0xf4, 0x5d, 0x58, 0x08, 0xbe, 0xf6, 0x8e, 0x2e, 0xcd, 0xaa, + 0xc2, 0x7a, 0xa3, 0x8f, 0xa5, 0x76, 0x52, 0xbd, 0x38, 0x43, 0x7d, 0xf5, 0x6d, 0x98, 0x4f, 0x09, + 0x2b, 0xf5, 0x25, 0xca, 0x5f, 0x29, 0xb0, 0x9c, 0x57, 0x7a, 0x88, 0xae, 0xc1, 0xd4, 0x81, 0x2e, + 0x2b, 0x26, 0x12, 0x55, 0x26, 0xbf, 0xa2, 0x5b, 0x1a, 0x16, 0x3d, 0xd1, 0x87, 0x44, 0x95, 0xc2, + 0x0f, 0x89, 0x6e, 0x02, 0x10, 0x47, 0x97, 0x5f, 0xd0, 0xcb, 0x51, 0x45, 0xc6, 0x1b, 0x7f, 0x5b, + 0x8f, 0x13, 0x54, 0xa2, 0xa8, 0x28, 0xd6, 0x47, 0x26, 0x84, 0x71, 0xb5, 0x4f, 0x42, 0xd5, 0x24, + 0x9d, 0xfa, 0x37, 0x0a, 0x7c, 0xe2, 0x99, 0x07, 0x37, 0xd4, 0x4a, 0xb9, 0x87, 0x66, 0xc6, 0x3d, + 0xac, 0x16, 0x03, 0xbc, 0xc0, 0x52, 0xee, 0xef, 0x54, 0x00, 0xed, 0xec, 0xeb, 0xae, 0xd6, 0x26, + 0x2e, 0x1b, 0x60, 0x39, 0xc0, 0x09, 0x3a, 0x8c, 0x5b, 0x50, 0xd3, 0xa8, 0xd7, 0x73, 0x75, 0x31, + 0x49, 0x72, 0x39, 0xa3, 0x19, 0xdf, 0x8c, 0xbb, 0x70, 0x92, 0x0e, 0xf5, 0x61, 0xf6, 0x30, 0x58, + 0xb3, 0xb0, 0x30, 0xa5, 0x6c, 0xd6, 0x1b, 0x5b, 0x40, 0xbc, 0x3f, 0x64, 0x83, 0x87, 0x23, 0x70, + 0xf5, 0xbb, 0x0a, 0xac, 0x0c, 0x4f, 0xc8, 0x66, 0x50, 0x76, 0x31, 0xa9, 0x49, 0x79, 0x05, 0xa6, + 0x04, 0x2a, 0x9f, 0x8d, 0x0b, 0xc1, 0xd5, 0x37, 0x97, 0x88, 0x45, 0xab, 0xfa, 0x33, 0x05, 0xae, + 0xe6, 0xab, 0x34, 0xf1, 0x93, 0xc6, 0x87, 0xe9, 0x93, 0x46, 0xd9, 0x9b, 0x84, 0x7c, 0xad, 0x0b, + 0x4e, 0x1d, 0x3f, 0xc9, 0x9d, 0xf9, 0x89, 0x0f, 0x71, 0x2f, 0x3d, 0xc4, 0xf5, 0x53, 0x0f, 0x31, + 0x7f, 0x78, 0xad, 0xcf, 0x3c, 0xf9, 0x78, 0xf5, 0xdc, 0x8f, 0x3f, 0x5e, 0x3d, 0xf7, 0x2f, 0x1f, + 0xaf, 0x9e, 0xfb, 0xf6, 0xc9, 0xaa, 0xf2, 0xe4, 0x64, 0x55, 0xf9, 0xf1, 0xc9, 0xaa, 0xf2, 0xef, + 0x27, 0xab, 0xca, 0x77, 0xff, 0x63, 0xf5, 0xdc, 0xfb, 0x33, 0x12, 0xf3, 0xff, 0x02, 0x00, 0x00, + 0xff, 0xff, 0xfb, 0xcc, 0x56, 0x9a, 0xd7, 0x45, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto index 933264e1110..865877f66aa 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.extensions.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -95,7 +95,7 @@ message DaemonSetList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of daemon sets. repeated DaemonSet items = 2; @@ -108,7 +108,7 @@ message DaemonSetSpec { // If empty, defaulted to labels on Pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 1; // Template is the object that describes the pod that will be created. // The DaemonSet will create exactly one copy of this pod on every node @@ -164,10 +164,10 @@ message DeploymentCondition { optional string status = 2; // The last time this condition was updated. - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastUpdateTime = 6; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastUpdateTime = 6; // Last time the condition transitioned from one status to another. - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 7; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 7; // The reason for the condition's last transition. optional string reason = 4; @@ -180,7 +180,7 @@ message DeploymentCondition { message DeploymentList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Deployments. repeated Deployment items = 2; @@ -209,7 +209,7 @@ message DeploymentSpec { // Label selector for pods. Existing ReplicaSets whose pods are // selected by this will be the ones affected by this deployment. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; // Template describes the pods that will be created. optional k8s.io.kubernetes.pkg.api.v1.PodTemplateSpec template = 3; @@ -289,15 +289,6 @@ message DeploymentStrategy { optional RollingUpdateDeployment rollingUpdate = 2; } -// ExportOptions is the query options to the standard REST get call. -message ExportOptions { - // Should this value be exported. Export strips fields that a user can not specify. - optional bool export = 1; - - // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace' - optional bool exact = 2; -} - // FSGroupStrategyOptions defines the strategy type and options used to create the strategy. message FSGroupStrategyOptions { // Rule is the strategy that will dictate what FSGroup is used in the SecurityContext. @@ -357,7 +348,7 @@ message HorizontalPodAutoscaler { message HorizontalPodAutoscalerList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // list of horizontal pod autoscaler objects. repeated HorizontalPodAutoscaler items = 2; @@ -391,7 +382,7 @@ message HorizontalPodAutoscalerStatus { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastScaleTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastScaleTime = 2; // current number of replicas of pods managed by this autoscaler. optional int32 currentReplicas = 3; @@ -459,7 +450,7 @@ message IngressList { // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Ingress. repeated Ingress items = 2; @@ -579,11 +570,11 @@ message JobCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -600,7 +591,7 @@ message JobList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of Job. repeated Job items = 2; @@ -634,7 +625,7 @@ message JobSpec { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 4; // AutoSelector controls generation of pod labels and pod selectors. // It was not present in the original extensions/v1beta1 Job definition, but exists @@ -661,13 +652,13 @@ message JobStatus { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time startTime = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time startTime = 2; // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time completionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time completionTime = 3; // Active is the number of actively running pods. // +optional @@ -721,7 +712,7 @@ message NetworkPolicyList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of schema objects. repeated NetworkPolicy items = 2; @@ -733,7 +724,7 @@ message NetworkPolicyPeer { // If not provided, this selector selects no pods. // If present but empty, this selector selects all pods in this namespace. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector podSelector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector podSelector = 1; // Selects Namespaces using cluster scoped-labels. This // matches all pods in all namespaces selected by this label selector. @@ -741,7 +732,7 @@ message NetworkPolicyPeer { // If omitted, this selector selects no namespaces. // If present but empty, this selector selects all namespaces. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector namespaceSelector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector namespaceSelector = 2; } message NetworkPolicyPort { @@ -765,7 +756,7 @@ message NetworkPolicySpec { // same set of pods. In this case, the ingress rules for each are combined additively. // This field is NOT optional and follows standard label selector semantics. // An empty podSelector matches all pods in this namespace. - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector podSelector = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector podSelector = 1; // List of ingress rules to be applied to the selected pods. // Traffic is allowed to a pod if namespace.networkPolicy.ingress.isolation is undefined and cluster policy allows it, @@ -797,7 +788,7 @@ message PodSecurityPolicyList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of schema objects. repeated PodSecurityPolicy items = 2; @@ -900,7 +891,7 @@ message ReplicaSetCondition { // The last time the condition transitioned from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 3; // The reason for the condition's last transition. // +optional @@ -916,7 +907,7 @@ message ReplicaSetList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of ReplicaSets. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -943,7 +934,7 @@ message ReplicaSetSpec { // Label keys and values that must match in order to be controlled by this replica set. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; // Template is the object that describes the pod that will be created if // insufficient replicas are detected. @@ -993,7 +984,7 @@ message RollbackConfig { message RollingUpdateDeployment { // The maximum number of pods that can be unavailable during the update. // Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). - // Absolute number is calculated from percentage by rounding up. + // Absolute number is calculated from percentage by rounding down. // This can not be 0 if MaxSurge is 0. // By default, a fixed value of 1 is used. // Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods @@ -1144,7 +1135,7 @@ message ThirdPartyResourceDataList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of ThirdpartyResourceData. repeated ThirdPartyResourceData items = 2; @@ -1154,7 +1145,7 @@ message ThirdPartyResourceDataList { message ThirdPartyResourceList { // Standard list metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of ThirdPartyResources. repeated ThirdPartyResource items = 2; diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/register.go index fadfe0fad5c..db7bc88a833 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/register.go @@ -18,6 +18,7 @@ package v1beta1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -29,6 +30,11 @@ const GroupName = "extensions" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs) AddToScheme = SchemeBuilder.AddToScheme @@ -56,7 +62,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &IngressList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, &ReplicaSet{}, &ReplicaSetList{}, &PodSecurityPolicy{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.generated.go index 752fb71ec70..412588d7ce9 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.generated.go @@ -26,8 +26,8 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg4_resource "k8s.io/client-go/pkg/api/resource" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" pkg5_intstr "k8s.io/client-go/pkg/util/intstr" "reflect" @@ -66,8 +66,8 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg4_resource.Quantity - var v1 pkg1_unversioned.TypeMeta - var v2 pkg2_v1.ObjectMeta + var v1 pkg2_v1.ObjectMeta + var v2 pkg1_v1.TypeMeta var v3 pkg3_types.UID var v4 pkg5_intstr.IntOrString var v5 time.Time @@ -2978,7 +2978,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromMap(l int, d *codec19 } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym240 := z.DecBinary() _ = yym240 @@ -3077,7 +3077,7 @@ func (x *HorizontalPodAutoscalerStatus) codecDecodeSelfFromArray(l int, d *codec } } else { if x.LastScaleTime == nil { - x.LastScaleTime = new(pkg1_unversioned.Time) + x.LastScaleTime = new(pkg1_v1.Time) } yym249 := z.DecBinary() _ = yym249 @@ -3722,7 +3722,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromMap(l int, d *codec1978 } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv306 := &x.ListMeta yym307 := z.DecBinary() @@ -3803,7 +3803,7 @@ func (x *HorizontalPodAutoscalerList) codecDecodeSelfFromArray(l int, d *codec19 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv313 := &x.ListMeta yym314 := z.DecBinary() @@ -4441,7 +4441,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv371 := &x.ListMeta yym372 := z.DecBinary() @@ -4522,7 +4522,7 @@ func (x *ThirdPartyResourceList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv378 := &x.ListMeta yym379 := z.DecBinary() @@ -5773,7 +5773,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym491 := z.DecBinary() _ = yym491 @@ -5909,7 +5909,7 @@ func (x *DeploymentSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym505 := z.DecBinary() _ = yym505 @@ -7860,7 +7860,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastUpdateTime": if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv660 := &x.LastUpdateTime yym661 := z.DecBinary() @@ -7877,7 +7877,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv662 := &x.LastTransitionTime yym663 := z.DecBinary() @@ -7962,7 +7962,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastUpdateTime = pkg1_unversioned.Time{} + x.LastUpdateTime = pkg1_v1.Time{} } else { yyv669 := &x.LastUpdateTime yym670 := z.DecBinary() @@ -7989,7 +7989,7 @@ func (x *DeploymentCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv671 := &x.LastTransitionTime yym672 := z.DecBinary() @@ -8266,7 +8266,7 @@ func (x *DeploymentList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv696 := &x.ListMeta yym697 := z.DecBinary() @@ -8347,7 +8347,7 @@ func (x *DeploymentList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv703 := &x.ListMeta yym704 := z.DecBinary() @@ -8541,7 +8541,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym719 := z.DecBinary() _ = yym719 @@ -8589,7 +8589,7 @@ func (x *DaemonSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym723 := z.DecBinary() _ = yym723 @@ -9474,7 +9474,7 @@ func (x *DaemonSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv803 := &x.ListMeta yym804 := z.DecBinary() @@ -9555,7 +9555,7 @@ func (x *DaemonSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv810 := &x.ListMeta yym811 := z.DecBinary() @@ -9818,7 +9818,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromMap(l int, d *codec1978. } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv835 := &x.ListMeta yym836 := z.DecBinary() @@ -9899,7 +9899,7 @@ func (x *ThirdPartyResourceDataList) codecDecodeSelfFromArray(l int, d *codec197 } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv842 := &x.ListMeta yym843 := z.DecBinary() @@ -10505,7 +10505,7 @@ func (x *JobList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv898 := &x.ListMeta yym899 := z.DecBinary() @@ -10586,7 +10586,7 @@ func (x *JobList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv905 := &x.ListMeta yym906 := z.DecBinary() @@ -10972,7 +10972,7 @@ func (x *JobSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym947 := z.DecBinary() _ = yym947 @@ -11114,7 +11114,7 @@ func (x *JobSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } yym959 := z.DecBinary() _ = yym959 @@ -11493,7 +11493,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym989 := z.DecBinary() _ = yym989 @@ -11514,7 +11514,7 @@ func (x *JobStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym991 := z.DecBinary() _ = yym991 @@ -11599,7 +11599,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.StartTime == nil { - x.StartTime = new(pkg1_unversioned.Time) + x.StartTime = new(pkg1_v1.Time) } yym999 := z.DecBinary() _ = yym999 @@ -11630,7 +11630,7 @@ func (x *JobStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.CompletionTime == nil { - x.CompletionTime = new(pkg1_unversioned.Time) + x.CompletionTime = new(pkg1_v1.Time) } yym1001 := z.DecBinary() _ = yym1001 @@ -11997,7 +11997,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv1034 := &x.LastProbeTime yym1035 := z.DecBinary() @@ -12014,7 +12014,7 @@ func (x *JobCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1036 := &x.LastTransitionTime yym1037 := z.DecBinary() @@ -12099,7 +12099,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg1_unversioned.Time{} + x.LastProbeTime = pkg1_v1.Time{} } else { yyv1043 := &x.LastProbeTime yym1044 := z.DecBinary() @@ -12126,7 +12126,7 @@ func (x *JobCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { yyv1045 := &x.LastTransitionTime yym1046 := z.DecBinary() @@ -12746,7 +12746,7 @@ func (x *IngressList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1101 := &x.ListMeta yym1102 := z.DecBinary() @@ -12827,7 +12827,7 @@ func (x *IngressList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv1108 := &x.ListMeta yym1109 := z.DecBinary() @@ -14626,7 +14626,7 @@ func (x *IngressBackend) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x *ExportOptions) CodecEncodeSelf(e *codec1978.Encoder) { +func (x *ReplicaSet) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -14640,16 +14640,19 @@ func (x *ExportOptions) CodecEncodeSelf(e *codec1978.Encoder) { } else { yysep1237 := !z.EncBinary() yy2arr1237 := z.EncBasicHandle().StructToArray - var yyq1237 [4]bool + var yyq1237 [5]bool _, _, _ = yysep1237, yyq1237, yy2arr1237 const yyr1237 bool = false yyq1237[0] = x.Kind != "" yyq1237[1] = x.APIVersion != "" + yyq1237[2] = true + yyq1237[3] = true + yyq1237[4] = true var yynn1237 int if yyr1237 || yy2arr1237 { - r.EncodeArrayStart(4) + r.EncodeArrayStart(5) } else { - yynn1237 = 2 + yynn1237 = 0 for _, b := range yyq1237 { if b { yynn1237++ @@ -14710,358 +14713,56 @@ func (x *ExportOptions) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr1237 || yy2arr1237 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1245 := z.EncBinary() - _ = yym1245 - if false { - } else { - r.EncodeBool(bool(x.Export)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("export")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1246 := z.EncBinary() - _ = yym1246 - if false { - } else { - r.EncodeBool(bool(x.Export)) - } - } - if yyr1237 || yy2arr1237 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1248 := z.EncBinary() - _ = yym1248 - if false { - } else { - r.EncodeBool(bool(x.Exact)) - } - } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("exact")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1249 := z.EncBinary() - _ = yym1249 - if false { - } else { - r.EncodeBool(bool(x.Exact)) - } - } - if yyr1237 || yy2arr1237 { - z.EncSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - z.EncSendContainerState(codecSelfer_containerMapEnd1234) - } - } - } -} - -func (x *ExportOptions) CodecDecodeSelf(d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - yym1250 := z.DecBinary() - _ = yym1250 - if false { - } else if z.HasExtensions() && z.DecExt(x) { - } else { - yyct1251 := r.ContainerType() - if yyct1251 == codecSelferValueTypeMap1234 { - yyl1251 := r.ReadMapStart() - if yyl1251 == 0 { - z.DecSendContainerState(codecSelfer_containerMapEnd1234) - } else { - x.codecDecodeSelfFromMap(yyl1251, d) - } - } else if yyct1251 == codecSelferValueTypeArray1234 { - yyl1251 := r.ReadArrayStart() - if yyl1251 == 0 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - } else { - x.codecDecodeSelfFromArray(yyl1251, d) - } - } else { - panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) - } - } -} - -func (x *ExportOptions) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yys1252Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1252Slc - var yyhl1252 bool = l >= 0 - for yyj1252 := 0; ; yyj1252++ { - if yyhl1252 { - if yyj1252 >= l { - break - } - } else { - if r.CheckBreak() { - break - } - } - z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1252Slc = r.DecodeBytes(yys1252Slc, true, true) - yys1252 := string(yys1252Slc) - z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1252 { - case "kind": - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - case "apiVersion": - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - case "export": - if r.TryDecodeAsNil() { - x.Export = false - } else { - x.Export = bool(r.DecodeBool()) - } - case "exact": - if r.TryDecodeAsNil() { - x.Exact = false - } else { - x.Exact = bool(r.DecodeBool()) - } - default: - z.DecStructFieldNotFound(-1, yys1252) - } // end switch yys1252 - } // end for yyj1252 - z.DecSendContainerState(codecSelfer_containerMapEnd1234) -} - -func (x *ExportOptions) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperDecoder(d) - _, _, _ = h, z, r - var yyj1257 int - var yyb1257 bool - var yyhl1257 bool = l >= 0 - yyj1257++ - if yyhl1257 { - yyb1257 = yyj1257 > l - } else { - yyb1257 = r.CheckBreak() - } - if yyb1257 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Kind = "" - } else { - x.Kind = string(r.DecodeString()) - } - yyj1257++ - if yyhl1257 { - yyb1257 = yyj1257 > l - } else { - yyb1257 = r.CheckBreak() - } - if yyb1257 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.APIVersion = "" - } else { - x.APIVersion = string(r.DecodeString()) - } - yyj1257++ - if yyhl1257 { - yyb1257 = yyj1257 > l - } else { - yyb1257 = r.CheckBreak() - } - if yyb1257 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Export = false - } else { - x.Export = bool(r.DecodeBool()) - } - yyj1257++ - if yyhl1257 { - yyb1257 = yyj1257 > l - } else { - yyb1257 = r.CheckBreak() - } - if yyb1257 { - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) - return - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - if r.TryDecodeAsNil() { - x.Exact = false - } else { - x.Exact = bool(r.DecodeBool()) - } - for { - yyj1257++ - if yyhl1257 { - yyb1257 = yyj1257 > l - } else { - yyb1257 = r.CheckBreak() - } - if yyb1257 { - break - } - z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1257-1, "") - } - z.DecSendContainerState(codecSelfer_containerArrayEnd1234) -} - -func (x *ReplicaSet) CodecEncodeSelf(e *codec1978.Encoder) { - var h codecSelfer1234 - z, r := codec1978.GenHelperEncoder(e) - _, _, _ = h, z, r - if x == nil { - r.EncodeNil() - } else { - yym1262 := z.EncBinary() - _ = yym1262 - if false { - } else if z.HasExtensions() && z.EncExt(x) { - } else { - yysep1263 := !z.EncBinary() - yy2arr1263 := z.EncBasicHandle().StructToArray - var yyq1263 [5]bool - _, _, _ = yysep1263, yyq1263, yy2arr1263 - const yyr1263 bool = false - yyq1263[0] = x.Kind != "" - yyq1263[1] = x.APIVersion != "" - yyq1263[2] = true - yyq1263[3] = true - yyq1263[4] = true - var yynn1263 int - if yyr1263 || yy2arr1263 { - r.EncodeArrayStart(5) - } else { - yynn1263 = 0 - for _, b := range yyq1263 { - if b { - yynn1263++ - } - } - r.EncodeMapStart(yynn1263) - yynn1263 = 0 - } - if yyr1263 || yy2arr1263 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1263[0] { - yym1265 := z.EncBinary() - _ = yym1265 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq1263[0] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("kind")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1266 := z.EncBinary() - _ = yym1266 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) - } - } - } - if yyr1263 || yy2arr1263 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1263[1] { - yym1268 := z.EncBinary() - _ = yym1268 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } else { - r.EncodeString(codecSelferC_UTF81234, "") - } - } else { - if yyq1263[1] { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1269 := z.EncBinary() - _ = yym1269 - if false { - } else { - r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) - } - } - } - if yyr1263 || yy2arr1263 { - z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1263[2] { - yy1271 := &x.ObjectMeta - yy1271.CodecEncodeSelf(e) + if yyq1237[2] { + yy1245 := &x.ObjectMeta + yy1245.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq1263[2] { + if yyq1237[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1272 := &x.ObjectMeta - yy1272.CodecEncodeSelf(e) + yy1246 := &x.ObjectMeta + yy1246.CodecEncodeSelf(e) } } - if yyr1263 || yy2arr1263 { + if yyr1237 || yy2arr1237 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1263[3] { - yy1274 := &x.Spec - yy1274.CodecEncodeSelf(e) + if yyq1237[3] { + yy1248 := &x.Spec + yy1248.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq1263[3] { + if yyq1237[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("spec")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1275 := &x.Spec - yy1275.CodecEncodeSelf(e) + yy1249 := &x.Spec + yy1249.CodecEncodeSelf(e) } } - if yyr1263 || yy2arr1263 { + if yyr1237 || yy2arr1237 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1263[4] { - yy1277 := &x.Status - yy1277.CodecEncodeSelf(e) + if yyq1237[4] { + yy1251 := &x.Status + yy1251.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq1263[4] { + if yyq1237[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("status")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1278 := &x.Status - yy1278.CodecEncodeSelf(e) + yy1252 := &x.Status + yy1252.CodecEncodeSelf(e) } } - if yyr1263 || yy2arr1263 { + if yyr1237 || yy2arr1237 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -15074,25 +14775,25 @@ func (x *ReplicaSet) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1279 := z.DecBinary() - _ = yym1279 + yym1253 := z.DecBinary() + _ = yym1253 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1280 := r.ContainerType() - if yyct1280 == codecSelferValueTypeMap1234 { - yyl1280 := r.ReadMapStart() - if yyl1280 == 0 { + yyct1254 := r.ContainerType() + if yyct1254 == codecSelferValueTypeMap1234 { + yyl1254 := r.ReadMapStart() + if yyl1254 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1280, d) + x.codecDecodeSelfFromMap(yyl1254, d) } - } else if yyct1280 == codecSelferValueTypeArray1234 { - yyl1280 := r.ReadArrayStart() - if yyl1280 == 0 { + } else if yyct1254 == codecSelferValueTypeArray1234 { + yyl1254 := r.ReadArrayStart() + if yyl1254 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1280, d) + x.codecDecodeSelfFromArray(yyl1254, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -15104,12 +14805,12 @@ func (x *ReplicaSet) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1281Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1281Slc - var yyhl1281 bool = l >= 0 - for yyj1281 := 0; ; yyj1281++ { - if yyhl1281 { - if yyj1281 >= l { + var yys1255Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1255Slc + var yyhl1255 bool = l >= 0 + for yyj1255 := 0; ; yyj1255++ { + if yyhl1255 { + if yyj1255 >= l { break } } else { @@ -15118,10 +14819,10 @@ func (x *ReplicaSet) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1281Slc = r.DecodeBytes(yys1281Slc, true, true) - yys1281 := string(yys1281Slc) + yys1255Slc = r.DecodeBytes(yys1255Slc, true, true) + yys1255 := string(yys1255Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1281 { + switch yys1255 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -15138,27 +14839,27 @@ func (x *ReplicaSet) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { - yyv1284 := &x.ObjectMeta - yyv1284.CodecDecodeSelf(d) + yyv1258 := &x.ObjectMeta + yyv1258.CodecDecodeSelf(d) } case "spec": if r.TryDecodeAsNil() { x.Spec = ReplicaSetSpec{} } else { - yyv1285 := &x.Spec - yyv1285.CodecDecodeSelf(d) + yyv1259 := &x.Spec + yyv1259.CodecDecodeSelf(d) } case "status": if r.TryDecodeAsNil() { x.Status = ReplicaSetStatus{} } else { - yyv1286 := &x.Status - yyv1286.CodecDecodeSelf(d) + yyv1260 := &x.Status + yyv1260.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys1281) - } // end switch yys1281 - } // end for yyj1281 + z.DecStructFieldNotFound(-1, yys1255) + } // end switch yys1255 + } // end for yyj1255 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -15166,16 +14867,16 @@ func (x *ReplicaSet) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1287 int - var yyb1287 bool - var yyhl1287 bool = l >= 0 - yyj1287++ - if yyhl1287 { - yyb1287 = yyj1287 > l + var yyj1261 int + var yyb1261 bool + var yyhl1261 bool = l >= 0 + yyj1261++ + if yyhl1261 { + yyb1261 = yyj1261 > l } else { - yyb1287 = r.CheckBreak() + yyb1261 = r.CheckBreak() } - if yyb1287 { + if yyb1261 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15185,13 +14886,13 @@ func (x *ReplicaSet) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj1287++ - if yyhl1287 { - yyb1287 = yyj1287 > l + yyj1261++ + if yyhl1261 { + yyb1261 = yyj1261 > l } else { - yyb1287 = r.CheckBreak() + yyb1261 = r.CheckBreak() } - if yyb1287 { + if yyb1261 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15201,13 +14902,13 @@ func (x *ReplicaSet) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj1287++ - if yyhl1287 { - yyb1287 = yyj1287 > l + yyj1261++ + if yyhl1261 { + yyb1261 = yyj1261 > l } else { - yyb1287 = r.CheckBreak() + yyb1261 = r.CheckBreak() } - if yyb1287 { + if yyb1261 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15215,16 +14916,16 @@ func (x *ReplicaSet) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { - yyv1290 := &x.ObjectMeta - yyv1290.CodecDecodeSelf(d) + yyv1264 := &x.ObjectMeta + yyv1264.CodecDecodeSelf(d) } - yyj1287++ - if yyhl1287 { - yyb1287 = yyj1287 > l + yyj1261++ + if yyhl1261 { + yyb1261 = yyj1261 > l } else { - yyb1287 = r.CheckBreak() + yyb1261 = r.CheckBreak() } - if yyb1287 { + if yyb1261 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15232,16 +14933,16 @@ func (x *ReplicaSet) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Spec = ReplicaSetSpec{} } else { - yyv1291 := &x.Spec - yyv1291.CodecDecodeSelf(d) + yyv1265 := &x.Spec + yyv1265.CodecDecodeSelf(d) } - yyj1287++ - if yyhl1287 { - yyb1287 = yyj1287 > l + yyj1261++ + if yyhl1261 { + yyb1261 = yyj1261 > l } else { - yyb1287 = r.CheckBreak() + yyb1261 = r.CheckBreak() } - if yyb1287 { + if yyb1261 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15249,21 +14950,21 @@ func (x *ReplicaSet) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Status = ReplicaSetStatus{} } else { - yyv1292 := &x.Status - yyv1292.CodecDecodeSelf(d) + yyv1266 := &x.Status + yyv1266.CodecDecodeSelf(d) } for { - yyj1287++ - if yyhl1287 { - yyb1287 = yyj1287 > l + yyj1261++ + if yyhl1261 { + yyb1261 = yyj1261 > l } else { - yyb1287 = r.CheckBreak() + yyb1261 = r.CheckBreak() } - if yyb1287 { + if yyb1261 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1287-1, "") + z.DecStructFieldNotFound(yyj1261-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -15275,37 +14976,37 @@ func (x *ReplicaSetList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1293 := z.EncBinary() - _ = yym1293 + yym1267 := z.EncBinary() + _ = yym1267 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1294 := !z.EncBinary() - yy2arr1294 := z.EncBasicHandle().StructToArray - var yyq1294 [4]bool - _, _, _ = yysep1294, yyq1294, yy2arr1294 - const yyr1294 bool = false - yyq1294[0] = x.Kind != "" - yyq1294[1] = x.APIVersion != "" - yyq1294[2] = true - var yynn1294 int - if yyr1294 || yy2arr1294 { + yysep1268 := !z.EncBinary() + yy2arr1268 := z.EncBasicHandle().StructToArray + var yyq1268 [4]bool + _, _, _ = yysep1268, yyq1268, yy2arr1268 + const yyr1268 bool = false + yyq1268[0] = x.Kind != "" + yyq1268[1] = x.APIVersion != "" + yyq1268[2] = true + var yynn1268 int + if yyr1268 || yy2arr1268 { r.EncodeArrayStart(4) } else { - yynn1294 = 1 - for _, b := range yyq1294 { + yynn1268 = 1 + for _, b := range yyq1268 { if b { - yynn1294++ + yynn1268++ } } - r.EncodeMapStart(yynn1294) - yynn1294 = 0 + r.EncodeMapStart(yynn1268) + yynn1268 = 0 } - if yyr1294 || yy2arr1294 { + if yyr1268 || yy2arr1268 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1294[0] { - yym1296 := z.EncBinary() - _ = yym1296 + if yyq1268[0] { + yym1270 := z.EncBinary() + _ = yym1270 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -15314,23 +15015,23 @@ func (x *ReplicaSetList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1294[0] { + if yyq1268[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1297 := z.EncBinary() - _ = yym1297 + yym1271 := z.EncBinary() + _ = yym1271 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr1294 || yy2arr1294 { + if yyr1268 || yy2arr1268 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1294[1] { - yym1299 := z.EncBinary() - _ = yym1299 + if yyq1268[1] { + yym1273 := z.EncBinary() + _ = yym1273 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -15339,54 +15040,54 @@ func (x *ReplicaSetList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1294[1] { + if yyq1268[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1300 := z.EncBinary() - _ = yym1300 + yym1274 := z.EncBinary() + _ = yym1274 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr1294 || yy2arr1294 { + if yyr1268 || yy2arr1268 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1294[2] { - yy1302 := &x.ListMeta - yym1303 := z.EncBinary() - _ = yym1303 + if yyq1268[2] { + yy1276 := &x.ListMeta + yym1277 := z.EncBinary() + _ = yym1277 if false { - } else if z.HasExtensions() && z.EncExt(yy1302) { + } else if z.HasExtensions() && z.EncExt(yy1276) { } else { - z.EncFallback(yy1302) + z.EncFallback(yy1276) } } else { r.EncodeNil() } } else { - if yyq1294[2] { + if yyq1268[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1304 := &x.ListMeta - yym1305 := z.EncBinary() - _ = yym1305 + yy1278 := &x.ListMeta + yym1279 := z.EncBinary() + _ = yym1279 if false { - } else if z.HasExtensions() && z.EncExt(yy1304) { + } else if z.HasExtensions() && z.EncExt(yy1278) { } else { - z.EncFallback(yy1304) + z.EncFallback(yy1278) } } } - if yyr1294 || yy2arr1294 { + if yyr1268 || yy2arr1268 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym1307 := z.EncBinary() - _ = yym1307 + yym1281 := z.EncBinary() + _ = yym1281 if false { } else { h.encSliceReplicaSet(([]ReplicaSet)(x.Items), e) @@ -15399,15 +15100,15 @@ func (x *ReplicaSetList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym1308 := z.EncBinary() - _ = yym1308 + yym1282 := z.EncBinary() + _ = yym1282 if false { } else { h.encSliceReplicaSet(([]ReplicaSet)(x.Items), e) } } } - if yyr1294 || yy2arr1294 { + if yyr1268 || yy2arr1268 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -15420,25 +15121,25 @@ func (x *ReplicaSetList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1309 := z.DecBinary() - _ = yym1309 + yym1283 := z.DecBinary() + _ = yym1283 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1310 := r.ContainerType() - if yyct1310 == codecSelferValueTypeMap1234 { - yyl1310 := r.ReadMapStart() - if yyl1310 == 0 { + yyct1284 := r.ContainerType() + if yyct1284 == codecSelferValueTypeMap1234 { + yyl1284 := r.ReadMapStart() + if yyl1284 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1310, d) + x.codecDecodeSelfFromMap(yyl1284, d) } - } else if yyct1310 == codecSelferValueTypeArray1234 { - yyl1310 := r.ReadArrayStart() - if yyl1310 == 0 { + } else if yyct1284 == codecSelferValueTypeArray1234 { + yyl1284 := r.ReadArrayStart() + if yyl1284 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1310, d) + x.codecDecodeSelfFromArray(yyl1284, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -15450,12 +15151,12 @@ func (x *ReplicaSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1311Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1311Slc - var yyhl1311 bool = l >= 0 - for yyj1311 := 0; ; yyj1311++ { - if yyhl1311 { - if yyj1311 >= l { + var yys1285Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1285Slc + var yyhl1285 bool = l >= 0 + for yyj1285 := 0; ; yyj1285++ { + if yyhl1285 { + if yyj1285 >= l { break } } else { @@ -15464,10 +15165,10 @@ func (x *ReplicaSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1311Slc = r.DecodeBytes(yys1311Slc, true, true) - yys1311 := string(yys1311Slc) + yys1285Slc = r.DecodeBytes(yys1285Slc, true, true) + yys1285 := string(yys1285Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1311 { + switch yys1285 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -15482,33 +15183,33 @@ func (x *ReplicaSetList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { - yyv1314 := &x.ListMeta - yym1315 := z.DecBinary() - _ = yym1315 + yyv1288 := &x.ListMeta + yym1289 := z.DecBinary() + _ = yym1289 if false { - } else if z.HasExtensions() && z.DecExt(yyv1314) { + } else if z.HasExtensions() && z.DecExt(yyv1288) { } else { - z.DecFallback(yyv1314, false) + z.DecFallback(yyv1288, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv1316 := &x.Items - yym1317 := z.DecBinary() - _ = yym1317 + yyv1290 := &x.Items + yym1291 := z.DecBinary() + _ = yym1291 if false { } else { - h.decSliceReplicaSet((*[]ReplicaSet)(yyv1316), d) + h.decSliceReplicaSet((*[]ReplicaSet)(yyv1290), d) } } default: - z.DecStructFieldNotFound(-1, yys1311) - } // end switch yys1311 - } // end for yyj1311 + z.DecStructFieldNotFound(-1, yys1285) + } // end switch yys1285 + } // end for yyj1285 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -15516,16 +15217,16 @@ func (x *ReplicaSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1318 int - var yyb1318 bool - var yyhl1318 bool = l >= 0 - yyj1318++ - if yyhl1318 { - yyb1318 = yyj1318 > l + var yyj1292 int + var yyb1292 bool + var yyhl1292 bool = l >= 0 + yyj1292++ + if yyhl1292 { + yyb1292 = yyj1292 > l } else { - yyb1318 = r.CheckBreak() + yyb1292 = r.CheckBreak() } - if yyb1318 { + if yyb1292 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15535,13 +15236,13 @@ func (x *ReplicaSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj1318++ - if yyhl1318 { - yyb1318 = yyj1318 > l + yyj1292++ + if yyhl1292 { + yyb1292 = yyj1292 > l } else { - yyb1318 = r.CheckBreak() + yyb1292 = r.CheckBreak() } - if yyb1318 { + if yyb1292 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15551,36 +15252,36 @@ func (x *ReplicaSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj1318++ - if yyhl1318 { - yyb1318 = yyj1318 > l + yyj1292++ + if yyhl1292 { + yyb1292 = yyj1292 > l } else { - yyb1318 = r.CheckBreak() + yyb1292 = r.CheckBreak() } - if yyb1318 { + if yyb1292 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { - yyv1321 := &x.ListMeta - yym1322 := z.DecBinary() - _ = yym1322 + yyv1295 := &x.ListMeta + yym1296 := z.DecBinary() + _ = yym1296 if false { - } else if z.HasExtensions() && z.DecExt(yyv1321) { + } else if z.HasExtensions() && z.DecExt(yyv1295) { } else { - z.DecFallback(yyv1321, false) + z.DecFallback(yyv1295, false) } } - yyj1318++ - if yyhl1318 { - yyb1318 = yyj1318 > l + yyj1292++ + if yyhl1292 { + yyb1292 = yyj1292 > l } else { - yyb1318 = r.CheckBreak() + yyb1292 = r.CheckBreak() } - if yyb1318 { + if yyb1292 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15588,26 +15289,26 @@ func (x *ReplicaSetList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Items = nil } else { - yyv1323 := &x.Items - yym1324 := z.DecBinary() - _ = yym1324 + yyv1297 := &x.Items + yym1298 := z.DecBinary() + _ = yym1298 if false { } else { - h.decSliceReplicaSet((*[]ReplicaSet)(yyv1323), d) + h.decSliceReplicaSet((*[]ReplicaSet)(yyv1297), d) } } for { - yyj1318++ - if yyhl1318 { - yyb1318 = yyj1318 > l + yyj1292++ + if yyhl1292 { + yyb1292 = yyj1292 > l } else { - yyb1318 = r.CheckBreak() + yyb1292 = r.CheckBreak() } - if yyb1318 { + if yyb1292 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1318-1, "") + z.DecStructFieldNotFound(yyj1292-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -15619,73 +15320,73 @@ func (x *ReplicaSetSpec) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1325 := z.EncBinary() - _ = yym1325 + yym1299 := z.EncBinary() + _ = yym1299 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1326 := !z.EncBinary() - yy2arr1326 := z.EncBasicHandle().StructToArray - var yyq1326 [4]bool - _, _, _ = yysep1326, yyq1326, yy2arr1326 - const yyr1326 bool = false - yyq1326[0] = x.Replicas != nil - yyq1326[1] = x.MinReadySeconds != 0 - yyq1326[2] = x.Selector != nil - yyq1326[3] = true - var yynn1326 int - if yyr1326 || yy2arr1326 { + yysep1300 := !z.EncBinary() + yy2arr1300 := z.EncBasicHandle().StructToArray + var yyq1300 [4]bool + _, _, _ = yysep1300, yyq1300, yy2arr1300 + const yyr1300 bool = false + yyq1300[0] = x.Replicas != nil + yyq1300[1] = x.MinReadySeconds != 0 + yyq1300[2] = x.Selector != nil + yyq1300[3] = true + var yynn1300 int + if yyr1300 || yy2arr1300 { r.EncodeArrayStart(4) } else { - yynn1326 = 0 - for _, b := range yyq1326 { + yynn1300 = 0 + for _, b := range yyq1300 { if b { - yynn1326++ + yynn1300++ } } - r.EncodeMapStart(yynn1326) - yynn1326 = 0 + r.EncodeMapStart(yynn1300) + yynn1300 = 0 } - if yyr1326 || yy2arr1326 { + if yyr1300 || yy2arr1300 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1326[0] { + if yyq1300[0] { if x.Replicas == nil { r.EncodeNil() } else { - yy1328 := *x.Replicas - yym1329 := z.EncBinary() - _ = yym1329 + yy1302 := *x.Replicas + yym1303 := z.EncBinary() + _ = yym1303 if false { } else { - r.EncodeInt(int64(yy1328)) + r.EncodeInt(int64(yy1302)) } } } else { r.EncodeNil() } } else { - if yyq1326[0] { + if yyq1300[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("replicas")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Replicas == nil { r.EncodeNil() } else { - yy1330 := *x.Replicas - yym1331 := z.EncBinary() - _ = yym1331 + yy1304 := *x.Replicas + yym1305 := z.EncBinary() + _ = yym1305 if false { } else { - r.EncodeInt(int64(yy1330)) + r.EncodeInt(int64(yy1304)) } } } } - if yyr1326 || yy2arr1326 { + if yyr1300 || yy2arr1300 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1326[1] { - yym1333 := z.EncBinary() - _ = yym1333 + if yyq1300[1] { + yym1307 := z.EncBinary() + _ = yym1307 if false { } else { r.EncodeInt(int64(x.MinReadySeconds)) @@ -15694,26 +15395,26 @@ func (x *ReplicaSetSpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq1326[1] { + if yyq1300[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("minReadySeconds")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1334 := z.EncBinary() - _ = yym1334 + yym1308 := z.EncBinary() + _ = yym1308 if false { } else { r.EncodeInt(int64(x.MinReadySeconds)) } } } - if yyr1326 || yy2arr1326 { + if yyr1300 || yy2arr1300 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1326[2] { + if yyq1300[2] { if x.Selector == nil { r.EncodeNil() } else { - yym1336 := z.EncBinary() - _ = yym1336 + yym1310 := z.EncBinary() + _ = yym1310 if false { } else if z.HasExtensions() && z.EncExt(x.Selector) { } else { @@ -15724,15 +15425,15 @@ func (x *ReplicaSetSpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1326[2] { + if yyq1300[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("selector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Selector == nil { r.EncodeNil() } else { - yym1337 := z.EncBinary() - _ = yym1337 + yym1311 := z.EncBinary() + _ = yym1311 if false { } else if z.HasExtensions() && z.EncExt(x.Selector) { } else { @@ -15741,24 +15442,24 @@ func (x *ReplicaSetSpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1326 || yy2arr1326 { + if yyr1300 || yy2arr1300 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1326[3] { - yy1339 := &x.Template - yy1339.CodecEncodeSelf(e) + if yyq1300[3] { + yy1313 := &x.Template + yy1313.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq1326[3] { + if yyq1300[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("template")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1340 := &x.Template - yy1340.CodecEncodeSelf(e) + yy1314 := &x.Template + yy1314.CodecEncodeSelf(e) } } - if yyr1326 || yy2arr1326 { + if yyr1300 || yy2arr1300 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -15771,25 +15472,25 @@ func (x *ReplicaSetSpec) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1341 := z.DecBinary() - _ = yym1341 + yym1315 := z.DecBinary() + _ = yym1315 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1342 := r.ContainerType() - if yyct1342 == codecSelferValueTypeMap1234 { - yyl1342 := r.ReadMapStart() - if yyl1342 == 0 { + yyct1316 := r.ContainerType() + if yyct1316 == codecSelferValueTypeMap1234 { + yyl1316 := r.ReadMapStart() + if yyl1316 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1342, d) + x.codecDecodeSelfFromMap(yyl1316, d) } - } else if yyct1342 == codecSelferValueTypeArray1234 { - yyl1342 := r.ReadArrayStart() - if yyl1342 == 0 { + } else if yyct1316 == codecSelferValueTypeArray1234 { + yyl1316 := r.ReadArrayStart() + if yyl1316 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1342, d) + x.codecDecodeSelfFromArray(yyl1316, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -15801,12 +15502,12 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1343Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1343Slc - var yyhl1343 bool = l >= 0 - for yyj1343 := 0; ; yyj1343++ { - if yyhl1343 { - if yyj1343 >= l { + var yys1317Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1317Slc + var yyhl1317 bool = l >= 0 + for yyj1317 := 0; ; yyj1317++ { + if yyhl1317 { + if yyj1317 >= l { break } } else { @@ -15815,10 +15516,10 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1343Slc = r.DecodeBytes(yys1343Slc, true, true) - yys1343 := string(yys1343Slc) + yys1317Slc = r.DecodeBytes(yys1317Slc, true, true) + yys1317 := string(yys1317Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1343 { + switch yys1317 { case "replicas": if r.TryDecodeAsNil() { if x.Replicas != nil { @@ -15828,8 +15529,8 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if x.Replicas == nil { x.Replicas = new(int32) } - yym1345 := z.DecBinary() - _ = yym1345 + yym1319 := z.DecBinary() + _ = yym1319 if false { } else { *((*int32)(x.Replicas)) = int32(r.DecodeInt(32)) @@ -15848,10 +15549,10 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } - yym1348 := z.DecBinary() - _ = yym1348 + yym1322 := z.DecBinary() + _ = yym1322 if false { } else if z.HasExtensions() && z.DecExt(x.Selector) { } else { @@ -15862,13 +15563,13 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Template = pkg2_v1.PodTemplateSpec{} } else { - yyv1349 := &x.Template - yyv1349.CodecDecodeSelf(d) + yyv1323 := &x.Template + yyv1323.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys1343) - } // end switch yys1343 - } // end for yyj1343 + z.DecStructFieldNotFound(-1, yys1317) + } // end switch yys1317 + } // end for yyj1317 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -15876,16 +15577,16 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1350 int - var yyb1350 bool - var yyhl1350 bool = l >= 0 - yyj1350++ - if yyhl1350 { - yyb1350 = yyj1350 > l + var yyj1324 int + var yyb1324 bool + var yyhl1324 bool = l >= 0 + yyj1324++ + if yyhl1324 { + yyb1324 = yyj1324 > l } else { - yyb1350 = r.CheckBreak() + yyb1324 = r.CheckBreak() } - if yyb1350 { + if yyb1324 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15898,20 +15599,20 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if x.Replicas == nil { x.Replicas = new(int32) } - yym1352 := z.DecBinary() - _ = yym1352 + yym1326 := z.DecBinary() + _ = yym1326 if false { } else { *((*int32)(x.Replicas)) = int32(r.DecodeInt(32)) } } - yyj1350++ - if yyhl1350 { - yyb1350 = yyj1350 > l + yyj1324++ + if yyhl1324 { + yyb1324 = yyj1324 > l } else { - yyb1350 = r.CheckBreak() + yyb1324 = r.CheckBreak() } - if yyb1350 { + if yyb1324 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15921,13 +15622,13 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.MinReadySeconds = int32(r.DecodeInt(32)) } - yyj1350++ - if yyhl1350 { - yyb1350 = yyj1350 > l + yyj1324++ + if yyhl1324 { + yyb1324 = yyj1324 > l } else { - yyb1350 = r.CheckBreak() + yyb1324 = r.CheckBreak() } - if yyb1350 { + if yyb1324 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15938,23 +15639,23 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.Selector == nil { - x.Selector = new(pkg1_unversioned.LabelSelector) + x.Selector = new(pkg1_v1.LabelSelector) } - yym1355 := z.DecBinary() - _ = yym1355 + yym1329 := z.DecBinary() + _ = yym1329 if false { } else if z.HasExtensions() && z.DecExt(x.Selector) { } else { z.DecFallback(x.Selector, false) } } - yyj1350++ - if yyhl1350 { - yyb1350 = yyj1350 > l + yyj1324++ + if yyhl1324 { + yyb1324 = yyj1324 > l } else { - yyb1350 = r.CheckBreak() + yyb1324 = r.CheckBreak() } - if yyb1350 { + if yyb1324 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -15962,21 +15663,21 @@ func (x *ReplicaSetSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Template = pkg2_v1.PodTemplateSpec{} } else { - yyv1356 := &x.Template - yyv1356.CodecDecodeSelf(d) + yyv1330 := &x.Template + yyv1330.CodecDecodeSelf(d) } for { - yyj1350++ - if yyhl1350 { - yyb1350 = yyj1350 > l + yyj1324++ + if yyhl1324 { + yyb1324 = yyj1324 > l } else { - yyb1350 = r.CheckBreak() + yyb1324 = r.CheckBreak() } - if yyb1350 { + if yyb1324 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1350-1, "") + z.DecStructFieldNotFound(yyj1324-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -15988,38 +15689,38 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1357 := z.EncBinary() - _ = yym1357 + yym1331 := z.EncBinary() + _ = yym1331 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1358 := !z.EncBinary() - yy2arr1358 := z.EncBasicHandle().StructToArray - var yyq1358 [6]bool - _, _, _ = yysep1358, yyq1358, yy2arr1358 - const yyr1358 bool = false - yyq1358[1] = x.FullyLabeledReplicas != 0 - yyq1358[2] = x.ReadyReplicas != 0 - yyq1358[3] = x.AvailableReplicas != 0 - yyq1358[4] = x.ObservedGeneration != 0 - yyq1358[5] = len(x.Conditions) != 0 - var yynn1358 int - if yyr1358 || yy2arr1358 { + yysep1332 := !z.EncBinary() + yy2arr1332 := z.EncBasicHandle().StructToArray + var yyq1332 [6]bool + _, _, _ = yysep1332, yyq1332, yy2arr1332 + const yyr1332 bool = false + yyq1332[1] = x.FullyLabeledReplicas != 0 + yyq1332[2] = x.ReadyReplicas != 0 + yyq1332[3] = x.AvailableReplicas != 0 + yyq1332[4] = x.ObservedGeneration != 0 + yyq1332[5] = len(x.Conditions) != 0 + var yynn1332 int + if yyr1332 || yy2arr1332 { r.EncodeArrayStart(6) } else { - yynn1358 = 1 - for _, b := range yyq1358 { + yynn1332 = 1 + for _, b := range yyq1332 { if b { - yynn1358++ + yynn1332++ } } - r.EncodeMapStart(yynn1358) - yynn1358 = 0 + r.EncodeMapStart(yynn1332) + yynn1332 = 0 } - if yyr1358 || yy2arr1358 { + if yyr1332 || yy2arr1332 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1360 := z.EncBinary() - _ = yym1360 + yym1334 := z.EncBinary() + _ = yym1334 if false { } else { r.EncodeInt(int64(x.Replicas)) @@ -16028,18 +15729,18 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("replicas")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1361 := z.EncBinary() - _ = yym1361 + yym1335 := z.EncBinary() + _ = yym1335 if false { } else { r.EncodeInt(int64(x.Replicas)) } } - if yyr1358 || yy2arr1358 { + if yyr1332 || yy2arr1332 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1358[1] { - yym1363 := z.EncBinary() - _ = yym1363 + if yyq1332[1] { + yym1337 := z.EncBinary() + _ = yym1337 if false { } else { r.EncodeInt(int64(x.FullyLabeledReplicas)) @@ -16048,23 +15749,23 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq1358[1] { + if yyq1332[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1364 := z.EncBinary() - _ = yym1364 + yym1338 := z.EncBinary() + _ = yym1338 if false { } else { r.EncodeInt(int64(x.FullyLabeledReplicas)) } } } - if yyr1358 || yy2arr1358 { + if yyr1332 || yy2arr1332 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1358[2] { - yym1366 := z.EncBinary() - _ = yym1366 + if yyq1332[2] { + yym1340 := z.EncBinary() + _ = yym1340 if false { } else { r.EncodeInt(int64(x.ReadyReplicas)) @@ -16073,23 +15774,23 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq1358[2] { + if yyq1332[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("readyReplicas")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1367 := z.EncBinary() - _ = yym1367 + yym1341 := z.EncBinary() + _ = yym1341 if false { } else { r.EncodeInt(int64(x.ReadyReplicas)) } } } - if yyr1358 || yy2arr1358 { + if yyr1332 || yy2arr1332 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1358[3] { - yym1369 := z.EncBinary() - _ = yym1369 + if yyq1332[3] { + yym1343 := z.EncBinary() + _ = yym1343 if false { } else { r.EncodeInt(int64(x.AvailableReplicas)) @@ -16098,23 +15799,23 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq1358[3] { + if yyq1332[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("availableReplicas")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1370 := z.EncBinary() - _ = yym1370 + yym1344 := z.EncBinary() + _ = yym1344 if false { } else { r.EncodeInt(int64(x.AvailableReplicas)) } } } - if yyr1358 || yy2arr1358 { + if yyr1332 || yy2arr1332 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1358[4] { - yym1372 := z.EncBinary() - _ = yym1372 + if yyq1332[4] { + yym1346 := z.EncBinary() + _ = yym1346 if false { } else { r.EncodeInt(int64(x.ObservedGeneration)) @@ -16123,26 +15824,26 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeInt(0) } } else { - if yyq1358[4] { + if yyq1332[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("observedGeneration")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1373 := z.EncBinary() - _ = yym1373 + yym1347 := z.EncBinary() + _ = yym1347 if false { } else { r.EncodeInt(int64(x.ObservedGeneration)) } } } - if yyr1358 || yy2arr1358 { + if yyr1332 || yy2arr1332 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1358[5] { + if yyq1332[5] { if x.Conditions == nil { r.EncodeNil() } else { - yym1375 := z.EncBinary() - _ = yym1375 + yym1349 := z.EncBinary() + _ = yym1349 if false { } else { h.encSliceReplicaSetCondition(([]ReplicaSetCondition)(x.Conditions), e) @@ -16152,15 +15853,15 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1358[5] { + if yyq1332[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("conditions")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Conditions == nil { r.EncodeNil() } else { - yym1376 := z.EncBinary() - _ = yym1376 + yym1350 := z.EncBinary() + _ = yym1350 if false { } else { h.encSliceReplicaSetCondition(([]ReplicaSetCondition)(x.Conditions), e) @@ -16168,7 +15869,7 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1358 || yy2arr1358 { + if yyr1332 || yy2arr1332 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -16181,25 +15882,25 @@ func (x *ReplicaSetStatus) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1377 := z.DecBinary() - _ = yym1377 + yym1351 := z.DecBinary() + _ = yym1351 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1378 := r.ContainerType() - if yyct1378 == codecSelferValueTypeMap1234 { - yyl1378 := r.ReadMapStart() - if yyl1378 == 0 { + yyct1352 := r.ContainerType() + if yyct1352 == codecSelferValueTypeMap1234 { + yyl1352 := r.ReadMapStart() + if yyl1352 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1378, d) + x.codecDecodeSelfFromMap(yyl1352, d) } - } else if yyct1378 == codecSelferValueTypeArray1234 { - yyl1378 := r.ReadArrayStart() - if yyl1378 == 0 { + } else if yyct1352 == codecSelferValueTypeArray1234 { + yyl1352 := r.ReadArrayStart() + if yyl1352 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1378, d) + x.codecDecodeSelfFromArray(yyl1352, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -16211,12 +15912,12 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1379Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1379Slc - var yyhl1379 bool = l >= 0 - for yyj1379 := 0; ; yyj1379++ { - if yyhl1379 { - if yyj1379 >= l { + var yys1353Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1353Slc + var yyhl1353 bool = l >= 0 + for yyj1353 := 0; ; yyj1353++ { + if yyhl1353 { + if yyj1353 >= l { break } } else { @@ -16225,10 +15926,10 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1379Slc = r.DecodeBytes(yys1379Slc, true, true) - yys1379 := string(yys1379Slc) + yys1353Slc = r.DecodeBytes(yys1353Slc, true, true) + yys1353 := string(yys1353Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1379 { + switch yys1353 { case "replicas": if r.TryDecodeAsNil() { x.Replicas = 0 @@ -16263,18 +15964,18 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Conditions = nil } else { - yyv1385 := &x.Conditions - yym1386 := z.DecBinary() - _ = yym1386 + yyv1359 := &x.Conditions + yym1360 := z.DecBinary() + _ = yym1360 if false { } else { - h.decSliceReplicaSetCondition((*[]ReplicaSetCondition)(yyv1385), d) + h.decSliceReplicaSetCondition((*[]ReplicaSetCondition)(yyv1359), d) } } default: - z.DecStructFieldNotFound(-1, yys1379) - } // end switch yys1379 - } // end for yyj1379 + z.DecStructFieldNotFound(-1, yys1353) + } // end switch yys1353 + } // end for yyj1353 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -16282,16 +15983,16 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1387 int - var yyb1387 bool - var yyhl1387 bool = l >= 0 - yyj1387++ - if yyhl1387 { - yyb1387 = yyj1387 > l + var yyj1361 int + var yyb1361 bool + var yyhl1361 bool = l >= 0 + yyj1361++ + if yyhl1361 { + yyb1361 = yyj1361 > l } else { - yyb1387 = r.CheckBreak() + yyb1361 = r.CheckBreak() } - if yyb1387 { + if yyb1361 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16301,13 +16002,13 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.Replicas = int32(r.DecodeInt(32)) } - yyj1387++ - if yyhl1387 { - yyb1387 = yyj1387 > l + yyj1361++ + if yyhl1361 { + yyb1361 = yyj1361 > l } else { - yyb1387 = r.CheckBreak() + yyb1361 = r.CheckBreak() } - if yyb1387 { + if yyb1361 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16317,13 +16018,13 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.FullyLabeledReplicas = int32(r.DecodeInt(32)) } - yyj1387++ - if yyhl1387 { - yyb1387 = yyj1387 > l + yyj1361++ + if yyhl1361 { + yyb1361 = yyj1361 > l } else { - yyb1387 = r.CheckBreak() + yyb1361 = r.CheckBreak() } - if yyb1387 { + if yyb1361 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16333,13 +16034,13 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.ReadyReplicas = int32(r.DecodeInt(32)) } - yyj1387++ - if yyhl1387 { - yyb1387 = yyj1387 > l + yyj1361++ + if yyhl1361 { + yyb1361 = yyj1361 > l } else { - yyb1387 = r.CheckBreak() + yyb1361 = r.CheckBreak() } - if yyb1387 { + if yyb1361 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16349,13 +16050,13 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.AvailableReplicas = int32(r.DecodeInt(32)) } - yyj1387++ - if yyhl1387 { - yyb1387 = yyj1387 > l + yyj1361++ + if yyhl1361 { + yyb1361 = yyj1361 > l } else { - yyb1387 = r.CheckBreak() + yyb1361 = r.CheckBreak() } - if yyb1387 { + if yyb1361 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16365,13 +16066,13 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } else { x.ObservedGeneration = int64(r.DecodeInt(64)) } - yyj1387++ - if yyhl1387 { - yyb1387 = yyj1387 > l + yyj1361++ + if yyhl1361 { + yyb1361 = yyj1361 > l } else { - yyb1387 = r.CheckBreak() + yyb1361 = r.CheckBreak() } - if yyb1387 { + if yyb1361 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16379,26 +16080,26 @@ func (x *ReplicaSetStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.Conditions = nil } else { - yyv1393 := &x.Conditions - yym1394 := z.DecBinary() - _ = yym1394 + yyv1367 := &x.Conditions + yym1368 := z.DecBinary() + _ = yym1368 if false { } else { - h.decSliceReplicaSetCondition((*[]ReplicaSetCondition)(yyv1393), d) + h.decSliceReplicaSetCondition((*[]ReplicaSetCondition)(yyv1367), d) } } for { - yyj1387++ - if yyhl1387 { - yyb1387 = yyj1387 > l + yyj1361++ + if yyhl1361 { + yyb1361 = yyj1361 > l } else { - yyb1387 = r.CheckBreak() + yyb1361 = r.CheckBreak() } - if yyb1387 { + if yyb1361 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1387-1, "") + z.DecStructFieldNotFound(yyj1361-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -16407,8 +16108,8 @@ func (x ReplicaSetConditionType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym1395 := z.EncBinary() - _ = yym1395 + yym1369 := z.EncBinary() + _ = yym1369 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -16420,8 +16121,8 @@ func (x *ReplicaSetConditionType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1396 := z.DecBinary() - _ = yym1396 + yym1370 := z.DecBinary() + _ = yym1370 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -16436,33 +16137,33 @@ func (x *ReplicaSetCondition) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1397 := z.EncBinary() - _ = yym1397 + yym1371 := z.EncBinary() + _ = yym1371 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1398 := !z.EncBinary() - yy2arr1398 := z.EncBasicHandle().StructToArray - var yyq1398 [5]bool - _, _, _ = yysep1398, yyq1398, yy2arr1398 - const yyr1398 bool = false - yyq1398[2] = true - yyq1398[3] = x.Reason != "" - yyq1398[4] = x.Message != "" - var yynn1398 int - if yyr1398 || yy2arr1398 { + yysep1372 := !z.EncBinary() + yy2arr1372 := z.EncBasicHandle().StructToArray + var yyq1372 [5]bool + _, _, _ = yysep1372, yyq1372, yy2arr1372 + const yyr1372 bool = false + yyq1372[2] = true + yyq1372[3] = x.Reason != "" + yyq1372[4] = x.Message != "" + var yynn1372 int + if yyr1372 || yy2arr1372 { r.EncodeArrayStart(5) } else { - yynn1398 = 2 - for _, b := range yyq1398 { + yynn1372 = 2 + for _, b := range yyq1372 { if b { - yynn1398++ + yynn1372++ } } - r.EncodeMapStart(yynn1398) - yynn1398 = 0 + r.EncodeMapStart(yynn1372) + yynn1372 = 0 } - if yyr1398 || yy2arr1398 { + if yyr1372 || yy2arr1372 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) x.Type.CodecEncodeSelf(e) } else { @@ -16471,10 +16172,10 @@ func (x *ReplicaSetCondition) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Type.CodecEncodeSelf(e) } - if yyr1398 || yy2arr1398 { + if yyr1372 || yy2arr1372 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1401 := z.EncBinary() - _ = yym1401 + yym1375 := z.EncBinary() + _ = yym1375 if false { } else if z.HasExtensions() && z.EncExt(x.Status) { } else { @@ -16484,56 +16185,56 @@ func (x *ReplicaSetCondition) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("status")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1402 := z.EncBinary() - _ = yym1402 + yym1376 := z.EncBinary() + _ = yym1376 if false { } else if z.HasExtensions() && z.EncExt(x.Status) { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Status)) } } - if yyr1398 || yy2arr1398 { + if yyr1372 || yy2arr1372 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1398[2] { - yy1404 := &x.LastTransitionTime - yym1405 := z.EncBinary() - _ = yym1405 + if yyq1372[2] { + yy1378 := &x.LastTransitionTime + yym1379 := z.EncBinary() + _ = yym1379 if false { - } else if z.HasExtensions() && z.EncExt(yy1404) { - } else if yym1405 { - z.EncBinaryMarshal(yy1404) - } else if !yym1405 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1404) + } else if z.HasExtensions() && z.EncExt(yy1378) { + } else if yym1379 { + z.EncBinaryMarshal(yy1378) + } else if !yym1379 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1378) } else { - z.EncFallback(yy1404) + z.EncFallback(yy1378) } } else { r.EncodeNil() } } else { - if yyq1398[2] { + if yyq1372[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("lastTransitionTime")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1406 := &x.LastTransitionTime - yym1407 := z.EncBinary() - _ = yym1407 + yy1380 := &x.LastTransitionTime + yym1381 := z.EncBinary() + _ = yym1381 if false { - } else if z.HasExtensions() && z.EncExt(yy1406) { - } else if yym1407 { - z.EncBinaryMarshal(yy1406) - } else if !yym1407 && z.IsJSONHandle() { - z.EncJSONMarshal(yy1406) + } else if z.HasExtensions() && z.EncExt(yy1380) { + } else if yym1381 { + z.EncBinaryMarshal(yy1380) + } else if !yym1381 && z.IsJSONHandle() { + z.EncJSONMarshal(yy1380) } else { - z.EncFallback(yy1406) + z.EncFallback(yy1380) } } } - if yyr1398 || yy2arr1398 { + if yyr1372 || yy2arr1372 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1398[3] { - yym1409 := z.EncBinary() - _ = yym1409 + if yyq1372[3] { + yym1383 := z.EncBinary() + _ = yym1383 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Reason)) @@ -16542,23 +16243,23 @@ func (x *ReplicaSetCondition) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1398[3] { + if yyq1372[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("reason")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1410 := z.EncBinary() - _ = yym1410 + yym1384 := z.EncBinary() + _ = yym1384 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Reason)) } } } - if yyr1398 || yy2arr1398 { + if yyr1372 || yy2arr1372 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1398[4] { - yym1412 := z.EncBinary() - _ = yym1412 + if yyq1372[4] { + yym1386 := z.EncBinary() + _ = yym1386 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) @@ -16567,19 +16268,19 @@ func (x *ReplicaSetCondition) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1398[4] { + if yyq1372[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("message")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1413 := z.EncBinary() - _ = yym1413 + yym1387 := z.EncBinary() + _ = yym1387 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Message)) } } } - if yyr1398 || yy2arr1398 { + if yyr1372 || yy2arr1372 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -16592,25 +16293,25 @@ func (x *ReplicaSetCondition) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1414 := z.DecBinary() - _ = yym1414 + yym1388 := z.DecBinary() + _ = yym1388 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1415 := r.ContainerType() - if yyct1415 == codecSelferValueTypeMap1234 { - yyl1415 := r.ReadMapStart() - if yyl1415 == 0 { + yyct1389 := r.ContainerType() + if yyct1389 == codecSelferValueTypeMap1234 { + yyl1389 := r.ReadMapStart() + if yyl1389 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1415, d) + x.codecDecodeSelfFromMap(yyl1389, d) } - } else if yyct1415 == codecSelferValueTypeArray1234 { - yyl1415 := r.ReadArrayStart() - if yyl1415 == 0 { + } else if yyct1389 == codecSelferValueTypeArray1234 { + yyl1389 := r.ReadArrayStart() + if yyl1389 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1415, d) + x.codecDecodeSelfFromArray(yyl1389, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -16622,12 +16323,12 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1416Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1416Slc - var yyhl1416 bool = l >= 0 - for yyj1416 := 0; ; yyj1416++ { - if yyhl1416 { - if yyj1416 >= l { + var yys1390Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1390Slc + var yyhl1390 bool = l >= 0 + for yyj1390 := 0; ; yyj1390++ { + if yyhl1390 { + if yyj1390 >= l { break } } else { @@ -16636,10 +16337,10 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1416Slc = r.DecodeBytes(yys1416Slc, true, true) - yys1416 := string(yys1416Slc) + yys1390Slc = r.DecodeBytes(yys1390Slc, true, true) + yys1390 := string(yys1390Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1416 { + switch yys1390 { case "type": if r.TryDecodeAsNil() { x.Type = "" @@ -16654,19 +16355,19 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { - yyv1419 := &x.LastTransitionTime - yym1420 := z.DecBinary() - _ = yym1420 + yyv1393 := &x.LastTransitionTime + yym1394 := z.DecBinary() + _ = yym1394 if false { - } else if z.HasExtensions() && z.DecExt(yyv1419) { - } else if yym1420 { - z.DecBinaryUnmarshal(yyv1419) - } else if !yym1420 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1419) + } else if z.HasExtensions() && z.DecExt(yyv1393) { + } else if yym1394 { + z.DecBinaryUnmarshal(yyv1393) + } else if !yym1394 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1393) } else { - z.DecFallback(yyv1419, false) + z.DecFallback(yyv1393, false) } } case "reason": @@ -16682,9 +16383,9 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder x.Message = string(r.DecodeString()) } default: - z.DecStructFieldNotFound(-1, yys1416) - } // end switch yys1416 - } // end for yyj1416 + z.DecStructFieldNotFound(-1, yys1390) + } // end switch yys1390 + } // end for yyj1390 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -16692,16 +16393,16 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1423 int - var yyb1423 bool - var yyhl1423 bool = l >= 0 - yyj1423++ - if yyhl1423 { - yyb1423 = yyj1423 > l + var yyj1397 int + var yyb1397 bool + var yyhl1397 bool = l >= 0 + yyj1397++ + if yyhl1397 { + yyb1397 = yyj1397 > l } else { - yyb1423 = r.CheckBreak() + yyb1397 = r.CheckBreak() } - if yyb1423 { + if yyb1397 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16711,13 +16412,13 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Type = ReplicaSetConditionType(r.DecodeString()) } - yyj1423++ - if yyhl1423 { - yyb1423 = yyj1423 > l + yyj1397++ + if yyhl1397 { + yyb1397 = yyj1397 > l } else { - yyb1423 = r.CheckBreak() + yyb1397 = r.CheckBreak() } - if yyb1423 { + if yyb1397 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16727,40 +16428,40 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Status = pkg2_v1.ConditionStatus(r.DecodeString()) } - yyj1423++ - if yyhl1423 { - yyb1423 = yyj1423 > l + yyj1397++ + if yyhl1397 { + yyb1397 = yyj1397 > l } else { - yyb1423 = r.CheckBreak() + yyb1397 = r.CheckBreak() } - if yyb1423 { + if yyb1397 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg1_unversioned.Time{} + x.LastTransitionTime = pkg1_v1.Time{} } else { - yyv1426 := &x.LastTransitionTime - yym1427 := z.DecBinary() - _ = yym1427 + yyv1400 := &x.LastTransitionTime + yym1401 := z.DecBinary() + _ = yym1401 if false { - } else if z.HasExtensions() && z.DecExt(yyv1426) { - } else if yym1427 { - z.DecBinaryUnmarshal(yyv1426) - } else if !yym1427 && z.IsJSONHandle() { - z.DecJSONUnmarshal(yyv1426) + } else if z.HasExtensions() && z.DecExt(yyv1400) { + } else if yym1401 { + z.DecBinaryUnmarshal(yyv1400) + } else if !yym1401 && z.IsJSONHandle() { + z.DecJSONUnmarshal(yyv1400) } else { - z.DecFallback(yyv1426, false) + z.DecFallback(yyv1400, false) } } - yyj1423++ - if yyhl1423 { - yyb1423 = yyj1423 > l + yyj1397++ + if yyhl1397 { + yyb1397 = yyj1397 > l } else { - yyb1423 = r.CheckBreak() + yyb1397 = r.CheckBreak() } - if yyb1423 { + if yyb1397 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16770,13 +16471,13 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod } else { x.Reason = string(r.DecodeString()) } - yyj1423++ - if yyhl1423 { - yyb1423 = yyj1423 > l + yyj1397++ + if yyhl1397 { + yyb1397 = yyj1397 > l } else { - yyb1423 = r.CheckBreak() + yyb1397 = r.CheckBreak() } - if yyb1423 { + if yyb1397 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -16787,17 +16488,17 @@ func (x *ReplicaSetCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decod x.Message = string(r.DecodeString()) } for { - yyj1423++ - if yyhl1423 { - yyb1423 = yyj1423 > l + yyj1397++ + if yyhl1397 { + yyb1397 = yyj1397 > l } else { - yyb1423 = r.CheckBreak() + yyb1397 = r.CheckBreak() } - if yyb1423 { + if yyb1397 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1423-1, "") + z.DecStructFieldNotFound(yyj1397-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -16809,38 +16510,38 @@ func (x *PodSecurityPolicy) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1430 := z.EncBinary() - _ = yym1430 + yym1404 := z.EncBinary() + _ = yym1404 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1431 := !z.EncBinary() - yy2arr1431 := z.EncBasicHandle().StructToArray - var yyq1431 [4]bool - _, _, _ = yysep1431, yyq1431, yy2arr1431 - const yyr1431 bool = false - yyq1431[0] = x.Kind != "" - yyq1431[1] = x.APIVersion != "" - yyq1431[2] = true - yyq1431[3] = true - var yynn1431 int - if yyr1431 || yy2arr1431 { + yysep1405 := !z.EncBinary() + yy2arr1405 := z.EncBasicHandle().StructToArray + var yyq1405 [4]bool + _, _, _ = yysep1405, yyq1405, yy2arr1405 + const yyr1405 bool = false + yyq1405[0] = x.Kind != "" + yyq1405[1] = x.APIVersion != "" + yyq1405[2] = true + yyq1405[3] = true + var yynn1405 int + if yyr1405 || yy2arr1405 { r.EncodeArrayStart(4) } else { - yynn1431 = 0 - for _, b := range yyq1431 { + yynn1405 = 0 + for _, b := range yyq1405 { if b { - yynn1431++ + yynn1405++ } } - r.EncodeMapStart(yynn1431) - yynn1431 = 0 + r.EncodeMapStart(yynn1405) + yynn1405 = 0 } - if yyr1431 || yy2arr1431 { + if yyr1405 || yy2arr1405 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1431[0] { - yym1433 := z.EncBinary() - _ = yym1433 + if yyq1405[0] { + yym1407 := z.EncBinary() + _ = yym1407 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -16849,23 +16550,23 @@ func (x *PodSecurityPolicy) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1431[0] { + if yyq1405[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1434 := z.EncBinary() - _ = yym1434 + yym1408 := z.EncBinary() + _ = yym1408 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr1431 || yy2arr1431 { + if yyr1405 || yy2arr1405 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1431[1] { - yym1436 := z.EncBinary() - _ = yym1436 + if yyq1405[1] { + yym1410 := z.EncBinary() + _ = yym1410 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -16874,53 +16575,53 @@ func (x *PodSecurityPolicy) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1431[1] { + if yyq1405[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1437 := z.EncBinary() - _ = yym1437 + yym1411 := z.EncBinary() + _ = yym1411 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr1431 || yy2arr1431 { + if yyr1405 || yy2arr1405 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1431[2] { - yy1439 := &x.ObjectMeta - yy1439.CodecEncodeSelf(e) + if yyq1405[2] { + yy1413 := &x.ObjectMeta + yy1413.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq1431[2] { + if yyq1405[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1440 := &x.ObjectMeta - yy1440.CodecEncodeSelf(e) + yy1414 := &x.ObjectMeta + yy1414.CodecEncodeSelf(e) } } - if yyr1431 || yy2arr1431 { + if yyr1405 || yy2arr1405 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1431[3] { - yy1442 := &x.Spec - yy1442.CodecEncodeSelf(e) + if yyq1405[3] { + yy1416 := &x.Spec + yy1416.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq1431[3] { + if yyq1405[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("spec")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1443 := &x.Spec - yy1443.CodecEncodeSelf(e) + yy1417 := &x.Spec + yy1417.CodecEncodeSelf(e) } } - if yyr1431 || yy2arr1431 { + if yyr1405 || yy2arr1405 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -16933,25 +16634,25 @@ func (x *PodSecurityPolicy) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1444 := z.DecBinary() - _ = yym1444 + yym1418 := z.DecBinary() + _ = yym1418 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1445 := r.ContainerType() - if yyct1445 == codecSelferValueTypeMap1234 { - yyl1445 := r.ReadMapStart() - if yyl1445 == 0 { + yyct1419 := r.ContainerType() + if yyct1419 == codecSelferValueTypeMap1234 { + yyl1419 := r.ReadMapStart() + if yyl1419 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1445, d) + x.codecDecodeSelfFromMap(yyl1419, d) } - } else if yyct1445 == codecSelferValueTypeArray1234 { - yyl1445 := r.ReadArrayStart() - if yyl1445 == 0 { + } else if yyct1419 == codecSelferValueTypeArray1234 { + yyl1419 := r.ReadArrayStart() + if yyl1419 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1445, d) + x.codecDecodeSelfFromArray(yyl1419, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -16963,12 +16664,12 @@ func (x *PodSecurityPolicy) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1446Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1446Slc - var yyhl1446 bool = l >= 0 - for yyj1446 := 0; ; yyj1446++ { - if yyhl1446 { - if yyj1446 >= l { + var yys1420Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1420Slc + var yyhl1420 bool = l >= 0 + for yyj1420 := 0; ; yyj1420++ { + if yyhl1420 { + if yyj1420 >= l { break } } else { @@ -16977,10 +16678,10 @@ func (x *PodSecurityPolicy) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1446Slc = r.DecodeBytes(yys1446Slc, true, true) - yys1446 := string(yys1446Slc) + yys1420Slc = r.DecodeBytes(yys1420Slc, true, true) + yys1420 := string(yys1420Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1446 { + switch yys1420 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -16997,20 +16698,20 @@ func (x *PodSecurityPolicy) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) if r.TryDecodeAsNil() { x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { - yyv1449 := &x.ObjectMeta - yyv1449.CodecDecodeSelf(d) + yyv1423 := &x.ObjectMeta + yyv1423.CodecDecodeSelf(d) } case "spec": if r.TryDecodeAsNil() { x.Spec = PodSecurityPolicySpec{} } else { - yyv1450 := &x.Spec - yyv1450.CodecDecodeSelf(d) + yyv1424 := &x.Spec + yyv1424.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys1446) - } // end switch yys1446 - } // end for yyj1446 + z.DecStructFieldNotFound(-1, yys1420) + } // end switch yys1420 + } // end for yyj1420 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -17018,16 +16719,16 @@ func (x *PodSecurityPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1451 int - var yyb1451 bool - var yyhl1451 bool = l >= 0 - yyj1451++ - if yyhl1451 { - yyb1451 = yyj1451 > l + var yyj1425 int + var yyb1425 bool + var yyhl1425 bool = l >= 0 + yyj1425++ + if yyhl1425 { + yyb1425 = yyj1425 > l } else { - yyb1451 = r.CheckBreak() + yyb1425 = r.CheckBreak() } - if yyb1451 { + if yyb1425 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17037,13 +16738,13 @@ func (x *PodSecurityPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.Kind = string(r.DecodeString()) } - yyj1451++ - if yyhl1451 { - yyb1451 = yyj1451 > l + yyj1425++ + if yyhl1425 { + yyb1425 = yyj1425 > l } else { - yyb1451 = r.CheckBreak() + yyb1425 = r.CheckBreak() } - if yyb1451 { + if yyb1425 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17053,13 +16754,13 @@ func (x *PodSecurityPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.APIVersion = string(r.DecodeString()) } - yyj1451++ - if yyhl1451 { - yyb1451 = yyj1451 > l + yyj1425++ + if yyhl1425 { + yyb1425 = yyj1425 > l } else { - yyb1451 = r.CheckBreak() + yyb1425 = r.CheckBreak() } - if yyb1451 { + if yyb1425 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17067,16 +16768,16 @@ func (x *PodSecurityPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { - yyv1454 := &x.ObjectMeta - yyv1454.CodecDecodeSelf(d) + yyv1428 := &x.ObjectMeta + yyv1428.CodecDecodeSelf(d) } - yyj1451++ - if yyhl1451 { - yyb1451 = yyj1451 > l + yyj1425++ + if yyhl1425 { + yyb1425 = yyj1425 > l } else { - yyb1451 = r.CheckBreak() + yyb1425 = r.CheckBreak() } - if yyb1451 { + if yyb1425 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17084,21 +16785,21 @@ func (x *PodSecurityPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Spec = PodSecurityPolicySpec{} } else { - yyv1455 := &x.Spec - yyv1455.CodecDecodeSelf(d) + yyv1429 := &x.Spec + yyv1429.CodecDecodeSelf(d) } for { - yyj1451++ - if yyhl1451 { - yyb1451 = yyj1451 > l + yyj1425++ + if yyhl1425 { + yyb1425 = yyj1425 > l } else { - yyb1451 = r.CheckBreak() + yyb1425 = r.CheckBreak() } - if yyb1451 { + if yyb1425 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1451-1, "") + z.DecStructFieldNotFound(yyj1425-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -17110,44 +16811,44 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1456 := z.EncBinary() - _ = yym1456 + yym1430 := z.EncBinary() + _ = yym1430 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1457 := !z.EncBinary() - yy2arr1457 := z.EncBasicHandle().StructToArray - var yyq1457 [14]bool - _, _, _ = yysep1457, yyq1457, yy2arr1457 - const yyr1457 bool = false - yyq1457[0] = x.Privileged != false - yyq1457[1] = len(x.DefaultAddCapabilities) != 0 - yyq1457[2] = len(x.RequiredDropCapabilities) != 0 - yyq1457[3] = len(x.AllowedCapabilities) != 0 - yyq1457[4] = len(x.Volumes) != 0 - yyq1457[5] = x.HostNetwork != false - yyq1457[6] = len(x.HostPorts) != 0 - yyq1457[7] = x.HostPID != false - yyq1457[8] = x.HostIPC != false - yyq1457[13] = x.ReadOnlyRootFilesystem != false - var yynn1457 int - if yyr1457 || yy2arr1457 { + yysep1431 := !z.EncBinary() + yy2arr1431 := z.EncBasicHandle().StructToArray + var yyq1431 [14]bool + _, _, _ = yysep1431, yyq1431, yy2arr1431 + const yyr1431 bool = false + yyq1431[0] = x.Privileged != false + yyq1431[1] = len(x.DefaultAddCapabilities) != 0 + yyq1431[2] = len(x.RequiredDropCapabilities) != 0 + yyq1431[3] = len(x.AllowedCapabilities) != 0 + yyq1431[4] = len(x.Volumes) != 0 + yyq1431[5] = x.HostNetwork != false + yyq1431[6] = len(x.HostPorts) != 0 + yyq1431[7] = x.HostPID != false + yyq1431[8] = x.HostIPC != false + yyq1431[13] = x.ReadOnlyRootFilesystem != false + var yynn1431 int + if yyr1431 || yy2arr1431 { r.EncodeArrayStart(14) } else { - yynn1457 = 4 - for _, b := range yyq1457 { + yynn1431 = 4 + for _, b := range yyq1431 { if b { - yynn1457++ + yynn1431++ } } - r.EncodeMapStart(yynn1457) - yynn1457 = 0 + r.EncodeMapStart(yynn1431) + yynn1431 = 0 } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[0] { - yym1459 := z.EncBinary() - _ = yym1459 + if yyq1431[0] { + yym1433 := z.EncBinary() + _ = yym1433 if false { } else { r.EncodeBool(bool(x.Privileged)) @@ -17156,26 +16857,26 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq1457[0] { + if yyq1431[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("privileged")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1460 := z.EncBinary() - _ = yym1460 + yym1434 := z.EncBinary() + _ = yym1434 if false { } else { r.EncodeBool(bool(x.Privileged)) } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[1] { + if yyq1431[1] { if x.DefaultAddCapabilities == nil { r.EncodeNil() } else { - yym1462 := z.EncBinary() - _ = yym1462 + yym1436 := z.EncBinary() + _ = yym1436 if false { } else { h.encSlicev1_Capability(([]pkg2_v1.Capability)(x.DefaultAddCapabilities), e) @@ -17185,15 +16886,15 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1457[1] { + if yyq1431[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("defaultAddCapabilities")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.DefaultAddCapabilities == nil { r.EncodeNil() } else { - yym1463 := z.EncBinary() - _ = yym1463 + yym1437 := z.EncBinary() + _ = yym1437 if false { } else { h.encSlicev1_Capability(([]pkg2_v1.Capability)(x.DefaultAddCapabilities), e) @@ -17201,14 +16902,14 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[2] { + if yyq1431[2] { if x.RequiredDropCapabilities == nil { r.EncodeNil() } else { - yym1465 := z.EncBinary() - _ = yym1465 + yym1439 := z.EncBinary() + _ = yym1439 if false { } else { h.encSlicev1_Capability(([]pkg2_v1.Capability)(x.RequiredDropCapabilities), e) @@ -17218,15 +16919,15 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1457[2] { + if yyq1431[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("requiredDropCapabilities")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.RequiredDropCapabilities == nil { r.EncodeNil() } else { - yym1466 := z.EncBinary() - _ = yym1466 + yym1440 := z.EncBinary() + _ = yym1440 if false { } else { h.encSlicev1_Capability(([]pkg2_v1.Capability)(x.RequiredDropCapabilities), e) @@ -17234,14 +16935,14 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[3] { + if yyq1431[3] { if x.AllowedCapabilities == nil { r.EncodeNil() } else { - yym1468 := z.EncBinary() - _ = yym1468 + yym1442 := z.EncBinary() + _ = yym1442 if false { } else { h.encSlicev1_Capability(([]pkg2_v1.Capability)(x.AllowedCapabilities), e) @@ -17251,15 +16952,15 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1457[3] { + if yyq1431[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("allowedCapabilities")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.AllowedCapabilities == nil { r.EncodeNil() } else { - yym1469 := z.EncBinary() - _ = yym1469 + yym1443 := z.EncBinary() + _ = yym1443 if false { } else { h.encSlicev1_Capability(([]pkg2_v1.Capability)(x.AllowedCapabilities), e) @@ -17267,14 +16968,14 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[4] { + if yyq1431[4] { if x.Volumes == nil { r.EncodeNil() } else { - yym1471 := z.EncBinary() - _ = yym1471 + yym1445 := z.EncBinary() + _ = yym1445 if false { } else { h.encSliceFSType(([]FSType)(x.Volumes), e) @@ -17284,15 +16985,15 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1457[4] { + if yyq1431[4] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("volumes")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Volumes == nil { r.EncodeNil() } else { - yym1472 := z.EncBinary() - _ = yym1472 + yym1446 := z.EncBinary() + _ = yym1446 if false { } else { h.encSliceFSType(([]FSType)(x.Volumes), e) @@ -17300,11 +17001,11 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[5] { - yym1474 := z.EncBinary() - _ = yym1474 + if yyq1431[5] { + yym1448 := z.EncBinary() + _ = yym1448 if false { } else { r.EncodeBool(bool(x.HostNetwork)) @@ -17313,26 +17014,26 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq1457[5] { + if yyq1431[5] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hostNetwork")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1475 := z.EncBinary() - _ = yym1475 + yym1449 := z.EncBinary() + _ = yym1449 if false { } else { r.EncodeBool(bool(x.HostNetwork)) } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[6] { + if yyq1431[6] { if x.HostPorts == nil { r.EncodeNil() } else { - yym1477 := z.EncBinary() - _ = yym1477 + yym1451 := z.EncBinary() + _ = yym1451 if false { } else { h.encSliceHostPortRange(([]HostPortRange)(x.HostPorts), e) @@ -17342,15 +17043,15 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1457[6] { + if yyq1431[6] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hostPorts")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.HostPorts == nil { r.EncodeNil() } else { - yym1478 := z.EncBinary() - _ = yym1478 + yym1452 := z.EncBinary() + _ = yym1452 if false { } else { h.encSliceHostPortRange(([]HostPortRange)(x.HostPorts), e) @@ -17358,11 +17059,11 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[7] { - yym1480 := z.EncBinary() - _ = yym1480 + if yyq1431[7] { + yym1454 := z.EncBinary() + _ = yym1454 if false { } else { r.EncodeBool(bool(x.HostPID)) @@ -17371,23 +17072,23 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq1457[7] { + if yyq1431[7] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hostPID")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1481 := z.EncBinary() - _ = yym1481 + yym1455 := z.EncBinary() + _ = yym1455 if false { } else { r.EncodeBool(bool(x.HostPID)) } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[8] { - yym1483 := z.EncBinary() - _ = yym1483 + if yyq1431[8] { + yym1457 := z.EncBinary() + _ = yym1457 if false { } else { r.EncodeBool(bool(x.HostIPC)) @@ -17396,67 +17097,67 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq1457[8] { + if yyq1431[8] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("hostIPC")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1484 := z.EncBinary() - _ = yym1484 + yym1458 := z.EncBinary() + _ = yym1458 if false { } else { r.EncodeBool(bool(x.HostIPC)) } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1486 := &x.SELinux - yy1486.CodecEncodeSelf(e) + yy1460 := &x.SELinux + yy1460.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("seLinux")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1487 := &x.SELinux - yy1487.CodecEncodeSelf(e) + yy1461 := &x.SELinux + yy1461.CodecEncodeSelf(e) } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1489 := &x.RunAsUser - yy1489.CodecEncodeSelf(e) + yy1463 := &x.RunAsUser + yy1463.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("runAsUser")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1490 := &x.RunAsUser - yy1490.CodecEncodeSelf(e) + yy1464 := &x.RunAsUser + yy1464.CodecEncodeSelf(e) } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1492 := &x.SupplementalGroups - yy1492.CodecEncodeSelf(e) + yy1466 := &x.SupplementalGroups + yy1466.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("supplementalGroups")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1493 := &x.SupplementalGroups - yy1493.CodecEncodeSelf(e) + yy1467 := &x.SupplementalGroups + yy1467.CodecEncodeSelf(e) } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1495 := &x.FSGroup - yy1495.CodecEncodeSelf(e) + yy1469 := &x.FSGroup + yy1469.CodecEncodeSelf(e) } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("fsGroup")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1496 := &x.FSGroup - yy1496.CodecEncodeSelf(e) + yy1470 := &x.FSGroup + yy1470.CodecEncodeSelf(e) } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1457[13] { - yym1498 := z.EncBinary() - _ = yym1498 + if yyq1431[13] { + yym1472 := z.EncBinary() + _ = yym1472 if false { } else { r.EncodeBool(bool(x.ReadOnlyRootFilesystem)) @@ -17465,19 +17166,19 @@ func (x *PodSecurityPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeBool(false) } } else { - if yyq1457[13] { + if yyq1431[13] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("readOnlyRootFilesystem")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1499 := z.EncBinary() - _ = yym1499 + yym1473 := z.EncBinary() + _ = yym1473 if false { } else { r.EncodeBool(bool(x.ReadOnlyRootFilesystem)) } } } - if yyr1457 || yy2arr1457 { + if yyr1431 || yy2arr1431 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -17490,25 +17191,25 @@ func (x *PodSecurityPolicySpec) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1500 := z.DecBinary() - _ = yym1500 + yym1474 := z.DecBinary() + _ = yym1474 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1501 := r.ContainerType() - if yyct1501 == codecSelferValueTypeMap1234 { - yyl1501 := r.ReadMapStart() - if yyl1501 == 0 { + yyct1475 := r.ContainerType() + if yyct1475 == codecSelferValueTypeMap1234 { + yyl1475 := r.ReadMapStart() + if yyl1475 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1501, d) + x.codecDecodeSelfFromMap(yyl1475, d) } - } else if yyct1501 == codecSelferValueTypeArray1234 { - yyl1501 := r.ReadArrayStart() - if yyl1501 == 0 { + } else if yyct1475 == codecSelferValueTypeArray1234 { + yyl1475 := r.ReadArrayStart() + if yyl1475 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1501, d) + x.codecDecodeSelfFromArray(yyl1475, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -17520,12 +17221,12 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1502Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1502Slc - var yyhl1502 bool = l >= 0 - for yyj1502 := 0; ; yyj1502++ { - if yyhl1502 { - if yyj1502 >= l { + var yys1476Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1476Slc + var yyhl1476 bool = l >= 0 + for yyj1476 := 0; ; yyj1476++ { + if yyhl1476 { + if yyj1476 >= l { break } } else { @@ -17534,10 +17235,10 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decod } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1502Slc = r.DecodeBytes(yys1502Slc, true, true) - yys1502 := string(yys1502Slc) + yys1476Slc = r.DecodeBytes(yys1476Slc, true, true) + yys1476 := string(yys1476Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1502 { + switch yys1476 { case "privileged": if r.TryDecodeAsNil() { x.Privileged = false @@ -17548,48 +17249,48 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.DefaultAddCapabilities = nil } else { - yyv1504 := &x.DefaultAddCapabilities - yym1505 := z.DecBinary() - _ = yym1505 + yyv1478 := &x.DefaultAddCapabilities + yym1479 := z.DecBinary() + _ = yym1479 if false { } else { - h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1504), d) + h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1478), d) } } case "requiredDropCapabilities": if r.TryDecodeAsNil() { x.RequiredDropCapabilities = nil } else { - yyv1506 := &x.RequiredDropCapabilities - yym1507 := z.DecBinary() - _ = yym1507 + yyv1480 := &x.RequiredDropCapabilities + yym1481 := z.DecBinary() + _ = yym1481 if false { } else { - h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1506), d) + h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1480), d) } } case "allowedCapabilities": if r.TryDecodeAsNil() { x.AllowedCapabilities = nil } else { - yyv1508 := &x.AllowedCapabilities - yym1509 := z.DecBinary() - _ = yym1509 + yyv1482 := &x.AllowedCapabilities + yym1483 := z.DecBinary() + _ = yym1483 if false { } else { - h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1508), d) + h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1482), d) } } case "volumes": if r.TryDecodeAsNil() { x.Volumes = nil } else { - yyv1510 := &x.Volumes - yym1511 := z.DecBinary() - _ = yym1511 + yyv1484 := &x.Volumes + yym1485 := z.DecBinary() + _ = yym1485 if false { } else { - h.decSliceFSType((*[]FSType)(yyv1510), d) + h.decSliceFSType((*[]FSType)(yyv1484), d) } } case "hostNetwork": @@ -17602,12 +17303,12 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.HostPorts = nil } else { - yyv1513 := &x.HostPorts - yym1514 := z.DecBinary() - _ = yym1514 + yyv1487 := &x.HostPorts + yym1488 := z.DecBinary() + _ = yym1488 if false { } else { - h.decSliceHostPortRange((*[]HostPortRange)(yyv1513), d) + h.decSliceHostPortRange((*[]HostPortRange)(yyv1487), d) } } case "hostPID": @@ -17626,29 +17327,29 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decod if r.TryDecodeAsNil() { x.SELinux = SELinuxStrategyOptions{} } else { - yyv1517 := &x.SELinux - yyv1517.CodecDecodeSelf(d) + yyv1491 := &x.SELinux + yyv1491.CodecDecodeSelf(d) } case "runAsUser": if r.TryDecodeAsNil() { x.RunAsUser = RunAsUserStrategyOptions{} } else { - yyv1518 := &x.RunAsUser - yyv1518.CodecDecodeSelf(d) + yyv1492 := &x.RunAsUser + yyv1492.CodecDecodeSelf(d) } case "supplementalGroups": if r.TryDecodeAsNil() { x.SupplementalGroups = SupplementalGroupsStrategyOptions{} } else { - yyv1519 := &x.SupplementalGroups - yyv1519.CodecDecodeSelf(d) + yyv1493 := &x.SupplementalGroups + yyv1493.CodecDecodeSelf(d) } case "fsGroup": if r.TryDecodeAsNil() { x.FSGroup = FSGroupStrategyOptions{} } else { - yyv1520 := &x.FSGroup - yyv1520.CodecDecodeSelf(d) + yyv1494 := &x.FSGroup + yyv1494.CodecDecodeSelf(d) } case "readOnlyRootFilesystem": if r.TryDecodeAsNil() { @@ -17657,9 +17358,9 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decod x.ReadOnlyRootFilesystem = bool(r.DecodeBool()) } default: - z.DecStructFieldNotFound(-1, yys1502) - } // end switch yys1502 - } // end for yyj1502 + z.DecStructFieldNotFound(-1, yys1476) + } // end switch yys1476 + } // end for yyj1476 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -17667,16 +17368,16 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1522 int - var yyb1522 bool - var yyhl1522 bool = l >= 0 - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + var yyj1496 int + var yyb1496 bool + var yyhl1496 bool = l >= 0 + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17686,13 +17387,13 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec } else { x.Privileged = bool(r.DecodeBool()) } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17700,21 +17401,21 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.DefaultAddCapabilities = nil } else { - yyv1524 := &x.DefaultAddCapabilities - yym1525 := z.DecBinary() - _ = yym1525 + yyv1498 := &x.DefaultAddCapabilities + yym1499 := z.DecBinary() + _ = yym1499 if false { } else { - h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1524), d) + h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1498), d) } } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17722,21 +17423,21 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.RequiredDropCapabilities = nil } else { - yyv1526 := &x.RequiredDropCapabilities - yym1527 := z.DecBinary() - _ = yym1527 + yyv1500 := &x.RequiredDropCapabilities + yym1501 := z.DecBinary() + _ = yym1501 if false { } else { - h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1526), d) + h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1500), d) } } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17744,21 +17445,21 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.AllowedCapabilities = nil } else { - yyv1528 := &x.AllowedCapabilities - yym1529 := z.DecBinary() - _ = yym1529 + yyv1502 := &x.AllowedCapabilities + yym1503 := z.DecBinary() + _ = yym1503 if false { } else { - h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1528), d) + h.decSlicev1_Capability((*[]pkg2_v1.Capability)(yyv1502), d) } } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17766,21 +17467,21 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.Volumes = nil } else { - yyv1530 := &x.Volumes - yym1531 := z.DecBinary() - _ = yym1531 + yyv1504 := &x.Volumes + yym1505 := z.DecBinary() + _ = yym1505 if false { } else { - h.decSliceFSType((*[]FSType)(yyv1530), d) + h.decSliceFSType((*[]FSType)(yyv1504), d) } } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17790,13 +17491,13 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec } else { x.HostNetwork = bool(r.DecodeBool()) } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17804,21 +17505,21 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.HostPorts = nil } else { - yyv1533 := &x.HostPorts - yym1534 := z.DecBinary() - _ = yym1534 + yyv1507 := &x.HostPorts + yym1508 := z.DecBinary() + _ = yym1508 if false { } else { - h.decSliceHostPortRange((*[]HostPortRange)(yyv1533), d) + h.decSliceHostPortRange((*[]HostPortRange)(yyv1507), d) } } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17828,13 +17529,13 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec } else { x.HostPID = bool(r.DecodeBool()) } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17844,13 +17545,13 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec } else { x.HostIPC = bool(r.DecodeBool()) } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17858,16 +17559,16 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.SELinux = SELinuxStrategyOptions{} } else { - yyv1537 := &x.SELinux - yyv1537.CodecDecodeSelf(d) + yyv1511 := &x.SELinux + yyv1511.CodecDecodeSelf(d) } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17875,16 +17576,16 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.RunAsUser = RunAsUserStrategyOptions{} } else { - yyv1538 := &x.RunAsUser - yyv1538.CodecDecodeSelf(d) + yyv1512 := &x.RunAsUser + yyv1512.CodecDecodeSelf(d) } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17892,16 +17593,16 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.SupplementalGroups = SupplementalGroupsStrategyOptions{} } else { - yyv1539 := &x.SupplementalGroups - yyv1539.CodecDecodeSelf(d) + yyv1513 := &x.SupplementalGroups + yyv1513.CodecDecodeSelf(d) } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17909,16 +17610,16 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.FSGroup = FSGroupStrategyOptions{} } else { - yyv1540 := &x.FSGroup - yyv1540.CodecDecodeSelf(d) + yyv1514 := &x.FSGroup + yyv1514.CodecDecodeSelf(d) } - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -17929,17 +17630,17 @@ func (x *PodSecurityPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Dec x.ReadOnlyRootFilesystem = bool(r.DecodeBool()) } for { - yyj1522++ - if yyhl1522 { - yyb1522 = yyj1522 > l + yyj1496++ + if yyhl1496 { + yyb1496 = yyj1496 > l } else { - yyb1522 = r.CheckBreak() + yyb1496 = r.CheckBreak() } - if yyb1522 { + if yyb1496 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1522-1, "") + z.DecStructFieldNotFound(yyj1496-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -17948,8 +17649,8 @@ func (x FSType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym1542 := z.EncBinary() - _ = yym1542 + yym1516 := z.EncBinary() + _ = yym1516 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -17961,8 +17662,8 @@ func (x *FSType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1543 := z.DecBinary() - _ = yym1543 + yym1517 := z.DecBinary() + _ = yym1517 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -17977,33 +17678,33 @@ func (x *HostPortRange) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1544 := z.EncBinary() - _ = yym1544 + yym1518 := z.EncBinary() + _ = yym1518 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1545 := !z.EncBinary() - yy2arr1545 := z.EncBasicHandle().StructToArray - var yyq1545 [2]bool - _, _, _ = yysep1545, yyq1545, yy2arr1545 - const yyr1545 bool = false - var yynn1545 int - if yyr1545 || yy2arr1545 { + yysep1519 := !z.EncBinary() + yy2arr1519 := z.EncBasicHandle().StructToArray + var yyq1519 [2]bool + _, _, _ = yysep1519, yyq1519, yy2arr1519 + const yyr1519 bool = false + var yynn1519 int + if yyr1519 || yy2arr1519 { r.EncodeArrayStart(2) } else { - yynn1545 = 2 - for _, b := range yyq1545 { + yynn1519 = 2 + for _, b := range yyq1519 { if b { - yynn1545++ + yynn1519++ } } - r.EncodeMapStart(yynn1545) - yynn1545 = 0 + r.EncodeMapStart(yynn1519) + yynn1519 = 0 } - if yyr1545 || yy2arr1545 { + if yyr1519 || yy2arr1519 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1547 := z.EncBinary() - _ = yym1547 + yym1521 := z.EncBinary() + _ = yym1521 if false { } else { r.EncodeInt(int64(x.Min)) @@ -18012,17 +17713,17 @@ func (x *HostPortRange) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("min")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1548 := z.EncBinary() - _ = yym1548 + yym1522 := z.EncBinary() + _ = yym1522 if false { } else { r.EncodeInt(int64(x.Min)) } } - if yyr1545 || yy2arr1545 { + if yyr1519 || yy2arr1519 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1550 := z.EncBinary() - _ = yym1550 + yym1524 := z.EncBinary() + _ = yym1524 if false { } else { r.EncodeInt(int64(x.Max)) @@ -18031,14 +17732,14 @@ func (x *HostPortRange) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("max")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1551 := z.EncBinary() - _ = yym1551 + yym1525 := z.EncBinary() + _ = yym1525 if false { } else { r.EncodeInt(int64(x.Max)) } } - if yyr1545 || yy2arr1545 { + if yyr1519 || yy2arr1519 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -18051,25 +17752,25 @@ func (x *HostPortRange) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1552 := z.DecBinary() - _ = yym1552 + yym1526 := z.DecBinary() + _ = yym1526 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1553 := r.ContainerType() - if yyct1553 == codecSelferValueTypeMap1234 { - yyl1553 := r.ReadMapStart() - if yyl1553 == 0 { + yyct1527 := r.ContainerType() + if yyct1527 == codecSelferValueTypeMap1234 { + yyl1527 := r.ReadMapStart() + if yyl1527 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1553, d) + x.codecDecodeSelfFromMap(yyl1527, d) } - } else if yyct1553 == codecSelferValueTypeArray1234 { - yyl1553 := r.ReadArrayStart() - if yyl1553 == 0 { + } else if yyct1527 == codecSelferValueTypeArray1234 { + yyl1527 := r.ReadArrayStart() + if yyl1527 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1553, d) + x.codecDecodeSelfFromArray(yyl1527, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -18081,12 +17782,12 @@ func (x *HostPortRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1554Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1554Slc - var yyhl1554 bool = l >= 0 - for yyj1554 := 0; ; yyj1554++ { - if yyhl1554 { - if yyj1554 >= l { + var yys1528Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1528Slc + var yyhl1528 bool = l >= 0 + for yyj1528 := 0; ; yyj1528++ { + if yyhl1528 { + if yyj1528 >= l { break } } else { @@ -18095,10 +17796,10 @@ func (x *HostPortRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1554Slc = r.DecodeBytes(yys1554Slc, true, true) - yys1554 := string(yys1554Slc) + yys1528Slc = r.DecodeBytes(yys1528Slc, true, true) + yys1528 := string(yys1528Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1554 { + switch yys1528 { case "min": if r.TryDecodeAsNil() { x.Min = 0 @@ -18112,9 +17813,9 @@ func (x *HostPortRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Max = int32(r.DecodeInt(32)) } default: - z.DecStructFieldNotFound(-1, yys1554) - } // end switch yys1554 - } // end for yyj1554 + z.DecStructFieldNotFound(-1, yys1528) + } // end switch yys1528 + } // end for yyj1528 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -18122,16 +17823,16 @@ func (x *HostPortRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1557 int - var yyb1557 bool - var yyhl1557 bool = l >= 0 - yyj1557++ - if yyhl1557 { - yyb1557 = yyj1557 > l + var yyj1531 int + var yyb1531 bool + var yyhl1531 bool = l >= 0 + yyj1531++ + if yyhl1531 { + yyb1531 = yyj1531 > l } else { - yyb1557 = r.CheckBreak() + yyb1531 = r.CheckBreak() } - if yyb1557 { + if yyb1531 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -18141,13 +17842,13 @@ func (x *HostPortRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Min = int32(r.DecodeInt(32)) } - yyj1557++ - if yyhl1557 { - yyb1557 = yyj1557 > l + yyj1531++ + if yyhl1531 { + yyb1531 = yyj1531 > l } else { - yyb1557 = r.CheckBreak() + yyb1531 = r.CheckBreak() } - if yyb1557 { + if yyb1531 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -18158,17 +17859,17 @@ func (x *HostPortRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Max = int32(r.DecodeInt(32)) } for { - yyj1557++ - if yyhl1557 { - yyb1557 = yyj1557 > l + yyj1531++ + if yyhl1531 { + yyb1531 = yyj1531 > l } else { - yyb1557 = r.CheckBreak() + yyb1531 = r.CheckBreak() } - if yyb1557 { + if yyb1531 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1557-1, "") + z.DecStructFieldNotFound(yyj1531-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -18180,31 +17881,31 @@ func (x *SELinuxStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1560 := z.EncBinary() - _ = yym1560 + yym1534 := z.EncBinary() + _ = yym1534 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1561 := !z.EncBinary() - yy2arr1561 := z.EncBasicHandle().StructToArray - var yyq1561 [2]bool - _, _, _ = yysep1561, yyq1561, yy2arr1561 - const yyr1561 bool = false - yyq1561[1] = x.SELinuxOptions != nil - var yynn1561 int - if yyr1561 || yy2arr1561 { + yysep1535 := !z.EncBinary() + yy2arr1535 := z.EncBasicHandle().StructToArray + var yyq1535 [2]bool + _, _, _ = yysep1535, yyq1535, yy2arr1535 + const yyr1535 bool = false + yyq1535[1] = x.SELinuxOptions != nil + var yynn1535 int + if yyr1535 || yy2arr1535 { r.EncodeArrayStart(2) } else { - yynn1561 = 1 - for _, b := range yyq1561 { + yynn1535 = 1 + for _, b := range yyq1535 { if b { - yynn1561++ + yynn1535++ } } - r.EncodeMapStart(yynn1561) - yynn1561 = 0 + r.EncodeMapStart(yynn1535) + yynn1535 = 0 } - if yyr1561 || yy2arr1561 { + if yyr1535 || yy2arr1535 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) x.Rule.CodecEncodeSelf(e) } else { @@ -18213,9 +17914,9 @@ func (x *SELinuxStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Rule.CodecEncodeSelf(e) } - if yyr1561 || yy2arr1561 { + if yyr1535 || yy2arr1535 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1561[1] { + if yyq1535[1] { if x.SELinuxOptions == nil { r.EncodeNil() } else { @@ -18225,7 +17926,7 @@ func (x *SELinuxStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1561[1] { + if yyq1535[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("seLinuxOptions")) z.EncSendContainerState(codecSelfer_containerMapValue1234) @@ -18236,7 +17937,7 @@ func (x *SELinuxStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1561 || yy2arr1561 { + if yyr1535 || yy2arr1535 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -18249,25 +17950,25 @@ func (x *SELinuxStrategyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1564 := z.DecBinary() - _ = yym1564 + yym1538 := z.DecBinary() + _ = yym1538 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1565 := r.ContainerType() - if yyct1565 == codecSelferValueTypeMap1234 { - yyl1565 := r.ReadMapStart() - if yyl1565 == 0 { + yyct1539 := r.ContainerType() + if yyct1539 == codecSelferValueTypeMap1234 { + yyl1539 := r.ReadMapStart() + if yyl1539 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1565, d) + x.codecDecodeSelfFromMap(yyl1539, d) } - } else if yyct1565 == codecSelferValueTypeArray1234 { - yyl1565 := r.ReadArrayStart() - if yyl1565 == 0 { + } else if yyct1539 == codecSelferValueTypeArray1234 { + yyl1539 := r.ReadArrayStart() + if yyl1539 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1565, d) + x.codecDecodeSelfFromArray(yyl1539, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -18279,12 +17980,12 @@ func (x *SELinuxStrategyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1566Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1566Slc - var yyhl1566 bool = l >= 0 - for yyj1566 := 0; ; yyj1566++ { - if yyhl1566 { - if yyj1566 >= l { + var yys1540Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1540Slc + var yyhl1540 bool = l >= 0 + for yyj1540 := 0; ; yyj1540++ { + if yyhl1540 { + if yyj1540 >= l { break } } else { @@ -18293,10 +17994,10 @@ func (x *SELinuxStrategyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Deco } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1566Slc = r.DecodeBytes(yys1566Slc, true, true) - yys1566 := string(yys1566Slc) + yys1540Slc = r.DecodeBytes(yys1540Slc, true, true) + yys1540 := string(yys1540Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1566 { + switch yys1540 { case "rule": if r.TryDecodeAsNil() { x.Rule = "" @@ -18315,9 +18016,9 @@ func (x *SELinuxStrategyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Deco x.SELinuxOptions.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys1566) - } // end switch yys1566 - } // end for yyj1566 + z.DecStructFieldNotFound(-1, yys1540) + } // end switch yys1540 + } // end for yyj1540 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -18325,16 +18026,16 @@ func (x *SELinuxStrategyOptions) codecDecodeSelfFromArray(l int, d *codec1978.De var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1569 int - var yyb1569 bool - var yyhl1569 bool = l >= 0 - yyj1569++ - if yyhl1569 { - yyb1569 = yyj1569 > l + var yyj1543 int + var yyb1543 bool + var yyhl1543 bool = l >= 0 + yyj1543++ + if yyhl1543 { + yyb1543 = yyj1543 > l } else { - yyb1569 = r.CheckBreak() + yyb1543 = r.CheckBreak() } - if yyb1569 { + if yyb1543 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -18344,13 +18045,13 @@ func (x *SELinuxStrategyOptions) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Rule = SELinuxStrategy(r.DecodeString()) } - yyj1569++ - if yyhl1569 { - yyb1569 = yyj1569 > l + yyj1543++ + if yyhl1543 { + yyb1543 = yyj1543 > l } else { - yyb1569 = r.CheckBreak() + yyb1543 = r.CheckBreak() } - if yyb1569 { + if yyb1543 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -18366,17 +18067,17 @@ func (x *SELinuxStrategyOptions) codecDecodeSelfFromArray(l int, d *codec1978.De x.SELinuxOptions.CodecDecodeSelf(d) } for { - yyj1569++ - if yyhl1569 { - yyb1569 = yyj1569 > l + yyj1543++ + if yyhl1543 { + yyb1543 = yyj1543 > l } else { - yyb1569 = r.CheckBreak() + yyb1543 = r.CheckBreak() } - if yyb1569 { + if yyb1543 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1569-1, "") + z.DecStructFieldNotFound(yyj1543-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -18385,8 +18086,8 @@ func (x SELinuxStrategy) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym1572 := z.EncBinary() - _ = yym1572 + yym1546 := z.EncBinary() + _ = yym1546 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -18398,8 +18099,8 @@ func (x *SELinuxStrategy) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1573 := z.DecBinary() - _ = yym1573 + yym1547 := z.DecBinary() + _ = yym1547 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -18414,31 +18115,31 @@ func (x *RunAsUserStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1574 := z.EncBinary() - _ = yym1574 + yym1548 := z.EncBinary() + _ = yym1548 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1575 := !z.EncBinary() - yy2arr1575 := z.EncBasicHandle().StructToArray - var yyq1575 [2]bool - _, _, _ = yysep1575, yyq1575, yy2arr1575 - const yyr1575 bool = false - yyq1575[1] = len(x.Ranges) != 0 - var yynn1575 int - if yyr1575 || yy2arr1575 { + yysep1549 := !z.EncBinary() + yy2arr1549 := z.EncBasicHandle().StructToArray + var yyq1549 [2]bool + _, _, _ = yysep1549, yyq1549, yy2arr1549 + const yyr1549 bool = false + yyq1549[1] = len(x.Ranges) != 0 + var yynn1549 int + if yyr1549 || yy2arr1549 { r.EncodeArrayStart(2) } else { - yynn1575 = 1 - for _, b := range yyq1575 { + yynn1549 = 1 + for _, b := range yyq1549 { if b { - yynn1575++ + yynn1549++ } } - r.EncodeMapStart(yynn1575) - yynn1575 = 0 + r.EncodeMapStart(yynn1549) + yynn1549 = 0 } - if yyr1575 || yy2arr1575 { + if yyr1549 || yy2arr1549 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) x.Rule.CodecEncodeSelf(e) } else { @@ -18447,14 +18148,14 @@ func (x *RunAsUserStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Rule.CodecEncodeSelf(e) } - if yyr1575 || yy2arr1575 { + if yyr1549 || yy2arr1549 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1575[1] { + if yyq1549[1] { if x.Ranges == nil { r.EncodeNil() } else { - yym1578 := z.EncBinary() - _ = yym1578 + yym1552 := z.EncBinary() + _ = yym1552 if false { } else { h.encSliceIDRange(([]IDRange)(x.Ranges), e) @@ -18464,15 +18165,15 @@ func (x *RunAsUserStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1575[1] { + if yyq1549[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("ranges")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Ranges == nil { r.EncodeNil() } else { - yym1579 := z.EncBinary() - _ = yym1579 + yym1553 := z.EncBinary() + _ = yym1553 if false { } else { h.encSliceIDRange(([]IDRange)(x.Ranges), e) @@ -18480,7 +18181,7 @@ func (x *RunAsUserStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1575 || yy2arr1575 { + if yyr1549 || yy2arr1549 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -18493,25 +18194,25 @@ func (x *RunAsUserStrategyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1580 := z.DecBinary() - _ = yym1580 + yym1554 := z.DecBinary() + _ = yym1554 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1581 := r.ContainerType() - if yyct1581 == codecSelferValueTypeMap1234 { - yyl1581 := r.ReadMapStart() - if yyl1581 == 0 { + yyct1555 := r.ContainerType() + if yyct1555 == codecSelferValueTypeMap1234 { + yyl1555 := r.ReadMapStart() + if yyl1555 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1581, d) + x.codecDecodeSelfFromMap(yyl1555, d) } - } else if yyct1581 == codecSelferValueTypeArray1234 { - yyl1581 := r.ReadArrayStart() - if yyl1581 == 0 { + } else if yyct1555 == codecSelferValueTypeArray1234 { + yyl1555 := r.ReadArrayStart() + if yyl1555 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1581, d) + x.codecDecodeSelfFromArray(yyl1555, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -18523,12 +18224,12 @@ func (x *RunAsUserStrategyOptions) codecDecodeSelfFromMap(l int, d *codec1978.De var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1582Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1582Slc - var yyhl1582 bool = l >= 0 - for yyj1582 := 0; ; yyj1582++ { - if yyhl1582 { - if yyj1582 >= l { + var yys1556Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1556Slc + var yyhl1556 bool = l >= 0 + for yyj1556 := 0; ; yyj1556++ { + if yyhl1556 { + if yyj1556 >= l { break } } else { @@ -18537,10 +18238,10 @@ func (x *RunAsUserStrategyOptions) codecDecodeSelfFromMap(l int, d *codec1978.De } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1582Slc = r.DecodeBytes(yys1582Slc, true, true) - yys1582 := string(yys1582Slc) + yys1556Slc = r.DecodeBytes(yys1556Slc, true, true) + yys1556 := string(yys1556Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1582 { + switch yys1556 { case "rule": if r.TryDecodeAsNil() { x.Rule = "" @@ -18551,18 +18252,18 @@ func (x *RunAsUserStrategyOptions) codecDecodeSelfFromMap(l int, d *codec1978.De if r.TryDecodeAsNil() { x.Ranges = nil } else { - yyv1584 := &x.Ranges - yym1585 := z.DecBinary() - _ = yym1585 + yyv1558 := &x.Ranges + yym1559 := z.DecBinary() + _ = yym1559 if false { } else { - h.decSliceIDRange((*[]IDRange)(yyv1584), d) + h.decSliceIDRange((*[]IDRange)(yyv1558), d) } } default: - z.DecStructFieldNotFound(-1, yys1582) - } // end switch yys1582 - } // end for yyj1582 + z.DecStructFieldNotFound(-1, yys1556) + } // end switch yys1556 + } // end for yyj1556 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -18570,16 +18271,16 @@ func (x *RunAsUserStrategyOptions) codecDecodeSelfFromArray(l int, d *codec1978. var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1586 int - var yyb1586 bool - var yyhl1586 bool = l >= 0 - yyj1586++ - if yyhl1586 { - yyb1586 = yyj1586 > l + var yyj1560 int + var yyb1560 bool + var yyhl1560 bool = l >= 0 + yyj1560++ + if yyhl1560 { + yyb1560 = yyj1560 > l } else { - yyb1586 = r.CheckBreak() + yyb1560 = r.CheckBreak() } - if yyb1586 { + if yyb1560 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -18589,13 +18290,13 @@ func (x *RunAsUserStrategyOptions) codecDecodeSelfFromArray(l int, d *codec1978. } else { x.Rule = RunAsUserStrategy(r.DecodeString()) } - yyj1586++ - if yyhl1586 { - yyb1586 = yyj1586 > l + yyj1560++ + if yyhl1560 { + yyb1560 = yyj1560 > l } else { - yyb1586 = r.CheckBreak() + yyb1560 = r.CheckBreak() } - if yyb1586 { + if yyb1560 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -18603,26 +18304,26 @@ func (x *RunAsUserStrategyOptions) codecDecodeSelfFromArray(l int, d *codec1978. if r.TryDecodeAsNil() { x.Ranges = nil } else { - yyv1588 := &x.Ranges - yym1589 := z.DecBinary() - _ = yym1589 + yyv1562 := &x.Ranges + yym1563 := z.DecBinary() + _ = yym1563 if false { } else { - h.decSliceIDRange((*[]IDRange)(yyv1588), d) + h.decSliceIDRange((*[]IDRange)(yyv1562), d) } } for { - yyj1586++ - if yyhl1586 { - yyb1586 = yyj1586 > l + yyj1560++ + if yyhl1560 { + yyb1560 = yyj1560 > l } else { - yyb1586 = r.CheckBreak() + yyb1560 = r.CheckBreak() } - if yyb1586 { + if yyb1560 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1586-1, "") + z.DecStructFieldNotFound(yyj1560-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -18634,33 +18335,33 @@ func (x *IDRange) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1590 := z.EncBinary() - _ = yym1590 + yym1564 := z.EncBinary() + _ = yym1564 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1591 := !z.EncBinary() - yy2arr1591 := z.EncBasicHandle().StructToArray - var yyq1591 [2]bool - _, _, _ = yysep1591, yyq1591, yy2arr1591 - const yyr1591 bool = false - var yynn1591 int - if yyr1591 || yy2arr1591 { + yysep1565 := !z.EncBinary() + yy2arr1565 := z.EncBasicHandle().StructToArray + var yyq1565 [2]bool + _, _, _ = yysep1565, yyq1565, yy2arr1565 + const yyr1565 bool = false + var yynn1565 int + if yyr1565 || yy2arr1565 { r.EncodeArrayStart(2) } else { - yynn1591 = 2 - for _, b := range yyq1591 { + yynn1565 = 2 + for _, b := range yyq1565 { if b { - yynn1591++ + yynn1565++ } } - r.EncodeMapStart(yynn1591) - yynn1591 = 0 + r.EncodeMapStart(yynn1565) + yynn1565 = 0 } - if yyr1591 || yy2arr1591 { + if yyr1565 || yy2arr1565 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1593 := z.EncBinary() - _ = yym1593 + yym1567 := z.EncBinary() + _ = yym1567 if false { } else { r.EncodeInt(int64(x.Min)) @@ -18669,17 +18370,17 @@ func (x *IDRange) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("min")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1594 := z.EncBinary() - _ = yym1594 + yym1568 := z.EncBinary() + _ = yym1568 if false { } else { r.EncodeInt(int64(x.Min)) } } - if yyr1591 || yy2arr1591 { + if yyr1565 || yy2arr1565 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1596 := z.EncBinary() - _ = yym1596 + yym1570 := z.EncBinary() + _ = yym1570 if false { } else { r.EncodeInt(int64(x.Max)) @@ -18688,14 +18389,14 @@ func (x *IDRange) CodecEncodeSelf(e *codec1978.Encoder) { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("max")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1597 := z.EncBinary() - _ = yym1597 + yym1571 := z.EncBinary() + _ = yym1571 if false { } else { r.EncodeInt(int64(x.Max)) } } - if yyr1591 || yy2arr1591 { + if yyr1565 || yy2arr1565 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -18708,25 +18409,25 @@ func (x *IDRange) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1598 := z.DecBinary() - _ = yym1598 + yym1572 := z.DecBinary() + _ = yym1572 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1599 := r.ContainerType() - if yyct1599 == codecSelferValueTypeMap1234 { - yyl1599 := r.ReadMapStart() - if yyl1599 == 0 { + yyct1573 := r.ContainerType() + if yyct1573 == codecSelferValueTypeMap1234 { + yyl1573 := r.ReadMapStart() + if yyl1573 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1599, d) + x.codecDecodeSelfFromMap(yyl1573, d) } - } else if yyct1599 == codecSelferValueTypeArray1234 { - yyl1599 := r.ReadArrayStart() - if yyl1599 == 0 { + } else if yyct1573 == codecSelferValueTypeArray1234 { + yyl1573 := r.ReadArrayStart() + if yyl1573 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1599, d) + x.codecDecodeSelfFromArray(yyl1573, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -18738,12 +18439,12 @@ func (x *IDRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1600Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1600Slc - var yyhl1600 bool = l >= 0 - for yyj1600 := 0; ; yyj1600++ { - if yyhl1600 { - if yyj1600 >= l { + var yys1574Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1574Slc + var yyhl1574 bool = l >= 0 + for yyj1574 := 0; ; yyj1574++ { + if yyhl1574 { + if yyj1574 >= l { break } } else { @@ -18752,10 +18453,10 @@ func (x *IDRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1600Slc = r.DecodeBytes(yys1600Slc, true, true) - yys1600 := string(yys1600Slc) + yys1574Slc = r.DecodeBytes(yys1574Slc, true, true) + yys1574 := string(yys1574Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1600 { + switch yys1574 { case "min": if r.TryDecodeAsNil() { x.Min = 0 @@ -18769,9 +18470,9 @@ func (x *IDRange) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { x.Max = int64(r.DecodeInt(64)) } default: - z.DecStructFieldNotFound(-1, yys1600) - } // end switch yys1600 - } // end for yyj1600 + z.DecStructFieldNotFound(-1, yys1574) + } // end switch yys1574 + } // end for yyj1574 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -18779,16 +18480,16 @@ func (x *IDRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1603 int - var yyb1603 bool - var yyhl1603 bool = l >= 0 - yyj1603++ - if yyhl1603 { - yyb1603 = yyj1603 > l + var yyj1577 int + var yyb1577 bool + var yyhl1577 bool = l >= 0 + yyj1577++ + if yyhl1577 { + yyb1577 = yyj1577 > l } else { - yyb1603 = r.CheckBreak() + yyb1577 = r.CheckBreak() } - if yyb1603 { + if yyb1577 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -18798,13 +18499,13 @@ func (x *IDRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Min = int64(r.DecodeInt(64)) } - yyj1603++ - if yyhl1603 { - yyb1603 = yyj1603 > l + yyj1577++ + if yyhl1577 { + yyb1577 = yyj1577 > l } else { - yyb1603 = r.CheckBreak() + yyb1577 = r.CheckBreak() } - if yyb1603 { + if yyb1577 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -18815,17 +18516,17 @@ func (x *IDRange) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { x.Max = int64(r.DecodeInt(64)) } for { - yyj1603++ - if yyhl1603 { - yyb1603 = yyj1603 > l + yyj1577++ + if yyhl1577 { + yyb1577 = yyj1577 > l } else { - yyb1603 = r.CheckBreak() + yyb1577 = r.CheckBreak() } - if yyb1603 { + if yyb1577 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1603-1, "") + z.DecStructFieldNotFound(yyj1577-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -18834,8 +18535,8 @@ func (x RunAsUserStrategy) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym1606 := z.EncBinary() - _ = yym1606 + yym1580 := z.EncBinary() + _ = yym1580 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -18847,8 +18548,8 @@ func (x *RunAsUserStrategy) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1607 := z.DecBinary() - _ = yym1607 + yym1581 := z.DecBinary() + _ = yym1581 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -18863,54 +18564,54 @@ func (x *FSGroupStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1608 := z.EncBinary() - _ = yym1608 + yym1582 := z.EncBinary() + _ = yym1582 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1609 := !z.EncBinary() - yy2arr1609 := z.EncBasicHandle().StructToArray - var yyq1609 [2]bool - _, _, _ = yysep1609, yyq1609, yy2arr1609 - const yyr1609 bool = false - yyq1609[0] = x.Rule != "" - yyq1609[1] = len(x.Ranges) != 0 - var yynn1609 int - if yyr1609 || yy2arr1609 { + yysep1583 := !z.EncBinary() + yy2arr1583 := z.EncBasicHandle().StructToArray + var yyq1583 [2]bool + _, _, _ = yysep1583, yyq1583, yy2arr1583 + const yyr1583 bool = false + yyq1583[0] = x.Rule != "" + yyq1583[1] = len(x.Ranges) != 0 + var yynn1583 int + if yyr1583 || yy2arr1583 { r.EncodeArrayStart(2) } else { - yynn1609 = 0 - for _, b := range yyq1609 { + yynn1583 = 0 + for _, b := range yyq1583 { if b { - yynn1609++ + yynn1583++ } } - r.EncodeMapStart(yynn1609) - yynn1609 = 0 + r.EncodeMapStart(yynn1583) + yynn1583 = 0 } - if yyr1609 || yy2arr1609 { + if yyr1583 || yy2arr1583 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1609[0] { + if yyq1583[0] { x.Rule.CodecEncodeSelf(e) } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1609[0] { + if yyq1583[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rule")) z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Rule.CodecEncodeSelf(e) } } - if yyr1609 || yy2arr1609 { + if yyr1583 || yy2arr1583 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1609[1] { + if yyq1583[1] { if x.Ranges == nil { r.EncodeNil() } else { - yym1612 := z.EncBinary() - _ = yym1612 + yym1586 := z.EncBinary() + _ = yym1586 if false { } else { h.encSliceIDRange(([]IDRange)(x.Ranges), e) @@ -18920,15 +18621,15 @@ func (x *FSGroupStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1609[1] { + if yyq1583[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("ranges")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Ranges == nil { r.EncodeNil() } else { - yym1613 := z.EncBinary() - _ = yym1613 + yym1587 := z.EncBinary() + _ = yym1587 if false { } else { h.encSliceIDRange(([]IDRange)(x.Ranges), e) @@ -18936,7 +18637,7 @@ func (x *FSGroupStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1609 || yy2arr1609 { + if yyr1583 || yy2arr1583 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -18949,25 +18650,25 @@ func (x *FSGroupStrategyOptions) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1614 := z.DecBinary() - _ = yym1614 + yym1588 := z.DecBinary() + _ = yym1588 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1615 := r.ContainerType() - if yyct1615 == codecSelferValueTypeMap1234 { - yyl1615 := r.ReadMapStart() - if yyl1615 == 0 { + yyct1589 := r.ContainerType() + if yyct1589 == codecSelferValueTypeMap1234 { + yyl1589 := r.ReadMapStart() + if yyl1589 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1615, d) + x.codecDecodeSelfFromMap(yyl1589, d) } - } else if yyct1615 == codecSelferValueTypeArray1234 { - yyl1615 := r.ReadArrayStart() - if yyl1615 == 0 { + } else if yyct1589 == codecSelferValueTypeArray1234 { + yyl1589 := r.ReadArrayStart() + if yyl1589 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1615, d) + x.codecDecodeSelfFromArray(yyl1589, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -18979,12 +18680,12 @@ func (x *FSGroupStrategyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Deco var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1616Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1616Slc - var yyhl1616 bool = l >= 0 - for yyj1616 := 0; ; yyj1616++ { - if yyhl1616 { - if yyj1616 >= l { + var yys1590Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1590Slc + var yyhl1590 bool = l >= 0 + for yyj1590 := 0; ; yyj1590++ { + if yyhl1590 { + if yyj1590 >= l { break } } else { @@ -18993,10 +18694,10 @@ func (x *FSGroupStrategyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Deco } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1616Slc = r.DecodeBytes(yys1616Slc, true, true) - yys1616 := string(yys1616Slc) + yys1590Slc = r.DecodeBytes(yys1590Slc, true, true) + yys1590 := string(yys1590Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1616 { + switch yys1590 { case "rule": if r.TryDecodeAsNil() { x.Rule = "" @@ -19007,18 +18708,18 @@ func (x *FSGroupStrategyOptions) codecDecodeSelfFromMap(l int, d *codec1978.Deco if r.TryDecodeAsNil() { x.Ranges = nil } else { - yyv1618 := &x.Ranges - yym1619 := z.DecBinary() - _ = yym1619 + yyv1592 := &x.Ranges + yym1593 := z.DecBinary() + _ = yym1593 if false { } else { - h.decSliceIDRange((*[]IDRange)(yyv1618), d) + h.decSliceIDRange((*[]IDRange)(yyv1592), d) } } default: - z.DecStructFieldNotFound(-1, yys1616) - } // end switch yys1616 - } // end for yyj1616 + z.DecStructFieldNotFound(-1, yys1590) + } // end switch yys1590 + } // end for yyj1590 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -19026,16 +18727,16 @@ func (x *FSGroupStrategyOptions) codecDecodeSelfFromArray(l int, d *codec1978.De var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1620 int - var yyb1620 bool - var yyhl1620 bool = l >= 0 - yyj1620++ - if yyhl1620 { - yyb1620 = yyj1620 > l + var yyj1594 int + var yyb1594 bool + var yyhl1594 bool = l >= 0 + yyj1594++ + if yyhl1594 { + yyb1594 = yyj1594 > l } else { - yyb1620 = r.CheckBreak() + yyb1594 = r.CheckBreak() } - if yyb1620 { + if yyb1594 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19045,13 +18746,13 @@ func (x *FSGroupStrategyOptions) codecDecodeSelfFromArray(l int, d *codec1978.De } else { x.Rule = FSGroupStrategyType(r.DecodeString()) } - yyj1620++ - if yyhl1620 { - yyb1620 = yyj1620 > l + yyj1594++ + if yyhl1594 { + yyb1594 = yyj1594 > l } else { - yyb1620 = r.CheckBreak() + yyb1594 = r.CheckBreak() } - if yyb1620 { + if yyb1594 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19059,26 +18760,26 @@ func (x *FSGroupStrategyOptions) codecDecodeSelfFromArray(l int, d *codec1978.De if r.TryDecodeAsNil() { x.Ranges = nil } else { - yyv1622 := &x.Ranges - yym1623 := z.DecBinary() - _ = yym1623 + yyv1596 := &x.Ranges + yym1597 := z.DecBinary() + _ = yym1597 if false { } else { - h.decSliceIDRange((*[]IDRange)(yyv1622), d) + h.decSliceIDRange((*[]IDRange)(yyv1596), d) } } for { - yyj1620++ - if yyhl1620 { - yyb1620 = yyj1620 > l + yyj1594++ + if yyhl1594 { + yyb1594 = yyj1594 > l } else { - yyb1620 = r.CheckBreak() + yyb1594 = r.CheckBreak() } - if yyb1620 { + if yyb1594 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1620-1, "") + z.DecStructFieldNotFound(yyj1594-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -19087,8 +18788,8 @@ func (x FSGroupStrategyType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym1624 := z.EncBinary() - _ = yym1624 + yym1598 := z.EncBinary() + _ = yym1598 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -19100,8 +18801,8 @@ func (x *FSGroupStrategyType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1625 := z.DecBinary() - _ = yym1625 + yym1599 := z.DecBinary() + _ = yym1599 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -19116,54 +18817,54 @@ func (x *SupplementalGroupsStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder if x == nil { r.EncodeNil() } else { - yym1626 := z.EncBinary() - _ = yym1626 + yym1600 := z.EncBinary() + _ = yym1600 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1627 := !z.EncBinary() - yy2arr1627 := z.EncBasicHandle().StructToArray - var yyq1627 [2]bool - _, _, _ = yysep1627, yyq1627, yy2arr1627 - const yyr1627 bool = false - yyq1627[0] = x.Rule != "" - yyq1627[1] = len(x.Ranges) != 0 - var yynn1627 int - if yyr1627 || yy2arr1627 { + yysep1601 := !z.EncBinary() + yy2arr1601 := z.EncBasicHandle().StructToArray + var yyq1601 [2]bool + _, _, _ = yysep1601, yyq1601, yy2arr1601 + const yyr1601 bool = false + yyq1601[0] = x.Rule != "" + yyq1601[1] = len(x.Ranges) != 0 + var yynn1601 int + if yyr1601 || yy2arr1601 { r.EncodeArrayStart(2) } else { - yynn1627 = 0 - for _, b := range yyq1627 { + yynn1601 = 0 + for _, b := range yyq1601 { if b { - yynn1627++ + yynn1601++ } } - r.EncodeMapStart(yynn1627) - yynn1627 = 0 + r.EncodeMapStart(yynn1601) + yynn1601 = 0 } - if yyr1627 || yy2arr1627 { + if yyr1601 || yy2arr1601 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1627[0] { + if yyq1601[0] { x.Rule.CodecEncodeSelf(e) } else { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1627[0] { + if yyq1601[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("rule")) z.EncSendContainerState(codecSelfer_containerMapValue1234) x.Rule.CodecEncodeSelf(e) } } - if yyr1627 || yy2arr1627 { + if yyr1601 || yy2arr1601 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1627[1] { + if yyq1601[1] { if x.Ranges == nil { r.EncodeNil() } else { - yym1630 := z.EncBinary() - _ = yym1630 + yym1604 := z.EncBinary() + _ = yym1604 if false { } else { h.encSliceIDRange(([]IDRange)(x.Ranges), e) @@ -19173,15 +18874,15 @@ func (x *SupplementalGroupsStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder r.EncodeNil() } } else { - if yyq1627[1] { + if yyq1601[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("ranges")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Ranges == nil { r.EncodeNil() } else { - yym1631 := z.EncBinary() - _ = yym1631 + yym1605 := z.EncBinary() + _ = yym1605 if false { } else { h.encSliceIDRange(([]IDRange)(x.Ranges), e) @@ -19189,7 +18890,7 @@ func (x *SupplementalGroupsStrategyOptions) CodecEncodeSelf(e *codec1978.Encoder } } } - if yyr1627 || yy2arr1627 { + if yyr1601 || yy2arr1601 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -19202,25 +18903,25 @@ func (x *SupplementalGroupsStrategyOptions) CodecDecodeSelf(d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1632 := z.DecBinary() - _ = yym1632 + yym1606 := z.DecBinary() + _ = yym1606 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1633 := r.ContainerType() - if yyct1633 == codecSelferValueTypeMap1234 { - yyl1633 := r.ReadMapStart() - if yyl1633 == 0 { + yyct1607 := r.ContainerType() + if yyct1607 == codecSelferValueTypeMap1234 { + yyl1607 := r.ReadMapStart() + if yyl1607 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1633, d) + x.codecDecodeSelfFromMap(yyl1607, d) } - } else if yyct1633 == codecSelferValueTypeArray1234 { - yyl1633 := r.ReadArrayStart() - if yyl1633 == 0 { + } else if yyct1607 == codecSelferValueTypeArray1234 { + yyl1607 := r.ReadArrayStart() + if yyl1607 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1633, d) + x.codecDecodeSelfFromArray(yyl1607, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -19232,12 +18933,12 @@ func (x *SupplementalGroupsStrategyOptions) codecDecodeSelfFromMap(l int, d *cod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1634Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1634Slc - var yyhl1634 bool = l >= 0 - for yyj1634 := 0; ; yyj1634++ { - if yyhl1634 { - if yyj1634 >= l { + var yys1608Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1608Slc + var yyhl1608 bool = l >= 0 + for yyj1608 := 0; ; yyj1608++ { + if yyhl1608 { + if yyj1608 >= l { break } } else { @@ -19246,10 +18947,10 @@ func (x *SupplementalGroupsStrategyOptions) codecDecodeSelfFromMap(l int, d *cod } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1634Slc = r.DecodeBytes(yys1634Slc, true, true) - yys1634 := string(yys1634Slc) + yys1608Slc = r.DecodeBytes(yys1608Slc, true, true) + yys1608 := string(yys1608Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1634 { + switch yys1608 { case "rule": if r.TryDecodeAsNil() { x.Rule = "" @@ -19260,18 +18961,18 @@ func (x *SupplementalGroupsStrategyOptions) codecDecodeSelfFromMap(l int, d *cod if r.TryDecodeAsNil() { x.Ranges = nil } else { - yyv1636 := &x.Ranges - yym1637 := z.DecBinary() - _ = yym1637 + yyv1610 := &x.Ranges + yym1611 := z.DecBinary() + _ = yym1611 if false { } else { - h.decSliceIDRange((*[]IDRange)(yyv1636), d) + h.decSliceIDRange((*[]IDRange)(yyv1610), d) } } default: - z.DecStructFieldNotFound(-1, yys1634) - } // end switch yys1634 - } // end for yyj1634 + z.DecStructFieldNotFound(-1, yys1608) + } // end switch yys1608 + } // end for yyj1608 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -19279,16 +18980,16 @@ func (x *SupplementalGroupsStrategyOptions) codecDecodeSelfFromArray(l int, d *c var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1638 int - var yyb1638 bool - var yyhl1638 bool = l >= 0 - yyj1638++ - if yyhl1638 { - yyb1638 = yyj1638 > l + var yyj1612 int + var yyb1612 bool + var yyhl1612 bool = l >= 0 + yyj1612++ + if yyhl1612 { + yyb1612 = yyj1612 > l } else { - yyb1638 = r.CheckBreak() + yyb1612 = r.CheckBreak() } - if yyb1638 { + if yyb1612 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19298,13 +18999,13 @@ func (x *SupplementalGroupsStrategyOptions) codecDecodeSelfFromArray(l int, d *c } else { x.Rule = SupplementalGroupsStrategyType(r.DecodeString()) } - yyj1638++ - if yyhl1638 { - yyb1638 = yyj1638 > l + yyj1612++ + if yyhl1612 { + yyb1612 = yyj1612 > l } else { - yyb1638 = r.CheckBreak() + yyb1612 = r.CheckBreak() } - if yyb1638 { + if yyb1612 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19312,26 +19013,26 @@ func (x *SupplementalGroupsStrategyOptions) codecDecodeSelfFromArray(l int, d *c if r.TryDecodeAsNil() { x.Ranges = nil } else { - yyv1640 := &x.Ranges - yym1641 := z.DecBinary() - _ = yym1641 + yyv1614 := &x.Ranges + yym1615 := z.DecBinary() + _ = yym1615 if false { } else { - h.decSliceIDRange((*[]IDRange)(yyv1640), d) + h.decSliceIDRange((*[]IDRange)(yyv1614), d) } } for { - yyj1638++ - if yyhl1638 { - yyb1638 = yyj1638 > l + yyj1612++ + if yyhl1612 { + yyb1612 = yyj1612 > l } else { - yyb1638 = r.CheckBreak() + yyb1612 = r.CheckBreak() } - if yyb1638 { + if yyb1612 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1638-1, "") + z.DecStructFieldNotFound(yyj1612-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -19340,8 +19041,8 @@ func (x SupplementalGroupsStrategyType) CodecEncodeSelf(e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r - yym1642 := z.EncBinary() - _ = yym1642 + yym1616 := z.EncBinary() + _ = yym1616 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { @@ -19353,8 +19054,8 @@ func (x *SupplementalGroupsStrategyType) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1643 := z.DecBinary() - _ = yym1643 + yym1617 := z.DecBinary() + _ = yym1617 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { @@ -19369,37 +19070,37 @@ func (x *PodSecurityPolicyList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1644 := z.EncBinary() - _ = yym1644 + yym1618 := z.EncBinary() + _ = yym1618 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1645 := !z.EncBinary() - yy2arr1645 := z.EncBasicHandle().StructToArray - var yyq1645 [4]bool - _, _, _ = yysep1645, yyq1645, yy2arr1645 - const yyr1645 bool = false - yyq1645[0] = x.Kind != "" - yyq1645[1] = x.APIVersion != "" - yyq1645[2] = true - var yynn1645 int - if yyr1645 || yy2arr1645 { + yysep1619 := !z.EncBinary() + yy2arr1619 := z.EncBasicHandle().StructToArray + var yyq1619 [4]bool + _, _, _ = yysep1619, yyq1619, yy2arr1619 + const yyr1619 bool = false + yyq1619[0] = x.Kind != "" + yyq1619[1] = x.APIVersion != "" + yyq1619[2] = true + var yynn1619 int + if yyr1619 || yy2arr1619 { r.EncodeArrayStart(4) } else { - yynn1645 = 1 - for _, b := range yyq1645 { + yynn1619 = 1 + for _, b := range yyq1619 { if b { - yynn1645++ + yynn1619++ } } - r.EncodeMapStart(yynn1645) - yynn1645 = 0 + r.EncodeMapStart(yynn1619) + yynn1619 = 0 } - if yyr1645 || yy2arr1645 { + if yyr1619 || yy2arr1619 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1645[0] { - yym1647 := z.EncBinary() - _ = yym1647 + if yyq1619[0] { + yym1621 := z.EncBinary() + _ = yym1621 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -19408,23 +19109,23 @@ func (x *PodSecurityPolicyList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1645[0] { + if yyq1619[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1648 := z.EncBinary() - _ = yym1648 + yym1622 := z.EncBinary() + _ = yym1622 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr1645 || yy2arr1645 { + if yyr1619 || yy2arr1619 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1645[1] { - yym1650 := z.EncBinary() - _ = yym1650 + if yyq1619[1] { + yym1624 := z.EncBinary() + _ = yym1624 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -19433,54 +19134,54 @@ func (x *PodSecurityPolicyList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1645[1] { + if yyq1619[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1651 := z.EncBinary() - _ = yym1651 + yym1625 := z.EncBinary() + _ = yym1625 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr1645 || yy2arr1645 { + if yyr1619 || yy2arr1619 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1645[2] { - yy1653 := &x.ListMeta - yym1654 := z.EncBinary() - _ = yym1654 + if yyq1619[2] { + yy1627 := &x.ListMeta + yym1628 := z.EncBinary() + _ = yym1628 if false { - } else if z.HasExtensions() && z.EncExt(yy1653) { + } else if z.HasExtensions() && z.EncExt(yy1627) { } else { - z.EncFallback(yy1653) + z.EncFallback(yy1627) } } else { r.EncodeNil() } } else { - if yyq1645[2] { + if yyq1619[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1655 := &x.ListMeta - yym1656 := z.EncBinary() - _ = yym1656 + yy1629 := &x.ListMeta + yym1630 := z.EncBinary() + _ = yym1630 if false { - } else if z.HasExtensions() && z.EncExt(yy1655) { + } else if z.HasExtensions() && z.EncExt(yy1629) { } else { - z.EncFallback(yy1655) + z.EncFallback(yy1629) } } } - if yyr1645 || yy2arr1645 { + if yyr1619 || yy2arr1619 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym1658 := z.EncBinary() - _ = yym1658 + yym1632 := z.EncBinary() + _ = yym1632 if false { } else { h.encSlicePodSecurityPolicy(([]PodSecurityPolicy)(x.Items), e) @@ -19493,15 +19194,15 @@ func (x *PodSecurityPolicyList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym1659 := z.EncBinary() - _ = yym1659 + yym1633 := z.EncBinary() + _ = yym1633 if false { } else { h.encSlicePodSecurityPolicy(([]PodSecurityPolicy)(x.Items), e) } } } - if yyr1645 || yy2arr1645 { + if yyr1619 || yy2arr1619 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -19514,25 +19215,25 @@ func (x *PodSecurityPolicyList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1660 := z.DecBinary() - _ = yym1660 + yym1634 := z.DecBinary() + _ = yym1634 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1661 := r.ContainerType() - if yyct1661 == codecSelferValueTypeMap1234 { - yyl1661 := r.ReadMapStart() - if yyl1661 == 0 { + yyct1635 := r.ContainerType() + if yyct1635 == codecSelferValueTypeMap1234 { + yyl1635 := r.ReadMapStart() + if yyl1635 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1661, d) + x.codecDecodeSelfFromMap(yyl1635, d) } - } else if yyct1661 == codecSelferValueTypeArray1234 { - yyl1661 := r.ReadArrayStart() - if yyl1661 == 0 { + } else if yyct1635 == codecSelferValueTypeArray1234 { + yyl1635 := r.ReadArrayStart() + if yyl1635 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1661, d) + x.codecDecodeSelfFromArray(yyl1635, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -19544,12 +19245,12 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decod var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1662Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1662Slc - var yyhl1662 bool = l >= 0 - for yyj1662 := 0; ; yyj1662++ { - if yyhl1662 { - if yyj1662 >= l { + var yys1636Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1636Slc + var yyhl1636 bool = l >= 0 + for yyj1636 := 0; ; yyj1636++ { + if yyhl1636 { + if yyj1636 >= l { break } } else { @@ -19558,10 +19259,10 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decod } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1662Slc = r.DecodeBytes(yys1662Slc, true, true) - yys1662 := string(yys1662Slc) + yys1636Slc = r.DecodeBytes(yys1636Slc, true, true) + yys1636 := string(yys1636Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1662 { + switch yys1636 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -19576,33 +19277,33 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decod } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { - yyv1665 := &x.ListMeta - yym1666 := z.DecBinary() - _ = yym1666 + yyv1639 := &x.ListMeta + yym1640 := z.DecBinary() + _ = yym1640 if false { - } else if z.HasExtensions() && z.DecExt(yyv1665) { + } else if z.HasExtensions() && z.DecExt(yyv1639) { } else { - z.DecFallback(yyv1665, false) + z.DecFallback(yyv1639, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv1667 := &x.Items - yym1668 := z.DecBinary() - _ = yym1668 + yyv1641 := &x.Items + yym1642 := z.DecBinary() + _ = yym1642 if false { } else { - h.decSlicePodSecurityPolicy((*[]PodSecurityPolicy)(yyv1667), d) + h.decSlicePodSecurityPolicy((*[]PodSecurityPolicy)(yyv1641), d) } } default: - z.DecStructFieldNotFound(-1, yys1662) - } // end switch yys1662 - } // end for yyj1662 + z.DecStructFieldNotFound(-1, yys1636) + } // end switch yys1636 + } // end for yyj1636 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -19610,16 +19311,16 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Dec var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1669 int - var yyb1669 bool - var yyhl1669 bool = l >= 0 - yyj1669++ - if yyhl1669 { - yyb1669 = yyj1669 > l + var yyj1643 int + var yyb1643 bool + var yyhl1643 bool = l >= 0 + yyj1643++ + if yyhl1643 { + yyb1643 = yyj1643 > l } else { - yyb1669 = r.CheckBreak() + yyb1643 = r.CheckBreak() } - if yyb1669 { + if yyb1643 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19629,13 +19330,13 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Dec } else { x.Kind = string(r.DecodeString()) } - yyj1669++ - if yyhl1669 { - yyb1669 = yyj1669 > l + yyj1643++ + if yyhl1643 { + yyb1643 = yyj1643 > l } else { - yyb1669 = r.CheckBreak() + yyb1643 = r.CheckBreak() } - if yyb1669 { + if yyb1643 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19645,36 +19346,36 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Dec } else { x.APIVersion = string(r.DecodeString()) } - yyj1669++ - if yyhl1669 { - yyb1669 = yyj1669 > l + yyj1643++ + if yyhl1643 { + yyb1643 = yyj1643 > l } else { - yyb1669 = r.CheckBreak() + yyb1643 = r.CheckBreak() } - if yyb1669 { + if yyb1643 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { - yyv1672 := &x.ListMeta - yym1673 := z.DecBinary() - _ = yym1673 + yyv1646 := &x.ListMeta + yym1647 := z.DecBinary() + _ = yym1647 if false { - } else if z.HasExtensions() && z.DecExt(yyv1672) { + } else if z.HasExtensions() && z.DecExt(yyv1646) { } else { - z.DecFallback(yyv1672, false) + z.DecFallback(yyv1646, false) } } - yyj1669++ - if yyhl1669 { - yyb1669 = yyj1669 > l + yyj1643++ + if yyhl1643 { + yyb1643 = yyj1643 > l } else { - yyb1669 = r.CheckBreak() + yyb1643 = r.CheckBreak() } - if yyb1669 { + if yyb1643 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19682,26 +19383,26 @@ func (x *PodSecurityPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Dec if r.TryDecodeAsNil() { x.Items = nil } else { - yyv1674 := &x.Items - yym1675 := z.DecBinary() - _ = yym1675 + yyv1648 := &x.Items + yym1649 := z.DecBinary() + _ = yym1649 if false { } else { - h.decSlicePodSecurityPolicy((*[]PodSecurityPolicy)(yyv1674), d) + h.decSlicePodSecurityPolicy((*[]PodSecurityPolicy)(yyv1648), d) } } for { - yyj1669++ - if yyhl1669 { - yyb1669 = yyj1669 > l + yyj1643++ + if yyhl1643 { + yyb1643 = yyj1643 > l } else { - yyb1669 = r.CheckBreak() + yyb1643 = r.CheckBreak() } - if yyb1669 { + if yyb1643 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1669-1, "") + z.DecStructFieldNotFound(yyj1643-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -19713,38 +19414,38 @@ func (x *NetworkPolicy) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1676 := z.EncBinary() - _ = yym1676 + yym1650 := z.EncBinary() + _ = yym1650 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1677 := !z.EncBinary() - yy2arr1677 := z.EncBasicHandle().StructToArray - var yyq1677 [4]bool - _, _, _ = yysep1677, yyq1677, yy2arr1677 - const yyr1677 bool = false - yyq1677[0] = x.Kind != "" - yyq1677[1] = x.APIVersion != "" - yyq1677[2] = true - yyq1677[3] = true - var yynn1677 int - if yyr1677 || yy2arr1677 { + yysep1651 := !z.EncBinary() + yy2arr1651 := z.EncBasicHandle().StructToArray + var yyq1651 [4]bool + _, _, _ = yysep1651, yyq1651, yy2arr1651 + const yyr1651 bool = false + yyq1651[0] = x.Kind != "" + yyq1651[1] = x.APIVersion != "" + yyq1651[2] = true + yyq1651[3] = true + var yynn1651 int + if yyr1651 || yy2arr1651 { r.EncodeArrayStart(4) } else { - yynn1677 = 0 - for _, b := range yyq1677 { + yynn1651 = 0 + for _, b := range yyq1651 { if b { - yynn1677++ + yynn1651++ } } - r.EncodeMapStart(yynn1677) - yynn1677 = 0 + r.EncodeMapStart(yynn1651) + yynn1651 = 0 } - if yyr1677 || yy2arr1677 { + if yyr1651 || yy2arr1651 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1677[0] { - yym1679 := z.EncBinary() - _ = yym1679 + if yyq1651[0] { + yym1653 := z.EncBinary() + _ = yym1653 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -19753,23 +19454,23 @@ func (x *NetworkPolicy) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1677[0] { + if yyq1651[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1680 := z.EncBinary() - _ = yym1680 + yym1654 := z.EncBinary() + _ = yym1654 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr1677 || yy2arr1677 { + if yyr1651 || yy2arr1651 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1677[1] { - yym1682 := z.EncBinary() - _ = yym1682 + if yyq1651[1] { + yym1656 := z.EncBinary() + _ = yym1656 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -19778,53 +19479,53 @@ func (x *NetworkPolicy) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1677[1] { + if yyq1651[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1683 := z.EncBinary() - _ = yym1683 + yym1657 := z.EncBinary() + _ = yym1657 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr1677 || yy2arr1677 { + if yyr1651 || yy2arr1651 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1677[2] { - yy1685 := &x.ObjectMeta - yy1685.CodecEncodeSelf(e) + if yyq1651[2] { + yy1659 := &x.ObjectMeta + yy1659.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq1677[2] { + if yyq1651[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1686 := &x.ObjectMeta - yy1686.CodecEncodeSelf(e) + yy1660 := &x.ObjectMeta + yy1660.CodecEncodeSelf(e) } } - if yyr1677 || yy2arr1677 { + if yyr1651 || yy2arr1651 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1677[3] { - yy1688 := &x.Spec - yy1688.CodecEncodeSelf(e) + if yyq1651[3] { + yy1662 := &x.Spec + yy1662.CodecEncodeSelf(e) } else { r.EncodeNil() } } else { - if yyq1677[3] { + if yyq1651[3] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("spec")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1689 := &x.Spec - yy1689.CodecEncodeSelf(e) + yy1663 := &x.Spec + yy1663.CodecEncodeSelf(e) } } - if yyr1677 || yy2arr1677 { + if yyr1651 || yy2arr1651 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -19837,25 +19538,25 @@ func (x *NetworkPolicy) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1690 := z.DecBinary() - _ = yym1690 + yym1664 := z.DecBinary() + _ = yym1664 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1691 := r.ContainerType() - if yyct1691 == codecSelferValueTypeMap1234 { - yyl1691 := r.ReadMapStart() - if yyl1691 == 0 { + yyct1665 := r.ContainerType() + if yyct1665 == codecSelferValueTypeMap1234 { + yyl1665 := r.ReadMapStart() + if yyl1665 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1691, d) + x.codecDecodeSelfFromMap(yyl1665, d) } - } else if yyct1691 == codecSelferValueTypeArray1234 { - yyl1691 := r.ReadArrayStart() - if yyl1691 == 0 { + } else if yyct1665 == codecSelferValueTypeArray1234 { + yyl1665 := r.ReadArrayStart() + if yyl1665 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1691, d) + x.codecDecodeSelfFromArray(yyl1665, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -19867,12 +19568,12 @@ func (x *NetworkPolicy) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1692Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1692Slc - var yyhl1692 bool = l >= 0 - for yyj1692 := 0; ; yyj1692++ { - if yyhl1692 { - if yyj1692 >= l { + var yys1666Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1666Slc + var yyhl1666 bool = l >= 0 + for yyj1666 := 0; ; yyj1666++ { + if yyhl1666 { + if yyj1666 >= l { break } } else { @@ -19881,10 +19582,10 @@ func (x *NetworkPolicy) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1692Slc = r.DecodeBytes(yys1692Slc, true, true) - yys1692 := string(yys1692Slc) + yys1666Slc = r.DecodeBytes(yys1666Slc, true, true) + yys1666 := string(yys1666Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1692 { + switch yys1666 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -19901,20 +19602,20 @@ func (x *NetworkPolicy) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { - yyv1695 := &x.ObjectMeta - yyv1695.CodecDecodeSelf(d) + yyv1669 := &x.ObjectMeta + yyv1669.CodecDecodeSelf(d) } case "spec": if r.TryDecodeAsNil() { x.Spec = NetworkPolicySpec{} } else { - yyv1696 := &x.Spec - yyv1696.CodecDecodeSelf(d) + yyv1670 := &x.Spec + yyv1670.CodecDecodeSelf(d) } default: - z.DecStructFieldNotFound(-1, yys1692) - } // end switch yys1692 - } // end for yyj1692 + z.DecStructFieldNotFound(-1, yys1666) + } // end switch yys1666 + } // end for yyj1666 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -19922,16 +19623,16 @@ func (x *NetworkPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1697 int - var yyb1697 bool - var yyhl1697 bool = l >= 0 - yyj1697++ - if yyhl1697 { - yyb1697 = yyj1697 > l + var yyj1671 int + var yyb1671 bool + var yyhl1671 bool = l >= 0 + yyj1671++ + if yyhl1671 { + yyb1671 = yyj1671 > l } else { - yyb1697 = r.CheckBreak() + yyb1671 = r.CheckBreak() } - if yyb1697 { + if yyb1671 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19941,13 +19642,13 @@ func (x *NetworkPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.Kind = string(r.DecodeString()) } - yyj1697++ - if yyhl1697 { - yyb1697 = yyj1697 > l + yyj1671++ + if yyhl1671 { + yyb1671 = yyj1671 > l } else { - yyb1697 = r.CheckBreak() + yyb1671 = r.CheckBreak() } - if yyb1697 { + if yyb1671 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19957,13 +19658,13 @@ func (x *NetworkPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } else { x.APIVersion = string(r.DecodeString()) } - yyj1697++ - if yyhl1697 { - yyb1697 = yyj1697 > l + yyj1671++ + if yyhl1671 { + yyb1671 = yyj1671 > l } else { - yyb1697 = r.CheckBreak() + yyb1671 = r.CheckBreak() } - if yyb1697 { + if yyb1671 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19971,16 +19672,16 @@ func (x *NetworkPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.ObjectMeta = pkg2_v1.ObjectMeta{} } else { - yyv1700 := &x.ObjectMeta - yyv1700.CodecDecodeSelf(d) + yyv1674 := &x.ObjectMeta + yyv1674.CodecDecodeSelf(d) } - yyj1697++ - if yyhl1697 { - yyb1697 = yyj1697 > l + yyj1671++ + if yyhl1671 { + yyb1671 = yyj1671 > l } else { - yyb1697 = r.CheckBreak() + yyb1671 = r.CheckBreak() } - if yyb1697 { + if yyb1671 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -19988,21 +19689,21 @@ func (x *NetworkPolicy) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { if r.TryDecodeAsNil() { x.Spec = NetworkPolicySpec{} } else { - yyv1701 := &x.Spec - yyv1701.CodecDecodeSelf(d) + yyv1675 := &x.Spec + yyv1675.CodecDecodeSelf(d) } for { - yyj1697++ - if yyhl1697 { - yyb1697 = yyj1697 > l + yyj1671++ + if yyhl1671 { + yyb1671 = yyj1671 > l } else { - yyb1697 = r.CheckBreak() + yyb1671 = r.CheckBreak() } - if yyb1697 { + if yyb1671 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1697-1, "") + z.DecStructFieldNotFound(yyj1671-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -20014,61 +19715,61 @@ func (x *NetworkPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1702 := z.EncBinary() - _ = yym1702 + yym1676 := z.EncBinary() + _ = yym1676 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1703 := !z.EncBinary() - yy2arr1703 := z.EncBasicHandle().StructToArray - var yyq1703 [2]bool - _, _, _ = yysep1703, yyq1703, yy2arr1703 - const yyr1703 bool = false - yyq1703[1] = len(x.Ingress) != 0 - var yynn1703 int - if yyr1703 || yy2arr1703 { + yysep1677 := !z.EncBinary() + yy2arr1677 := z.EncBasicHandle().StructToArray + var yyq1677 [2]bool + _, _, _ = yysep1677, yyq1677, yy2arr1677 + const yyr1677 bool = false + yyq1677[1] = len(x.Ingress) != 0 + var yynn1677 int + if yyr1677 || yy2arr1677 { r.EncodeArrayStart(2) } else { - yynn1703 = 1 - for _, b := range yyq1703 { + yynn1677 = 1 + for _, b := range yyq1677 { if b { - yynn1703++ + yynn1677++ } } - r.EncodeMapStart(yynn1703) - yynn1703 = 0 + r.EncodeMapStart(yynn1677) + yynn1677 = 0 } - if yyr1703 || yy2arr1703 { + if yyr1677 || yy2arr1677 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1705 := &x.PodSelector - yym1706 := z.EncBinary() - _ = yym1706 + yy1679 := &x.PodSelector + yym1680 := z.EncBinary() + _ = yym1680 if false { - } else if z.HasExtensions() && z.EncExt(yy1705) { + } else if z.HasExtensions() && z.EncExt(yy1679) { } else { - z.EncFallback(yy1705) + z.EncFallback(yy1679) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podSelector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1707 := &x.PodSelector - yym1708 := z.EncBinary() - _ = yym1708 + yy1681 := &x.PodSelector + yym1682 := z.EncBinary() + _ = yym1682 if false { - } else if z.HasExtensions() && z.EncExt(yy1707) { + } else if z.HasExtensions() && z.EncExt(yy1681) { } else { - z.EncFallback(yy1707) + z.EncFallback(yy1681) } } - if yyr1703 || yy2arr1703 { + if yyr1677 || yy2arr1677 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1703[1] { + if yyq1677[1] { if x.Ingress == nil { r.EncodeNil() } else { - yym1710 := z.EncBinary() - _ = yym1710 + yym1684 := z.EncBinary() + _ = yym1684 if false { } else { h.encSliceNetworkPolicyIngressRule(([]NetworkPolicyIngressRule)(x.Ingress), e) @@ -20078,15 +19779,15 @@ func (x *NetworkPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1703[1] { + if yyq1677[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("ingress")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Ingress == nil { r.EncodeNil() } else { - yym1711 := z.EncBinary() - _ = yym1711 + yym1685 := z.EncBinary() + _ = yym1685 if false { } else { h.encSliceNetworkPolicyIngressRule(([]NetworkPolicyIngressRule)(x.Ingress), e) @@ -20094,7 +19795,7 @@ func (x *NetworkPolicySpec) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1703 || yy2arr1703 { + if yyr1677 || yy2arr1677 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -20107,25 +19808,25 @@ func (x *NetworkPolicySpec) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1712 := z.DecBinary() - _ = yym1712 + yym1686 := z.DecBinary() + _ = yym1686 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1713 := r.ContainerType() - if yyct1713 == codecSelferValueTypeMap1234 { - yyl1713 := r.ReadMapStart() - if yyl1713 == 0 { + yyct1687 := r.ContainerType() + if yyct1687 == codecSelferValueTypeMap1234 { + yyl1687 := r.ReadMapStart() + if yyl1687 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1713, d) + x.codecDecodeSelfFromMap(yyl1687, d) } - } else if yyct1713 == codecSelferValueTypeArray1234 { - yyl1713 := r.ReadArrayStart() - if yyl1713 == 0 { + } else if yyct1687 == codecSelferValueTypeArray1234 { + yyl1687 := r.ReadArrayStart() + if yyl1687 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1713, d) + x.codecDecodeSelfFromArray(yyl1687, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -20137,12 +19838,12 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1714Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1714Slc - var yyhl1714 bool = l >= 0 - for yyj1714 := 0; ; yyj1714++ { - if yyhl1714 { - if yyj1714 >= l { + var yys1688Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1688Slc + var yyhl1688 bool = l >= 0 + for yyj1688 := 0; ; yyj1688++ { + if yyhl1688 { + if yyj1688 >= l { break } } else { @@ -20151,39 +19852,39 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1714Slc = r.DecodeBytes(yys1714Slc, true, true) - yys1714 := string(yys1714Slc) + yys1688Slc = r.DecodeBytes(yys1688Slc, true, true) + yys1688 := string(yys1688Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1714 { + switch yys1688 { case "podSelector": if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { - yyv1715 := &x.PodSelector - yym1716 := z.DecBinary() - _ = yym1716 + yyv1689 := &x.PodSelector + yym1690 := z.DecBinary() + _ = yym1690 if false { - } else if z.HasExtensions() && z.DecExt(yyv1715) { + } else if z.HasExtensions() && z.DecExt(yyv1689) { } else { - z.DecFallback(yyv1715, false) + z.DecFallback(yyv1689, false) } } case "ingress": if r.TryDecodeAsNil() { x.Ingress = nil } else { - yyv1717 := &x.Ingress - yym1718 := z.DecBinary() - _ = yym1718 + yyv1691 := &x.Ingress + yym1692 := z.DecBinary() + _ = yym1692 if false { } else { - h.decSliceNetworkPolicyIngressRule((*[]NetworkPolicyIngressRule)(yyv1717), d) + h.decSliceNetworkPolicyIngressRule((*[]NetworkPolicyIngressRule)(yyv1691), d) } } default: - z.DecStructFieldNotFound(-1, yys1714) - } // end switch yys1714 - } // end for yyj1714 + z.DecStructFieldNotFound(-1, yys1688) + } // end switch yys1688 + } // end for yyj1688 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -20191,39 +19892,39 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1719 int - var yyb1719 bool - var yyhl1719 bool = l >= 0 - yyj1719++ - if yyhl1719 { - yyb1719 = yyj1719 > l + var yyj1693 int + var yyb1693 bool + var yyhl1693 bool = l >= 0 + yyj1693++ + if yyhl1693 { + yyb1693 = yyj1693 > l } else { - yyb1719 = r.CheckBreak() + yyb1693 = r.CheckBreak() } - if yyb1719 { + if yyb1693 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.PodSelector = pkg1_unversioned.LabelSelector{} + x.PodSelector = pkg1_v1.LabelSelector{} } else { - yyv1720 := &x.PodSelector - yym1721 := z.DecBinary() - _ = yym1721 + yyv1694 := &x.PodSelector + yym1695 := z.DecBinary() + _ = yym1695 if false { - } else if z.HasExtensions() && z.DecExt(yyv1720) { + } else if z.HasExtensions() && z.DecExt(yyv1694) { } else { - z.DecFallback(yyv1720, false) + z.DecFallback(yyv1694, false) } } - yyj1719++ - if yyhl1719 { - yyb1719 = yyj1719 > l + yyj1693++ + if yyhl1693 { + yyb1693 = yyj1693 > l } else { - yyb1719 = r.CheckBreak() + yyb1693 = r.CheckBreak() } - if yyb1719 { + if yyb1693 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -20231,26 +19932,26 @@ func (x *NetworkPolicySpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Ingress = nil } else { - yyv1722 := &x.Ingress - yym1723 := z.DecBinary() - _ = yym1723 + yyv1696 := &x.Ingress + yym1697 := z.DecBinary() + _ = yym1697 if false { } else { - h.decSliceNetworkPolicyIngressRule((*[]NetworkPolicyIngressRule)(yyv1722), d) + h.decSliceNetworkPolicyIngressRule((*[]NetworkPolicyIngressRule)(yyv1696), d) } } for { - yyj1719++ - if yyhl1719 { - yyb1719 = yyj1719 > l + yyj1693++ + if yyhl1693 { + yyb1693 = yyj1693 > l } else { - yyb1719 = r.CheckBreak() + yyb1693 = r.CheckBreak() } - if yyb1719 { + if yyb1693 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1719-1, "") + z.DecStructFieldNotFound(yyj1693-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -20262,39 +19963,39 @@ func (x *NetworkPolicyIngressRule) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1724 := z.EncBinary() - _ = yym1724 + yym1698 := z.EncBinary() + _ = yym1698 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1725 := !z.EncBinary() - yy2arr1725 := z.EncBasicHandle().StructToArray - var yyq1725 [2]bool - _, _, _ = yysep1725, yyq1725, yy2arr1725 - const yyr1725 bool = false - yyq1725[0] = len(x.Ports) != 0 - yyq1725[1] = len(x.From) != 0 - var yynn1725 int - if yyr1725 || yy2arr1725 { + yysep1699 := !z.EncBinary() + yy2arr1699 := z.EncBasicHandle().StructToArray + var yyq1699 [2]bool + _, _, _ = yysep1699, yyq1699, yy2arr1699 + const yyr1699 bool = false + yyq1699[0] = len(x.Ports) != 0 + yyq1699[1] = len(x.From) != 0 + var yynn1699 int + if yyr1699 || yy2arr1699 { r.EncodeArrayStart(2) } else { - yynn1725 = 0 - for _, b := range yyq1725 { + yynn1699 = 0 + for _, b := range yyq1699 { if b { - yynn1725++ + yynn1699++ } } - r.EncodeMapStart(yynn1725) - yynn1725 = 0 + r.EncodeMapStart(yynn1699) + yynn1699 = 0 } - if yyr1725 || yy2arr1725 { + if yyr1699 || yy2arr1699 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1725[0] { + if yyq1699[0] { if x.Ports == nil { r.EncodeNil() } else { - yym1727 := z.EncBinary() - _ = yym1727 + yym1701 := z.EncBinary() + _ = yym1701 if false { } else { h.encSliceNetworkPolicyPort(([]NetworkPolicyPort)(x.Ports), e) @@ -20304,15 +20005,15 @@ func (x *NetworkPolicyIngressRule) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1725[0] { + if yyq1699[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("ports")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Ports == nil { r.EncodeNil() } else { - yym1728 := z.EncBinary() - _ = yym1728 + yym1702 := z.EncBinary() + _ = yym1702 if false { } else { h.encSliceNetworkPolicyPort(([]NetworkPolicyPort)(x.Ports), e) @@ -20320,14 +20021,14 @@ func (x *NetworkPolicyIngressRule) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1725 || yy2arr1725 { + if yyr1699 || yy2arr1699 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1725[1] { + if yyq1699[1] { if x.From == nil { r.EncodeNil() } else { - yym1730 := z.EncBinary() - _ = yym1730 + yym1704 := z.EncBinary() + _ = yym1704 if false { } else { h.encSliceNetworkPolicyPeer(([]NetworkPolicyPeer)(x.From), e) @@ -20337,15 +20038,15 @@ func (x *NetworkPolicyIngressRule) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1725[1] { + if yyq1699[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("from")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.From == nil { r.EncodeNil() } else { - yym1731 := z.EncBinary() - _ = yym1731 + yym1705 := z.EncBinary() + _ = yym1705 if false { } else { h.encSliceNetworkPolicyPeer(([]NetworkPolicyPeer)(x.From), e) @@ -20353,7 +20054,7 @@ func (x *NetworkPolicyIngressRule) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1725 || yy2arr1725 { + if yyr1699 || yy2arr1699 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -20366,25 +20067,25 @@ func (x *NetworkPolicyIngressRule) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1732 := z.DecBinary() - _ = yym1732 + yym1706 := z.DecBinary() + _ = yym1706 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1733 := r.ContainerType() - if yyct1733 == codecSelferValueTypeMap1234 { - yyl1733 := r.ReadMapStart() - if yyl1733 == 0 { + yyct1707 := r.ContainerType() + if yyct1707 == codecSelferValueTypeMap1234 { + yyl1707 := r.ReadMapStart() + if yyl1707 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1733, d) + x.codecDecodeSelfFromMap(yyl1707, d) } - } else if yyct1733 == codecSelferValueTypeArray1234 { - yyl1733 := r.ReadArrayStart() - if yyl1733 == 0 { + } else if yyct1707 == codecSelferValueTypeArray1234 { + yyl1707 := r.ReadArrayStart() + if yyl1707 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1733, d) + x.codecDecodeSelfFromArray(yyl1707, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -20396,12 +20097,12 @@ func (x *NetworkPolicyIngressRule) codecDecodeSelfFromMap(l int, d *codec1978.De var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1734Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1734Slc - var yyhl1734 bool = l >= 0 - for yyj1734 := 0; ; yyj1734++ { - if yyhl1734 { - if yyj1734 >= l { + var yys1708Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1708Slc + var yyhl1708 bool = l >= 0 + for yyj1708 := 0; ; yyj1708++ { + if yyhl1708 { + if yyj1708 >= l { break } } else { @@ -20410,38 +20111,38 @@ func (x *NetworkPolicyIngressRule) codecDecodeSelfFromMap(l int, d *codec1978.De } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1734Slc = r.DecodeBytes(yys1734Slc, true, true) - yys1734 := string(yys1734Slc) + yys1708Slc = r.DecodeBytes(yys1708Slc, true, true) + yys1708 := string(yys1708Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1734 { + switch yys1708 { case "ports": if r.TryDecodeAsNil() { x.Ports = nil } else { - yyv1735 := &x.Ports - yym1736 := z.DecBinary() - _ = yym1736 + yyv1709 := &x.Ports + yym1710 := z.DecBinary() + _ = yym1710 if false { } else { - h.decSliceNetworkPolicyPort((*[]NetworkPolicyPort)(yyv1735), d) + h.decSliceNetworkPolicyPort((*[]NetworkPolicyPort)(yyv1709), d) } } case "from": if r.TryDecodeAsNil() { x.From = nil } else { - yyv1737 := &x.From - yym1738 := z.DecBinary() - _ = yym1738 + yyv1711 := &x.From + yym1712 := z.DecBinary() + _ = yym1712 if false { } else { - h.decSliceNetworkPolicyPeer((*[]NetworkPolicyPeer)(yyv1737), d) + h.decSliceNetworkPolicyPeer((*[]NetworkPolicyPeer)(yyv1711), d) } } default: - z.DecStructFieldNotFound(-1, yys1734) - } // end switch yys1734 - } // end for yyj1734 + z.DecStructFieldNotFound(-1, yys1708) + } // end switch yys1708 + } // end for yyj1708 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -20449,16 +20150,16 @@ func (x *NetworkPolicyIngressRule) codecDecodeSelfFromArray(l int, d *codec1978. var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1739 int - var yyb1739 bool - var yyhl1739 bool = l >= 0 - yyj1739++ - if yyhl1739 { - yyb1739 = yyj1739 > l + var yyj1713 int + var yyb1713 bool + var yyhl1713 bool = l >= 0 + yyj1713++ + if yyhl1713 { + yyb1713 = yyj1713 > l } else { - yyb1739 = r.CheckBreak() + yyb1713 = r.CheckBreak() } - if yyb1739 { + if yyb1713 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -20466,21 +20167,21 @@ func (x *NetworkPolicyIngressRule) codecDecodeSelfFromArray(l int, d *codec1978. if r.TryDecodeAsNil() { x.Ports = nil } else { - yyv1740 := &x.Ports - yym1741 := z.DecBinary() - _ = yym1741 + yyv1714 := &x.Ports + yym1715 := z.DecBinary() + _ = yym1715 if false { } else { - h.decSliceNetworkPolicyPort((*[]NetworkPolicyPort)(yyv1740), d) + h.decSliceNetworkPolicyPort((*[]NetworkPolicyPort)(yyv1714), d) } } - yyj1739++ - if yyhl1739 { - yyb1739 = yyj1739 > l + yyj1713++ + if yyhl1713 { + yyb1713 = yyj1713 > l } else { - yyb1739 = r.CheckBreak() + yyb1713 = r.CheckBreak() } - if yyb1739 { + if yyb1713 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -20488,26 +20189,26 @@ func (x *NetworkPolicyIngressRule) codecDecodeSelfFromArray(l int, d *codec1978. if r.TryDecodeAsNil() { x.From = nil } else { - yyv1742 := &x.From - yym1743 := z.DecBinary() - _ = yym1743 + yyv1716 := &x.From + yym1717 := z.DecBinary() + _ = yym1717 if false { } else { - h.decSliceNetworkPolicyPeer((*[]NetworkPolicyPeer)(yyv1742), d) + h.decSliceNetworkPolicyPeer((*[]NetworkPolicyPeer)(yyv1716), d) } } for { - yyj1739++ - if yyhl1739 { - yyb1739 = yyj1739 > l + yyj1713++ + if yyhl1713 { + yyb1713 = yyj1713 > l } else { - yyb1739 = r.CheckBreak() + yyb1713 = r.CheckBreak() } - if yyb1739 { + if yyb1713 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1739-1, "") + z.DecStructFieldNotFound(yyj1713-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -20519,79 +20220,79 @@ func (x *NetworkPolicyPort) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1744 := z.EncBinary() - _ = yym1744 + yym1718 := z.EncBinary() + _ = yym1718 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1745 := !z.EncBinary() - yy2arr1745 := z.EncBasicHandle().StructToArray - var yyq1745 [2]bool - _, _, _ = yysep1745, yyq1745, yy2arr1745 - const yyr1745 bool = false - yyq1745[0] = x.Protocol != nil - yyq1745[1] = x.Port != nil - var yynn1745 int - if yyr1745 || yy2arr1745 { + yysep1719 := !z.EncBinary() + yy2arr1719 := z.EncBasicHandle().StructToArray + var yyq1719 [2]bool + _, _, _ = yysep1719, yyq1719, yy2arr1719 + const yyr1719 bool = false + yyq1719[0] = x.Protocol != nil + yyq1719[1] = x.Port != nil + var yynn1719 int + if yyr1719 || yy2arr1719 { r.EncodeArrayStart(2) } else { - yynn1745 = 0 - for _, b := range yyq1745 { + yynn1719 = 0 + for _, b := range yyq1719 { if b { - yynn1745++ + yynn1719++ } } - r.EncodeMapStart(yynn1745) - yynn1745 = 0 + r.EncodeMapStart(yynn1719) + yynn1719 = 0 } - if yyr1745 || yy2arr1745 { + if yyr1719 || yy2arr1719 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1745[0] { + if yyq1719[0] { if x.Protocol == nil { r.EncodeNil() } else { - yy1747 := *x.Protocol - yym1748 := z.EncBinary() - _ = yym1748 + yy1721 := *x.Protocol + yym1722 := z.EncBinary() + _ = yym1722 if false { - } else if z.HasExtensions() && z.EncExt(yy1747) { + } else if z.HasExtensions() && z.EncExt(yy1721) { } else { - r.EncodeString(codecSelferC_UTF81234, string(yy1747)) + r.EncodeString(codecSelferC_UTF81234, string(yy1721)) } } } else { r.EncodeNil() } } else { - if yyq1745[0] { + if yyq1719[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("protocol")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Protocol == nil { r.EncodeNil() } else { - yy1749 := *x.Protocol - yym1750 := z.EncBinary() - _ = yym1750 + yy1723 := *x.Protocol + yym1724 := z.EncBinary() + _ = yym1724 if false { - } else if z.HasExtensions() && z.EncExt(yy1749) { + } else if z.HasExtensions() && z.EncExt(yy1723) { } else { - r.EncodeString(codecSelferC_UTF81234, string(yy1749)) + r.EncodeString(codecSelferC_UTF81234, string(yy1723)) } } } } - if yyr1745 || yy2arr1745 { + if yyr1719 || yy2arr1719 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1745[1] { + if yyq1719[1] { if x.Port == nil { r.EncodeNil() } else { - yym1752 := z.EncBinary() - _ = yym1752 + yym1726 := z.EncBinary() + _ = yym1726 if false { } else if z.HasExtensions() && z.EncExt(x.Port) { - } else if !yym1752 && z.IsJSONHandle() { + } else if !yym1726 && z.IsJSONHandle() { z.EncJSONMarshal(x.Port) } else { z.EncFallback(x.Port) @@ -20601,18 +20302,18 @@ func (x *NetworkPolicyPort) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1745[1] { + if yyq1719[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("port")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.Port == nil { r.EncodeNil() } else { - yym1753 := z.EncBinary() - _ = yym1753 + yym1727 := z.EncBinary() + _ = yym1727 if false { } else if z.HasExtensions() && z.EncExt(x.Port) { - } else if !yym1753 && z.IsJSONHandle() { + } else if !yym1727 && z.IsJSONHandle() { z.EncJSONMarshal(x.Port) } else { z.EncFallback(x.Port) @@ -20620,7 +20321,7 @@ func (x *NetworkPolicyPort) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1745 || yy2arr1745 { + if yyr1719 || yy2arr1719 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -20633,25 +20334,25 @@ func (x *NetworkPolicyPort) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1754 := z.DecBinary() - _ = yym1754 + yym1728 := z.DecBinary() + _ = yym1728 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1755 := r.ContainerType() - if yyct1755 == codecSelferValueTypeMap1234 { - yyl1755 := r.ReadMapStart() - if yyl1755 == 0 { + yyct1729 := r.ContainerType() + if yyct1729 == codecSelferValueTypeMap1234 { + yyl1729 := r.ReadMapStart() + if yyl1729 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1755, d) + x.codecDecodeSelfFromMap(yyl1729, d) } - } else if yyct1755 == codecSelferValueTypeArray1234 { - yyl1755 := r.ReadArrayStart() - if yyl1755 == 0 { + } else if yyct1729 == codecSelferValueTypeArray1234 { + yyl1729 := r.ReadArrayStart() + if yyl1729 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1755, d) + x.codecDecodeSelfFromArray(yyl1729, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -20663,12 +20364,12 @@ func (x *NetworkPolicyPort) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1756Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1756Slc - var yyhl1756 bool = l >= 0 - for yyj1756 := 0; ; yyj1756++ { - if yyhl1756 { - if yyj1756 >= l { + var yys1730Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1730Slc + var yyhl1730 bool = l >= 0 + for yyj1730 := 0; ; yyj1730++ { + if yyhl1730 { + if yyj1730 >= l { break } } else { @@ -20677,10 +20378,10 @@ func (x *NetworkPolicyPort) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1756Slc = r.DecodeBytes(yys1756Slc, true, true) - yys1756 := string(yys1756Slc) + yys1730Slc = r.DecodeBytes(yys1730Slc, true, true) + yys1730 := string(yys1730Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1756 { + switch yys1730 { case "protocol": if r.TryDecodeAsNil() { if x.Protocol != nil { @@ -20701,20 +20402,20 @@ func (x *NetworkPolicyPort) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) if x.Port == nil { x.Port = new(pkg5_intstr.IntOrString) } - yym1759 := z.DecBinary() - _ = yym1759 + yym1733 := z.DecBinary() + _ = yym1733 if false { } else if z.HasExtensions() && z.DecExt(x.Port) { - } else if !yym1759 && z.IsJSONHandle() { + } else if !yym1733 && z.IsJSONHandle() { z.DecJSONUnmarshal(x.Port) } else { z.DecFallback(x.Port, false) } } default: - z.DecStructFieldNotFound(-1, yys1756) - } // end switch yys1756 - } // end for yyj1756 + z.DecStructFieldNotFound(-1, yys1730) + } // end switch yys1730 + } // end for yyj1730 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -20722,16 +20423,16 @@ func (x *NetworkPolicyPort) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1760 int - var yyb1760 bool - var yyhl1760 bool = l >= 0 - yyj1760++ - if yyhl1760 { - yyb1760 = yyj1760 > l + var yyj1734 int + var yyb1734 bool + var yyhl1734 bool = l >= 0 + yyj1734++ + if yyhl1734 { + yyb1734 = yyj1734 > l } else { - yyb1760 = r.CheckBreak() + yyb1734 = r.CheckBreak() } - if yyb1760 { + if yyb1734 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -20746,13 +20447,13 @@ func (x *NetworkPolicyPort) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } x.Protocol.CodecDecodeSelf(d) } - yyj1760++ - if yyhl1760 { - yyb1760 = yyj1760 > l + yyj1734++ + if yyhl1734 { + yyb1734 = yyj1734 > l } else { - yyb1760 = r.CheckBreak() + yyb1734 = r.CheckBreak() } - if yyb1760 { + if yyb1734 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -20765,28 +20466,28 @@ func (x *NetworkPolicyPort) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if x.Port == nil { x.Port = new(pkg5_intstr.IntOrString) } - yym1763 := z.DecBinary() - _ = yym1763 + yym1737 := z.DecBinary() + _ = yym1737 if false { } else if z.HasExtensions() && z.DecExt(x.Port) { - } else if !yym1763 && z.IsJSONHandle() { + } else if !yym1737 && z.IsJSONHandle() { z.DecJSONUnmarshal(x.Port) } else { z.DecFallback(x.Port, false) } } for { - yyj1760++ - if yyhl1760 { - yyb1760 = yyj1760 > l + yyj1734++ + if yyhl1734 { + yyb1734 = yyj1734 > l } else { - yyb1760 = r.CheckBreak() + yyb1734 = r.CheckBreak() } - if yyb1760 { + if yyb1734 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1760-1, "") + z.DecStructFieldNotFound(yyj1734-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -20798,39 +20499,39 @@ func (x *NetworkPolicyPeer) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1764 := z.EncBinary() - _ = yym1764 + yym1738 := z.EncBinary() + _ = yym1738 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1765 := !z.EncBinary() - yy2arr1765 := z.EncBasicHandle().StructToArray - var yyq1765 [2]bool - _, _, _ = yysep1765, yyq1765, yy2arr1765 - const yyr1765 bool = false - yyq1765[0] = x.PodSelector != nil - yyq1765[1] = x.NamespaceSelector != nil - var yynn1765 int - if yyr1765 || yy2arr1765 { + yysep1739 := !z.EncBinary() + yy2arr1739 := z.EncBasicHandle().StructToArray + var yyq1739 [2]bool + _, _, _ = yysep1739, yyq1739, yy2arr1739 + const yyr1739 bool = false + yyq1739[0] = x.PodSelector != nil + yyq1739[1] = x.NamespaceSelector != nil + var yynn1739 int + if yyr1739 || yy2arr1739 { r.EncodeArrayStart(2) } else { - yynn1765 = 0 - for _, b := range yyq1765 { + yynn1739 = 0 + for _, b := range yyq1739 { if b { - yynn1765++ + yynn1739++ } } - r.EncodeMapStart(yynn1765) - yynn1765 = 0 + r.EncodeMapStart(yynn1739) + yynn1739 = 0 } - if yyr1765 || yy2arr1765 { + if yyr1739 || yy2arr1739 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1765[0] { + if yyq1739[0] { if x.PodSelector == nil { r.EncodeNil() } else { - yym1767 := z.EncBinary() - _ = yym1767 + yym1741 := z.EncBinary() + _ = yym1741 if false { } else if z.HasExtensions() && z.EncExt(x.PodSelector) { } else { @@ -20841,15 +20542,15 @@ func (x *NetworkPolicyPeer) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1765[0] { + if yyq1739[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("podSelector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.PodSelector == nil { r.EncodeNil() } else { - yym1768 := z.EncBinary() - _ = yym1768 + yym1742 := z.EncBinary() + _ = yym1742 if false { } else if z.HasExtensions() && z.EncExt(x.PodSelector) { } else { @@ -20858,14 +20559,14 @@ func (x *NetworkPolicyPeer) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1765 || yy2arr1765 { + if yyr1739 || yy2arr1739 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1765[1] { + if yyq1739[1] { if x.NamespaceSelector == nil { r.EncodeNil() } else { - yym1770 := z.EncBinary() - _ = yym1770 + yym1744 := z.EncBinary() + _ = yym1744 if false { } else if z.HasExtensions() && z.EncExt(x.NamespaceSelector) { } else { @@ -20876,15 +20577,15 @@ func (x *NetworkPolicyPeer) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeNil() } } else { - if yyq1765[1] { + if yyq1739[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("namespaceSelector")) z.EncSendContainerState(codecSelfer_containerMapValue1234) if x.NamespaceSelector == nil { r.EncodeNil() } else { - yym1771 := z.EncBinary() - _ = yym1771 + yym1745 := z.EncBinary() + _ = yym1745 if false { } else if z.HasExtensions() && z.EncExt(x.NamespaceSelector) { } else { @@ -20893,7 +20594,7 @@ func (x *NetworkPolicyPeer) CodecEncodeSelf(e *codec1978.Encoder) { } } } - if yyr1765 || yy2arr1765 { + if yyr1739 || yy2arr1739 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -20906,25 +20607,25 @@ func (x *NetworkPolicyPeer) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1772 := z.DecBinary() - _ = yym1772 + yym1746 := z.DecBinary() + _ = yym1746 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1773 := r.ContainerType() - if yyct1773 == codecSelferValueTypeMap1234 { - yyl1773 := r.ReadMapStart() - if yyl1773 == 0 { + yyct1747 := r.ContainerType() + if yyct1747 == codecSelferValueTypeMap1234 { + yyl1747 := r.ReadMapStart() + if yyl1747 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1773, d) + x.codecDecodeSelfFromMap(yyl1747, d) } - } else if yyct1773 == codecSelferValueTypeArray1234 { - yyl1773 := r.ReadArrayStart() - if yyl1773 == 0 { + } else if yyct1747 == codecSelferValueTypeArray1234 { + yyl1747 := r.ReadArrayStart() + if yyl1747 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1773, d) + x.codecDecodeSelfFromArray(yyl1747, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -20936,12 +20637,12 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1774Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1774Slc - var yyhl1774 bool = l >= 0 - for yyj1774 := 0; ; yyj1774++ { - if yyhl1774 { - if yyj1774 >= l { + var yys1748Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1748Slc + var yyhl1748 bool = l >= 0 + for yyj1748 := 0; ; yyj1748++ { + if yyhl1748 { + if yyj1748 >= l { break } } else { @@ -20950,10 +20651,10 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1774Slc = r.DecodeBytes(yys1774Slc, true, true) - yys1774 := string(yys1774Slc) + yys1748Slc = r.DecodeBytes(yys1748Slc, true, true) + yys1748 := string(yys1748Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1774 { + switch yys1748 { case "podSelector": if r.TryDecodeAsNil() { if x.PodSelector != nil { @@ -20961,10 +20662,10 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } - yym1776 := z.DecBinary() - _ = yym1776 + yym1750 := z.DecBinary() + _ = yym1750 if false { } else if z.HasExtensions() && z.DecExt(x.PodSelector) { } else { @@ -20978,10 +20679,10 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } - yym1778 := z.DecBinary() - _ = yym1778 + yym1752 := z.DecBinary() + _ = yym1752 if false { } else if z.HasExtensions() && z.DecExt(x.NamespaceSelector) { } else { @@ -20989,9 +20690,9 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } default: - z.DecStructFieldNotFound(-1, yys1774) - } // end switch yys1774 - } // end for yyj1774 + z.DecStructFieldNotFound(-1, yys1748) + } // end switch yys1748 + } // end for yyj1748 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -20999,16 +20700,16 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1779 int - var yyb1779 bool - var yyhl1779 bool = l >= 0 - yyj1779++ - if yyhl1779 { - yyb1779 = yyj1779 > l + var yyj1753 int + var yyb1753 bool + var yyhl1753 bool = l >= 0 + yyj1753++ + if yyhl1753 { + yyb1753 = yyj1753 > l } else { - yyb1779 = r.CheckBreak() + yyb1753 = r.CheckBreak() } - if yyb1779 { + if yyb1753 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -21019,23 +20720,23 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.PodSelector == nil { - x.PodSelector = new(pkg1_unversioned.LabelSelector) + x.PodSelector = new(pkg1_v1.LabelSelector) } - yym1781 := z.DecBinary() - _ = yym1781 + yym1755 := z.DecBinary() + _ = yym1755 if false { } else if z.HasExtensions() && z.DecExt(x.PodSelector) { } else { z.DecFallback(x.PodSelector, false) } } - yyj1779++ - if yyhl1779 { - yyb1779 = yyj1779 > l + yyj1753++ + if yyhl1753 { + yyb1753 = yyj1753 > l } else { - yyb1779 = r.CheckBreak() + yyb1753 = r.CheckBreak() } - if yyb1779 { + if yyb1753 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -21046,10 +20747,10 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } else { if x.NamespaceSelector == nil { - x.NamespaceSelector = new(pkg1_unversioned.LabelSelector) + x.NamespaceSelector = new(pkg1_v1.LabelSelector) } - yym1783 := z.DecBinary() - _ = yym1783 + yym1757 := z.DecBinary() + _ = yym1757 if false { } else if z.HasExtensions() && z.DecExt(x.NamespaceSelector) { } else { @@ -21057,17 +20758,17 @@ func (x *NetworkPolicyPeer) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } } for { - yyj1779++ - if yyhl1779 { - yyb1779 = yyj1779 > l + yyj1753++ + if yyhl1753 { + yyb1753 = yyj1753 > l } else { - yyb1779 = r.CheckBreak() + yyb1753 = r.CheckBreak() } - if yyb1779 { + if yyb1753 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1779-1, "") + z.DecStructFieldNotFound(yyj1753-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -21079,37 +20780,37 @@ func (x *NetworkPolicyList) CodecEncodeSelf(e *codec1978.Encoder) { if x == nil { r.EncodeNil() } else { - yym1784 := z.EncBinary() - _ = yym1784 + yym1758 := z.EncBinary() + _ = yym1758 if false { } else if z.HasExtensions() && z.EncExt(x) { } else { - yysep1785 := !z.EncBinary() - yy2arr1785 := z.EncBasicHandle().StructToArray - var yyq1785 [4]bool - _, _, _ = yysep1785, yyq1785, yy2arr1785 - const yyr1785 bool = false - yyq1785[0] = x.Kind != "" - yyq1785[1] = x.APIVersion != "" - yyq1785[2] = true - var yynn1785 int - if yyr1785 || yy2arr1785 { + yysep1759 := !z.EncBinary() + yy2arr1759 := z.EncBasicHandle().StructToArray + var yyq1759 [4]bool + _, _, _ = yysep1759, yyq1759, yy2arr1759 + const yyr1759 bool = false + yyq1759[0] = x.Kind != "" + yyq1759[1] = x.APIVersion != "" + yyq1759[2] = true + var yynn1759 int + if yyr1759 || yy2arr1759 { r.EncodeArrayStart(4) } else { - yynn1785 = 1 - for _, b := range yyq1785 { + yynn1759 = 1 + for _, b := range yyq1759 { if b { - yynn1785++ + yynn1759++ } } - r.EncodeMapStart(yynn1785) - yynn1785 = 0 + r.EncodeMapStart(yynn1759) + yynn1759 = 0 } - if yyr1785 || yy2arr1785 { + if yyr1759 || yy2arr1759 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1785[0] { - yym1787 := z.EncBinary() - _ = yym1787 + if yyq1759[0] { + yym1761 := z.EncBinary() + _ = yym1761 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) @@ -21118,23 +20819,23 @@ func (x *NetworkPolicyList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1785[0] { + if yyq1759[0] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("kind")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1788 := z.EncBinary() - _ = yym1788 + yym1762 := z.EncBinary() + _ = yym1762 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.Kind)) } } } - if yyr1785 || yy2arr1785 { + if yyr1759 || yy2arr1759 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1785[1] { - yym1790 := z.EncBinary() - _ = yym1790 + if yyq1759[1] { + yym1764 := z.EncBinary() + _ = yym1764 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) @@ -21143,54 +20844,54 @@ func (x *NetworkPolicyList) CodecEncodeSelf(e *codec1978.Encoder) { r.EncodeString(codecSelferC_UTF81234, "") } } else { - if yyq1785[1] { + if yyq1759[1] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("apiVersion")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym1791 := z.EncBinary() - _ = yym1791 + yym1765 := z.EncBinary() + _ = yym1765 if false { } else { r.EncodeString(codecSelferC_UTF81234, string(x.APIVersion)) } } } - if yyr1785 || yy2arr1785 { + if yyr1759 || yy2arr1759 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - if yyq1785[2] { - yy1793 := &x.ListMeta - yym1794 := z.EncBinary() - _ = yym1794 + if yyq1759[2] { + yy1767 := &x.ListMeta + yym1768 := z.EncBinary() + _ = yym1768 if false { - } else if z.HasExtensions() && z.EncExt(yy1793) { + } else if z.HasExtensions() && z.EncExt(yy1767) { } else { - z.EncFallback(yy1793) + z.EncFallback(yy1767) } } else { r.EncodeNil() } } else { - if yyq1785[2] { + if yyq1759[2] { z.EncSendContainerState(codecSelfer_containerMapKey1234) r.EncodeString(codecSelferC_UTF81234, string("metadata")) z.EncSendContainerState(codecSelfer_containerMapValue1234) - yy1795 := &x.ListMeta - yym1796 := z.EncBinary() - _ = yym1796 + yy1769 := &x.ListMeta + yym1770 := z.EncBinary() + _ = yym1770 if false { - } else if z.HasExtensions() && z.EncExt(yy1795) { + } else if z.HasExtensions() && z.EncExt(yy1769) { } else { - z.EncFallback(yy1795) + z.EncFallback(yy1769) } } } - if yyr1785 || yy2arr1785 { + if yyr1759 || yy2arr1759 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) if x.Items == nil { r.EncodeNil() } else { - yym1798 := z.EncBinary() - _ = yym1798 + yym1772 := z.EncBinary() + _ = yym1772 if false { } else { h.encSliceNetworkPolicy(([]NetworkPolicy)(x.Items), e) @@ -21203,15 +20904,15 @@ func (x *NetworkPolicyList) CodecEncodeSelf(e *codec1978.Encoder) { if x.Items == nil { r.EncodeNil() } else { - yym1799 := z.EncBinary() - _ = yym1799 + yym1773 := z.EncBinary() + _ = yym1773 if false { } else { h.encSliceNetworkPolicy(([]NetworkPolicy)(x.Items), e) } } } - if yyr1785 || yy2arr1785 { + if yyr1759 || yy2arr1759 { z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } else { z.EncSendContainerState(codecSelfer_containerMapEnd1234) @@ -21224,25 +20925,25 @@ func (x *NetworkPolicyList) CodecDecodeSelf(d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yym1800 := z.DecBinary() - _ = yym1800 + yym1774 := z.DecBinary() + _ = yym1774 if false { } else if z.HasExtensions() && z.DecExt(x) { } else { - yyct1801 := r.ContainerType() - if yyct1801 == codecSelferValueTypeMap1234 { - yyl1801 := r.ReadMapStart() - if yyl1801 == 0 { + yyct1775 := r.ContainerType() + if yyct1775 == codecSelferValueTypeMap1234 { + yyl1775 := r.ReadMapStart() + if yyl1775 == 0 { z.DecSendContainerState(codecSelfer_containerMapEnd1234) } else { - x.codecDecodeSelfFromMap(yyl1801, d) + x.codecDecodeSelfFromMap(yyl1775, d) } - } else if yyct1801 == codecSelferValueTypeArray1234 { - yyl1801 := r.ReadArrayStart() - if yyl1801 == 0 { + } else if yyct1775 == codecSelferValueTypeArray1234 { + yyl1775 := r.ReadArrayStart() + if yyl1775 == 0 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } else { - x.codecDecodeSelfFromArray(yyl1801, d) + x.codecDecodeSelfFromArray(yyl1775, d) } } else { panic(codecSelferOnlyMapOrArrayEncodeToStructErr1234) @@ -21254,12 +20955,12 @@ func (x *NetworkPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yys1802Slc = z.DecScratchBuffer() // default slice to decode into - _ = yys1802Slc - var yyhl1802 bool = l >= 0 - for yyj1802 := 0; ; yyj1802++ { - if yyhl1802 { - if yyj1802 >= l { + var yys1776Slc = z.DecScratchBuffer() // default slice to decode into + _ = yys1776Slc + var yyhl1776 bool = l >= 0 + for yyj1776 := 0; ; yyj1776++ { + if yyhl1776 { + if yyj1776 >= l { break } } else { @@ -21268,10 +20969,10 @@ func (x *NetworkPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } } z.DecSendContainerState(codecSelfer_containerMapKey1234) - yys1802Slc = r.DecodeBytes(yys1802Slc, true, true) - yys1802 := string(yys1802Slc) + yys1776Slc = r.DecodeBytes(yys1776Slc, true, true) + yys1776 := string(yys1776Slc) z.DecSendContainerState(codecSelfer_containerMapValue1234) - switch yys1802 { + switch yys1776 { case "kind": if r.TryDecodeAsNil() { x.Kind = "" @@ -21286,33 +20987,33 @@ func (x *NetworkPolicyList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { - yyv1805 := &x.ListMeta - yym1806 := z.DecBinary() - _ = yym1806 + yyv1779 := &x.ListMeta + yym1780 := z.DecBinary() + _ = yym1780 if false { - } else if z.HasExtensions() && z.DecExt(yyv1805) { + } else if z.HasExtensions() && z.DecExt(yyv1779) { } else { - z.DecFallback(yyv1805, false) + z.DecFallback(yyv1779, false) } } case "items": if r.TryDecodeAsNil() { x.Items = nil } else { - yyv1807 := &x.Items - yym1808 := z.DecBinary() - _ = yym1808 + yyv1781 := &x.Items + yym1782 := z.DecBinary() + _ = yym1782 if false { } else { - h.decSliceNetworkPolicy((*[]NetworkPolicy)(yyv1807), d) + h.decSliceNetworkPolicy((*[]NetworkPolicy)(yyv1781), d) } } default: - z.DecStructFieldNotFound(-1, yys1802) - } // end switch yys1802 - } // end for yyj1802 + z.DecStructFieldNotFound(-1, yys1776) + } // end switch yys1776 + } // end for yyj1776 z.DecSendContainerState(codecSelfer_containerMapEnd1234) } @@ -21320,16 +21021,16 @@ func (x *NetworkPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - var yyj1809 int - var yyb1809 bool - var yyhl1809 bool = l >= 0 - yyj1809++ - if yyhl1809 { - yyb1809 = yyj1809 > l + var yyj1783 int + var yyb1783 bool + var yyhl1783 bool = l >= 0 + yyj1783++ + if yyhl1783 { + yyb1783 = yyj1783 > l } else { - yyb1809 = r.CheckBreak() + yyb1783 = r.CheckBreak() } - if yyb1809 { + if yyb1783 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -21339,13 +21040,13 @@ func (x *NetworkPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.Kind = string(r.DecodeString()) } - yyj1809++ - if yyhl1809 { - yyb1809 = yyj1809 > l + yyj1783++ + if yyhl1783 { + yyb1783 = yyj1783 > l } else { - yyb1809 = r.CheckBreak() + yyb1783 = r.CheckBreak() } - if yyb1809 { + if yyb1783 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -21355,36 +21056,36 @@ func (x *NetworkPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder } else { x.APIVersion = string(r.DecodeString()) } - yyj1809++ - if yyhl1809 { - yyb1809 = yyj1809 > l + yyj1783++ + if yyhl1783 { + yyb1783 = yyj1783 > l } else { - yyb1809 = r.CheckBreak() + yyb1783 = r.CheckBreak() } - if yyb1809 { + if yyb1783 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { - yyv1812 := &x.ListMeta - yym1813 := z.DecBinary() - _ = yym1813 + yyv1786 := &x.ListMeta + yym1787 := z.DecBinary() + _ = yym1787 if false { - } else if z.HasExtensions() && z.DecExt(yyv1812) { + } else if z.HasExtensions() && z.DecExt(yyv1786) { } else { - z.DecFallback(yyv1812, false) + z.DecFallback(yyv1786, false) } } - yyj1809++ - if yyhl1809 { - yyb1809 = yyj1809 > l + yyj1783++ + if yyhl1783 { + yyb1783 = yyj1783 > l } else { - yyb1809 = r.CheckBreak() + yyb1783 = r.CheckBreak() } - if yyb1809 { + if yyb1783 { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) return } @@ -21392,26 +21093,26 @@ func (x *NetworkPolicyList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder if r.TryDecodeAsNil() { x.Items = nil } else { - yyv1814 := &x.Items - yym1815 := z.DecBinary() - _ = yym1815 + yyv1788 := &x.Items + yym1789 := z.DecBinary() + _ = yym1789 if false { } else { - h.decSliceNetworkPolicy((*[]NetworkPolicy)(yyv1814), d) + h.decSliceNetworkPolicy((*[]NetworkPolicy)(yyv1788), d) } } for { - yyj1809++ - if yyhl1809 { - yyb1809 = yyj1809 > l + yyj1783++ + if yyhl1783 { + yyb1783 = yyj1783 > l } else { - yyb1809 = r.CheckBreak() + yyb1783 = r.CheckBreak() } - if yyb1809 { + if yyb1783 { break } z.DecSendContainerState(codecSelfer_containerArrayElem1234) - z.DecStructFieldNotFound(yyj1809-1, "") + z.DecStructFieldNotFound(yyj1783-1, "") } z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -21421,10 +21122,10 @@ func (x codecSelfer1234) encSliceCustomMetricTarget(v []CustomMetricTarget, e *c z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1816 := range v { + for _, yyv1790 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1817 := &yyv1816 - yy1817.CodecEncodeSelf(e) + yy1791 := &yyv1790 + yy1791.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -21434,83 +21135,83 @@ func (x codecSelfer1234) decSliceCustomMetricTarget(v *[]CustomMetricTarget, d * z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1818 := *v - yyh1818, yyl1818 := z.DecSliceHelperStart() - var yyc1818 bool - if yyl1818 == 0 { - if yyv1818 == nil { - yyv1818 = []CustomMetricTarget{} - yyc1818 = true - } else if len(yyv1818) != 0 { - yyv1818 = yyv1818[:0] - yyc1818 = true + yyv1792 := *v + yyh1792, yyl1792 := z.DecSliceHelperStart() + var yyc1792 bool + if yyl1792 == 0 { + if yyv1792 == nil { + yyv1792 = []CustomMetricTarget{} + yyc1792 = true + } else if len(yyv1792) != 0 { + yyv1792 = yyv1792[:0] + yyc1792 = true } - } else if yyl1818 > 0 { - var yyrr1818, yyrl1818 int - var yyrt1818 bool - if yyl1818 > cap(yyv1818) { + } else if yyl1792 > 0 { + var yyrr1792, yyrl1792 int + var yyrt1792 bool + if yyl1792 > cap(yyv1792) { - yyrg1818 := len(yyv1818) > 0 - yyv21818 := yyv1818 - yyrl1818, yyrt1818 = z.DecInferLen(yyl1818, z.DecBasicHandle().MaxInitLen, 72) - if yyrt1818 { - if yyrl1818 <= cap(yyv1818) { - yyv1818 = yyv1818[:yyrl1818] + yyrg1792 := len(yyv1792) > 0 + yyv21792 := yyv1792 + yyrl1792, yyrt1792 = z.DecInferLen(yyl1792, z.DecBasicHandle().MaxInitLen, 72) + if yyrt1792 { + if yyrl1792 <= cap(yyv1792) { + yyv1792 = yyv1792[:yyrl1792] } else { - yyv1818 = make([]CustomMetricTarget, yyrl1818) + yyv1792 = make([]CustomMetricTarget, yyrl1792) } } else { - yyv1818 = make([]CustomMetricTarget, yyrl1818) + yyv1792 = make([]CustomMetricTarget, yyrl1792) } - yyc1818 = true - yyrr1818 = len(yyv1818) - if yyrg1818 { - copy(yyv1818, yyv21818) + yyc1792 = true + yyrr1792 = len(yyv1792) + if yyrg1792 { + copy(yyv1792, yyv21792) } - } else if yyl1818 != len(yyv1818) { - yyv1818 = yyv1818[:yyl1818] - yyc1818 = true + } else if yyl1792 != len(yyv1792) { + yyv1792 = yyv1792[:yyl1792] + yyc1792 = true } - yyj1818 := 0 - for ; yyj1818 < yyrr1818; yyj1818++ { - yyh1818.ElemContainerState(yyj1818) + yyj1792 := 0 + for ; yyj1792 < yyrr1792; yyj1792++ { + yyh1792.ElemContainerState(yyj1792) if r.TryDecodeAsNil() { - yyv1818[yyj1818] = CustomMetricTarget{} + yyv1792[yyj1792] = CustomMetricTarget{} } else { - yyv1819 := &yyv1818[yyj1818] - yyv1819.CodecDecodeSelf(d) + yyv1793 := &yyv1792[yyj1792] + yyv1793.CodecDecodeSelf(d) } } - if yyrt1818 { - for ; yyj1818 < yyl1818; yyj1818++ { - yyv1818 = append(yyv1818, CustomMetricTarget{}) - yyh1818.ElemContainerState(yyj1818) + if yyrt1792 { + for ; yyj1792 < yyl1792; yyj1792++ { + yyv1792 = append(yyv1792, CustomMetricTarget{}) + yyh1792.ElemContainerState(yyj1792) if r.TryDecodeAsNil() { - yyv1818[yyj1818] = CustomMetricTarget{} + yyv1792[yyj1792] = CustomMetricTarget{} } else { - yyv1820 := &yyv1818[yyj1818] - yyv1820.CodecDecodeSelf(d) + yyv1794 := &yyv1792[yyj1792] + yyv1794.CodecDecodeSelf(d) } } } } else { - yyj1818 := 0 - for ; !r.CheckBreak(); yyj1818++ { + yyj1792 := 0 + for ; !r.CheckBreak(); yyj1792++ { - if yyj1818 >= len(yyv1818) { - yyv1818 = append(yyv1818, CustomMetricTarget{}) // var yyz1818 CustomMetricTarget - yyc1818 = true + if yyj1792 >= len(yyv1792) { + yyv1792 = append(yyv1792, CustomMetricTarget{}) // var yyz1792 CustomMetricTarget + yyc1792 = true } - yyh1818.ElemContainerState(yyj1818) - if yyj1818 < len(yyv1818) { + yyh1792.ElemContainerState(yyj1792) + if yyj1792 < len(yyv1792) { if r.TryDecodeAsNil() { - yyv1818[yyj1818] = CustomMetricTarget{} + yyv1792[yyj1792] = CustomMetricTarget{} } else { - yyv1821 := &yyv1818[yyj1818] - yyv1821.CodecDecodeSelf(d) + yyv1795 := &yyv1792[yyj1792] + yyv1795.CodecDecodeSelf(d) } } else { @@ -21518,17 +21219,17 @@ func (x codecSelfer1234) decSliceCustomMetricTarget(v *[]CustomMetricTarget, d * } } - if yyj1818 < len(yyv1818) { - yyv1818 = yyv1818[:yyj1818] - yyc1818 = true - } else if yyj1818 == 0 && yyv1818 == nil { - yyv1818 = []CustomMetricTarget{} - yyc1818 = true + if yyj1792 < len(yyv1792) { + yyv1792 = yyv1792[:yyj1792] + yyc1792 = true + } else if yyj1792 == 0 && yyv1792 == nil { + yyv1792 = []CustomMetricTarget{} + yyc1792 = true } } - yyh1818.End() - if yyc1818 { - *v = yyv1818 + yyh1792.End() + if yyc1792 { + *v = yyv1792 } } @@ -21537,10 +21238,10 @@ func (x codecSelfer1234) encSliceCustomMetricCurrentStatus(v []CustomMetricCurre z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1822 := range v { + for _, yyv1796 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1823 := &yyv1822 - yy1823.CodecEncodeSelf(e) + yy1797 := &yyv1796 + yy1797.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -21550,83 +21251,83 @@ func (x codecSelfer1234) decSliceCustomMetricCurrentStatus(v *[]CustomMetricCurr z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1824 := *v - yyh1824, yyl1824 := z.DecSliceHelperStart() - var yyc1824 bool - if yyl1824 == 0 { - if yyv1824 == nil { - yyv1824 = []CustomMetricCurrentStatus{} - yyc1824 = true - } else if len(yyv1824) != 0 { - yyv1824 = yyv1824[:0] - yyc1824 = true + yyv1798 := *v + yyh1798, yyl1798 := z.DecSliceHelperStart() + var yyc1798 bool + if yyl1798 == 0 { + if yyv1798 == nil { + yyv1798 = []CustomMetricCurrentStatus{} + yyc1798 = true + } else if len(yyv1798) != 0 { + yyv1798 = yyv1798[:0] + yyc1798 = true } - } else if yyl1824 > 0 { - var yyrr1824, yyrl1824 int - var yyrt1824 bool - if yyl1824 > cap(yyv1824) { + } else if yyl1798 > 0 { + var yyrr1798, yyrl1798 int + var yyrt1798 bool + if yyl1798 > cap(yyv1798) { - yyrg1824 := len(yyv1824) > 0 - yyv21824 := yyv1824 - yyrl1824, yyrt1824 = z.DecInferLen(yyl1824, z.DecBasicHandle().MaxInitLen, 72) - if yyrt1824 { - if yyrl1824 <= cap(yyv1824) { - yyv1824 = yyv1824[:yyrl1824] + yyrg1798 := len(yyv1798) > 0 + yyv21798 := yyv1798 + yyrl1798, yyrt1798 = z.DecInferLen(yyl1798, z.DecBasicHandle().MaxInitLen, 72) + if yyrt1798 { + if yyrl1798 <= cap(yyv1798) { + yyv1798 = yyv1798[:yyrl1798] } else { - yyv1824 = make([]CustomMetricCurrentStatus, yyrl1824) + yyv1798 = make([]CustomMetricCurrentStatus, yyrl1798) } } else { - yyv1824 = make([]CustomMetricCurrentStatus, yyrl1824) + yyv1798 = make([]CustomMetricCurrentStatus, yyrl1798) } - yyc1824 = true - yyrr1824 = len(yyv1824) - if yyrg1824 { - copy(yyv1824, yyv21824) + yyc1798 = true + yyrr1798 = len(yyv1798) + if yyrg1798 { + copy(yyv1798, yyv21798) } - } else if yyl1824 != len(yyv1824) { - yyv1824 = yyv1824[:yyl1824] - yyc1824 = true + } else if yyl1798 != len(yyv1798) { + yyv1798 = yyv1798[:yyl1798] + yyc1798 = true } - yyj1824 := 0 - for ; yyj1824 < yyrr1824; yyj1824++ { - yyh1824.ElemContainerState(yyj1824) + yyj1798 := 0 + for ; yyj1798 < yyrr1798; yyj1798++ { + yyh1798.ElemContainerState(yyj1798) if r.TryDecodeAsNil() { - yyv1824[yyj1824] = CustomMetricCurrentStatus{} + yyv1798[yyj1798] = CustomMetricCurrentStatus{} } else { - yyv1825 := &yyv1824[yyj1824] - yyv1825.CodecDecodeSelf(d) + yyv1799 := &yyv1798[yyj1798] + yyv1799.CodecDecodeSelf(d) } } - if yyrt1824 { - for ; yyj1824 < yyl1824; yyj1824++ { - yyv1824 = append(yyv1824, CustomMetricCurrentStatus{}) - yyh1824.ElemContainerState(yyj1824) + if yyrt1798 { + for ; yyj1798 < yyl1798; yyj1798++ { + yyv1798 = append(yyv1798, CustomMetricCurrentStatus{}) + yyh1798.ElemContainerState(yyj1798) if r.TryDecodeAsNil() { - yyv1824[yyj1824] = CustomMetricCurrentStatus{} + yyv1798[yyj1798] = CustomMetricCurrentStatus{} } else { - yyv1826 := &yyv1824[yyj1824] - yyv1826.CodecDecodeSelf(d) + yyv1800 := &yyv1798[yyj1798] + yyv1800.CodecDecodeSelf(d) } } } } else { - yyj1824 := 0 - for ; !r.CheckBreak(); yyj1824++ { + yyj1798 := 0 + for ; !r.CheckBreak(); yyj1798++ { - if yyj1824 >= len(yyv1824) { - yyv1824 = append(yyv1824, CustomMetricCurrentStatus{}) // var yyz1824 CustomMetricCurrentStatus - yyc1824 = true + if yyj1798 >= len(yyv1798) { + yyv1798 = append(yyv1798, CustomMetricCurrentStatus{}) // var yyz1798 CustomMetricCurrentStatus + yyc1798 = true } - yyh1824.ElemContainerState(yyj1824) - if yyj1824 < len(yyv1824) { + yyh1798.ElemContainerState(yyj1798) + if yyj1798 < len(yyv1798) { if r.TryDecodeAsNil() { - yyv1824[yyj1824] = CustomMetricCurrentStatus{} + yyv1798[yyj1798] = CustomMetricCurrentStatus{} } else { - yyv1827 := &yyv1824[yyj1824] - yyv1827.CodecDecodeSelf(d) + yyv1801 := &yyv1798[yyj1798] + yyv1801.CodecDecodeSelf(d) } } else { @@ -21634,17 +21335,17 @@ func (x codecSelfer1234) decSliceCustomMetricCurrentStatus(v *[]CustomMetricCurr } } - if yyj1824 < len(yyv1824) { - yyv1824 = yyv1824[:yyj1824] - yyc1824 = true - } else if yyj1824 == 0 && yyv1824 == nil { - yyv1824 = []CustomMetricCurrentStatus{} - yyc1824 = true + if yyj1798 < len(yyv1798) { + yyv1798 = yyv1798[:yyj1798] + yyc1798 = true + } else if yyj1798 == 0 && yyv1798 == nil { + yyv1798 = []CustomMetricCurrentStatus{} + yyc1798 = true } } - yyh1824.End() - if yyc1824 { - *v = yyv1824 + yyh1798.End() + if yyc1798 { + *v = yyv1798 } } @@ -21653,10 +21354,10 @@ func (x codecSelfer1234) encSliceHorizontalPodAutoscaler(v []HorizontalPodAutosc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1828 := range v { + for _, yyv1802 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1829 := &yyv1828 - yy1829.CodecEncodeSelf(e) + yy1803 := &yyv1802 + yy1803.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -21666,83 +21367,83 @@ func (x codecSelfer1234) decSliceHorizontalPodAutoscaler(v *[]HorizontalPodAutos z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1830 := *v - yyh1830, yyl1830 := z.DecSliceHelperStart() - var yyc1830 bool - if yyl1830 == 0 { - if yyv1830 == nil { - yyv1830 = []HorizontalPodAutoscaler{} - yyc1830 = true - } else if len(yyv1830) != 0 { - yyv1830 = yyv1830[:0] - yyc1830 = true + yyv1804 := *v + yyh1804, yyl1804 := z.DecSliceHelperStart() + var yyc1804 bool + if yyl1804 == 0 { + if yyv1804 == nil { + yyv1804 = []HorizontalPodAutoscaler{} + yyc1804 = true + } else if len(yyv1804) != 0 { + yyv1804 = yyv1804[:0] + yyc1804 = true } - } else if yyl1830 > 0 { - var yyrr1830, yyrl1830 int - var yyrt1830 bool - if yyl1830 > cap(yyv1830) { + } else if yyl1804 > 0 { + var yyrr1804, yyrl1804 int + var yyrt1804 bool + if yyl1804 > cap(yyv1804) { - yyrg1830 := len(yyv1830) > 0 - yyv21830 := yyv1830 - yyrl1830, yyrt1830 = z.DecInferLen(yyl1830, z.DecBasicHandle().MaxInitLen, 376) - if yyrt1830 { - if yyrl1830 <= cap(yyv1830) { - yyv1830 = yyv1830[:yyrl1830] + yyrg1804 := len(yyv1804) > 0 + yyv21804 := yyv1804 + yyrl1804, yyrt1804 = z.DecInferLen(yyl1804, z.DecBasicHandle().MaxInitLen, 376) + if yyrt1804 { + if yyrl1804 <= cap(yyv1804) { + yyv1804 = yyv1804[:yyrl1804] } else { - yyv1830 = make([]HorizontalPodAutoscaler, yyrl1830) + yyv1804 = make([]HorizontalPodAutoscaler, yyrl1804) } } else { - yyv1830 = make([]HorizontalPodAutoscaler, yyrl1830) + yyv1804 = make([]HorizontalPodAutoscaler, yyrl1804) } - yyc1830 = true - yyrr1830 = len(yyv1830) - if yyrg1830 { - copy(yyv1830, yyv21830) + yyc1804 = true + yyrr1804 = len(yyv1804) + if yyrg1804 { + copy(yyv1804, yyv21804) } - } else if yyl1830 != len(yyv1830) { - yyv1830 = yyv1830[:yyl1830] - yyc1830 = true + } else if yyl1804 != len(yyv1804) { + yyv1804 = yyv1804[:yyl1804] + yyc1804 = true } - yyj1830 := 0 - for ; yyj1830 < yyrr1830; yyj1830++ { - yyh1830.ElemContainerState(yyj1830) + yyj1804 := 0 + for ; yyj1804 < yyrr1804; yyj1804++ { + yyh1804.ElemContainerState(yyj1804) if r.TryDecodeAsNil() { - yyv1830[yyj1830] = HorizontalPodAutoscaler{} + yyv1804[yyj1804] = HorizontalPodAutoscaler{} } else { - yyv1831 := &yyv1830[yyj1830] - yyv1831.CodecDecodeSelf(d) + yyv1805 := &yyv1804[yyj1804] + yyv1805.CodecDecodeSelf(d) } } - if yyrt1830 { - for ; yyj1830 < yyl1830; yyj1830++ { - yyv1830 = append(yyv1830, HorizontalPodAutoscaler{}) - yyh1830.ElemContainerState(yyj1830) + if yyrt1804 { + for ; yyj1804 < yyl1804; yyj1804++ { + yyv1804 = append(yyv1804, HorizontalPodAutoscaler{}) + yyh1804.ElemContainerState(yyj1804) if r.TryDecodeAsNil() { - yyv1830[yyj1830] = HorizontalPodAutoscaler{} + yyv1804[yyj1804] = HorizontalPodAutoscaler{} } else { - yyv1832 := &yyv1830[yyj1830] - yyv1832.CodecDecodeSelf(d) + yyv1806 := &yyv1804[yyj1804] + yyv1806.CodecDecodeSelf(d) } } } } else { - yyj1830 := 0 - for ; !r.CheckBreak(); yyj1830++ { + yyj1804 := 0 + for ; !r.CheckBreak(); yyj1804++ { - if yyj1830 >= len(yyv1830) { - yyv1830 = append(yyv1830, HorizontalPodAutoscaler{}) // var yyz1830 HorizontalPodAutoscaler - yyc1830 = true + if yyj1804 >= len(yyv1804) { + yyv1804 = append(yyv1804, HorizontalPodAutoscaler{}) // var yyz1804 HorizontalPodAutoscaler + yyc1804 = true } - yyh1830.ElemContainerState(yyj1830) - if yyj1830 < len(yyv1830) { + yyh1804.ElemContainerState(yyj1804) + if yyj1804 < len(yyv1804) { if r.TryDecodeAsNil() { - yyv1830[yyj1830] = HorizontalPodAutoscaler{} + yyv1804[yyj1804] = HorizontalPodAutoscaler{} } else { - yyv1833 := &yyv1830[yyj1830] - yyv1833.CodecDecodeSelf(d) + yyv1807 := &yyv1804[yyj1804] + yyv1807.CodecDecodeSelf(d) } } else { @@ -21750,17 +21451,17 @@ func (x codecSelfer1234) decSliceHorizontalPodAutoscaler(v *[]HorizontalPodAutos } } - if yyj1830 < len(yyv1830) { - yyv1830 = yyv1830[:yyj1830] - yyc1830 = true - } else if yyj1830 == 0 && yyv1830 == nil { - yyv1830 = []HorizontalPodAutoscaler{} - yyc1830 = true + if yyj1804 < len(yyv1804) { + yyv1804 = yyv1804[:yyj1804] + yyc1804 = true + } else if yyj1804 == 0 && yyv1804 == nil { + yyv1804 = []HorizontalPodAutoscaler{} + yyc1804 = true } } - yyh1830.End() - if yyc1830 { - *v = yyv1830 + yyh1804.End() + if yyc1804 { + *v = yyv1804 } } @@ -21769,10 +21470,10 @@ func (x codecSelfer1234) encSliceAPIVersion(v []APIVersion, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1834 := range v { + for _, yyv1808 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1835 := &yyv1834 - yy1835.CodecEncodeSelf(e) + yy1809 := &yyv1808 + yy1809.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -21782,83 +21483,83 @@ func (x codecSelfer1234) decSliceAPIVersion(v *[]APIVersion, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1836 := *v - yyh1836, yyl1836 := z.DecSliceHelperStart() - var yyc1836 bool - if yyl1836 == 0 { - if yyv1836 == nil { - yyv1836 = []APIVersion{} - yyc1836 = true - } else if len(yyv1836) != 0 { - yyv1836 = yyv1836[:0] - yyc1836 = true + yyv1810 := *v + yyh1810, yyl1810 := z.DecSliceHelperStart() + var yyc1810 bool + if yyl1810 == 0 { + if yyv1810 == nil { + yyv1810 = []APIVersion{} + yyc1810 = true + } else if len(yyv1810) != 0 { + yyv1810 = yyv1810[:0] + yyc1810 = true } - } else if yyl1836 > 0 { - var yyrr1836, yyrl1836 int - var yyrt1836 bool - if yyl1836 > cap(yyv1836) { + } else if yyl1810 > 0 { + var yyrr1810, yyrl1810 int + var yyrt1810 bool + if yyl1810 > cap(yyv1810) { - yyrg1836 := len(yyv1836) > 0 - yyv21836 := yyv1836 - yyrl1836, yyrt1836 = z.DecInferLen(yyl1836, z.DecBasicHandle().MaxInitLen, 16) - if yyrt1836 { - if yyrl1836 <= cap(yyv1836) { - yyv1836 = yyv1836[:yyrl1836] + yyrg1810 := len(yyv1810) > 0 + yyv21810 := yyv1810 + yyrl1810, yyrt1810 = z.DecInferLen(yyl1810, z.DecBasicHandle().MaxInitLen, 16) + if yyrt1810 { + if yyrl1810 <= cap(yyv1810) { + yyv1810 = yyv1810[:yyrl1810] } else { - yyv1836 = make([]APIVersion, yyrl1836) + yyv1810 = make([]APIVersion, yyrl1810) } } else { - yyv1836 = make([]APIVersion, yyrl1836) + yyv1810 = make([]APIVersion, yyrl1810) } - yyc1836 = true - yyrr1836 = len(yyv1836) - if yyrg1836 { - copy(yyv1836, yyv21836) + yyc1810 = true + yyrr1810 = len(yyv1810) + if yyrg1810 { + copy(yyv1810, yyv21810) } - } else if yyl1836 != len(yyv1836) { - yyv1836 = yyv1836[:yyl1836] - yyc1836 = true + } else if yyl1810 != len(yyv1810) { + yyv1810 = yyv1810[:yyl1810] + yyc1810 = true } - yyj1836 := 0 - for ; yyj1836 < yyrr1836; yyj1836++ { - yyh1836.ElemContainerState(yyj1836) + yyj1810 := 0 + for ; yyj1810 < yyrr1810; yyj1810++ { + yyh1810.ElemContainerState(yyj1810) if r.TryDecodeAsNil() { - yyv1836[yyj1836] = APIVersion{} + yyv1810[yyj1810] = APIVersion{} } else { - yyv1837 := &yyv1836[yyj1836] - yyv1837.CodecDecodeSelf(d) + yyv1811 := &yyv1810[yyj1810] + yyv1811.CodecDecodeSelf(d) } } - if yyrt1836 { - for ; yyj1836 < yyl1836; yyj1836++ { - yyv1836 = append(yyv1836, APIVersion{}) - yyh1836.ElemContainerState(yyj1836) + if yyrt1810 { + for ; yyj1810 < yyl1810; yyj1810++ { + yyv1810 = append(yyv1810, APIVersion{}) + yyh1810.ElemContainerState(yyj1810) if r.TryDecodeAsNil() { - yyv1836[yyj1836] = APIVersion{} + yyv1810[yyj1810] = APIVersion{} } else { - yyv1838 := &yyv1836[yyj1836] - yyv1838.CodecDecodeSelf(d) + yyv1812 := &yyv1810[yyj1810] + yyv1812.CodecDecodeSelf(d) } } } } else { - yyj1836 := 0 - for ; !r.CheckBreak(); yyj1836++ { + yyj1810 := 0 + for ; !r.CheckBreak(); yyj1810++ { - if yyj1836 >= len(yyv1836) { - yyv1836 = append(yyv1836, APIVersion{}) // var yyz1836 APIVersion - yyc1836 = true + if yyj1810 >= len(yyv1810) { + yyv1810 = append(yyv1810, APIVersion{}) // var yyz1810 APIVersion + yyc1810 = true } - yyh1836.ElemContainerState(yyj1836) - if yyj1836 < len(yyv1836) { + yyh1810.ElemContainerState(yyj1810) + if yyj1810 < len(yyv1810) { if r.TryDecodeAsNil() { - yyv1836[yyj1836] = APIVersion{} + yyv1810[yyj1810] = APIVersion{} } else { - yyv1839 := &yyv1836[yyj1836] - yyv1839.CodecDecodeSelf(d) + yyv1813 := &yyv1810[yyj1810] + yyv1813.CodecDecodeSelf(d) } } else { @@ -21866,17 +21567,17 @@ func (x codecSelfer1234) decSliceAPIVersion(v *[]APIVersion, d *codec1978.Decode } } - if yyj1836 < len(yyv1836) { - yyv1836 = yyv1836[:yyj1836] - yyc1836 = true - } else if yyj1836 == 0 && yyv1836 == nil { - yyv1836 = []APIVersion{} - yyc1836 = true + if yyj1810 < len(yyv1810) { + yyv1810 = yyv1810[:yyj1810] + yyc1810 = true + } else if yyj1810 == 0 && yyv1810 == nil { + yyv1810 = []APIVersion{} + yyc1810 = true } } - yyh1836.End() - if yyc1836 { - *v = yyv1836 + yyh1810.End() + if yyc1810 { + *v = yyv1810 } } @@ -21885,10 +21586,10 @@ func (x codecSelfer1234) encSliceThirdPartyResource(v []ThirdPartyResource, e *c z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1840 := range v { + for _, yyv1814 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1841 := &yyv1840 - yy1841.CodecEncodeSelf(e) + yy1815 := &yyv1814 + yy1815.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -21898,83 +21599,83 @@ func (x codecSelfer1234) decSliceThirdPartyResource(v *[]ThirdPartyResource, d * z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1842 := *v - yyh1842, yyl1842 := z.DecSliceHelperStart() - var yyc1842 bool - if yyl1842 == 0 { - if yyv1842 == nil { - yyv1842 = []ThirdPartyResource{} - yyc1842 = true - } else if len(yyv1842) != 0 { - yyv1842 = yyv1842[:0] - yyc1842 = true + yyv1816 := *v + yyh1816, yyl1816 := z.DecSliceHelperStart() + var yyc1816 bool + if yyl1816 == 0 { + if yyv1816 == nil { + yyv1816 = []ThirdPartyResource{} + yyc1816 = true + } else if len(yyv1816) != 0 { + yyv1816 = yyv1816[:0] + yyc1816 = true } - } else if yyl1842 > 0 { - var yyrr1842, yyrl1842 int - var yyrt1842 bool - if yyl1842 > cap(yyv1842) { + } else if yyl1816 > 0 { + var yyrr1816, yyrl1816 int + var yyrt1816 bool + if yyl1816 > cap(yyv1816) { - yyrg1842 := len(yyv1842) > 0 - yyv21842 := yyv1842 - yyrl1842, yyrt1842 = z.DecInferLen(yyl1842, z.DecBasicHandle().MaxInitLen, 296) - if yyrt1842 { - if yyrl1842 <= cap(yyv1842) { - yyv1842 = yyv1842[:yyrl1842] + yyrg1816 := len(yyv1816) > 0 + yyv21816 := yyv1816 + yyrl1816, yyrt1816 = z.DecInferLen(yyl1816, z.DecBasicHandle().MaxInitLen, 296) + if yyrt1816 { + if yyrl1816 <= cap(yyv1816) { + yyv1816 = yyv1816[:yyrl1816] } else { - yyv1842 = make([]ThirdPartyResource, yyrl1842) + yyv1816 = make([]ThirdPartyResource, yyrl1816) } } else { - yyv1842 = make([]ThirdPartyResource, yyrl1842) + yyv1816 = make([]ThirdPartyResource, yyrl1816) } - yyc1842 = true - yyrr1842 = len(yyv1842) - if yyrg1842 { - copy(yyv1842, yyv21842) + yyc1816 = true + yyrr1816 = len(yyv1816) + if yyrg1816 { + copy(yyv1816, yyv21816) } - } else if yyl1842 != len(yyv1842) { - yyv1842 = yyv1842[:yyl1842] - yyc1842 = true + } else if yyl1816 != len(yyv1816) { + yyv1816 = yyv1816[:yyl1816] + yyc1816 = true } - yyj1842 := 0 - for ; yyj1842 < yyrr1842; yyj1842++ { - yyh1842.ElemContainerState(yyj1842) + yyj1816 := 0 + for ; yyj1816 < yyrr1816; yyj1816++ { + yyh1816.ElemContainerState(yyj1816) if r.TryDecodeAsNil() { - yyv1842[yyj1842] = ThirdPartyResource{} + yyv1816[yyj1816] = ThirdPartyResource{} } else { - yyv1843 := &yyv1842[yyj1842] - yyv1843.CodecDecodeSelf(d) + yyv1817 := &yyv1816[yyj1816] + yyv1817.CodecDecodeSelf(d) } } - if yyrt1842 { - for ; yyj1842 < yyl1842; yyj1842++ { - yyv1842 = append(yyv1842, ThirdPartyResource{}) - yyh1842.ElemContainerState(yyj1842) + if yyrt1816 { + for ; yyj1816 < yyl1816; yyj1816++ { + yyv1816 = append(yyv1816, ThirdPartyResource{}) + yyh1816.ElemContainerState(yyj1816) if r.TryDecodeAsNil() { - yyv1842[yyj1842] = ThirdPartyResource{} + yyv1816[yyj1816] = ThirdPartyResource{} } else { - yyv1844 := &yyv1842[yyj1842] - yyv1844.CodecDecodeSelf(d) + yyv1818 := &yyv1816[yyj1816] + yyv1818.CodecDecodeSelf(d) } } } } else { - yyj1842 := 0 - for ; !r.CheckBreak(); yyj1842++ { + yyj1816 := 0 + for ; !r.CheckBreak(); yyj1816++ { - if yyj1842 >= len(yyv1842) { - yyv1842 = append(yyv1842, ThirdPartyResource{}) // var yyz1842 ThirdPartyResource - yyc1842 = true + if yyj1816 >= len(yyv1816) { + yyv1816 = append(yyv1816, ThirdPartyResource{}) // var yyz1816 ThirdPartyResource + yyc1816 = true } - yyh1842.ElemContainerState(yyj1842) - if yyj1842 < len(yyv1842) { + yyh1816.ElemContainerState(yyj1816) + if yyj1816 < len(yyv1816) { if r.TryDecodeAsNil() { - yyv1842[yyj1842] = ThirdPartyResource{} + yyv1816[yyj1816] = ThirdPartyResource{} } else { - yyv1845 := &yyv1842[yyj1842] - yyv1845.CodecDecodeSelf(d) + yyv1819 := &yyv1816[yyj1816] + yyv1819.CodecDecodeSelf(d) } } else { @@ -21982,17 +21683,17 @@ func (x codecSelfer1234) decSliceThirdPartyResource(v *[]ThirdPartyResource, d * } } - if yyj1842 < len(yyv1842) { - yyv1842 = yyv1842[:yyj1842] - yyc1842 = true - } else if yyj1842 == 0 && yyv1842 == nil { - yyv1842 = []ThirdPartyResource{} - yyc1842 = true + if yyj1816 < len(yyv1816) { + yyv1816 = yyv1816[:yyj1816] + yyc1816 = true + } else if yyj1816 == 0 && yyv1816 == nil { + yyv1816 = []ThirdPartyResource{} + yyc1816 = true } } - yyh1842.End() - if yyc1842 { - *v = yyv1842 + yyh1816.End() + if yyc1816 { + *v = yyv1816 } } @@ -22001,10 +21702,10 @@ func (x codecSelfer1234) encSliceDeploymentCondition(v []DeploymentCondition, e z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1846 := range v { + for _, yyv1820 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1847 := &yyv1846 - yy1847.CodecEncodeSelf(e) + yy1821 := &yyv1820 + yy1821.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -22014,83 +21715,83 @@ func (x codecSelfer1234) decSliceDeploymentCondition(v *[]DeploymentCondition, d z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1848 := *v - yyh1848, yyl1848 := z.DecSliceHelperStart() - var yyc1848 bool - if yyl1848 == 0 { - if yyv1848 == nil { - yyv1848 = []DeploymentCondition{} - yyc1848 = true - } else if len(yyv1848) != 0 { - yyv1848 = yyv1848[:0] - yyc1848 = true + yyv1822 := *v + yyh1822, yyl1822 := z.DecSliceHelperStart() + var yyc1822 bool + if yyl1822 == 0 { + if yyv1822 == nil { + yyv1822 = []DeploymentCondition{} + yyc1822 = true + } else if len(yyv1822) != 0 { + yyv1822 = yyv1822[:0] + yyc1822 = true } - } else if yyl1848 > 0 { - var yyrr1848, yyrl1848 int - var yyrt1848 bool - if yyl1848 > cap(yyv1848) { + } else if yyl1822 > 0 { + var yyrr1822, yyrl1822 int + var yyrt1822 bool + if yyl1822 > cap(yyv1822) { - yyrg1848 := len(yyv1848) > 0 - yyv21848 := yyv1848 - yyrl1848, yyrt1848 = z.DecInferLen(yyl1848, z.DecBasicHandle().MaxInitLen, 112) - if yyrt1848 { - if yyrl1848 <= cap(yyv1848) { - yyv1848 = yyv1848[:yyrl1848] + yyrg1822 := len(yyv1822) > 0 + yyv21822 := yyv1822 + yyrl1822, yyrt1822 = z.DecInferLen(yyl1822, z.DecBasicHandle().MaxInitLen, 112) + if yyrt1822 { + if yyrl1822 <= cap(yyv1822) { + yyv1822 = yyv1822[:yyrl1822] } else { - yyv1848 = make([]DeploymentCondition, yyrl1848) + yyv1822 = make([]DeploymentCondition, yyrl1822) } } else { - yyv1848 = make([]DeploymentCondition, yyrl1848) + yyv1822 = make([]DeploymentCondition, yyrl1822) } - yyc1848 = true - yyrr1848 = len(yyv1848) - if yyrg1848 { - copy(yyv1848, yyv21848) + yyc1822 = true + yyrr1822 = len(yyv1822) + if yyrg1822 { + copy(yyv1822, yyv21822) } - } else if yyl1848 != len(yyv1848) { - yyv1848 = yyv1848[:yyl1848] - yyc1848 = true + } else if yyl1822 != len(yyv1822) { + yyv1822 = yyv1822[:yyl1822] + yyc1822 = true } - yyj1848 := 0 - for ; yyj1848 < yyrr1848; yyj1848++ { - yyh1848.ElemContainerState(yyj1848) + yyj1822 := 0 + for ; yyj1822 < yyrr1822; yyj1822++ { + yyh1822.ElemContainerState(yyj1822) if r.TryDecodeAsNil() { - yyv1848[yyj1848] = DeploymentCondition{} + yyv1822[yyj1822] = DeploymentCondition{} } else { - yyv1849 := &yyv1848[yyj1848] - yyv1849.CodecDecodeSelf(d) + yyv1823 := &yyv1822[yyj1822] + yyv1823.CodecDecodeSelf(d) } } - if yyrt1848 { - for ; yyj1848 < yyl1848; yyj1848++ { - yyv1848 = append(yyv1848, DeploymentCondition{}) - yyh1848.ElemContainerState(yyj1848) + if yyrt1822 { + for ; yyj1822 < yyl1822; yyj1822++ { + yyv1822 = append(yyv1822, DeploymentCondition{}) + yyh1822.ElemContainerState(yyj1822) if r.TryDecodeAsNil() { - yyv1848[yyj1848] = DeploymentCondition{} + yyv1822[yyj1822] = DeploymentCondition{} } else { - yyv1850 := &yyv1848[yyj1848] - yyv1850.CodecDecodeSelf(d) + yyv1824 := &yyv1822[yyj1822] + yyv1824.CodecDecodeSelf(d) } } } } else { - yyj1848 := 0 - for ; !r.CheckBreak(); yyj1848++ { + yyj1822 := 0 + for ; !r.CheckBreak(); yyj1822++ { - if yyj1848 >= len(yyv1848) { - yyv1848 = append(yyv1848, DeploymentCondition{}) // var yyz1848 DeploymentCondition - yyc1848 = true + if yyj1822 >= len(yyv1822) { + yyv1822 = append(yyv1822, DeploymentCondition{}) // var yyz1822 DeploymentCondition + yyc1822 = true } - yyh1848.ElemContainerState(yyj1848) - if yyj1848 < len(yyv1848) { + yyh1822.ElemContainerState(yyj1822) + if yyj1822 < len(yyv1822) { if r.TryDecodeAsNil() { - yyv1848[yyj1848] = DeploymentCondition{} + yyv1822[yyj1822] = DeploymentCondition{} } else { - yyv1851 := &yyv1848[yyj1848] - yyv1851.CodecDecodeSelf(d) + yyv1825 := &yyv1822[yyj1822] + yyv1825.CodecDecodeSelf(d) } } else { @@ -22098,17 +21799,17 @@ func (x codecSelfer1234) decSliceDeploymentCondition(v *[]DeploymentCondition, d } } - if yyj1848 < len(yyv1848) { - yyv1848 = yyv1848[:yyj1848] - yyc1848 = true - } else if yyj1848 == 0 && yyv1848 == nil { - yyv1848 = []DeploymentCondition{} - yyc1848 = true + if yyj1822 < len(yyv1822) { + yyv1822 = yyv1822[:yyj1822] + yyc1822 = true + } else if yyj1822 == 0 && yyv1822 == nil { + yyv1822 = []DeploymentCondition{} + yyc1822 = true } } - yyh1848.End() - if yyc1848 { - *v = yyv1848 + yyh1822.End() + if yyc1822 { + *v = yyv1822 } } @@ -22117,10 +21818,10 @@ func (x codecSelfer1234) encSliceDeployment(v []Deployment, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1852 := range v { + for _, yyv1826 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1853 := &yyv1852 - yy1853.CodecEncodeSelf(e) + yy1827 := &yyv1826 + yy1827.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -22130,83 +21831,83 @@ func (x codecSelfer1234) decSliceDeployment(v *[]Deployment, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1854 := *v - yyh1854, yyl1854 := z.DecSliceHelperStart() - var yyc1854 bool - if yyl1854 == 0 { - if yyv1854 == nil { - yyv1854 = []Deployment{} - yyc1854 = true - } else if len(yyv1854) != 0 { - yyv1854 = yyv1854[:0] - yyc1854 = true + yyv1828 := *v + yyh1828, yyl1828 := z.DecSliceHelperStart() + var yyc1828 bool + if yyl1828 == 0 { + if yyv1828 == nil { + yyv1828 = []Deployment{} + yyc1828 = true + } else if len(yyv1828) != 0 { + yyv1828 = yyv1828[:0] + yyc1828 = true } - } else if yyl1854 > 0 { - var yyrr1854, yyrl1854 int - var yyrt1854 bool - if yyl1854 > cap(yyv1854) { + } else if yyl1828 > 0 { + var yyrr1828, yyrl1828 int + var yyrt1828 bool + if yyl1828 > cap(yyv1828) { - yyrg1854 := len(yyv1854) > 0 - yyv21854 := yyv1854 - yyrl1854, yyrt1854 = z.DecInferLen(yyl1854, z.DecBasicHandle().MaxInitLen, 856) - if yyrt1854 { - if yyrl1854 <= cap(yyv1854) { - yyv1854 = yyv1854[:yyrl1854] + yyrg1828 := len(yyv1828) > 0 + yyv21828 := yyv1828 + yyrl1828, yyrt1828 = z.DecInferLen(yyl1828, z.DecBasicHandle().MaxInitLen, 856) + if yyrt1828 { + if yyrl1828 <= cap(yyv1828) { + yyv1828 = yyv1828[:yyrl1828] } else { - yyv1854 = make([]Deployment, yyrl1854) + yyv1828 = make([]Deployment, yyrl1828) } } else { - yyv1854 = make([]Deployment, yyrl1854) + yyv1828 = make([]Deployment, yyrl1828) } - yyc1854 = true - yyrr1854 = len(yyv1854) - if yyrg1854 { - copy(yyv1854, yyv21854) + yyc1828 = true + yyrr1828 = len(yyv1828) + if yyrg1828 { + copy(yyv1828, yyv21828) } - } else if yyl1854 != len(yyv1854) { - yyv1854 = yyv1854[:yyl1854] - yyc1854 = true + } else if yyl1828 != len(yyv1828) { + yyv1828 = yyv1828[:yyl1828] + yyc1828 = true } - yyj1854 := 0 - for ; yyj1854 < yyrr1854; yyj1854++ { - yyh1854.ElemContainerState(yyj1854) + yyj1828 := 0 + for ; yyj1828 < yyrr1828; yyj1828++ { + yyh1828.ElemContainerState(yyj1828) if r.TryDecodeAsNil() { - yyv1854[yyj1854] = Deployment{} + yyv1828[yyj1828] = Deployment{} } else { - yyv1855 := &yyv1854[yyj1854] - yyv1855.CodecDecodeSelf(d) + yyv1829 := &yyv1828[yyj1828] + yyv1829.CodecDecodeSelf(d) } } - if yyrt1854 { - for ; yyj1854 < yyl1854; yyj1854++ { - yyv1854 = append(yyv1854, Deployment{}) - yyh1854.ElemContainerState(yyj1854) + if yyrt1828 { + for ; yyj1828 < yyl1828; yyj1828++ { + yyv1828 = append(yyv1828, Deployment{}) + yyh1828.ElemContainerState(yyj1828) if r.TryDecodeAsNil() { - yyv1854[yyj1854] = Deployment{} + yyv1828[yyj1828] = Deployment{} } else { - yyv1856 := &yyv1854[yyj1854] - yyv1856.CodecDecodeSelf(d) + yyv1830 := &yyv1828[yyj1828] + yyv1830.CodecDecodeSelf(d) } } } } else { - yyj1854 := 0 - for ; !r.CheckBreak(); yyj1854++ { + yyj1828 := 0 + for ; !r.CheckBreak(); yyj1828++ { - if yyj1854 >= len(yyv1854) { - yyv1854 = append(yyv1854, Deployment{}) // var yyz1854 Deployment - yyc1854 = true + if yyj1828 >= len(yyv1828) { + yyv1828 = append(yyv1828, Deployment{}) // var yyz1828 Deployment + yyc1828 = true } - yyh1854.ElemContainerState(yyj1854) - if yyj1854 < len(yyv1854) { + yyh1828.ElemContainerState(yyj1828) + if yyj1828 < len(yyv1828) { if r.TryDecodeAsNil() { - yyv1854[yyj1854] = Deployment{} + yyv1828[yyj1828] = Deployment{} } else { - yyv1857 := &yyv1854[yyj1854] - yyv1857.CodecDecodeSelf(d) + yyv1831 := &yyv1828[yyj1828] + yyv1831.CodecDecodeSelf(d) } } else { @@ -22214,17 +21915,17 @@ func (x codecSelfer1234) decSliceDeployment(v *[]Deployment, d *codec1978.Decode } } - if yyj1854 < len(yyv1854) { - yyv1854 = yyv1854[:yyj1854] - yyc1854 = true - } else if yyj1854 == 0 && yyv1854 == nil { - yyv1854 = []Deployment{} - yyc1854 = true + if yyj1828 < len(yyv1828) { + yyv1828 = yyv1828[:yyj1828] + yyc1828 = true + } else if yyj1828 == 0 && yyv1828 == nil { + yyv1828 = []Deployment{} + yyc1828 = true } } - yyh1854.End() - if yyc1854 { - *v = yyv1854 + yyh1828.End() + if yyc1828 { + *v = yyv1828 } } @@ -22233,10 +21934,10 @@ func (x codecSelfer1234) encSliceDaemonSet(v []DaemonSet, e *codec1978.Encoder) z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1858 := range v { + for _, yyv1832 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1859 := &yyv1858 - yy1859.CodecEncodeSelf(e) + yy1833 := &yyv1832 + yy1833.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -22246,83 +21947,83 @@ func (x codecSelfer1234) decSliceDaemonSet(v *[]DaemonSet, d *codec1978.Decoder) z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1860 := *v - yyh1860, yyl1860 := z.DecSliceHelperStart() - var yyc1860 bool - if yyl1860 == 0 { - if yyv1860 == nil { - yyv1860 = []DaemonSet{} - yyc1860 = true - } else if len(yyv1860) != 0 { - yyv1860 = yyv1860[:0] - yyc1860 = true + yyv1834 := *v + yyh1834, yyl1834 := z.DecSliceHelperStart() + var yyc1834 bool + if yyl1834 == 0 { + if yyv1834 == nil { + yyv1834 = []DaemonSet{} + yyc1834 = true + } else if len(yyv1834) != 0 { + yyv1834 = yyv1834[:0] + yyc1834 = true } - } else if yyl1860 > 0 { - var yyrr1860, yyrl1860 int - var yyrt1860 bool - if yyl1860 > cap(yyv1860) { + } else if yyl1834 > 0 { + var yyrr1834, yyrl1834 int + var yyrt1834 bool + if yyl1834 > cap(yyv1834) { - yyrg1860 := len(yyv1860) > 0 - yyv21860 := yyv1860 - yyrl1860, yyrt1860 = z.DecInferLen(yyl1860, z.DecBasicHandle().MaxInitLen, 752) - if yyrt1860 { - if yyrl1860 <= cap(yyv1860) { - yyv1860 = yyv1860[:yyrl1860] + yyrg1834 := len(yyv1834) > 0 + yyv21834 := yyv1834 + yyrl1834, yyrt1834 = z.DecInferLen(yyl1834, z.DecBasicHandle().MaxInitLen, 752) + if yyrt1834 { + if yyrl1834 <= cap(yyv1834) { + yyv1834 = yyv1834[:yyrl1834] } else { - yyv1860 = make([]DaemonSet, yyrl1860) + yyv1834 = make([]DaemonSet, yyrl1834) } } else { - yyv1860 = make([]DaemonSet, yyrl1860) + yyv1834 = make([]DaemonSet, yyrl1834) } - yyc1860 = true - yyrr1860 = len(yyv1860) - if yyrg1860 { - copy(yyv1860, yyv21860) + yyc1834 = true + yyrr1834 = len(yyv1834) + if yyrg1834 { + copy(yyv1834, yyv21834) } - } else if yyl1860 != len(yyv1860) { - yyv1860 = yyv1860[:yyl1860] - yyc1860 = true + } else if yyl1834 != len(yyv1834) { + yyv1834 = yyv1834[:yyl1834] + yyc1834 = true } - yyj1860 := 0 - for ; yyj1860 < yyrr1860; yyj1860++ { - yyh1860.ElemContainerState(yyj1860) + yyj1834 := 0 + for ; yyj1834 < yyrr1834; yyj1834++ { + yyh1834.ElemContainerState(yyj1834) if r.TryDecodeAsNil() { - yyv1860[yyj1860] = DaemonSet{} + yyv1834[yyj1834] = DaemonSet{} } else { - yyv1861 := &yyv1860[yyj1860] - yyv1861.CodecDecodeSelf(d) + yyv1835 := &yyv1834[yyj1834] + yyv1835.CodecDecodeSelf(d) } } - if yyrt1860 { - for ; yyj1860 < yyl1860; yyj1860++ { - yyv1860 = append(yyv1860, DaemonSet{}) - yyh1860.ElemContainerState(yyj1860) + if yyrt1834 { + for ; yyj1834 < yyl1834; yyj1834++ { + yyv1834 = append(yyv1834, DaemonSet{}) + yyh1834.ElemContainerState(yyj1834) if r.TryDecodeAsNil() { - yyv1860[yyj1860] = DaemonSet{} + yyv1834[yyj1834] = DaemonSet{} } else { - yyv1862 := &yyv1860[yyj1860] - yyv1862.CodecDecodeSelf(d) + yyv1836 := &yyv1834[yyj1834] + yyv1836.CodecDecodeSelf(d) } } } } else { - yyj1860 := 0 - for ; !r.CheckBreak(); yyj1860++ { + yyj1834 := 0 + for ; !r.CheckBreak(); yyj1834++ { - if yyj1860 >= len(yyv1860) { - yyv1860 = append(yyv1860, DaemonSet{}) // var yyz1860 DaemonSet - yyc1860 = true + if yyj1834 >= len(yyv1834) { + yyv1834 = append(yyv1834, DaemonSet{}) // var yyz1834 DaemonSet + yyc1834 = true } - yyh1860.ElemContainerState(yyj1860) - if yyj1860 < len(yyv1860) { + yyh1834.ElemContainerState(yyj1834) + if yyj1834 < len(yyv1834) { if r.TryDecodeAsNil() { - yyv1860[yyj1860] = DaemonSet{} + yyv1834[yyj1834] = DaemonSet{} } else { - yyv1863 := &yyv1860[yyj1860] - yyv1863.CodecDecodeSelf(d) + yyv1837 := &yyv1834[yyj1834] + yyv1837.CodecDecodeSelf(d) } } else { @@ -22330,17 +22031,17 @@ func (x codecSelfer1234) decSliceDaemonSet(v *[]DaemonSet, d *codec1978.Decoder) } } - if yyj1860 < len(yyv1860) { - yyv1860 = yyv1860[:yyj1860] - yyc1860 = true - } else if yyj1860 == 0 && yyv1860 == nil { - yyv1860 = []DaemonSet{} - yyc1860 = true + if yyj1834 < len(yyv1834) { + yyv1834 = yyv1834[:yyj1834] + yyc1834 = true + } else if yyj1834 == 0 && yyv1834 == nil { + yyv1834 = []DaemonSet{} + yyc1834 = true } } - yyh1860.End() - if yyc1860 { - *v = yyv1860 + yyh1834.End() + if yyc1834 { + *v = yyv1834 } } @@ -22349,10 +22050,10 @@ func (x codecSelfer1234) encSliceThirdPartyResourceData(v []ThirdPartyResourceDa z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1864 := range v { + for _, yyv1838 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1865 := &yyv1864 - yy1865.CodecEncodeSelf(e) + yy1839 := &yyv1838 + yy1839.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -22362,83 +22063,83 @@ func (x codecSelfer1234) decSliceThirdPartyResourceData(v *[]ThirdPartyResourceD z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1866 := *v - yyh1866, yyl1866 := z.DecSliceHelperStart() - var yyc1866 bool - if yyl1866 == 0 { - if yyv1866 == nil { - yyv1866 = []ThirdPartyResourceData{} - yyc1866 = true - } else if len(yyv1866) != 0 { - yyv1866 = yyv1866[:0] - yyc1866 = true + yyv1840 := *v + yyh1840, yyl1840 := z.DecSliceHelperStart() + var yyc1840 bool + if yyl1840 == 0 { + if yyv1840 == nil { + yyv1840 = []ThirdPartyResourceData{} + yyc1840 = true + } else if len(yyv1840) != 0 { + yyv1840 = yyv1840[:0] + yyc1840 = true } - } else if yyl1866 > 0 { - var yyrr1866, yyrl1866 int - var yyrt1866 bool - if yyl1866 > cap(yyv1866) { + } else if yyl1840 > 0 { + var yyrr1840, yyrl1840 int + var yyrt1840 bool + if yyl1840 > cap(yyv1840) { - yyrg1866 := len(yyv1866) > 0 - yyv21866 := yyv1866 - yyrl1866, yyrt1866 = z.DecInferLen(yyl1866, z.DecBasicHandle().MaxInitLen, 280) - if yyrt1866 { - if yyrl1866 <= cap(yyv1866) { - yyv1866 = yyv1866[:yyrl1866] + yyrg1840 := len(yyv1840) > 0 + yyv21840 := yyv1840 + yyrl1840, yyrt1840 = z.DecInferLen(yyl1840, z.DecBasicHandle().MaxInitLen, 280) + if yyrt1840 { + if yyrl1840 <= cap(yyv1840) { + yyv1840 = yyv1840[:yyrl1840] } else { - yyv1866 = make([]ThirdPartyResourceData, yyrl1866) + yyv1840 = make([]ThirdPartyResourceData, yyrl1840) } } else { - yyv1866 = make([]ThirdPartyResourceData, yyrl1866) + yyv1840 = make([]ThirdPartyResourceData, yyrl1840) } - yyc1866 = true - yyrr1866 = len(yyv1866) - if yyrg1866 { - copy(yyv1866, yyv21866) + yyc1840 = true + yyrr1840 = len(yyv1840) + if yyrg1840 { + copy(yyv1840, yyv21840) } - } else if yyl1866 != len(yyv1866) { - yyv1866 = yyv1866[:yyl1866] - yyc1866 = true + } else if yyl1840 != len(yyv1840) { + yyv1840 = yyv1840[:yyl1840] + yyc1840 = true } - yyj1866 := 0 - for ; yyj1866 < yyrr1866; yyj1866++ { - yyh1866.ElemContainerState(yyj1866) + yyj1840 := 0 + for ; yyj1840 < yyrr1840; yyj1840++ { + yyh1840.ElemContainerState(yyj1840) if r.TryDecodeAsNil() { - yyv1866[yyj1866] = ThirdPartyResourceData{} + yyv1840[yyj1840] = ThirdPartyResourceData{} } else { - yyv1867 := &yyv1866[yyj1866] - yyv1867.CodecDecodeSelf(d) + yyv1841 := &yyv1840[yyj1840] + yyv1841.CodecDecodeSelf(d) } } - if yyrt1866 { - for ; yyj1866 < yyl1866; yyj1866++ { - yyv1866 = append(yyv1866, ThirdPartyResourceData{}) - yyh1866.ElemContainerState(yyj1866) + if yyrt1840 { + for ; yyj1840 < yyl1840; yyj1840++ { + yyv1840 = append(yyv1840, ThirdPartyResourceData{}) + yyh1840.ElemContainerState(yyj1840) if r.TryDecodeAsNil() { - yyv1866[yyj1866] = ThirdPartyResourceData{} + yyv1840[yyj1840] = ThirdPartyResourceData{} } else { - yyv1868 := &yyv1866[yyj1866] - yyv1868.CodecDecodeSelf(d) + yyv1842 := &yyv1840[yyj1840] + yyv1842.CodecDecodeSelf(d) } } } } else { - yyj1866 := 0 - for ; !r.CheckBreak(); yyj1866++ { + yyj1840 := 0 + for ; !r.CheckBreak(); yyj1840++ { - if yyj1866 >= len(yyv1866) { - yyv1866 = append(yyv1866, ThirdPartyResourceData{}) // var yyz1866 ThirdPartyResourceData - yyc1866 = true + if yyj1840 >= len(yyv1840) { + yyv1840 = append(yyv1840, ThirdPartyResourceData{}) // var yyz1840 ThirdPartyResourceData + yyc1840 = true } - yyh1866.ElemContainerState(yyj1866) - if yyj1866 < len(yyv1866) { + yyh1840.ElemContainerState(yyj1840) + if yyj1840 < len(yyv1840) { if r.TryDecodeAsNil() { - yyv1866[yyj1866] = ThirdPartyResourceData{} + yyv1840[yyj1840] = ThirdPartyResourceData{} } else { - yyv1869 := &yyv1866[yyj1866] - yyv1869.CodecDecodeSelf(d) + yyv1843 := &yyv1840[yyj1840] + yyv1843.CodecDecodeSelf(d) } } else { @@ -22446,17 +22147,17 @@ func (x codecSelfer1234) decSliceThirdPartyResourceData(v *[]ThirdPartyResourceD } } - if yyj1866 < len(yyv1866) { - yyv1866 = yyv1866[:yyj1866] - yyc1866 = true - } else if yyj1866 == 0 && yyv1866 == nil { - yyv1866 = []ThirdPartyResourceData{} - yyc1866 = true + if yyj1840 < len(yyv1840) { + yyv1840 = yyv1840[:yyj1840] + yyc1840 = true + } else if yyj1840 == 0 && yyv1840 == nil { + yyv1840 = []ThirdPartyResourceData{} + yyc1840 = true } } - yyh1866.End() - if yyc1866 { - *v = yyv1866 + yyh1840.End() + if yyc1840 { + *v = yyv1840 } } @@ -22465,10 +22166,10 @@ func (x codecSelfer1234) encSliceJob(v []Job, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1870 := range v { + for _, yyv1844 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1871 := &yyv1870 - yy1871.CodecEncodeSelf(e) + yy1845 := &yyv1844 + yy1845.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -22478,83 +22179,83 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1872 := *v - yyh1872, yyl1872 := z.DecSliceHelperStart() - var yyc1872 bool - if yyl1872 == 0 { - if yyv1872 == nil { - yyv1872 = []Job{} - yyc1872 = true - } else if len(yyv1872) != 0 { - yyv1872 = yyv1872[:0] - yyc1872 = true + yyv1846 := *v + yyh1846, yyl1846 := z.DecSliceHelperStart() + var yyc1846 bool + if yyl1846 == 0 { + if yyv1846 == nil { + yyv1846 = []Job{} + yyc1846 = true + } else if len(yyv1846) != 0 { + yyv1846 = yyv1846[:0] + yyc1846 = true } - } else if yyl1872 > 0 { - var yyrr1872, yyrl1872 int - var yyrt1872 bool - if yyl1872 > cap(yyv1872) { + } else if yyl1846 > 0 { + var yyrr1846, yyrl1846 int + var yyrt1846 bool + if yyl1846 > cap(yyv1846) { - yyrg1872 := len(yyv1872) > 0 - yyv21872 := yyv1872 - yyrl1872, yyrt1872 = z.DecInferLen(yyl1872, z.DecBasicHandle().MaxInitLen, 824) - if yyrt1872 { - if yyrl1872 <= cap(yyv1872) { - yyv1872 = yyv1872[:yyrl1872] + yyrg1846 := len(yyv1846) > 0 + yyv21846 := yyv1846 + yyrl1846, yyrt1846 = z.DecInferLen(yyl1846, z.DecBasicHandle().MaxInitLen, 824) + if yyrt1846 { + if yyrl1846 <= cap(yyv1846) { + yyv1846 = yyv1846[:yyrl1846] } else { - yyv1872 = make([]Job, yyrl1872) + yyv1846 = make([]Job, yyrl1846) } } else { - yyv1872 = make([]Job, yyrl1872) + yyv1846 = make([]Job, yyrl1846) } - yyc1872 = true - yyrr1872 = len(yyv1872) - if yyrg1872 { - copy(yyv1872, yyv21872) + yyc1846 = true + yyrr1846 = len(yyv1846) + if yyrg1846 { + copy(yyv1846, yyv21846) } - } else if yyl1872 != len(yyv1872) { - yyv1872 = yyv1872[:yyl1872] - yyc1872 = true + } else if yyl1846 != len(yyv1846) { + yyv1846 = yyv1846[:yyl1846] + yyc1846 = true } - yyj1872 := 0 - for ; yyj1872 < yyrr1872; yyj1872++ { - yyh1872.ElemContainerState(yyj1872) + yyj1846 := 0 + for ; yyj1846 < yyrr1846; yyj1846++ { + yyh1846.ElemContainerState(yyj1846) if r.TryDecodeAsNil() { - yyv1872[yyj1872] = Job{} + yyv1846[yyj1846] = Job{} } else { - yyv1873 := &yyv1872[yyj1872] - yyv1873.CodecDecodeSelf(d) + yyv1847 := &yyv1846[yyj1846] + yyv1847.CodecDecodeSelf(d) } } - if yyrt1872 { - for ; yyj1872 < yyl1872; yyj1872++ { - yyv1872 = append(yyv1872, Job{}) - yyh1872.ElemContainerState(yyj1872) + if yyrt1846 { + for ; yyj1846 < yyl1846; yyj1846++ { + yyv1846 = append(yyv1846, Job{}) + yyh1846.ElemContainerState(yyj1846) if r.TryDecodeAsNil() { - yyv1872[yyj1872] = Job{} + yyv1846[yyj1846] = Job{} } else { - yyv1874 := &yyv1872[yyj1872] - yyv1874.CodecDecodeSelf(d) + yyv1848 := &yyv1846[yyj1846] + yyv1848.CodecDecodeSelf(d) } } } } else { - yyj1872 := 0 - for ; !r.CheckBreak(); yyj1872++ { + yyj1846 := 0 + for ; !r.CheckBreak(); yyj1846++ { - if yyj1872 >= len(yyv1872) { - yyv1872 = append(yyv1872, Job{}) // var yyz1872 Job - yyc1872 = true + if yyj1846 >= len(yyv1846) { + yyv1846 = append(yyv1846, Job{}) // var yyz1846 Job + yyc1846 = true } - yyh1872.ElemContainerState(yyj1872) - if yyj1872 < len(yyv1872) { + yyh1846.ElemContainerState(yyj1846) + if yyj1846 < len(yyv1846) { if r.TryDecodeAsNil() { - yyv1872[yyj1872] = Job{} + yyv1846[yyj1846] = Job{} } else { - yyv1875 := &yyv1872[yyj1872] - yyv1875.CodecDecodeSelf(d) + yyv1849 := &yyv1846[yyj1846] + yyv1849.CodecDecodeSelf(d) } } else { @@ -22562,17 +22263,17 @@ func (x codecSelfer1234) decSliceJob(v *[]Job, d *codec1978.Decoder) { } } - if yyj1872 < len(yyv1872) { - yyv1872 = yyv1872[:yyj1872] - yyc1872 = true - } else if yyj1872 == 0 && yyv1872 == nil { - yyv1872 = []Job{} - yyc1872 = true + if yyj1846 < len(yyv1846) { + yyv1846 = yyv1846[:yyj1846] + yyc1846 = true + } else if yyj1846 == 0 && yyv1846 == nil { + yyv1846 = []Job{} + yyc1846 = true } } - yyh1872.End() - if yyc1872 { - *v = yyv1872 + yyh1846.End() + if yyc1846 { + *v = yyv1846 } } @@ -22581,10 +22282,10 @@ func (x codecSelfer1234) encSliceJobCondition(v []JobCondition, e *codec1978.Enc z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1876 := range v { + for _, yyv1850 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1877 := &yyv1876 - yy1877.CodecEncodeSelf(e) + yy1851 := &yyv1850 + yy1851.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -22594,83 +22295,83 @@ func (x codecSelfer1234) decSliceJobCondition(v *[]JobCondition, d *codec1978.De z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1878 := *v - yyh1878, yyl1878 := z.DecSliceHelperStart() - var yyc1878 bool - if yyl1878 == 0 { - if yyv1878 == nil { - yyv1878 = []JobCondition{} - yyc1878 = true - } else if len(yyv1878) != 0 { - yyv1878 = yyv1878[:0] - yyc1878 = true + yyv1852 := *v + yyh1852, yyl1852 := z.DecSliceHelperStart() + var yyc1852 bool + if yyl1852 == 0 { + if yyv1852 == nil { + yyv1852 = []JobCondition{} + yyc1852 = true + } else if len(yyv1852) != 0 { + yyv1852 = yyv1852[:0] + yyc1852 = true } - } else if yyl1878 > 0 { - var yyrr1878, yyrl1878 int - var yyrt1878 bool - if yyl1878 > cap(yyv1878) { + } else if yyl1852 > 0 { + var yyrr1852, yyrl1852 int + var yyrt1852 bool + if yyl1852 > cap(yyv1852) { - yyrg1878 := len(yyv1878) > 0 - yyv21878 := yyv1878 - yyrl1878, yyrt1878 = z.DecInferLen(yyl1878, z.DecBasicHandle().MaxInitLen, 112) - if yyrt1878 { - if yyrl1878 <= cap(yyv1878) { - yyv1878 = yyv1878[:yyrl1878] + yyrg1852 := len(yyv1852) > 0 + yyv21852 := yyv1852 + yyrl1852, yyrt1852 = z.DecInferLen(yyl1852, z.DecBasicHandle().MaxInitLen, 112) + if yyrt1852 { + if yyrl1852 <= cap(yyv1852) { + yyv1852 = yyv1852[:yyrl1852] } else { - yyv1878 = make([]JobCondition, yyrl1878) + yyv1852 = make([]JobCondition, yyrl1852) } } else { - yyv1878 = make([]JobCondition, yyrl1878) + yyv1852 = make([]JobCondition, yyrl1852) } - yyc1878 = true - yyrr1878 = len(yyv1878) - if yyrg1878 { - copy(yyv1878, yyv21878) + yyc1852 = true + yyrr1852 = len(yyv1852) + if yyrg1852 { + copy(yyv1852, yyv21852) } - } else if yyl1878 != len(yyv1878) { - yyv1878 = yyv1878[:yyl1878] - yyc1878 = true + } else if yyl1852 != len(yyv1852) { + yyv1852 = yyv1852[:yyl1852] + yyc1852 = true } - yyj1878 := 0 - for ; yyj1878 < yyrr1878; yyj1878++ { - yyh1878.ElemContainerState(yyj1878) + yyj1852 := 0 + for ; yyj1852 < yyrr1852; yyj1852++ { + yyh1852.ElemContainerState(yyj1852) if r.TryDecodeAsNil() { - yyv1878[yyj1878] = JobCondition{} + yyv1852[yyj1852] = JobCondition{} } else { - yyv1879 := &yyv1878[yyj1878] - yyv1879.CodecDecodeSelf(d) + yyv1853 := &yyv1852[yyj1852] + yyv1853.CodecDecodeSelf(d) } } - if yyrt1878 { - for ; yyj1878 < yyl1878; yyj1878++ { - yyv1878 = append(yyv1878, JobCondition{}) - yyh1878.ElemContainerState(yyj1878) + if yyrt1852 { + for ; yyj1852 < yyl1852; yyj1852++ { + yyv1852 = append(yyv1852, JobCondition{}) + yyh1852.ElemContainerState(yyj1852) if r.TryDecodeAsNil() { - yyv1878[yyj1878] = JobCondition{} + yyv1852[yyj1852] = JobCondition{} } else { - yyv1880 := &yyv1878[yyj1878] - yyv1880.CodecDecodeSelf(d) + yyv1854 := &yyv1852[yyj1852] + yyv1854.CodecDecodeSelf(d) } } } } else { - yyj1878 := 0 - for ; !r.CheckBreak(); yyj1878++ { + yyj1852 := 0 + for ; !r.CheckBreak(); yyj1852++ { - if yyj1878 >= len(yyv1878) { - yyv1878 = append(yyv1878, JobCondition{}) // var yyz1878 JobCondition - yyc1878 = true + if yyj1852 >= len(yyv1852) { + yyv1852 = append(yyv1852, JobCondition{}) // var yyz1852 JobCondition + yyc1852 = true } - yyh1878.ElemContainerState(yyj1878) - if yyj1878 < len(yyv1878) { + yyh1852.ElemContainerState(yyj1852) + if yyj1852 < len(yyv1852) { if r.TryDecodeAsNil() { - yyv1878[yyj1878] = JobCondition{} + yyv1852[yyj1852] = JobCondition{} } else { - yyv1881 := &yyv1878[yyj1878] - yyv1881.CodecDecodeSelf(d) + yyv1855 := &yyv1852[yyj1852] + yyv1855.CodecDecodeSelf(d) } } else { @@ -22678,17 +22379,17 @@ func (x codecSelfer1234) decSliceJobCondition(v *[]JobCondition, d *codec1978.De } } - if yyj1878 < len(yyv1878) { - yyv1878 = yyv1878[:yyj1878] - yyc1878 = true - } else if yyj1878 == 0 && yyv1878 == nil { - yyv1878 = []JobCondition{} - yyc1878 = true + if yyj1852 < len(yyv1852) { + yyv1852 = yyv1852[:yyj1852] + yyc1852 = true + } else if yyj1852 == 0 && yyv1852 == nil { + yyv1852 = []JobCondition{} + yyc1852 = true } } - yyh1878.End() - if yyc1878 { - *v = yyv1878 + yyh1852.End() + if yyc1852 { + *v = yyv1852 } } @@ -22697,10 +22398,10 @@ func (x codecSelfer1234) encSliceIngress(v []Ingress, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1882 := range v { + for _, yyv1856 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1883 := &yyv1882 - yy1883.CodecEncodeSelf(e) + yy1857 := &yyv1856 + yy1857.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -22710,83 +22411,83 @@ func (x codecSelfer1234) decSliceIngress(v *[]Ingress, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1884 := *v - yyh1884, yyl1884 := z.DecSliceHelperStart() - var yyc1884 bool - if yyl1884 == 0 { - if yyv1884 == nil { - yyv1884 = []Ingress{} - yyc1884 = true - } else if len(yyv1884) != 0 { - yyv1884 = yyv1884[:0] - yyc1884 = true + yyv1858 := *v + yyh1858, yyl1858 := z.DecSliceHelperStart() + var yyc1858 bool + if yyl1858 == 0 { + if yyv1858 == nil { + yyv1858 = []Ingress{} + yyc1858 = true + } else if len(yyv1858) != 0 { + yyv1858 = yyv1858[:0] + yyc1858 = true } - } else if yyl1884 > 0 { - var yyrr1884, yyrl1884 int - var yyrt1884 bool - if yyl1884 > cap(yyv1884) { + } else if yyl1858 > 0 { + var yyrr1858, yyrl1858 int + var yyrt1858 bool + if yyl1858 > cap(yyv1858) { - yyrg1884 := len(yyv1884) > 0 - yyv21884 := yyv1884 - yyrl1884, yyrt1884 = z.DecInferLen(yyl1884, z.DecBasicHandle().MaxInitLen, 336) - if yyrt1884 { - if yyrl1884 <= cap(yyv1884) { - yyv1884 = yyv1884[:yyrl1884] + yyrg1858 := len(yyv1858) > 0 + yyv21858 := yyv1858 + yyrl1858, yyrt1858 = z.DecInferLen(yyl1858, z.DecBasicHandle().MaxInitLen, 336) + if yyrt1858 { + if yyrl1858 <= cap(yyv1858) { + yyv1858 = yyv1858[:yyrl1858] } else { - yyv1884 = make([]Ingress, yyrl1884) + yyv1858 = make([]Ingress, yyrl1858) } } else { - yyv1884 = make([]Ingress, yyrl1884) + yyv1858 = make([]Ingress, yyrl1858) } - yyc1884 = true - yyrr1884 = len(yyv1884) - if yyrg1884 { - copy(yyv1884, yyv21884) + yyc1858 = true + yyrr1858 = len(yyv1858) + if yyrg1858 { + copy(yyv1858, yyv21858) } - } else if yyl1884 != len(yyv1884) { - yyv1884 = yyv1884[:yyl1884] - yyc1884 = true + } else if yyl1858 != len(yyv1858) { + yyv1858 = yyv1858[:yyl1858] + yyc1858 = true } - yyj1884 := 0 - for ; yyj1884 < yyrr1884; yyj1884++ { - yyh1884.ElemContainerState(yyj1884) + yyj1858 := 0 + for ; yyj1858 < yyrr1858; yyj1858++ { + yyh1858.ElemContainerState(yyj1858) if r.TryDecodeAsNil() { - yyv1884[yyj1884] = Ingress{} + yyv1858[yyj1858] = Ingress{} } else { - yyv1885 := &yyv1884[yyj1884] - yyv1885.CodecDecodeSelf(d) + yyv1859 := &yyv1858[yyj1858] + yyv1859.CodecDecodeSelf(d) } } - if yyrt1884 { - for ; yyj1884 < yyl1884; yyj1884++ { - yyv1884 = append(yyv1884, Ingress{}) - yyh1884.ElemContainerState(yyj1884) + if yyrt1858 { + for ; yyj1858 < yyl1858; yyj1858++ { + yyv1858 = append(yyv1858, Ingress{}) + yyh1858.ElemContainerState(yyj1858) if r.TryDecodeAsNil() { - yyv1884[yyj1884] = Ingress{} + yyv1858[yyj1858] = Ingress{} } else { - yyv1886 := &yyv1884[yyj1884] - yyv1886.CodecDecodeSelf(d) + yyv1860 := &yyv1858[yyj1858] + yyv1860.CodecDecodeSelf(d) } } } } else { - yyj1884 := 0 - for ; !r.CheckBreak(); yyj1884++ { + yyj1858 := 0 + for ; !r.CheckBreak(); yyj1858++ { - if yyj1884 >= len(yyv1884) { - yyv1884 = append(yyv1884, Ingress{}) // var yyz1884 Ingress - yyc1884 = true + if yyj1858 >= len(yyv1858) { + yyv1858 = append(yyv1858, Ingress{}) // var yyz1858 Ingress + yyc1858 = true } - yyh1884.ElemContainerState(yyj1884) - if yyj1884 < len(yyv1884) { + yyh1858.ElemContainerState(yyj1858) + if yyj1858 < len(yyv1858) { if r.TryDecodeAsNil() { - yyv1884[yyj1884] = Ingress{} + yyv1858[yyj1858] = Ingress{} } else { - yyv1887 := &yyv1884[yyj1884] - yyv1887.CodecDecodeSelf(d) + yyv1861 := &yyv1858[yyj1858] + yyv1861.CodecDecodeSelf(d) } } else { @@ -22794,17 +22495,17 @@ func (x codecSelfer1234) decSliceIngress(v *[]Ingress, d *codec1978.Decoder) { } } - if yyj1884 < len(yyv1884) { - yyv1884 = yyv1884[:yyj1884] - yyc1884 = true - } else if yyj1884 == 0 && yyv1884 == nil { - yyv1884 = []Ingress{} - yyc1884 = true + if yyj1858 < len(yyv1858) { + yyv1858 = yyv1858[:yyj1858] + yyc1858 = true + } else if yyj1858 == 0 && yyv1858 == nil { + yyv1858 = []Ingress{} + yyc1858 = true } } - yyh1884.End() - if yyc1884 { - *v = yyv1884 + yyh1858.End() + if yyc1858 { + *v = yyv1858 } } @@ -22813,10 +22514,10 @@ func (x codecSelfer1234) encSliceIngressTLS(v []IngressTLS, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1888 := range v { + for _, yyv1862 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1889 := &yyv1888 - yy1889.CodecEncodeSelf(e) + yy1863 := &yyv1862 + yy1863.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -22826,83 +22527,83 @@ func (x codecSelfer1234) decSliceIngressTLS(v *[]IngressTLS, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1890 := *v - yyh1890, yyl1890 := z.DecSliceHelperStart() - var yyc1890 bool - if yyl1890 == 0 { - if yyv1890 == nil { - yyv1890 = []IngressTLS{} - yyc1890 = true - } else if len(yyv1890) != 0 { - yyv1890 = yyv1890[:0] - yyc1890 = true + yyv1864 := *v + yyh1864, yyl1864 := z.DecSliceHelperStart() + var yyc1864 bool + if yyl1864 == 0 { + if yyv1864 == nil { + yyv1864 = []IngressTLS{} + yyc1864 = true + } else if len(yyv1864) != 0 { + yyv1864 = yyv1864[:0] + yyc1864 = true } - } else if yyl1890 > 0 { - var yyrr1890, yyrl1890 int - var yyrt1890 bool - if yyl1890 > cap(yyv1890) { + } else if yyl1864 > 0 { + var yyrr1864, yyrl1864 int + var yyrt1864 bool + if yyl1864 > cap(yyv1864) { - yyrg1890 := len(yyv1890) > 0 - yyv21890 := yyv1890 - yyrl1890, yyrt1890 = z.DecInferLen(yyl1890, z.DecBasicHandle().MaxInitLen, 40) - if yyrt1890 { - if yyrl1890 <= cap(yyv1890) { - yyv1890 = yyv1890[:yyrl1890] + yyrg1864 := len(yyv1864) > 0 + yyv21864 := yyv1864 + yyrl1864, yyrt1864 = z.DecInferLen(yyl1864, z.DecBasicHandle().MaxInitLen, 40) + if yyrt1864 { + if yyrl1864 <= cap(yyv1864) { + yyv1864 = yyv1864[:yyrl1864] } else { - yyv1890 = make([]IngressTLS, yyrl1890) + yyv1864 = make([]IngressTLS, yyrl1864) } } else { - yyv1890 = make([]IngressTLS, yyrl1890) + yyv1864 = make([]IngressTLS, yyrl1864) } - yyc1890 = true - yyrr1890 = len(yyv1890) - if yyrg1890 { - copy(yyv1890, yyv21890) + yyc1864 = true + yyrr1864 = len(yyv1864) + if yyrg1864 { + copy(yyv1864, yyv21864) } - } else if yyl1890 != len(yyv1890) { - yyv1890 = yyv1890[:yyl1890] - yyc1890 = true + } else if yyl1864 != len(yyv1864) { + yyv1864 = yyv1864[:yyl1864] + yyc1864 = true } - yyj1890 := 0 - for ; yyj1890 < yyrr1890; yyj1890++ { - yyh1890.ElemContainerState(yyj1890) + yyj1864 := 0 + for ; yyj1864 < yyrr1864; yyj1864++ { + yyh1864.ElemContainerState(yyj1864) if r.TryDecodeAsNil() { - yyv1890[yyj1890] = IngressTLS{} + yyv1864[yyj1864] = IngressTLS{} } else { - yyv1891 := &yyv1890[yyj1890] - yyv1891.CodecDecodeSelf(d) + yyv1865 := &yyv1864[yyj1864] + yyv1865.CodecDecodeSelf(d) } } - if yyrt1890 { - for ; yyj1890 < yyl1890; yyj1890++ { - yyv1890 = append(yyv1890, IngressTLS{}) - yyh1890.ElemContainerState(yyj1890) + if yyrt1864 { + for ; yyj1864 < yyl1864; yyj1864++ { + yyv1864 = append(yyv1864, IngressTLS{}) + yyh1864.ElemContainerState(yyj1864) if r.TryDecodeAsNil() { - yyv1890[yyj1890] = IngressTLS{} + yyv1864[yyj1864] = IngressTLS{} } else { - yyv1892 := &yyv1890[yyj1890] - yyv1892.CodecDecodeSelf(d) + yyv1866 := &yyv1864[yyj1864] + yyv1866.CodecDecodeSelf(d) } } } } else { - yyj1890 := 0 - for ; !r.CheckBreak(); yyj1890++ { + yyj1864 := 0 + for ; !r.CheckBreak(); yyj1864++ { - if yyj1890 >= len(yyv1890) { - yyv1890 = append(yyv1890, IngressTLS{}) // var yyz1890 IngressTLS - yyc1890 = true + if yyj1864 >= len(yyv1864) { + yyv1864 = append(yyv1864, IngressTLS{}) // var yyz1864 IngressTLS + yyc1864 = true } - yyh1890.ElemContainerState(yyj1890) - if yyj1890 < len(yyv1890) { + yyh1864.ElemContainerState(yyj1864) + if yyj1864 < len(yyv1864) { if r.TryDecodeAsNil() { - yyv1890[yyj1890] = IngressTLS{} + yyv1864[yyj1864] = IngressTLS{} } else { - yyv1893 := &yyv1890[yyj1890] - yyv1893.CodecDecodeSelf(d) + yyv1867 := &yyv1864[yyj1864] + yyv1867.CodecDecodeSelf(d) } } else { @@ -22910,17 +22611,17 @@ func (x codecSelfer1234) decSliceIngressTLS(v *[]IngressTLS, d *codec1978.Decode } } - if yyj1890 < len(yyv1890) { - yyv1890 = yyv1890[:yyj1890] - yyc1890 = true - } else if yyj1890 == 0 && yyv1890 == nil { - yyv1890 = []IngressTLS{} - yyc1890 = true + if yyj1864 < len(yyv1864) { + yyv1864 = yyv1864[:yyj1864] + yyc1864 = true + } else if yyj1864 == 0 && yyv1864 == nil { + yyv1864 = []IngressTLS{} + yyc1864 = true } } - yyh1890.End() - if yyc1890 { - *v = yyv1890 + yyh1864.End() + if yyc1864 { + *v = yyv1864 } } @@ -22929,10 +22630,10 @@ func (x codecSelfer1234) encSliceIngressRule(v []IngressRule, e *codec1978.Encod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1894 := range v { + for _, yyv1868 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1895 := &yyv1894 - yy1895.CodecEncodeSelf(e) + yy1869 := &yyv1868 + yy1869.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -22942,83 +22643,83 @@ func (x codecSelfer1234) decSliceIngressRule(v *[]IngressRule, d *codec1978.Deco z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1896 := *v - yyh1896, yyl1896 := z.DecSliceHelperStart() - var yyc1896 bool - if yyl1896 == 0 { - if yyv1896 == nil { - yyv1896 = []IngressRule{} - yyc1896 = true - } else if len(yyv1896) != 0 { - yyv1896 = yyv1896[:0] - yyc1896 = true + yyv1870 := *v + yyh1870, yyl1870 := z.DecSliceHelperStart() + var yyc1870 bool + if yyl1870 == 0 { + if yyv1870 == nil { + yyv1870 = []IngressRule{} + yyc1870 = true + } else if len(yyv1870) != 0 { + yyv1870 = yyv1870[:0] + yyc1870 = true } - } else if yyl1896 > 0 { - var yyrr1896, yyrl1896 int - var yyrt1896 bool - if yyl1896 > cap(yyv1896) { + } else if yyl1870 > 0 { + var yyrr1870, yyrl1870 int + var yyrt1870 bool + if yyl1870 > cap(yyv1870) { - yyrg1896 := len(yyv1896) > 0 - yyv21896 := yyv1896 - yyrl1896, yyrt1896 = z.DecInferLen(yyl1896, z.DecBasicHandle().MaxInitLen, 24) - if yyrt1896 { - if yyrl1896 <= cap(yyv1896) { - yyv1896 = yyv1896[:yyrl1896] + yyrg1870 := len(yyv1870) > 0 + yyv21870 := yyv1870 + yyrl1870, yyrt1870 = z.DecInferLen(yyl1870, z.DecBasicHandle().MaxInitLen, 24) + if yyrt1870 { + if yyrl1870 <= cap(yyv1870) { + yyv1870 = yyv1870[:yyrl1870] } else { - yyv1896 = make([]IngressRule, yyrl1896) + yyv1870 = make([]IngressRule, yyrl1870) } } else { - yyv1896 = make([]IngressRule, yyrl1896) + yyv1870 = make([]IngressRule, yyrl1870) } - yyc1896 = true - yyrr1896 = len(yyv1896) - if yyrg1896 { - copy(yyv1896, yyv21896) + yyc1870 = true + yyrr1870 = len(yyv1870) + if yyrg1870 { + copy(yyv1870, yyv21870) } - } else if yyl1896 != len(yyv1896) { - yyv1896 = yyv1896[:yyl1896] - yyc1896 = true + } else if yyl1870 != len(yyv1870) { + yyv1870 = yyv1870[:yyl1870] + yyc1870 = true } - yyj1896 := 0 - for ; yyj1896 < yyrr1896; yyj1896++ { - yyh1896.ElemContainerState(yyj1896) + yyj1870 := 0 + for ; yyj1870 < yyrr1870; yyj1870++ { + yyh1870.ElemContainerState(yyj1870) if r.TryDecodeAsNil() { - yyv1896[yyj1896] = IngressRule{} + yyv1870[yyj1870] = IngressRule{} } else { - yyv1897 := &yyv1896[yyj1896] - yyv1897.CodecDecodeSelf(d) + yyv1871 := &yyv1870[yyj1870] + yyv1871.CodecDecodeSelf(d) } } - if yyrt1896 { - for ; yyj1896 < yyl1896; yyj1896++ { - yyv1896 = append(yyv1896, IngressRule{}) - yyh1896.ElemContainerState(yyj1896) + if yyrt1870 { + for ; yyj1870 < yyl1870; yyj1870++ { + yyv1870 = append(yyv1870, IngressRule{}) + yyh1870.ElemContainerState(yyj1870) if r.TryDecodeAsNil() { - yyv1896[yyj1896] = IngressRule{} + yyv1870[yyj1870] = IngressRule{} } else { - yyv1898 := &yyv1896[yyj1896] - yyv1898.CodecDecodeSelf(d) + yyv1872 := &yyv1870[yyj1870] + yyv1872.CodecDecodeSelf(d) } } } } else { - yyj1896 := 0 - for ; !r.CheckBreak(); yyj1896++ { + yyj1870 := 0 + for ; !r.CheckBreak(); yyj1870++ { - if yyj1896 >= len(yyv1896) { - yyv1896 = append(yyv1896, IngressRule{}) // var yyz1896 IngressRule - yyc1896 = true + if yyj1870 >= len(yyv1870) { + yyv1870 = append(yyv1870, IngressRule{}) // var yyz1870 IngressRule + yyc1870 = true } - yyh1896.ElemContainerState(yyj1896) - if yyj1896 < len(yyv1896) { + yyh1870.ElemContainerState(yyj1870) + if yyj1870 < len(yyv1870) { if r.TryDecodeAsNil() { - yyv1896[yyj1896] = IngressRule{} + yyv1870[yyj1870] = IngressRule{} } else { - yyv1899 := &yyv1896[yyj1896] - yyv1899.CodecDecodeSelf(d) + yyv1873 := &yyv1870[yyj1870] + yyv1873.CodecDecodeSelf(d) } } else { @@ -23026,17 +22727,17 @@ func (x codecSelfer1234) decSliceIngressRule(v *[]IngressRule, d *codec1978.Deco } } - if yyj1896 < len(yyv1896) { - yyv1896 = yyv1896[:yyj1896] - yyc1896 = true - } else if yyj1896 == 0 && yyv1896 == nil { - yyv1896 = []IngressRule{} - yyc1896 = true + if yyj1870 < len(yyv1870) { + yyv1870 = yyv1870[:yyj1870] + yyc1870 = true + } else if yyj1870 == 0 && yyv1870 == nil { + yyv1870 = []IngressRule{} + yyc1870 = true } } - yyh1896.End() - if yyc1896 { - *v = yyv1896 + yyh1870.End() + if yyc1870 { + *v = yyv1870 } } @@ -23045,10 +22746,10 @@ func (x codecSelfer1234) encSliceHTTPIngressPath(v []HTTPIngressPath, e *codec19 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1900 := range v { + for _, yyv1874 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1901 := &yyv1900 - yy1901.CodecEncodeSelf(e) + yy1875 := &yyv1874 + yy1875.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -23058,83 +22759,83 @@ func (x codecSelfer1234) decSliceHTTPIngressPath(v *[]HTTPIngressPath, d *codec1 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1902 := *v - yyh1902, yyl1902 := z.DecSliceHelperStart() - var yyc1902 bool - if yyl1902 == 0 { - if yyv1902 == nil { - yyv1902 = []HTTPIngressPath{} - yyc1902 = true - } else if len(yyv1902) != 0 { - yyv1902 = yyv1902[:0] - yyc1902 = true + yyv1876 := *v + yyh1876, yyl1876 := z.DecSliceHelperStart() + var yyc1876 bool + if yyl1876 == 0 { + if yyv1876 == nil { + yyv1876 = []HTTPIngressPath{} + yyc1876 = true + } else if len(yyv1876) != 0 { + yyv1876 = yyv1876[:0] + yyc1876 = true } - } else if yyl1902 > 0 { - var yyrr1902, yyrl1902 int - var yyrt1902 bool - if yyl1902 > cap(yyv1902) { + } else if yyl1876 > 0 { + var yyrr1876, yyrl1876 int + var yyrt1876 bool + if yyl1876 > cap(yyv1876) { - yyrg1902 := len(yyv1902) > 0 - yyv21902 := yyv1902 - yyrl1902, yyrt1902 = z.DecInferLen(yyl1902, z.DecBasicHandle().MaxInitLen, 64) - if yyrt1902 { - if yyrl1902 <= cap(yyv1902) { - yyv1902 = yyv1902[:yyrl1902] + yyrg1876 := len(yyv1876) > 0 + yyv21876 := yyv1876 + yyrl1876, yyrt1876 = z.DecInferLen(yyl1876, z.DecBasicHandle().MaxInitLen, 64) + if yyrt1876 { + if yyrl1876 <= cap(yyv1876) { + yyv1876 = yyv1876[:yyrl1876] } else { - yyv1902 = make([]HTTPIngressPath, yyrl1902) + yyv1876 = make([]HTTPIngressPath, yyrl1876) } } else { - yyv1902 = make([]HTTPIngressPath, yyrl1902) + yyv1876 = make([]HTTPIngressPath, yyrl1876) } - yyc1902 = true - yyrr1902 = len(yyv1902) - if yyrg1902 { - copy(yyv1902, yyv21902) + yyc1876 = true + yyrr1876 = len(yyv1876) + if yyrg1876 { + copy(yyv1876, yyv21876) } - } else if yyl1902 != len(yyv1902) { - yyv1902 = yyv1902[:yyl1902] - yyc1902 = true + } else if yyl1876 != len(yyv1876) { + yyv1876 = yyv1876[:yyl1876] + yyc1876 = true } - yyj1902 := 0 - for ; yyj1902 < yyrr1902; yyj1902++ { - yyh1902.ElemContainerState(yyj1902) + yyj1876 := 0 + for ; yyj1876 < yyrr1876; yyj1876++ { + yyh1876.ElemContainerState(yyj1876) if r.TryDecodeAsNil() { - yyv1902[yyj1902] = HTTPIngressPath{} + yyv1876[yyj1876] = HTTPIngressPath{} } else { - yyv1903 := &yyv1902[yyj1902] - yyv1903.CodecDecodeSelf(d) + yyv1877 := &yyv1876[yyj1876] + yyv1877.CodecDecodeSelf(d) } } - if yyrt1902 { - for ; yyj1902 < yyl1902; yyj1902++ { - yyv1902 = append(yyv1902, HTTPIngressPath{}) - yyh1902.ElemContainerState(yyj1902) + if yyrt1876 { + for ; yyj1876 < yyl1876; yyj1876++ { + yyv1876 = append(yyv1876, HTTPIngressPath{}) + yyh1876.ElemContainerState(yyj1876) if r.TryDecodeAsNil() { - yyv1902[yyj1902] = HTTPIngressPath{} + yyv1876[yyj1876] = HTTPIngressPath{} } else { - yyv1904 := &yyv1902[yyj1902] - yyv1904.CodecDecodeSelf(d) + yyv1878 := &yyv1876[yyj1876] + yyv1878.CodecDecodeSelf(d) } } } } else { - yyj1902 := 0 - for ; !r.CheckBreak(); yyj1902++ { + yyj1876 := 0 + for ; !r.CheckBreak(); yyj1876++ { - if yyj1902 >= len(yyv1902) { - yyv1902 = append(yyv1902, HTTPIngressPath{}) // var yyz1902 HTTPIngressPath - yyc1902 = true + if yyj1876 >= len(yyv1876) { + yyv1876 = append(yyv1876, HTTPIngressPath{}) // var yyz1876 HTTPIngressPath + yyc1876 = true } - yyh1902.ElemContainerState(yyj1902) - if yyj1902 < len(yyv1902) { + yyh1876.ElemContainerState(yyj1876) + if yyj1876 < len(yyv1876) { if r.TryDecodeAsNil() { - yyv1902[yyj1902] = HTTPIngressPath{} + yyv1876[yyj1876] = HTTPIngressPath{} } else { - yyv1905 := &yyv1902[yyj1902] - yyv1905.CodecDecodeSelf(d) + yyv1879 := &yyv1876[yyj1876] + yyv1879.CodecDecodeSelf(d) } } else { @@ -23142,17 +22843,17 @@ func (x codecSelfer1234) decSliceHTTPIngressPath(v *[]HTTPIngressPath, d *codec1 } } - if yyj1902 < len(yyv1902) { - yyv1902 = yyv1902[:yyj1902] - yyc1902 = true - } else if yyj1902 == 0 && yyv1902 == nil { - yyv1902 = []HTTPIngressPath{} - yyc1902 = true + if yyj1876 < len(yyv1876) { + yyv1876 = yyv1876[:yyj1876] + yyc1876 = true + } else if yyj1876 == 0 && yyv1876 == nil { + yyv1876 = []HTTPIngressPath{} + yyc1876 = true } } - yyh1902.End() - if yyc1902 { - *v = yyv1902 + yyh1876.End() + if yyc1876 { + *v = yyv1876 } } @@ -23161,10 +22862,10 @@ func (x codecSelfer1234) encSliceReplicaSet(v []ReplicaSet, e *codec1978.Encoder z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1906 := range v { + for _, yyv1880 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1907 := &yyv1906 - yy1907.CodecEncodeSelf(e) + yy1881 := &yyv1880 + yy1881.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -23174,83 +22875,83 @@ func (x codecSelfer1234) decSliceReplicaSet(v *[]ReplicaSet, d *codec1978.Decode z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1908 := *v - yyh1908, yyl1908 := z.DecSliceHelperStart() - var yyc1908 bool - if yyl1908 == 0 { - if yyv1908 == nil { - yyv1908 = []ReplicaSet{} - yyc1908 = true - } else if len(yyv1908) != 0 { - yyv1908 = yyv1908[:0] - yyc1908 = true + yyv1882 := *v + yyh1882, yyl1882 := z.DecSliceHelperStart() + var yyc1882 bool + if yyl1882 == 0 { + if yyv1882 == nil { + yyv1882 = []ReplicaSet{} + yyc1882 = true + } else if len(yyv1882) != 0 { + yyv1882 = yyv1882[:0] + yyc1882 = true } - } else if yyl1908 > 0 { - var yyrr1908, yyrl1908 int - var yyrt1908 bool - if yyl1908 > cap(yyv1908) { + } else if yyl1882 > 0 { + var yyrr1882, yyrl1882 int + var yyrt1882 bool + if yyl1882 > cap(yyv1882) { - yyrg1908 := len(yyv1908) > 0 - yyv21908 := yyv1908 - yyrl1908, yyrt1908 = z.DecInferLen(yyl1908, z.DecBasicHandle().MaxInitLen, 800) - if yyrt1908 { - if yyrl1908 <= cap(yyv1908) { - yyv1908 = yyv1908[:yyrl1908] + yyrg1882 := len(yyv1882) > 0 + yyv21882 := yyv1882 + yyrl1882, yyrt1882 = z.DecInferLen(yyl1882, z.DecBasicHandle().MaxInitLen, 800) + if yyrt1882 { + if yyrl1882 <= cap(yyv1882) { + yyv1882 = yyv1882[:yyrl1882] } else { - yyv1908 = make([]ReplicaSet, yyrl1908) + yyv1882 = make([]ReplicaSet, yyrl1882) } } else { - yyv1908 = make([]ReplicaSet, yyrl1908) + yyv1882 = make([]ReplicaSet, yyrl1882) } - yyc1908 = true - yyrr1908 = len(yyv1908) - if yyrg1908 { - copy(yyv1908, yyv21908) + yyc1882 = true + yyrr1882 = len(yyv1882) + if yyrg1882 { + copy(yyv1882, yyv21882) } - } else if yyl1908 != len(yyv1908) { - yyv1908 = yyv1908[:yyl1908] - yyc1908 = true + } else if yyl1882 != len(yyv1882) { + yyv1882 = yyv1882[:yyl1882] + yyc1882 = true } - yyj1908 := 0 - for ; yyj1908 < yyrr1908; yyj1908++ { - yyh1908.ElemContainerState(yyj1908) + yyj1882 := 0 + for ; yyj1882 < yyrr1882; yyj1882++ { + yyh1882.ElemContainerState(yyj1882) if r.TryDecodeAsNil() { - yyv1908[yyj1908] = ReplicaSet{} + yyv1882[yyj1882] = ReplicaSet{} } else { - yyv1909 := &yyv1908[yyj1908] - yyv1909.CodecDecodeSelf(d) + yyv1883 := &yyv1882[yyj1882] + yyv1883.CodecDecodeSelf(d) } } - if yyrt1908 { - for ; yyj1908 < yyl1908; yyj1908++ { - yyv1908 = append(yyv1908, ReplicaSet{}) - yyh1908.ElemContainerState(yyj1908) + if yyrt1882 { + for ; yyj1882 < yyl1882; yyj1882++ { + yyv1882 = append(yyv1882, ReplicaSet{}) + yyh1882.ElemContainerState(yyj1882) if r.TryDecodeAsNil() { - yyv1908[yyj1908] = ReplicaSet{} + yyv1882[yyj1882] = ReplicaSet{} } else { - yyv1910 := &yyv1908[yyj1908] - yyv1910.CodecDecodeSelf(d) + yyv1884 := &yyv1882[yyj1882] + yyv1884.CodecDecodeSelf(d) } } } } else { - yyj1908 := 0 - for ; !r.CheckBreak(); yyj1908++ { + yyj1882 := 0 + for ; !r.CheckBreak(); yyj1882++ { - if yyj1908 >= len(yyv1908) { - yyv1908 = append(yyv1908, ReplicaSet{}) // var yyz1908 ReplicaSet - yyc1908 = true + if yyj1882 >= len(yyv1882) { + yyv1882 = append(yyv1882, ReplicaSet{}) // var yyz1882 ReplicaSet + yyc1882 = true } - yyh1908.ElemContainerState(yyj1908) - if yyj1908 < len(yyv1908) { + yyh1882.ElemContainerState(yyj1882) + if yyj1882 < len(yyv1882) { if r.TryDecodeAsNil() { - yyv1908[yyj1908] = ReplicaSet{} + yyv1882[yyj1882] = ReplicaSet{} } else { - yyv1911 := &yyv1908[yyj1908] - yyv1911.CodecDecodeSelf(d) + yyv1885 := &yyv1882[yyj1882] + yyv1885.CodecDecodeSelf(d) } } else { @@ -23258,17 +22959,17 @@ func (x codecSelfer1234) decSliceReplicaSet(v *[]ReplicaSet, d *codec1978.Decode } } - if yyj1908 < len(yyv1908) { - yyv1908 = yyv1908[:yyj1908] - yyc1908 = true - } else if yyj1908 == 0 && yyv1908 == nil { - yyv1908 = []ReplicaSet{} - yyc1908 = true + if yyj1882 < len(yyv1882) { + yyv1882 = yyv1882[:yyj1882] + yyc1882 = true + } else if yyj1882 == 0 && yyv1882 == nil { + yyv1882 = []ReplicaSet{} + yyc1882 = true } } - yyh1908.End() - if yyc1908 { - *v = yyv1908 + yyh1882.End() + if yyc1882 { + *v = yyv1882 } } @@ -23277,10 +22978,10 @@ func (x codecSelfer1234) encSliceReplicaSetCondition(v []ReplicaSetCondition, e z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1912 := range v { + for _, yyv1886 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1913 := &yyv1912 - yy1913.CodecEncodeSelf(e) + yy1887 := &yyv1886 + yy1887.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -23290,83 +22991,83 @@ func (x codecSelfer1234) decSliceReplicaSetCondition(v *[]ReplicaSetCondition, d z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1914 := *v - yyh1914, yyl1914 := z.DecSliceHelperStart() - var yyc1914 bool - if yyl1914 == 0 { - if yyv1914 == nil { - yyv1914 = []ReplicaSetCondition{} - yyc1914 = true - } else if len(yyv1914) != 0 { - yyv1914 = yyv1914[:0] - yyc1914 = true + yyv1888 := *v + yyh1888, yyl1888 := z.DecSliceHelperStart() + var yyc1888 bool + if yyl1888 == 0 { + if yyv1888 == nil { + yyv1888 = []ReplicaSetCondition{} + yyc1888 = true + } else if len(yyv1888) != 0 { + yyv1888 = yyv1888[:0] + yyc1888 = true } - } else if yyl1914 > 0 { - var yyrr1914, yyrl1914 int - var yyrt1914 bool - if yyl1914 > cap(yyv1914) { + } else if yyl1888 > 0 { + var yyrr1888, yyrl1888 int + var yyrt1888 bool + if yyl1888 > cap(yyv1888) { - yyrg1914 := len(yyv1914) > 0 - yyv21914 := yyv1914 - yyrl1914, yyrt1914 = z.DecInferLen(yyl1914, z.DecBasicHandle().MaxInitLen, 88) - if yyrt1914 { - if yyrl1914 <= cap(yyv1914) { - yyv1914 = yyv1914[:yyrl1914] + yyrg1888 := len(yyv1888) > 0 + yyv21888 := yyv1888 + yyrl1888, yyrt1888 = z.DecInferLen(yyl1888, z.DecBasicHandle().MaxInitLen, 88) + if yyrt1888 { + if yyrl1888 <= cap(yyv1888) { + yyv1888 = yyv1888[:yyrl1888] } else { - yyv1914 = make([]ReplicaSetCondition, yyrl1914) + yyv1888 = make([]ReplicaSetCondition, yyrl1888) } } else { - yyv1914 = make([]ReplicaSetCondition, yyrl1914) + yyv1888 = make([]ReplicaSetCondition, yyrl1888) } - yyc1914 = true - yyrr1914 = len(yyv1914) - if yyrg1914 { - copy(yyv1914, yyv21914) + yyc1888 = true + yyrr1888 = len(yyv1888) + if yyrg1888 { + copy(yyv1888, yyv21888) } - } else if yyl1914 != len(yyv1914) { - yyv1914 = yyv1914[:yyl1914] - yyc1914 = true + } else if yyl1888 != len(yyv1888) { + yyv1888 = yyv1888[:yyl1888] + yyc1888 = true } - yyj1914 := 0 - for ; yyj1914 < yyrr1914; yyj1914++ { - yyh1914.ElemContainerState(yyj1914) + yyj1888 := 0 + for ; yyj1888 < yyrr1888; yyj1888++ { + yyh1888.ElemContainerState(yyj1888) if r.TryDecodeAsNil() { - yyv1914[yyj1914] = ReplicaSetCondition{} + yyv1888[yyj1888] = ReplicaSetCondition{} } else { - yyv1915 := &yyv1914[yyj1914] - yyv1915.CodecDecodeSelf(d) + yyv1889 := &yyv1888[yyj1888] + yyv1889.CodecDecodeSelf(d) } } - if yyrt1914 { - for ; yyj1914 < yyl1914; yyj1914++ { - yyv1914 = append(yyv1914, ReplicaSetCondition{}) - yyh1914.ElemContainerState(yyj1914) + if yyrt1888 { + for ; yyj1888 < yyl1888; yyj1888++ { + yyv1888 = append(yyv1888, ReplicaSetCondition{}) + yyh1888.ElemContainerState(yyj1888) if r.TryDecodeAsNil() { - yyv1914[yyj1914] = ReplicaSetCondition{} + yyv1888[yyj1888] = ReplicaSetCondition{} } else { - yyv1916 := &yyv1914[yyj1914] - yyv1916.CodecDecodeSelf(d) + yyv1890 := &yyv1888[yyj1888] + yyv1890.CodecDecodeSelf(d) } } } } else { - yyj1914 := 0 - for ; !r.CheckBreak(); yyj1914++ { + yyj1888 := 0 + for ; !r.CheckBreak(); yyj1888++ { - if yyj1914 >= len(yyv1914) { - yyv1914 = append(yyv1914, ReplicaSetCondition{}) // var yyz1914 ReplicaSetCondition - yyc1914 = true + if yyj1888 >= len(yyv1888) { + yyv1888 = append(yyv1888, ReplicaSetCondition{}) // var yyz1888 ReplicaSetCondition + yyc1888 = true } - yyh1914.ElemContainerState(yyj1914) - if yyj1914 < len(yyv1914) { + yyh1888.ElemContainerState(yyj1888) + if yyj1888 < len(yyv1888) { if r.TryDecodeAsNil() { - yyv1914[yyj1914] = ReplicaSetCondition{} + yyv1888[yyj1888] = ReplicaSetCondition{} } else { - yyv1917 := &yyv1914[yyj1914] - yyv1917.CodecDecodeSelf(d) + yyv1891 := &yyv1888[yyj1888] + yyv1891.CodecDecodeSelf(d) } } else { @@ -23374,17 +23075,17 @@ func (x codecSelfer1234) decSliceReplicaSetCondition(v *[]ReplicaSetCondition, d } } - if yyj1914 < len(yyv1914) { - yyv1914 = yyv1914[:yyj1914] - yyc1914 = true - } else if yyj1914 == 0 && yyv1914 == nil { - yyv1914 = []ReplicaSetCondition{} - yyc1914 = true + if yyj1888 < len(yyv1888) { + yyv1888 = yyv1888[:yyj1888] + yyc1888 = true + } else if yyj1888 == 0 && yyv1888 == nil { + yyv1888 = []ReplicaSetCondition{} + yyc1888 = true } } - yyh1914.End() - if yyc1914 { - *v = yyv1914 + yyh1888.End() + if yyc1888 { + *v = yyv1888 } } @@ -23393,14 +23094,14 @@ func (x codecSelfer1234) encSlicev1_Capability(v []pkg2_v1.Capability, e *codec1 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1918 := range v { + for _, yyv1892 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym1919 := z.EncBinary() - _ = yym1919 + yym1893 := z.EncBinary() + _ = yym1893 if false { - } else if z.HasExtensions() && z.EncExt(yyv1918) { + } else if z.HasExtensions() && z.EncExt(yyv1892) { } else { - r.EncodeString(codecSelferC_UTF81234, string(yyv1918)) + r.EncodeString(codecSelferC_UTF81234, string(yyv1892)) } } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) @@ -23411,75 +23112,75 @@ func (x codecSelfer1234) decSlicev1_Capability(v *[]pkg2_v1.Capability, d *codec z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1920 := *v - yyh1920, yyl1920 := z.DecSliceHelperStart() - var yyc1920 bool - if yyl1920 == 0 { - if yyv1920 == nil { - yyv1920 = []pkg2_v1.Capability{} - yyc1920 = true - } else if len(yyv1920) != 0 { - yyv1920 = yyv1920[:0] - yyc1920 = true + yyv1894 := *v + yyh1894, yyl1894 := z.DecSliceHelperStart() + var yyc1894 bool + if yyl1894 == 0 { + if yyv1894 == nil { + yyv1894 = []pkg2_v1.Capability{} + yyc1894 = true + } else if len(yyv1894) != 0 { + yyv1894 = yyv1894[:0] + yyc1894 = true } - } else if yyl1920 > 0 { - var yyrr1920, yyrl1920 int - var yyrt1920 bool - if yyl1920 > cap(yyv1920) { + } else if yyl1894 > 0 { + var yyrr1894, yyrl1894 int + var yyrt1894 bool + if yyl1894 > cap(yyv1894) { - yyrl1920, yyrt1920 = z.DecInferLen(yyl1920, z.DecBasicHandle().MaxInitLen, 16) - if yyrt1920 { - if yyrl1920 <= cap(yyv1920) { - yyv1920 = yyv1920[:yyrl1920] + yyrl1894, yyrt1894 = z.DecInferLen(yyl1894, z.DecBasicHandle().MaxInitLen, 16) + if yyrt1894 { + if yyrl1894 <= cap(yyv1894) { + yyv1894 = yyv1894[:yyrl1894] } else { - yyv1920 = make([]pkg2_v1.Capability, yyrl1920) + yyv1894 = make([]pkg2_v1.Capability, yyrl1894) } } else { - yyv1920 = make([]pkg2_v1.Capability, yyrl1920) + yyv1894 = make([]pkg2_v1.Capability, yyrl1894) } - yyc1920 = true - yyrr1920 = len(yyv1920) - } else if yyl1920 != len(yyv1920) { - yyv1920 = yyv1920[:yyl1920] - yyc1920 = true + yyc1894 = true + yyrr1894 = len(yyv1894) + } else if yyl1894 != len(yyv1894) { + yyv1894 = yyv1894[:yyl1894] + yyc1894 = true } - yyj1920 := 0 - for ; yyj1920 < yyrr1920; yyj1920++ { - yyh1920.ElemContainerState(yyj1920) + yyj1894 := 0 + for ; yyj1894 < yyrr1894; yyj1894++ { + yyh1894.ElemContainerState(yyj1894) if r.TryDecodeAsNil() { - yyv1920[yyj1920] = "" + yyv1894[yyj1894] = "" } else { - yyv1920[yyj1920] = pkg2_v1.Capability(r.DecodeString()) + yyv1894[yyj1894] = pkg2_v1.Capability(r.DecodeString()) } } - if yyrt1920 { - for ; yyj1920 < yyl1920; yyj1920++ { - yyv1920 = append(yyv1920, "") - yyh1920.ElemContainerState(yyj1920) + if yyrt1894 { + for ; yyj1894 < yyl1894; yyj1894++ { + yyv1894 = append(yyv1894, "") + yyh1894.ElemContainerState(yyj1894) if r.TryDecodeAsNil() { - yyv1920[yyj1920] = "" + yyv1894[yyj1894] = "" } else { - yyv1920[yyj1920] = pkg2_v1.Capability(r.DecodeString()) + yyv1894[yyj1894] = pkg2_v1.Capability(r.DecodeString()) } } } } else { - yyj1920 := 0 - for ; !r.CheckBreak(); yyj1920++ { + yyj1894 := 0 + for ; !r.CheckBreak(); yyj1894++ { - if yyj1920 >= len(yyv1920) { - yyv1920 = append(yyv1920, "") // var yyz1920 pkg2_v1.Capability - yyc1920 = true + if yyj1894 >= len(yyv1894) { + yyv1894 = append(yyv1894, "") // var yyz1894 pkg2_v1.Capability + yyc1894 = true } - yyh1920.ElemContainerState(yyj1920) - if yyj1920 < len(yyv1920) { + yyh1894.ElemContainerState(yyj1894) + if yyj1894 < len(yyv1894) { if r.TryDecodeAsNil() { - yyv1920[yyj1920] = "" + yyv1894[yyj1894] = "" } else { - yyv1920[yyj1920] = pkg2_v1.Capability(r.DecodeString()) + yyv1894[yyj1894] = pkg2_v1.Capability(r.DecodeString()) } } else { @@ -23487,17 +23188,17 @@ func (x codecSelfer1234) decSlicev1_Capability(v *[]pkg2_v1.Capability, d *codec } } - if yyj1920 < len(yyv1920) { - yyv1920 = yyv1920[:yyj1920] - yyc1920 = true - } else if yyj1920 == 0 && yyv1920 == nil { - yyv1920 = []pkg2_v1.Capability{} - yyc1920 = true + if yyj1894 < len(yyv1894) { + yyv1894 = yyv1894[:yyj1894] + yyc1894 = true + } else if yyj1894 == 0 && yyv1894 == nil { + yyv1894 = []pkg2_v1.Capability{} + yyc1894 = true } } - yyh1920.End() - if yyc1920 { - *v = yyv1920 + yyh1894.End() + if yyc1894 { + *v = yyv1894 } } @@ -23506,9 +23207,9 @@ func (x codecSelfer1234) encSliceFSType(v []FSType, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1924 := range v { + for _, yyv1898 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yyv1924.CodecEncodeSelf(e) + yyv1898.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -23518,75 +23219,75 @@ func (x codecSelfer1234) decSliceFSType(v *[]FSType, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1925 := *v - yyh1925, yyl1925 := z.DecSliceHelperStart() - var yyc1925 bool - if yyl1925 == 0 { - if yyv1925 == nil { - yyv1925 = []FSType{} - yyc1925 = true - } else if len(yyv1925) != 0 { - yyv1925 = yyv1925[:0] - yyc1925 = true + yyv1899 := *v + yyh1899, yyl1899 := z.DecSliceHelperStart() + var yyc1899 bool + if yyl1899 == 0 { + if yyv1899 == nil { + yyv1899 = []FSType{} + yyc1899 = true + } else if len(yyv1899) != 0 { + yyv1899 = yyv1899[:0] + yyc1899 = true } - } else if yyl1925 > 0 { - var yyrr1925, yyrl1925 int - var yyrt1925 bool - if yyl1925 > cap(yyv1925) { + } else if yyl1899 > 0 { + var yyrr1899, yyrl1899 int + var yyrt1899 bool + if yyl1899 > cap(yyv1899) { - yyrl1925, yyrt1925 = z.DecInferLen(yyl1925, z.DecBasicHandle().MaxInitLen, 16) - if yyrt1925 { - if yyrl1925 <= cap(yyv1925) { - yyv1925 = yyv1925[:yyrl1925] + yyrl1899, yyrt1899 = z.DecInferLen(yyl1899, z.DecBasicHandle().MaxInitLen, 16) + if yyrt1899 { + if yyrl1899 <= cap(yyv1899) { + yyv1899 = yyv1899[:yyrl1899] } else { - yyv1925 = make([]FSType, yyrl1925) + yyv1899 = make([]FSType, yyrl1899) } } else { - yyv1925 = make([]FSType, yyrl1925) + yyv1899 = make([]FSType, yyrl1899) } - yyc1925 = true - yyrr1925 = len(yyv1925) - } else if yyl1925 != len(yyv1925) { - yyv1925 = yyv1925[:yyl1925] - yyc1925 = true + yyc1899 = true + yyrr1899 = len(yyv1899) + } else if yyl1899 != len(yyv1899) { + yyv1899 = yyv1899[:yyl1899] + yyc1899 = true } - yyj1925 := 0 - for ; yyj1925 < yyrr1925; yyj1925++ { - yyh1925.ElemContainerState(yyj1925) + yyj1899 := 0 + for ; yyj1899 < yyrr1899; yyj1899++ { + yyh1899.ElemContainerState(yyj1899) if r.TryDecodeAsNil() { - yyv1925[yyj1925] = "" + yyv1899[yyj1899] = "" } else { - yyv1925[yyj1925] = FSType(r.DecodeString()) + yyv1899[yyj1899] = FSType(r.DecodeString()) } } - if yyrt1925 { - for ; yyj1925 < yyl1925; yyj1925++ { - yyv1925 = append(yyv1925, "") - yyh1925.ElemContainerState(yyj1925) + if yyrt1899 { + for ; yyj1899 < yyl1899; yyj1899++ { + yyv1899 = append(yyv1899, "") + yyh1899.ElemContainerState(yyj1899) if r.TryDecodeAsNil() { - yyv1925[yyj1925] = "" + yyv1899[yyj1899] = "" } else { - yyv1925[yyj1925] = FSType(r.DecodeString()) + yyv1899[yyj1899] = FSType(r.DecodeString()) } } } } else { - yyj1925 := 0 - for ; !r.CheckBreak(); yyj1925++ { + yyj1899 := 0 + for ; !r.CheckBreak(); yyj1899++ { - if yyj1925 >= len(yyv1925) { - yyv1925 = append(yyv1925, "") // var yyz1925 FSType - yyc1925 = true + if yyj1899 >= len(yyv1899) { + yyv1899 = append(yyv1899, "") // var yyz1899 FSType + yyc1899 = true } - yyh1925.ElemContainerState(yyj1925) - if yyj1925 < len(yyv1925) { + yyh1899.ElemContainerState(yyj1899) + if yyj1899 < len(yyv1899) { if r.TryDecodeAsNil() { - yyv1925[yyj1925] = "" + yyv1899[yyj1899] = "" } else { - yyv1925[yyj1925] = FSType(r.DecodeString()) + yyv1899[yyj1899] = FSType(r.DecodeString()) } } else { @@ -23594,17 +23295,17 @@ func (x codecSelfer1234) decSliceFSType(v *[]FSType, d *codec1978.Decoder) { } } - if yyj1925 < len(yyv1925) { - yyv1925 = yyv1925[:yyj1925] - yyc1925 = true - } else if yyj1925 == 0 && yyv1925 == nil { - yyv1925 = []FSType{} - yyc1925 = true + if yyj1899 < len(yyv1899) { + yyv1899 = yyv1899[:yyj1899] + yyc1899 = true + } else if yyj1899 == 0 && yyv1899 == nil { + yyv1899 = []FSType{} + yyc1899 = true } } - yyh1925.End() - if yyc1925 { - *v = yyv1925 + yyh1899.End() + if yyc1899 { + *v = yyv1899 } } @@ -23613,10 +23314,10 @@ func (x codecSelfer1234) encSliceHostPortRange(v []HostPortRange, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1929 := range v { + for _, yyv1903 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1930 := &yyv1929 - yy1930.CodecEncodeSelf(e) + yy1904 := &yyv1903 + yy1904.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -23626,83 +23327,83 @@ func (x codecSelfer1234) decSliceHostPortRange(v *[]HostPortRange, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1931 := *v - yyh1931, yyl1931 := z.DecSliceHelperStart() - var yyc1931 bool - if yyl1931 == 0 { - if yyv1931 == nil { - yyv1931 = []HostPortRange{} - yyc1931 = true - } else if len(yyv1931) != 0 { - yyv1931 = yyv1931[:0] - yyc1931 = true + yyv1905 := *v + yyh1905, yyl1905 := z.DecSliceHelperStart() + var yyc1905 bool + if yyl1905 == 0 { + if yyv1905 == nil { + yyv1905 = []HostPortRange{} + yyc1905 = true + } else if len(yyv1905) != 0 { + yyv1905 = yyv1905[:0] + yyc1905 = true } - } else if yyl1931 > 0 { - var yyrr1931, yyrl1931 int - var yyrt1931 bool - if yyl1931 > cap(yyv1931) { + } else if yyl1905 > 0 { + var yyrr1905, yyrl1905 int + var yyrt1905 bool + if yyl1905 > cap(yyv1905) { - yyrg1931 := len(yyv1931) > 0 - yyv21931 := yyv1931 - yyrl1931, yyrt1931 = z.DecInferLen(yyl1931, z.DecBasicHandle().MaxInitLen, 8) - if yyrt1931 { - if yyrl1931 <= cap(yyv1931) { - yyv1931 = yyv1931[:yyrl1931] + yyrg1905 := len(yyv1905) > 0 + yyv21905 := yyv1905 + yyrl1905, yyrt1905 = z.DecInferLen(yyl1905, z.DecBasicHandle().MaxInitLen, 8) + if yyrt1905 { + if yyrl1905 <= cap(yyv1905) { + yyv1905 = yyv1905[:yyrl1905] } else { - yyv1931 = make([]HostPortRange, yyrl1931) + yyv1905 = make([]HostPortRange, yyrl1905) } } else { - yyv1931 = make([]HostPortRange, yyrl1931) + yyv1905 = make([]HostPortRange, yyrl1905) } - yyc1931 = true - yyrr1931 = len(yyv1931) - if yyrg1931 { - copy(yyv1931, yyv21931) + yyc1905 = true + yyrr1905 = len(yyv1905) + if yyrg1905 { + copy(yyv1905, yyv21905) } - } else if yyl1931 != len(yyv1931) { - yyv1931 = yyv1931[:yyl1931] - yyc1931 = true + } else if yyl1905 != len(yyv1905) { + yyv1905 = yyv1905[:yyl1905] + yyc1905 = true } - yyj1931 := 0 - for ; yyj1931 < yyrr1931; yyj1931++ { - yyh1931.ElemContainerState(yyj1931) + yyj1905 := 0 + for ; yyj1905 < yyrr1905; yyj1905++ { + yyh1905.ElemContainerState(yyj1905) if r.TryDecodeAsNil() { - yyv1931[yyj1931] = HostPortRange{} + yyv1905[yyj1905] = HostPortRange{} } else { - yyv1932 := &yyv1931[yyj1931] - yyv1932.CodecDecodeSelf(d) + yyv1906 := &yyv1905[yyj1905] + yyv1906.CodecDecodeSelf(d) } } - if yyrt1931 { - for ; yyj1931 < yyl1931; yyj1931++ { - yyv1931 = append(yyv1931, HostPortRange{}) - yyh1931.ElemContainerState(yyj1931) + if yyrt1905 { + for ; yyj1905 < yyl1905; yyj1905++ { + yyv1905 = append(yyv1905, HostPortRange{}) + yyh1905.ElemContainerState(yyj1905) if r.TryDecodeAsNil() { - yyv1931[yyj1931] = HostPortRange{} + yyv1905[yyj1905] = HostPortRange{} } else { - yyv1933 := &yyv1931[yyj1931] - yyv1933.CodecDecodeSelf(d) + yyv1907 := &yyv1905[yyj1905] + yyv1907.CodecDecodeSelf(d) } } } } else { - yyj1931 := 0 - for ; !r.CheckBreak(); yyj1931++ { + yyj1905 := 0 + for ; !r.CheckBreak(); yyj1905++ { - if yyj1931 >= len(yyv1931) { - yyv1931 = append(yyv1931, HostPortRange{}) // var yyz1931 HostPortRange - yyc1931 = true + if yyj1905 >= len(yyv1905) { + yyv1905 = append(yyv1905, HostPortRange{}) // var yyz1905 HostPortRange + yyc1905 = true } - yyh1931.ElemContainerState(yyj1931) - if yyj1931 < len(yyv1931) { + yyh1905.ElemContainerState(yyj1905) + if yyj1905 < len(yyv1905) { if r.TryDecodeAsNil() { - yyv1931[yyj1931] = HostPortRange{} + yyv1905[yyj1905] = HostPortRange{} } else { - yyv1934 := &yyv1931[yyj1931] - yyv1934.CodecDecodeSelf(d) + yyv1908 := &yyv1905[yyj1905] + yyv1908.CodecDecodeSelf(d) } } else { @@ -23710,17 +23411,17 @@ func (x codecSelfer1234) decSliceHostPortRange(v *[]HostPortRange, d *codec1978. } } - if yyj1931 < len(yyv1931) { - yyv1931 = yyv1931[:yyj1931] - yyc1931 = true - } else if yyj1931 == 0 && yyv1931 == nil { - yyv1931 = []HostPortRange{} - yyc1931 = true + if yyj1905 < len(yyv1905) { + yyv1905 = yyv1905[:yyj1905] + yyc1905 = true + } else if yyj1905 == 0 && yyv1905 == nil { + yyv1905 = []HostPortRange{} + yyc1905 = true } } - yyh1931.End() - if yyc1931 { - *v = yyv1931 + yyh1905.End() + if yyc1905 { + *v = yyv1905 } } @@ -23729,10 +23430,10 @@ func (x codecSelfer1234) encSliceIDRange(v []IDRange, e *codec1978.Encoder) { z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1935 := range v { + for _, yyv1909 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1936 := &yyv1935 - yy1936.CodecEncodeSelf(e) + yy1910 := &yyv1909 + yy1910.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -23742,83 +23443,83 @@ func (x codecSelfer1234) decSliceIDRange(v *[]IDRange, d *codec1978.Decoder) { z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1937 := *v - yyh1937, yyl1937 := z.DecSliceHelperStart() - var yyc1937 bool - if yyl1937 == 0 { - if yyv1937 == nil { - yyv1937 = []IDRange{} - yyc1937 = true - } else if len(yyv1937) != 0 { - yyv1937 = yyv1937[:0] - yyc1937 = true + yyv1911 := *v + yyh1911, yyl1911 := z.DecSliceHelperStart() + var yyc1911 bool + if yyl1911 == 0 { + if yyv1911 == nil { + yyv1911 = []IDRange{} + yyc1911 = true + } else if len(yyv1911) != 0 { + yyv1911 = yyv1911[:0] + yyc1911 = true } - } else if yyl1937 > 0 { - var yyrr1937, yyrl1937 int - var yyrt1937 bool - if yyl1937 > cap(yyv1937) { + } else if yyl1911 > 0 { + var yyrr1911, yyrl1911 int + var yyrt1911 bool + if yyl1911 > cap(yyv1911) { - yyrg1937 := len(yyv1937) > 0 - yyv21937 := yyv1937 - yyrl1937, yyrt1937 = z.DecInferLen(yyl1937, z.DecBasicHandle().MaxInitLen, 16) - if yyrt1937 { - if yyrl1937 <= cap(yyv1937) { - yyv1937 = yyv1937[:yyrl1937] + yyrg1911 := len(yyv1911) > 0 + yyv21911 := yyv1911 + yyrl1911, yyrt1911 = z.DecInferLen(yyl1911, z.DecBasicHandle().MaxInitLen, 16) + if yyrt1911 { + if yyrl1911 <= cap(yyv1911) { + yyv1911 = yyv1911[:yyrl1911] } else { - yyv1937 = make([]IDRange, yyrl1937) + yyv1911 = make([]IDRange, yyrl1911) } } else { - yyv1937 = make([]IDRange, yyrl1937) + yyv1911 = make([]IDRange, yyrl1911) } - yyc1937 = true - yyrr1937 = len(yyv1937) - if yyrg1937 { - copy(yyv1937, yyv21937) + yyc1911 = true + yyrr1911 = len(yyv1911) + if yyrg1911 { + copy(yyv1911, yyv21911) } - } else if yyl1937 != len(yyv1937) { - yyv1937 = yyv1937[:yyl1937] - yyc1937 = true + } else if yyl1911 != len(yyv1911) { + yyv1911 = yyv1911[:yyl1911] + yyc1911 = true } - yyj1937 := 0 - for ; yyj1937 < yyrr1937; yyj1937++ { - yyh1937.ElemContainerState(yyj1937) + yyj1911 := 0 + for ; yyj1911 < yyrr1911; yyj1911++ { + yyh1911.ElemContainerState(yyj1911) if r.TryDecodeAsNil() { - yyv1937[yyj1937] = IDRange{} + yyv1911[yyj1911] = IDRange{} } else { - yyv1938 := &yyv1937[yyj1937] - yyv1938.CodecDecodeSelf(d) + yyv1912 := &yyv1911[yyj1911] + yyv1912.CodecDecodeSelf(d) } } - if yyrt1937 { - for ; yyj1937 < yyl1937; yyj1937++ { - yyv1937 = append(yyv1937, IDRange{}) - yyh1937.ElemContainerState(yyj1937) + if yyrt1911 { + for ; yyj1911 < yyl1911; yyj1911++ { + yyv1911 = append(yyv1911, IDRange{}) + yyh1911.ElemContainerState(yyj1911) if r.TryDecodeAsNil() { - yyv1937[yyj1937] = IDRange{} + yyv1911[yyj1911] = IDRange{} } else { - yyv1939 := &yyv1937[yyj1937] - yyv1939.CodecDecodeSelf(d) + yyv1913 := &yyv1911[yyj1911] + yyv1913.CodecDecodeSelf(d) } } } } else { - yyj1937 := 0 - for ; !r.CheckBreak(); yyj1937++ { + yyj1911 := 0 + for ; !r.CheckBreak(); yyj1911++ { - if yyj1937 >= len(yyv1937) { - yyv1937 = append(yyv1937, IDRange{}) // var yyz1937 IDRange - yyc1937 = true + if yyj1911 >= len(yyv1911) { + yyv1911 = append(yyv1911, IDRange{}) // var yyz1911 IDRange + yyc1911 = true } - yyh1937.ElemContainerState(yyj1937) - if yyj1937 < len(yyv1937) { + yyh1911.ElemContainerState(yyj1911) + if yyj1911 < len(yyv1911) { if r.TryDecodeAsNil() { - yyv1937[yyj1937] = IDRange{} + yyv1911[yyj1911] = IDRange{} } else { - yyv1940 := &yyv1937[yyj1937] - yyv1940.CodecDecodeSelf(d) + yyv1914 := &yyv1911[yyj1911] + yyv1914.CodecDecodeSelf(d) } } else { @@ -23826,17 +23527,17 @@ func (x codecSelfer1234) decSliceIDRange(v *[]IDRange, d *codec1978.Decoder) { } } - if yyj1937 < len(yyv1937) { - yyv1937 = yyv1937[:yyj1937] - yyc1937 = true - } else if yyj1937 == 0 && yyv1937 == nil { - yyv1937 = []IDRange{} - yyc1937 = true + if yyj1911 < len(yyv1911) { + yyv1911 = yyv1911[:yyj1911] + yyc1911 = true + } else if yyj1911 == 0 && yyv1911 == nil { + yyv1911 = []IDRange{} + yyc1911 = true } } - yyh1937.End() - if yyc1937 { - *v = yyv1937 + yyh1911.End() + if yyc1911 { + *v = yyv1911 } } @@ -23845,10 +23546,10 @@ func (x codecSelfer1234) encSlicePodSecurityPolicy(v []PodSecurityPolicy, e *cod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1941 := range v { + for _, yyv1915 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1942 := &yyv1941 - yy1942.CodecEncodeSelf(e) + yy1916 := &yyv1915 + yy1916.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -23858,83 +23559,83 @@ func (x codecSelfer1234) decSlicePodSecurityPolicy(v *[]PodSecurityPolicy, d *co z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1943 := *v - yyh1943, yyl1943 := z.DecSliceHelperStart() - var yyc1943 bool - if yyl1943 == 0 { - if yyv1943 == nil { - yyv1943 = []PodSecurityPolicy{} - yyc1943 = true - } else if len(yyv1943) != 0 { - yyv1943 = yyv1943[:0] - yyc1943 = true + yyv1917 := *v + yyh1917, yyl1917 := z.DecSliceHelperStart() + var yyc1917 bool + if yyl1917 == 0 { + if yyv1917 == nil { + yyv1917 = []PodSecurityPolicy{} + yyc1917 = true + } else if len(yyv1917) != 0 { + yyv1917 = yyv1917[:0] + yyc1917 = true } - } else if yyl1943 > 0 { - var yyrr1943, yyrl1943 int - var yyrt1943 bool - if yyl1943 > cap(yyv1943) { + } else if yyl1917 > 0 { + var yyrr1917, yyrl1917 int + var yyrt1917 bool + if yyl1917 > cap(yyv1917) { - yyrg1943 := len(yyv1943) > 0 - yyv21943 := yyv1943 - yyrl1943, yyrt1943 = z.DecInferLen(yyl1943, z.DecBasicHandle().MaxInitLen, 552) - if yyrt1943 { - if yyrl1943 <= cap(yyv1943) { - yyv1943 = yyv1943[:yyrl1943] + yyrg1917 := len(yyv1917) > 0 + yyv21917 := yyv1917 + yyrl1917, yyrt1917 = z.DecInferLen(yyl1917, z.DecBasicHandle().MaxInitLen, 552) + if yyrt1917 { + if yyrl1917 <= cap(yyv1917) { + yyv1917 = yyv1917[:yyrl1917] } else { - yyv1943 = make([]PodSecurityPolicy, yyrl1943) + yyv1917 = make([]PodSecurityPolicy, yyrl1917) } } else { - yyv1943 = make([]PodSecurityPolicy, yyrl1943) + yyv1917 = make([]PodSecurityPolicy, yyrl1917) } - yyc1943 = true - yyrr1943 = len(yyv1943) - if yyrg1943 { - copy(yyv1943, yyv21943) + yyc1917 = true + yyrr1917 = len(yyv1917) + if yyrg1917 { + copy(yyv1917, yyv21917) } - } else if yyl1943 != len(yyv1943) { - yyv1943 = yyv1943[:yyl1943] - yyc1943 = true + } else if yyl1917 != len(yyv1917) { + yyv1917 = yyv1917[:yyl1917] + yyc1917 = true } - yyj1943 := 0 - for ; yyj1943 < yyrr1943; yyj1943++ { - yyh1943.ElemContainerState(yyj1943) + yyj1917 := 0 + for ; yyj1917 < yyrr1917; yyj1917++ { + yyh1917.ElemContainerState(yyj1917) if r.TryDecodeAsNil() { - yyv1943[yyj1943] = PodSecurityPolicy{} + yyv1917[yyj1917] = PodSecurityPolicy{} } else { - yyv1944 := &yyv1943[yyj1943] - yyv1944.CodecDecodeSelf(d) + yyv1918 := &yyv1917[yyj1917] + yyv1918.CodecDecodeSelf(d) } } - if yyrt1943 { - for ; yyj1943 < yyl1943; yyj1943++ { - yyv1943 = append(yyv1943, PodSecurityPolicy{}) - yyh1943.ElemContainerState(yyj1943) + if yyrt1917 { + for ; yyj1917 < yyl1917; yyj1917++ { + yyv1917 = append(yyv1917, PodSecurityPolicy{}) + yyh1917.ElemContainerState(yyj1917) if r.TryDecodeAsNil() { - yyv1943[yyj1943] = PodSecurityPolicy{} + yyv1917[yyj1917] = PodSecurityPolicy{} } else { - yyv1945 := &yyv1943[yyj1943] - yyv1945.CodecDecodeSelf(d) + yyv1919 := &yyv1917[yyj1917] + yyv1919.CodecDecodeSelf(d) } } } } else { - yyj1943 := 0 - for ; !r.CheckBreak(); yyj1943++ { + yyj1917 := 0 + for ; !r.CheckBreak(); yyj1917++ { - if yyj1943 >= len(yyv1943) { - yyv1943 = append(yyv1943, PodSecurityPolicy{}) // var yyz1943 PodSecurityPolicy - yyc1943 = true + if yyj1917 >= len(yyv1917) { + yyv1917 = append(yyv1917, PodSecurityPolicy{}) // var yyz1917 PodSecurityPolicy + yyc1917 = true } - yyh1943.ElemContainerState(yyj1943) - if yyj1943 < len(yyv1943) { + yyh1917.ElemContainerState(yyj1917) + if yyj1917 < len(yyv1917) { if r.TryDecodeAsNil() { - yyv1943[yyj1943] = PodSecurityPolicy{} + yyv1917[yyj1917] = PodSecurityPolicy{} } else { - yyv1946 := &yyv1943[yyj1943] - yyv1946.CodecDecodeSelf(d) + yyv1920 := &yyv1917[yyj1917] + yyv1920.CodecDecodeSelf(d) } } else { @@ -23942,17 +23643,17 @@ func (x codecSelfer1234) decSlicePodSecurityPolicy(v *[]PodSecurityPolicy, d *co } } - if yyj1943 < len(yyv1943) { - yyv1943 = yyv1943[:yyj1943] - yyc1943 = true - } else if yyj1943 == 0 && yyv1943 == nil { - yyv1943 = []PodSecurityPolicy{} - yyc1943 = true + if yyj1917 < len(yyv1917) { + yyv1917 = yyv1917[:yyj1917] + yyc1917 = true + } else if yyj1917 == 0 && yyv1917 == nil { + yyv1917 = []PodSecurityPolicy{} + yyc1917 = true } } - yyh1943.End() - if yyc1943 { - *v = yyv1943 + yyh1917.End() + if yyc1917 { + *v = yyv1917 } } @@ -23961,10 +23662,10 @@ func (x codecSelfer1234) encSliceNetworkPolicyIngressRule(v []NetworkPolicyIngre z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1947 := range v { + for _, yyv1921 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1948 := &yyv1947 - yy1948.CodecEncodeSelf(e) + yy1922 := &yyv1921 + yy1922.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -23974,83 +23675,83 @@ func (x codecSelfer1234) decSliceNetworkPolicyIngressRule(v *[]NetworkPolicyIngr z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1949 := *v - yyh1949, yyl1949 := z.DecSliceHelperStart() - var yyc1949 bool - if yyl1949 == 0 { - if yyv1949 == nil { - yyv1949 = []NetworkPolicyIngressRule{} - yyc1949 = true - } else if len(yyv1949) != 0 { - yyv1949 = yyv1949[:0] - yyc1949 = true + yyv1923 := *v + yyh1923, yyl1923 := z.DecSliceHelperStart() + var yyc1923 bool + if yyl1923 == 0 { + if yyv1923 == nil { + yyv1923 = []NetworkPolicyIngressRule{} + yyc1923 = true + } else if len(yyv1923) != 0 { + yyv1923 = yyv1923[:0] + yyc1923 = true } - } else if yyl1949 > 0 { - var yyrr1949, yyrl1949 int - var yyrt1949 bool - if yyl1949 > cap(yyv1949) { + } else if yyl1923 > 0 { + var yyrr1923, yyrl1923 int + var yyrt1923 bool + if yyl1923 > cap(yyv1923) { - yyrg1949 := len(yyv1949) > 0 - yyv21949 := yyv1949 - yyrl1949, yyrt1949 = z.DecInferLen(yyl1949, z.DecBasicHandle().MaxInitLen, 48) - if yyrt1949 { - if yyrl1949 <= cap(yyv1949) { - yyv1949 = yyv1949[:yyrl1949] + yyrg1923 := len(yyv1923) > 0 + yyv21923 := yyv1923 + yyrl1923, yyrt1923 = z.DecInferLen(yyl1923, z.DecBasicHandle().MaxInitLen, 48) + if yyrt1923 { + if yyrl1923 <= cap(yyv1923) { + yyv1923 = yyv1923[:yyrl1923] } else { - yyv1949 = make([]NetworkPolicyIngressRule, yyrl1949) + yyv1923 = make([]NetworkPolicyIngressRule, yyrl1923) } } else { - yyv1949 = make([]NetworkPolicyIngressRule, yyrl1949) + yyv1923 = make([]NetworkPolicyIngressRule, yyrl1923) } - yyc1949 = true - yyrr1949 = len(yyv1949) - if yyrg1949 { - copy(yyv1949, yyv21949) + yyc1923 = true + yyrr1923 = len(yyv1923) + if yyrg1923 { + copy(yyv1923, yyv21923) } - } else if yyl1949 != len(yyv1949) { - yyv1949 = yyv1949[:yyl1949] - yyc1949 = true + } else if yyl1923 != len(yyv1923) { + yyv1923 = yyv1923[:yyl1923] + yyc1923 = true } - yyj1949 := 0 - for ; yyj1949 < yyrr1949; yyj1949++ { - yyh1949.ElemContainerState(yyj1949) + yyj1923 := 0 + for ; yyj1923 < yyrr1923; yyj1923++ { + yyh1923.ElemContainerState(yyj1923) if r.TryDecodeAsNil() { - yyv1949[yyj1949] = NetworkPolicyIngressRule{} + yyv1923[yyj1923] = NetworkPolicyIngressRule{} } else { - yyv1950 := &yyv1949[yyj1949] - yyv1950.CodecDecodeSelf(d) + yyv1924 := &yyv1923[yyj1923] + yyv1924.CodecDecodeSelf(d) } } - if yyrt1949 { - for ; yyj1949 < yyl1949; yyj1949++ { - yyv1949 = append(yyv1949, NetworkPolicyIngressRule{}) - yyh1949.ElemContainerState(yyj1949) + if yyrt1923 { + for ; yyj1923 < yyl1923; yyj1923++ { + yyv1923 = append(yyv1923, NetworkPolicyIngressRule{}) + yyh1923.ElemContainerState(yyj1923) if r.TryDecodeAsNil() { - yyv1949[yyj1949] = NetworkPolicyIngressRule{} + yyv1923[yyj1923] = NetworkPolicyIngressRule{} } else { - yyv1951 := &yyv1949[yyj1949] - yyv1951.CodecDecodeSelf(d) + yyv1925 := &yyv1923[yyj1923] + yyv1925.CodecDecodeSelf(d) } } } } else { - yyj1949 := 0 - for ; !r.CheckBreak(); yyj1949++ { + yyj1923 := 0 + for ; !r.CheckBreak(); yyj1923++ { - if yyj1949 >= len(yyv1949) { - yyv1949 = append(yyv1949, NetworkPolicyIngressRule{}) // var yyz1949 NetworkPolicyIngressRule - yyc1949 = true + if yyj1923 >= len(yyv1923) { + yyv1923 = append(yyv1923, NetworkPolicyIngressRule{}) // var yyz1923 NetworkPolicyIngressRule + yyc1923 = true } - yyh1949.ElemContainerState(yyj1949) - if yyj1949 < len(yyv1949) { + yyh1923.ElemContainerState(yyj1923) + if yyj1923 < len(yyv1923) { if r.TryDecodeAsNil() { - yyv1949[yyj1949] = NetworkPolicyIngressRule{} + yyv1923[yyj1923] = NetworkPolicyIngressRule{} } else { - yyv1952 := &yyv1949[yyj1949] - yyv1952.CodecDecodeSelf(d) + yyv1926 := &yyv1923[yyj1923] + yyv1926.CodecDecodeSelf(d) } } else { @@ -24058,17 +23759,17 @@ func (x codecSelfer1234) decSliceNetworkPolicyIngressRule(v *[]NetworkPolicyIngr } } - if yyj1949 < len(yyv1949) { - yyv1949 = yyv1949[:yyj1949] - yyc1949 = true - } else if yyj1949 == 0 && yyv1949 == nil { - yyv1949 = []NetworkPolicyIngressRule{} - yyc1949 = true + if yyj1923 < len(yyv1923) { + yyv1923 = yyv1923[:yyj1923] + yyc1923 = true + } else if yyj1923 == 0 && yyv1923 == nil { + yyv1923 = []NetworkPolicyIngressRule{} + yyc1923 = true } } - yyh1949.End() - if yyc1949 { - *v = yyv1949 + yyh1923.End() + if yyc1923 { + *v = yyv1923 } } @@ -24077,10 +23778,10 @@ func (x codecSelfer1234) encSliceNetworkPolicyPort(v []NetworkPolicyPort, e *cod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1953 := range v { + for _, yyv1927 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1954 := &yyv1953 - yy1954.CodecEncodeSelf(e) + yy1928 := &yyv1927 + yy1928.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -24090,83 +23791,83 @@ func (x codecSelfer1234) decSliceNetworkPolicyPort(v *[]NetworkPolicyPort, d *co z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1955 := *v - yyh1955, yyl1955 := z.DecSliceHelperStart() - var yyc1955 bool - if yyl1955 == 0 { - if yyv1955 == nil { - yyv1955 = []NetworkPolicyPort{} - yyc1955 = true - } else if len(yyv1955) != 0 { - yyv1955 = yyv1955[:0] - yyc1955 = true + yyv1929 := *v + yyh1929, yyl1929 := z.DecSliceHelperStart() + var yyc1929 bool + if yyl1929 == 0 { + if yyv1929 == nil { + yyv1929 = []NetworkPolicyPort{} + yyc1929 = true + } else if len(yyv1929) != 0 { + yyv1929 = yyv1929[:0] + yyc1929 = true } - } else if yyl1955 > 0 { - var yyrr1955, yyrl1955 int - var yyrt1955 bool - if yyl1955 > cap(yyv1955) { + } else if yyl1929 > 0 { + var yyrr1929, yyrl1929 int + var yyrt1929 bool + if yyl1929 > cap(yyv1929) { - yyrg1955 := len(yyv1955) > 0 - yyv21955 := yyv1955 - yyrl1955, yyrt1955 = z.DecInferLen(yyl1955, z.DecBasicHandle().MaxInitLen, 16) - if yyrt1955 { - if yyrl1955 <= cap(yyv1955) { - yyv1955 = yyv1955[:yyrl1955] + yyrg1929 := len(yyv1929) > 0 + yyv21929 := yyv1929 + yyrl1929, yyrt1929 = z.DecInferLen(yyl1929, z.DecBasicHandle().MaxInitLen, 16) + if yyrt1929 { + if yyrl1929 <= cap(yyv1929) { + yyv1929 = yyv1929[:yyrl1929] } else { - yyv1955 = make([]NetworkPolicyPort, yyrl1955) + yyv1929 = make([]NetworkPolicyPort, yyrl1929) } } else { - yyv1955 = make([]NetworkPolicyPort, yyrl1955) + yyv1929 = make([]NetworkPolicyPort, yyrl1929) } - yyc1955 = true - yyrr1955 = len(yyv1955) - if yyrg1955 { - copy(yyv1955, yyv21955) + yyc1929 = true + yyrr1929 = len(yyv1929) + if yyrg1929 { + copy(yyv1929, yyv21929) } - } else if yyl1955 != len(yyv1955) { - yyv1955 = yyv1955[:yyl1955] - yyc1955 = true + } else if yyl1929 != len(yyv1929) { + yyv1929 = yyv1929[:yyl1929] + yyc1929 = true } - yyj1955 := 0 - for ; yyj1955 < yyrr1955; yyj1955++ { - yyh1955.ElemContainerState(yyj1955) + yyj1929 := 0 + for ; yyj1929 < yyrr1929; yyj1929++ { + yyh1929.ElemContainerState(yyj1929) if r.TryDecodeAsNil() { - yyv1955[yyj1955] = NetworkPolicyPort{} + yyv1929[yyj1929] = NetworkPolicyPort{} } else { - yyv1956 := &yyv1955[yyj1955] - yyv1956.CodecDecodeSelf(d) + yyv1930 := &yyv1929[yyj1929] + yyv1930.CodecDecodeSelf(d) } } - if yyrt1955 { - for ; yyj1955 < yyl1955; yyj1955++ { - yyv1955 = append(yyv1955, NetworkPolicyPort{}) - yyh1955.ElemContainerState(yyj1955) + if yyrt1929 { + for ; yyj1929 < yyl1929; yyj1929++ { + yyv1929 = append(yyv1929, NetworkPolicyPort{}) + yyh1929.ElemContainerState(yyj1929) if r.TryDecodeAsNil() { - yyv1955[yyj1955] = NetworkPolicyPort{} + yyv1929[yyj1929] = NetworkPolicyPort{} } else { - yyv1957 := &yyv1955[yyj1955] - yyv1957.CodecDecodeSelf(d) + yyv1931 := &yyv1929[yyj1929] + yyv1931.CodecDecodeSelf(d) } } } } else { - yyj1955 := 0 - for ; !r.CheckBreak(); yyj1955++ { + yyj1929 := 0 + for ; !r.CheckBreak(); yyj1929++ { - if yyj1955 >= len(yyv1955) { - yyv1955 = append(yyv1955, NetworkPolicyPort{}) // var yyz1955 NetworkPolicyPort - yyc1955 = true + if yyj1929 >= len(yyv1929) { + yyv1929 = append(yyv1929, NetworkPolicyPort{}) // var yyz1929 NetworkPolicyPort + yyc1929 = true } - yyh1955.ElemContainerState(yyj1955) - if yyj1955 < len(yyv1955) { + yyh1929.ElemContainerState(yyj1929) + if yyj1929 < len(yyv1929) { if r.TryDecodeAsNil() { - yyv1955[yyj1955] = NetworkPolicyPort{} + yyv1929[yyj1929] = NetworkPolicyPort{} } else { - yyv1958 := &yyv1955[yyj1955] - yyv1958.CodecDecodeSelf(d) + yyv1932 := &yyv1929[yyj1929] + yyv1932.CodecDecodeSelf(d) } } else { @@ -24174,17 +23875,17 @@ func (x codecSelfer1234) decSliceNetworkPolicyPort(v *[]NetworkPolicyPort, d *co } } - if yyj1955 < len(yyv1955) { - yyv1955 = yyv1955[:yyj1955] - yyc1955 = true - } else if yyj1955 == 0 && yyv1955 == nil { - yyv1955 = []NetworkPolicyPort{} - yyc1955 = true + if yyj1929 < len(yyv1929) { + yyv1929 = yyv1929[:yyj1929] + yyc1929 = true + } else if yyj1929 == 0 && yyv1929 == nil { + yyv1929 = []NetworkPolicyPort{} + yyc1929 = true } } - yyh1955.End() - if yyc1955 { - *v = yyv1955 + yyh1929.End() + if yyc1929 { + *v = yyv1929 } } @@ -24193,10 +23894,10 @@ func (x codecSelfer1234) encSliceNetworkPolicyPeer(v []NetworkPolicyPeer, e *cod z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1959 := range v { + for _, yyv1933 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1960 := &yyv1959 - yy1960.CodecEncodeSelf(e) + yy1934 := &yyv1933 + yy1934.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -24206,83 +23907,83 @@ func (x codecSelfer1234) decSliceNetworkPolicyPeer(v *[]NetworkPolicyPeer, d *co z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1961 := *v - yyh1961, yyl1961 := z.DecSliceHelperStart() - var yyc1961 bool - if yyl1961 == 0 { - if yyv1961 == nil { - yyv1961 = []NetworkPolicyPeer{} - yyc1961 = true - } else if len(yyv1961) != 0 { - yyv1961 = yyv1961[:0] - yyc1961 = true + yyv1935 := *v + yyh1935, yyl1935 := z.DecSliceHelperStart() + var yyc1935 bool + if yyl1935 == 0 { + if yyv1935 == nil { + yyv1935 = []NetworkPolicyPeer{} + yyc1935 = true + } else if len(yyv1935) != 0 { + yyv1935 = yyv1935[:0] + yyc1935 = true } - } else if yyl1961 > 0 { - var yyrr1961, yyrl1961 int - var yyrt1961 bool - if yyl1961 > cap(yyv1961) { + } else if yyl1935 > 0 { + var yyrr1935, yyrl1935 int + var yyrt1935 bool + if yyl1935 > cap(yyv1935) { - yyrg1961 := len(yyv1961) > 0 - yyv21961 := yyv1961 - yyrl1961, yyrt1961 = z.DecInferLen(yyl1961, z.DecBasicHandle().MaxInitLen, 16) - if yyrt1961 { - if yyrl1961 <= cap(yyv1961) { - yyv1961 = yyv1961[:yyrl1961] + yyrg1935 := len(yyv1935) > 0 + yyv21935 := yyv1935 + yyrl1935, yyrt1935 = z.DecInferLen(yyl1935, z.DecBasicHandle().MaxInitLen, 16) + if yyrt1935 { + if yyrl1935 <= cap(yyv1935) { + yyv1935 = yyv1935[:yyrl1935] } else { - yyv1961 = make([]NetworkPolicyPeer, yyrl1961) + yyv1935 = make([]NetworkPolicyPeer, yyrl1935) } } else { - yyv1961 = make([]NetworkPolicyPeer, yyrl1961) + yyv1935 = make([]NetworkPolicyPeer, yyrl1935) } - yyc1961 = true - yyrr1961 = len(yyv1961) - if yyrg1961 { - copy(yyv1961, yyv21961) + yyc1935 = true + yyrr1935 = len(yyv1935) + if yyrg1935 { + copy(yyv1935, yyv21935) } - } else if yyl1961 != len(yyv1961) { - yyv1961 = yyv1961[:yyl1961] - yyc1961 = true + } else if yyl1935 != len(yyv1935) { + yyv1935 = yyv1935[:yyl1935] + yyc1935 = true } - yyj1961 := 0 - for ; yyj1961 < yyrr1961; yyj1961++ { - yyh1961.ElemContainerState(yyj1961) + yyj1935 := 0 + for ; yyj1935 < yyrr1935; yyj1935++ { + yyh1935.ElemContainerState(yyj1935) if r.TryDecodeAsNil() { - yyv1961[yyj1961] = NetworkPolicyPeer{} + yyv1935[yyj1935] = NetworkPolicyPeer{} } else { - yyv1962 := &yyv1961[yyj1961] - yyv1962.CodecDecodeSelf(d) + yyv1936 := &yyv1935[yyj1935] + yyv1936.CodecDecodeSelf(d) } } - if yyrt1961 { - for ; yyj1961 < yyl1961; yyj1961++ { - yyv1961 = append(yyv1961, NetworkPolicyPeer{}) - yyh1961.ElemContainerState(yyj1961) + if yyrt1935 { + for ; yyj1935 < yyl1935; yyj1935++ { + yyv1935 = append(yyv1935, NetworkPolicyPeer{}) + yyh1935.ElemContainerState(yyj1935) if r.TryDecodeAsNil() { - yyv1961[yyj1961] = NetworkPolicyPeer{} + yyv1935[yyj1935] = NetworkPolicyPeer{} } else { - yyv1963 := &yyv1961[yyj1961] - yyv1963.CodecDecodeSelf(d) + yyv1937 := &yyv1935[yyj1935] + yyv1937.CodecDecodeSelf(d) } } } } else { - yyj1961 := 0 - for ; !r.CheckBreak(); yyj1961++ { + yyj1935 := 0 + for ; !r.CheckBreak(); yyj1935++ { - if yyj1961 >= len(yyv1961) { - yyv1961 = append(yyv1961, NetworkPolicyPeer{}) // var yyz1961 NetworkPolicyPeer - yyc1961 = true + if yyj1935 >= len(yyv1935) { + yyv1935 = append(yyv1935, NetworkPolicyPeer{}) // var yyz1935 NetworkPolicyPeer + yyc1935 = true } - yyh1961.ElemContainerState(yyj1961) - if yyj1961 < len(yyv1961) { + yyh1935.ElemContainerState(yyj1935) + if yyj1935 < len(yyv1935) { if r.TryDecodeAsNil() { - yyv1961[yyj1961] = NetworkPolicyPeer{} + yyv1935[yyj1935] = NetworkPolicyPeer{} } else { - yyv1964 := &yyv1961[yyj1961] - yyv1964.CodecDecodeSelf(d) + yyv1938 := &yyv1935[yyj1935] + yyv1938.CodecDecodeSelf(d) } } else { @@ -24290,17 +23991,17 @@ func (x codecSelfer1234) decSliceNetworkPolicyPeer(v *[]NetworkPolicyPeer, d *co } } - if yyj1961 < len(yyv1961) { - yyv1961 = yyv1961[:yyj1961] - yyc1961 = true - } else if yyj1961 == 0 && yyv1961 == nil { - yyv1961 = []NetworkPolicyPeer{} - yyc1961 = true + if yyj1935 < len(yyv1935) { + yyv1935 = yyv1935[:yyj1935] + yyc1935 = true + } else if yyj1935 == 0 && yyv1935 == nil { + yyv1935 = []NetworkPolicyPeer{} + yyc1935 = true } } - yyh1961.End() - if yyc1961 { - *v = yyv1961 + yyh1935.End() + if yyc1935 { + *v = yyv1935 } } @@ -24309,10 +24010,10 @@ func (x codecSelfer1234) encSliceNetworkPolicy(v []NetworkPolicy, e *codec1978.E z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r r.EncodeArrayStart(len(v)) - for _, yyv1965 := range v { + for _, yyv1939 := range v { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yy1966 := &yyv1965 - yy1966.CodecEncodeSelf(e) + yy1940 := &yyv1939 + yy1940.CodecEncodeSelf(e) } z.EncSendContainerState(codecSelfer_containerArrayEnd1234) } @@ -24322,83 +24023,83 @@ func (x codecSelfer1234) decSliceNetworkPolicy(v *[]NetworkPolicy, d *codec1978. z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r - yyv1967 := *v - yyh1967, yyl1967 := z.DecSliceHelperStart() - var yyc1967 bool - if yyl1967 == 0 { - if yyv1967 == nil { - yyv1967 = []NetworkPolicy{} - yyc1967 = true - } else if len(yyv1967) != 0 { - yyv1967 = yyv1967[:0] - yyc1967 = true + yyv1941 := *v + yyh1941, yyl1941 := z.DecSliceHelperStart() + var yyc1941 bool + if yyl1941 == 0 { + if yyv1941 == nil { + yyv1941 = []NetworkPolicy{} + yyc1941 = true + } else if len(yyv1941) != 0 { + yyv1941 = yyv1941[:0] + yyc1941 = true } - } else if yyl1967 > 0 { - var yyrr1967, yyrl1967 int - var yyrt1967 bool - if yyl1967 > cap(yyv1967) { + } else if yyl1941 > 0 { + var yyrr1941, yyrl1941 int + var yyrt1941 bool + if yyl1941 > cap(yyv1941) { - yyrg1967 := len(yyv1967) > 0 - yyv21967 := yyv1967 - yyrl1967, yyrt1967 = z.DecInferLen(yyl1967, z.DecBasicHandle().MaxInitLen, 312) - if yyrt1967 { - if yyrl1967 <= cap(yyv1967) { - yyv1967 = yyv1967[:yyrl1967] + yyrg1941 := len(yyv1941) > 0 + yyv21941 := yyv1941 + yyrl1941, yyrt1941 = z.DecInferLen(yyl1941, z.DecBasicHandle().MaxInitLen, 312) + if yyrt1941 { + if yyrl1941 <= cap(yyv1941) { + yyv1941 = yyv1941[:yyrl1941] } else { - yyv1967 = make([]NetworkPolicy, yyrl1967) + yyv1941 = make([]NetworkPolicy, yyrl1941) } } else { - yyv1967 = make([]NetworkPolicy, yyrl1967) + yyv1941 = make([]NetworkPolicy, yyrl1941) } - yyc1967 = true - yyrr1967 = len(yyv1967) - if yyrg1967 { - copy(yyv1967, yyv21967) + yyc1941 = true + yyrr1941 = len(yyv1941) + if yyrg1941 { + copy(yyv1941, yyv21941) } - } else if yyl1967 != len(yyv1967) { - yyv1967 = yyv1967[:yyl1967] - yyc1967 = true + } else if yyl1941 != len(yyv1941) { + yyv1941 = yyv1941[:yyl1941] + yyc1941 = true } - yyj1967 := 0 - for ; yyj1967 < yyrr1967; yyj1967++ { - yyh1967.ElemContainerState(yyj1967) + yyj1941 := 0 + for ; yyj1941 < yyrr1941; yyj1941++ { + yyh1941.ElemContainerState(yyj1941) if r.TryDecodeAsNil() { - yyv1967[yyj1967] = NetworkPolicy{} + yyv1941[yyj1941] = NetworkPolicy{} } else { - yyv1968 := &yyv1967[yyj1967] - yyv1968.CodecDecodeSelf(d) + yyv1942 := &yyv1941[yyj1941] + yyv1942.CodecDecodeSelf(d) } } - if yyrt1967 { - for ; yyj1967 < yyl1967; yyj1967++ { - yyv1967 = append(yyv1967, NetworkPolicy{}) - yyh1967.ElemContainerState(yyj1967) + if yyrt1941 { + for ; yyj1941 < yyl1941; yyj1941++ { + yyv1941 = append(yyv1941, NetworkPolicy{}) + yyh1941.ElemContainerState(yyj1941) if r.TryDecodeAsNil() { - yyv1967[yyj1967] = NetworkPolicy{} + yyv1941[yyj1941] = NetworkPolicy{} } else { - yyv1969 := &yyv1967[yyj1967] - yyv1969.CodecDecodeSelf(d) + yyv1943 := &yyv1941[yyj1941] + yyv1943.CodecDecodeSelf(d) } } } } else { - yyj1967 := 0 - for ; !r.CheckBreak(); yyj1967++ { + yyj1941 := 0 + for ; !r.CheckBreak(); yyj1941++ { - if yyj1967 >= len(yyv1967) { - yyv1967 = append(yyv1967, NetworkPolicy{}) // var yyz1967 NetworkPolicy - yyc1967 = true + if yyj1941 >= len(yyv1941) { + yyv1941 = append(yyv1941, NetworkPolicy{}) // var yyz1941 NetworkPolicy + yyc1941 = true } - yyh1967.ElemContainerState(yyj1967) - if yyj1967 < len(yyv1967) { + yyh1941.ElemContainerState(yyj1941) + if yyj1941 < len(yyv1941) { if r.TryDecodeAsNil() { - yyv1967[yyj1967] = NetworkPolicy{} + yyv1941[yyj1941] = NetworkPolicy{} } else { - yyv1970 := &yyv1967[yyj1967] - yyv1970.CodecDecodeSelf(d) + yyv1944 := &yyv1941[yyj1941] + yyv1944.CodecDecodeSelf(d) } } else { @@ -24406,16 +24107,16 @@ func (x codecSelfer1234) decSliceNetworkPolicy(v *[]NetworkPolicy, d *codec1978. } } - if yyj1967 < len(yyv1967) { - yyv1967 = yyv1967[:yyj1967] - yyc1967 = true - } else if yyj1967 == 0 && yyv1967 == nil { - yyv1967 = []NetworkPolicy{} - yyc1967 = true + if yyj1941 < len(yyv1941) { + yyv1941 = yyv1941[:yyj1941] + yyc1941 = true + } else if yyj1941 == 0 && yyv1941 == nil { + yyv1941 = []NetworkPolicy{} + yyc1941 = true } } - yyh1967.End() - if yyc1967 { - *v = yyv1967 + yyh1941.End() + if yyc1941 { + *v = yyv1941 } } diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go index 0f7b44ef7a4..b46ac7eb951 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go @@ -18,8 +18,8 @@ package v1beta1 import ( "k8s.io/client-go/pkg/api/resource" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/util/intstr" ) @@ -54,7 +54,7 @@ type ScaleStatus struct { // represents a scaling request for a resource. type Scale struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -70,7 +70,7 @@ type Scale struct { // Dummy definition type ReplicationControllerDummy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` } // SubresourceReference contains enough information to let you inspect or modify the referred subresource. @@ -143,7 +143,7 @@ type HorizontalPodAutoscalerStatus struct { // last time the HorizontalPodAutoscaler scaled the number of pods; // used by the autoscaler to control how often the number of pods is changed. // +optional - LastScaleTime *unversioned.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"` + LastScaleTime *metav1.Time `json:"lastScaleTime,omitempty" protobuf:"bytes,2,opt,name=lastScaleTime"` // current number of replicas of pods managed by this autoscaler. CurrentReplicas int32 `json:"currentReplicas" protobuf:"varint,3,opt,name=currentReplicas"` @@ -159,7 +159,7 @@ type HorizontalPodAutoscalerStatus struct { // configuration of a horizontal pod autoscaler. type HorizontalPodAutoscaler struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -175,10 +175,10 @@ type HorizontalPodAutoscaler struct { // list of horizontal pod autoscaler objects. type HorizontalPodAutoscalerList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // list of horizontal pod autoscaler objects. Items []HorizontalPodAutoscaler `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -190,7 +190,7 @@ type HorizontalPodAutoscalerList struct { // A ThirdPartyResource is a generic representation of a resource, it is used by add-ons and plugins to add new resource // types to the API. It consists of one or more Versions of the api. type ThirdPartyResource struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata // +optional @@ -207,11 +207,11 @@ type ThirdPartyResource struct { // ThirdPartyResourceList is a list of ThirdPartyResources. type ThirdPartyResourceList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of ThirdPartyResources. Items []ThirdPartyResource `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -226,7 +226,7 @@ type APIVersion struct { // An internal object, used for versioned storage in etcd. Not exposed to the end user. type ThirdPartyResourceData struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -240,7 +240,7 @@ type ThirdPartyResourceData struct { // Deployment enables declarative updates for Pods and ReplicaSets. type Deployment struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -264,7 +264,7 @@ type DeploymentSpec struct { // Label selector for pods. Existing ReplicaSets whose pods are // selected by this will be the ones affected by this deployment. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` // Template describes the pods that will be created. Template v1.PodTemplateSpec `json:"template" protobuf:"bytes,3,opt,name=template"` @@ -305,7 +305,7 @@ type DeploymentSpec struct { // DeploymentRollback stores the information required to rollback a deployment. type DeploymentRollback struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Required: This must match the Name of a deployment. Name string `json:"name" protobuf:"bytes,1,opt,name=name"` // The annotations to be updated to a deployment @@ -357,7 +357,7 @@ const ( type RollingUpdateDeployment struct { // The maximum number of pods that can be unavailable during the update. // Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). - // Absolute number is calculated from percentage by rounding up. + // Absolute number is calculated from percentage by rounding down. // This can not be 0 if MaxSurge is 0. // By default, a fixed value of 1 is used. // Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods @@ -433,9 +433,9 @@ type DeploymentCondition struct { // Status of the condition, one of True, False, Unknown. Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // The last time this condition was updated. - LastUpdateTime unversioned.Time `json:"lastUpdateTime,omitempty" protobuf:"bytes,6,opt,name=lastUpdateTime"` + LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty" protobuf:"bytes,6,opt,name=lastUpdateTime"` // Last time the condition transitioned from one status to another. - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,7,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,7,opt,name=lastTransitionTime"` // The reason for the condition's last transition. Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` // A human readable message indicating details about the transition. @@ -444,10 +444,10 @@ type DeploymentCondition struct { // DeploymentList is a list of Deployments. type DeploymentList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Deployments. Items []Deployment `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -510,7 +510,7 @@ type DaemonSetSpec struct { // If empty, defaulted to labels on Pod template. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,1,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,1,opt,name=selector"` // Template is the object that describes the pod that will be created. // The DaemonSet will create exactly one copy of this pod on every node @@ -570,7 +570,7 @@ type DaemonSetStatus struct { // DaemonSet represents the configuration of a daemon set. type DaemonSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -592,11 +592,11 @@ type DaemonSet struct { // DaemonSetList is a collection of daemon sets. type DaemonSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of daemon sets. Items []DaemonSet `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -604,11 +604,11 @@ type DaemonSetList struct { // ThirdPartyResrouceDataList is a list of ThirdPartyResourceData. type ThirdPartyResourceDataList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of ThirdpartyResourceData. Items []ThirdPartyResourceData `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -619,7 +619,7 @@ type ThirdPartyResourceDataList struct { // Job represents the configuration of a single job. // DEPRECATED: extensions/v1beta1.Job is deprecated, use batch/v1.Job instead. type Job struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -639,11 +639,11 @@ type Job struct { // JobList is a collection of jobs. // DEPRECATED: extensions/v1beta1.JobList is deprecated, use batch/v1.JobList instead. type JobList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Job. Items []Job `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -678,7 +678,7 @@ type JobSpec struct { // Normally, the system sets this field for you. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,4,opt,name=selector"` // AutoSelector controls generation of pod labels and pod selectors. // It was not present in the original extensions/v1beta1 Job definition, but exists @@ -706,13 +706,13 @@ type JobStatus struct { // It is not guaranteed to be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - StartTime *unversioned.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` + StartTime *metav1.Time `json:"startTime,omitempty" protobuf:"bytes,2,opt,name=startTime"` // CompletionTime represents time when the job was completed. It is not guaranteed to // be set in happens-before order across separate operations. // It is represented in RFC3339 form and is in UTC. // +optional - CompletionTime *unversioned.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` + CompletionTime *metav1.Time `json:"completionTime,omitempty" protobuf:"bytes,3,opt,name=completionTime"` // Active is the number of actively running pods. // +optional @@ -745,10 +745,10 @@ type JobCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -764,7 +764,7 @@ type JobCondition struct { // externally-reachable urls, load balance traffic, terminate SSL, offer name // based virtual hosting etc. type Ingress struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -783,11 +783,11 @@ type Ingress struct { // IngressList is a collection of Ingress. type IngressList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of Ingress. Items []Ingress `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -923,20 +923,11 @@ type IngressBackend struct { ServicePort intstr.IntOrString `json:"servicePort" protobuf:"bytes,2,opt,name=servicePort"` } -// ExportOptions is the query options to the standard REST get call. -type ExportOptions struct { - unversioned.TypeMeta `json:",inline"` - // Should this value be exported. Export strips fields that a user can not specify. - Export bool `json:"export" protobuf:"varint,1,opt,name=export"` - // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace' - Exact bool `json:"exact" protobuf:"varint,2,opt,name=exact"` -} - // +genclient=true // ReplicaSet represents the configuration of a ReplicaSet. type ReplicaSet struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // If the Labels of a ReplicaSet are empty, they are defaulted to // be the same as the Pod(s) that the ReplicaSet manages. @@ -960,11 +951,11 @@ type ReplicaSet struct { // ReplicaSetList is a collection of ReplicaSets. type ReplicaSetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of ReplicaSets. // More info: http://kubernetes.io/docs/user-guide/replication-controller @@ -991,7 +982,7 @@ type ReplicaSetSpec struct { // Label keys and values that must match in order to be controlled by this replica set. // More info: http://kubernetes.io/docs/user-guide/labels#label-selectors // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` // Template is the object that describes the pod that will be created if // insufficient replicas are detected. @@ -1045,7 +1036,7 @@ type ReplicaSetCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // The last time the condition transitioned from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,3,opt,name=lastTransitionTime"` // The reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` @@ -1060,7 +1051,7 @@ type ReplicaSetCondition struct { // Pod Security Policy governs the ability to make requests that affect the Security Context // that will be applied to a pod and container. type PodSecurityPolicy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -1257,18 +1248,18 @@ const ( // Pod Security Policy List is a list of PodSecurityPolicy objects. type PodSecurityPolicyList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of schema objects. Items []PodSecurityPolicy `json:"items" protobuf:"bytes,2,rep,name=items"` } type NetworkPolicy struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -1285,7 +1276,7 @@ type NetworkPolicySpec struct { // same set of pods. In this case, the ingress rules for each are combined additively. // This field is NOT optional and follows standard label selector semantics. // An empty podSelector matches all pods in this namespace. - PodSelector unversioned.LabelSelector `json:"podSelector" protobuf:"bytes,1,opt,name=podSelector"` + PodSelector metav1.LabelSelector `json:"podSelector" protobuf:"bytes,1,opt,name=podSelector"` // List of ingress rules to be applied to the selected pods. // Traffic is allowed to a pod if namespace.networkPolicy.ingress.isolation is undefined and cluster policy allows it, @@ -1345,7 +1336,7 @@ type NetworkPolicyPeer struct { // If not provided, this selector selects no pods. // If present but empty, this selector selects all pods in this namespace. // +optional - PodSelector *unversioned.LabelSelector `json:"podSelector,omitempty" protobuf:"bytes,1,opt,name=podSelector"` + PodSelector *metav1.LabelSelector `json:"podSelector,omitempty" protobuf:"bytes,1,opt,name=podSelector"` // Selects Namespaces using cluster scoped-labels. This // matches all pods in all namespaces selected by this label selector. @@ -1353,16 +1344,16 @@ type NetworkPolicyPeer struct { // If omitted, this selector selects no namespaces. // If present but empty, this selector selects all namespaces. // +optional - NamespaceSelector *unversioned.LabelSelector `json:"namespaceSelector,omitempty" protobuf:"bytes,2,opt,name=namespaceSelector"` + NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector,omitempty" protobuf:"bytes,2,opt,name=namespaceSelector"` } // Network Policy List is a list of NetworkPolicy objects. type NetworkPolicyList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of schema objects. Items []NetworkPolicy `json:"items" protobuf:"bytes,2,rep,name=items"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go index 1fd1fd5bebe..e3630e049eb 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go @@ -193,16 +193,6 @@ func (DeploymentStrategy) SwaggerDoc() map[string]string { return map_DeploymentStrategy } -var map_ExportOptions = map[string]string{ - "": "ExportOptions is the query options to the standard REST get call.", - "export": "Should this value be exported. Export strips fields that a user can not specify.", - "exact": "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'", -} - -func (ExportOptions) SwaggerDoc() map[string]string { - return map_ExportOptions -} - var map_FSGroupStrategyOptions = map[string]string{ "": "FSGroupStrategyOptions defines the strategy type and options used to create the strategy.", "rule": "Rule is the strategy that will dictate what FSGroup is used in the SecurityContext.", @@ -615,7 +605,7 @@ func (RollbackConfig) SwaggerDoc() map[string]string { var map_RollingUpdateDeployment = map[string]string{ "": "Spec to control the desired behavior of rolling update.", - "maxUnavailable": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding up. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.", + "maxUnavailable": "The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding down. This can not be 0 if MaxSurge is 0. By default, a fixed value of 1 is used. Example: when this is set to 30%, the old RC can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old RC can be scaled down further, followed by scaling up the new RC, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.", "maxSurge": "The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). This can not be 0 if MaxUnavailable is 0. Absolute number is calculated from percentage by rounding up. By default, a value of 1 is used. Example: when this is set to 30%, the new RC can be scaled up immediately when the rolling update starts, such that the total number of old and new pods do not exceed 130% of desired pods. Once old pods have been killed, new RC can be scaled up further, ensuring that total number of pods running at any time during the update is atmost 130% of desired pods.", } diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go index ea0292d94bc..ab21541dee7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go @@ -22,11 +22,11 @@ package v1beta1 import ( api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" - v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/client-go/pkg/api/v1" autoscaling "k8s.io/client-go/pkg/apis/autoscaling" batch "k8s.io/client-go/pkg/apis/batch" extensions "k8s.io/client-go/pkg/apis/extensions" + v1 "k8s.io/client-go/pkg/apis/meta/v1" conversion "k8s.io/client-go/pkg/conversion" runtime "k8s.io/client-go/pkg/runtime" intstr "k8s.io/client-go/pkg/util/intstr" @@ -73,8 +73,6 @@ func RegisterConversions(scheme *runtime.Scheme) error { Convert_extensions_DeploymentStatus_To_v1beta1_DeploymentStatus, Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy, Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy, - Convert_v1beta1_ExportOptions_To_api_ExportOptions, - Convert_api_ExportOptions_To_v1beta1_ExportOptions, Convert_v1beta1_FSGroupStrategyOptions_To_extensions_FSGroupStrategyOptions, Convert_extensions_FSGroupStrategyOptions_To_v1beta1_FSGroupStrategyOptions, Convert_v1beta1_HTTPIngressPath_To_extensions_HTTPIngressPath, @@ -347,8 +345,8 @@ func Convert_extensions_DaemonSetList_To_v1beta1_DaemonSetList(in *extensions.Da } func autoConvert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error { - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -359,8 +357,8 @@ func Convert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *DaemonSetSpec } func autoConvert_extensions_DaemonSetSpec_To_v1beta1_DaemonSetSpec(in *extensions.DaemonSetSpec, out *DaemonSetSpec, s conversion.Scope) error { - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -446,7 +444,7 @@ func Convert_v1beta1_DeploymentCondition_To_extensions_DeploymentCondition(in *D func autoConvert_extensions_DeploymentCondition_To_v1beta1_DeploymentCondition(in *extensions.DeploymentCondition, out *DeploymentCondition, s conversion.Scope) error { out.Type = DeploymentConditionType(in.Type) - out.Status = v1.ConditionStatus(in.Status) + out.Status = api_v1.ConditionStatus(in.Status) out.LastUpdateTime = in.LastUpdateTime out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason @@ -528,8 +526,8 @@ func autoConvert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *Deploym if err := api.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { return err } - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } if err := Convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { @@ -547,8 +545,8 @@ func autoConvert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensi if err := api.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { return err } - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } if err := Convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil { @@ -618,26 +616,6 @@ func autoConvert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in return nil } -func autoConvert_v1beta1_ExportOptions_To_api_ExportOptions(in *ExportOptions, out *api.ExportOptions, s conversion.Scope) error { - out.Export = in.Export - out.Exact = in.Exact - return nil -} - -func Convert_v1beta1_ExportOptions_To_api_ExportOptions(in *ExportOptions, out *api.ExportOptions, s conversion.Scope) error { - return autoConvert_v1beta1_ExportOptions_To_api_ExportOptions(in, out, s) -} - -func autoConvert_api_ExportOptions_To_v1beta1_ExportOptions(in *api.ExportOptions, out *ExportOptions, s conversion.Scope) error { - out.Export = in.Export - out.Exact = in.Exact - return nil -} - -func Convert_api_ExportOptions_To_v1beta1_ExportOptions(in *api.ExportOptions, out *ExportOptions, s conversion.Scope) error { - return autoConvert_api_ExportOptions_To_v1beta1_ExportOptions(in, out, s) -} - func autoConvert_v1beta1_FSGroupStrategyOptions_To_extensions_FSGroupStrategyOptions(in *FSGroupStrategyOptions, out *extensions.FSGroupStrategyOptions, s conversion.Scope) error { out.Rule = extensions.FSGroupStrategyType(in.Rule) out.Ranges = *(*[]extensions.IDRange)(unsafe.Pointer(&in.Ranges)) @@ -794,7 +772,7 @@ func autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v1beta1_HorizontalPo func autoConvert_v1beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error { out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) - out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) + out.LastScaleTime = (*v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) @@ -807,7 +785,7 @@ func Convert_v1beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodA func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1beta1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration)) - out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime)) + out.LastScaleTime = (*v1.Time)(unsafe.Pointer(in.LastScaleTime)) out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage)) @@ -1094,7 +1072,7 @@ func Convert_v1beta1_JobCondition_To_batch_JobCondition(in *JobCondition, out *b func autoConvert_batch_JobCondition_To_v1beta1_JobCondition(in *batch.JobCondition, out *JobCondition, s conversion.Scope) error { out.Type = JobConditionType(in.Type) - out.Status = v1.ConditionStatus(in.Status) + out.Status = api_v1.ConditionStatus(in.Status) out.LastProbeTime = in.LastProbeTime out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason @@ -1150,9 +1128,9 @@ func autoConvert_v1beta1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpe out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) // WARNING: in.AutoSelector requires manual conversion: does not exist in peer-type - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -1162,9 +1140,9 @@ func autoConvert_batch_JobSpec_To_v1beta1_JobSpec(in *batch.JobSpec, out *JobSpe out.Parallelism = (*int32)(unsafe.Pointer(in.Parallelism)) out.Completions = (*int32)(unsafe.Pointer(in.Completions)) out.ActiveDeadlineSeconds = (*int64)(unsafe.Pointer(in.ActiveDeadlineSeconds)) - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) // WARNING: in.ManualSelector requires manual conversion: does not exist in peer-type - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -1172,8 +1150,8 @@ func autoConvert_batch_JobSpec_To_v1beta1_JobSpec(in *batch.JobSpec, out *JobSpe func autoConvert_v1beta1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobStatus, s conversion.Scope) error { out.Conditions = *(*[]batch.JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed @@ -1186,8 +1164,8 @@ func Convert_v1beta1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobS func autoConvert_batch_JobStatus_To_v1beta1_JobStatus(in *batch.JobStatus, out *JobStatus, s conversion.Scope) error { out.Conditions = *(*[]JobCondition)(unsafe.Pointer(&in.Conditions)) - out.StartTime = (*unversioned.Time)(unsafe.Pointer(in.StartTime)) - out.CompletionTime = (*unversioned.Time)(unsafe.Pointer(in.CompletionTime)) + out.StartTime = (*v1.Time)(unsafe.Pointer(in.StartTime)) + out.CompletionTime = (*v1.Time)(unsafe.Pointer(in.CompletionTime)) out.Active = in.Active out.Succeeded = in.Succeeded out.Failed = in.Failed @@ -1269,8 +1247,8 @@ func Convert_extensions_NetworkPolicyList_To_v1beta1_NetworkPolicyList(in *exten } func autoConvert_v1beta1_NetworkPolicyPeer_To_extensions_NetworkPolicyPeer(in *NetworkPolicyPeer, out *extensions.NetworkPolicyPeer, s conversion.Scope) error { - out.PodSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.PodSelector)) - out.NamespaceSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) + out.PodSelector = (*v1.LabelSelector)(unsafe.Pointer(in.PodSelector)) + out.NamespaceSelector = (*v1.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) return nil } @@ -1279,8 +1257,8 @@ func Convert_v1beta1_NetworkPolicyPeer_To_extensions_NetworkPolicyPeer(in *Netwo } func autoConvert_extensions_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer(in *extensions.NetworkPolicyPeer, out *NetworkPolicyPeer, s conversion.Scope) error { - out.PodSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.PodSelector)) - out.NamespaceSelector = (*unversioned.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) + out.PodSelector = (*v1.LabelSelector)(unsafe.Pointer(in.PodSelector)) + out.NamespaceSelector = (*v1.LabelSelector)(unsafe.Pointer(in.NamespaceSelector)) return nil } @@ -1299,7 +1277,7 @@ func Convert_v1beta1_NetworkPolicyPort_To_extensions_NetworkPolicyPort(in *Netwo } func autoConvert_extensions_NetworkPolicyPort_To_v1beta1_NetworkPolicyPort(in *extensions.NetworkPolicyPort, out *NetworkPolicyPort, s conversion.Scope) error { - out.Protocol = (*v1.Protocol)(unsafe.Pointer(in.Protocol)) + out.Protocol = (*api_v1.Protocol)(unsafe.Pointer(in.Protocol)) out.Port = (*intstr.IntOrString)(unsafe.Pointer(in.Port)) return nil } @@ -1440,9 +1418,9 @@ func Convert_v1beta1_PodSecurityPolicySpec_To_extensions_PodSecurityPolicySpec(i func autoConvert_extensions_PodSecurityPolicySpec_To_v1beta1_PodSecurityPolicySpec(in *extensions.PodSecurityPolicySpec, out *PodSecurityPolicySpec, s conversion.Scope) error { out.Privileged = in.Privileged - out.DefaultAddCapabilities = *(*[]v1.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities)) - out.RequiredDropCapabilities = *(*[]v1.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities)) - out.AllowedCapabilities = *(*[]v1.Capability)(unsafe.Pointer(&in.AllowedCapabilities)) + out.DefaultAddCapabilities = *(*[]api_v1.Capability)(unsafe.Pointer(&in.DefaultAddCapabilities)) + out.RequiredDropCapabilities = *(*[]api_v1.Capability)(unsafe.Pointer(&in.RequiredDropCapabilities)) + out.AllowedCapabilities = *(*[]api_v1.Capability)(unsafe.Pointer(&in.AllowedCapabilities)) out.Volumes = *(*[]FSType)(unsafe.Pointer(&in.Volumes)) out.HostNetwork = in.HostNetwork if in.HostPorts != nil { @@ -1529,7 +1507,7 @@ func Convert_v1beta1_ReplicaSetCondition_To_extensions_ReplicaSetCondition(in *R func autoConvert_extensions_ReplicaSetCondition_To_v1beta1_ReplicaSetCondition(in *extensions.ReplicaSetCondition, out *ReplicaSetCondition, s conversion.Scope) error { out.Type = ReplicaSetConditionType(in.Type) - out.Status = v1.ConditionStatus(in.Status) + out.Status = api_v1.ConditionStatus(in.Status) out.LastTransitionTime = in.LastTransitionTime out.Reason = in.Reason out.Message = in.Message @@ -1585,8 +1563,8 @@ func autoConvert_v1beta1_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *Replica return err } out.MinReadySeconds = in.MinReadySeconds - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -1597,8 +1575,8 @@ func autoConvert_extensions_ReplicaSetSpec_To_v1beta1_ReplicaSetSpec(in *extensi return err } out.MinReadySeconds = in.MinReadySeconds - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) - if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { + out.Selector = (*v1.LabelSelector)(unsafe.Pointer(in.Selector)) + if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { return err } return nil @@ -1710,7 +1688,7 @@ func Convert_v1beta1_SELinuxStrategyOptions_To_extensions_SELinuxStrategyOptions func autoConvert_extensions_SELinuxStrategyOptions_To_v1beta1_SELinuxStrategyOptions(in *extensions.SELinuxStrategyOptions, out *SELinuxStrategyOptions, s conversion.Scope) error { out.Rule = SELinuxStrategy(in.Rule) - out.SELinuxOptions = (*v1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions)) + out.SELinuxOptions = (*api_v1.SELinuxOptions)(unsafe.Pointer(in.SELinuxOptions)) return nil } @@ -1774,14 +1752,14 @@ func Convert_extensions_ScaleSpec_To_v1beta1_ScaleSpec(in *extensions.ScaleSpec, func autoConvert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(in *ScaleStatus, out *extensions.ScaleStatus, s conversion.Scope) error { out.Replicas = in.Replicas - // WARNING: in.Selector requires manual conversion: inconvertible types (map[string]string vs *k8s.io/kubernetes/pkg/api/unversioned.LabelSelector) + // WARNING: in.Selector requires manual conversion: inconvertible types (map[string]string vs *k8s.io/kubernetes/pkg/apis/meta/v1.LabelSelector) // WARNING: in.TargetSelector requires manual conversion: does not exist in peer-type return nil } func autoConvert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in *extensions.ScaleStatus, out *ScaleStatus, s conversion.Scope) error { out.Replicas = in.Replicas - // WARNING: in.Selector requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/api/unversioned.LabelSelector vs map[string]string) + // WARNING: in.Selector requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/apis/meta/v1.LabelSelector vs map[string]string) return nil } diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..655b053f849 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go @@ -0,0 +1,1436 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1beta1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + intstr "k8s.io/client-go/pkg/util/intstr" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_APIVersion, InType: reflect.TypeOf(&APIVersion{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CPUTargetUtilization, InType: reflect.TypeOf(&CPUTargetUtilization{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomMetricCurrentStatus, InType: reflect.TypeOf(&CustomMetricCurrentStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomMetricCurrentStatusList, InType: reflect.TypeOf(&CustomMetricCurrentStatusList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomMetricTarget, InType: reflect.TypeOf(&CustomMetricTarget{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomMetricTargetList, InType: reflect.TypeOf(&CustomMetricTargetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DaemonSet, InType: reflect.TypeOf(&DaemonSet{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DaemonSetList, InType: reflect.TypeOf(&DaemonSetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DaemonSetSpec, InType: reflect.TypeOf(&DaemonSetSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DaemonSetStatus, InType: reflect.TypeOf(&DaemonSetStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Deployment, InType: reflect.TypeOf(&Deployment{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentCondition, InType: reflect.TypeOf(&DeploymentCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentList, InType: reflect.TypeOf(&DeploymentList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentRollback, InType: reflect.TypeOf(&DeploymentRollback{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentSpec, InType: reflect.TypeOf(&DeploymentSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentStatus, InType: reflect.TypeOf(&DeploymentStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_DeploymentStrategy, InType: reflect.TypeOf(&DeploymentStrategy{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_FSGroupStrategyOptions, InType: reflect.TypeOf(&FSGroupStrategyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HTTPIngressPath, InType: reflect.TypeOf(&HTTPIngressPath{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HTTPIngressRuleValue, InType: reflect.TypeOf(&HTTPIngressRuleValue{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HorizontalPodAutoscaler, InType: reflect.TypeOf(&HorizontalPodAutoscaler{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HorizontalPodAutoscalerList, InType: reflect.TypeOf(&HorizontalPodAutoscalerList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HorizontalPodAutoscalerSpec, InType: reflect.TypeOf(&HorizontalPodAutoscalerSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HorizontalPodAutoscalerStatus, InType: reflect.TypeOf(&HorizontalPodAutoscalerStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_HostPortRange, InType: reflect.TypeOf(&HostPortRange{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IDRange, InType: reflect.TypeOf(&IDRange{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Ingress, InType: reflect.TypeOf(&Ingress{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressBackend, InType: reflect.TypeOf(&IngressBackend{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressList, InType: reflect.TypeOf(&IngressList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressRule, InType: reflect.TypeOf(&IngressRule{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressRuleValue, InType: reflect.TypeOf(&IngressRuleValue{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressSpec, InType: reflect.TypeOf(&IngressSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressStatus, InType: reflect.TypeOf(&IngressStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_IngressTLS, InType: reflect.TypeOf(&IngressTLS{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Job, InType: reflect.TypeOf(&Job{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_JobCondition, InType: reflect.TypeOf(&JobCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_JobList, InType: reflect.TypeOf(&JobList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_JobSpec, InType: reflect.TypeOf(&JobSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_JobStatus, InType: reflect.TypeOf(&JobStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicy, InType: reflect.TypeOf(&NetworkPolicy{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicyIngressRule, InType: reflect.TypeOf(&NetworkPolicyIngressRule{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicyList, InType: reflect.TypeOf(&NetworkPolicyList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicyPeer, InType: reflect.TypeOf(&NetworkPolicyPeer{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicyPort, InType: reflect.TypeOf(&NetworkPolicyPort{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_NetworkPolicySpec, InType: reflect.TypeOf(&NetworkPolicySpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodSecurityPolicy, InType: reflect.TypeOf(&PodSecurityPolicy{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodSecurityPolicyList, InType: reflect.TypeOf(&PodSecurityPolicyList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodSecurityPolicySpec, InType: reflect.TypeOf(&PodSecurityPolicySpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSet, InType: reflect.TypeOf(&ReplicaSet{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSetCondition, InType: reflect.TypeOf(&ReplicaSetCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSetList, InType: reflect.TypeOf(&ReplicaSetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSetSpec, InType: reflect.TypeOf(&ReplicaSetSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicaSetStatus, InType: reflect.TypeOf(&ReplicaSetStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ReplicationControllerDummy, InType: reflect.TypeOf(&ReplicationControllerDummy{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_RollbackConfig, InType: reflect.TypeOf(&RollbackConfig{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_RollingUpdateDeployment, InType: reflect.TypeOf(&RollingUpdateDeployment{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_RunAsUserStrategyOptions, InType: reflect.TypeOf(&RunAsUserStrategyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SELinuxStrategyOptions, InType: reflect.TypeOf(&SELinuxStrategyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Scale, InType: reflect.TypeOf(&Scale{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ScaleSpec, InType: reflect.TypeOf(&ScaleSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ScaleStatus, InType: reflect.TypeOf(&ScaleStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SubresourceReference, InType: reflect.TypeOf(&SubresourceReference{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_SupplementalGroupsStrategyOptions, InType: reflect.TypeOf(&SupplementalGroupsStrategyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ThirdPartyResource, InType: reflect.TypeOf(&ThirdPartyResource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ThirdPartyResourceData, InType: reflect.TypeOf(&ThirdPartyResourceData{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ThirdPartyResourceDataList, InType: reflect.TypeOf(&ThirdPartyResourceDataList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ThirdPartyResourceList, InType: reflect.TypeOf(&ThirdPartyResourceList{})}, + ) +} + +func DeepCopy_v1beta1_APIVersion(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*APIVersion) + out := out.(*APIVersion) + out.Name = in.Name + return nil + } +} + +func DeepCopy_v1beta1_CPUTargetUtilization(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CPUTargetUtilization) + out := out.(*CPUTargetUtilization) + out.TargetPercentage = in.TargetPercentage + return nil + } +} + +func DeepCopy_v1beta1_CustomMetricCurrentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CustomMetricCurrentStatus) + out := out.(*CustomMetricCurrentStatus) + out.Name = in.Name + out.CurrentValue = in.CurrentValue.DeepCopy() + return nil + } +} + +func DeepCopy_v1beta1_CustomMetricCurrentStatusList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CustomMetricCurrentStatusList) + out := out.(*CustomMetricCurrentStatusList) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CustomMetricCurrentStatus, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_CustomMetricCurrentStatus(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_CustomMetricTarget(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CustomMetricTarget) + out := out.(*CustomMetricTarget) + out.Name = in.Name + out.TargetValue = in.TargetValue.DeepCopy() + return nil + } +} + +func DeepCopy_v1beta1_CustomMetricTargetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CustomMetricTargetList) + out := out.(*CustomMetricTargetList) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CustomMetricTarget, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_CustomMetricTarget(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_DaemonSet(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonSet) + out := out.(*DaemonSet) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_DaemonSetSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_v1beta1_DaemonSetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonSetList) + out := out.(*DaemonSetList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DaemonSet, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_DaemonSet(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_DaemonSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonSetSpec) + out := out.(*DaemonSetSpec) + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_DaemonSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonSetStatus) + out := out.(*DaemonSetStatus) + out.CurrentNumberScheduled = in.CurrentNumberScheduled + out.NumberMisscheduled = in.NumberMisscheduled + out.DesiredNumberScheduled = in.DesiredNumberScheduled + out.NumberReady = in.NumberReady + return nil + } +} + +func DeepCopy_v1beta1_Deployment(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Deployment) + out := out.(*Deployment) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_DeploymentSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_DeploymentStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_DeploymentCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentCondition) + out := out.(*DeploymentCondition) + out.Type = in.Type + out.Status = in.Status + out.LastUpdateTime = in.LastUpdateTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1beta1_DeploymentList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentList) + out := out.(*DeploymentList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Deployment, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_Deployment(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_DeploymentRollback(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentRollback) + out := out.(*DeploymentRollback) + out.TypeMeta = in.TypeMeta + out.Name = in.Name + if in.UpdatedAnnotations != nil { + in, out := &in.UpdatedAnnotations, &out.UpdatedAnnotations + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.UpdatedAnnotations = nil + } + out.RollbackTo = in.RollbackTo + return nil + } +} + +func DeepCopy_v1beta1_DeploymentSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentSpec) + out := out.(*DeploymentSpec) + if in.Replicas != nil { + in, out := &in.Replicas, &out.Replicas + *out = new(int32) + **out = **in + } else { + out.Replicas = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, c); err != nil { + return err + } + out.MinReadySeconds = in.MinReadySeconds + if in.RevisionHistoryLimit != nil { + in, out := &in.RevisionHistoryLimit, &out.RevisionHistoryLimit + *out = new(int32) + **out = **in + } else { + out.RevisionHistoryLimit = nil + } + out.Paused = in.Paused + if in.RollbackTo != nil { + in, out := &in.RollbackTo, &out.RollbackTo + *out = new(RollbackConfig) + **out = **in + } else { + out.RollbackTo = nil + } + if in.ProgressDeadlineSeconds != nil { + in, out := &in.ProgressDeadlineSeconds, &out.ProgressDeadlineSeconds + *out = new(int32) + **out = **in + } else { + out.ProgressDeadlineSeconds = nil + } + return nil + } +} + +func DeepCopy_v1beta1_DeploymentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentStatus) + out := out.(*DeploymentStatus) + out.ObservedGeneration = in.ObservedGeneration + out.Replicas = in.Replicas + out.UpdatedReplicas = in.UpdatedReplicas + out.AvailableReplicas = in.AvailableReplicas + out.UnavailableReplicas = in.UnavailableReplicas + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]DeploymentCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_DeploymentCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + return nil + } +} + +func DeepCopy_v1beta1_DeploymentStrategy(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentStrategy) + out := out.(*DeploymentStrategy) + out.Type = in.Type + if in.RollingUpdate != nil { + in, out := &in.RollingUpdate, &out.RollingUpdate + *out = new(RollingUpdateDeployment) + if err := DeepCopy_v1beta1_RollingUpdateDeployment(*in, *out, c); err != nil { + return err + } + } else { + out.RollingUpdate = nil + } + return nil + } +} + +func DeepCopy_v1beta1_FSGroupStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*FSGroupStrategyOptions) + out := out.(*FSGroupStrategyOptions) + out.Rule = in.Rule + if in.Ranges != nil { + in, out := &in.Ranges, &out.Ranges + *out = make([]IDRange, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ranges = nil + } + return nil + } +} + +func DeepCopy_v1beta1_HTTPIngressPath(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HTTPIngressPath) + out := out.(*HTTPIngressPath) + out.Path = in.Path + out.Backend = in.Backend + return nil + } +} + +func DeepCopy_v1beta1_HTTPIngressRuleValue(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HTTPIngressRuleValue) + out := out.(*HTTPIngressRuleValue) + if in.Paths != nil { + in, out := &in.Paths, &out.Paths + *out = make([]HTTPIngressPath, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Paths = nil + } + return nil + } +} + +func DeepCopy_v1beta1_HorizontalPodAutoscaler(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscaler) + out := out.(*HorizontalPodAutoscaler) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_HorizontalPodAutoscalerList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscalerList) + out := out.(*HorizontalPodAutoscalerList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]HorizontalPodAutoscaler, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_HorizontalPodAutoscalerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscalerSpec) + out := out.(*HorizontalPodAutoscalerSpec) + out.ScaleRef = in.ScaleRef + if in.MinReplicas != nil { + in, out := &in.MinReplicas, &out.MinReplicas + *out = new(int32) + **out = **in + } else { + out.MinReplicas = nil + } + out.MaxReplicas = in.MaxReplicas + if in.CPUUtilization != nil { + in, out := &in.CPUUtilization, &out.CPUUtilization + *out = new(CPUTargetUtilization) + **out = **in + } else { + out.CPUUtilization = nil + } + return nil + } +} + +func DeepCopy_v1beta1_HorizontalPodAutoscalerStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HorizontalPodAutoscalerStatus) + out := out.(*HorizontalPodAutoscalerStatus) + if in.ObservedGeneration != nil { + in, out := &in.ObservedGeneration, &out.ObservedGeneration + *out = new(int64) + **out = **in + } else { + out.ObservedGeneration = nil + } + if in.LastScaleTime != nil { + in, out := &in.LastScaleTime, &out.LastScaleTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.LastScaleTime = nil + } + out.CurrentReplicas = in.CurrentReplicas + out.DesiredReplicas = in.DesiredReplicas + if in.CurrentCPUUtilizationPercentage != nil { + in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage + *out = new(int32) + **out = **in + } else { + out.CurrentCPUUtilizationPercentage = nil + } + return nil + } +} + +func DeepCopy_v1beta1_HostPortRange(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HostPortRange) + out := out.(*HostPortRange) + out.Min = in.Min + out.Max = in.Max + return nil + } +} + +func DeepCopy_v1beta1_IDRange(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IDRange) + out := out.(*IDRange) + out.Min = in.Min + out.Max = in.Max + return nil + } +} + +func DeepCopy_v1beta1_Ingress(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Ingress) + out := out.(*Ingress) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_IngressSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_IngressStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_IngressBackend(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressBackend) + out := out.(*IngressBackend) + out.ServiceName = in.ServiceName + out.ServicePort = in.ServicePort + return nil + } +} + +func DeepCopy_v1beta1_IngressList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressList) + out := out.(*IngressList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Ingress, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_Ingress(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_IngressRule(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressRule) + out := out.(*IngressRule) + out.Host = in.Host + if err := DeepCopy_v1beta1_IngressRuleValue(&in.IngressRuleValue, &out.IngressRuleValue, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_IngressRuleValue(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressRuleValue) + out := out.(*IngressRuleValue) + if in.HTTP != nil { + in, out := &in.HTTP, &out.HTTP + *out = new(HTTPIngressRuleValue) + if err := DeepCopy_v1beta1_HTTPIngressRuleValue(*in, *out, c); err != nil { + return err + } + } else { + out.HTTP = nil + } + return nil + } +} + +func DeepCopy_v1beta1_IngressSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressSpec) + out := out.(*IngressSpec) + if in.Backend != nil { + in, out := &in.Backend, &out.Backend + *out = new(IngressBackend) + **out = **in + } else { + out.Backend = nil + } + if in.TLS != nil { + in, out := &in.TLS, &out.TLS + *out = make([]IngressTLS, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_IngressTLS(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.TLS = nil + } + if in.Rules != nil { + in, out := &in.Rules, &out.Rules + *out = make([]IngressRule, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_IngressRule(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Rules = nil + } + return nil + } +} + +func DeepCopy_v1beta1_IngressStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressStatus) + out := out.(*IngressStatus) + if err := v1.DeepCopy_v1_LoadBalancerStatus(&in.LoadBalancer, &out.LoadBalancer, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_IngressTLS(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressTLS) + out := out.(*IngressTLS) + if in.Hosts != nil { + in, out := &in.Hosts, &out.Hosts + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Hosts = nil + } + out.SecretName = in.SecretName + return nil + } +} + +func DeepCopy_v1beta1_Job(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Job) + out := out.(*Job) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_JobSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_JobStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_JobCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobCondition) + out := out.(*JobCondition) + out.Type = in.Type + out.Status = in.Status + out.LastProbeTime = in.LastProbeTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1beta1_JobList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobList) + out := out.(*JobList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Job, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_Job(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_JobSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobSpec) + out := out.(*JobSpec) + if in.Parallelism != nil { + in, out := &in.Parallelism, &out.Parallelism + *out = new(int32) + **out = **in + } else { + out.Parallelism = nil + } + if in.Completions != nil { + in, out := &in.Completions, &out.Completions + *out = new(int32) + **out = **in + } else { + out.Completions = nil + } + if in.ActiveDeadlineSeconds != nil { + in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds + *out = new(int64) + **out = **in + } else { + out.ActiveDeadlineSeconds = nil + } + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if in.AutoSelector != nil { + in, out := &in.AutoSelector, &out.AutoSelector + *out = new(bool) + **out = **in + } else { + out.AutoSelector = nil + } + if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_JobStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*JobStatus) + out := out.(*JobStatus) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]JobCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_JobCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.StartTime != nil { + in, out := &in.StartTime, &out.StartTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.StartTime = nil + } + if in.CompletionTime != nil { + in, out := &in.CompletionTime, &out.CompletionTime + *out = new(meta_v1.Time) + **out = (*in).DeepCopy() + } else { + out.CompletionTime = nil + } + out.Active = in.Active + out.Succeeded = in.Succeeded + out.Failed = in.Failed + return nil + } +} + +func DeepCopy_v1beta1_NetworkPolicy(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicy) + out := out.(*NetworkPolicy) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_NetworkPolicySpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_NetworkPolicyIngressRule(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicyIngressRule) + out := out.(*NetworkPolicyIngressRule) + if in.Ports != nil { + in, out := &in.Ports, &out.Ports + *out = make([]NetworkPolicyPort, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_NetworkPolicyPort(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Ports = nil + } + if in.From != nil { + in, out := &in.From, &out.From + *out = make([]NetworkPolicyPeer, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_NetworkPolicyPeer(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.From = nil + } + return nil + } +} + +func DeepCopy_v1beta1_NetworkPolicyList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicyList) + out := out.(*NetworkPolicyList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]NetworkPolicy, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_NetworkPolicy(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_NetworkPolicyPeer(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicyPeer) + out := out.(*NetworkPolicyPeer) + if in.PodSelector != nil { + in, out := &in.PodSelector, &out.PodSelector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.PodSelector = nil + } + if in.NamespaceSelector != nil { + in, out := &in.NamespaceSelector, &out.NamespaceSelector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.NamespaceSelector = nil + } + return nil + } +} + +func DeepCopy_v1beta1_NetworkPolicyPort(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicyPort) + out := out.(*NetworkPolicyPort) + if in.Protocol != nil { + in, out := &in.Protocol, &out.Protocol + *out = new(v1.Protocol) + **out = **in + } else { + out.Protocol = nil + } + if in.Port != nil { + in, out := &in.Port, &out.Port + *out = new(intstr.IntOrString) + **out = **in + } else { + out.Port = nil + } + return nil + } +} + +func DeepCopy_v1beta1_NetworkPolicySpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicySpec) + out := out.(*NetworkPolicySpec) + if err := meta_v1.DeepCopy_v1_LabelSelector(&in.PodSelector, &out.PodSelector, c); err != nil { + return err + } + if in.Ingress != nil { + in, out := &in.Ingress, &out.Ingress + *out = make([]NetworkPolicyIngressRule, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_NetworkPolicyIngressRule(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Ingress = nil + } + return nil + } +} + +func DeepCopy_v1beta1_PodSecurityPolicy(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSecurityPolicy) + out := out.(*PodSecurityPolicy) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_PodSecurityPolicySpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_PodSecurityPolicyList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSecurityPolicyList) + out := out.(*PodSecurityPolicyList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PodSecurityPolicy, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_PodSecurityPolicy(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_PodSecurityPolicySpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSecurityPolicySpec) + out := out.(*PodSecurityPolicySpec) + out.Privileged = in.Privileged + if in.DefaultAddCapabilities != nil { + in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities + *out = make([]v1.Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.DefaultAddCapabilities = nil + } + if in.RequiredDropCapabilities != nil { + in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities + *out = make([]v1.Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.RequiredDropCapabilities = nil + } + if in.AllowedCapabilities != nil { + in, out := &in.AllowedCapabilities, &out.AllowedCapabilities + *out = make([]v1.Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.AllowedCapabilities = nil + } + if in.Volumes != nil { + in, out := &in.Volumes, &out.Volumes + *out = make([]FSType, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Volumes = nil + } + out.HostNetwork = in.HostNetwork + if in.HostPorts != nil { + in, out := &in.HostPorts, &out.HostPorts + *out = make([]HostPortRange, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.HostPorts = nil + } + out.HostPID = in.HostPID + out.HostIPC = in.HostIPC + if err := DeepCopy_v1beta1_SELinuxStrategyOptions(&in.SELinux, &out.SELinux, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_RunAsUserStrategyOptions(&in.RunAsUser, &out.RunAsUser, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_SupplementalGroupsStrategyOptions(&in.SupplementalGroups, &out.SupplementalGroups, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_FSGroupStrategyOptions(&in.FSGroup, &out.FSGroup, c); err != nil { + return err + } + out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem + return nil + } +} + +func DeepCopy_v1beta1_ReplicaSet(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSet) + out := out.(*ReplicaSet) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_ReplicaSetSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_ReplicaSetStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_ReplicaSetCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSetCondition) + out := out.(*ReplicaSetCondition) + out.Type = in.Type + out.Status = in.Status + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1beta1_ReplicaSetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSetList) + out := out.(*ReplicaSetList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ReplicaSet, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_ReplicaSet(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_ReplicaSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSetSpec) + out := out.(*ReplicaSetSpec) + if in.Replicas != nil { + in, out := &in.Replicas, &out.Replicas + *out = new(int32) + **out = **in + } else { + out.Replicas = nil + } + out.MinReadySeconds = in.MinReadySeconds + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := v1.DeepCopy_v1_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_ReplicaSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSetStatus) + out := out.(*ReplicaSetStatus) + out.Replicas = in.Replicas + out.FullyLabeledReplicas = in.FullyLabeledReplicas + out.ReadyReplicas = in.ReadyReplicas + out.AvailableReplicas = in.AvailableReplicas + out.ObservedGeneration = in.ObservedGeneration + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ReplicaSetCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_ReplicaSetCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + return nil + } +} + +func DeepCopy_v1beta1_ReplicationControllerDummy(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerDummy) + out := out.(*ReplicationControllerDummy) + out.TypeMeta = in.TypeMeta + return nil + } +} + +func DeepCopy_v1beta1_RollbackConfig(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RollbackConfig) + out := out.(*RollbackConfig) + out.Revision = in.Revision + return nil + } +} + +func DeepCopy_v1beta1_RollingUpdateDeployment(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RollingUpdateDeployment) + out := out.(*RollingUpdateDeployment) + if in.MaxUnavailable != nil { + in, out := &in.MaxUnavailable, &out.MaxUnavailable + *out = new(intstr.IntOrString) + **out = **in + } else { + out.MaxUnavailable = nil + } + if in.MaxSurge != nil { + in, out := &in.MaxSurge, &out.MaxSurge + *out = new(intstr.IntOrString) + **out = **in + } else { + out.MaxSurge = nil + } + return nil + } +} + +func DeepCopy_v1beta1_RunAsUserStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RunAsUserStrategyOptions) + out := out.(*RunAsUserStrategyOptions) + out.Rule = in.Rule + if in.Ranges != nil { + in, out := &in.Ranges, &out.Ranges + *out = make([]IDRange, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ranges = nil + } + return nil + } +} + +func DeepCopy_v1beta1_SELinuxStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SELinuxStrategyOptions) + out := out.(*SELinuxStrategyOptions) + out.Rule = in.Rule + if in.SELinuxOptions != nil { + in, out := &in.SELinuxOptions, &out.SELinuxOptions + *out = new(v1.SELinuxOptions) + **out = **in + } else { + out.SELinuxOptions = nil + } + return nil + } +} + +func DeepCopy_v1beta1_Scale(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Scale) + out := out.(*Scale) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Spec = in.Spec + if err := DeepCopy_v1beta1_ScaleStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ScaleSpec) + out := out.(*ScaleSpec) + out.Replicas = in.Replicas + return nil + } +} + +func DeepCopy_v1beta1_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ScaleStatus) + out := out.(*ScaleStatus) + out.Replicas = in.Replicas + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Selector = nil + } + out.TargetSelector = in.TargetSelector + return nil + } +} + +func DeepCopy_v1beta1_SubresourceReference(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SubresourceReference) + out := out.(*SubresourceReference) + out.Kind = in.Kind + out.Name = in.Name + out.APIVersion = in.APIVersion + out.Subresource = in.Subresource + return nil + } +} + +func DeepCopy_v1beta1_SupplementalGroupsStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SupplementalGroupsStrategyOptions) + out := out.(*SupplementalGroupsStrategyOptions) + out.Rule = in.Rule + if in.Ranges != nil { + in, out := &in.Ranges, &out.Ranges + *out = make([]IDRange, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ranges = nil + } + return nil + } +} + +func DeepCopy_v1beta1_ThirdPartyResource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ThirdPartyResource) + out := out.(*ThirdPartyResource) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Description = in.Description + if in.Versions != nil { + in, out := &in.Versions, &out.Versions + *out = make([]APIVersion, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Versions = nil + } + return nil + } +} + +func DeepCopy_v1beta1_ThirdPartyResourceData(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ThirdPartyResourceData) + out := out.(*ThirdPartyResourceData) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Data != nil { + in, out := &in.Data, &out.Data + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Data = nil + } + return nil + } +} + +func DeepCopy_v1beta1_ThirdPartyResourceDataList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ThirdPartyResourceDataList) + out := out.(*ThirdPartyResourceDataList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ThirdPartyResourceData, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_ThirdPartyResourceData(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_ThirdPartyResourceList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ThirdPartyResourceList) + out := out.(*ThirdPartyResourceList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ThirdPartyResource, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_ThirdPartyResource(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go new file mode 100644 index 00000000000..19106fbba7b --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/zz_generated.deepcopy.go @@ -0,0 +1,1146 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package extensions + +import ( + api "k8s.io/client-go/pkg/api" + v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + intstr "k8s.io/client-go/pkg/util/intstr" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_APIVersion, InType: reflect.TypeOf(&APIVersion{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_CustomMetricCurrentStatus, InType: reflect.TypeOf(&CustomMetricCurrentStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_CustomMetricCurrentStatusList, InType: reflect.TypeOf(&CustomMetricCurrentStatusList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_CustomMetricTarget, InType: reflect.TypeOf(&CustomMetricTarget{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_CustomMetricTargetList, InType: reflect.TypeOf(&CustomMetricTargetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DaemonSet, InType: reflect.TypeOf(&DaemonSet{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DaemonSetList, InType: reflect.TypeOf(&DaemonSetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DaemonSetSpec, InType: reflect.TypeOf(&DaemonSetSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DaemonSetStatus, InType: reflect.TypeOf(&DaemonSetStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_Deployment, InType: reflect.TypeOf(&Deployment{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentCondition, InType: reflect.TypeOf(&DeploymentCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentList, InType: reflect.TypeOf(&DeploymentList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentRollback, InType: reflect.TypeOf(&DeploymentRollback{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentSpec, InType: reflect.TypeOf(&DeploymentSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentStatus, InType: reflect.TypeOf(&DeploymentStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_DeploymentStrategy, InType: reflect.TypeOf(&DeploymentStrategy{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_FSGroupStrategyOptions, InType: reflect.TypeOf(&FSGroupStrategyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_HTTPIngressPath, InType: reflect.TypeOf(&HTTPIngressPath{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_HTTPIngressRuleValue, InType: reflect.TypeOf(&HTTPIngressRuleValue{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_HostPortRange, InType: reflect.TypeOf(&HostPortRange{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IDRange, InType: reflect.TypeOf(&IDRange{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_Ingress, InType: reflect.TypeOf(&Ingress{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressBackend, InType: reflect.TypeOf(&IngressBackend{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressList, InType: reflect.TypeOf(&IngressList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressRule, InType: reflect.TypeOf(&IngressRule{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressRuleValue, InType: reflect.TypeOf(&IngressRuleValue{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressSpec, InType: reflect.TypeOf(&IngressSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressStatus, InType: reflect.TypeOf(&IngressStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_IngressTLS, InType: reflect.TypeOf(&IngressTLS{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicy, InType: reflect.TypeOf(&NetworkPolicy{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicyIngressRule, InType: reflect.TypeOf(&NetworkPolicyIngressRule{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicyList, InType: reflect.TypeOf(&NetworkPolicyList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicyPeer, InType: reflect.TypeOf(&NetworkPolicyPeer{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicyPort, InType: reflect.TypeOf(&NetworkPolicyPort{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_NetworkPolicySpec, InType: reflect.TypeOf(&NetworkPolicySpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_PodSecurityPolicy, InType: reflect.TypeOf(&PodSecurityPolicy{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_PodSecurityPolicyList, InType: reflect.TypeOf(&PodSecurityPolicyList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_PodSecurityPolicySpec, InType: reflect.TypeOf(&PodSecurityPolicySpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSet, InType: reflect.TypeOf(&ReplicaSet{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSetCondition, InType: reflect.TypeOf(&ReplicaSetCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSetList, InType: reflect.TypeOf(&ReplicaSetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSetSpec, InType: reflect.TypeOf(&ReplicaSetSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicaSetStatus, InType: reflect.TypeOf(&ReplicaSetStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ReplicationControllerDummy, InType: reflect.TypeOf(&ReplicationControllerDummy{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_RollbackConfig, InType: reflect.TypeOf(&RollbackConfig{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_RollingUpdateDeployment, InType: reflect.TypeOf(&RollingUpdateDeployment{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_RunAsUserStrategyOptions, InType: reflect.TypeOf(&RunAsUserStrategyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_SELinuxStrategyOptions, InType: reflect.TypeOf(&SELinuxStrategyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_Scale, InType: reflect.TypeOf(&Scale{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ScaleSpec, InType: reflect.TypeOf(&ScaleSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ScaleStatus, InType: reflect.TypeOf(&ScaleStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_SupplementalGroupsStrategyOptions, InType: reflect.TypeOf(&SupplementalGroupsStrategyOptions{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ThirdPartyResource, InType: reflect.TypeOf(&ThirdPartyResource{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ThirdPartyResourceData, InType: reflect.TypeOf(&ThirdPartyResourceData{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ThirdPartyResourceDataList, InType: reflect.TypeOf(&ThirdPartyResourceDataList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_extensions_ThirdPartyResourceList, InType: reflect.TypeOf(&ThirdPartyResourceList{})}, + ) +} + +func DeepCopy_extensions_APIVersion(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*APIVersion) + out := out.(*APIVersion) + out.Name = in.Name + return nil + } +} + +func DeepCopy_extensions_CustomMetricCurrentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CustomMetricCurrentStatus) + out := out.(*CustomMetricCurrentStatus) + out.Name = in.Name + out.CurrentValue = in.CurrentValue.DeepCopy() + return nil + } +} + +func DeepCopy_extensions_CustomMetricCurrentStatusList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CustomMetricCurrentStatusList) + out := out.(*CustomMetricCurrentStatusList) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CustomMetricCurrentStatus, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_CustomMetricCurrentStatus(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_extensions_CustomMetricTarget(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CustomMetricTarget) + out := out.(*CustomMetricTarget) + out.Name = in.Name + out.TargetValue = in.TargetValue.DeepCopy() + return nil + } +} + +func DeepCopy_extensions_CustomMetricTargetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*CustomMetricTargetList) + out := out.(*CustomMetricTargetList) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]CustomMetricTarget, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_CustomMetricTarget(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_extensions_DaemonSet(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonSet) + out := out.(*DaemonSet) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_extensions_DaemonSetSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_extensions_DaemonSetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonSetList) + out := out.(*DaemonSetList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]DaemonSet, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_DaemonSet(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_extensions_DaemonSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonSetSpec) + out := out.(*DaemonSetSpec) + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_DaemonSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DaemonSetStatus) + out := out.(*DaemonSetStatus) + out.CurrentNumberScheduled = in.CurrentNumberScheduled + out.NumberMisscheduled = in.NumberMisscheduled + out.DesiredNumberScheduled = in.DesiredNumberScheduled + out.NumberReady = in.NumberReady + return nil + } +} + +func DeepCopy_extensions_Deployment(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Deployment) + out := out.(*Deployment) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_extensions_DeploymentSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_extensions_DeploymentStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_DeploymentCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentCondition) + out := out.(*DeploymentCondition) + out.Type = in.Type + out.Status = in.Status + out.LastUpdateTime = in.LastUpdateTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_extensions_DeploymentList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentList) + out := out.(*DeploymentList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Deployment, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_Deployment(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_extensions_DeploymentRollback(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentRollback) + out := out.(*DeploymentRollback) + out.TypeMeta = in.TypeMeta + out.Name = in.Name + if in.UpdatedAnnotations != nil { + in, out := &in.UpdatedAnnotations, &out.UpdatedAnnotations + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.UpdatedAnnotations = nil + } + out.RollbackTo = in.RollbackTo + return nil + } +} + +func DeepCopy_extensions_DeploymentSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentSpec) + out := out.(*DeploymentSpec) + out.Replicas = in.Replicas + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + if err := DeepCopy_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, c); err != nil { + return err + } + out.MinReadySeconds = in.MinReadySeconds + if in.RevisionHistoryLimit != nil { + in, out := &in.RevisionHistoryLimit, &out.RevisionHistoryLimit + *out = new(int32) + **out = **in + } else { + out.RevisionHistoryLimit = nil + } + out.Paused = in.Paused + if in.RollbackTo != nil { + in, out := &in.RollbackTo, &out.RollbackTo + *out = new(RollbackConfig) + **out = **in + } else { + out.RollbackTo = nil + } + if in.ProgressDeadlineSeconds != nil { + in, out := &in.ProgressDeadlineSeconds, &out.ProgressDeadlineSeconds + *out = new(int32) + **out = **in + } else { + out.ProgressDeadlineSeconds = nil + } + return nil + } +} + +func DeepCopy_extensions_DeploymentStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentStatus) + out := out.(*DeploymentStatus) + out.ObservedGeneration = in.ObservedGeneration + out.Replicas = in.Replicas + out.UpdatedReplicas = in.UpdatedReplicas + out.AvailableReplicas = in.AvailableReplicas + out.UnavailableReplicas = in.UnavailableReplicas + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]DeploymentCondition, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_DeploymentCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + return nil + } +} + +func DeepCopy_extensions_DeploymentStrategy(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*DeploymentStrategy) + out := out.(*DeploymentStrategy) + out.Type = in.Type + if in.RollingUpdate != nil { + in, out := &in.RollingUpdate, &out.RollingUpdate + *out = new(RollingUpdateDeployment) + **out = **in + } else { + out.RollingUpdate = nil + } + return nil + } +} + +func DeepCopy_extensions_FSGroupStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*FSGroupStrategyOptions) + out := out.(*FSGroupStrategyOptions) + out.Rule = in.Rule + if in.Ranges != nil { + in, out := &in.Ranges, &out.Ranges + *out = make([]IDRange, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ranges = nil + } + return nil + } +} + +func DeepCopy_extensions_HTTPIngressPath(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HTTPIngressPath) + out := out.(*HTTPIngressPath) + out.Path = in.Path + out.Backend = in.Backend + return nil + } +} + +func DeepCopy_extensions_HTTPIngressRuleValue(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HTTPIngressRuleValue) + out := out.(*HTTPIngressRuleValue) + if in.Paths != nil { + in, out := &in.Paths, &out.Paths + *out = make([]HTTPIngressPath, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Paths = nil + } + return nil + } +} + +func DeepCopy_extensions_HostPortRange(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*HostPortRange) + out := out.(*HostPortRange) + out.Min = in.Min + out.Max = in.Max + return nil + } +} + +func DeepCopy_extensions_IDRange(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IDRange) + out := out.(*IDRange) + out.Min = in.Min + out.Max = in.Max + return nil + } +} + +func DeepCopy_extensions_Ingress(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Ingress) + out := out.(*Ingress) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_extensions_IngressSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_extensions_IngressStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_IngressBackend(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressBackend) + out := out.(*IngressBackend) + out.ServiceName = in.ServiceName + out.ServicePort = in.ServicePort + return nil + } +} + +func DeepCopy_extensions_IngressList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressList) + out := out.(*IngressList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Ingress, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_Ingress(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_extensions_IngressRule(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressRule) + out := out.(*IngressRule) + out.Host = in.Host + if err := DeepCopy_extensions_IngressRuleValue(&in.IngressRuleValue, &out.IngressRuleValue, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_IngressRuleValue(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressRuleValue) + out := out.(*IngressRuleValue) + if in.HTTP != nil { + in, out := &in.HTTP, &out.HTTP + *out = new(HTTPIngressRuleValue) + if err := DeepCopy_extensions_HTTPIngressRuleValue(*in, *out, c); err != nil { + return err + } + } else { + out.HTTP = nil + } + return nil + } +} + +func DeepCopy_extensions_IngressSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressSpec) + out := out.(*IngressSpec) + if in.Backend != nil { + in, out := &in.Backend, &out.Backend + *out = new(IngressBackend) + **out = **in + } else { + out.Backend = nil + } + if in.TLS != nil { + in, out := &in.TLS, &out.TLS + *out = make([]IngressTLS, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_IngressTLS(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.TLS = nil + } + if in.Rules != nil { + in, out := &in.Rules, &out.Rules + *out = make([]IngressRule, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_IngressRule(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Rules = nil + } + return nil + } +} + +func DeepCopy_extensions_IngressStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressStatus) + out := out.(*IngressStatus) + if err := api.DeepCopy_api_LoadBalancerStatus(&in.LoadBalancer, &out.LoadBalancer, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_IngressTLS(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*IngressTLS) + out := out.(*IngressTLS) + if in.Hosts != nil { + in, out := &in.Hosts, &out.Hosts + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Hosts = nil + } + out.SecretName = in.SecretName + return nil + } +} + +func DeepCopy_extensions_NetworkPolicy(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicy) + out := out.(*NetworkPolicy) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_extensions_NetworkPolicySpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_NetworkPolicyIngressRule(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicyIngressRule) + out := out.(*NetworkPolicyIngressRule) + if in.Ports != nil { + in, out := &in.Ports, &out.Ports + *out = make([]NetworkPolicyPort, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_NetworkPolicyPort(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Ports = nil + } + if in.From != nil { + in, out := &in.From, &out.From + *out = make([]NetworkPolicyPeer, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_NetworkPolicyPeer(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.From = nil + } + return nil + } +} + +func DeepCopy_extensions_NetworkPolicyList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicyList) + out := out.(*NetworkPolicyList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]NetworkPolicy, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_NetworkPolicy(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_extensions_NetworkPolicyPeer(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicyPeer) + out := out.(*NetworkPolicyPeer) + if in.PodSelector != nil { + in, out := &in.PodSelector, &out.PodSelector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.PodSelector = nil + } + if in.NamespaceSelector != nil { + in, out := &in.NamespaceSelector, &out.NamespaceSelector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.NamespaceSelector = nil + } + return nil + } +} + +func DeepCopy_extensions_NetworkPolicyPort(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicyPort) + out := out.(*NetworkPolicyPort) + if in.Protocol != nil { + in, out := &in.Protocol, &out.Protocol + *out = new(api.Protocol) + **out = **in + } else { + out.Protocol = nil + } + if in.Port != nil { + in, out := &in.Port, &out.Port + *out = new(intstr.IntOrString) + **out = **in + } else { + out.Port = nil + } + return nil + } +} + +func DeepCopy_extensions_NetworkPolicySpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*NetworkPolicySpec) + out := out.(*NetworkPolicySpec) + if err := v1.DeepCopy_v1_LabelSelector(&in.PodSelector, &out.PodSelector, c); err != nil { + return err + } + if in.Ingress != nil { + in, out := &in.Ingress, &out.Ingress + *out = make([]NetworkPolicyIngressRule, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_NetworkPolicyIngressRule(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Ingress = nil + } + return nil + } +} + +func DeepCopy_extensions_PodSecurityPolicy(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSecurityPolicy) + out := out.(*PodSecurityPolicy) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_extensions_PodSecurityPolicySpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_PodSecurityPolicyList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSecurityPolicyList) + out := out.(*PodSecurityPolicyList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PodSecurityPolicy, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_PodSecurityPolicy(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_extensions_PodSecurityPolicySpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodSecurityPolicySpec) + out := out.(*PodSecurityPolicySpec) + out.Privileged = in.Privileged + if in.DefaultAddCapabilities != nil { + in, out := &in.DefaultAddCapabilities, &out.DefaultAddCapabilities + *out = make([]api.Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.DefaultAddCapabilities = nil + } + if in.RequiredDropCapabilities != nil { + in, out := &in.RequiredDropCapabilities, &out.RequiredDropCapabilities + *out = make([]api.Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.RequiredDropCapabilities = nil + } + if in.AllowedCapabilities != nil { + in, out := &in.AllowedCapabilities, &out.AllowedCapabilities + *out = make([]api.Capability, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.AllowedCapabilities = nil + } + if in.Volumes != nil { + in, out := &in.Volumes, &out.Volumes + *out = make([]FSType, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Volumes = nil + } + out.HostNetwork = in.HostNetwork + if in.HostPorts != nil { + in, out := &in.HostPorts, &out.HostPorts + *out = make([]HostPortRange, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.HostPorts = nil + } + out.HostPID = in.HostPID + out.HostIPC = in.HostIPC + if err := DeepCopy_extensions_SELinuxStrategyOptions(&in.SELinux, &out.SELinux, c); err != nil { + return err + } + if err := DeepCopy_extensions_RunAsUserStrategyOptions(&in.RunAsUser, &out.RunAsUser, c); err != nil { + return err + } + if err := DeepCopy_extensions_SupplementalGroupsStrategyOptions(&in.SupplementalGroups, &out.SupplementalGroups, c); err != nil { + return err + } + if err := DeepCopy_extensions_FSGroupStrategyOptions(&in.FSGroup, &out.FSGroup, c); err != nil { + return err + } + out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem + return nil + } +} + +func DeepCopy_extensions_ReplicaSet(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSet) + out := out.(*ReplicaSet) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_extensions_ReplicaSetSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_extensions_ReplicaSetStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_ReplicaSetCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSetCondition) + out := out.(*ReplicaSetCondition) + out.Type = in.Type + out.Status = in.Status + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_extensions_ReplicaSetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSetList) + out := out.(*ReplicaSetList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ReplicaSet, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_ReplicaSet(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_extensions_ReplicaSetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSetSpec) + out := out.(*ReplicaSetSpec) + out.Replicas = in.Replicas + out.MinReadySeconds = in.MinReadySeconds + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + if err := api.DeepCopy_api_PodTemplateSpec(&in.Template, &out.Template, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_ReplicaSetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicaSetStatus) + out := out.(*ReplicaSetStatus) + out.Replicas = in.Replicas + out.FullyLabeledReplicas = in.FullyLabeledReplicas + out.ReadyReplicas = in.ReadyReplicas + out.AvailableReplicas = in.AvailableReplicas + out.ObservedGeneration = in.ObservedGeneration + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ReplicaSetCondition, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_ReplicaSetCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + return nil + } +} + +func DeepCopy_extensions_ReplicationControllerDummy(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ReplicationControllerDummy) + out := out.(*ReplicationControllerDummy) + out.TypeMeta = in.TypeMeta + return nil + } +} + +func DeepCopy_extensions_RollbackConfig(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RollbackConfig) + out := out.(*RollbackConfig) + out.Revision = in.Revision + return nil + } +} + +func DeepCopy_extensions_RollingUpdateDeployment(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RollingUpdateDeployment) + out := out.(*RollingUpdateDeployment) + out.MaxUnavailable = in.MaxUnavailable + out.MaxSurge = in.MaxSurge + return nil + } +} + +func DeepCopy_extensions_RunAsUserStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RunAsUserStrategyOptions) + out := out.(*RunAsUserStrategyOptions) + out.Rule = in.Rule + if in.Ranges != nil { + in, out := &in.Ranges, &out.Ranges + *out = make([]IDRange, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ranges = nil + } + return nil + } +} + +func DeepCopy_extensions_SELinuxStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SELinuxStrategyOptions) + out := out.(*SELinuxStrategyOptions) + out.Rule = in.Rule + if in.SELinuxOptions != nil { + in, out := &in.SELinuxOptions, &out.SELinuxOptions + *out = new(api.SELinuxOptions) + **out = **in + } else { + out.SELinuxOptions = nil + } + return nil + } +} + +func DeepCopy_extensions_Scale(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Scale) + out := out.(*Scale) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Spec = in.Spec + if err := DeepCopy_extensions_ScaleStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_extensions_ScaleSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ScaleSpec) + out := out.(*ScaleSpec) + out.Replicas = in.Replicas + return nil + } +} + +func DeepCopy_extensions_ScaleStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ScaleStatus) + out := out.(*ScaleStatus) + out.Replicas = in.Replicas + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + return nil + } +} + +func DeepCopy_extensions_SupplementalGroupsStrategyOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*SupplementalGroupsStrategyOptions) + out := out.(*SupplementalGroupsStrategyOptions) + out.Rule = in.Rule + if in.Ranges != nil { + in, out := &in.Ranges, &out.Ranges + *out = make([]IDRange, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Ranges = nil + } + return nil + } +} + +func DeepCopy_extensions_ThirdPartyResource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ThirdPartyResource) + out := out.(*ThirdPartyResource) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Description = in.Description + if in.Versions != nil { + in, out := &in.Versions, &out.Versions + *out = make([]APIVersion, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Versions = nil + } + return nil + } +} + +func DeepCopy_extensions_ThirdPartyResourceData(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ThirdPartyResourceData) + out := out.(*ThirdPartyResourceData) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Data != nil { + in, out := &in.Data, &out.Data + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Data = nil + } + return nil + } +} + +func DeepCopy_extensions_ThirdPartyResourceDataList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ThirdPartyResourceDataList) + out := out.(*ThirdPartyResourceDataList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ThirdPartyResourceData, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_ThirdPartyResourceData(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_extensions_ThirdPartyResourceList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ThirdPartyResourceList) + out := out.(*ThirdPartyResourceList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ThirdPartyResource, len(*in)) + for i := range *in { + if err := DeepCopy_extensions_ThirdPartyResource(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/OWNERS new file mode 100755 index 00000000000..96ae42e027a --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/OWNERS @@ -0,0 +1,4 @@ +reviewers: +- deads2k +- mbohlool +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/register.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/register.go index 86da8164f86..5927d9e68d7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/register.go @@ -18,6 +18,7 @@ package imagepolicy import ( "k8s.io/client-go/pkg/api" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" ) @@ -47,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &api.ListOptions{}, &api.DeleteOptions{}, - &api.ExportOptions{}, + &metav1.ExportOptions{}, &ImageReview{}, ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/types.generated.go index 382e8acb897..e9464e514c7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/client-go/pkg/api" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -784,7 +784,7 @@ func (x *ImageReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "creationTimestamp": if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv76 := &x.CreationTimestamp yym77 := z.DecBinary() @@ -801,7 +801,7 @@ func (x *ImageReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "deletionTimestamp": if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } if r.TryDecodeAsNil() { if x.DeletionTimestamp != nil { @@ -809,7 +809,7 @@ func (x *ImageReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym79 := z.DecBinary() _ = yym79 @@ -1080,7 +1080,7 @@ func (x *ImageReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.CreationTimestamp = pkg1_unversioned.Time{} + x.CreationTimestamp = pkg1_v1.Time{} } else { yyv103 := &x.CreationTimestamp yym104 := z.DecBinary() @@ -1096,7 +1096,7 @@ func (x *ImageReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } if x.ObjectMeta.DeletionTimestamp == nil { - x.ObjectMeta.DeletionTimestamp = new(pkg1_unversioned.Time) + x.ObjectMeta.DeletionTimestamp = new(pkg1_v1.Time) } yyj93++ if yyhl93 { @@ -1115,7 +1115,7 @@ func (x *ImageReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } } else { if x.DeletionTimestamp == nil { - x.DeletionTimestamp = new(pkg1_unversioned.Time) + x.DeletionTimestamp = new(pkg1_v1.Time) } yym106 := z.DecBinary() _ = yym106 diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/types.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/types.go index d0fa6d2dc68..d5decfe06b8 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/types.go @@ -18,7 +18,7 @@ package imagepolicy import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -27,7 +27,7 @@ import ( // ImageReview checks if the set of images in a pod are allowed. type ImageReview struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Spec holds information about the pod being evaluated diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/generated.pb.go index 57ccc84093f..f93321ac859 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/generated.pb.go @@ -1019,42 +1019,42 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 585 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0x3f, 0x6f, 0x13, 0x3f, - 0x18, 0xc7, 0x73, 0x49, 0xff, 0xc5, 0xf9, 0xfd, 0x68, 0x6b, 0x18, 0xa2, 0x0c, 0xd7, 0x2a, 0x48, - 0xa8, 0x20, 0x6a, 0x2b, 0x15, 0x48, 0x15, 0x03, 0xa5, 0x87, 0x18, 0x3a, 0x00, 0xc2, 0x2c, 0x88, - 0xcd, 0xb9, 0x3c, 0xbd, 0xba, 0xb9, 0xb3, 0x4f, 0x67, 0xdf, 0x55, 0x1d, 0x90, 0x18, 0x19, 0x18, - 0x78, 0x37, 0xbc, 0x85, 0x8e, 0x1d, 0x99, 0x2a, 0x1a, 0xde, 0x08, 0x8a, 0xef, 0xd2, 0x3b, 0x92, - 0x06, 0x09, 0x65, 0xf3, 0xe3, 0xc7, 0xdf, 0xcf, 0xf7, 0x6b, 0x3f, 0x46, 0x07, 0xc3, 0x7d, 0x4d, - 0x84, 0xa2, 0xc3, 0xb4, 0x0f, 0x89, 0x04, 0x03, 0x9a, 0xc6, 0xc3, 0x80, 0xf2, 0x58, 0x68, 0x2a, - 0x22, 0x1e, 0x40, 0xac, 0x42, 0xe1, 0x9f, 0xd3, 0xac, 0xc7, 0xc3, 0xf8, 0x84, 0xf7, 0x68, 0x00, - 0x12, 0x12, 0x6e, 0x60, 0x40, 0xe2, 0x44, 0x19, 0x85, 0x69, 0x0e, 0x20, 0x25, 0x80, 0xc4, 0xc3, - 0x80, 0x8c, 0x01, 0xa4, 0x02, 0x20, 0x13, 0x40, 0x67, 0x37, 0x10, 0xe6, 0x24, 0xed, 0x13, 0x5f, - 0x45, 0x34, 0x50, 0x81, 0xa2, 0x96, 0xd3, 0x4f, 0x8f, 0x6d, 0x65, 0x0b, 0xbb, 0xca, 0xf9, 0x9d, - 0xbd, 0xb9, 0x01, 0x69, 0x02, 0x5a, 0xa5, 0x89, 0x0f, 0xd3, 0x99, 0x3a, 0x4f, 0xe7, 0x6b, 0x52, - 0x99, 0x41, 0xa2, 0x85, 0x92, 0x30, 0x98, 0x91, 0x3d, 0x9e, 0x2f, 0xcb, 0x66, 0x2e, 0xde, 0xd9, - 0xbd, 0xfd, 0x74, 0x92, 0x4a, 0x23, 0xa2, 0xd9, 0x4c, 0x4f, 0xfe, 0x7e, 0x5c, 0xfb, 0x27, 0x10, - 0xf1, 0x19, 0x55, 0xef, 0x76, 0x55, 0x6a, 0x44, 0x48, 0x85, 0x34, 0xda, 0x24, 0xd3, 0x92, 0xee, - 0xf7, 0x3a, 0x6a, 0x1d, 0x8d, 0x1f, 0x9e, 0x41, 0x26, 0xe0, 0x0c, 0x7f, 0x40, 0x6b, 0x11, 0x18, - 0x3e, 0xe0, 0x86, 0xb7, 0x9d, 0x6d, 0x67, 0xa7, 0xb5, 0xb7, 0x43, 0xe6, 0xce, 0x8c, 0x64, 0x3d, - 0xf2, 0xb6, 0x7f, 0x0a, 0xbe, 0x79, 0x0d, 0x86, 0x7b, 0xf8, 0xe2, 0x6a, 0xab, 0x36, 0xba, 0xda, - 0x42, 0xe5, 0x1e, 0xbb, 0xa1, 0xe1, 0x3e, 0x5a, 0xd2, 0x31, 0xf8, 0xed, 0xba, 0xa5, 0xbe, 0x20, - 0xff, 0xf8, 0x13, 0x48, 0x25, 0xe5, 0xfb, 0x18, 0x7c, 0xef, 0xbf, 0xc2, 0x6d, 0x69, 0x5c, 0x31, - 0xcb, 0xc6, 0xa7, 0x68, 0x45, 0x1b, 0x6e, 0x52, 0xdd, 0x6e, 0x58, 0x17, 0x6f, 0x21, 0x17, 0x4b, - 0xf2, 0xee, 0x14, 0x3e, 0x2b, 0x79, 0xcd, 0x0a, 0x87, 0xee, 0x01, 0x6a, 0x57, 0x0e, 0xbf, 0x54, - 0xd2, 0x70, 0x21, 0x21, 0x19, 0xa7, 0xc1, 0xf7, 0xd1, 0xb2, 0xa5, 0xdb, 0x27, 0x6c, 0x7a, 0xff, - 0x17, 0x88, 0xe5, 0x5c, 0x90, 0xf7, 0xba, 0x5f, 0x1b, 0x68, 0x7d, 0xea, 0x52, 0xf8, 0x13, 0x42, - 0xfe, 0x84, 0xa4, 0xdb, 0xce, 0x76, 0x63, 0xa7, 0xb5, 0x77, 0xb4, 0xc8, 0x25, 0xfe, 0xc8, 0x55, - 0x4e, 0xe8, 0x66, 0x5b, 0xb3, 0x8a, 0x21, 0xfe, 0xe2, 0xa0, 0x16, 0x97, 0x52, 0x19, 0x6e, 0x84, - 0x92, 0xba, 0x5d, 0xb7, 0x01, 0xde, 0x2d, 0x3a, 0x2b, 0x72, 0x58, 0x32, 0x5f, 0x49, 0x93, 0x9c, - 0x7b, 0x77, 0x8b, 0x20, 0xad, 0x4a, 0x87, 0x55, 0xad, 0x31, 0x45, 0x4d, 0xc9, 0x23, 0xd0, 0x31, - 0xf7, 0xc1, 0x4e, 0xb3, 0xe9, 0x6d, 0x16, 0xa2, 0xe6, 0x9b, 0x49, 0x83, 0x95, 0x67, 0x3a, 0xcf, - 0xd1, 0xc6, 0xb4, 0x0d, 0xde, 0x40, 0x8d, 0x21, 0x9c, 0xe7, 0x53, 0x60, 0xe3, 0x25, 0xbe, 0x87, - 0x96, 0x33, 0x1e, 0xa6, 0x60, 0xbf, 0x61, 0x93, 0xe5, 0xc5, 0xb3, 0xfa, 0xbe, 0xd3, 0x3d, 0x46, - 0x9b, 0x33, 0xc3, 0xc7, 0x0f, 0xd1, 0x2a, 0x0f, 0x43, 0x75, 0x06, 0x03, 0x0b, 0x59, 0xf3, 0xd6, - 0x8b, 0x0c, 0xab, 0x87, 0xf9, 0x36, 0x9b, 0xf4, 0xf1, 0x03, 0xb4, 0x92, 0x00, 0xd7, 0x4a, 0xe6, - 0xe8, 0xf2, 0xdf, 0x30, 0xbb, 0xcb, 0x8a, 0xae, 0xf7, 0xe8, 0xe2, 0xda, 0xad, 0x5d, 0x5e, 0xbb, - 0xb5, 0x1f, 0xd7, 0x6e, 0xed, 0xf3, 0xc8, 0x75, 0x2e, 0x46, 0xae, 0x73, 0x39, 0x72, 0x9d, 0x9f, - 0x23, 0xd7, 0xf9, 0xf6, 0xcb, 0xad, 0x7d, 0x5c, 0x9b, 0xbc, 0xe3, 0xef, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x16, 0xa4, 0x8e, 0xac, 0x70, 0x05, 0x00, 0x00, + // 579 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0x4f, 0x6f, 0xd3, 0x3e, + 0x18, 0xc7, 0x9b, 0x76, 0xff, 0xea, 0xfe, 0x7e, 0x6c, 0x33, 0x1c, 0xa2, 0x1e, 0xb2, 0xa9, 0x48, + 0x68, 0x20, 0x66, 0xab, 0x13, 0x87, 0x89, 0x03, 0x63, 0x41, 0x1c, 0x76, 0x00, 0x84, 0xb9, 0x20, + 0x6e, 0x6e, 0xf6, 0x2c, 0xcb, 0x9a, 0xd8, 0x51, 0xec, 0x74, 0xda, 0x01, 0x89, 0x23, 0x07, 0x0e, + 0xbc, 0x1b, 0xde, 0x42, 0x8f, 0x3b, 0x72, 0x9a, 0x68, 0x79, 0x23, 0x28, 0x4e, 0xba, 0x84, 0xfe, + 0x99, 0x84, 0x7a, 0xf3, 0xe3, 0xc7, 0xdf, 0xcf, 0xf7, 0x6b, 0x3f, 0x46, 0x47, 0xfd, 0x43, 0x45, + 0x02, 0x49, 0xfb, 0x69, 0x0f, 0x12, 0x01, 0x1a, 0x14, 0x8d, 0xfb, 0x3e, 0xe5, 0x71, 0xa0, 0x68, + 0x10, 0x71, 0x1f, 0x62, 0x19, 0x06, 0xde, 0x15, 0x1d, 0x74, 0x79, 0x18, 0x9f, 0xf3, 0x2e, 0xf5, + 0x41, 0x40, 0xc2, 0x35, 0x9c, 0x92, 0x38, 0x91, 0x5a, 0x62, 0x9a, 0x03, 0x48, 0x09, 0x20, 0x71, + 0xdf, 0x27, 0x19, 0x80, 0x54, 0x00, 0x64, 0x02, 0x68, 0xef, 0xfb, 0x81, 0x3e, 0x4f, 0x7b, 0xc4, + 0x93, 0x11, 0xf5, 0xa5, 0x2f, 0xa9, 0xe1, 0xf4, 0xd2, 0x33, 0x53, 0x99, 0xc2, 0xac, 0x72, 0x7e, + 0xfb, 0x60, 0x61, 0x40, 0x9a, 0x80, 0x92, 0x69, 0xe2, 0xc1, 0x74, 0xa6, 0xf6, 0xd3, 0xc5, 0x9a, + 0xc1, 0xcc, 0x0d, 0xee, 0x70, 0x50, 0x34, 0x02, 0xcd, 0xe7, 0x69, 0xf6, 0xe7, 0x6b, 0x92, 0x54, + 0xe8, 0x20, 0x9a, 0x0d, 0xf4, 0xec, 0xee, 0xe3, 0xca, 0x3b, 0x87, 0x88, 0xcf, 0xa8, 0xba, 0xf3, + 0x55, 0xa9, 0x0e, 0x42, 0x1a, 0x08, 0xad, 0x74, 0x32, 0x2d, 0xe9, 0xfc, 0xa8, 0xa3, 0xd6, 0x49, + 0xf6, 0xea, 0x0c, 0x06, 0x01, 0x5c, 0xe2, 0x8f, 0x68, 0x23, 0xbb, 0xc2, 0x29, 0xd7, 0xdc, 0xb6, + 0x76, 0xad, 0xbd, 0xd6, 0xc1, 0x1e, 0x59, 0x38, 0x30, 0x32, 0xe8, 0x92, 0x77, 0xbd, 0x0b, 0xf0, + 0xf4, 0x1b, 0xd0, 0xdc, 0xc5, 0xc3, 0x9b, 0x9d, 0xda, 0xf8, 0x66, 0x07, 0x95, 0x7b, 0xec, 0x96, + 0x86, 0x7b, 0x68, 0x45, 0xc5, 0xe0, 0xd9, 0x75, 0x43, 0x7d, 0x49, 0xfe, 0xf1, 0x1b, 0x90, 0x4a, + 0xca, 0x0f, 0x31, 0x78, 0xee, 0x7f, 0x85, 0xdb, 0x4a, 0x56, 0x31, 0xc3, 0xc6, 0x17, 0x68, 0x4d, + 0x69, 0xae, 0x53, 0x65, 0x37, 0x8c, 0x8b, 0xbb, 0x94, 0x8b, 0x21, 0xb9, 0xf7, 0x0a, 0x9f, 0xb5, + 0xbc, 0x66, 0x85, 0x43, 0xe7, 0x08, 0xd9, 0x95, 0xc3, 0xaf, 0xa4, 0xd0, 0x3c, 0x10, 0x90, 0x64, + 0x69, 0xf0, 0x43, 0xb4, 0x6a, 0xe8, 0xe6, 0x09, 0x9b, 0xee, 0xff, 0x05, 0x62, 0x35, 0x17, 0xe4, + 0xbd, 0xce, 0xb7, 0x06, 0xda, 0x9c, 0xba, 0x14, 0xfe, 0x8c, 0x90, 0x37, 0x21, 0x29, 0xdb, 0xda, + 0x6d, 0xec, 0xb5, 0x0e, 0x4e, 0x96, 0xb9, 0xc4, 0x5f, 0xb9, 0xca, 0x09, 0xdd, 0x6e, 0x2b, 0x56, + 0x31, 0xc4, 0x5f, 0x2d, 0xd4, 0xe2, 0x42, 0x48, 0xcd, 0x75, 0x20, 0x85, 0xb2, 0xeb, 0x26, 0xc0, + 0xfb, 0x65, 0x67, 0x45, 0x8e, 0x4b, 0xe6, 0x6b, 0xa1, 0x93, 0x2b, 0xf7, 0x7e, 0x11, 0xa4, 0x55, + 0xe9, 0xb0, 0xaa, 0x35, 0xa6, 0xa8, 0x29, 0x78, 0x04, 0x2a, 0xe6, 0x1e, 0x98, 0x69, 0x36, 0xdd, + 0xed, 0x42, 0xd4, 0x7c, 0x3b, 0x69, 0xb0, 0xf2, 0x4c, 0xfb, 0x05, 0xda, 0x9a, 0xb6, 0xc1, 0x5b, + 0xa8, 0xd1, 0x87, 0xab, 0x7c, 0x0a, 0x2c, 0x5b, 0xe2, 0x07, 0x68, 0x75, 0xc0, 0xc3, 0x14, 0xcc, + 0x37, 0x6c, 0xb2, 0xbc, 0x78, 0x5e, 0x3f, 0xb4, 0x3a, 0x67, 0x68, 0x7b, 0x66, 0xf8, 0xf8, 0x31, + 0x5a, 0xe7, 0x61, 0x28, 0x2f, 0xe1, 0xd4, 0x40, 0x36, 0xdc, 0xcd, 0x22, 0xc3, 0xfa, 0x71, 0xbe, + 0xcd, 0x26, 0x7d, 0xfc, 0x08, 0xad, 0x25, 0xc0, 0x95, 0x14, 0x39, 0xba, 0xfc, 0x37, 0xcc, 0xec, + 0xb2, 0xa2, 0xeb, 0x3e, 0x19, 0x8e, 0x9c, 0xda, 0xf5, 0xc8, 0xa9, 0xfd, 0x1c, 0x39, 0xb5, 0x2f, + 0x63, 0xc7, 0x1a, 0x8e, 0x1d, 0xeb, 0x7a, 0xec, 0x58, 0xbf, 0xc6, 0x8e, 0xf5, 0xfd, 0xb7, 0x53, + 0xfb, 0xb4, 0x31, 0x79, 0xc7, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x06, 0xba, 0x95, 0xb5, 0x6d, + 0x05, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/generated.proto index 06419a135a0..963c5ab2874 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.imagepolicy.v1alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/register.go index b06967db965..890e23f5cf3 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/register.go @@ -18,6 +18,7 @@ package v1alpha1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" ) @@ -28,6 +29,11 @@ const GroupName = "imagepolicy.k8s.io" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) AddToScheme = SchemeBuilder.AddToScheme @@ -38,7 +44,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, &ImageReview{}, ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.generated.go index 8bb3ba09baf..eec7e9a506c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.go index 26d236188ac..f6fc4623586 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -27,7 +27,7 @@ import ( // ImageReview checks if the set of images in a pod are allowed. type ImageReview struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..ba5c19d2aeb --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/zz_generated.deepcopy.go @@ -0,0 +1,105 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1alpha1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ImageReview, InType: reflect.TypeOf(&ImageReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ImageReviewContainerSpec, InType: reflect.TypeOf(&ImageReviewContainerSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ImageReviewSpec, InType: reflect.TypeOf(&ImageReviewSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ImageReviewStatus, InType: reflect.TypeOf(&ImageReviewStatus{})}, + ) +} + +func DeepCopy_v1alpha1_ImageReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ImageReview) + out := out.(*ImageReview) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1alpha1_ImageReviewSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_v1alpha1_ImageReviewContainerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ImageReviewContainerSpec) + out := out.(*ImageReviewContainerSpec) + out.Image = in.Image + return nil + } +} + +func DeepCopy_v1alpha1_ImageReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ImageReviewSpec) + out := out.(*ImageReviewSpec) + if in.Containers != nil { + in, out := &in.Containers, &out.Containers + *out = make([]ImageReviewContainerSpec, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Containers = nil + } + if in.Annotations != nil { + in, out := &in.Annotations, &out.Annotations + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Annotations = nil + } + out.Namespace = in.Namespace + return nil + } +} + +func DeepCopy_v1alpha1_ImageReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ImageReviewStatus) + out := out.(*ImageReviewStatus) + out.Allowed = in.Allowed + out.Reason = in.Reason + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go new file mode 100644 index 00000000000..abe64ed78ad --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/zz_generated.deepcopy.go @@ -0,0 +1,105 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package imagepolicy + +import ( + api "k8s.io/client-go/pkg/api" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_imagepolicy_ImageReview, InType: reflect.TypeOf(&ImageReview{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_imagepolicy_ImageReviewContainerSpec, InType: reflect.TypeOf(&ImageReviewContainerSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_imagepolicy_ImageReviewSpec, InType: reflect.TypeOf(&ImageReviewSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_imagepolicy_ImageReviewStatus, InType: reflect.TypeOf(&ImageReviewStatus{})}, + ) +} + +func DeepCopy_imagepolicy_ImageReview(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ImageReview) + out := out.(*ImageReview) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_imagepolicy_ImageReviewSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + out.Status = in.Status + return nil + } +} + +func DeepCopy_imagepolicy_ImageReviewContainerSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ImageReviewContainerSpec) + out := out.(*ImageReviewContainerSpec) + out.Image = in.Image + return nil + } +} + +func DeepCopy_imagepolicy_ImageReviewSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ImageReviewSpec) + out := out.(*ImageReviewSpec) + if in.Containers != nil { + in, out := &in.Containers, &out.Containers + *out = make([]ImageReviewContainerSpec, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Containers = nil + } + if in.Annotations != nil { + in, out := &in.Annotations, &out.Annotations + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Annotations = nil + } + out.Namespace = in.Namespace + return nil + } +} + +func DeepCopy_imagepolicy_ImageReviewStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ImageReviewStatus) + out := out.(*ImageReviewStatus) + out.Allowed = in.Allowed + out.Reason = in.Reason + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/env.go b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/env.go index 687e89edc76..050483513db 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/env.go +++ b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/env.go @@ -36,6 +36,7 @@ func SetEnvParams() *EnvParams { "host_pki_path": "/etc/kubernetes/pki", "host_etcd_path": "/var/lib/etcd", "hyperkube_image": "", + "repo_prefix": "gcr.io/google_containers", "discovery_image": fmt.Sprintf("gcr.io/google_containers/kube-discovery-%s:%s", runtime.GOARCH, "1.0"), "etcd_image": "", "component_loglevel": "--v=2", @@ -52,6 +53,7 @@ func SetEnvParams() *EnvParams { HostPKIPath: envParams["host_pki_path"], HostEtcdPath: envParams["host_etcd_path"], HyperkubeImage: envParams["hyperkube_image"], + RepositoryPrefix: envParams["repo_prefix"], DiscoveryImage: envParams["discovery_image"], EtcdImage: envParams["etcd_image"], ComponentLoglevel: envParams["component_loglevel"], diff --git a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/register.go b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/register.go index e8850f458b8..7be954dc6e1 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/register.go @@ -18,6 +18,7 @@ package kubeadm import ( "k8s.io/client-go/pkg/api" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" ) @@ -50,7 +51,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterInfo{}, &api.ListOptions{}, &api.DeleteOptions{}, - &api.ExportOptions{}, + &metav1.ExportOptions{}, ) return nil } diff --git a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/types.go b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/types.go index f86f4ae4ecb..ecc9e59f671 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/types.go @@ -16,20 +16,23 @@ limitations under the License. package kubeadm -import "k8s.io/client-go/pkg/api/unversioned" +import ( + metav1 "k8s.io/client-go/pkg/apis/meta/v1" +) type EnvParams struct { KubernetesDir string HostPKIPath string HostEtcdPath string HyperkubeImage string + RepositoryPrefix string DiscoveryImage string EtcdImage string ComponentLoglevel string } type MasterConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta Secrets Secrets API API @@ -71,7 +74,7 @@ type Secrets struct { } type NodeConfiguration struct { - unversioned.TypeMeta + metav1.TypeMeta MasterAddresses []string Secrets Secrets @@ -81,7 +84,7 @@ type NodeConfiguration struct { // ClusterInfo TODO add description type ClusterInfo struct { - unversioned.TypeMeta + metav1.TypeMeta // TODO(phase1+) this may become simply `api.Config` CertificateAuthorities []string `json:"certificateAuthorities"` Endpoints []string `json:"endpoints"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/defaults.go b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/defaults.go index 74d3ec2a1e9..dce5bf7deed 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/defaults.go @@ -21,11 +21,12 @@ import ( ) const ( - DefaultServiceDNSDomain = "cluster.local" - DefaultServicesSubnet = "10.96.0.0/12" - DefaultKubernetesVersion = "v1.4.4" - DefaultAPIBindPort = 6443 - DefaultDiscoveryBindPort = 9898 + DefaultServiceDNSDomain = "cluster.local" + DefaultServicesSubnet = "10.96.0.0/12" + DefaultKubernetesVersion = "stable" + DefaultKubernetesFallbackVersion = "v1.4.6" + DefaultAPIBindPort = 6443 + DefaultDiscoveryBindPort = 9898 ) func addDefaultingFuncs(scheme *runtime.Scheme) error { diff --git a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/register.go index 3a05bbc9c2b..6a7df449c76 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/register.go @@ -18,6 +18,7 @@ package v1alpha1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" ) @@ -50,7 +51,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterInfo{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, ) return nil } diff --git a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/types.go index ecd8046559e..0a5caa297a5 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/types.go @@ -16,10 +16,12 @@ limitations under the License. package v1alpha1 -import "k8s.io/client-go/pkg/api/unversioned" +import ( + metav1 "k8s.io/client-go/pkg/apis/meta/v1" +) type MasterConfiguration struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` Secrets Secrets `json:"secrets"` API API `json:"api"` @@ -61,7 +63,7 @@ type Secrets struct { } type NodeConfiguration struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` MasterAddresses []string `json:"masterAddresses"` Secrets Secrets `json:"secrets"` @@ -71,7 +73,7 @@ type NodeConfiguration struct { // ClusterInfo TODO add description type ClusterInfo struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // TODO(phase1+) this may become simply `api.Config` CertificateAuthorities []string `json:"certificateAuthorities"` Endpoints []string `json:"endpoints"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/meta/v1/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/OWNERS new file mode 100755 index 00000000000..381a5250947 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/OWNERS @@ -0,0 +1,33 @@ +reviewers: +- thockin +- smarterclayton +- wojtek-t +- deads2k +- brendandburns +- caesarxuchao +- liggitt +- nikhiljindal +- gmarek +- erictune +- davidopp +- sttts +- quinton-hoole +- kargakis +- luxas +- janetkuo +- justinsb +- ncdc +- timothysc +- soltysh +- dims +- madhusudancs +- hongchaodeng +- krousey +- mml +- mbohlool +- david-mcmahon +- therc +- mqliang +- kevin-wangzefeng +- jianhuiz +- feihujiang diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/doc.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/doc.go similarity index 94% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/doc.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/doc.go index 720c686a907..52273240f0e 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/doc.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/doc.go @@ -18,4 +18,5 @@ limitations under the License. // +k8s:openapi-gen=true // +k8s:defaulter-gen=TypeMeta -package unversioned +// +groupName=meta.k8s.io +package v1 diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/duration.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/duration.go similarity index 98% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/duration.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/duration.go index ed54e515dae..fea458dfb3a 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/duration.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/duration.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "encoding/json" diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/generated.pb.go similarity index 91% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/generated.pb.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/generated.pb.go index 253fd661922..9cfe7bccef6 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/generated.pb.go @@ -15,14 +15,14 @@ limitations under the License. */ // Code generated by protoc-gen-gogo. -// source: k8s.io/kubernetes/pkg/api/unversioned/generated.proto +// source: k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto // DO NOT EDIT! /* - Package unversioned is a generated protocol buffer package. + Package v1 is a generated protocol buffer package. It is generated from these files: - k8s.io/kubernetes/pkg/api/unversioned/generated.proto + k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto It has these top-level messages: APIGroup @@ -50,7 +50,7 @@ limitations under the License. Timestamp TypeMeta */ -package unversioned +package v1 import proto "github.com/gogo/protobuf/proto" import fmt "fmt" @@ -176,30 +176,30 @@ func (*TypeMeta) ProtoMessage() {} func (*TypeMeta) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{23} } func init() { - proto.RegisterType((*APIGroup)(nil), "k8s.io.client-go.pkg.api.unversioned.APIGroup") - proto.RegisterType((*APIGroupList)(nil), "k8s.io.client-go.pkg.api.unversioned.APIGroupList") - proto.RegisterType((*APIResource)(nil), "k8s.io.client-go.pkg.api.unversioned.APIResource") - proto.RegisterType((*APIResourceList)(nil), "k8s.io.client-go.pkg.api.unversioned.APIResourceList") - proto.RegisterType((*APIVersions)(nil), "k8s.io.client-go.pkg.api.unversioned.APIVersions") - proto.RegisterType((*Duration)(nil), "k8s.io.client-go.pkg.api.unversioned.Duration") - proto.RegisterType((*ExportOptions)(nil), "k8s.io.client-go.pkg.api.unversioned.ExportOptions") - proto.RegisterType((*GroupKind)(nil), "k8s.io.client-go.pkg.api.unversioned.GroupKind") - proto.RegisterType((*GroupResource)(nil), "k8s.io.client-go.pkg.api.unversioned.GroupResource") - proto.RegisterType((*GroupVersion)(nil), "k8s.io.client-go.pkg.api.unversioned.GroupVersion") - proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.client-go.pkg.api.unversioned.GroupVersionForDiscovery") - proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.client-go.pkg.api.unversioned.GroupVersionKind") - proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.client-go.pkg.api.unversioned.GroupVersionResource") - proto.RegisterType((*LabelSelector)(nil), "k8s.io.client-go.pkg.api.unversioned.LabelSelector") - proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.client-go.pkg.api.unversioned.LabelSelectorRequirement") - proto.RegisterType((*ListMeta)(nil), "k8s.io.client-go.pkg.api.unversioned.ListMeta") - proto.RegisterType((*RootPaths)(nil), "k8s.io.client-go.pkg.api.unversioned.RootPaths") - proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.client-go.pkg.api.unversioned.ServerAddressByClientCIDR") - proto.RegisterType((*Status)(nil), "k8s.io.client-go.pkg.api.unversioned.Status") - proto.RegisterType((*StatusCause)(nil), "k8s.io.client-go.pkg.api.unversioned.StatusCause") - proto.RegisterType((*StatusDetails)(nil), "k8s.io.client-go.pkg.api.unversioned.StatusDetails") - proto.RegisterType((*Time)(nil), "k8s.io.client-go.pkg.api.unversioned.Time") - proto.RegisterType((*Timestamp)(nil), "k8s.io.client-go.pkg.api.unversioned.Timestamp") - proto.RegisterType((*TypeMeta)(nil), "k8s.io.client-go.pkg.api.unversioned.TypeMeta") + proto.RegisterType((*APIGroup)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIGroup") + proto.RegisterType((*APIGroupList)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIGroupList") + proto.RegisterType((*APIResource)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIResource") + proto.RegisterType((*APIResourceList)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIResourceList") + proto.RegisterType((*APIVersions)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIVersions") + proto.RegisterType((*Duration)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Duration") + proto.RegisterType((*ExportOptions)(nil), "k8s.io.client-go.pkg.apis.meta.v1.ExportOptions") + proto.RegisterType((*GroupKind)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupKind") + proto.RegisterType((*GroupResource)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupResource") + proto.RegisterType((*GroupVersion)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersion") + proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersionForDiscovery") + proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersionKind") + proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersionResource") + proto.RegisterType((*LabelSelector)(nil), "k8s.io.client-go.pkg.apis.meta.v1.LabelSelector") + proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.client-go.pkg.apis.meta.v1.LabelSelectorRequirement") + proto.RegisterType((*ListMeta)(nil), "k8s.io.client-go.pkg.apis.meta.v1.ListMeta") + proto.RegisterType((*RootPaths)(nil), "k8s.io.client-go.pkg.apis.meta.v1.RootPaths") + proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.client-go.pkg.apis.meta.v1.ServerAddressByClientCIDR") + proto.RegisterType((*Status)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Status") + proto.RegisterType((*StatusCause)(nil), "k8s.io.client-go.pkg.apis.meta.v1.StatusCause") + proto.RegisterType((*StatusDetails)(nil), "k8s.io.client-go.pkg.apis.meta.v1.StatusDetails") + proto.RegisterType((*Time)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Time") + proto.RegisterType((*Timestamp)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Timestamp") + proto.RegisterType((*TypeMeta)(nil), "k8s.io.client-go.pkg.apis.meta.v1.TypeMeta") } func (m *APIGroup) Marshal() (data []byte, err error) { size := m.Size() @@ -4446,93 +4446,93 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 1400 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6b, 0x1b, 0x47, - 0x14, 0xd7, 0x4a, 0x96, 0xb2, 0x7a, 0xb2, 0x6a, 0x67, 0xeb, 0xd0, 0x8d, 0xa1, 0x92, 0xba, 0xa1, - 0xc5, 0x81, 0x44, 0x22, 0x26, 0x2d, 0x21, 0xa5, 0x7f, 0x2c, 0xdb, 0x09, 0x26, 0x71, 0x62, 0xc6, - 0x21, 0x85, 0x24, 0x85, 0xae, 0xb5, 0x63, 0x79, 0x91, 0xb4, 0xbb, 0x9d, 0x99, 0x35, 0x11, 0x2d, - 0x34, 0x97, 0x40, 0x0f, 0xa5, 0xe4, 0xd8, 0x4b, 0x4b, 0x02, 0xf9, 0x06, 0xfd, 0x12, 0xa1, 0xa7, - 0x5c, 0x0a, 0x3d, 0x14, 0xd3, 0xb8, 0x97, 0x5e, 0x7b, 0xf5, 0xa9, 0xcc, 0xec, 0xcc, 0x6a, 0x57, - 0x8e, 0xe2, 0x75, 0x9b, 0x43, 0x4f, 0xda, 0xf7, 0xff, 0xcd, 0x7b, 0xbf, 0x79, 0x6f, 0x04, 0xef, - 0xf7, 0x2e, 0xd1, 0xa6, 0xeb, 0xb7, 0x7a, 0xe1, 0x16, 0x26, 0x1e, 0x66, 0x98, 0xb6, 0x82, 0x5e, - 0xb7, 0x65, 0x07, 0x6e, 0x2b, 0xf4, 0x76, 0x31, 0xa1, 0xae, 0xef, 0x61, 0xa7, 0xd5, 0xc5, 0x1e, - 0x26, 0x36, 0xc3, 0x4e, 0x33, 0x20, 0x3e, 0xf3, 0x8d, 0x77, 0x23, 0xb3, 0xe6, 0xc8, 0xac, 0x19, - 0xf4, 0xba, 0x4d, 0x3b, 0x70, 0x9b, 0x09, 0xb3, 0xf9, 0xf3, 0x5d, 0x97, 0xed, 0x84, 0x5b, 0xcd, - 0x8e, 0x3f, 0x68, 0x75, 0xfd, 0xae, 0xdf, 0x12, 0xd6, 0x5b, 0xe1, 0xb6, 0xa0, 0x04, 0x21, 0xbe, - 0x22, 0xaf, 0xf3, 0xe7, 0x5f, 0x9e, 0x0c, 0x09, 0x3d, 0xe6, 0x0e, 0xf0, 0x78, 0x12, 0xf3, 0x17, - 0x5f, 0xad, 0x4e, 0x3b, 0x3b, 0x78, 0x60, 0x1f, 0xb2, 0xba, 0xf0, 0x72, 0xab, 0x90, 0xb9, 0xfd, - 0x96, 0xeb, 0x31, 0xca, 0xc8, 0xb8, 0x89, 0xf5, 0x4b, 0x01, 0xf4, 0xa5, 0x8d, 0xb5, 0xab, 0xc4, - 0x0f, 0x03, 0xa3, 0x01, 0x53, 0x9e, 0x3d, 0xc0, 0xa6, 0xd6, 0xd0, 0x16, 0xca, 0xed, 0xe9, 0x67, - 0x7b, 0xf5, 0xdc, 0xfe, 0x5e, 0x7d, 0xea, 0x86, 0x3d, 0xc0, 0x48, 0x48, 0x8c, 0x01, 0xe8, 0xb2, - 0x04, 0xd4, 0xcc, 0x37, 0x0a, 0x0b, 0x95, 0xc5, 0x4f, 0x9a, 0x99, 0xea, 0xd5, 0x14, 0x11, 0x6e, - 0x47, 0xe4, 0x15, 0x9f, 0xac, 0xb8, 0xb4, 0xe3, 0xef, 0x62, 0x32, 0x6c, 0xcf, 0xca, 0x30, 0xba, - 0x14, 0x52, 0x14, 0x87, 0x30, 0x1e, 0x6a, 0x30, 0x1b, 0x10, 0xbc, 0x8d, 0x09, 0xc1, 0x8e, 0x94, - 0x9b, 0x85, 0x86, 0xf6, 0x3a, 0xe2, 0x9a, 0x32, 0xee, 0xec, 0xc6, 0x58, 0x00, 0x74, 0x28, 0xa4, - 0xf1, 0x54, 0x83, 0x79, 0x8a, 0xc9, 0x2e, 0x26, 0x4b, 0x8e, 0x43, 0x30, 0xa5, 0xed, 0xe1, 0x72, - 0xdf, 0xc5, 0x1e, 0x5b, 0x5e, 0x5b, 0x41, 0xd4, 0x9c, 0x12, 0x95, 0xf8, 0x34, 0x63, 0x46, 0x9b, - 0x93, 0x1c, 0xb5, 0x2d, 0x99, 0xd2, 0xfc, 0x44, 0x15, 0x8a, 0x5e, 0x91, 0x87, 0xd5, 0x85, 0x69, - 0xd5, 0xcb, 0xeb, 0x2e, 0x65, 0xc6, 0x67, 0x50, 0xea, 0x72, 0x82, 0x9a, 0x9a, 0xc8, 0xb0, 0x95, - 0x31, 0x43, 0xe5, 0xa4, 0xfd, 0x86, 0x4c, 0xa8, 0x24, 0x48, 0x8a, 0xa4, 0x3b, 0xeb, 0xa1, 0x06, - 0x95, 0xa5, 0x8d, 0x35, 0x84, 0xa9, 0x1f, 0x92, 0x0e, 0xce, 0x00, 0x9c, 0x45, 0x00, 0xfe, 0x4b, - 0x03, 0xbb, 0x83, 0x1d, 0x33, 0xdf, 0xd0, 0x16, 0xf4, 0xb6, 0x21, 0xf5, 0xe0, 0x46, 0x2c, 0x41, - 0x09, 0x2d, 0xee, 0xb5, 0xe7, 0x7a, 0x8e, 0x68, 0x78, 0xc2, 0xeb, 0x35, 0xd7, 0x73, 0x90, 0x90, - 0x58, 0x3f, 0x6b, 0x30, 0x93, 0xc8, 0x43, 0x1c, 0xfa, 0x12, 0x4c, 0x77, 0x13, 0x3d, 0x97, 0x39, - 0xcd, 0x49, 0xeb, 0xe9, 0x24, 0x1e, 0x50, 0x4a, 0xd3, 0xd8, 0x86, 0x32, 0x91, 0x9e, 0x14, 0xba, - 0x17, 0xb3, 0x57, 0x4c, 0x25, 0x31, 0x0a, 0x95, 0x60, 0x52, 0x34, 0x72, 0x6d, 0xfd, 0x15, 0x55, - 0x4f, 0xe1, 0xdd, 0x58, 0x48, 0x5c, 0x2a, 0xde, 0xa8, 0x72, 0x7b, 0x7a, 0xc2, 0x7d, 0x38, 0x02, - 0x87, 0xf9, 0xff, 0x07, 0x0e, 0x2f, 0xeb, 0x3f, 0x3c, 0xae, 0xe7, 0x1e, 0xfc, 0xde, 0xc8, 0x59, - 0x6b, 0xa0, 0xaf, 0x84, 0xc4, 0x66, 0xbc, 0xbc, 0x1f, 0x81, 0xee, 0xc8, 0x6f, 0xd1, 0x94, 0x42, - 0xfb, 0x1d, 0x75, 0xf5, 0x95, 0xce, 0xc1, 0x5e, 0xbd, 0xca, 0x07, 0x5c, 0x53, 0x31, 0x50, 0x6c, - 0x62, 0xdd, 0x83, 0xea, 0xea, 0xfd, 0xc0, 0x27, 0xec, 0x66, 0xc0, 0x44, 0x31, 0xde, 0x83, 0x12, - 0x16, 0x0c, 0xe1, 0x4d, 0x1f, 0x81, 0x35, 0x52, 0x43, 0x52, 0x6a, 0x9c, 0x81, 0x22, 0xbe, 0x6f, - 0x77, 0x98, 0x44, 0x5d, 0x55, 0xaa, 0x15, 0x57, 0x39, 0x13, 0x45, 0x32, 0xeb, 0x1e, 0x94, 0x05, - 0x32, 0x38, 0xb8, 0xb8, 0x85, 0x00, 0x86, 0xc4, 0x4e, 0x6c, 0x21, 0x34, 0x50, 0x24, 0x8b, 0xd1, - 0x99, 0x9f, 0x84, 0xce, 0x44, 0x19, 0xfa, 0x50, 0x8d, 0x6c, 0xd5, 0x85, 0xc9, 0x14, 0xe1, 0x1c, - 0xe8, 0x0a, 0x34, 0x32, 0x4a, 0x3c, 0x2b, 0x95, 0x23, 0x14, 0x6b, 0x24, 0xa2, 0xed, 0x40, 0x0a, - 0xe5, 0xd9, 0x82, 0x9d, 0x85, 0x13, 0x12, 0x1a, 0x32, 0xd6, 0x8c, 0x54, 0x3b, 0xa1, 0x2e, 0x8b, - 0x92, 0x27, 0x22, 0x7d, 0x03, 0xe6, 0xa4, 0xf9, 0xfa, 0x1f, 0xee, 0x61, 0xf6, 0x54, 0xac, 0xef, - 0x35, 0x98, 0x4d, 0x7a, 0xca, 0xde, 0xbe, 0xec, 0x41, 0x8e, 0x9e, 0x43, 0x89, 0x8a, 0xfc, 0xa4, - 0xc1, 0x5c, 0xea, 0x68, 0xc7, 0xea, 0xf8, 0x31, 0x92, 0x4a, 0x82, 0xa3, 0x70, 0x0c, 0x70, 0xfc, - 0x9a, 0x87, 0xea, 0x75, 0x7b, 0x0b, 0xf7, 0x37, 0x71, 0x1f, 0x77, 0x98, 0x4f, 0x8c, 0xaf, 0xa1, - 0x32, 0xb0, 0x59, 0x67, 0x47, 0x70, 0xd5, 0xaa, 0x58, 0xcd, 0x38, 0x44, 0x52, 0xae, 0x9a, 0xeb, - 0x23, 0x3f, 0xab, 0x1e, 0x23, 0xc3, 0xf6, 0x9b, 0x32, 0xa7, 0x4a, 0x42, 0x82, 0x92, 0xe1, 0xc4, - 0x8a, 0x17, 0xf4, 0xea, 0xfd, 0x80, 0x4f, 0x92, 0x7f, 0xf1, 0xb4, 0x48, 0xe5, 0x80, 0xf0, 0x97, - 0xa1, 0x4b, 0xf0, 0x00, 0x7b, 0x6c, 0xb4, 0xe2, 0xd7, 0xc7, 0x02, 0xa0, 0x43, 0x21, 0xe7, 0x3f, - 0x86, 0xd9, 0xf1, 0xec, 0x8d, 0x59, 0x28, 0xf4, 0xf0, 0x30, 0xea, 0x18, 0xe2, 0x9f, 0xc6, 0x1c, - 0x14, 0x77, 0xed, 0x7e, 0x28, 0xef, 0x23, 0x8a, 0x88, 0xcb, 0xf9, 0x4b, 0x9a, 0xf5, 0x54, 0x03, - 0x73, 0x52, 0x22, 0xc6, 0xdb, 0x09, 0x47, 0xed, 0x8a, 0xcc, 0xaa, 0x70, 0x0d, 0x0f, 0x23, 0xaf, - 0xab, 0xa0, 0xfb, 0x01, 0x7f, 0x96, 0xf9, 0x44, 0xf6, 0xfd, 0xac, 0xea, 0xe5, 0x4d, 0xc9, 0x3f, - 0xd8, 0xab, 0x9f, 0x4a, 0xb9, 0x57, 0x02, 0x14, 0x9b, 0x1a, 0x16, 0x94, 0x44, 0x3e, 0xd4, 0x2c, - 0x88, 0x2d, 0x02, 0x7c, 0x18, 0xde, 0x16, 0x1c, 0x24, 0x25, 0xd6, 0x57, 0xa0, 0xf3, 0x2d, 0xb9, - 0x8e, 0x99, 0xcd, 0x21, 0x44, 0x71, 0x7f, 0xfb, 0xba, 0xeb, 0xf5, 0x64, 0x6a, 0x31, 0x84, 0x36, - 0x25, 0x1f, 0xc5, 0x1a, 0xc6, 0x12, 0xcc, 0x28, 0x38, 0xdd, 0x4e, 0x61, 0xf4, 0x2d, 0x69, 0x34, - 0x83, 0xd2, 0x62, 0x34, 0xae, 0x6f, 0x9d, 0x83, 0x32, 0xf2, 0x7d, 0xb6, 0x61, 0xb3, 0x1d, 0x6a, - 0xd4, 0xa1, 0x18, 0xf0, 0x0f, 0xb9, 0xf2, 0xca, 0xfc, 0x32, 0x08, 0x09, 0x8a, 0xf8, 0xd6, 0x77, - 0x1a, 0x9c, 0x9e, 0xb8, 0x80, 0xf8, 0x83, 0xa2, 0x13, 0x53, 0x32, 0xfd, 0xf8, 0x41, 0x31, 0xd2, - 0x43, 0x09, 0x2d, 0xe3, 0x43, 0xa8, 0xa6, 0xb6, 0x96, 0x3c, 0xc0, 0x29, 0x69, 0x56, 0x4d, 0x45, - 0x43, 0x69, 0x5d, 0xeb, 0xef, 0x3c, 0x94, 0x36, 0x99, 0xcd, 0x42, 0x6a, 0x7c, 0x0e, 0xfa, 0x00, - 0x33, 0xdb, 0xb1, 0x99, 0x2d, 0x22, 0x67, 0x7f, 0x59, 0xa9, 0xda, 0x8f, 0x2a, 0xad, 0x38, 0x28, - 0x76, 0xc9, 0x17, 0x1b, 0x15, 0x81, 0x64, 0x7e, 0xf1, 0x62, 0x8b, 0xc2, 0x23, 0x29, 0xe5, 0xd3, - 0x62, 0x80, 0x29, 0xb5, 0xbb, 0x6a, 0x02, 0xc4, 0xd3, 0x62, 0x3d, 0x62, 0x23, 0x25, 0x37, 0x3e, - 0x80, 0x12, 0xc1, 0x36, 0xf5, 0x3d, 0x73, 0x4a, 0x68, 0xd6, 0x94, 0x4b, 0x24, 0xb8, 0x07, 0x7b, - 0xf5, 0x69, 0xe9, 0x5c, 0xd0, 0x48, 0x6a, 0x1b, 0x77, 0xe1, 0x84, 0x83, 0x99, 0xed, 0xf6, 0xa9, - 0x59, 0x14, 0x07, 0xbd, 0x98, 0xf5, 0x71, 0x21, 0xbc, 0xad, 0x44, 0xb6, 0xed, 0x0a, 0x4f, 0x4a, - 0x12, 0x48, 0x79, 0xe4, 0x73, 0xb5, 0xe3, 0x3b, 0xd8, 0x2c, 0x35, 0xb4, 0x85, 0xe2, 0x68, 0xae, - 0x2e, 0xfb, 0x0e, 0x46, 0x42, 0x62, 0x3d, 0xd2, 0xa0, 0x12, 0x79, 0x5a, 0xb6, 0x43, 0x8a, 0x8d, - 0x0b, 0xf1, 0x31, 0xa2, 0x86, 0x9f, 0x56, 0x36, 0xb7, 0x86, 0x01, 0x3e, 0xd8, 0xab, 0x97, 0x85, - 0x1a, 0x27, 0xe2, 0x13, 0x24, 0x8a, 0x94, 0x3f, 0xa2, 0x48, 0x67, 0xa0, 0xb8, 0xed, 0xe2, 0xbe, - 0x1a, 0xf4, 0xf1, 0x88, 0xbe, 0xc2, 0x99, 0x28, 0x92, 0x59, 0x3f, 0xe6, 0xa1, 0x9a, 0x3a, 0x5c, - 0x86, 0xc7, 0x6f, 0x3c, 0xfb, 0xf3, 0x19, 0xde, 0x13, 0x13, 0xb7, 0x8c, 0x71, 0x07, 0x4a, 0x1d, - 0x7e, 0x3e, 0xf5, 0x87, 0x63, 0xf1, 0x58, 0xbd, 0x10, 0xa5, 0x19, 0x61, 0x49, 0x90, 0x14, 0x49, - 0x8f, 0xc6, 0x55, 0x38, 0x49, 0x30, 0x23, 0xc3, 0xa5, 0x6d, 0x86, 0xc9, 0x26, 0xee, 0xf8, 0x9e, - 0x13, 0xb5, 0xbc, 0x18, 0x17, 0xf9, 0x24, 0x1a, 0x57, 0x40, 0x87, 0x6d, 0xac, 0x3e, 0x4c, 0xdd, - 0x72, 0x07, 0x98, 0xd7, 0x9d, 0x4a, 0x37, 0xd1, 0x63, 0x2f, 0xae, 0xbb, 0x32, 0x56, 0x72, 0x5e, - 0x1e, 0xcf, 0xf6, 0xfc, 0x08, 0xee, 0xc5, 0x51, 0x79, 0x6e, 0x70, 0x26, 0x8a, 0x64, 0x97, 0xe7, - 0xf8, 0x06, 0xfb, 0xf6, 0x49, 0x3d, 0xf7, 0xe8, 0x49, 0x3d, 0xf7, 0xf8, 0x89, 0xdc, 0x66, 0x77, - 0xa1, 0xcc, 0xa3, 0x51, 0x66, 0x0f, 0x82, 0xd7, 0x1d, 0xd2, 0xfa, 0x02, 0x74, 0x0e, 0x25, 0x31, - 0x2b, 0x55, 0x77, 0xb4, 0x89, 0xdd, 0x59, 0x04, 0xb0, 0x03, 0x37, 0x3d, 0x1a, 0xe3, 0x81, 0x34, - 0x7a, 0xee, 0xa3, 0x84, 0x56, 0xfb, 0xfc, 0xb3, 0x17, 0xb5, 0xdc, 0xf3, 0x17, 0xb5, 0xdc, 0x6f, - 0x2f, 0x6a, 0xb9, 0x07, 0xfb, 0x35, 0xed, 0xd9, 0x7e, 0x4d, 0x7b, 0xbe, 0x5f, 0xd3, 0xfe, 0xd8, - 0xaf, 0x69, 0x8f, 0xfe, 0xac, 0xe5, 0xee, 0x54, 0x12, 0x8d, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, - 0xac, 0x17, 0x87, 0x87, 0xd2, 0x10, 0x00, 0x00, + // 1406 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0xdb, 0xc6, + 0x12, 0x17, 0x25, 0x4b, 0x91, 0x46, 0xd6, 0xb3, 0xc3, 0xe7, 0xe0, 0x31, 0x06, 0x9e, 0xa4, 0xc7, + 0x3c, 0x14, 0x0e, 0x90, 0x48, 0xb0, 0x51, 0x14, 0x41, 0xda, 0x14, 0x30, 0x6d, 0x27, 0x30, 0x12, + 0x27, 0xc6, 0x3a, 0x48, 0x8b, 0x34, 0x87, 0xd2, 0xe4, 0x5a, 0x66, 0x25, 0x91, 0xec, 0xee, 0x4a, + 0x88, 0xd0, 0x43, 0x83, 0x02, 0x05, 0x7a, 0x28, 0x8a, 0x1c, 0x8b, 0x1e, 0x8a, 0x18, 0xe8, 0x07, + 0xe8, 0x57, 0xe8, 0x2d, 0xb7, 0xe6, 0xd8, 0x43, 0x61, 0x34, 0x2e, 0x7a, 0xea, 0x37, 0xf0, 0xa9, + 0xd8, 0xe5, 0x2e, 0x45, 0xca, 0x51, 0x4c, 0x23, 0x3d, 0xf4, 0x64, 0xed, 0xfc, 0xf9, 0xcd, 0x70, + 0xe6, 0xb7, 0x33, 0x6b, 0x58, 0xe9, 0x5e, 0xa3, 0x2d, 0x2f, 0x68, 0x77, 0x07, 0xbb, 0x98, 0xf8, + 0x98, 0x61, 0xda, 0x0e, 0xbb, 0x9d, 0xb6, 0x1d, 0x7a, 0xb4, 0xdd, 0xc7, 0xcc, 0x6e, 0x0f, 0x97, + 0xdb, 0x1d, 0xec, 0x63, 0x62, 0x33, 0xec, 0xb6, 0x42, 0x12, 0xb0, 0x40, 0x37, 0x23, 0x9f, 0xd6, + 0xd8, 0xa7, 0x15, 0x76, 0x3b, 0x2d, 0xee, 0xd3, 0xe2, 0x3e, 0xad, 0xe1, 0xf2, 0xe2, 0xd5, 0x8e, + 0xc7, 0xf6, 0x07, 0xbb, 0x2d, 0x27, 0xe8, 0xb7, 0x3b, 0x41, 0x27, 0x68, 0x0b, 0xd7, 0xdd, 0xc1, + 0x9e, 0x38, 0x89, 0x83, 0xf8, 0x15, 0x41, 0x2e, 0x5e, 0x7d, 0x75, 0x1a, 0x64, 0xe0, 0x33, 0xaf, + 0x8f, 0x27, 0x33, 0x58, 0x7c, 0xfb, 0xf5, 0xe6, 0xd4, 0xd9, 0xc7, 0x7d, 0xfb, 0x84, 0xd7, 0xf2, + 0xab, 0xbd, 0x06, 0xcc, 0xeb, 0xb5, 0x3d, 0x9f, 0x51, 0x46, 0x26, 0x5d, 0xcc, 0x9f, 0x0a, 0x50, + 0x5e, 0xdd, 0xde, 0xbc, 0x45, 0x82, 0x41, 0xa8, 0x37, 0x61, 0xc6, 0xb7, 0xfb, 0xd8, 0xd0, 0x9a, + 0xda, 0x52, 0xc5, 0x9a, 0x7d, 0x7e, 0xd8, 0xc8, 0x1d, 0x1d, 0x36, 0x66, 0xee, 0xda, 0x7d, 0x8c, + 0x84, 0x46, 0xff, 0x04, 0xca, 0x43, 0x4c, 0xa8, 0x17, 0xf8, 0xd4, 0xc8, 0x37, 0x0b, 0x4b, 0xd5, + 0x95, 0xf7, 0x5a, 0xa7, 0x17, 0xab, 0x25, 0xe0, 0x1f, 0x44, 0x8e, 0x37, 0x03, 0xb2, 0xee, 0x51, + 0x27, 0x18, 0x62, 0x32, 0xb2, 0xe6, 0x65, 0x8c, 0xb2, 0x54, 0x52, 0x14, 0xe3, 0xeb, 0x5f, 0x68, + 0x30, 0x1f, 0x12, 0xbc, 0x87, 0x09, 0xc1, 0xae, 0xd4, 0x1b, 0x85, 0xa6, 0xf6, 0xc6, 0x41, 0x0d, + 0x19, 0x74, 0x7e, 0x7b, 0x02, 0x1d, 0x9d, 0x88, 0xa7, 0x1f, 0x68, 0xb0, 0x48, 0x31, 0x19, 0x62, + 0xb2, 0xea, 0xba, 0x04, 0x53, 0x6a, 0x8d, 0xd6, 0x7a, 0x1e, 0xf6, 0xd9, 0xda, 0xe6, 0x3a, 0xa2, + 0xc6, 0x8c, 0xa8, 0xc1, 0x8d, 0x2c, 0xe9, 0xec, 0x4c, 0x43, 0xb1, 0x4c, 0x99, 0xcf, 0xe2, 0x54, + 0x13, 0x8a, 0x5e, 0x93, 0x84, 0xe9, 0xc2, 0xac, 0x6a, 0xe1, 0x1d, 0x8f, 0x32, 0xfd, 0x3e, 0x94, + 0x3a, 0xfc, 0x40, 0x0d, 0x4d, 0xa4, 0x77, 0x25, 0x4b, 0x7a, 0x0a, 0xc1, 0xfa, 0x97, 0xcc, 0xa6, + 0x24, 0x8e, 0x14, 0x49, 0x2c, 0xf3, 0x4b, 0x0d, 0xaa, 0xab, 0xdb, 0x9b, 0x08, 0xd3, 0x60, 0x40, + 0x1c, 0x9c, 0x81, 0x2c, 0x2b, 0x00, 0xfc, 0x2f, 0x0d, 0x6d, 0x07, 0xbb, 0x46, 0xbe, 0xa9, 0x2d, + 0x95, 0x2d, 0x5d, 0xda, 0xc1, 0xdd, 0x58, 0x83, 0x12, 0x56, 0x1c, 0xb5, 0xeb, 0xf9, 0xae, 0xe8, + 0x73, 0x02, 0xf5, 0xb6, 0xe7, 0xbb, 0x48, 0x68, 0xcc, 0x1f, 0x35, 0x98, 0x4b, 0xe4, 0x21, 0xbe, + 0xf8, 0x1a, 0xcc, 0x76, 0x12, 0xdd, 0x96, 0x39, 0x2d, 0x48, 0xef, 0xd9, 0x24, 0x13, 0x50, 0xca, + 0x52, 0x77, 0xa0, 0x42, 0x24, 0x92, 0x62, 0x74, 0x3b, 0x63, 0xb9, 0x54, 0x06, 0xe3, 0x38, 0x09, + 0x21, 0x45, 0x63, 0x5c, 0xf3, 0x8f, 0xa8, 0x74, 0x8a, 0xe3, 0xfa, 0x52, 0xe2, 0x16, 0xf1, 0x16, + 0x55, 0xac, 0xd9, 0x29, 0x77, 0xe0, 0x14, 0xfa, 0xe5, 0xff, 0x01, 0xf4, 0xbb, 0x5e, 0xfe, 0xf6, + 0x59, 0x23, 0xf7, 0xe4, 0xd7, 0x66, 0xce, 0xdc, 0x84, 0xf2, 0xfa, 0x80, 0xd8, 0x8c, 0x17, 0xf6, + 0x06, 0x94, 0x5d, 0xf9, 0x5b, 0xb4, 0xa3, 0x60, 0xfd, 0x4f, 0xdd, 0x75, 0x65, 0x73, 0x7c, 0xd8, + 0xa8, 0xf1, 0x71, 0xd6, 0x52, 0x02, 0x14, 0xbb, 0x98, 0x8f, 0xa0, 0xb6, 0xf1, 0x38, 0x0c, 0x08, + 0xbb, 0x17, 0x32, 0x51, 0x89, 0xb7, 0xa0, 0x84, 0x85, 0x40, 0xa0, 0x95, 0xc7, 0x34, 0x8d, 0xcc, + 0x90, 0xd4, 0xea, 0x97, 0xa0, 0x88, 0x1f, 0xdb, 0x0e, 0x93, 0x7c, 0xab, 0x49, 0xb3, 0xe2, 0x06, + 0x17, 0xa2, 0x48, 0x67, 0x3e, 0x82, 0x8a, 0xe0, 0x04, 0xa7, 0x15, 0xf7, 0x10, 0x94, 0x90, 0xac, + 0x89, 0x3d, 0x84, 0x05, 0x8a, 0x74, 0x31, 0x2f, 0xf3, 0xd3, 0x78, 0x99, 0x28, 0x43, 0x0f, 0x6a, + 0x91, 0xaf, 0xba, 0x2a, 0x99, 0x22, 0x5c, 0x81, 0xb2, 0x62, 0x8c, 0x8c, 0x12, 0x0f, 0x47, 0x05, + 0x84, 0x62, 0x8b, 0x44, 0xb4, 0x7d, 0x48, 0xf1, 0x3b, 0x5b, 0xb0, 0xcb, 0x70, 0x4e, 0x72, 0x4c, + 0xc6, 0x9a, 0x93, 0x66, 0xe7, 0xd4, 0x35, 0x51, 0xfa, 0x44, 0xa4, 0xcf, 0xc1, 0x98, 0x36, 0x53, + 0xdf, 0xe0, 0x06, 0x66, 0x4f, 0xc5, 0xfc, 0x46, 0x83, 0xf9, 0x24, 0x52, 0xf6, 0xf6, 0x65, 0x0f, + 0x72, 0xfa, 0x04, 0x4a, 0x54, 0xe4, 0x7b, 0x0d, 0x16, 0x52, 0x9f, 0x76, 0xa6, 0x8e, 0x9f, 0x21, + 0xa9, 0x24, 0x39, 0x0a, 0x67, 0x20, 0xc7, 0xcf, 0x79, 0xa8, 0xdd, 0xb1, 0x77, 0x71, 0x6f, 0x07, + 0xf7, 0xb0, 0xc3, 0x02, 0xa2, 0x8f, 0xa0, 0xda, 0xb7, 0x99, 0xb3, 0x2f, 0xa4, 0x6a, 0x43, 0x58, + 0x59, 0x26, 0x48, 0x0a, 0xa7, 0xb5, 0x35, 0x06, 0xd9, 0xf0, 0x19, 0x19, 0x59, 0xff, 0x96, 0x09, + 0x55, 0x13, 0x1a, 0x94, 0x8c, 0x25, 0x16, 0xba, 0x38, 0x6f, 0x3c, 0x0e, 0xf9, 0x18, 0x39, 0xeb, + 0x2b, 0x22, 0x95, 0x00, 0xc2, 0x9f, 0x0e, 0x3c, 0x82, 0xfb, 0xd8, 0x67, 0xe3, 0x85, 0xbe, 0x35, + 0x81, 0x8e, 0x4e, 0xc4, 0x5b, 0x7c, 0x1f, 0xe6, 0x27, 0x53, 0xd7, 0xe7, 0xa1, 0xd0, 0xc5, 0xa3, + 0xa8, 0x57, 0x88, 0xff, 0xd4, 0x17, 0xa0, 0x38, 0xb4, 0x7b, 0x03, 0x79, 0x13, 0x51, 0x74, 0xb8, + 0x9e, 0xbf, 0xa6, 0x99, 0x3f, 0x68, 0x60, 0x4c, 0x4b, 0x44, 0xff, 0x6f, 0x02, 0xc8, 0xaa, 0xca, + 0xac, 0x0a, 0xb7, 0xf1, 0x28, 0x42, 0xdd, 0x80, 0x72, 0x10, 0xf2, 0xe7, 0x57, 0x40, 0x64, 0xc7, + 0x2f, 0xab, 0x2e, 0xde, 0x93, 0xf2, 0xe3, 0xc3, 0xc6, 0x85, 0x14, 0xbc, 0x52, 0xa0, 0xd8, 0x55, + 0x37, 0xa1, 0x24, 0xf2, 0xa1, 0x46, 0x41, 0x2c, 0x0f, 0xe0, 0x63, 0xf0, 0x81, 0x90, 0x20, 0xa9, + 0x31, 0x3f, 0x83, 0x32, 0xdf, 0x8c, 0x5b, 0x98, 0xd9, 0x9c, 0x3c, 0x14, 0xf7, 0xf6, 0xee, 0x78, + 0x7e, 0x57, 0xa6, 0x16, 0x93, 0x67, 0x47, 0xca, 0x51, 0x6c, 0xa1, 0xaf, 0xc2, 0x9c, 0x22, 0xd2, + 0x83, 0x14, 0x3b, 0xff, 0x23, 0x9d, 0xe6, 0x50, 0x5a, 0x8d, 0x26, 0xed, 0xcd, 0x2b, 0x50, 0x41, + 0x41, 0xc0, 0xb6, 0x6d, 0xb6, 0x4f, 0xf5, 0x06, 0x14, 0x43, 0xfe, 0x43, 0x6e, 0xba, 0x0a, 0xbf, + 0x06, 0x42, 0x83, 0x22, 0xb9, 0xf9, 0xb5, 0x06, 0x17, 0xa7, 0xae, 0x1e, 0xfe, 0x88, 0x70, 0xe2, + 0x93, 0x4c, 0x3f, 0x7e, 0x44, 0x8c, 0xed, 0x50, 0xc2, 0x4a, 0x7f, 0x17, 0x6a, 0xa9, 0x7d, 0x25, + 0x3f, 0xe0, 0x82, 0x74, 0xab, 0xa5, 0xa2, 0xa1, 0xb4, 0xad, 0xf9, 0x67, 0x1e, 0x4a, 0x3b, 0xcc, + 0x66, 0x03, 0xaa, 0x3f, 0x84, 0x32, 0xe7, 0x9e, 0x6b, 0x33, 0x5b, 0x44, 0xce, 0xf8, 0x94, 0x52, + 0x85, 0x1f, 0x97, 0x59, 0x49, 0x50, 0x8c, 0xc7, 0xf7, 0x19, 0x15, 0x51, 0x64, 0x72, 0xf1, 0x3e, + 0x8b, 0x62, 0x23, 0xa9, 0xe5, 0x43, 0xa2, 0x8f, 0x29, 0xb5, 0x3b, 0xea, 0xe2, 0xc7, 0x43, 0x62, + 0x2b, 0x12, 0x23, 0xa5, 0xd7, 0xdf, 0x81, 0x12, 0xc1, 0x36, 0x0d, 0x7c, 0x63, 0x46, 0x58, 0xd6, + 0x15, 0x24, 0x12, 0xd2, 0xe3, 0xc3, 0xc6, 0xac, 0x04, 0x17, 0x67, 0x24, 0xad, 0xf5, 0x0f, 0xe1, + 0x9c, 0x8b, 0x99, 0xed, 0xf5, 0xa8, 0x51, 0x14, 0x5f, 0xb9, 0x9c, 0xe9, 0x41, 0x21, 0xa0, 0xd6, + 0x23, 0x47, 0xab, 0xca, 0x33, 0x92, 0x07, 0xa4, 0xe0, 0xf8, 0x2c, 0x75, 0x02, 0x17, 0x1b, 0xa5, + 0xa6, 0xb6, 0x54, 0x1c, 0xcf, 0xd2, 0xb5, 0xc0, 0xc5, 0x48, 0x68, 0xcc, 0xa7, 0x1a, 0x54, 0x23, + 0xa4, 0x35, 0x7b, 0x40, 0xb1, 0xbe, 0x1c, 0x7f, 0x43, 0xd4, 0xea, 0x8b, 0xca, 0xe7, 0xfe, 0x28, + 0xc4, 0xc7, 0x87, 0x8d, 0x8a, 0x30, 0xe3, 0x87, 0x38, 0xfd, 0x44, 0x85, 0xf2, 0xa7, 0x54, 0xe8, + 0x12, 0x14, 0xf7, 0x3c, 0xdc, 0x53, 0xc3, 0x3d, 0x1e, 0xcb, 0x37, 0xb9, 0x10, 0x45, 0x3a, 0xf3, + 0xbb, 0x3c, 0xd4, 0x52, 0x1f, 0x97, 0xe1, 0xa9, 0x1b, 0xcf, 0xfb, 0x7c, 0x86, 0x37, 0xc4, 0xd4, + 0xcd, 0xa2, 0x7f, 0x00, 0x25, 0x87, 0x7f, 0x9f, 0xfa, 0xc7, 0xa2, 0x9d, 0xbd, 0x11, 0xa2, 0x2e, + 0x63, 0x16, 0x89, 0x23, 0x45, 0x12, 0x4e, 0xbf, 0x05, 0xe7, 0x09, 0x66, 0x64, 0xb4, 0xba, 0xc7, + 0x30, 0xd9, 0xc1, 0x4e, 0xe0, 0xbb, 0x51, 0xb3, 0x8b, 0x71, 0x85, 0xcf, 0xa3, 0x49, 0x03, 0x74, + 0xd2, 0xc7, 0xec, 0xc1, 0xcc, 0x7d, 0xaf, 0x8f, 0x79, 0xd1, 0xa9, 0x84, 0x89, 0x5e, 0x77, 0x71, + 0xd1, 0x95, 0xb3, 0xd2, 0xf3, 0xda, 0xf8, 0xb6, 0x1f, 0x44, 0x44, 0x2f, 0x8e, 0x6b, 0x73, 0x97, + 0x0b, 0x51, 0xa4, 0xbb, 0xbe, 0xc0, 0x57, 0xd6, 0x57, 0x07, 0x8d, 0xdc, 0xd3, 0x83, 0x46, 0xee, + 0xd9, 0x81, 0x5c, 0x5f, 0x1f, 0x41, 0x85, 0x47, 0xa3, 0xcc, 0xee, 0x87, 0x7f, 0x77, 0x48, 0xf3, + 0x63, 0x28, 0x73, 0x1e, 0x89, 0x11, 0xa9, 0x5a, 0xa3, 0x4d, 0x6d, 0xcd, 0x0a, 0x80, 0x1d, 0x7a, + 0xe9, 0x89, 0x18, 0xcf, 0xa1, 0xf1, 0xe3, 0x1e, 0x25, 0xac, 0xac, 0xff, 0x3f, 0x7f, 0x59, 0xcf, + 0xbd, 0x78, 0x59, 0xcf, 0xfd, 0xf2, 0xb2, 0x9e, 0x7b, 0x72, 0x54, 0xd7, 0x9e, 0x1f, 0xd5, 0xb5, + 0x17, 0x47, 0x75, 0xed, 0xb7, 0xa3, 0xba, 0xf6, 0xf4, 0xf7, 0x7a, 0xee, 0x61, 0x7e, 0xb8, 0xfc, + 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x82, 0xf3, 0x8f, 0xb8, 0xa2, 0x10, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/generated.proto similarity index 99% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/generated.proto rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/generated.proto index a10e2ddb0a3..191c6ef5d4a 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/generated.proto @@ -19,14 +19,14 @@ limitations under the License. syntax = 'proto2'; -package k8s.io.kubernetes.pkg.api.unversioned; +package k8s.io.kubernetes.pkg.apis.meta.v1; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "unversioned"; +option go_package = "v1"; // APIGroup contains the name, the supported versions, and the preferred version // of a group. @@ -109,10 +109,10 @@ message Duration { // ExportOptions is the query options to the standard REST get call. message ExportOptions { - // Should this value be exported. Export strips fields that a user can not specify.` + // Should this value be exported. Export strips fields that a user can not specify. optional bool export = 1; - // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace' + // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'. optional bool exact = 2; } diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/group_version.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/group_version.go similarity index 99% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/group_version.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/group_version.go index dd3355644a3..7342ede6f20 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/group_version.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/group_version.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "encoding/json" diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/helpers.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/helpers.go similarity index 99% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/helpers.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/helpers.go index 8ef9b038c7e..cf861aebfa9 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/helpers.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/helpers.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "fmt" diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/meta.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/meta.go similarity index 99% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/meta.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/meta.go index 224bf6cfccf..c4aa7e5b563 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/meta.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/meta.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "k8s.io/client-go/pkg/runtime/schema" diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/register.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/register.go similarity index 91% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/register.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/register.go index 88ff41b1456..10c51822304 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/register.go @@ -14,12 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "k8s.io/client-go/pkg/runtime/schema" ) +// GroupName is the group name for this API. +const GroupName = "meta.k8s.io" + // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: "", Version: ""} diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/time.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/time.go similarity index 99% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/time.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/time.go index d490f3bb9a4..2794cab9322 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/time.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/time.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "encoding/json" diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/time_proto.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/time_proto.go similarity index 99% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/time_proto.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/time_proto.go index ba25e9164f5..aea28e410ba 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/time_proto.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/time_proto.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 import ( "time" diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/types.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/types.go similarity index 99% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/types.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/types.go index 6178f199b84..31c7a8b93b0 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/types.go @@ -23,7 +23,7 @@ limitations under the License. // (e.g. LabelSelector). // In the future, we will probably move these categories of objects into // separate packages. -package unversioned +package v1 import "strings" @@ -69,9 +69,9 @@ type ListMeta struct { // ExportOptions is the query options to the standard REST get call. type ExportOptions struct { TypeMeta `json:",inline"` - // Should this value be exported. Export strips fields that a user can not specify.` + // Should this value be exported. Export strips fields that a user can not specify. Export bool `json:"export" protobuf:"varint,1,opt,name=export"` - // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace' + // Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'. Exact bool `json:"exact" protobuf:"varint,2,opt,name=exact"` } diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/types_swagger_doc_generated.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/types_swagger_doc_generated.go similarity index 99% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/types_swagger_doc_generated.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/types_swagger_doc_generated.go index 3f08115a6cf..c943611d1e8 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/types_swagger_doc_generated.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 // 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 @@ -81,8 +81,8 @@ func (APIVersions) SwaggerDoc() map[string]string { var map_ExportOptions = map[string]string{ "": "ExportOptions is the query options to the standard REST get call.", - "export": "Should this value be exported. Export strips fields that a user can not specify.`", - "exact": "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'", + "export": "Should this value be exported. Export strips fields that a user can not specify.", + "exact": "Should the export be exact. Exact export maintains cluster-specific fields like 'Namespace'.", } func (ExportOptions) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/client-go/pkg/api/unversioned/well_known_labels.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/well_known_labels.go similarity index 99% rename from staging/src/k8s.io/client-go/pkg/api/unversioned/well_known_labels.go rename to staging/src/k8s.io/client-go/pkg/apis/meta/v1/well_known_labels.go index 7556181e88b..fb0ccad7075 100644 --- a/staging/src/k8s.io/client-go/pkg/api/unversioned/well_known_labels.go +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/well_known_labels.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package unversioned +package v1 const ( // If you add a new topology domain here, also consider adding it to the set of default values diff --git a/staging/src/k8s.io/client-go/pkg/apis/meta/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..113164fb061 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/meta/v1/zz_generated.deepcopy.go @@ -0,0 +1,390 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1 + +import ( + conversion "k8s.io/client-go/pkg/conversion" + time "time" +) + +func DeepCopy_v1_APIGroup(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*APIGroup) + out := out.(*APIGroup) + out.TypeMeta = in.TypeMeta + out.Name = in.Name + if in.Versions != nil { + in, out := &in.Versions, &out.Versions + *out = make([]GroupVersionForDiscovery, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Versions = nil + } + out.PreferredVersion = in.PreferredVersion + if in.ServerAddressByClientCIDRs != nil { + in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs + *out = make([]ServerAddressByClientCIDR, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.ServerAddressByClientCIDRs = nil + } + return nil + } +} + +func DeepCopy_v1_APIGroupList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*APIGroupList) + out := out.(*APIGroupList) + out.TypeMeta = in.TypeMeta + if in.Groups != nil { + in, out := &in.Groups, &out.Groups + *out = make([]APIGroup, len(*in)) + for i := range *in { + if err := DeepCopy_v1_APIGroup(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Groups = nil + } + return nil + } +} + +func DeepCopy_v1_APIResource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*APIResource) + out := out.(*APIResource) + out.Name = in.Name + out.Namespaced = in.Namespaced + out.Kind = in.Kind + return nil + } +} + +func DeepCopy_v1_APIResourceList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*APIResourceList) + out := out.(*APIResourceList) + out.TypeMeta = in.TypeMeta + out.GroupVersion = in.GroupVersion + if in.APIResources != nil { + in, out := &in.APIResources, &out.APIResources + *out = make([]APIResource, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.APIResources = nil + } + return nil + } +} + +func DeepCopy_v1_APIVersions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*APIVersions) + out := out.(*APIVersions) + out.TypeMeta = in.TypeMeta + if in.Versions != nil { + in, out := &in.Versions, &out.Versions + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Versions = nil + } + if in.ServerAddressByClientCIDRs != nil { + in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs + *out = make([]ServerAddressByClientCIDR, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.ServerAddressByClientCIDRs = nil + } + return nil + } +} + +func DeepCopy_v1_Duration(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Duration) + out := out.(*Duration) + out.Duration = in.Duration + return nil + } +} + +func DeepCopy_v1_ExportOptions(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ExportOptions) + out := out.(*ExportOptions) + out.TypeMeta = in.TypeMeta + out.Export = in.Export + out.Exact = in.Exact + return nil + } +} + +func DeepCopy_v1_GroupKind(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GroupKind) + out := out.(*GroupKind) + out.Group = in.Group + out.Kind = in.Kind + return nil + } +} + +func DeepCopy_v1_GroupResource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GroupResource) + out := out.(*GroupResource) + out.Group = in.Group + out.Resource = in.Resource + return nil + } +} + +func DeepCopy_v1_GroupVersion(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GroupVersion) + out := out.(*GroupVersion) + out.Group = in.Group + out.Version = in.Version + return nil + } +} + +func DeepCopy_v1_GroupVersionForDiscovery(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GroupVersionForDiscovery) + out := out.(*GroupVersionForDiscovery) + out.GroupVersion = in.GroupVersion + out.Version = in.Version + return nil + } +} + +func DeepCopy_v1_GroupVersionKind(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GroupVersionKind) + out := out.(*GroupVersionKind) + out.Group = in.Group + out.Version = in.Version + out.Kind = in.Kind + return nil + } +} + +func DeepCopy_v1_GroupVersionResource(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*GroupVersionResource) + out := out.(*GroupVersionResource) + out.Group = in.Group + out.Version = in.Version + out.Resource = in.Resource + return nil + } +} + +func DeepCopy_v1_LabelSelector(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LabelSelector) + out := out.(*LabelSelector) + if in.MatchLabels != nil { + in, out := &in.MatchLabels, &out.MatchLabels + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.MatchLabels = nil + } + if in.MatchExpressions != nil { + in, out := &in.MatchExpressions, &out.MatchExpressions + *out = make([]LabelSelectorRequirement, len(*in)) + for i := range *in { + if err := DeepCopy_v1_LabelSelectorRequirement(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.MatchExpressions = nil + } + return nil + } +} + +func DeepCopy_v1_LabelSelectorRequirement(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*LabelSelectorRequirement) + out := out.(*LabelSelectorRequirement) + out.Key = in.Key + out.Operator = in.Operator + if in.Values != nil { + in, out := &in.Values, &out.Values + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Values = nil + } + return nil + } +} + +func DeepCopy_v1_ListMeta(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ListMeta) + out := out.(*ListMeta) + out.SelfLink = in.SelfLink + out.ResourceVersion = in.ResourceVersion + return nil + } +} + +func DeepCopy_v1_Patch(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Patch) + out := out.(*Patch) + _ = in + _ = out + return nil + } +} + +func DeepCopy_v1_RootPaths(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RootPaths) + out := out.(*RootPaths) + if in.Paths != nil { + in, out := &in.Paths, &out.Paths + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Paths = nil + } + return nil + } +} + +func DeepCopy_v1_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServerAddressByClientCIDR) + out := out.(*ServerAddressByClientCIDR) + out.ClientCIDR = in.ClientCIDR + out.ServerAddress = in.ServerAddress + return nil + } +} + +func DeepCopy_v1_Status(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Status) + out := out.(*Status) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + out.Status = in.Status + out.Message = in.Message + out.Reason = in.Reason + if in.Details != nil { + in, out := &in.Details, &out.Details + *out = new(StatusDetails) + if err := DeepCopy_v1_StatusDetails(*in, *out, c); err != nil { + return err + } + } else { + out.Details = nil + } + out.Code = in.Code + return nil + } +} + +func DeepCopy_v1_StatusCause(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatusCause) + out := out.(*StatusCause) + out.Type = in.Type + out.Message = in.Message + out.Field = in.Field + return nil + } +} + +func DeepCopy_v1_StatusDetails(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StatusDetails) + out := out.(*StatusDetails) + out.Name = in.Name + out.Group = in.Group + out.Kind = in.Kind + if in.Causes != nil { + in, out := &in.Causes, &out.Causes + *out = make([]StatusCause, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Causes = nil + } + out.RetryAfterSeconds = in.RetryAfterSeconds + return nil + } +} + +func DeepCopy_v1_Time(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Time) + out := out.(*Time) + if newVal, err := c.DeepCopy(&in.Time); err != nil { + return err + } else { + out.Time = *newVal.(*time.Time) + } + return nil + } +} + +func DeepCopy_v1_Timestamp(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Timestamp) + out := out.(*Timestamp) + out.Seconds = in.Seconds + out.Nanos = in.Nanos + return nil + } +} + +func DeepCopy_v1_TypeMeta(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TypeMeta) + out := out.(*TypeMeta) + out.Kind = in.Kind + out.APIVersion = in.APIVersion + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/policy/OWNERS new file mode 100755 index 00000000000..8d0eea51636 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/OWNERS @@ -0,0 +1,14 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- deads2k +- caesarxuchao +- sttts +- ncdc +- timothysc +- dims +- mml +- mbohlool +- david-mcmahon +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/policy/types.generated.go index fd1a669b705..2d92acb0c7b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg3_api "k8s.io/client-go/pkg/api" - pkg2_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg2_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg4_types "k8s.io/client-go/pkg/types" pkg1_intstr "k8s.io/client-go/pkg/util/intstr" "reflect" @@ -65,7 +65,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg3_api.ObjectMeta - var v1 pkg2_unversioned.LabelSelector + var v1 pkg2_v1.LabelSelector var v2 pkg4_types.UID var v3 pkg1_intstr.IntOrString var v4 time.Time @@ -256,7 +256,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym17 := z.DecBinary() _ = yym17 @@ -322,7 +322,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym22 := z.DecBinary() _ = yym22 @@ -413,7 +413,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym29 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } else { @@ -427,7 +427,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym30 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } @@ -583,7 +583,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromMap(l int, d *codec1978.D _ = yym48 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv47), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv47), d) } } case "disruptionsAllowed": @@ -659,7 +659,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromArray(l int, d *codec1978 _ = yym56 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv55), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv55), d) } } yyj53++ @@ -1299,7 +1299,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv113 := &x.ListMeta yym114 := z.DecBinary() @@ -1380,7 +1380,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv120 := &x.ListMeta yym121 := z.DecBinary() @@ -1744,7 +1744,7 @@ func (x *Eviction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversioned.Time, e *codec1978.Encoder) { +func (x codecSelfer1234) encMapstringv1_Time(v map[string]pkg2_v1.Time, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -1774,7 +1774,7 @@ func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversio z.EncSendContainerState(codecSelfer_containerMapEnd1234) } -func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversioned.Time, d *codec1978.Decoder) { +func (x codecSelfer1234) decMapstringv1_Time(v *map[string]pkg2_v1.Time, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -1784,11 +1784,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi yybh152 := z.DecBasicHandle() if yyv152 == nil { yyrl152, _ := z.DecInferLen(yyl152, yybh152.MaxInitLen, 40) - yyv152 = make(map[string]pkg2_unversioned.Time, yyrl152) + yyv152 = make(map[string]pkg2_v1.Time, yyrl152) *v = yyv152 } var yymk152 string - var yymv152 pkg2_unversioned.Time + var yymv152 pkg2_v1.Time var yymg152 bool if yybh152.MapValueReset { yymg152 = true @@ -1805,11 +1805,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv154 := &yymv152 yym155 := z.DecBinary() @@ -1841,11 +1841,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv157 := &yymv152 yym158 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/types.go b/staging/src/k8s.io/client-go/pkg/apis/policy/types.go index 1b753f0f430..674718f1efa 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/types.go @@ -18,7 +18,7 @@ package policy import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/util/intstr" ) @@ -34,7 +34,7 @@ type PodDisruptionBudgetSpec struct { // Label query over pods whose evictions are managed by the disruption // budget. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty"` + Selector *metav1.LabelSelector `json:"selector,omitempty"` } // PodDisruptionBudgetStatus represents information about the status of a @@ -56,7 +56,7 @@ type PodDisruptionBudgetStatus struct { // the list automatically by PodDisruptionBudget controller after some time. // If everything goes smooth this map should be empty for the most of the time. // Large number of entries in the map may indicate problems with pod deletions. - DisruptedPods map[string]unversioned.Time `json:"disruptedPods" protobuf:"bytes,5,rep,name=disruptedPods"` + DisruptedPods map[string]metav1.Time `json:"disruptedPods" protobuf:"bytes,5,rep,name=disruptedPods"` // Number of pod disruptions that are currently allowed. PodDisruptionsAllowed int32 `json:"disruptionsAllowed"` @@ -75,7 +75,7 @@ type PodDisruptionBudgetStatus struct { // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods type PodDisruptionBudget struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -89,10 +89,10 @@ type PodDisruptionBudget struct { // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. type PodDisruptionBudgetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty"` - Items []PodDisruptionBudget `json:"items"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []PodDisruptionBudget `json:"items"` } // +genclient=true @@ -102,7 +102,7 @@ type PodDisruptionBudgetList struct { // This is a subresource of Pod. A request to cause such an eviction is // created by POSTing to .../pods//eviction. type Eviction struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // ObjectMeta describes the pod that is being evicted. // +optional diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/register.go index 156e0715f3f..dc219521445 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/register.go @@ -18,6 +18,7 @@ package v1alpha1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -29,6 +30,11 @@ const GroupName = "policy" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) AddToScheme = SchemeBuilder.AddToScheme @@ -42,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Eviction{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, ) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/types.go index 3affb1bd466..5c3bcaec6a5 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/util/intstr" ) @@ -34,7 +34,7 @@ type PodDisruptionBudgetSpec struct { // Label query over pods whose evictions are managed by the disruption // budget. // +optional - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` } // PodDisruptionBudgetStatus represents information about the status of a @@ -57,7 +57,7 @@ type PodDisruptionBudgetStatus struct { // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods type PodDisruptionBudget struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -71,17 +71,17 @@ type PodDisruptionBudget struct { // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. type PodDisruptionBudgetList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` - Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` } // Eviction evicts a pod from its node subject to certain policies and safety constraints. // This is a subresource of Pod. A request to cause such an eviction is // created by POSTing to .../pods//eviction. type Eviction struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // ObjectMeta describes the pod that is being evicted. // +optional diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go index 43f5f4db081..38ffeeba72d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go @@ -37,8 +37,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_unversioned "k8s.io/client-go/pkg/api/unversioned" import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_apis_meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" import strings "strings" import reflect "reflect" @@ -429,7 +429,7 @@ func (this *PodDisruptionBudgetList) String() string { return "nil" } s := strings.Join([]string{`&PodDisruptionBudgetList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "PodDisruptionBudget", "PodDisruptionBudget", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -441,7 +441,7 @@ func (this *PodDisruptionBudgetSpec) String() string { } s := strings.Join([]string{`&PodDisruptionBudgetSpec{`, `MinAvailable:` + strings.Replace(strings.Replace(this.MinAvailable.String(), "IntOrString", "k8s_io_kubernetes_pkg_util_intstr.IntOrString", 1), `&`, ``, 1) + `,`, - `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_api_unversioned.LabelSelector", 1) + `,`, + `Selector:` + strings.Replace(fmt.Sprintf("%v", this.Selector), "LabelSelector", "k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector", 1) + `,`, `}`, }, "") return s @@ -455,7 +455,7 @@ func (this *PodDisruptionBudgetStatus) String() string { keysForDisruptedPods = append(keysForDisruptedPods, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForDisruptedPods) - mapStringForDisruptedPods := "map[string]k8s_io_kubernetes_pkg_api_unversioned.Time{" + mapStringForDisruptedPods := "map[string]k8s_io_kubernetes_pkg_apis_meta_v1.Time{" for _, k := range keysForDisruptedPods { mapStringForDisruptedPods += fmt.Sprintf("%v: %v,", k, this.DisruptedPods[k]) } @@ -929,7 +929,7 @@ func (m *PodDisruptionBudgetSpec) Unmarshal(data []byte) error { return io.ErrUnexpectedEOF } if m.Selector == nil { - m.Selector = &k8s_io_kubernetes_pkg_api_unversioned.LabelSelector{} + m.Selector = &k8s_io_kubernetes_pkg_apis_meta_v1.LabelSelector{} } if err := m.Selector.Unmarshal(data[iNdEx:postIndex]); err != nil { return err @@ -1110,13 +1110,13 @@ func (m *PodDisruptionBudgetStatus) Unmarshal(data []byte) error { if postmsgIndex > l { return io.ErrUnexpectedEOF } - mapvalue := &k8s_io_kubernetes_pkg_api_unversioned.Time{} + mapvalue := &k8s_io_kubernetes_pkg_apis_meta_v1.Time{} if err := mapvalue.Unmarshal(data[iNdEx:postmsgIndex]); err != nil { return err } iNdEx = postmsgIndex if m.DisruptedPods == nil { - m.DisruptedPods = make(map[string]k8s_io_kubernetes_pkg_api_unversioned.Time) + m.DisruptedPods = make(map[string]k8s_io_kubernetes_pkg_apis_meta_v1.Time) } m.DisruptedPods[mapkey] = *mapvalue iNdEx = postIndex @@ -1323,53 +1323,53 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 764 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0x4d, 0x6f, 0xf3, 0x44, - 0x10, 0xc7, 0xe3, 0x26, 0x29, 0x61, 0x9b, 0x54, 0x65, 0xa1, 0x10, 0x22, 0xe1, 0xa2, 0x9c, 0x5a, - 0x41, 0xd7, 0x4a, 0x55, 0xa4, 0xc2, 0xa1, 0x52, 0x4d, 0x2a, 0x28, 0xa2, 0x4a, 0xe5, 0x22, 0x81, - 0x90, 0x40, 0xf2, 0xcb, 0xe0, 0x2c, 0xb1, 0xbd, 0xd6, 0xee, 0xda, 0x90, 0x1b, 0x1f, 0x81, 0x03, - 0xdf, 0x88, 0x4b, 0xc5, 0xa9, 0x47, 0x2e, 0x54, 0x34, 0xfd, 0x0e, 0x9c, 0x91, 0xed, 0x4d, 0x1a, - 0xe7, 0xa5, 0xaa, 0xd4, 0xe7, 0xb9, 0x79, 0x77, 0xe7, 0xf7, 0xff, 0xcf, 0xcc, 0xce, 0x1a, 0x7d, - 0x3a, 0x3a, 0x11, 0x84, 0x32, 0x63, 0x94, 0x38, 0xc0, 0x23, 0x90, 0x20, 0x8c, 0x78, 0xe4, 0x1b, - 0x76, 0x4c, 0x85, 0x11, 0xb3, 0x80, 0xba, 0x63, 0x23, 0xed, 0x39, 0x20, 0xed, 0x9e, 0xe1, 0x43, - 0x04, 0xdc, 0x96, 0xe0, 0x91, 0x98, 0x33, 0xc9, 0xf0, 0x41, 0x81, 0x92, 0x47, 0x94, 0xc4, 0x23, - 0x9f, 0x64, 0x28, 0x29, 0x50, 0xa2, 0xd0, 0xce, 0xa1, 0x4f, 0xe5, 0x30, 0x71, 0x88, 0xcb, 0x42, - 0xc3, 0x67, 0x3e, 0x33, 0x72, 0x05, 0x27, 0xf9, 0x29, 0x5f, 0xe5, 0x8b, 0xfc, 0xab, 0x50, 0xee, - 0x1c, 0xad, 0x4d, 0xca, 0xe0, 0x20, 0x58, 0xc2, 0x5d, 0x58, 0xcc, 0xa6, 0xf3, 0xc9, 0x7a, 0x26, - 0x89, 0x52, 0xe0, 0x82, 0xb2, 0x08, 0xbc, 0x25, 0xec, 0xe3, 0xf5, 0x58, 0xba, 0x54, 0x72, 0xe7, - 0x70, 0x75, 0x34, 0x4f, 0x22, 0x49, 0xc3, 0xe5, 0x9c, 0x8e, 0x9f, 0x0e, 0x17, 0xee, 0x10, 0x42, - 0x7b, 0x89, 0xea, 0xad, 0xa6, 0x12, 0x49, 0x03, 0x83, 0x46, 0x52, 0x48, 0xbe, 0x88, 0x74, 0xff, - 0xd2, 0x50, 0xe3, 0x3c, 0xa5, 0xae, 0xa4, 0x2c, 0xc2, 0xdf, 0xa1, 0x46, 0x08, 0xd2, 0xf6, 0x6c, - 0x69, 0xb7, 0xb5, 0x0f, 0xb5, 0xfd, 0xad, 0xa3, 0x7d, 0xb2, 0xf6, 0xaa, 0x48, 0xda, 0x23, 0x03, - 0xe7, 0x67, 0x70, 0xe5, 0x25, 0x48, 0xdb, 0xc4, 0x37, 0x77, 0x7b, 0x95, 0xc9, 0xdd, 0x1e, 0x7a, - 0xdc, 0xb3, 0x66, 0x6a, 0xd8, 0x43, 0x2d, 0x0f, 0x02, 0x90, 0x30, 0x88, 0x33, 0x27, 0xd1, 0xde, - 0xc8, 0xe5, 0x3f, 0x7a, 0x5a, 0xbe, 0x3f, 0x8f, 0x98, 0x6f, 0x4d, 0xee, 0xf6, 0x5a, 0xa5, 0x2d, - 0xab, 0x2c, 0xda, 0xfd, 0x73, 0x03, 0xbd, 0x7d, 0xc5, 0xbc, 0x3e, 0x15, 0x3c, 0xc9, 0xb7, 0xcc, - 0xc4, 0xf3, 0x41, 0xbe, 0xd6, 0xba, 0x6a, 0x22, 0x06, 0x57, 0x95, 0x63, 0x92, 0x67, 0x0f, 0x36, - 0x59, 0x91, 0xe7, 0x75, 0x0c, 0xae, 0xd9, 0x54, 0x7e, 0xb5, 0x6c, 0x65, 0xe5, 0xea, 0x38, 0x40, - 0x9b, 0x42, 0xda, 0x32, 0x11, 0xed, 0x6a, 0xee, 0xd3, 0x7f, 0xa1, 0x4f, 0xae, 0x65, 0x6e, 0x2b, - 0xa7, 0xcd, 0x62, 0x6d, 0x29, 0x8f, 0xee, 0x3f, 0x1a, 0x7a, 0x6f, 0x05, 0xf5, 0x35, 0x15, 0x12, - 0xff, 0xb0, 0xd4, 0x49, 0xe3, 0x89, 0x4e, 0xce, 0x3d, 0x1f, 0x92, 0xe1, 0x79, 0x43, 0x77, 0x94, - 0x6d, 0x63, 0xba, 0x33, 0xd7, 0x4e, 0x17, 0xd5, 0xa9, 0x84, 0x30, 0x1b, 0x8f, 0xea, 0xfe, 0xd6, - 0xd1, 0xe9, 0xcb, 0xea, 0x34, 0x5b, 0xca, 0xaa, 0x7e, 0x91, 0x89, 0x5a, 0x85, 0x76, 0xf7, 0x61, - 0x75, 0x7d, 0x59, 0xbf, 0xf1, 0x10, 0x35, 0x43, 0x1a, 0x9d, 0xa5, 0x36, 0x0d, 0x6c, 0x27, 0x00, - 0x55, 0x23, 0x59, 0x93, 0x47, 0xf6, 0xb0, 0x48, 0xf1, 0xb0, 0xc8, 0x45, 0x24, 0x07, 0xfc, 0x5a, - 0x72, 0x1a, 0xf9, 0xe6, 0x3b, 0xca, 0xb7, 0x79, 0x39, 0xa7, 0x65, 0x95, 0x94, 0xf1, 0x8f, 0xa8, - 0x21, 0x20, 0x00, 0x57, 0x32, 0xae, 0xa6, 0xe7, 0xf8, 0xb9, 0x9d, 0xb4, 0x1d, 0x08, 0xae, 0x15, - 0x6b, 0x36, 0xb3, 0x56, 0x4e, 0x57, 0xd6, 0x4c, 0xb3, 0xfb, 0x5f, 0x0d, 0xbd, 0xbf, 0xf6, 0xee, - 0xf1, 0x57, 0x08, 0x33, 0x47, 0x00, 0x4f, 0xc1, 0xfb, 0xa2, 0xf8, 0x23, 0x50, 0x16, 0xe5, 0xd5, - 0x56, 0xcd, 0x8e, 0xca, 0x1e, 0x0f, 0x96, 0x22, 0xac, 0x15, 0x14, 0xfe, 0x43, 0x43, 0x2d, 0xaf, - 0xb0, 0x01, 0xef, 0x8a, 0x79, 0xd3, 0xdb, 0xfb, 0xf6, 0x55, 0x4c, 0x29, 0xe9, 0xcf, 0x2b, 0x9f, - 0x47, 0x92, 0x8f, 0xcd, 0x5d, 0x95, 0x60, 0xab, 0x74, 0x66, 0x95, 0x93, 0xc0, 0x97, 0x08, 0x7b, - 0x33, 0x49, 0x71, 0x16, 0x04, 0xec, 0x17, 0xf0, 0xf2, 0x07, 0x54, 0x37, 0x3f, 0x50, 0x0a, 0xbb, - 0x25, 0xdf, 0x69, 0x90, 0xb5, 0x02, 0xc4, 0xa7, 0x68, 0xdb, 0x4d, 0x38, 0x87, 0x48, 0x7e, 0x09, - 0x76, 0x20, 0x87, 0xe3, 0x76, 0x2d, 0x97, 0x7a, 0x57, 0x49, 0x6d, 0x7f, 0x5e, 0x3a, 0xb5, 0x16, - 0xa2, 0x33, 0xde, 0x03, 0x41, 0x39, 0x78, 0x53, 0xbe, 0x5e, 0xe6, 0xfb, 0xa5, 0x53, 0x6b, 0x21, - 0x1a, 0x9f, 0xa0, 0x26, 0xfc, 0x1a, 0x83, 0x3b, 0xed, 0xf1, 0x66, 0x4e, 0xcf, 0x26, 0xed, 0x7c, - 0xee, 0xcc, 0x2a, 0x45, 0x76, 0x42, 0x84, 0x97, 0x9b, 0x88, 0x77, 0x50, 0x75, 0x04, 0xe3, 0xfc, - 0xca, 0xdf, 0xb4, 0xb2, 0x4f, 0x7c, 0x86, 0xea, 0xa9, 0x1d, 0x24, 0xf0, 0x8c, 0x7f, 0xf3, 0xfc, - 0x38, 0x7e, 0x43, 0x43, 0xb0, 0x0a, 0xf2, 0xb3, 0x8d, 0x13, 0xcd, 0x3c, 0xb8, 0xb9, 0xd7, 0x2b, - 0xb7, 0xf7, 0x7a, 0xe5, 0xef, 0x7b, 0xbd, 0xf2, 0xdb, 0x44, 0xd7, 0x6e, 0x26, 0xba, 0x76, 0x3b, - 0xd1, 0xb5, 0x7f, 0x27, 0xba, 0xf6, 0xfb, 0x83, 0x5e, 0xf9, 0xfe, 0x0d, 0x75, 0xeb, 0xff, 0x07, - 0x00, 0x00, 0xff, 0xff, 0x5e, 0x98, 0x33, 0x48, 0x43, 0x08, 0x00, 0x00, + // 762 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xdb, 0x46, + 0x10, 0xc6, 0x45, 0x4b, 0x72, 0xd5, 0xb5, 0x64, 0xb8, 0xdb, 0xba, 0x55, 0x05, 0x94, 0x2e, 0x74, + 0x92, 0x51, 0x7b, 0x09, 0x19, 0x3d, 0xb8, 0x3d, 0x18, 0x30, 0x2b, 0xa3, 0x75, 0x51, 0x43, 0x06, + 0x5d, 0xa0, 0x85, 0x7b, 0xe2, 0x9f, 0x29, 0xb5, 0x16, 0x45, 0x12, 0xbb, 0x4b, 0x25, 0xba, 0xe5, + 0x11, 0x72, 0xc8, 0x1b, 0xe5, 0x62, 0xe4, 0xe4, 0x63, 0x90, 0x83, 0x61, 0x2b, 0x8f, 0x90, 0x17, + 0x08, 0x48, 0xae, 0x64, 0x51, 0xa2, 0x04, 0x03, 0x4e, 0x6e, 0xdc, 0xdd, 0xf9, 0x7d, 0xdf, 0xcc, + 0xec, 0x2c, 0xd1, 0x2f, 0xfd, 0x43, 0x4e, 0x68, 0xa0, 0xf5, 0x23, 0x0b, 0x98, 0x0f, 0x02, 0xb8, + 0x16, 0xf6, 0x5d, 0xcd, 0x0c, 0x29, 0xd7, 0xc2, 0xc0, 0xa3, 0xf6, 0x48, 0x1b, 0xb6, 0x2d, 0x10, + 0x66, 0x5b, 0x73, 0xc1, 0x07, 0x66, 0x0a, 0x70, 0x48, 0xc8, 0x02, 0x11, 0xe0, 0xdd, 0x14, 0x25, + 0x0f, 0x28, 0x09, 0xfb, 0x2e, 0x89, 0x51, 0x92, 0xa2, 0x44, 0xa2, 0x8d, 0x7d, 0x97, 0x8a, 0x5e, + 0x64, 0x11, 0x3b, 0x18, 0x68, 0x6e, 0xe0, 0x06, 0x5a, 0xa2, 0x60, 0x45, 0xff, 0x27, 0xab, 0x64, + 0x91, 0x7c, 0xa5, 0xca, 0x8d, 0x83, 0xa5, 0x49, 0x69, 0x0c, 0x78, 0x10, 0x31, 0x1b, 0xe6, 0xb3, + 0x69, 0xec, 0x2d, 0x67, 0x86, 0x0b, 0xb9, 0xaf, 0x70, 0xe0, 0xda, 0x00, 0x84, 0x99, 0xc7, 0xec, + 0xe7, 0x33, 0x2c, 0xf2, 0x05, 0x1d, 0x2c, 0x26, 0xf4, 0xf3, 0xea, 0x70, 0x6e, 0xf7, 0x60, 0x60, + 0x2e, 0x50, 0xed, 0x7c, 0x2a, 0x12, 0xd4, 0xd3, 0xa8, 0x2f, 0xb8, 0x60, 0xf3, 0x48, 0xf3, 0x8d, + 0x82, 0x2a, 0x27, 0x43, 0x6a, 0x0b, 0x1a, 0xf8, 0xf8, 0x5f, 0x54, 0x89, 0xf3, 0x77, 0x4c, 0x61, + 0xd6, 0x95, 0x1f, 0x95, 0xd6, 0xc6, 0x41, 0x8b, 0x2c, 0xbd, 0x27, 0x32, 0x6c, 0x93, 0xae, 0x75, + 0x05, 0xb6, 0x38, 0x03, 0x61, 0xea, 0xf8, 0xfa, 0x76, 0xa7, 0x30, 0xbe, 0xdd, 0x41, 0x0f, 0x7b, + 0xc6, 0x54, 0x0d, 0x3b, 0xa8, 0xe6, 0x80, 0x07, 0x02, 0xba, 0x61, 0xec, 0xc4, 0xeb, 0x6b, 0x89, + 0xfc, 0x4f, 0xab, 0xe5, 0x3b, 0xb3, 0x88, 0xfe, 0xd5, 0xf8, 0x76, 0xa7, 0x96, 0xd9, 0x32, 0xb2, + 0xa2, 0xcd, 0xd7, 0x6b, 0xe8, 0xeb, 0xf3, 0xc0, 0xe9, 0x50, 0xce, 0xa2, 0x64, 0x4b, 0x8f, 0x1c, + 0x17, 0xc4, 0x67, 0xad, 0xab, 0xc4, 0x43, 0xb0, 0x65, 0x39, 0x3a, 0x79, 0xf4, 0x54, 0x93, 0x9c, + 0x3c, 0x2f, 0x42, 0xb0, 0xf5, 0xaa, 0xf4, 0x2b, 0xc5, 0x2b, 0x23, 0x51, 0xc7, 0x1e, 0x5a, 0xe7, + 0xc2, 0x14, 0x11, 0xaf, 0x17, 0x13, 0x9f, 0xce, 0x13, 0x7d, 0x12, 0x2d, 0x7d, 0x53, 0x3a, 0xad, + 0xa7, 0x6b, 0x43, 0x7a, 0x34, 0xdf, 0x29, 0xe8, 0xbb, 0x1c, 0xea, 0x2f, 0xca, 0x05, 0xbe, 0x5c, + 0xe8, 0xe4, 0xde, 0xaa, 0x5c, 0xe2, 0xd8, 0xb8, 0x9f, 0x31, 0x9b, 0x74, 0x73, 0x4b, 0x7a, 0x56, + 0x26, 0x3b, 0x33, 0xbd, 0xb4, 0x51, 0x99, 0x0a, 0x18, 0xc4, 0xb3, 0x51, 0x6c, 0x6d, 0x1c, 0x1c, + 0x3d, 0xad, 0x48, 0xbd, 0x26, 0xad, 0xca, 0xa7, 0xb1, 0xa8, 0x91, 0x6a, 0x37, 0xef, 0xf2, 0x8b, + 0x8b, 0x9b, 0x8d, 0x7b, 0xa8, 0x3a, 0xa0, 0xfe, 0xf1, 0xd0, 0xa4, 0x9e, 0x69, 0x79, 0x20, 0x0b, + 0x24, 0x4b, 0xf2, 0x88, 0x5f, 0x15, 0x49, 0x5f, 0x15, 0x39, 0xf5, 0x45, 0x97, 0x5d, 0x08, 0x46, + 0x7d, 0x57, 0xff, 0x46, 0xfa, 0x56, 0xcf, 0x66, 0xb4, 0x8c, 0x8c, 0x32, 0xfe, 0x0f, 0x55, 0x38, + 0x78, 0x60, 0x8b, 0x80, 0xc9, 0xd1, 0x69, 0x3f, 0xaa, 0x8d, 0xa6, 0x05, 0xde, 0x85, 0x04, 0xf5, + 0x6a, 0xdc, 0xc7, 0xc9, 0xca, 0x98, 0x0a, 0x36, 0x3f, 0x94, 0xd0, 0xf7, 0x4b, 0x6f, 0x1d, 0xff, + 0x89, 0x70, 0x60, 0x71, 0x60, 0x43, 0x70, 0x7e, 0x4f, 0xff, 0x05, 0x34, 0xf0, 0x93, 0x52, 0x8b, + 0x7a, 0x43, 0xa6, 0x8e, 0xbb, 0x0b, 0x11, 0x46, 0x0e, 0x85, 0x5f, 0x29, 0xa8, 0xe6, 0xa4, 0x36, + 0xe0, 0x9c, 0x07, 0xce, 0xe4, 0xea, 0xfe, 0xf9, 0x14, 0xf3, 0x49, 0x3a, 0xb3, 0xca, 0x27, 0xbe, + 0x60, 0x23, 0x7d, 0x5b, 0x26, 0x58, 0xcb, 0x9c, 0x19, 0xd9, 0x24, 0xf0, 0x19, 0xc2, 0xce, 0x54, + 0x92, 0x1f, 0x7b, 0x5e, 0xf0, 0x0c, 0x9c, 0xe4, 0xe9, 0x94, 0xf5, 0x1f, 0xa4, 0xc2, 0x76, 0xc6, + 0x77, 0x12, 0x64, 0xe4, 0x80, 0xf8, 0x08, 0x6d, 0xda, 0x11, 0x63, 0xe0, 0x8b, 0x3f, 0xc0, 0xf4, + 0x44, 0x6f, 0x54, 0x2f, 0x25, 0x52, 0xdf, 0x4a, 0xa9, 0xcd, 0xdf, 0x32, 0xa7, 0xc6, 0x5c, 0x74, + 0xcc, 0x3b, 0xc0, 0x29, 0x03, 0x67, 0xc2, 0x97, 0xb3, 0x7c, 0x27, 0x73, 0x6a, 0xcc, 0x45, 0xe3, + 0x43, 0x54, 0x85, 0xe7, 0x21, 0xd8, 0x93, 0x1e, 0xaf, 0x27, 0xf4, 0x74, 0xcc, 0x4e, 0x66, 0xce, + 0x8c, 0x4c, 0x64, 0xe3, 0x0a, 0xe1, 0xc5, 0x26, 0xe2, 0x2d, 0x54, 0xec, 0xc3, 0x28, 0xb9, 0xf2, + 0x2f, 0x8d, 0xf8, 0x13, 0x1f, 0xa1, 0xf2, 0xd0, 0xf4, 0x22, 0x90, 0xb3, 0xd8, 0x7a, 0xcc, 0x2c, + 0xfe, 0x4d, 0x07, 0x60, 0xa4, 0xd8, 0xaf, 0x6b, 0x87, 0x8a, 0xbe, 0x7b, 0x7d, 0xaf, 0x16, 0x6e, + 0xee, 0xd5, 0xc2, 0xdb, 0x7b, 0xb5, 0xf0, 0x62, 0xac, 0x2a, 0xd7, 0x63, 0x55, 0xb9, 0x19, 0xab, + 0xca, 0xdd, 0x58, 0x55, 0x5e, 0xbe, 0x57, 0x0b, 0x97, 0x5f, 0xc8, 0x2b, 0xff, 0x18, 0x00, 0x00, + 0xff, 0xff, 0xfa, 0x95, 0xd6, 0xdd, 0x37, 0x08, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto index 560850ea4cc..c274ee4f776 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.policy.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -55,7 +55,7 @@ message PodDisruptionBudget { // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. message PodDisruptionBudgetList { - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; repeated PodDisruptionBudget items = 2; } @@ -70,7 +70,7 @@ message PodDisruptionBudgetSpec { // Label query over pods whose evictions are managed by the disruption // budget. - optional k8s.io.kubernetes.pkg.api.unversioned.LabelSelector selector = 2; + optional k8s.io.kubernetes.pkg.apis.meta.v1.LabelSelector selector = 2; } // PodDisruptionBudgetStatus represents information about the status of a @@ -92,7 +92,7 @@ message PodDisruptionBudgetStatus { // the list automatically by PodDisruptionBudget controller after some time. // If everything goes smooth this map should be empty for the most of the time. // Large number of entries in the map may indicate problems with pod deletions. - map disruptedPods = 2; + map disruptedPods = 2; // Number of pod disruptions that are currently allowed. optional int32 disruptionsAllowed = 3; diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/register.go index 0544ef418ec..86dea355f3e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/register.go @@ -18,6 +18,7 @@ package v1beta1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -29,6 +30,11 @@ const GroupName = "policy" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) AddToScheme = SchemeBuilder.AddToScheme @@ -42,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Eviction{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, ) // Add the watch version that applies versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.generated.go index 387b3f5784b..864668fbd24 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg3_v1 "k8s.io/client-go/pkg/api/v1" + pkg2_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg4_types "k8s.io/client-go/pkg/types" pkg1_intstr "k8s.io/client-go/pkg/util/intstr" "reflect" @@ -64,8 +64,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_unversioned.LabelSelector - var v1 pkg3_v1.ObjectMeta + var v0 pkg3_v1.ObjectMeta + var v1 pkg2_v1.LabelSelector var v2 pkg4_types.UID var v3 pkg1_intstr.IntOrString var v4 time.Time @@ -256,7 +256,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromMap(l int, d *codec1978.Dec } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym17 := z.DecBinary() _ = yym17 @@ -322,7 +322,7 @@ func (x *PodDisruptionBudgetSpec) codecDecodeSelfFromArray(l int, d *codec1978.D } } else { if x.Selector == nil { - x.Selector = new(pkg2_unversioned.LabelSelector) + x.Selector = new(pkg2_v1.LabelSelector) } yym22 := z.DecBinary() _ = yym22 @@ -413,7 +413,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym29 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } else { @@ -427,7 +427,7 @@ func (x *PodDisruptionBudgetStatus) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym30 if false { } else { - h.encMapstringunversioned_Time((map[string]pkg2_unversioned.Time)(x.DisruptedPods), e) + h.encMapstringv1_Time((map[string]pkg2_v1.Time)(x.DisruptedPods), e) } } } @@ -583,7 +583,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromMap(l int, d *codec1978.D _ = yym48 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv47), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv47), d) } } case "disruptionsAllowed": @@ -659,7 +659,7 @@ func (x *PodDisruptionBudgetStatus) codecDecodeSelfFromArray(l int, d *codec1978 _ = yym56 if false { } else { - h.decMapstringunversioned_Time((*map[string]pkg2_unversioned.Time)(yyv55), d) + h.decMapstringv1_Time((*map[string]pkg2_v1.Time)(yyv55), d) } } yyj53++ @@ -1299,7 +1299,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromMap(l int, d *codec1978.Dec } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv113 := &x.ListMeta yym114 := z.DecBinary() @@ -1380,7 +1380,7 @@ func (x *PodDisruptionBudgetList) codecDecodeSelfFromArray(l int, d *codec1978.D } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv120 := &x.ListMeta yym121 := z.DecBinary() @@ -1744,7 +1744,7 @@ func (x *Eviction) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { z.DecSendContainerState(codecSelfer_containerArrayEnd1234) } -func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversioned.Time, e *codec1978.Encoder) { +func (x codecSelfer1234) encMapstringv1_Time(v map[string]pkg2_v1.Time, e *codec1978.Encoder) { var h codecSelfer1234 z, r := codec1978.GenHelperEncoder(e) _, _, _ = h, z, r @@ -1774,7 +1774,7 @@ func (x codecSelfer1234) encMapstringunversioned_Time(v map[string]pkg2_unversio z.EncSendContainerState(codecSelfer_containerMapEnd1234) } -func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversioned.Time, d *codec1978.Decoder) { +func (x codecSelfer1234) decMapstringv1_Time(v *map[string]pkg2_v1.Time, d *codec1978.Decoder) { var h codecSelfer1234 z, r := codec1978.GenHelperDecoder(d) _, _, _ = h, z, r @@ -1784,11 +1784,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi yybh152 := z.DecBasicHandle() if yyv152 == nil { yyrl152, _ := z.DecInferLen(yyl152, yybh152.MaxInitLen, 40) - yyv152 = make(map[string]pkg2_unversioned.Time, yyrl152) + yyv152 = make(map[string]pkg2_v1.Time, yyrl152) *v = yyv152 } var yymk152 string - var yymv152 pkg2_unversioned.Time + var yymv152 pkg2_v1.Time var yymg152 bool if yybh152.MapValueReset { yymg152 = true @@ -1805,11 +1805,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv154 := &yymv152 yym155 := z.DecBinary() @@ -1841,11 +1841,11 @@ func (x codecSelfer1234) decMapstringunversioned_Time(v *map[string]pkg2_unversi if yymg152 { yymv152 = yyv152[yymk152] } else { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } z.DecSendContainerState(codecSelfer_containerMapValue1234) if r.TryDecodeAsNil() { - yymv152 = pkg2_unversioned.Time{} + yymv152 = pkg2_v1.Time{} } else { yyv157 := &yymv152 yym158 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.go index cc892d965a8..28ac89cd849 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/util/intstr" ) @@ -32,7 +32,7 @@ type PodDisruptionBudgetSpec struct { // Label query over pods whose evictions are managed by the disruption // budget. - Selector *unversioned.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` + Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,2,opt,name=selector"` } // PodDisruptionBudgetStatus represents information about the status of a @@ -54,7 +54,7 @@ type PodDisruptionBudgetStatus struct { // the list automatically by PodDisruptionBudget controller after some time. // If everything goes smooth this map should be empty for the most of the time. // Large number of entries in the map may indicate problems with pod deletions. - DisruptedPods map[string]unversioned.Time `json:"disruptedPods" protobuf:"bytes,2,rep,name=disruptedPods"` + DisruptedPods map[string]metav1.Time `json:"disruptedPods" protobuf:"bytes,2,rep,name=disruptedPods"` // Number of pod disruptions that are currently allowed. PodDisruptionsAllowed int32 `json:"disruptionsAllowed" protobuf:"varint,3,opt,name=disruptionsAllowed"` @@ -73,8 +73,8 @@ type PodDisruptionBudgetStatus struct { // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods type PodDisruptionBudget struct { - unversioned.TypeMeta `json:",inline"` - v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.TypeMeta `json:",inline"` + v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Specification of the desired behavior of the PodDisruptionBudget. Spec PodDisruptionBudgetSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` @@ -84,16 +84,16 @@ type PodDisruptionBudget struct { // PodDisruptionBudgetList is a collection of PodDisruptionBudgets. type PodDisruptionBudgetList struct { - unversioned.TypeMeta `json:",inline"` - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` - Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` } // Eviction evicts a pod from its node subject to certain policies and safety constraints. // This is a subresource of Pod. A request to cause such an eviction is // created by POSTing to .../pods//evictions. type Eviction struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // ObjectMeta describes the pod that is being evicted. v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go index 1cb8af3b740..15a3b4a7132 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go @@ -22,8 +22,8 @@ package v1beta1 import ( api "k8s.io/client-go/pkg/api" - unversioned "k8s.io/client-go/pkg/api/unversioned" v1 "k8s.io/client-go/pkg/api/v1" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" policy "k8s.io/client-go/pkg/apis/policy" conversion "k8s.io/client-go/pkg/conversion" runtime "k8s.io/client-go/pkg/runtime" @@ -135,7 +135,7 @@ func Convert_policy_PodDisruptionBudgetList_To_v1beta1_PodDisruptionBudgetList(i func autoConvert_v1beta1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(in *PodDisruptionBudgetSpec, out *policy.PodDisruptionBudgetSpec, s conversion.Scope) error { out.MinAvailable = in.MinAvailable - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) return nil } @@ -145,7 +145,7 @@ func Convert_v1beta1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(i func autoConvert_policy_PodDisruptionBudgetSpec_To_v1beta1_PodDisruptionBudgetSpec(in *policy.PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, s conversion.Scope) error { out.MinAvailable = in.MinAvailable - out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector)) + out.Selector = (*meta_v1.LabelSelector)(unsafe.Pointer(in.Selector)) return nil } @@ -155,7 +155,7 @@ func Convert_policy_PodDisruptionBudgetSpec_To_v1beta1_PodDisruptionBudgetSpec(i func autoConvert_v1beta1_PodDisruptionBudgetStatus_To_policy_PodDisruptionBudgetStatus(in *PodDisruptionBudgetStatus, out *policy.PodDisruptionBudgetStatus, s conversion.Scope) error { out.ObservedGeneration = in.ObservedGeneration - out.DisruptedPods = *(*map[string]unversioned.Time)(unsafe.Pointer(&in.DisruptedPods)) + out.DisruptedPods = *(*map[string]meta_v1.Time)(unsafe.Pointer(&in.DisruptedPods)) out.PodDisruptionsAllowed = in.PodDisruptionsAllowed out.CurrentHealthy = in.CurrentHealthy out.DesiredHealthy = in.DesiredHealthy @@ -169,7 +169,7 @@ func Convert_v1beta1_PodDisruptionBudgetStatus_To_policy_PodDisruptionBudgetStat func autoConvert_policy_PodDisruptionBudgetStatus_To_v1beta1_PodDisruptionBudgetStatus(in *policy.PodDisruptionBudgetStatus, out *PodDisruptionBudgetStatus, s conversion.Scope) error { out.ObservedGeneration = in.ObservedGeneration - out.DisruptedPods = *(*map[string]unversioned.Time)(unsafe.Pointer(&in.DisruptedPods)) + out.DisruptedPods = *(*map[string]meta_v1.Time)(unsafe.Pointer(&in.DisruptedPods)) out.PodDisruptionsAllowed = in.PodDisruptionsAllowed out.CurrentHealthy = in.CurrentHealthy out.DesiredHealthy = in.DesiredHealthy diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..34fbc04333a --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.deepcopy.go @@ -0,0 +1,145 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1beta1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + meta_v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Eviction, InType: reflect.TypeOf(&Eviction{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodDisruptionBudget, InType: reflect.TypeOf(&PodDisruptionBudget{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodDisruptionBudgetList, InType: reflect.TypeOf(&PodDisruptionBudgetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodDisruptionBudgetSpec, InType: reflect.TypeOf(&PodDisruptionBudgetSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_PodDisruptionBudgetStatus, InType: reflect.TypeOf(&PodDisruptionBudgetStatus{})}, + ) +} + +func DeepCopy_v1beta1_Eviction(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Eviction) + out := out.(*Eviction) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.DeleteOptions != nil { + in, out := &in.DeleteOptions, &out.DeleteOptions + *out = new(v1.DeleteOptions) + if err := v1.DeepCopy_v1_DeleteOptions(*in, *out, c); err != nil { + return err + } + } else { + out.DeleteOptions = nil + } + return nil + } +} + +func DeepCopy_v1beta1_PodDisruptionBudget(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodDisruptionBudget) + out := out.(*PodDisruptionBudget) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_PodDisruptionBudgetSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_PodDisruptionBudgetStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_PodDisruptionBudgetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodDisruptionBudgetList) + out := out.(*PodDisruptionBudgetList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PodDisruptionBudget, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_PodDisruptionBudget(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodDisruptionBudgetSpec) + out := out.(*PodDisruptionBudgetSpec) + out.MinAvailable = in.MinAvailable + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(meta_v1.LabelSelector) + if err := meta_v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + return nil + } +} + +func DeepCopy_v1beta1_PodDisruptionBudgetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodDisruptionBudgetStatus) + out := out.(*PodDisruptionBudgetStatus) + out.ObservedGeneration = in.ObservedGeneration + if in.DisruptedPods != nil { + in, out := &in.DisruptedPods, &out.DisruptedPods + *out = make(map[string]meta_v1.Time) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.DisruptedPods = nil + } + out.PodDisruptionsAllowed = in.PodDisruptionsAllowed + out.CurrentHealthy = in.CurrentHealthy + out.DesiredHealthy = in.DesiredHealthy + out.ExpectedPods = in.ExpectedPods + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go new file mode 100644 index 00000000000..309c544dd2f --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/zz_generated.deepcopy.go @@ -0,0 +1,145 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package policy + +import ( + api "k8s.io/client-go/pkg/api" + v1 "k8s.io/client-go/pkg/apis/meta/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_Eviction, InType: reflect.TypeOf(&Eviction{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudget, InType: reflect.TypeOf(&PodDisruptionBudget{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudgetList, InType: reflect.TypeOf(&PodDisruptionBudgetList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudgetSpec, InType: reflect.TypeOf(&PodDisruptionBudgetSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_policy_PodDisruptionBudgetStatus, InType: reflect.TypeOf(&PodDisruptionBudgetStatus{})}, + ) +} + +func DeepCopy_policy_Eviction(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Eviction) + out := out.(*Eviction) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.DeleteOptions != nil { + in, out := &in.DeleteOptions, &out.DeleteOptions + *out = new(api.DeleteOptions) + if err := api.DeepCopy_api_DeleteOptions(*in, *out, c); err != nil { + return err + } + } else { + out.DeleteOptions = nil + } + return nil + } +} + +func DeepCopy_policy_PodDisruptionBudget(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodDisruptionBudget) + out := out.(*PodDisruptionBudget) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_policy_PodDisruptionBudgetSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_policy_PodDisruptionBudgetStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_policy_PodDisruptionBudgetList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodDisruptionBudgetList) + out := out.(*PodDisruptionBudgetList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]PodDisruptionBudget, len(*in)) + for i := range *in { + if err := DeepCopy_policy_PodDisruptionBudget(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_policy_PodDisruptionBudgetSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodDisruptionBudgetSpec) + out := out.(*PodDisruptionBudgetSpec) + out.MinAvailable = in.MinAvailable + if in.Selector != nil { + in, out := &in.Selector, &out.Selector + *out = new(v1.LabelSelector) + if err := v1.DeepCopy_v1_LabelSelector(*in, *out, c); err != nil { + return err + } + } else { + out.Selector = nil + } + return nil + } +} + +func DeepCopy_policy_PodDisruptionBudgetStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PodDisruptionBudgetStatus) + out := out.(*PodDisruptionBudgetStatus) + out.ObservedGeneration = in.ObservedGeneration + if in.DisruptedPods != nil { + in, out := &in.DisruptedPods, &out.DisruptedPods + *out = make(map[string]v1.Time) + for key, val := range *in { + (*out)[key] = val.DeepCopy() + } + } else { + out.DisruptedPods = nil + } + out.PodDisruptionsAllowed = in.PodDisruptionsAllowed + out.CurrentHealthy = in.CurrentHealthy + out.DesiredHealthy = in.DesiredHealthy + out.ExpectedPods = in.ExpectedPods + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/rbac/OWNERS new file mode 100755 index 00000000000..dec71dbf51b --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/OWNERS @@ -0,0 +1,16 @@ +reviewers: +- thockin +- lavalamp +- smarterclayton +- deads2k +- sttts +- ncdc +- timothysc +- dims +- krousey +- mml +- mbohlool +- david-mcmahon +- ericchiang +- lixiaobing10051267 +- jianhuiz diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/helpers.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/helpers.go index 2f91caaa13f..202dc4111f7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/helpers.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/helpers.go @@ -97,6 +97,32 @@ func NonResourceURLMatches(rule PolicyRule, requestedURL string) bool { return false } +// subjectsStrings returns users, groups, serviceaccounts, unknown for display purposes. +func SubjectsStrings(subjects []Subject) ([]string, []string, []string, []string) { + users := []string{} + groups := []string{} + sas := []string{} + others := []string{} + + for _, subject := range subjects { + switch subject.Kind { + case ServiceAccountKind: + sas = append(sas, fmt.Sprintf("%s/%s", subject.Namespace, subject.Name)) + + case UserKind: + users = append(users, subject.Name) + + case GroupKind: + groups = append(groups, subject.Name) + + default: + others = append(others, fmt.Sprintf("%s/%s/%s", subject.Kind, subject.Namespace, subject.Name)) + } + } + + return users, groups, sas, others +} + // +k8s:deepcopy-gen=false // PolicyRuleBuilder let's us attach methods. A no-no for API types. // We use it to construct rules in code. It's more compact than trying to write them diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/register.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/register.go index 9ea3c9aea49..9c5c6dd7c83 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/register.go @@ -18,6 +18,7 @@ package rbac import ( "k8s.io/client-go/pkg/api" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/watch/versioned" @@ -58,7 +59,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &api.ListOptions{}, &api.DeleteOptions{}, - &api.ExportOptions{}, + &metav1.ExportOptions{}, ) versioned.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/types.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/types.go index 0d8ec843fd1..5043b33f047 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/types.go @@ -18,7 +18,7 @@ package rbac import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" ) @@ -94,7 +94,7 @@ type RoleRef struct { // Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding. type Role struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. api.ObjectMeta @@ -108,7 +108,7 @@ type Role struct { // It adds who information via Subjects and namespace information by which namespace it exists in. RoleBindings in a given // namespace only have effect in that namespace. type RoleBinding struct { - unversioned.TypeMeta + metav1.TypeMeta api.ObjectMeta // Subjects holds references to the objects the role applies to. @@ -121,9 +121,9 @@ type RoleBinding struct { // RoleBindingList is a collection of RoleBindings type RoleBindingList struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. - unversioned.ListMeta + metav1.ListMeta // Items is a list of roleBindings Items []RoleBinding @@ -131,9 +131,9 @@ type RoleBindingList struct { // RoleList is a collection of Roles type RoleList struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. - unversioned.ListMeta + metav1.ListMeta // Items is a list of roles Items []Role @@ -144,7 +144,7 @@ type RoleList struct { // ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding. type ClusterRole struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. api.ObjectMeta @@ -158,7 +158,7 @@ type ClusterRole struct { // ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, // and adds who information via Subject. type ClusterRoleBinding struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. api.ObjectMeta @@ -172,9 +172,9 @@ type ClusterRoleBinding struct { // ClusterRoleBindingList is a collection of ClusterRoleBindings type ClusterRoleBindingList struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. - unversioned.ListMeta + metav1.ListMeta // Items is a list of ClusterRoleBindings Items []ClusterRoleBinding @@ -182,9 +182,9 @@ type ClusterRoleBindingList struct { // ClusterRoleList is a collection of ClusterRoles type ClusterRoleList struct { - unversioned.TypeMeta + metav1.TypeMeta // Standard object's metadata. - unversioned.ListMeta + metav1.ListMeta // Items is a list of ClusterRoles Items []ClusterRole diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.pb.go index 439a319f981..9dfe7503766 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.pb.go @@ -939,7 +939,7 @@ func (this *ClusterRoleBindingList) String() string { return "nil" } s := strings.Join([]string{`&ClusterRoleBindingList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRoleBinding", "ClusterRoleBinding", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -950,7 +950,7 @@ func (this *ClusterRoleList) String() string { return "nil" } s := strings.Join([]string{`&ClusterRoleList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "ClusterRole", "ClusterRole", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1009,7 +1009,7 @@ func (this *RoleBindingList) String() string { return "nil" } s := strings.Join([]string{`&RoleBindingList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "RoleBinding", "RoleBinding", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1020,7 +1020,7 @@ func (this *RoleList) String() string { return "nil" } s := strings.Join([]string{`&RoleList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Role", "Role", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -2801,61 +2801,60 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 886 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x55, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0xc4, 0x36, 0xb1, 0x5f, 0x88, 0x42, 0x06, 0x15, 0x2d, 0x96, 0xb0, 0x23, 0x9f, 0x2c, - 0xda, 0xee, 0xca, 0x51, 0x2b, 0x7a, 0x80, 0x43, 0x16, 0x21, 0x14, 0x51, 0x42, 0x34, 0x15, 0x15, - 0x54, 0x20, 0x34, 0x5e, 0x4f, 0x9d, 0xc1, 0xeb, 0xdd, 0xd5, 0xcc, 0xac, 0x01, 0x21, 0xa4, 0x8a, - 0x13, 0x47, 0xfe, 0x8a, 0xde, 0xb8, 0x70, 0x45, 0xe2, 0xc0, 0x29, 0x07, 0x0e, 0x3d, 0x22, 0x0e, - 0x16, 0x31, 0xff, 0x08, 0xda, 0xdd, 0xd9, 0x1f, 0xc9, 0xae, 0x5b, 0x37, 0x88, 0x48, 0x48, 0x3d, - 0xd9, 0xfb, 0xde, 0xf7, 0x7d, 0xf3, 0xbe, 0x79, 0x33, 0x6f, 0xe0, 0xce, 0xf4, 0x8e, 0x34, 0xb9, - 0x6f, 0x4d, 0xc3, 0x11, 0x13, 0x1e, 0x53, 0x4c, 0x5a, 0xc1, 0x74, 0x62, 0xd1, 0x80, 0x4b, 0x4b, - 0x8c, 0xa8, 0x63, 0xcd, 0x87, 0xd4, 0x0d, 0x4e, 0xe8, 0xd0, 0x9a, 0x30, 0x8f, 0x09, 0xaa, 0xd8, - 0xd8, 0x0c, 0x84, 0xaf, 0x7c, 0x3c, 0x48, 0x98, 0x66, 0xce, 0x34, 0x83, 0xe9, 0xc4, 0x8c, 0x98, - 0x66, 0xc4, 0x34, 0x53, 0x66, 0xe7, 0xe6, 0x84, 0xab, 0x93, 0x70, 0x64, 0x3a, 0xfe, 0xcc, 0x9a, - 0xf8, 0x13, 0xdf, 0x8a, 0x05, 0x46, 0xe1, 0xc3, 0xf8, 0x2b, 0xfe, 0x88, 0xff, 0x25, 0xc2, 0x9d, - 0xfd, 0x95, 0x25, 0x59, 0x82, 0x49, 0x3f, 0x14, 0x0e, 0xbb, 0x58, 0x4c, 0xe7, 0xf6, 0x6a, 0x4e, - 0xe8, 0xcd, 0x99, 0x90, 0xdc, 0xf7, 0xd8, 0xb8, 0x44, 0xbb, 0xb1, 0x9a, 0x36, 0x2f, 0x39, 0xee, - 0xdc, 0xac, 0x46, 0x8b, 0xd0, 0x53, 0x7c, 0x56, 0xae, 0xe9, 0xd6, 0xd3, 0xe1, 0xd2, 0x39, 0x61, - 0x33, 0x5a, 0x62, 0x0d, 0xab, 0x59, 0xa1, 0xe2, 0xae, 0xc5, 0x3d, 0x25, 0x95, 0xb8, 0x48, 0xe9, - 0xff, 0x86, 0x60, 0xeb, 0x5d, 0x37, 0x94, 0x8a, 0x09, 0xe2, 0xbb, 0x0c, 0x7f, 0x02, 0xad, 0x19, - 0x53, 0x74, 0x4c, 0x15, 0x35, 0xd0, 0x1e, 0x1a, 0x6c, 0xed, 0x0f, 0xcc, 0x95, 0xcd, 0x32, 0xe7, - 0x43, 0xf3, 0xa3, 0xd1, 0x97, 0xcc, 0x51, 0x1f, 0x32, 0x45, 0x6d, 0x7c, 0xba, 0xe8, 0xd5, 0x96, - 0x8b, 0x1e, 0xe4, 0x31, 0x92, 0xa9, 0xe1, 0x4f, 0xa1, 0x29, 0x42, 0x97, 0x49, 0x63, 0x63, 0xaf, - 0x3e, 0xd8, 0xda, 0xbf, 0x65, 0xae, 0x7b, 0x06, 0xcc, 0x63, 0xdf, 0xe5, 0xce, 0x37, 0x24, 0x74, - 0x99, 0xbd, 0xad, 0x97, 0x68, 0x46, 0x5f, 0x92, 0x24, 0x8a, 0xfd, 0x9f, 0x36, 0x00, 0x17, 0x4c, - 0xd8, 0xdc, 0x1b, 0x73, 0x6f, 0xf2, 0x1f, 0x7a, 0xf9, 0x02, 0x5a, 0x32, 0x8c, 0x13, 0xa9, 0x9d, - 0xe1, 0xfa, 0x76, 0xee, 0x25, 0x4c, 0xfb, 0x15, 0xbd, 0x44, 0x4b, 0x07, 0x24, 0xc9, 0x44, 0xf1, - 0x67, 0xb0, 0x29, 0x7c, 0x97, 0x11, 0xf6, 0xd0, 0xa8, 0xc7, 0x95, 0x3f, 0x87, 0x3e, 0x49, 0x88, - 0xf6, 0x8e, 0xd6, 0xdf, 0xd4, 0x01, 0x92, 0x4a, 0xf6, 0x1f, 0x23, 0x78, 0xbd, 0xbc, 0x5f, 0x76, - 0xc8, 0xdd, 0x31, 0x13, 0xf8, 0x07, 0x04, 0xd8, 0x29, 0x65, 0xf5, 0x0e, 0xbe, 0xbd, 0x7e, 0x1d, - 0x15, 0x2b, 0x74, 0x74, 0x49, 0x15, 0xdd, 0x22, 0x15, 0x6b, 0xf6, 0xff, 0x44, 0xf0, 0x5a, 0x19, - 0x7a, 0x97, 0x4b, 0x85, 0x3f, 0x2f, 0x35, 0xd7, 0x7a, 0x4a, 0x73, 0x0b, 0x17, 0xd9, 0x8c, 0xe8, - 0x71, 0x8f, 0xb3, 0x06, 0xa4, 0x91, 0x42, 0x87, 0x29, 0x34, 0xb9, 0x62, 0xb3, 0xb4, 0xbd, 0xff, - 0xce, 0x76, 0x76, 0x6a, 0x0f, 0x23, 0x49, 0x92, 0x28, 0xf7, 0x7f, 0x47, 0xb0, 0x53, 0x00, 0x5f, - 0x85, 0xab, 0x07, 0xe7, 0x5d, 0xdd, 0xbe, 0x9c, 0xab, 0x6a, 0x3b, 0xdf, 0xd7, 0x01, 0xf2, 0x9b, - 0x8a, 0x7b, 0xd0, 0x9c, 0x33, 0x31, 0x92, 0x06, 0xda, 0xab, 0x0f, 0xda, 0x76, 0x3b, 0xc2, 0xdf, - 0x8f, 0x02, 0x24, 0x89, 0xe3, 0x47, 0x08, 0xae, 0x51, 0xa5, 0x04, 0x1f, 0x85, 0x8a, 0x11, 0x26, - 0x95, 0xe0, 0x8e, 0xe2, 0xbe, 0x17, 0x15, 0x17, 0x19, 0xbf, 0xbe, 0xa2, 0x38, 0x3d, 0x03, 0x4d, - 0x42, 0xbf, 0x7a, 0xef, 0x6b, 0xc5, 0xbc, 0xc8, 0xbf, 0xfd, 0x86, 0x2e, 0xe9, 0xda, 0x41, 0x95, - 0x22, 0xa9, 0x5e, 0x08, 0x5f, 0x87, 0x36, 0x0d, 0xf8, 0xfb, 0xc2, 0x0f, 0x03, 0x69, 0xd4, 0xe3, - 0x3a, 0xb7, 0x97, 0x8b, 0x5e, 0xfb, 0xe0, 0xf8, 0x30, 0x09, 0x92, 0x3c, 0x1f, 0x81, 0xd3, 0x27, - 0x44, 0x1a, 0x8d, 0x1c, 0x4c, 0xd2, 0x20, 0xc9, 0xf3, 0xf8, 0x2d, 0xd8, 0x4e, 0x3f, 0x8e, 0xe8, - 0x8c, 0x49, 0xa3, 0x19, 0x13, 0x76, 0x97, 0x8b, 0xde, 0x36, 0x29, 0x26, 0xc8, 0x79, 0x1c, 0x7e, - 0x07, 0x76, 0x3c, 0xdf, 0x4b, 0x21, 0x1f, 0x93, 0xbb, 0xd2, 0x78, 0x29, 0xa6, 0xbe, 0xba, 0x5c, - 0xf4, 0x76, 0x8e, 0xce, 0xa7, 0xc8, 0x45, 0x6c, 0xff, 0x3b, 0xd8, 0x2d, 0x4c, 0x4b, 0x7d, 0xa1, - 0x4f, 0x00, 0x82, 0x2c, 0xa8, 0x8f, 0xd5, 0xe5, 0xc6, 0x6f, 0x36, 0x15, 0xf3, 0x18, 0x29, 0x68, - 0xf7, 0x7f, 0x41, 0xd0, 0xf8, 0xff, 0x3e, 0x23, 0x8f, 0x37, 0x60, 0xeb, 0xc5, 0xfb, 0xb1, 0xc6, - 0xfb, 0x11, 0x4d, 0xae, 0x2b, 0x9e, 0xc7, 0x97, 0x9f, 0x5c, 0xcf, 0x1e, 0xc4, 0xbf, 0x22, 0x68, - 0x5d, 0xd5, 0x04, 0xbe, 0x77, 0xde, 0x87, 0xf9, 0x9c, 0x3e, 0xaa, 0x0d, 0x7c, 0x0b, 0x69, 0x8f, - 0xf0, 0x0d, 0x68, 0xa5, 0x23, 0x2b, 0x2e, 0xbf, 0x9d, 0x57, 0x93, 0x4e, 0x35, 0x92, 0x21, 0xf0, - 0x1e, 0x34, 0xa6, 0xdc, 0x1b, 0xc7, 0x13, 0xb7, 0x6d, 0xbf, 0xac, 0x91, 0x8d, 0x0f, 0xb8, 0x37, - 0x26, 0x71, 0x26, 0x42, 0x78, 0x74, 0xc6, 0xe2, 0x53, 0x54, 0x40, 0x44, 0xc3, 0x8a, 0xc4, 0x99, - 0xfe, 0xcf, 0x08, 0x36, 0xf5, 0x09, 0xcc, 0xf4, 0xd0, 0x4a, 0xbd, 0x7d, 0x00, 0x1a, 0xf0, 0xfb, - 0xc9, 0xa6, 0xe9, 0x75, 0xb3, 0xbb, 0x72, 0x70, 0x7c, 0xa8, 0x33, 0xa4, 0x80, 0x7a, 0x76, 0x0d, - 0xd8, 0x82, 0x76, 0xf4, 0x2b, 0x03, 0xea, 0x30, 0xa3, 0x11, 0xc3, 0x76, 0x35, 0xac, 0x7d, 0x94, - 0x26, 0x48, 0x8e, 0xb1, 0xdf, 0x3c, 0x3d, 0xeb, 0xd6, 0x9e, 0x9c, 0x75, 0x6b, 0x7f, 0x9c, 0x75, - 0x6b, 0x8f, 0x96, 0x5d, 0x74, 0xba, 0xec, 0xa2, 0x27, 0xcb, 0x2e, 0xfa, 0x6b, 0xd9, 0x45, 0x3f, - 0xfe, 0xdd, 0xad, 0x3d, 0x68, 0xa5, 0x1b, 0xff, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x90, 0xdd, - 0x28, 0xaf, 0xe7, 0x0c, 0x00, 0x00, + // 879 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x55, 0x41, 0x6f, 0x23, 0x35, + 0x14, 0x8e, 0x9b, 0x84, 0x26, 0xaf, 0x54, 0xa5, 0x46, 0x8b, 0x86, 0x4a, 0x24, 0x55, 0x4e, 0x11, + 0xdb, 0x9d, 0x51, 0xaa, 0x45, 0xec, 0x01, 0x0e, 0x1d, 0x84, 0x50, 0xc5, 0x52, 0x2a, 0xaf, 0x58, + 0x41, 0x85, 0x84, 0x9c, 0x89, 0x37, 0x35, 0x99, 0xcc, 0x8c, 0x6c, 0x4f, 0x01, 0x21, 0xa4, 0x15, + 0x27, 0x8e, 0xfc, 0x8a, 0xbd, 0x71, 0xe1, 0xba, 0x37, 0x4e, 0xe5, 0xb6, 0x37, 0x38, 0x45, 0x34, + 0xfc, 0x11, 0x64, 0xc7, 0x33, 0x93, 0x36, 0x93, 0x6e, 0xb7, 0x68, 0x2b, 0x21, 0x71, 0x4a, 0xfc, + 0xde, 0xf7, 0x3d, 0x7f, 0xcf, 0xcf, 0xf3, 0x19, 0xee, 0x8d, 0xee, 0x49, 0x97, 0xc7, 0xde, 0x28, + 0xed, 0x33, 0x11, 0x31, 0xc5, 0xa4, 0x97, 0x8c, 0x86, 0x1e, 0x4d, 0xb8, 0xf4, 0x44, 0x9f, 0x06, + 0xde, 0x49, 0x8f, 0x86, 0xc9, 0x31, 0xed, 0x79, 0x43, 0x16, 0x31, 0x41, 0x15, 0x1b, 0xb8, 0x89, + 0x88, 0x55, 0x8c, 0xbb, 0x33, 0xa6, 0x5b, 0x30, 0xdd, 0x64, 0x34, 0x74, 0x35, 0xd3, 0xd5, 0x4c, + 0x37, 0x63, 0x6e, 0xdd, 0x19, 0x72, 0x75, 0x9c, 0xf6, 0xdd, 0x20, 0x1e, 0x7b, 0xc3, 0x78, 0x18, + 0x7b, 0xa6, 0x40, 0x3f, 0x7d, 0x64, 0x56, 0x66, 0x61, 0xfe, 0xcd, 0x0a, 0x6f, 0xed, 0x2e, 0x95, + 0xe4, 0x09, 0x26, 0xe3, 0x54, 0x04, 0xec, 0xa2, 0x98, 0xad, 0x9d, 0xe5, 0x9c, 0x93, 0x05, 0xe9, + 0x97, 0xec, 0x20, 0xbd, 0x31, 0x53, 0xb4, 0x8c, 0x73, 0xa7, 0x9c, 0x23, 0xd2, 0x48, 0xf1, 0xf1, + 0xa2, 0xa0, 0xbb, 0x97, 0xc3, 0x65, 0x70, 0xcc, 0xc6, 0x74, 0x81, 0xd5, 0x2b, 0x67, 0xa5, 0x8a, + 0x87, 0x1e, 0x8f, 0x94, 0x54, 0xe2, 0x22, 0xa5, 0xf3, 0x1b, 0x82, 0xb5, 0x0f, 0xc2, 0x54, 0x2a, + 0x26, 0x48, 0x1c, 0x32, 0xfc, 0x39, 0x34, 0x74, 0x0b, 0x03, 0xaa, 0xa8, 0x83, 0xb6, 0x51, 0x77, + 0x6d, 0xb7, 0xeb, 0x2e, 0x9d, 0x94, 0x7b, 0xd2, 0x73, 0x3f, 0xed, 0x7f, 0xcd, 0x02, 0xf5, 0x09, + 0x53, 0xd4, 0xc7, 0xa7, 0x93, 0x76, 0x65, 0x3a, 0x69, 0x43, 0x11, 0x23, 0x79, 0x35, 0xfc, 0x05, + 0xd4, 0x45, 0x1a, 0x32, 0xe9, 0xac, 0x6c, 0x57, 0xbb, 0x6b, 0xbb, 0x77, 0xdd, 0xab, 0x5e, 0x00, + 0xf7, 0x30, 0x0e, 0x79, 0xf0, 0x1d, 0x49, 0x43, 0xe6, 0xaf, 0xdb, 0x2d, 0xea, 0x7a, 0x25, 0xc9, + 0xac, 0x62, 0xe7, 0x97, 0x15, 0xc0, 0x73, 0x4d, 0xf8, 0x3c, 0x1a, 0xf0, 0x68, 0xf8, 0x12, 0x7b, + 0xf9, 0x0a, 0x1a, 0x32, 0x35, 0x89, 0xac, 0x9d, 0xde, 0xd5, 0xdb, 0x79, 0x30, 0x63, 0xfa, 0xaf, + 0xd9, 0x2d, 0x1a, 0x36, 0x20, 0x49, 0x5e, 0x14, 0x7f, 0x09, 0xab, 0x22, 0x0e, 0x19, 0x61, 0x8f, + 0x9c, 0xaa, 0x51, 0xfe, 0x02, 0xf5, 0xc9, 0x8c, 0xe8, 0x6f, 0xd8, 0xfa, 0xab, 0x36, 0x40, 0xb2, + 0x92, 0x9d, 0x27, 0x08, 0xde, 0x5c, 0x3c, 0x2f, 0x3f, 0xe5, 0xe1, 0x80, 0x09, 0xfc, 0x13, 0x02, + 0x1c, 0x2c, 0x64, 0xed, 0x09, 0xbe, 0x77, 0x75, 0x1d, 0x25, 0x3b, 0x6c, 0x59, 0x49, 0x25, 0xd3, + 0x22, 0x25, 0x7b, 0x76, 0xfe, 0x40, 0xf0, 0xc6, 0x22, 0xf4, 0x3e, 0x97, 0x0a, 0x1f, 0x2d, 0x0c, + 0x77, 0xe7, 0x32, 0x69, 0x1a, 0xab, 0x47, 0xac, 0xb9, 0x66, 0xc0, 0xf9, 0xe9, 0x67, 0x91, 0xb9, + 0xf1, 0x52, 0xa8, 0x73, 0xc5, 0xc6, 0xd9, 0x6c, 0xff, 0x5d, 0xcf, 0xf9, 0x95, 0xdd, 0xd7, 0x25, + 0xc9, 0xac, 0x72, 0xe7, 0x77, 0x04, 0x1b, 0x73, 0xe0, 0x97, 0xde, 0xd2, 0xd1, 0xf9, 0x96, 0xde, + 0xb9, 0x5e, 0x4b, 0xe5, 0xbd, 0xfc, 0x58, 0x05, 0x28, 0xbe, 0x51, 0xdc, 0x86, 0xfa, 0x09, 0x13, + 0x7d, 0xe9, 0xa0, 0xed, 0x6a, 0xb7, 0xe9, 0x37, 0x35, 0xfe, 0xa1, 0x0e, 0x90, 0x59, 0x1c, 0x3f, + 0x46, 0x70, 0x8b, 0x2a, 0x25, 0x78, 0x3f, 0x55, 0x8c, 0x30, 0xa9, 0x04, 0x0f, 0x14, 0x8f, 0x23, + 0x2d, 0x4e, 0x77, 0x7d, 0x7b, 0x89, 0x38, 0xeb, 0x7e, 0x2e, 0xa1, 0xdf, 0x7c, 0xf8, 0xad, 0x62, + 0x91, 0xe4, 0x71, 0xe4, 0xbf, 0x65, 0x25, 0xdd, 0xda, 0x2b, 0xab, 0x48, 0xca, 0x37, 0xc2, 0xb7, + 0xa1, 0x49, 0x13, 0xfe, 0x91, 0x88, 0xd3, 0x44, 0x3a, 0x55, 0xa3, 0x73, 0x7d, 0x3a, 0x69, 0x37, + 0xf7, 0x0e, 0xf7, 0x67, 0x41, 0x52, 0xe4, 0x35, 0x38, 0x7b, 0x39, 0xa4, 0x53, 0x2b, 0xc0, 0x24, + 0x0b, 0x92, 0x22, 0x8f, 0xdf, 0x85, 0xf5, 0x6c, 0x71, 0x40, 0xc7, 0x4c, 0x3a, 0x75, 0x43, 0xd8, + 0x9c, 0x4e, 0xda, 0xeb, 0x64, 0x3e, 0x41, 0xce, 0xe3, 0xf0, 0xfb, 0xb0, 0x11, 0xc5, 0x51, 0x06, + 0xf9, 0x8c, 0xdc, 0x97, 0xce, 0x2b, 0x86, 0xfa, 0xfa, 0x74, 0xd2, 0xde, 0x38, 0x38, 0x9f, 0x22, + 0x17, 0xb1, 0x9d, 0x1f, 0x60, 0x73, 0xce, 0x27, 0xed, 0xa7, 0x7c, 0x0c, 0x90, 0xe4, 0x41, 0x7b, + 0xa7, 0xae, 0x67, 0xbc, 0xb9, 0x1f, 0x16, 0x31, 0x32, 0x57, 0xbb, 0xf3, 0x14, 0x41, 0xed, 0xbf, + 0xfb, 0x80, 0x3c, 0x59, 0x81, 0xb5, 0xff, 0x5f, 0x8e, 0x2b, 0xbc, 0x1c, 0xda, 0xb6, 0x6e, 0xd2, + 0x89, 0xaf, 0x6f, 0x5b, 0xcf, 0xb7, 0xe0, 0xa7, 0x08, 0x1a, 0x37, 0xe2, 0xbd, 0x0f, 0xce, 0x37, + 0xe1, 0xbe, 0x60, 0x13, 0xe5, 0xea, 0xbf, 0x87, 0x6c, 0x3a, 0x78, 0x07, 0x1a, 0x99, 0x59, 0x19, + 0xed, 0xcd, 0x42, 0x4d, 0xe6, 0x67, 0x24, 0x47, 0xe0, 0x6d, 0xa8, 0x8d, 0x78, 0x34, 0x30, 0x5e, + 0xdb, 0xf4, 0x5f, 0xb5, 0xc8, 0xda, 0xc7, 0x3c, 0x1a, 0x10, 0x93, 0xd1, 0x88, 0x88, 0x8e, 0x99, + 0xb9, 0x3f, 0x73, 0x08, 0x6d, 0x53, 0xc4, 0x64, 0x3a, 0xbf, 0x22, 0x58, 0xb5, 0x77, 0x2f, 0xaf, + 0x87, 0x96, 0xd6, 0xdb, 0x05, 0xa0, 0x09, 0x7f, 0xc8, 0x84, 0x36, 0x6c, 0xbb, 0x6f, 0xfe, 0x95, + 0xec, 0x1d, 0xee, 0xdb, 0x0c, 0x99, 0x43, 0x3d, 0x5f, 0x03, 0xf6, 0xa0, 0xa9, 0x7f, 0x65, 0x42, + 0x03, 0xe6, 0xd4, 0x0c, 0x6c, 0xd3, 0xc2, 0x9a, 0x07, 0x59, 0x82, 0x14, 0x18, 0xff, 0xed, 0xd3, + 0xb3, 0x56, 0xe5, 0xd9, 0x59, 0xab, 0xf2, 0xe7, 0x59, 0xab, 0xf2, 0x78, 0xda, 0x42, 0xa7, 0xd3, + 0x16, 0x7a, 0x36, 0x6d, 0xa1, 0xbf, 0xa6, 0x2d, 0xf4, 0xf3, 0xdf, 0xad, 0xca, 0x51, 0x23, 0x3b, + 0xf8, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x24, 0x96, 0xf9, 0x34, 0xd8, 0x0c, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.proto index c265441f965..63ec41b9c1b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.rbac.v1alpha1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -68,7 +68,7 @@ message ClusterRoleBindingBuilder { message ClusterRoleBindingList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of ClusterRoleBindings repeated ClusterRoleBinding items = 2; @@ -78,7 +78,7 @@ message ClusterRoleBindingList { message ClusterRoleList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of ClusterRoles repeated ClusterRole items = 2; @@ -154,7 +154,7 @@ message RoleBinding { message RoleBindingList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of RoleBindings repeated RoleBinding items = 2; @@ -164,7 +164,7 @@ message RoleBindingList { message RoleList { // Standard object's metadata. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is a list of Roles repeated Role items = 2; diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/register.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/register.go index 537019bc488..b738163ffab 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/register.go @@ -18,6 +18,7 @@ package v1alpha1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/watch/versioned" @@ -28,6 +29,11 @@ const GroupName = "rbac.authorization.k8s.io" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs) AddToScheme = SchemeBuilder.AddToScheme @@ -48,7 +54,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, ) versioned.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.generated.go index 3e0824d3f34..0af4bfc1feb 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg3_v1 "k8s.io/client-go/pkg/api/v1" + pkg2_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg1_runtime "k8s.io/client-go/pkg/runtime" pkg4_types "k8s.io/client-go/pkg/types" "reflect" @@ -64,8 +64,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_unversioned.TypeMeta - var v1 pkg3_v1.ObjectMeta + var v0 pkg3_v1.ObjectMeta + var v1 pkg2_v1.TypeMeta var v2 pkg1_runtime.RawExtension var v3 pkg4_types.UID var v4 time.Time @@ -2033,7 +2033,7 @@ func (x *RoleBindingList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv180 := &x.ListMeta yym181 := z.DecBinary() @@ -2114,7 +2114,7 @@ func (x *RoleBindingList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv187 := &x.ListMeta yym188 := z.DecBinary() @@ -2377,7 +2377,7 @@ func (x *RoleList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv212 := &x.ListMeta yym213 := z.DecBinary() @@ -2458,7 +2458,7 @@ func (x *RoleList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv219 := &x.ListMeta yym220 := z.DecBinary() @@ -3396,7 +3396,7 @@ func (x *ClusterRoleBindingList) codecDecodeSelfFromMap(l int, d *codec1978.Deco } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv305 := &x.ListMeta yym306 := z.DecBinary() @@ -3477,7 +3477,7 @@ func (x *ClusterRoleBindingList) codecDecodeSelfFromArray(l int, d *codec1978.De } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv312 := &x.ListMeta yym313 := z.DecBinary() @@ -3740,7 +3740,7 @@ func (x *ClusterRoleList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv337 := &x.ListMeta yym338 := z.DecBinary() @@ -3821,7 +3821,7 @@ func (x *ClusterRoleList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv344 := &x.ListMeta yym345 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.go index 6ddc6167a3b..3fc9a416ffd 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" ) @@ -105,7 +105,7 @@ type RoleRef struct { // Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding. type Role struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -120,7 +120,7 @@ type Role struct { // It adds who information via Subjects and namespace information by which namespace it exists in. RoleBindings in a given // namespace only have effect in that namespace. type RoleBinding struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -135,10 +135,10 @@ type RoleBinding struct { // RoleBindingList is a collection of RoleBindings type RoleBindingList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of RoleBindings Items []RoleBinding `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -146,10 +146,10 @@ type RoleBindingList struct { // RoleList is a collection of Roles type RoleList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of Roles Items []Role `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -160,7 +160,7 @@ type RoleList struct { // ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding. type ClusterRole struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -175,7 +175,7 @@ type ClusterRole struct { // ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, // and adds who information via Subject. type ClusterRoleBinding struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` @@ -190,10 +190,10 @@ type ClusterRoleBinding struct { // ClusterRoleBindingList is a collection of ClusterRoleBindings type ClusterRoleBindingList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of ClusterRoleBindings Items []ClusterRoleBinding `json:"items" protobuf:"bytes,2,rep,name=items"` @@ -201,10 +201,10 @@ type ClusterRoleBindingList struct { // ClusterRoleList is a collection of ClusterRoles type ClusterRoleList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is a list of ClusterRoles Items []ClusterRole `json:"items" protobuf:"bytes,2,rep,name=items"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..0631bb7cc29 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.deepcopy.go @@ -0,0 +1,293 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1alpha1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRole, InType: reflect.TypeOf(&ClusterRole{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRoleBinding, InType: reflect.TypeOf(&ClusterRoleBinding{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRoleBindingList, InType: reflect.TypeOf(&ClusterRoleBindingList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_ClusterRoleList, InType: reflect.TypeOf(&ClusterRoleList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_PolicyRule, InType: reflect.TypeOf(&PolicyRule{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_Role, InType: reflect.TypeOf(&Role{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleBinding, InType: reflect.TypeOf(&RoleBinding{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleBindingList, InType: reflect.TypeOf(&RoleBindingList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleList, InType: reflect.TypeOf(&RoleList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_RoleRef, InType: reflect.TypeOf(&RoleRef{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_Subject, InType: reflect.TypeOf(&Subject{})}, + ) +} + +func DeepCopy_v1alpha1_ClusterRole(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterRole) + out := out.(*ClusterRole) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Rules != nil { + in, out := &in.Rules, &out.Rules + *out = make([]PolicyRule, len(*in)) + for i := range *in { + if err := DeepCopy_v1alpha1_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Rules = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_ClusterRoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterRoleBinding) + out := out.(*ClusterRoleBinding) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Subjects != nil { + in, out := &in.Subjects, &out.Subjects + *out = make([]Subject, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Subjects = nil + } + out.RoleRef = in.RoleRef + return nil + } +} + +func DeepCopy_v1alpha1_ClusterRoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterRoleBindingList) + out := out.(*ClusterRoleBindingList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ClusterRoleBinding, len(*in)) + for i := range *in { + if err := DeepCopy_v1alpha1_ClusterRoleBinding(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_ClusterRoleList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterRoleList) + out := out.(*ClusterRoleList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ClusterRole, len(*in)) + for i := range *in { + if err := DeepCopy_v1alpha1_ClusterRole(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_PolicyRule(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PolicyRule) + out := out.(*PolicyRule) + if in.Verbs != nil { + in, out := &in.Verbs, &out.Verbs + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Verbs = nil + } + if err := runtime.DeepCopy_runtime_RawExtension(&in.AttributeRestrictions, &out.AttributeRestrictions, c); err != nil { + return err + } + if in.APIGroups != nil { + in, out := &in.APIGroups, &out.APIGroups + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.APIGroups = nil + } + if in.Resources != nil { + in, out := &in.Resources, &out.Resources + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Resources = nil + } + if in.ResourceNames != nil { + in, out := &in.ResourceNames, &out.ResourceNames + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.ResourceNames = nil + } + if in.NonResourceURLs != nil { + in, out := &in.NonResourceURLs, &out.NonResourceURLs + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.NonResourceURLs = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_Role(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Role) + out := out.(*Role) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Rules != nil { + in, out := &in.Rules, &out.Rules + *out = make([]PolicyRule, len(*in)) + for i := range *in { + if err := DeepCopy_v1alpha1_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Rules = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_RoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RoleBinding) + out := out.(*RoleBinding) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Subjects != nil { + in, out := &in.Subjects, &out.Subjects + *out = make([]Subject, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Subjects = nil + } + out.RoleRef = in.RoleRef + return nil + } +} + +func DeepCopy_v1alpha1_RoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RoleBindingList) + out := out.(*RoleBindingList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]RoleBinding, len(*in)) + for i := range *in { + if err := DeepCopy_v1alpha1_RoleBinding(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_RoleList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RoleList) + out := out.(*RoleList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Role, len(*in)) + for i := range *in { + if err := DeepCopy_v1alpha1_Role(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1alpha1_RoleRef(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RoleRef) + out := out.(*RoleRef) + out.APIGroup = in.APIGroup + out.Kind = in.Kind + out.Name = in.Name + return nil + } +} + +func DeepCopy_v1alpha1_Subject(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Subject) + out := out.(*Subject) + out.Kind = in.Kind + out.APIVersion = in.APIVersion + out.Name = in.Name + out.Namespace = in.Namespace + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go new file mode 100644 index 00000000000..253c1517f10 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/zz_generated.deepcopy.go @@ -0,0 +1,297 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package rbac + +import ( + api "k8s.io/client-go/pkg/api" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRole, InType: reflect.TypeOf(&ClusterRole{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRoleBinding, InType: reflect.TypeOf(&ClusterRoleBinding{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRoleBindingList, InType: reflect.TypeOf(&ClusterRoleBindingList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_ClusterRoleList, InType: reflect.TypeOf(&ClusterRoleList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_PolicyRule, InType: reflect.TypeOf(&PolicyRule{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_Role, InType: reflect.TypeOf(&Role{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleBinding, InType: reflect.TypeOf(&RoleBinding{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleBindingList, InType: reflect.TypeOf(&RoleBindingList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleList, InType: reflect.TypeOf(&RoleList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_RoleRef, InType: reflect.TypeOf(&RoleRef{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_rbac_Subject, InType: reflect.TypeOf(&Subject{})}, + ) +} + +func DeepCopy_rbac_ClusterRole(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterRole) + out := out.(*ClusterRole) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Rules != nil { + in, out := &in.Rules, &out.Rules + *out = make([]PolicyRule, len(*in)) + for i := range *in { + if err := DeepCopy_rbac_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Rules = nil + } + return nil + } +} + +func DeepCopy_rbac_ClusterRoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterRoleBinding) + out := out.(*ClusterRoleBinding) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Subjects != nil { + in, out := &in.Subjects, &out.Subjects + *out = make([]Subject, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Subjects = nil + } + out.RoleRef = in.RoleRef + return nil + } +} + +func DeepCopy_rbac_ClusterRoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterRoleBindingList) + out := out.(*ClusterRoleBindingList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ClusterRoleBinding, len(*in)) + for i := range *in { + if err := DeepCopy_rbac_ClusterRoleBinding(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_rbac_ClusterRoleList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterRoleList) + out := out.(*ClusterRoleList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]ClusterRole, len(*in)) + for i := range *in { + if err := DeepCopy_rbac_ClusterRole(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_rbac_PolicyRule(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*PolicyRule) + out := out.(*PolicyRule) + if in.Verbs != nil { + in, out := &in.Verbs, &out.Verbs + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Verbs = nil + } + if in.AttributeRestrictions == nil { + out.AttributeRestrictions = nil + } else if newVal, err := c.DeepCopy(&in.AttributeRestrictions); err != nil { + return err + } else { + out.AttributeRestrictions = *newVal.(*runtime.Object) + } + if in.APIGroups != nil { + in, out := &in.APIGroups, &out.APIGroups + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.APIGroups = nil + } + if in.Resources != nil { + in, out := &in.Resources, &out.Resources + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Resources = nil + } + if in.ResourceNames != nil { + in, out := &in.ResourceNames, &out.ResourceNames + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.ResourceNames = nil + } + if in.NonResourceURLs != nil { + in, out := &in.NonResourceURLs, &out.NonResourceURLs + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.NonResourceURLs = nil + } + return nil + } +} + +func DeepCopy_rbac_Role(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Role) + out := out.(*Role) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Rules != nil { + in, out := &in.Rules, &out.Rules + *out = make([]PolicyRule, len(*in)) + for i := range *in { + if err := DeepCopy_rbac_PolicyRule(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Rules = nil + } + return nil + } +} + +func DeepCopy_rbac_RoleBinding(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RoleBinding) + out := out.(*RoleBinding) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if in.Subjects != nil { + in, out := &in.Subjects, &out.Subjects + *out = make([]Subject, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.Subjects = nil + } + out.RoleRef = in.RoleRef + return nil + } +} + +func DeepCopy_rbac_RoleBindingList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RoleBindingList) + out := out.(*RoleBindingList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]RoleBinding, len(*in)) + for i := range *in { + if err := DeepCopy_rbac_RoleBinding(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_rbac_RoleList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RoleList) + out := out.(*RoleList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Role, len(*in)) + for i := range *in { + if err := DeepCopy_rbac_Role(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_rbac_RoleRef(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RoleRef) + out := out.(*RoleRef) + out.APIGroup = in.APIGroup + out.Kind = in.Kind + out.Name = in.Name + return nil + } +} + +func DeepCopy_rbac_Subject(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Subject) + out := out.(*Subject) + out.Kind = in.Kind + out.APIVersion = in.APIVersion + out.Name = in.Name + out.Namespace = in.Namespace + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/OWNERS b/staging/src/k8s.io/client-go/pkg/apis/storage/OWNERS new file mode 100755 index 00000000000..d59ed6e1d8a --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/OWNERS @@ -0,0 +1,3 @@ +reviewers: +- deads2k +- mbohlool diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/register.go b/staging/src/k8s.io/client-go/pkg/apis/storage/register.go index 5dc5fe48c39..2397373496b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/register.go @@ -18,6 +18,7 @@ package storage import ( "k8s.io/client-go/pkg/api" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" ) @@ -47,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &api.ListOptions{}, &api.DeleteOptions{}, - &api.ExportOptions{}, + &metav1.ExportOptions{}, &StorageClass{}, &StorageClassList{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/storage/types.generated.go index 9d8d7bf960f..145f3ff17d5 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg2_api "k8s.io/client-go/pkg/api" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg2_api.ObjectMeta - var v1 pkg1_unversioned.TypeMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -653,7 +653,7 @@ func (x *StorageClassList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() @@ -734,7 +734,7 @@ func (x *StorageClassList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv62 := &x.ListMeta yym63 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/types.go b/staging/src/k8s.io/client-go/pkg/apis/storage/types.go index 4d4a18f60d3..6bc4022c2c3 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/types.go @@ -18,7 +18,7 @@ package storage import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -31,7 +31,7 @@ import ( // called "profiles" in other storage systems. // The name of a StorageClass object is significant, and is how users can request a particular class. type StorageClass struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // +optional api.ObjectMeta `json:"metadata,omitempty"` @@ -52,11 +52,11 @@ type StorageClass struct { // StorageClassList is a collection of storage classes. type StorageClassList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // Items is the list of StorageClasses Items []StorageClass `json:"items"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.pb.go index 49c051ce27b..595c0191cd1 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.pb.go @@ -245,7 +245,7 @@ func (this *StorageClassList) String() string { return "nil" } s := strings.Join([]string{`&StorageClassList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "StorageClass", "StorageClass", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -696,35 +696,35 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 472 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0x41, 0x8b, 0xd3, 0x40, - 0x14, 0xc7, 0x3b, 0x2d, 0xc5, 0xdd, 0xa9, 0x62, 0x89, 0x1e, 0x4a, 0x0e, 0xd9, 0xb2, 0xa7, 0x2a, - 0xee, 0x0c, 0x2d, 0x2e, 0x94, 0x05, 0x2f, 0x15, 0x41, 0x41, 0x71, 0x89, 0x17, 0x11, 0xf6, 0x30, - 0x69, 0x9f, 0xd9, 0x31, 0x4d, 0x26, 0xcc, 0xbc, 0x04, 0x16, 0x3c, 0xf8, 0x11, 0xfc, 0x58, 0x3d, - 0xf6, 0xe8, 0x41, 0x16, 0x1b, 0xbf, 0x88, 0x34, 0x89, 0x9b, 0xd0, 0x6c, 0x17, 0xf1, 0x96, 0x37, - 0xf3, 0x7e, 0xff, 0xf7, 0x7f, 0xff, 0x0c, 0x3d, 0x0b, 0xa6, 0x86, 0x49, 0xc5, 0x83, 0xc4, 0x03, - 0x1d, 0x01, 0x82, 0xe1, 0x71, 0xe0, 0x73, 0x11, 0x4b, 0xc3, 0x0d, 0x2a, 0x2d, 0x7c, 0xe0, 0xe9, - 0xd8, 0x03, 0x14, 0x63, 0xee, 0x43, 0x04, 0x5a, 0x20, 0x2c, 0x58, 0xac, 0x15, 0x2a, 0xeb, 0x69, - 0xc1, 0xb2, 0x8a, 0x65, 0x71, 0xe0, 0xb3, 0x2d, 0xcb, 0x4a, 0x96, 0x95, 0xac, 0x7d, 0xe2, 0x4b, - 0xbc, 0x4c, 0x3c, 0x36, 0x57, 0x21, 0xf7, 0x95, 0xaf, 0x78, 0x2e, 0xe1, 0x25, 0x9f, 0xf3, 0x2a, - 0x2f, 0xf2, 0xaf, 0x42, 0xda, 0x9e, 0xec, 0xb5, 0xc5, 0x35, 0x18, 0x95, 0xe8, 0x39, 0xec, 0xda, - 0xb1, 0x4f, 0xf7, 0x33, 0x49, 0x94, 0x82, 0x36, 0x52, 0x45, 0xb0, 0x68, 0x60, 0xcf, 0xf6, 0x63, - 0x69, 0x63, 0x67, 0xfb, 0xe4, 0xf6, 0x6e, 0x9d, 0x44, 0x28, 0xc3, 0xa6, 0xa7, 0xe7, 0x77, 0xb7, - 0x9b, 0xf9, 0x25, 0x84, 0xa2, 0x41, 0x8d, 0x6f, 0xa7, 0x12, 0x94, 0x4b, 0x2e, 0x23, 0x34, 0xa8, - 0x77, 0x91, 0xe3, 0x9f, 0x6d, 0x7a, 0xff, 0x43, 0x91, 0xf9, 0xcb, 0xa5, 0x30, 0xc6, 0xfa, 0x48, - 0x0f, 0x42, 0x40, 0xb1, 0x10, 0x28, 0x06, 0x64, 0x48, 0x46, 0xbd, 0xc9, 0x88, 0xed, 0xfd, 0x5f, - 0x2c, 0x1d, 0xb3, 0xf7, 0xde, 0x17, 0x98, 0xe3, 0x3b, 0x40, 0x31, 0xb3, 0x56, 0xd7, 0x47, 0xad, - 0xec, 0xfa, 0x88, 0x56, 0x67, 0xee, 0x8d, 0x9a, 0x75, 0x4a, 0x7b, 0xb1, 0x56, 0xa9, 0xcc, 0xf3, - 0xd4, 0x83, 0xf6, 0x90, 0x8c, 0x0e, 0x67, 0x8f, 0x4a, 0xa4, 0x77, 0x5e, 0x5d, 0xb9, 0xf5, 0x3e, - 0xeb, 0x2b, 0xa5, 0xb1, 0xd0, 0x22, 0x04, 0x04, 0x6d, 0x06, 0x9d, 0x61, 0x67, 0xd4, 0x9b, 0xbc, - 0x66, 0xff, 0xfe, 0x84, 0x58, 0x7d, 0x3d, 0x76, 0x7e, 0x23, 0xf5, 0x2a, 0x42, 0x7d, 0x55, 0x59, - 0xae, 0x2e, 0xdc, 0xda, 0x3c, 0xfb, 0x05, 0x7d, 0xb8, 0x83, 0x58, 0x7d, 0xda, 0x09, 0xe0, 0x2a, - 0x0f, 0xe7, 0xd0, 0xdd, 0x7e, 0x5a, 0x8f, 0x69, 0x37, 0x15, 0xcb, 0x04, 0x8a, 0x9d, 0xdc, 0xa2, - 0x38, 0x6b, 0x4f, 0xc9, 0xf1, 0x9a, 0xd0, 0x7e, 0x7d, 0xfe, 0x5b, 0x69, 0xd0, 0xba, 0x68, 0x44, - 0xcc, 0xef, 0x88, 0xb8, 0xf6, 0x06, 0xd9, 0x16, 0xcf, 0x93, 0xee, 0x97, 0xb6, 0x0f, 0xfe, 0x9e, - 0xd4, 0x72, 0xbe, 0xa0, 0x5d, 0x89, 0x10, 0x9a, 0x41, 0x3b, 0xcf, 0x6a, 0xfa, 0xbf, 0x59, 0xcd, - 0x1e, 0x94, 0x43, 0xba, 0x6f, 0xb6, 0x72, 0x6e, 0xa1, 0x3a, 0x7b, 0xb2, 0xda, 0x38, 0xad, 0xf5, - 0xc6, 0x69, 0xfd, 0xd8, 0x38, 0xad, 0x6f, 0x99, 0x43, 0x56, 0x99, 0x43, 0xd6, 0x99, 0x43, 0x7e, - 0x65, 0x0e, 0xf9, 0xfe, 0xdb, 0x69, 0x7d, 0xba, 0x57, 0xaa, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, - 0x0a, 0x07, 0x46, 0xe4, 0x25, 0x04, 0x00, 0x00, + // 471 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0x4f, 0x8b, 0xd3, 0x4e, + 0x18, 0xc7, 0x33, 0x2d, 0xe5, 0xb7, 0x3b, 0xfd, 0x89, 0x25, 0x7a, 0x28, 0x3d, 0x64, 0xcb, 0x9e, + 0xaa, 0xec, 0xce, 0xd0, 0xa2, 0x50, 0x16, 0xbc, 0x54, 0x04, 0x05, 0xc5, 0x25, 0x5e, 0x64, 0xc1, + 0xc3, 0xa4, 0xfb, 0x98, 0x1d, 0xd3, 0x64, 0xc2, 0xcc, 0x93, 0xc0, 0x82, 0x07, 0x5f, 0x82, 0x2f, + 0xab, 0x17, 0x61, 0x8f, 0x1e, 0x64, 0xb1, 0xf1, 0x8d, 0x48, 0xfe, 0xb8, 0x09, 0xfd, 0x87, 0x78, + 0x9b, 0x67, 0xe6, 0xf9, 0x7c, 0x9f, 0xef, 0xf3, 0x4d, 0xe8, 0x59, 0x30, 0x35, 0x4c, 0x2a, 0x1e, + 0x24, 0x1e, 0xe8, 0x08, 0x10, 0x0c, 0x8f, 0x03, 0x9f, 0x8b, 0x58, 0x1a, 0x6e, 0x50, 0x69, 0xe1, + 0x03, 0x4f, 0xc7, 0x1e, 0xa0, 0x18, 0x73, 0x1f, 0x22, 0xd0, 0x02, 0xe1, 0x92, 0xc5, 0x5a, 0xa1, + 0xb2, 0x1f, 0x97, 0x2c, 0xab, 0x59, 0x16, 0x07, 0x3e, 0xcb, 0x59, 0x56, 0xb1, 0xac, 0x62, 0x07, + 0xa7, 0xbe, 0xc4, 0xab, 0xc4, 0x63, 0x73, 0x15, 0x72, 0x5f, 0xf9, 0x8a, 0x17, 0x12, 0x5e, 0xf2, + 0xb1, 0xa8, 0x8a, 0xa2, 0x38, 0x95, 0xd2, 0x83, 0xc9, 0x4e, 0x5b, 0x5c, 0x83, 0x51, 0x89, 0x9e, + 0xc3, 0xba, 0x9d, 0xc1, 0xc9, 0x6e, 0x26, 0xdd, 0x30, 0xbf, 0x67, 0x82, 0xe1, 0x21, 0xa0, 0xd8, + 0xc6, 0x9c, 0x6e, 0x67, 0x74, 0x12, 0xa1, 0x0c, 0x37, 0x0d, 0x3d, 0xd9, 0xdf, 0x6e, 0xe6, 0x57, + 0x10, 0x8a, 0x0d, 0x6a, 0xbc, 0x9d, 0x4a, 0x50, 0x2e, 0xb8, 0x8c, 0xd0, 0xa0, 0x5e, 0x47, 0x8e, + 0x7f, 0xb4, 0xe8, 0xff, 0xef, 0xca, 0xc0, 0x9f, 0x2f, 0x84, 0x31, 0xf6, 0x7b, 0x7a, 0x90, 0xef, + 0x70, 0x29, 0x50, 0xf4, 0xc9, 0x90, 0x8c, 0xba, 0x93, 0x11, 0xdb, 0xf9, 0xb1, 0x58, 0x3a, 0x66, + 0x6f, 0xbd, 0x4f, 0x30, 0xc7, 0x37, 0x80, 0x62, 0x66, 0x2f, 0x6f, 0x8f, 0xac, 0xec, 0xf6, 0x88, + 0xd6, 0x77, 0xee, 0x9d, 0x9a, 0xfd, 0x94, 0x76, 0x63, 0xad, 0x52, 0x69, 0xa4, 0x8a, 0x40, 0xf7, + 0x5b, 0x43, 0x32, 0x3a, 0x9c, 0x3d, 0xa8, 0x90, 0xee, 0x79, 0xfd, 0xe4, 0x36, 0xfb, 0xec, 0xcf, + 0x94, 0xc6, 0x42, 0x8b, 0x10, 0x10, 0xb4, 0xe9, 0xb7, 0x87, 0xed, 0x51, 0x77, 0xf2, 0x92, 0xfd, + 0xfd, 0xff, 0xc3, 0x9a, 0xeb, 0xb1, 0xf3, 0x3b, 0xa9, 0x17, 0x11, 0xea, 0xeb, 0xda, 0x72, 0xfd, + 0xe0, 0x36, 0xe6, 0x0d, 0x9e, 0xd1, 0xfb, 0x6b, 0x88, 0xdd, 0xa3, 0xed, 0x00, 0xae, 0x8b, 0x70, + 0x0e, 0xdd, 0xfc, 0x68, 0x3f, 0xa4, 0x9d, 0x54, 0x2c, 0x12, 0x28, 0x77, 0x72, 0xcb, 0xe2, 0xac, + 0x35, 0x25, 0xc7, 0xdf, 0x08, 0xed, 0x35, 0xe7, 0xbf, 0x96, 0x06, 0xed, 0x8b, 0x8d, 0x88, 0x4f, + 0xf6, 0xed, 0x93, 0xf7, 0xe6, 0x41, 0xe7, 0x6c, 0x11, 0x73, 0xaf, 0xf2, 0x7c, 0xf0, 0xe7, 0xa6, + 0x11, 0xf2, 0x07, 0xda, 0x91, 0x08, 0xa1, 0xe9, 0xb7, 0x8a, 0xa0, 0xa6, 0xff, 0x1a, 0xd4, 0xec, + 0x5e, 0x35, 0xa4, 0xf3, 0x2a, 0x97, 0x73, 0x4b, 0xd5, 0xd9, 0xa3, 0xe5, 0xca, 0xb1, 0x6e, 0x56, + 0x8e, 0xf5, 0x7d, 0xe5, 0x58, 0x5f, 0x32, 0x87, 0x2c, 0x33, 0x87, 0xdc, 0x64, 0x0e, 0xf9, 0x99, + 0x39, 0xe4, 0xeb, 0x2f, 0xc7, 0xba, 0xf8, 0xaf, 0x52, 0xfb, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xc5, + 0xf0, 0x27, 0x65, 0x1f, 0x04, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.proto index efc3b806d3f..497ea99954e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.pkg.apis.storage.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -56,7 +56,7 @@ message StorageClassList { // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // Items is the list of StorageClasses repeated StorageClass items = 2; diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/register.go index fbd0ad89859..f5713abcba5 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/register.go @@ -18,6 +18,7 @@ package v1beta1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -29,6 +30,11 @@ const GroupName = "storage.k8s.io" // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} + var ( SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) AddToScheme = SchemeBuilder.AddToScheme @@ -39,7 +45,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(SchemeGroupVersion, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, &StorageClass{}, &StorageClassList{}, diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/types.generated.go index 39e92456367..cbbb7ee881b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg1_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg1_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg1_unversioned.TypeMeta - var v1 pkg2_v1.ObjectMeta + var v0 pkg2_v1.ObjectMeta + var v1 pkg1_v1.TypeMeta var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -653,7 +653,7 @@ func (x *StorageClassList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv55 := &x.ListMeta yym56 := z.DecBinary() @@ -734,7 +734,7 @@ func (x *StorageClassList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg1_unversioned.ListMeta{} + x.ListMeta = pkg1_v1.ListMeta{} } else { yyv62 := &x.ListMeta yym63 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/types.go index c48bfde51f6..59a2753e26e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // +genclient=true @@ -30,7 +30,7 @@ import ( // StorageClasses are non-namespaced; the name of the storage class // according to etcd is in ObjectMeta.Name. type StorageClass struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -47,11 +47,11 @@ type StorageClass struct { // StorageClassList is a collection of storage classes. type StorageClassList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // Items is the list of StorageClasses Items []StorageClass `json:"items" protobuf:"bytes,2,rep,name=items"` diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..05b9feca812 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.deepcopy.go @@ -0,0 +1,84 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1beta1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StorageClass, InType: reflect.TypeOf(&StorageClass{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_StorageClassList, InType: reflect.TypeOf(&StorageClassList{})}, + ) +} + +func DeepCopy_v1beta1_StorageClass(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StorageClass) + out := out.(*StorageClass) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Provisioner = in.Provisioner + if in.Parameters != nil { + in, out := &in.Parameters, &out.Parameters + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Parameters = nil + } + return nil + } +} + +func DeepCopy_v1beta1_StorageClassList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StorageClassList) + out := out.(*StorageClassList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]StorageClass, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_StorageClass(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go new file mode 100644 index 00000000000..a1c1817537e --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/zz_generated.deepcopy.go @@ -0,0 +1,84 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package storage + +import ( + api "k8s.io/client-go/pkg/api" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_storage_StorageClass, InType: reflect.TypeOf(&StorageClass{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_storage_StorageClassList, InType: reflect.TypeOf(&StorageClassList{})}, + ) +} + +func DeepCopy_storage_StorageClass(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StorageClass) + out := out.(*StorageClass) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + out.Provisioner = in.Provisioner + if in.Parameters != nil { + in, out := &in.Parameters, &out.Parameters + *out = make(map[string]string) + for key, val := range *in { + (*out)[key] = val + } + } else { + out.Parameters = nil + } + return nil + } +} + +func DeepCopy_storage_StorageClassList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*StorageClassList) + out := out.(*StorageClassList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]StorageClass, len(*in)) + for i := range *in { + if err := DeepCopy_storage_StorageClass(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/types.generated.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/types.generated.go index 2113488bfc7..8e3ebed763d 100644 --- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/types.generated.go @@ -26,7 +26,7 @@ import ( "fmt" codec1978 "github.com/ugorji/go/codec" pkg1_api "k8s.io/client-go/pkg/api" - pkg2_unversioned "k8s.io/client-go/pkg/api/unversioned" + pkg2_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -64,7 +64,7 @@ func init() { } if false { // reference the types, but skip this branch at build/run time var v0 pkg1_api.LocalObjectReference - var v1 pkg2_unversioned.Time + var v1 pkg2_v1.Time var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -801,7 +801,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv62 := &x.LastProbeTime yym63 := z.DecBinary() @@ -818,7 +818,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv64 := &x.LastTransitionTime yym65 := z.DecBinary() @@ -903,7 +903,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv71 := &x.LastProbeTime yym72 := z.DecBinary() @@ -930,7 +930,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv73 := &x.LastTransitionTime yym74 := z.DecBinary() @@ -1855,7 +1855,7 @@ func (x *ClusterList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv154 := &x.ListMeta yym155 := z.DecBinary() @@ -1936,7 +1936,7 @@ func (x *ClusterList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv161 := &x.ListMeta yym162 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/types.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/types.go index 761722d536f..1f45993dae6 100644 --- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/types.go +++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/types.go @@ -18,7 +18,7 @@ package federation import ( "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match. @@ -64,10 +64,10 @@ type ClusterCondition struct { Status api.ConditionStatus `json:"status"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty"` @@ -95,7 +95,7 @@ type ClusterStatus struct { // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation. type Cluster struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -111,11 +111,11 @@ type Cluster struct { // A list of all the kubernetes clusters registered to the federation type ClusterList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty"` + metav1.ListMeta `json:"metadata,omitempty"` // List of Cluster objects. Items []Cluster `json:"items"` diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/generated.pb.go index 8db4e211bfb..790c92e08a9 100644 --- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/generated.pb.go @@ -482,8 +482,8 @@ func (this *ClusterCondition) String() string { s := strings.Join([]string{`&ClusterCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, - `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_api_unversioned.Time", 1), `&`, ``, 1) + `,`, + `LastProbeTime:` + strings.Replace(strings.Replace(this.LastProbeTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(this.LastTransitionTime.String(), "Time", "k8s_io_kubernetes_pkg_apis_meta_v1.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, `}`, @@ -495,7 +495,7 @@ func (this *ClusterList) String() string { return "nil" } s := strings.Join([]string{`&ClusterList{`, - `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_api_unversioned.ListMeta", 1), `&`, ``, 1) + `,`, + `ListMeta:` + strings.Replace(strings.Replace(this.ListMeta.String(), "ListMeta", "k8s_io_kubernetes_pkg_apis_meta_v1.ListMeta", 1), `&`, ``, 1) + `,`, `Items:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Items), "Cluster", "Cluster", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1487,55 +1487,55 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 793 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xdd, 0x6a, 0x03, 0x45, - 0x14, 0xce, 0xe6, 0xb7, 0x99, 0x1a, 0x2d, 0x83, 0x42, 0xcc, 0xc5, 0xa6, 0x04, 0x91, 0x14, 0xed, - 0x2e, 0x09, 0x15, 0x0a, 0xa2, 0xd0, 0x4d, 0x11, 0x0a, 0x29, 0x95, 0x69, 0x11, 0x29, 0x88, 0x6c, - 0x36, 0x27, 0xdb, 0x35, 0xc9, 0xee, 0x32, 0x33, 0x1b, 0x69, 0xaf, 0x7c, 0x00, 0x2f, 0x7c, 0x08, - 0xdf, 0x40, 0x7c, 0x87, 0x5e, 0xf6, 0xc2, 0x0b, 0xf1, 0x22, 0xd8, 0xf8, 0x16, 0xbd, 0x92, 0x99, - 0x9d, 0x6c, 0xb2, 0xdd, 0x26, 0x68, 0x7b, 0xb7, 0xe7, 0xec, 0x39, 0xdf, 0xf7, 0xcd, 0xf9, 0x43, - 0xa7, 0xe3, 0x63, 0x66, 0x78, 0x81, 0x39, 0x8e, 0x06, 0x40, 0x7d, 0xe0, 0xc0, 0xcc, 0x11, 0x0c, - 0x81, 0xda, 0xdc, 0x0b, 0x7c, 0xd3, 0x0e, 0xbd, 0x94, 0x3d, 0xeb, 0x0c, 0x80, 0xdb, 0x1d, 0xd3, - 0x05, 0x5f, 0xb8, 0x60, 0x68, 0x84, 0x34, 0xe0, 0x01, 0x3e, 0x8a, 0x51, 0x8c, 0x15, 0x8a, 0xb1, - 0xca, 0x32, 0x04, 0xca, 0xba, 0xad, 0x50, 0x1a, 0x87, 0xae, 0xc7, 0x6f, 0xa2, 0x81, 0xe1, 0x04, - 0x53, 0xd3, 0x0d, 0xdc, 0xc0, 0x94, 0x60, 0x83, 0x68, 0x24, 0x2d, 0x69, 0xc8, 0xaf, 0x98, 0xa4, - 0xd1, 0xcd, 0x4a, 0x0d, 0xc7, 0xae, 0xd0, 0x68, 0x52, 0x60, 0x41, 0x44, 0x1d, 0x78, 0x2e, 0xac, - 0xf1, 0xd9, 0xe6, 0x9c, 0xc8, 0x9f, 0x01, 0x65, 0x5e, 0xe0, 0xc3, 0x30, 0x93, 0xf6, 0xe9, 0xe6, - 0xb4, 0x59, 0xe6, 0xf5, 0x8d, 0xc3, 0x97, 0xa3, 0x69, 0xe4, 0x73, 0x6f, 0x9a, 0xd5, 0x74, 0xb4, - 0x3d, 0x9c, 0x39, 0x37, 0x30, 0xb5, 0x33, 0x59, 0x9d, 0x97, 0xb3, 0x22, 0xee, 0x4d, 0x4c, 0xcf, - 0xe7, 0x8c, 0xd3, 0xe7, 0x29, 0xad, 0xdf, 0xf3, 0xa8, 0xd2, 0x9b, 0x44, 0x8c, 0x03, 0xc5, 0xdf, - 0xa2, 0x9d, 0x29, 0x70, 0x7b, 0x68, 0x73, 0xbb, 0xae, 0xed, 0x6b, 0xed, 0xdd, 0x6e, 0xdb, 0xc8, - 0x36, 0x2d, 0x1c, 0xbb, 0xa2, 0x5b, 0xc6, 0xac, 0x63, 0x5c, 0x0c, 0x7e, 0x00, 0x87, 0x9f, 0x03, - 0xb7, 0x2d, 0x7c, 0x3f, 0x6f, 0xe6, 0x16, 0xf3, 0x26, 0x5a, 0xf9, 0x48, 0x82, 0x86, 0x1d, 0x54, - 0x64, 0x21, 0x38, 0xf5, 0xbc, 0x44, 0x3d, 0x31, 0x5e, 0x33, 0x0a, 0x86, 0x92, 0x79, 0x19, 0x82, - 0x63, 0xbd, 0xa3, 0xe8, 0x8a, 0xc2, 0x22, 0x12, 0x1c, 0x8f, 0x51, 0x99, 0x71, 0x9b, 0x47, 0xac, - 0x5e, 0x90, 0x34, 0xbd, 0xb7, 0xd1, 0x48, 0x28, 0xeb, 0x5d, 0x45, 0x54, 0x8e, 0x6d, 0xa2, 0x28, - 0x5a, 0x7f, 0x15, 0xd0, 0x9e, 0x8a, 0xec, 0x05, 0xfe, 0xd0, 0x13, 0x10, 0xf8, 0x18, 0x15, 0xf9, - 0x6d, 0x08, 0xb2, 0x78, 0x55, 0xeb, 0xa3, 0xa5, 0xc6, 0xab, 0xdb, 0x10, 0x9e, 0xe6, 0xcd, 0xf7, - 0x9f, 0xc7, 0x0b, 0x3f, 0x91, 0x19, 0xf8, 0x9b, 0x44, 0x7b, 0x5e, 0xe6, 0x7e, 0x99, 0xa6, 0x7d, - 0x9a, 0x37, 0xb7, 0x8e, 0x9b, 0x91, 0x60, 0xa6, 0x65, 0xe2, 0x1b, 0x54, 0x9b, 0xd8, 0x8c, 0x7f, - 0x4d, 0x83, 0x01, 0x5c, 0x79, 0x53, 0x50, 0xa5, 0xf9, 0x64, 0x4b, 0x5f, 0xd7, 0x66, 0xde, 0x10, - 0x29, 0xd6, 0x07, 0x4a, 0x4b, 0xad, 0xbf, 0x8e, 0x44, 0xd2, 0xc0, 0xf8, 0x47, 0x84, 0x85, 0xe3, - 0x8a, 0xda, 0x3e, 0x8b, 0x5f, 0x27, 0xe8, 0x8a, 0xff, 0x9f, 0xae, 0xa1, 0xe8, 0x70, 0x3f, 0x03, - 0x47, 0x5e, 0xa0, 0xc0, 0x1f, 0xa3, 0x32, 0x05, 0x9b, 0x05, 0x7e, 0xbd, 0x24, 0x4b, 0x97, 0x74, - 0x8c, 0x48, 0x2f, 0x51, 0x7f, 0xf1, 0x01, 0xaa, 0x4c, 0x81, 0x31, 0xdb, 0x85, 0x7a, 0x59, 0x06, - 0xbe, 0xa7, 0x02, 0x2b, 0xe7, 0xb1, 0x9b, 0x2c, 0xff, 0xb7, 0x1e, 0x34, 0xb4, 0xab, 0x9a, 0xd5, - 0xf7, 0x18, 0xc7, 0xdf, 0x65, 0x16, 0xc3, 0xfc, 0x8f, 0x2f, 0x12, 0xe9, 0x72, 0x3f, 0xf6, 0x14, - 0xd9, 0xce, 0xd2, 0xb3, 0xb6, 0x1d, 0x03, 0x54, 0xf2, 0x38, 0x4c, 0x45, 0xef, 0x0b, 0xed, 0xdd, - 0xee, 0x17, 0x6f, 0x9a, 0x5b, 0xab, 0xa6, 0x98, 0x4a, 0x67, 0x02, 0x93, 0xc4, 0xd0, 0xad, 0x5f, - 0xf3, 0xc9, 0x93, 0xc4, 0xca, 0xe0, 0xdf, 0x34, 0xd4, 0x60, 0x40, 0x67, 0x40, 0x4f, 0x86, 0x43, - 0x0a, 0x8c, 0x59, 0xb7, 0xbd, 0x89, 0x07, 0x3e, 0xef, 0x9d, 0x9d, 0x12, 0x56, 0xd7, 0xa4, 0x92, - 0x8b, 0xd7, 0x29, 0xb9, 0xdc, 0x84, 0x6b, 0xb5, 0x94, 0xb6, 0xc6, 0xc6, 0x10, 0x46, 0xb6, 0xc8, - 0xc2, 0xdf, 0xa3, 0x2a, 0x03, 0x87, 0x02, 0x27, 0x30, 0x52, 0xc7, 0xa4, 0xbb, 0xfd, 0x44, 0xf5, - 0x03, 0xc7, 0x9e, 0xc4, 0x37, 0x89, 0xc0, 0x08, 0x28, 0xf8, 0x0e, 0x58, 0xb5, 0xc5, 0xbc, 0x59, - 0xbd, 0x5c, 0x02, 0x91, 0x15, 0x66, 0xeb, 0x0f, 0x0d, 0xd5, 0x52, 0x07, 0x00, 0xdf, 0x21, 0xe4, - 0x2c, 0x97, 0x6b, 0x59, 0x97, 0xaf, 0xde, 0xd4, 0xa1, 0x64, 0x57, 0x57, 0x47, 0x33, 0x71, 0x31, - 0xb2, 0xc6, 0x86, 0x9b, 0xa8, 0x74, 0x17, 0xf8, 0xc0, 0xea, 0xa5, 0xfd, 0x42, 0xbb, 0x6a, 0x55, - 0x45, 0x57, 0xaf, 0x85, 0x83, 0xc4, 0xfe, 0x78, 0xf6, 0x5d, 0x2f, 0xf0, 0xd5, 0x48, 0xaf, 0xcd, - 0xbe, 0xf0, 0x12, 0xf5, 0xb7, 0xf5, 0xb3, 0x86, 0x3e, 0xdc, 0x58, 0x72, 0xdc, 0x45, 0xc8, 0x49, - 0x2c, 0x75, 0xbc, 0x56, 0xd2, 0x92, 0x3f, 0x64, 0x2d, 0x0a, 0x7f, 0x8e, 0x6a, 0xa9, 0x3e, 0xa9, - 0xbb, 0x95, 0xdc, 0x8a, 0x14, 0x1b, 0x49, 0xc7, 0x5a, 0x07, 0xf7, 0x8f, 0x7a, 0xee, 0xe1, 0x51, - 0xcf, 0xfd, 0xf9, 0xa8, 0xe7, 0x7e, 0x5a, 0xe8, 0xda, 0xfd, 0x42, 0xd7, 0x1e, 0x16, 0xba, 0xf6, - 0xf7, 0x42, 0xd7, 0x7e, 0xf9, 0x47, 0xcf, 0x5d, 0x57, 0x54, 0xcd, 0xfe, 0x0d, 0x00, 0x00, 0xff, - 0xff, 0x4b, 0x32, 0xe4, 0xec, 0x7c, 0x08, 0x00, 0x00, + // 787 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcb, 0x6a, 0xf3, 0x46, + 0x14, 0xb6, 0x7c, 0x8d, 0x27, 0x75, 0x1b, 0x86, 0x16, 0x5c, 0x2f, 0xe4, 0x60, 0x4a, 0x71, 0x20, + 0x91, 0xb0, 0xc9, 0x22, 0x50, 0x5a, 0x88, 0x1c, 0x0a, 0x01, 0x87, 0x94, 0x49, 0x28, 0x25, 0x9b, + 0x22, 0xcb, 0xc7, 0x8a, 0x6a, 0x5b, 0x12, 0x33, 0x23, 0x43, 0xb2, 0xea, 0x03, 0x74, 0xd1, 0x87, + 0xe8, 0x1b, 0x94, 0xbe, 0x43, 0x36, 0x85, 0x2c, 0xb2, 0xe8, 0xca, 0x34, 0xee, 0x5b, 0x64, 0x55, + 0x66, 0x34, 0x96, 0xad, 0xf8, 0xc2, 0xff, 0x27, 0x3b, 0x9d, 0xa3, 0x73, 0xbe, 0xef, 0x9b, 0x73, + 0x43, 0x67, 0xc3, 0x13, 0x66, 0x78, 0x81, 0x39, 0x8c, 0x7a, 0x40, 0x7d, 0xe0, 0xc0, 0xcc, 0x01, + 0xf4, 0x81, 0xda, 0xdc, 0x0b, 0x7c, 0xd3, 0x0e, 0xbd, 0x94, 0x3d, 0x69, 0xf5, 0x80, 0xdb, 0x2d, + 0xd3, 0x05, 0x5f, 0xb8, 0xa0, 0x6f, 0x84, 0x34, 0xe0, 0x01, 0x3e, 0x8e, 0x51, 0x8c, 0x05, 0x8a, + 0xb1, 0xc8, 0x32, 0x04, 0xca, 0xb2, 0xad, 0x50, 0x6a, 0x47, 0xae, 0xc7, 0x6f, 0xa3, 0x9e, 0xe1, + 0x04, 0x63, 0xd3, 0x0d, 0xdc, 0xc0, 0x94, 0x60, 0xbd, 0x68, 0x20, 0x2d, 0x69, 0xc8, 0xaf, 0x98, + 0xa4, 0xd6, 0x5e, 0x95, 0x1a, 0x0e, 0x5d, 0xa1, 0xd1, 0xa4, 0xc0, 0x82, 0x88, 0x3a, 0xf0, 0x5a, + 0x58, 0xed, 0x70, 0x73, 0xce, 0x64, 0xe5, 0x19, 0x5b, 0x18, 0x98, 0x39, 0x06, 0x6e, 0xaf, 0xcb, + 0x39, 0x5a, 0x9f, 0x43, 0x23, 0x9f, 0x7b, 0xe3, 0x55, 0x41, 0xc7, 0xdb, 0xc3, 0x99, 0x73, 0x0b, + 0x63, 0x7b, 0x25, 0xab, 0xb5, 0x3e, 0x2b, 0xe2, 0xde, 0xc8, 0xf4, 0x7c, 0xce, 0x38, 0x7d, 0x9d, + 0xd2, 0xf8, 0x2b, 0x8b, 0x4a, 0x9d, 0x51, 0xc4, 0x38, 0x50, 0xfc, 0x13, 0xda, 0x11, 0xf2, 0xfb, + 0x36, 0xb7, 0xab, 0xda, 0xbe, 0xd6, 0xdc, 0x6d, 0x37, 0x8d, 0xd5, 0x8e, 0x85, 0x43, 0x57, 0xb4, + 0xca, 0x98, 0xb4, 0x8c, 0xcb, 0xde, 0x2f, 0xe0, 0xf0, 0x0b, 0xe0, 0xb6, 0x85, 0x1f, 0xa6, 0xf5, + 0xcc, 0x6c, 0x5a, 0x47, 0x0b, 0x1f, 0x49, 0xd0, 0xb0, 0x83, 0xf2, 0x2c, 0x04, 0xa7, 0x9a, 0x95, + 0xa8, 0xa7, 0xc6, 0x5b, 0xe6, 0xc0, 0x50, 0x32, 0xaf, 0x42, 0x70, 0xac, 0x4f, 0x14, 0x5d, 0x5e, + 0x58, 0x44, 0x82, 0xe3, 0x21, 0x2a, 0x32, 0x6e, 0xf3, 0x88, 0x55, 0x73, 0x92, 0xa6, 0xf3, 0x3e, + 0x1a, 0x09, 0x65, 0x7d, 0xaa, 0x88, 0x8a, 0xb1, 0x4d, 0x14, 0x45, 0xe3, 0x29, 0x87, 0xf6, 0x54, + 0x64, 0x27, 0xf0, 0xfb, 0x9e, 0x80, 0xc0, 0x27, 0x28, 0xcf, 0xef, 0x42, 0x90, 0xc5, 0x2b, 0x5b, + 0x5f, 0xcd, 0x35, 0x5e, 0xdf, 0x85, 0xf0, 0x32, 0xad, 0x7f, 0xfe, 0x3a, 0x5e, 0xf8, 0x89, 0xcc, + 0xc0, 0x3f, 0x26, 0xda, 0xb3, 0x32, 0xf7, 0xbb, 0x34, 0xed, 0xcb, 0xb4, 0xbe, 0x75, 0x44, 0x8d, + 0x04, 0x33, 0x2d, 0x13, 0x03, 0xaa, 0x8c, 0x6c, 0xc6, 0x7f, 0xa0, 0x41, 0x0f, 0xae, 0xbd, 0x31, + 0xa8, 0xd2, 0x6c, 0xe9, 0x2b, 0x33, 0x44, 0xd7, 0x44, 0x77, 0x45, 0xbc, 0xf5, 0x85, 0x12, 0x52, + 0xe9, 0x2e, 0xc3, 0x90, 0x34, 0x2a, 0xe6, 0x08, 0x0b, 0xc7, 0x35, 0xb5, 0x7d, 0x16, 0x3f, 0x4d, + 0x70, 0xe5, 0x3f, 0x92, 0xab, 0xa6, 0xb8, 0x70, 0x77, 0x05, 0x8b, 0xac, 0xc1, 0xc7, 0x5f, 0xa3, + 0x22, 0x05, 0x9b, 0x05, 0x7e, 0xb5, 0x20, 0x8b, 0x96, 0xf4, 0x8a, 0x48, 0x2f, 0x51, 0x7f, 0xf1, + 0x01, 0x2a, 0x8d, 0x81, 0x31, 0xdb, 0x85, 0x6a, 0x51, 0x06, 0x7e, 0xa6, 0x02, 0x4b, 0x17, 0xb1, + 0x9b, 0xcc, 0xff, 0x37, 0xfe, 0xd6, 0xd0, 0xae, 0x6a, 0x53, 0xd7, 0x63, 0x1c, 0xdf, 0xac, 0xac, + 0xc4, 0xe1, 0x87, 0x3c, 0x47, 0xe4, 0xca, 0xb5, 0xd8, 0x53, 0x4c, 0x3b, 0x73, 0xcf, 0xd2, 0x52, + 0xf4, 0x50, 0xc1, 0xe3, 0x30, 0x16, 0x2d, 0xcf, 0x35, 0x77, 0xdb, 0xdf, 0xbe, 0x6b, 0x5c, 0xad, + 0x8a, 0x62, 0x2a, 0x9c, 0x0b, 0x4c, 0x12, 0x43, 0x37, 0xfe, 0xc8, 0x26, 0xef, 0x11, 0x9b, 0x82, + 0xff, 0xd4, 0x50, 0x8d, 0x01, 0x9d, 0x00, 0x3d, 0xed, 0xf7, 0x29, 0x30, 0x66, 0xdd, 0x75, 0x46, + 0x1e, 0xf8, 0xbc, 0x73, 0x7e, 0x46, 0x58, 0x55, 0x93, 0x4a, 0x2e, 0xdf, 0xa6, 0xe4, 0x6a, 0x13, + 0xae, 0xd5, 0x50, 0xda, 0x6a, 0x1b, 0x43, 0x18, 0xd9, 0x22, 0x0b, 0xff, 0x8c, 0xca, 0x0c, 0x1c, + 0x0a, 0x9c, 0xc0, 0x40, 0xdd, 0x90, 0xf6, 0xf6, 0xcb, 0xd4, 0x0d, 0x1c, 0x7b, 0x14, 0x9f, 0x22, + 0x02, 0x03, 0xa0, 0xe0, 0x3b, 0x60, 0x55, 0x66, 0xd3, 0x7a, 0xf9, 0x6a, 0x0e, 0x44, 0x16, 0x98, + 0x8d, 0x27, 0x0d, 0x55, 0x52, 0x7b, 0x8f, 0xef, 0x11, 0x72, 0xe6, 0x3b, 0x35, 0xaf, 0xcb, 0xf7, + 0xef, 0xea, 0x50, 0xb2, 0xa2, 0x8b, 0x5b, 0x99, 0xb8, 0x18, 0x59, 0x62, 0xc3, 0x75, 0x54, 0xb8, + 0x0f, 0x7c, 0x60, 0xd5, 0xc2, 0x7e, 0xae, 0x59, 0xb6, 0xca, 0xa2, 0xab, 0x37, 0xc2, 0x41, 0x62, + 0x7f, 0x3c, 0xf8, 0xae, 0x17, 0xf8, 0x6a, 0x9e, 0x97, 0x06, 0x5f, 0x78, 0x89, 0xfa, 0xdb, 0xf8, + 0x4d, 0x43, 0x5f, 0x6e, 0x2c, 0x39, 0x6e, 0x23, 0xe4, 0x24, 0x96, 0xba, 0x59, 0x0b, 0x69, 0xc9, + 0x1f, 0xb2, 0x14, 0x85, 0xbf, 0x41, 0x95, 0x54, 0x9f, 0xd4, 0xb9, 0x4a, 0xae, 0x44, 0x8a, 0x8d, + 0xa4, 0x63, 0xad, 0x83, 0x87, 0x67, 0x3d, 0xf3, 0xf8, 0xac, 0x67, 0xfe, 0x79, 0xd6, 0x33, 0xbf, + 0xce, 0x74, 0xed, 0x61, 0xa6, 0x6b, 0x8f, 0x33, 0x5d, 0xfb, 0x77, 0xa6, 0x6b, 0xbf, 0xff, 0xa7, + 0x67, 0x6e, 0x4a, 0xaa, 0x66, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x63, 0x94, 0x8a, 0xdf, 0x70, + 0x08, 0x00, 0x00, } diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/generated.proto b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/generated.proto index db890906c5f..21738c5e7eb 100644 --- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/generated.proto @@ -22,8 +22,8 @@ syntax = 'proto2'; package k8s.io.kubernetes.federation.apis.federation.v1beta1; import "k8s.io/kubernetes/pkg/api/resource/generated.proto"; -import "k8s.io/kubernetes/pkg/api/unversioned/generated.proto"; import "k8s.io/kubernetes/pkg/api/v1/generated.proto"; +import "k8s.io/kubernetes/pkg/apis/meta/v1/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/generated.proto"; import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto"; import "k8s.io/kubernetes/pkg/util/intstr/generated.proto"; @@ -57,11 +57,11 @@ message ClusterCondition { // Last time the condition was checked. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastProbeTime = 3; // Last time the condition transit from one status to another. // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4; + optional k8s.io.kubernetes.pkg.apis.meta.v1.Time lastTransitionTime = 4; // (brief) reason for the condition's last transition. // +optional @@ -77,7 +77,7 @@ message ClusterList { // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - optional k8s.io.kubernetes.pkg.api.unversioned.ListMeta metadata = 1; + optional k8s.io.kubernetes.pkg.apis.meta.v1.ListMeta metadata = 1; // List of Cluster objects. repeated Cluster items = 2; diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/register.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/register.go index b67a342540b..7a5fe07afd8 100644 --- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/register.go +++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/register.go @@ -18,6 +18,7 @@ package v1beta1 import ( "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" versionedwatch "k8s.io/client-go/pkg/watch/versioned" @@ -40,7 +41,7 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterList{}, &v1.ListOptions{}, &v1.DeleteOptions{}, - &v1.ExportOptions{}, + &metav1.ExportOptions{}, ) versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion) return nil diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.generated.go index 7a6cc62a6aa..9d0fd1290b7 100644 --- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.generated.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" codec1978 "github.com/ugorji/go/codec" - pkg2_unversioned "k8s.io/client-go/pkg/api/unversioned" pkg1_v1 "k8s.io/client-go/pkg/api/v1" + pkg2_v1 "k8s.io/client-go/pkg/apis/meta/v1" pkg3_types "k8s.io/client-go/pkg/types" "reflect" "runtime" @@ -63,8 +63,8 @@ func init() { panic(err) } if false { // reference the types, but skip this branch at build/run time - var v0 pkg2_unversioned.Time - var v1 pkg1_v1.LocalObjectReference + var v0 pkg1_v1.LocalObjectReference + var v1 pkg2_v1.Time var v2 pkg3_types.UID var v3 time.Time _, _, _, _ = v0, v1, v2, v3 @@ -801,7 +801,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastProbeTime": if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv62 := &x.LastProbeTime yym63 := z.DecBinary() @@ -818,7 +818,7 @@ func (x *ClusterCondition) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "lastTransitionTime": if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv64 := &x.LastTransitionTime yym65 := z.DecBinary() @@ -903,7 +903,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastProbeTime = pkg2_unversioned.Time{} + x.LastProbeTime = pkg2_v1.Time{} } else { yyv71 := &x.LastProbeTime yym72 := z.DecBinary() @@ -930,7 +930,7 @@ func (x *ClusterCondition) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.LastTransitionTime = pkg2_unversioned.Time{} + x.LastTransitionTime = pkg2_v1.Time{} } else { yyv73 := &x.LastTransitionTime yym74 := z.DecBinary() @@ -1855,7 +1855,7 @@ func (x *ClusterList) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) { } case "metadata": if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv154 := &x.ListMeta yym155 := z.DecBinary() @@ -1936,7 +1936,7 @@ func (x *ClusterList) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) { } z.DecSendContainerState(codecSelfer_containerArrayElem1234) if r.TryDecodeAsNil() { - x.ListMeta = pkg2_unversioned.ListMeta{} + x.ListMeta = pkg2_v1.ListMeta{} } else { yyv161 := &x.ListMeta yym162 := z.DecBinary() diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.go index 99462df5c47..b65d701c01c 100644 --- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/types.go @@ -17,8 +17,8 @@ limitations under the License. package v1beta1 import ( - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match. @@ -64,10 +64,10 @@ type ClusterCondition struct { Status v1.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/kubernetes/pkg/api/v1.ConditionStatus"` // Last time the condition was checked. // +optional - LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` + LastProbeTime metav1.Time `json:"lastProbeTime,omitempty" protobuf:"bytes,3,opt,name=lastProbeTime"` // Last time the condition transit from one status to another. // +optional - LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,4,opt,name=lastTransitionTime"` // (brief) reason for the condition's last transition. // +optional Reason string `json:"reason,omitempty" protobuf:"bytes,5,opt,name=reason"` @@ -95,7 +95,7 @@ type ClusterStatus struct { // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation. type Cluster struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard object's metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata // +optional @@ -111,11 +111,11 @@ type Cluster struct { // A list of all the kubernetes clusters registered to the federation type ClusterList struct { - unversioned.TypeMeta `json:",inline"` + metav1.TypeMeta `json:",inline"` // Standard list metadata. // More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds // +optional - unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // List of Cluster objects. Items []Cluster `json:"items" protobuf:"bytes,2,rep,name=items"` diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..16b06a16211 --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/zz_generated.deepcopy.go @@ -0,0 +1,159 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package v1beta1 + +import ( + v1 "k8s.io/client-go/pkg/api/v1" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_Cluster, InType: reflect.TypeOf(&Cluster{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterCondition, InType: reflect.TypeOf(&ClusterCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterList, InType: reflect.TypeOf(&ClusterList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterSpec, InType: reflect.TypeOf(&ClusterSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ClusterStatus, InType: reflect.TypeOf(&ClusterStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_ServerAddressByClientCIDR, InType: reflect.TypeOf(&ServerAddressByClientCIDR{})}, + ) +} + +func DeepCopy_v1beta1_Cluster(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Cluster) + out := out.(*Cluster) + out.TypeMeta = in.TypeMeta + if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_ClusterSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_v1beta1_ClusterStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_v1beta1_ClusterCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterCondition) + out := out.(*ClusterCondition) + out.Type = in.Type + out.Status = in.Status + out.LastProbeTime = in.LastProbeTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_v1beta1_ClusterList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterList) + out := out.(*ClusterList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Cluster, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_Cluster(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_v1beta1_ClusterSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterSpec) + out := out.(*ClusterSpec) + if in.ServerAddressByClientCIDRs != nil { + in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs + *out = make([]ServerAddressByClientCIDR, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.ServerAddressByClientCIDRs = nil + } + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(v1.LocalObjectReference) + **out = **in + } else { + out.SecretRef = nil + } + return nil + } +} + +func DeepCopy_v1beta1_ClusterStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterStatus) + out := out.(*ClusterStatus) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ClusterCondition, len(*in)) + for i := range *in { + if err := DeepCopy_v1beta1_ClusterCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.Zones != nil { + in, out := &in.Zones, &out.Zones + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Zones = nil + } + out.Region = in.Region + return nil + } +} + +func DeepCopy_v1beta1_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServerAddressByClientCIDR) + out := out.(*ServerAddressByClientCIDR) + out.ClientCIDR = in.ClientCIDR + out.ServerAddress = in.ServerAddress + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go new file mode 100644 index 00000000000..32e8bc360af --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/zz_generated.deepcopy.go @@ -0,0 +1,200 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package federation + +import ( + api "k8s.io/client-go/pkg/api" + conversion "k8s.io/client-go/pkg/conversion" + runtime "k8s.io/client-go/pkg/runtime" + reflect "reflect" +) + +func init() { + SchemeBuilder.Register(RegisterDeepCopies) +} + +// RegisterDeepCopies adds deep-copy functions to the given scheme. Public +// to allow building arbitrary schemes. +func RegisterDeepCopies(scheme *runtime.Scheme) error { + return scheme.AddGeneratedDeepCopyFuncs( + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_Cluster, InType: reflect.TypeOf(&Cluster{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterCondition, InType: reflect.TypeOf(&ClusterCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterList, InType: reflect.TypeOf(&ClusterList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterReplicaSetPreferences, InType: reflect.TypeOf(&ClusterReplicaSetPreferences{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterSpec, InType: reflect.TypeOf(&ClusterSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ClusterStatus, InType: reflect.TypeOf(&ClusterStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_FederatedReplicaSetPreferences, InType: reflect.TypeOf(&FederatedReplicaSetPreferences{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_federation_ServerAddressByClientCIDR, InType: reflect.TypeOf(&ServerAddressByClientCIDR{})}, + ) +} + +func DeepCopy_federation_Cluster(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Cluster) + out := out.(*Cluster) + out.TypeMeta = in.TypeMeta + if err := api.DeepCopy_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil { + return err + } + if err := DeepCopy_federation_ClusterSpec(&in.Spec, &out.Spec, c); err != nil { + return err + } + if err := DeepCopy_federation_ClusterStatus(&in.Status, &out.Status, c); err != nil { + return err + } + return nil + } +} + +func DeepCopy_federation_ClusterCondition(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterCondition) + out := out.(*ClusterCondition) + out.Type = in.Type + out.Status = in.Status + out.LastProbeTime = in.LastProbeTime.DeepCopy() + out.LastTransitionTime = in.LastTransitionTime.DeepCopy() + out.Reason = in.Reason + out.Message = in.Message + return nil + } +} + +func DeepCopy_federation_ClusterList(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterList) + out := out.(*ClusterList) + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Cluster, len(*in)) + for i := range *in { + if err := DeepCopy_federation_Cluster(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil + } +} + +func DeepCopy_federation_ClusterReplicaSetPreferences(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterReplicaSetPreferences) + out := out.(*ClusterReplicaSetPreferences) + out.MinReplicas = in.MinReplicas + if in.MaxReplicas != nil { + in, out := &in.MaxReplicas, &out.MaxReplicas + *out = new(int64) + **out = **in + } else { + out.MaxReplicas = nil + } + out.Weight = in.Weight + return nil + } +} + +func DeepCopy_federation_ClusterSpec(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterSpec) + out := out.(*ClusterSpec) + if in.ServerAddressByClientCIDRs != nil { + in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs + *out = make([]ServerAddressByClientCIDR, len(*in)) + for i := range *in { + (*out)[i] = (*in)[i] + } + } else { + out.ServerAddressByClientCIDRs = nil + } + if in.SecretRef != nil { + in, out := &in.SecretRef, &out.SecretRef + *out = new(api.LocalObjectReference) + **out = **in + } else { + out.SecretRef = nil + } + return nil + } +} + +func DeepCopy_federation_ClusterStatus(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ClusterStatus) + out := out.(*ClusterStatus) + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]ClusterCondition, len(*in)) + for i := range *in { + if err := DeepCopy_federation_ClusterCondition(&(*in)[i], &(*out)[i], c); err != nil { + return err + } + } + } else { + out.Conditions = nil + } + if in.Zones != nil { + in, out := &in.Zones, &out.Zones + *out = make([]string, len(*in)) + copy(*out, *in) + } else { + out.Zones = nil + } + out.Region = in.Region + return nil + } +} + +func DeepCopy_federation_FederatedReplicaSetPreferences(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*FederatedReplicaSetPreferences) + out := out.(*FederatedReplicaSetPreferences) + out.Rebalance = in.Rebalance + if in.Clusters != nil { + in, out := &in.Clusters, &out.Clusters + *out = make(map[string]ClusterReplicaSetPreferences) + for key, val := range *in { + newVal := new(ClusterReplicaSetPreferences) + if err := DeepCopy_federation_ClusterReplicaSetPreferences(&val, newVal, c); err != nil { + return err + } + (*out)[key] = *newVal + } + } else { + out.Clusters = nil + } + return nil + } +} + +func DeepCopy_federation_ServerAddressByClientCIDR(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*ServerAddressByClientCIDR) + out := out.(*ServerAddressByClientCIDR) + out.ClientCIDR = in.ClientCIDR + out.ServerAddress = in.ServerAddress + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/runtime/generated.proto b/staging/src/k8s.io/client-go/pkg/runtime/generated.proto index 136ab0b5e3c..bd0e893ba14 100644 --- a/staging/src/k8s.io/client-go/pkg/runtime/generated.proto +++ b/staging/src/k8s.io/client-go/pkg/runtime/generated.proto @@ -85,7 +85,7 @@ message RawExtension { // runtime.TypeMeta `json:",inline"` // ... // other fields // } -// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *unversioned.GroupVersionKind) { unversioned.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind +// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind // // TypeMeta is provided here for convenience. You may use it directly from this package or define // your own with the same fields. diff --git a/staging/src/k8s.io/client-go/pkg/runtime/types.go b/staging/src/k8s.io/client-go/pkg/runtime/types.go index ceffdd9f774..9a2a1b6bc92 100644 --- a/staging/src/k8s.io/client-go/pkg/runtime/types.go +++ b/staging/src/k8s.io/client-go/pkg/runtime/types.go @@ -25,7 +25,7 @@ package runtime // runtime.TypeMeta `json:",inline"` // ... // other fields // } -// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *unversioned.GroupVersionKind) { unversioned.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind +// func (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind // // TypeMeta is provided here for convenience. You may use it directly from this package or define // your own with the same fields. diff --git a/staging/src/k8s.io/client-go/pkg/runtime/unstructured.go b/staging/src/k8s.io/client-go/pkg/runtime/unstructured.go index 7a0e76b672f..143e34b0cd8 100644 --- a/staging/src/k8s.io/client-go/pkg/runtime/unstructured.go +++ b/staging/src/k8s.io/client-go/pkg/runtime/unstructured.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" "k8s.io/client-go/pkg/api/meta/metatypes" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/types" "k8s.io/client-go/pkg/util/json" @@ -287,19 +287,19 @@ func (u *Unstructured) SetSelfLink(selfLink string) { u.setNestedField(selfLink, "metadata", "selfLink") } -func (u *Unstructured) GetCreationTimestamp() unversioned.Time { - var timestamp unversioned.Time +func (u *Unstructured) GetCreationTimestamp() metav1.Time { + var timestamp metav1.Time timestamp.UnmarshalQueryParameter(getNestedString(u.Object, "metadata", "creationTimestamp")) return timestamp } -func (u *Unstructured) SetCreationTimestamp(timestamp unversioned.Time) { +func (u *Unstructured) SetCreationTimestamp(timestamp metav1.Time) { ts, _ := timestamp.MarshalQueryParameter() u.setNestedField(ts, "metadata", "creationTimestamp") } -func (u *Unstructured) GetDeletionTimestamp() *unversioned.Time { - var timestamp unversioned.Time +func (u *Unstructured) GetDeletionTimestamp() *metav1.Time { + var timestamp metav1.Time timestamp.UnmarshalQueryParameter(getNestedString(u.Object, "metadata", "deletionTimestamp")) if timestamp.IsZero() { return nil @@ -307,7 +307,7 @@ func (u *Unstructured) GetDeletionTimestamp() *unversioned.Time { return ×tamp } -func (u *Unstructured) SetDeletionTimestamp(timestamp *unversioned.Time) { +func (u *Unstructured) SetDeletionTimestamp(timestamp *metav1.Time) { ts, _ := timestamp.MarshalQueryParameter() u.setNestedField(ts, "metadata", "deletionTimestamp") } diff --git a/staging/src/k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go new file mode 100644 index 00000000000..09bf660025b --- /dev/null +++ b/staging/src/k8s.io/client-go/pkg/runtime/zz_generated.deepcopy.go @@ -0,0 +1,75 @@ +// +build !ignore_autogenerated + +/* +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. +*/ + +// This file was autogenerated by deepcopy-gen. Do not edit it manually! + +package runtime + +import ( + conversion "k8s.io/client-go/pkg/conversion" +) + +func DeepCopy_runtime_RawExtension(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*RawExtension) + out := out.(*RawExtension) + if in.Raw != nil { + in, out := &in.Raw, &out.Raw + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Raw = nil + } + if in.Object == nil { + out.Object = nil + } else if newVal, err := c.DeepCopy(&in.Object); err != nil { + return err + } else { + out.Object = *newVal.(*Object) + } + return nil + } +} + +func DeepCopy_runtime_TypeMeta(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*TypeMeta) + out := out.(*TypeMeta) + out.APIVersion = in.APIVersion + out.Kind = in.Kind + return nil + } +} + +func DeepCopy_runtime_Unknown(in interface{}, out interface{}, c *conversion.Cloner) error { + { + in := in.(*Unknown) + out := out.(*Unknown) + out.TypeMeta = in.TypeMeta + if in.Raw != nil { + in, out := &in.Raw, &out.Raw + *out = make([]byte, len(*in)) + copy(*out, *in) + } else { + out.Raw = nil + } + out.ContentEncoding = in.ContentEncoding + out.ContentType = in.ContentType + return nil + } +} diff --git a/staging/src/k8s.io/client-go/pkg/util/cert/io.go b/staging/src/k8s.io/client-go/pkg/util/cert/io.go index 9a3e1622f37..377b3d5892f 100644 --- a/staging/src/k8s.io/client-go/pkg/util/cert/io.go +++ b/staging/src/k8s.io/client-go/pkg/util/cert/io.go @@ -25,14 +25,25 @@ import ( "path/filepath" ) -// CanReadCertOrKey returns true if the certificate or key files already exists, -// otherwise returns false. -func CanReadCertOrKey(certPath, keyPath string) bool { - if canReadFile(certPath) || canReadFile(keyPath) { - return true +// CanReadCertAndKey returns true if the certificate and key files already exists, +// otherwise returns false. If lost one of cert and key, returns error. +func CanReadCertAndKey(certPath, keyPath string) (bool, error) { + certReadable := canReadFile(certPath) + keyReadable := canReadFile(keyPath) + + if certReadable == false && keyReadable == false { + return false, nil } - return false + if certReadable == false { + return false, fmt.Errorf("error reading %s, certificate and key must be supplied as a pair", certPath) + } + + if keyReadable == false { + return false, fmt.Errorf("error reading %s, certificate and key must be supplied as a pair", keyPath) + } + + return true, nil } // If the file represented by path exists and diff --git a/staging/src/k8s.io/client-go/pkg/util/httpstream/spdy/roundtripper.go b/staging/src/k8s.io/client-go/pkg/util/httpstream/spdy/roundtripper.go index 2fb55950f32..d7fceb3dd35 100644 --- a/staging/src/k8s.io/client-go/pkg/util/httpstream/spdy/roundtripper.go +++ b/staging/src/k8s.io/client-go/pkg/util/httpstream/spdy/roundtripper.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/pkg/api" apierrors "k8s.io/client-go/pkg/api/errors" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/third_party/forked/golang/netutil" "k8s.io/client-go/pkg/util/httpstream" ) @@ -72,6 +72,11 @@ func NewSpdyRoundTripper(tlsConfig *tls.Config) *SpdyRoundTripper { return &SpdyRoundTripper{tlsConfig: tlsConfig} } +// implements pkg/util/net.TLSClientConfigHolder for proper TLS checking during proxying with a spdy roundtripper +func (s *SpdyRoundTripper) TLSClientConfig() *tls.Config { + return s.tlsConfig +} + // dial dials the host specified by req, using TLS if appropriate, optionally // using a proxy server if one is configured via environment variables. func (s *SpdyRoundTripper) dial(req *http.Request) (net.Conn, error) { @@ -246,8 +251,8 @@ func (s *SpdyRoundTripper) NewConnection(resp *http.Response) (httpstream.Connec responseError = "unable to read error from server response" } else { // TODO: I don't belong here, I should be abstracted from this class - if obj, _, err := api.Codecs.UniversalDecoder().Decode(responseErrorBytes, nil, &unversioned.Status{}); err == nil { - if status, ok := obj.(*unversioned.Status); ok { + if obj, _, err := api.Codecs.UniversalDecoder().Decode(responseErrorBytes, nil, &metav1.Status{}); err == nil { + if status, ok := obj.(*metav1.Status); ok { return nil, &apierrors.StatusError{ErrStatus: *status} } } diff --git a/staging/src/k8s.io/client-go/pkg/util/intstr/intstr.go b/staging/src/k8s.io/client-go/pkg/util/intstr/intstr.go index a365f623e58..c3cfb3477a9 100644 --- a/staging/src/k8s.io/client-go/pkg/util/intstr/intstr.go +++ b/staging/src/k8s.io/client-go/pkg/util/intstr/intstr.go @@ -20,12 +20,14 @@ import ( "encoding/json" "fmt" "math" + "runtime/debug" "strconv" "strings" "k8s.io/client-go/pkg/genericapiserver/openapi/common" "github.com/go-openapi/spec" + "github.com/golang/glog" "github.com/google/gofuzz" ) @@ -57,6 +59,9 @@ const ( // than int32. // TODO: convert to (val int32) func FromInt(val int) IntOrString { + if val > math.MaxInt32 || val < math.MinInt32 { + glog.Errorf("value: %d overflows int32\n%s\n", val, debug.Stack()) + } return IntOrString{Type: Int, IntVal: int32(val)} } @@ -65,6 +70,16 @@ func FromString(val string) IntOrString { return IntOrString{Type: String, StrVal: val} } +// Parse the given string and try to convert it to an integer before +// setting it as a string value. +func Parse(val string) IntOrString { + i, err := strconv.Atoi(val) + if err != nil { + return FromString(val) + } + return FromInt(i) +} + // UnmarshalJSON implements the json.Unmarshaller interface. func (intstr *IntOrString) UnmarshalJSON(value []byte) error { if value[0] == '"' { diff --git a/staging/src/k8s.io/client-go/pkg/util/labels/labels.go b/staging/src/k8s.io/client-go/pkg/util/labels/labels.go index 3e1f623e548..2b16fbd297b 100644 --- a/staging/src/k8s.io/client-go/pkg/util/labels/labels.go +++ b/staging/src/k8s.io/client-go/pkg/util/labels/labels.go @@ -19,7 +19,7 @@ package labels import ( "fmt" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) // Clones the given map and returns a new map with the given key and value added. @@ -69,14 +69,14 @@ func AddLabel(labels map[string]string, labelKey string, labelValue string) map[ // Clones the given selector and returns a new selector with the given key and value added. // Returns the given selector, if labelKey is empty. -func CloneSelectorAndAddLabel(selector *unversioned.LabelSelector, labelKey string, labelValue uint32) *unversioned.LabelSelector { +func CloneSelectorAndAddLabel(selector *metav1.LabelSelector, labelKey string, labelValue uint32) *metav1.LabelSelector { if labelKey == "" { // Don't need to add a label. return selector } // Clone. - newSelector := new(unversioned.LabelSelector) + newSelector := new(metav1.LabelSelector) // TODO(madhusudancs): Check if you can use deepCopy_extensions_LabelSelector here. newSelector.MatchLabels = make(map[string]string) @@ -88,7 +88,7 @@ func CloneSelectorAndAddLabel(selector *unversioned.LabelSelector, labelKey stri newSelector.MatchLabels[labelKey] = fmt.Sprintf("%d", labelValue) if selector.MatchExpressions != nil { - newMExps := make([]unversioned.LabelSelectorRequirement, len(selector.MatchExpressions)) + newMExps := make([]metav1.LabelSelectorRequirement, len(selector.MatchExpressions)) for i, me := range selector.MatchExpressions { newMExps[i].Key = me.Key newMExps[i].Operator = me.Operator @@ -108,7 +108,7 @@ func CloneSelectorAndAddLabel(selector *unversioned.LabelSelector, labelKey stri } // AddLabelToSelector returns a selector with the given key and value added to the given selector's MatchLabels. -func AddLabelToSelector(selector *unversioned.LabelSelector, labelKey string, labelValue string) *unversioned.LabelSelector { +func AddLabelToSelector(selector *metav1.LabelSelector, labelKey string, labelValue string) *metav1.LabelSelector { if labelKey == "" { // Don't need to add a label. return selector @@ -121,6 +121,6 @@ func AddLabelToSelector(selector *unversioned.LabelSelector, labelKey string, la } // SelectorHasLabel checks if the given selector contains the given label key in its MatchLabels -func SelectorHasLabel(selector *unversioned.LabelSelector, labelKey string) bool { +func SelectorHasLabel(selector *metav1.LabelSelector, labelKey string) bool { return len(selector.MatchLabels[labelKey]) > 0 } diff --git a/staging/src/k8s.io/client-go/pkg/util/net/http.go b/staging/src/k8s.io/client-go/pkg/util/net/http.go index bfe2e09375a..c32082e9315 100644 --- a/staging/src/k8s.io/client-go/pkg/util/net/http.go +++ b/staging/src/k8s.io/client-go/pkg/util/net/http.go @@ -138,6 +138,10 @@ func CloneTLSConfig(cfg *tls.Config) *tls.Config { } } +type TLSClientConfigHolder interface { + TLSClientConfig() *tls.Config +} + func TLSClientConfig(transport http.RoundTripper) (*tls.Config, error) { if transport == nil { return nil, nil @@ -146,6 +150,8 @@ func TLSClientConfig(transport http.RoundTripper) (*tls.Config, error) { switch transport := transport.(type) { case *http.Transport: return transport.TLSClientConfig, nil + case TLSClientConfigHolder: + return transport.TLSClientConfig(), nil case RoundTripperWrapper: return TLSClientConfig(transport.WrappedRoundTripper()) default: diff --git a/staging/src/k8s.io/client-go/pkg/util/rand/rand.go b/staging/src/k8s.io/client-go/pkg/util/rand/rand.go index 134c1526050..db109c2cd2a 100644 --- a/staging/src/k8s.io/client-go/pkg/util/rand/rand.go +++ b/staging/src/k8s.io/client-go/pkg/util/rand/rand.go @@ -23,8 +23,6 @@ import ( "time" ) -var letters = []rune("abcdefghijklmnopqrstuvwxyz0123456789") -var numLetters = len(letters) var rng = struct { sync.Mutex rand *rand.Rand @@ -72,12 +70,16 @@ func Perm(n int) []int { return rng.rand.Perm(n) } -// String generates a random alphanumeric string n characters long. This will -// panic if n is less than zero. +// We omit vowels from the set of available characters to reduce the chances +// of "bad words" being formed. +var alphanums = []rune("bcdfghjklmnpqrstvwxz0123456789") + +// String generates a random alphanumeric string, without vowels, which is n +// characters long. This will panic if n is less than zero. func String(length int) string { b := make([]rune, length) for i := range b { - b[i] = letters[Intn(numLetters)] + b[i] = alphanums[Intn(len(alphanums))] } return string(b) } diff --git a/staging/src/k8s.io/client-go/pkg/util/strategicpatch/patch.go b/staging/src/k8s.io/client-go/pkg/util/strategicpatch/patch.go index 0f9b312224c..56affaa9151 100644 --- a/staging/src/k8s.io/client-go/pkg/util/strategicpatch/patch.go +++ b/staging/src/k8s.io/client-go/pkg/util/strategicpatch/patch.go @@ -21,7 +21,6 @@ import ( "reflect" "sort" - "k8s.io/client-go/discovery" forkedjson "k8s.io/client-go/pkg/third_party/forked/golang/json" "k8s.io/client-go/pkg/util/json" @@ -39,20 +38,11 @@ import ( // Some of the content of this package was borrowed with minor adaptations from // evanphx/json-patch and openshift/origin. -type StrategicMergePatchVersion string - const ( - directiveMarker = "$patch" - deleteDirective = "delete" - replaceDirective = "replace" - mergeDirective = "merge" - mergePrimitivesListDirective = "mergeprimitiveslist" - - // different versions of StrategicMergePatch - SMPatchVersion_1_0 StrategicMergePatchVersion = "v1.0.0" - SMPatchVersion_1_5 StrategicMergePatchVersion = "v1.5.0" - Unknown StrategicMergePatchVersion = "Unknown" - SMPatchVersionLatest = SMPatchVersion_1_5 + directiveMarker = "$patch" + deleteDirective = "delete" + replaceDirective = "replace" + mergeDirective = "merge" ) // IsPreconditionFailed returns true if the provided error indicates @@ -97,7 +87,6 @@ func IsConflict(err error) bool { var errBadJSONDoc = fmt.Errorf("Invalid JSON document") var errNoListOfLists = fmt.Errorf("Lists of lists are not supported") -var errNoElementsInSlice = fmt.Errorf("no elements in any of the given slices") // The following code is adapted from github.com/openshift/origin/pkg/util/jsonmerge. // Instead of defining a Delta that holds an original, a patch and a set of preconditions, @@ -144,15 +133,15 @@ func RequireMetadataKeyUnchanged(key string) PreconditionFunc { } // Deprecated: Use the synonym CreateTwoWayMergePatch, instead. -func CreateStrategicMergePatch(original, modified []byte, dataStruct interface{}, smPatchVersion StrategicMergePatchVersion) ([]byte, error) { - return CreateTwoWayMergePatch(original, modified, dataStruct, smPatchVersion) +func CreateStrategicMergePatch(original, modified []byte, dataStruct interface{}) ([]byte, error) { + return CreateTwoWayMergePatch(original, modified, dataStruct) } // CreateTwoWayMergePatch creates a patch that can be passed to StrategicMergePatch from an original // document and a modified document, which are passed to the method as json encoded content. It will // return a patch that yields the modified document when applied to the original document, or an error // if either of the two documents is invalid. -func CreateTwoWayMergePatch(original, modified []byte, dataStruct interface{}, smPatchVersion StrategicMergePatchVersion, fns ...PreconditionFunc) ([]byte, error) { +func CreateTwoWayMergePatch(original, modified []byte, dataStruct interface{}, fns ...PreconditionFunc) ([]byte, error) { originalMap := map[string]interface{}{} if len(original) > 0 { if err := json.Unmarshal(original, &originalMap); err != nil { @@ -172,7 +161,7 @@ func CreateTwoWayMergePatch(original, modified []byte, dataStruct interface{}, s return nil, err } - patchMap, err := diffMaps(originalMap, modifiedMap, t, false, false, smPatchVersion) + patchMap, err := diffMaps(originalMap, modifiedMap, t, false, false) if err != nil { return nil, err } @@ -188,7 +177,7 @@ func CreateTwoWayMergePatch(original, modified []byte, dataStruct interface{}, s } // Returns a (recursive) strategic merge patch that yields modified when applied to original. -func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreChangesAndAdditions, ignoreDeletions bool, smPatchVersion StrategicMergePatchVersion) (map[string]interface{}, error) { +func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreChangesAndAdditions, ignoreDeletions bool) (map[string]interface{}, error) { patch := map[string]interface{}{} if t.Kind() == reflect.Ptr { t = t.Elem() @@ -241,7 +230,7 @@ func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreC return nil, err } - patchValue, err := diffMaps(originalValueTyped, modifiedValueTyped, fieldType, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) + patchValue, err := diffMaps(originalValueTyped, modifiedValueTyped, fieldType, ignoreChangesAndAdditions, ignoreDeletions) if err != nil { return nil, err } @@ -259,25 +248,13 @@ func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreC } if fieldPatchStrategy == mergeDirective { - patchValue, err := diffLists(originalValueTyped, modifiedValueTyped, fieldType.Elem(), fieldPatchMergeKey, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) + patchValue, err := diffLists(originalValueTyped, modifiedValueTyped, fieldType.Elem(), fieldPatchMergeKey, ignoreChangesAndAdditions, ignoreDeletions) if err != nil { return nil, err } - if patchValue == nil { - continue - } - switch typedPatchValue := patchValue.(type) { - case []interface{}: - if len(typedPatchValue) > 0 { - patch[key] = typedPatchValue - } - case map[string]interface{}: - if len(typedPatchValue) > 0 { - patch[key] = typedPatchValue - } - default: - return nil, fmt.Errorf("invalid type of patch: %v", reflect.TypeOf(patchValue)) + if len(patchValue) > 0 { + patch[key] = patchValue } continue @@ -307,7 +284,7 @@ func diffMaps(original, modified map[string]interface{}, t reflect.Type, ignoreC // Returns a (recursive) strategic merge patch that yields modified when applied to original, // for a pair of lists with merge semantics. -func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool, smPatchVersion StrategicMergePatchVersion) (interface{}, error) { +func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool) ([]interface{}, error) { if len(original) == 0 { if len(modified) == 0 || ignoreChangesAndAdditions { return nil, nil @@ -321,14 +298,12 @@ func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string return nil, err } - var patch interface{} + var patch []interface{} if elementType.Kind() == reflect.Map { - patch, err = diffListsOfMaps(original, modified, t, mergeKey, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) - } else if elementType.Kind() == reflect.Slice { - err = errNoListOfLists - } else { - patch, err = diffListsOfScalars(original, modified, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) + patch, err = diffListsOfMaps(original, modified, t, mergeKey, ignoreChangesAndAdditions, ignoreDeletions) + } else if !ignoreChangesAndAdditions { + patch, err = diffListsOfScalars(original, modified) } if err != nil { @@ -340,23 +315,8 @@ func diffLists(original, modified []interface{}, t reflect.Type, mergeKey string // Returns a (recursive) strategic merge patch that yields modified when applied to original, // for a pair of lists of scalars with merge semantics. -func diffListsOfScalars(original, modified []interface{}, ignoreChangesAndAdditions, ignoreDeletions bool, smPatchVersion StrategicMergePatchVersion) (interface{}, error) { - originalScalars := uniqifyAndSortScalars(original) - modifiedScalars := uniqifyAndSortScalars(modified) - - switch smPatchVersion { - case SMPatchVersion_1_5: - return diffListsOfScalarsIntoMap(originalScalars, modifiedScalars, ignoreChangesAndAdditions, ignoreDeletions) - case SMPatchVersion_1_0: - return diffListsOfScalarsIntoSlice(originalScalars, modifiedScalars, ignoreChangesAndAdditions, ignoreDeletions) - default: - return nil, fmt.Errorf("Unknown StrategicMergePatchVersion: %v", smPatchVersion) - } -} - -func diffListsOfScalarsIntoSlice(originalScalars, modifiedScalars []interface{}, ignoreChangesAndAdditions, ignoreDeletions bool) ([]interface{}, error) { - originalIndex, modifiedIndex := 0, 0 - if len(modifiedScalars) == 0 { +func diffListsOfScalars(original, modified []interface{}) ([]interface{}, error) { + if len(modified) == 0 { // There is no need to check the length of original because there is no way to create // a patch that deletes a scalar from a list of scalars with merge semantics. return nil, nil @@ -364,14 +324,18 @@ func diffListsOfScalarsIntoSlice(originalScalars, modifiedScalars []interface{}, patch := []interface{}{} + originalScalars := uniqifyAndSortScalars(original) + modifiedScalars := uniqifyAndSortScalars(modified) + originalIndex, modifiedIndex := 0, 0 + loopB: for ; modifiedIndex < len(modifiedScalars); modifiedIndex++ { for ; originalIndex < len(originalScalars); originalIndex++ { - originalString := fmt.Sprintf("%v", originalScalars[originalIndex]) - modifiedString := fmt.Sprintf("%v", modifiedScalars[modifiedIndex]) + originalString := fmt.Sprintf("%v", original[originalIndex]) + modifiedString := fmt.Sprintf("%v", modified[modifiedIndex]) if originalString >= modifiedString { if originalString != modifiedString { - patch = append(patch, modifiedScalars[modifiedIndex]) + patch = append(patch, modified[modifiedIndex]) } continue loopB @@ -385,57 +349,7 @@ loopB: // Add any remaining items found only in modified for ; modifiedIndex < len(modifiedScalars); modifiedIndex++ { - patch = append(patch, modifiedScalars[modifiedIndex]) - } - - return patch, nil -} - -func diffListsOfScalarsIntoMap(originalScalars, modifiedScalars []interface{}, ignoreChangesAndAdditions, ignoreDeletions bool) (map[string]interface{}, error) { - originalIndex, modifiedIndex := 0, 0 - patch := map[string]interface{}{} - patch[directiveMarker] = mergePrimitivesListDirective - - for originalIndex < len(originalScalars) && modifiedIndex < len(modifiedScalars) { - originalString := fmt.Sprintf("%v", originalScalars[originalIndex]) - modifiedString := fmt.Sprintf("%v", modifiedScalars[modifiedIndex]) - - // objects are identical - if originalString == modifiedString { - originalIndex++ - modifiedIndex++ - continue - } - - if originalString > modifiedString { - if !ignoreChangesAndAdditions { - modifiedValue := modifiedScalars[modifiedIndex] - patch[modifiedString] = modifiedValue - } - modifiedIndex++ - } else { - if !ignoreDeletions { - patch[originalString] = nil - } - originalIndex++ - } - } - - // Delete any remaining items found only in original - if !ignoreDeletions { - for ; originalIndex < len(originalScalars); originalIndex++ { - originalString := fmt.Sprintf("%v", originalScalars[originalIndex]) - patch[originalString] = nil - } - } - - // Add any remaining items found only in modified - if !ignoreChangesAndAdditions { - for ; modifiedIndex < len(modifiedScalars); modifiedIndex++ { - modifiedString := fmt.Sprintf("%v", modifiedScalars[modifiedIndex]) - modifiedValue := modifiedScalars[modifiedIndex] - patch[modifiedString] = modifiedValue - } + patch = append(patch, modified[modifiedIndex]) } return patch, nil @@ -446,7 +360,7 @@ var errBadArgTypeFmt = "expected a %s, but received a %s" // Returns a (recursive) strategic merge patch that yields modified when applied to original, // for a pair of lists of maps with merge semantics. -func diffListsOfMaps(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool, smPatchVersion StrategicMergePatchVersion) ([]interface{}, error) { +func diffListsOfMaps(original, modified []interface{}, t reflect.Type, mergeKey string, ignoreChangesAndAdditions, ignoreDeletions bool) ([]interface{}, error) { patch := make([]interface{}, 0) originalSorted, err := sortMergeListsByNameArray(original, t, mergeKey, false) @@ -492,7 +406,7 @@ loopB: if originalString >= modifiedString { if originalString == modifiedString { // Merge key values are equal, so recurse - patchValue, err := diffMaps(originalMap, modifiedMap, t, ignoreChangesAndAdditions, ignoreDeletions, smPatchVersion) + patchValue, err := diffMaps(originalMap, modifiedMap, t, ignoreChangesAndAdditions, ignoreDeletions) if err != nil { return nil, err } @@ -628,15 +542,7 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin return map[string]interface{}{}, nil } - if v == mergePrimitivesListDirective { - // delete the directiveMarker's key-value pair to avoid delta map and delete map - // overlaping with each other when calculating a ThreeWayDiff for list of Primitives. - // Otherwise, the overlaping will cause it calling LookupPatchMetadata() which will - // return an error since the metadata shows it's a slice but it is actually a map. - delete(original, directiveMarker) - } else { - return nil, fmt.Errorf(errBadPatchTypeFmt, v, patch) - } + return nil, fmt.Errorf(errBadPatchTypeFmt, v, patch) } // nil is an accepted value for original to simplify logic in other places. @@ -672,9 +578,7 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin // If they're both maps or lists, recurse into the value. originalType := reflect.TypeOf(original[k]) patchType := reflect.TypeOf(patchV) - // check if we are trying to merge a slice with a map for list of primitives - isMergeSliceOfPrimitivesWithAPatchMap := originalType != nil && patchType != nil && originalType.Kind() == reflect.Slice && patchType.Kind() == reflect.Map - if originalType == patchType || isMergeSliceOfPrimitivesWithAPatchMap { + if originalType == patchType { // First find the fieldPatchStrategy and fieldPatchMergeKey. fieldType, fieldPatchStrategy, fieldPatchMergeKey, err := forkedjson.LookupPatchMetadata(t, k) if err != nil { @@ -696,8 +600,9 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin if originalType.Kind() == reflect.Slice && fieldPatchStrategy == mergeDirective { elemType := fieldType.Elem() typedOriginal := original[k].([]interface{}) + typedPatch := patchV.([]interface{}) var err error - original[k], err = mergeSlice(typedOriginal, patchV, elemType, fieldPatchMergeKey) + original[k], err = mergeSlice(typedOriginal, typedPatch, elemType, fieldPatchMergeKey) if err != nil { return nil, err } @@ -718,34 +623,13 @@ func mergeMap(original, patch map[string]interface{}, t reflect.Type) (map[strin // Merge two slices together. Note: This may modify both the original slice and // the patch because getting a deep copy of a slice in golang is highly // non-trivial. -// The patch could be a map[string]interface{} representing a slice of primitives. -// If the patch map doesn't has the specific directiveMarker (mergePrimitivesListDirective), -// it returns an error. Please check patch_test.go and find the test case named -// "merge lists of scalars for list of primitives" to see what the patch looks like. -// Patch is still []interface{} for all the other types. -func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type, mergeKey string) ([]interface{}, error) { - t, err := sliceElementType(original) - if err != nil && err != errNoElementsInSlice { - return nil, err - } - - if patchMap, ok := patch.(map[string]interface{}); ok { - // We try to merge the original slice with a patch map only when the map has - // a specific directiveMarker. Otherwise, this patch will be treated as invalid. - if directiveValue, ok := patchMap[directiveMarker]; ok && directiveValue == mergePrimitivesListDirective { - return mergeSliceOfScalarsWithPatchMap(original, patchMap) - } else { - return nil, fmt.Errorf("Unable to merge a slice with an invalid map") - } - } - - typedPatch := patch.([]interface{}) - if len(original) == 0 && len(typedPatch) == 0 { +func mergeSlice(original, patch []interface{}, elemType reflect.Type, mergeKey string) ([]interface{}, error) { + if len(original) == 0 && len(patch) == 0 { return original, nil } // All the values must be of the same type, but not a list. - t, err = sliceElementType(original, typedPatch) + t, err := sliceElementType(original, patch) if err != nil { return nil, err } @@ -754,7 +638,7 @@ func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type if t.Kind() != reflect.Map { // Maybe in the future add a "concat" mode that doesn't // uniqify. - both := append(original, typedPatch...) + both := append(original, patch...) return uniqifyScalars(both), nil } @@ -765,7 +649,7 @@ func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type // First look for any special $patch elements. patchWithoutSpecialElements := []interface{}{} replace := false - for _, v := range typedPatch { + for _, v := range patch { typedV := v.(map[string]interface{}) patchType, ok := typedV[directiveMarker] if ok { @@ -801,10 +685,10 @@ func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type return patchWithoutSpecialElements, nil } - typedPatch = patchWithoutSpecialElements + patch = patchWithoutSpecialElements // Merge patch into original. - for _, v := range typedPatch { + for _, v := range patch { // Because earlier we confirmed that all the elements are maps. typedV := v.(map[string]interface{}) mergeValue, ok := typedV[mergeKey] @@ -837,36 +721,6 @@ func mergeSlice(original []interface{}, patch interface{}, elemType reflect.Type return original, nil } -// mergeSliceOfScalarsWithPatchMap merges the original slice with a patch map and -// returns an uniqified and sorted slice of primitives. -// The patch map must have the specific directiveMarker (mergePrimitivesListDirective). -func mergeSliceOfScalarsWithPatchMap(original []interface{}, patch map[string]interface{}) ([]interface{}, error) { - // make sure the patch has the specific directiveMarker () - if directiveValue, ok := patch[directiveMarker]; ok && directiveValue != mergePrimitivesListDirective { - return nil, fmt.Errorf("Unable to merge a slice with an invalid map") - } - delete(patch, directiveMarker) - output := make([]interface{}, 0, len(original)+len(patch)) - for _, value := range original { - valueString := fmt.Sprintf("%v", value) - if v, ok := patch[valueString]; ok { - if v != nil { - output = append(output, v) - } - delete(patch, valueString) - } else { - output = append(output, value) - } - } - for _, value := range patch { - if value != nil { - output = append(output, value) - } - // No action required to delete items that missing from the original slice. - } - return uniqifyAndSortScalars(output), nil -} - // This method no longer panics if any element of the slice is not a map. func findMapInSliceBasedOnKeyValue(m []interface{}, key string, value interface{}) (map[string]interface{}, int, bool, error) { for k, v := range m { @@ -1092,7 +946,7 @@ func sliceElementType(slices ...[]interface{}) (reflect.Type, error) { } if prevType == nil { - return nil, errNoElementsInSlice + return nil, fmt.Errorf("no elements in any of the given slices") } return prevType, nil @@ -1181,10 +1035,6 @@ func mergingMapFieldsHaveConflicts( if leftMarker != rightMarker { return true, nil } - - if leftMarker == mergePrimitivesListDirective && rightMarker == mergePrimitivesListDirective { - return false, nil - } } // Check the individual keys. @@ -1207,29 +1057,12 @@ func mergingMapFieldsHaveConflicts( } func mapsHaveConflicts(typedLeft, typedRight map[string]interface{}, structType reflect.Type) (bool, error) { - isForListOfPrimitives := false - if leftDirective, ok := typedLeft[directiveMarker]; ok { - if rightDirective, ok := typedRight[directiveMarker]; ok { - if leftDirective == mergePrimitivesListDirective && rightDirective == rightDirective { - isForListOfPrimitives = true - } - } - } for key, leftValue := range typedLeft { if key != directiveMarker { if rightValue, ok := typedRight[key]; ok { - var fieldType reflect.Type - var fieldPatchStrategy, fieldPatchMergeKey string - var err error - if isForListOfPrimitives { - fieldType = reflect.TypeOf(leftValue) - fieldPatchStrategy = "" - fieldPatchMergeKey = "" - } else { - fieldType, fieldPatchStrategy, fieldPatchMergeKey, err = forkedjson.LookupPatchMetadata(structType, key) - if err != nil { - return true, err - } + fieldType, fieldPatchStrategy, fieldPatchMergeKey, err := forkedjson.LookupPatchMetadata(structType, key) + if err != nil { + return true, err } if hasConflicts, err := mergingMapFieldsHaveConflicts(leftValue, rightValue, @@ -1339,7 +1172,7 @@ func mapsOfMapsHaveConflicts(typedLeft, typedRight map[string]interface{}, struc // than from original to current. In other words, a conflict occurs if modified changes any key // in a way that is different from how it is changed in current (e.g., deleting it, changing its // value). -func CreateThreeWayMergePatch(original, modified, current []byte, dataStruct interface{}, overwrite bool, smPatchVersion StrategicMergePatchVersion, fns ...PreconditionFunc) ([]byte, error) { +func CreateThreeWayMergePatch(original, modified, current []byte, dataStruct interface{}, overwrite bool, fns ...PreconditionFunc) ([]byte, error) { originalMap := map[string]interface{}{} if len(original) > 0 { if err := json.Unmarshal(original, &originalMap); err != nil { @@ -1370,12 +1203,12 @@ func CreateThreeWayMergePatch(original, modified, current []byte, dataStruct int // from original to modified. To find it, we compute deletions, which are the deletions from // original to modified, and delta, which is the difference from current to modified without // deletions, and then apply delta to deletions as a patch, which should be strictly additive. - deltaMap, err := diffMaps(currentMap, modifiedMap, t, false, true, smPatchVersion) + deltaMap, err := diffMaps(currentMap, modifiedMap, t, false, true) if err != nil { return nil, err } - deletionsMap, err := diffMaps(originalMap, modifiedMap, t, true, false, smPatchVersion) + deletionsMap, err := diffMaps(originalMap, modifiedMap, t, true, false) if err != nil { return nil, err } @@ -1395,7 +1228,7 @@ func CreateThreeWayMergePatch(original, modified, current []byte, dataStruct int // If overwrite is false, and the patch contains any keys that were changed differently, // then return a conflict error. if !overwrite { - changedMap, err := diffMaps(originalMap, currentMap, t, false, false, smPatchVersion) + changedMap, err := diffMaps(originalMap, currentMap, t, false, false) if err != nil { return nil, err } @@ -1430,20 +1263,3 @@ func toYAML(v interface{}) (string, error) { return string(y), nil } - -// GetServerSupportedSMPatchVersion takes a discoveryClient, -// returns the max StrategicMergePatch version supported -func GetServerSupportedSMPatchVersion(discoveryClient discovery.DiscoveryInterface) (StrategicMergePatchVersion, error) { - serverVersion, err := discoveryClient.ServerVersion() - if err != nil { - return Unknown, err - } - serverGitVersion := serverVersion.GitVersion - if serverGitVersion >= string(SMPatchVersion_1_5) { - return SMPatchVersion_1_5, nil - } - if serverGitVersion >= string(SMPatchVersion_1_0) { - return SMPatchVersion_1_0, nil - } - return Unknown, fmt.Errorf("The version is too old: %v\n", serverVersion) -} diff --git a/staging/src/k8s.io/client-go/pkg/util/validation/validation.go b/staging/src/k8s.io/client-go/pkg/util/validation/validation.go index aaf63190887..c2658312449 100644 --- a/staging/src/k8s.io/client-go/pkg/util/validation/validation.go +++ b/staging/src/k8s.io/client-go/pkg/util/validation/validation.go @@ -283,8 +283,7 @@ func IsConfigMapKey(value string) []string { } if value == "." { errs = append(errs, `must not be '.'`) - } - if value == ".." { + } else if value == ".." { errs = append(errs, `must not be '..'`) } else if strings.HasPrefix(value, "..") { errs = append(errs, `must not start with '..'`) diff --git a/staging/src/k8s.io/client-go/rest/client_test.go b/staging/src/k8s.io/client-go/rest/client_test.go index 1e0dc0e6811..cdc01bd628e 100644 --- a/staging/src/k8s.io/client-go/rest/client_test.go +++ b/staging/src/k8s.io/client-go/rest/client_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/client-go/pkg/api" "k8s.io/client-go/pkg/api/errors" "k8s.io/client-go/pkg/api/testapi" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/apimachinery/registered" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/util/diff" @@ -43,7 +43,7 @@ type TestParam struct { expectingError bool actualCreated bool expCreated bool - expStatus *unversioned.Status + expStatus *metav1.Status testBody bool testBodyErrorIsNotNil bool } @@ -84,12 +84,12 @@ func TestDoRequestSuccess(t *testing.T) { } func TestDoRequestFailed(t *testing.T) { - status := &unversioned.Status{ + status := &metav1.Status{ Code: http.StatusNotFound, - Status: unversioned.StatusFailure, - Reason: unversioned.StatusReasonNotFound, + Status: metav1.StatusFailure, + Reason: metav1.StatusReasonNotFound, Message: " \"\" not found", - Details: &unversioned.StatusDetails{}, + Details: &metav1.StatusDetails{}, } expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status) fakeHandler := utiltesting.FakeHandler{ @@ -119,14 +119,14 @@ func TestDoRequestFailed(t *testing.T) { } func TestDoRawRequestFailed(t *testing.T) { - status := &unversioned.Status{ + status := &metav1.Status{ Code: http.StatusNotFound, - Status: unversioned.StatusFailure, - Reason: unversioned.StatusReasonNotFound, + Status: metav1.StatusFailure, + Reason: metav1.StatusReasonNotFound, Message: "the server could not find the requested resource", - Details: &unversioned.StatusDetails{ - Causes: []unversioned.StatusCause{ - {Type: unversioned.CauseTypeUnexpectedServerResponse, Message: "unknown"}, + Details: &metav1.StatusDetails{ + Causes: []metav1.StatusCause{ + {Type: metav1.CauseTypeUnexpectedServerResponse, Message: "unknown"}, }, }, } @@ -314,8 +314,8 @@ func TestCreateBackoffManager(t *testing.T) { } -func testServerEnv(t *testing.T, statusCode int) (*httptest.Server, *utiltesting.FakeHandler, *unversioned.Status) { - status := &unversioned.Status{Status: fmt.Sprintf("%s", unversioned.StatusSuccess)} +func testServerEnv(t *testing.T, statusCode int) (*httptest.Server, *utiltesting.FakeHandler, *metav1.Status) { + status := &metav1.Status{Status: fmt.Sprintf("%s", metav1.StatusSuccess)} expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status) fakeHandler := utiltesting.FakeHandler{ StatusCode: statusCode, diff --git a/staging/src/k8s.io/client-go/rest/config.go b/staging/src/k8s.io/client-go/rest/config.go index bbd9fb4779d..6feccb2b159 100644 --- a/staging/src/k8s.io/client-go/rest/config.go +++ b/staging/src/k8s.io/client-go/rest/config.go @@ -30,7 +30,7 @@ import ( "github.com/golang/glog" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" certutil "k8s.io/client-go/pkg/util/cert" @@ -236,7 +236,7 @@ func UnversionedRESTClientFor(config *Config) (*RESTClient, error) { versionConfig := config.ContentConfig if versionConfig.GroupVersion == nil { - v := unversioned.SchemeGroupVersion + v := metav1.SchemeGroupVersion versionConfig.GroupVersion = &v } diff --git a/staging/src/k8s.io/client-go/rest/request.go b/staging/src/k8s.io/client-go/rest/request.go index 460ac9743bd..0a2f9f79f26 100644 --- a/staging/src/k8s.io/client-go/rest/request.go +++ b/staging/src/k8s.io/client-go/rest/request.go @@ -33,9 +33,9 @@ import ( "github.com/golang/glog" "k8s.io/client-go/pkg/api/errors" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" pathvalidation "k8s.io/client-go/pkg/api/validation/path" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/fields" "k8s.io/client-go/pkg/labels" "k8s.io/client-go/pkg/runtime" @@ -405,7 +405,7 @@ func (r *Request) FieldsSelectorParam(s fields.Selector) *Request { r.err = err return r } - return r.setParam(unversioned.FieldSelectorQueryParam(r.content.GroupVersion.String()), s2.String()) + return r.setParam(metav1.FieldSelectorQueryParam(r.content.GroupVersion.String()), s2.String()) } // LabelsSelectorParam adds the given selector as a query parameter @@ -419,7 +419,7 @@ func (r *Request) LabelsSelectorParam(s labels.Selector) *Request { if s.Empty() { return r } - return r.setParam(unversioned.LabelSelectorQueryParam(r.content.GroupVersion.String()), s.String()) + return r.setParam(metav1.LabelSelectorQueryParam(r.content.GroupVersion.String()), s.String()) } // UintParam creates a query parameter with the given value. @@ -454,14 +454,14 @@ func (r *Request) VersionedParams(obj runtime.Object, codec runtime.ParameterCod for _, value := range v { // TODO: Move it to setParam method, once we get rid of // FieldSelectorParam & LabelSelectorParam methods. - if k == unversioned.LabelSelectorQueryParam(r.content.GroupVersion.String()) && value == "" { + if k == metav1.LabelSelectorQueryParam(r.content.GroupVersion.String()) && value == "" { // Don't set an empty selector for backward compatibility. // Since there is no way to get the difference between empty // and unspecified string, we don't set it to avoid having // labelSelector= param in every request. continue } - if k == unversioned.FieldSelectorQueryParam(r.content.GroupVersion.String()) { + if k == metav1.FieldSelectorQueryParam(r.content.GroupVersion.String()) { if len(value) == 0 { // Don't set an empty selector for backward compatibility. // Since there is no way to get the difference between empty @@ -1083,9 +1083,9 @@ func (r Result) Get() (runtime.Object, error) { return nil, err } switch t := out.(type) { - case *unversioned.Status: + case *metav1.Status: // any status besides StatusSuccess is considered an error. - if t.Status != unversioned.StatusSuccess { + if t.Status != metav1.StatusSuccess { return nil, errors.FromObject(t) } } @@ -1118,9 +1118,9 @@ func (r Result) Into(obj runtime.Object) error { // if a different object is returned, see if it is Status and avoid double decoding // the object. switch t := out.(type) { - case *unversioned.Status: + case *metav1.Status: // any status besides StatusSuccess is considered an error. - if t.Status != unversioned.StatusSuccess { + if t.Status != metav1.StatusSuccess { return errors.FromObject(t) } } @@ -1153,9 +1153,9 @@ func (r Result) Error() error { return r.err } switch t := out.(type) { - case *unversioned.Status: + case *metav1.Status: // because we default the kind, we *must* check for StatusFailure - if t.Status == unversioned.StatusFailure { + if t.Status == metav1.StatusFailure { return errors.FromObject(t) } } diff --git a/staging/src/k8s.io/client-go/rest/request_test.go b/staging/src/k8s.io/client-go/rest/request_test.go index c647a5e8c7d..a864b782349 100755 --- a/staging/src/k8s.io/client-go/rest/request_test.go +++ b/staging/src/k8s.io/client-go/rest/request_test.go @@ -34,9 +34,9 @@ import ( "k8s.io/client-go/pkg/api" apierrors "k8s.io/client-go/pkg/api/errors" "k8s.io/client-go/pkg/api/testapi" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/apimachinery/registered" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/labels" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" @@ -635,7 +635,7 @@ func TestTransformUnstructuredError(t *testing.T) { Res: &http.Response{StatusCode: http.StatusBadRequest, Body: ioutil.NopCloser(bytes.NewReader([]byte(`{"kind":"Status","apiVersion":"v1","status":"Failure","code":404}`)))}, ErrFn: apierrors.IsBadRequest, Transformed: &apierrors.StatusError{ - ErrStatus: unversioned.Status{Status: unversioned.StatusFailure, Code: http.StatusNotFound}, + ErrStatus: metav1.Status{Status: metav1.StatusFailure, Code: http.StatusNotFound}, }, }, { @@ -657,7 +657,7 @@ func TestTransformUnstructuredError(t *testing.T) { Res: &http.Response{StatusCode: http.StatusBadRequest, Body: ioutil.NopCloser(bytes.NewReader([]byte(`{"kind":"Status","status":"Failure","code":404}`)))}, ErrFn: apierrors.IsBadRequest, Transformed: &apierrors.StatusError{ - ErrStatus: unversioned.Status{Status: unversioned.StatusFailure, Code: http.StatusNotFound}, + ErrStatus: metav1.Status{Status: metav1.StatusFailure, Code: http.StatusNotFound}, }, }, { @@ -783,9 +783,9 @@ func TestRequestWatch(t *testing.T) { client: clientFunc(func(req *http.Request) (*http.Response, error) { return &http.Response{ StatusCode: http.StatusUnauthorized, - Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &unversioned.Status{ - Status: unversioned.StatusFailure, - Reason: unversioned.StatusReasonUnauthorized, + Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &metav1.Status{ + Status: metav1.StatusFailure, + Reason: metav1.StatusReasonUnauthorized, })))), }, nil }), @@ -889,9 +889,9 @@ func TestRequestStream(t *testing.T) { client: clientFunc(func(req *http.Request) (*http.Response, error) { return &http.Response{ StatusCode: http.StatusUnauthorized, - Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &unversioned.Status{ - Status: unversioned.StatusFailure, - Reason: unversioned.StatusReasonUnauthorized, + Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &metav1.Status{ + Status: metav1.StatusFailure, + Reason: metav1.StatusReasonUnauthorized, })))), }, nil }), @@ -1222,7 +1222,7 @@ func TestDoRequestNewWayReader(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePathWithPrefix("foo", "bar", "", "baz") - requestURL += "?" + unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } @@ -1262,7 +1262,7 @@ func TestDoRequestNewWayObj(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePath("foo", "", "bar/baz") - requestURL += "?" + unversioned.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + metav1.LabelSelectorQueryParam(registered.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } diff --git a/staging/src/k8s.io/client-go/rest/versions.go b/staging/src/k8s.io/client-go/rest/versions.go index 12ef828dd7b..203fc88bcef 100644 --- a/staging/src/k8s.io/client-go/rest/versions.go +++ b/staging/src/k8s.io/client-go/rest/versions.go @@ -22,7 +22,7 @@ import ( "net/http" "path" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" ) const ( @@ -57,7 +57,7 @@ func ServerAPIVersions(c *Config) (groupVersions []string, err error) { if err != nil { return nil, err } - var v unversioned.APIVersions + var v metav1.APIVersions defer resp.Body.Close() err = json.NewDecoder(resp.Body).Decode(&v) if err != nil { @@ -71,7 +71,7 @@ func ServerAPIVersions(c *Config) (groupVersions []string, err error) { if err != nil { return nil, err } - var apiGroupList unversioned.APIGroupList + var apiGroupList metav1.APIGroupList defer resp2.Body.Close() err = json.NewDecoder(resp2.Body).Decode(&apiGroupList) if err != nil { diff --git a/staging/src/k8s.io/client-go/testing/fake.go b/staging/src/k8s.io/client-go/testing/fake.go index 192e635c1f4..9a91856043d 100644 --- a/staging/src/k8s.io/client-go/testing/fake.go +++ b/staging/src/k8s.io/client-go/testing/fake.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/version" @@ -45,7 +45,7 @@ type Fake struct { // for every request in the order they are tried. ProxyReactionChain []ProxyReactor - Resources map[string]*unversioned.APIResourceList + Resources map[string]*metav1.APIResourceList } // Reactor is an interface to allow the composition of reaction functions. @@ -219,7 +219,7 @@ type FakeDiscovery struct { *Fake } -func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*unversioned.APIResourceList, error) { +func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) { action := ActionImpl{ Verb: "get", Resource: schema.GroupVersionResource{Resource: "resource"}, @@ -228,7 +228,7 @@ func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*un return c.Resources[groupVersion], nil } -func (c *FakeDiscovery) ServerResources() (map[string]*unversioned.APIResourceList, error) { +func (c *FakeDiscovery) ServerResources() (map[string]*metav1.APIResourceList, error) { action := ActionImpl{ Verb: "get", Resource: schema.GroupVersionResource{Resource: "resource"}, @@ -237,7 +237,7 @@ func (c *FakeDiscovery) ServerResources() (map[string]*unversioned.APIResourceLi return c.Resources, nil } -func (c *FakeDiscovery) ServerGroups() (*unversioned.APIGroupList, error) { +func (c *FakeDiscovery) ServerGroups() (*metav1.APIGroupList, error) { return nil, nil } diff --git a/staging/src/k8s.io/client-go/testing/fixture.go b/staging/src/k8s.io/client-go/testing/fixture.go index b8afc9fac16..62035616f65 100644 --- a/staging/src/k8s.io/client-go/testing/fixture.go +++ b/staging/src/k8s.io/client-go/testing/fixture.go @@ -22,8 +22,8 @@ import ( "k8s.io/client-go/pkg/api/errors" "k8s.io/client-go/pkg/api/meta" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/apimachinery/registered" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/runtime/schema" "k8s.io/client-go/pkg/watch" @@ -230,11 +230,11 @@ func (t *tracker) Get(gvk schema.GroupVersionKind, ns, name string) (runtime.Obj return nil, err } - if status, ok := obj.(*unversioned.Status); ok { + if status, ok := obj.(*metav1.Status); ok { if status.Details != nil { status.Details.Kind = gvk.Kind } - if status.Status != unversioned.StatusSuccess { + if status.Status != metav1.StatusSuccess { return nil, &errors.StatusError{ErrStatus: *status} } } @@ -277,7 +277,7 @@ func (t *tracker) add(obj runtime.Object, replaceExisting bool) error { return err } - if status, ok := obj.(*unversioned.Status); ok && status.Details != nil { + if status, ok := obj.(*metav1.Status); ok && status.Details != nil { gvk.Kind = status.Details.Kind } diff --git a/staging/src/k8s.io/client-go/tools/cache/listers.go b/staging/src/k8s.io/client-go/tools/cache/listers.go index 6fa98f20196..34f2fc5e5ad 100644 --- a/staging/src/k8s.io/client-go/tools/cache/listers.go +++ b/staging/src/k8s.io/client-go/tools/cache/listers.go @@ -22,11 +22,11 @@ import ( "github.com/golang/glog" "k8s.io/client-go/pkg/api/errors" "k8s.io/client-go/pkg/api/meta" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" apps "k8s.io/client-go/pkg/apis/apps/v1beta1" certificates "k8s.io/client-go/pkg/apis/certificates/v1alpha1" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" policy "k8s.io/client-go/pkg/apis/policy/v1beta1" storageinternal "k8s.io/client-go/pkg/apis/storage" storage "k8s.io/client-go/pkg/apis/storage/v1beta1" @@ -252,7 +252,7 @@ func (s *StoreToDaemonSetLister) GetPodDaemonSets(pod *v1.Pod) (daemonSets []ext if daemonSet.Namespace != pod.Namespace { continue } - selector, err = unversioned.LabelSelectorAsSelector(daemonSet.Spec.Selector) + selector, err = metav1.LabelSelectorAsSelector(daemonSet.Spec.Selector) if err != nil { // this should not happen if the DaemonSet passed validation return nil, err @@ -361,7 +361,7 @@ func (s *StoreToStatefulSetLister) GetPodStatefulSets(pod *v1.Pod) (psList []app if ps.Namespace != pod.Namespace { continue } - selector, err = unversioned.LabelSelectorAsSelector(ps.Spec.Selector) + selector, err = metav1.LabelSelectorAsSelector(ps.Spec.Selector) if err != nil { err = fmt.Errorf("invalid selector: %v", err) return @@ -423,7 +423,7 @@ func (s *StoreToPodDisruptionBudgetLister) GetPodPodDisruptionBudgets(pod *v1.Po if pdb.Namespace != pod.Namespace { continue } - selector, err = unversioned.LabelSelectorAsSelector(pdb.Spec.Selector) + selector, err = metav1.LabelSelectorAsSelector(pdb.Spec.Selector) if err != nil { glog.Warningf("invalid selector: %v", err) // TODO(mml): add an event to the PDB diff --git a/staging/src/k8s.io/client-go/tools/cache/listers_extensions.go b/staging/src/k8s.io/client-go/tools/cache/listers_extensions.go index b9a9a792fbf..0950e76e457 100644 --- a/staging/src/k8s.io/client-go/tools/cache/listers_extensions.go +++ b/staging/src/k8s.io/client-go/tools/cache/listers_extensions.go @@ -20,10 +20,10 @@ import ( "fmt" "k8s.io/client-go/pkg/api/errors" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" extensionsinternal "k8s.io/client-go/pkg/apis/extensions" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/labels" ) @@ -90,7 +90,7 @@ func (s *StoreToDeploymentLister) GetDeploymentsForReplicaSet(rs *extensions.Rep return } for _, d := range dList { - selector, err := unversioned.LabelSelectorAsSelector(d.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(d.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid label selector: %v", err) } @@ -123,7 +123,7 @@ func (s *StoreToDeploymentLister) GetDeploymentsForPod(pod *v1.Pod) (deployments return } for _, d := range dList { - selector, err := unversioned.LabelSelectorAsSelector(d.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(d.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid label selector: %v", err) } @@ -193,7 +193,7 @@ func (s *StoreToReplicaSetLister) GetPodReplicaSets(pod *v1.Pod) (rss []*extensi if rs.Namespace != pod.Namespace { continue } - selector, err := unversioned.LabelSelectorAsSelector(rs.Spec.Selector) + selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector) if err != nil { return nil, fmt.Errorf("invalid selector: %v", err) } diff --git a/staging/src/k8s.io/client-go/tools/cache/listers_test.go b/staging/src/k8s.io/client-go/tools/cache/listers_test.go index 12b3884e1dd..da4b4a5e751 100644 --- a/staging/src/k8s.io/client-go/tools/cache/listers_test.go +++ b/staging/src/k8s.io/client-go/tools/cache/listers_test.go @@ -20,9 +20,9 @@ import ( "testing" apierrors "k8s.io/client-go/pkg/api/errors" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/labels" "k8s.io/client-go/pkg/util/sets" ) @@ -303,7 +303,7 @@ func TestStoreToReplicaSetLister(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "basic", Namespace: "ns"}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "baz"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "baz"}}, }, }, }, @@ -342,13 +342,13 @@ func TestStoreToReplicaSetLister(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "foo"}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, { ObjectMeta: v1.ObjectMeta{Name: "bar", Namespace: "ns"}, Spec: extensions.ReplicaSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, }, @@ -429,7 +429,7 @@ func TestStoreToDaemonSetLister(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "basic", Namespace: "ns"}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "baz"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "baz"}}, }, }, }, @@ -468,13 +468,13 @@ func TestStoreToDaemonSetLister(t *testing.T) { { ObjectMeta: v1.ObjectMeta{Name: "foo"}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, { ObjectMeta: v1.ObjectMeta{Name: "bar", Namespace: "ns"}, Spec: extensions.DaemonSetSpec{ - Selector: &unversioned.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, }, }, }, diff --git a/staging/src/k8s.io/client-go/tools/cache/reflector_test.go b/staging/src/k8s.io/client-go/tools/cache/reflector_test.go index 9600ee8701c..eb02dd13626 100644 --- a/staging/src/k8s.io/client-go/tools/cache/reflector_test.go +++ b/staging/src/k8s.io/client-go/tools/cache/reflector_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/util/wait" "k8s.io/client-go/pkg/watch" @@ -54,7 +54,7 @@ func TestCloseWatchChannelOnError(t *testing.T) { return fw, nil }, ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "1"}}, nil + return &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "1"}}, nil }, } go r.ListAndWatch(wait.NeverStop) @@ -80,7 +80,7 @@ func TestRunUntil(t *testing.T) { return fw, nil }, ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "1"}}, nil + return &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "1"}}, nil }, } r.RunUntil(stopCh) @@ -228,7 +228,7 @@ func TestReflectorListAndWatch(t *testing.T) { return fw, nil }, ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "1"}}, nil + return &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "1"}}, nil }, } s := NewFIFO(MetaNamespaceKeyFunc) @@ -271,7 +271,7 @@ func TestReflectorListAndWatchWithErrors(t *testing.T) { return &v1.Pod{ObjectMeta: v1.ObjectMeta{Name: id, ResourceVersion: rv}} } mkList := func(rv string, pods ...*v1.Pod) *v1.PodList { - list := &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: rv}} + list := &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: rv}} for _, pod := range pods { list.Items = append(list.Items, *pod) } @@ -374,7 +374,7 @@ func TestReflectorResync(t *testing.T) { return fw, nil }, ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return &v1.PodList{ListMeta: unversioned.ListMeta{ResourceVersion: "0"}}, nil + return &v1.PodList{ListMeta: metav1.ListMeta{ResourceVersion: "0"}}, nil }, } resyncPeriod := 1 * time.Millisecond diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/doc.go b/staging/src/k8s.io/client-go/tools/clientcmd/doc.go index a4cfbd13ce1..424311ee12d 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/doc.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/doc.go @@ -31,7 +31,7 @@ Sample usage from merged .kubeconfig files (local directory, home directory) if err != nil { // Do something } - client, err := unversioned.New(config) + client, err := metav1.New(config) // ... */ package clientcmd // import "k8s.io/client-go/tools/clientcmd" diff --git a/staging/src/k8s.io/client-go/tools/record/event.go b/staging/src/k8s.io/client-go/tools/record/event.go index 89cba20ee10..61b6ff078be 100644 --- a/staging/src/k8s.io/client-go/tools/record/event.go +++ b/staging/src/k8s.io/client-go/tools/record/event.go @@ -22,8 +22,8 @@ import ( "time" "k8s.io/client-go/pkg/api/errors" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/util/clock" utilruntime "k8s.io/client-go/pkg/util/runtime" @@ -70,7 +70,7 @@ type EventRecorder interface { Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) // PastEventf is just like Eventf, but with an option to specify the event's 'timestamp' field. - PastEventf(object runtime.Object, timestamp unversioned.Time, eventtype, reason, messageFmt string, args ...interface{}) + PastEventf(object runtime.Object, timestamp metav1.Time, eventtype, reason, messageFmt string, args ...interface{}) } // EventBroadcaster knows how to receive events and send them to any EventSink, watcher, or log. @@ -252,7 +252,7 @@ type recorderImpl struct { clock clock.Clock } -func (recorder *recorderImpl) generateEvent(object runtime.Object, timestamp unversioned.Time, eventtype, reason, message string) { +func (recorder *recorderImpl) generateEvent(object runtime.Object, timestamp metav1.Time, eventtype, reason, message string) { ref, err := v1.GetReference(object) if err != nil { glog.Errorf("Could not construct reference to: '%#v' due to: '%v'. Will not report event: '%v' '%v' '%v'", object, err, eventtype, reason, message) @@ -283,19 +283,19 @@ func validateEventType(eventtype string) bool { } func (recorder *recorderImpl) Event(object runtime.Object, eventtype, reason, message string) { - recorder.generateEvent(object, unversioned.Now(), eventtype, reason, message) + recorder.generateEvent(object, metav1.Now(), eventtype, reason, message) } func (recorder *recorderImpl) Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) { recorder.Event(object, eventtype, reason, fmt.Sprintf(messageFmt, args...)) } -func (recorder *recorderImpl) PastEventf(object runtime.Object, timestamp unversioned.Time, eventtype, reason, messageFmt string, args ...interface{}) { +func (recorder *recorderImpl) PastEventf(object runtime.Object, timestamp metav1.Time, eventtype, reason, messageFmt string, args ...interface{}) { recorder.generateEvent(object, timestamp, eventtype, reason, fmt.Sprintf(messageFmt, args...)) } func (recorder *recorderImpl) makeEvent(ref *v1.ObjectReference, eventtype, reason, message string) *v1.Event { - t := unversioned.Time{Time: recorder.clock.Now()} + t := metav1.Time{Time: recorder.clock.Now()} namespace := ref.Namespace if namespace == "" { namespace = v1.NamespaceDefault diff --git a/staging/src/k8s.io/client-go/tools/record/event_test.go b/staging/src/k8s.io/client-go/tools/record/event_test.go index 2e8a9dba439..d499f89dd9d 100644 --- a/staging/src/k8s.io/client-go/tools/record/event_test.go +++ b/staging/src/k8s.io/client-go/tools/record/event_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/client-go/pkg/api/errors" _ "k8s.io/client-go/pkg/api/install" // To register api.Pod used in tests below - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" k8sruntime "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/util/clock" "k8s.io/client-go/pkg/util/strategicpatch" @@ -442,9 +442,9 @@ func TestUpdateExpiredEvent(t *testing.T) { sink := &testEventSink{ OnPatch: func(*v1.Event, []byte) (*v1.Event, error) { return nil, &errors.StatusError{ - ErrStatus: unversioned.Status{ + ErrStatus: metav1.Status{ Code: http.StatusNotFound, - Reason: unversioned.StatusReasonNotFound, + Reason: metav1.StatusReasonNotFound, }} }, OnCreate: func(event *v1.Event) (*v1.Event, error) { diff --git a/staging/src/k8s.io/client-go/tools/record/events_cache.go b/staging/src/k8s.io/client-go/tools/record/events_cache.go index 500ad9a3d7f..1b6c89640e1 100644 --- a/staging/src/k8s.io/client-go/tools/record/events_cache.go +++ b/staging/src/k8s.io/client-go/tools/record/events_cache.go @@ -25,8 +25,8 @@ import ( "github.com/golang/groupcache/lru" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/util/clock" "k8s.io/client-go/pkg/util/sets" "k8s.io/client-go/pkg/util/strategicpatch" @@ -138,13 +138,13 @@ type aggregateRecord struct { // if the size of this set exceeds the max, we know we need to aggregate localKeys sets.String // The last time at which the aggregate was recorded - lastTimestamp unversioned.Time + lastTimestamp metav1.Time } // EventAggregate identifies similar events and groups into a common event if required func (e *EventAggregator) EventAggregate(newEvent *v1.Event) (*v1.Event, error) { aggregateKey, localKey := e.keyFunc(newEvent) - now := unversioned.NewTime(e.clock.Now()) + now := metav1.NewTime(e.clock.Now()) record := aggregateRecord{localKeys: sets.NewString(), lastTimestamp: now} e.Lock() defer e.Unlock() @@ -194,7 +194,7 @@ type eventLog struct { count int // The time at which the event was first recorded. - firstTimestamp unversioned.Time + firstTimestamp metav1.Time // The unique name of the first occurrence of this event name string @@ -240,13 +240,11 @@ func (e *eventLogger) eventObserve(newEvent *v1.Event) (*v1.Event, []byte, error eventCopy2 := *event eventCopy2.Count = 0 - eventCopy2.LastTimestamp = unversioned.NewTime(time.Unix(0, 0)) + eventCopy2.LastTimestamp = metav1.NewTime(time.Unix(0, 0)) newData, _ := json.Marshal(event) oldData, _ := json.Marshal(eventCopy2) - // TODO: need to figure out if we need to let eventObserve() use the new behavior of StrategicMergePatch. - // Currently default to old behavior now. Ref: issue #35936 - patch, err = strategicpatch.CreateStrategicMergePatch(oldData, newData, event, strategicpatch.SMPatchVersion_1_0) + patch, err = strategicpatch.CreateStrategicMergePatch(oldData, newData, event) } // record our new observation diff --git a/staging/src/k8s.io/client-go/tools/record/events_cache_test.go b/staging/src/k8s.io/client-go/tools/record/events_cache_test.go index 168f672b748..e1e55500c4c 100644 --- a/staging/src/k8s.io/client-go/tools/record/events_cache_test.go +++ b/staging/src/k8s.io/client-go/tools/record/events_cache_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "k8s.io/client-go/pkg/api/unversioned" "k8s.io/client-go/pkg/api/v1" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/util/clock" "k8s.io/client-go/pkg/util/diff" ) @@ -39,7 +39,7 @@ func makeObjectReference(kind, name, namespace string) v1.ObjectReference { } func makeEvent(reason, message string, involvedObject v1.ObjectReference) v1.Event { - eventTime := unversioned.Now() + eventTime := metav1.Now() event := v1.Event{ Reason: reason, Message: message, @@ -227,7 +227,7 @@ func TestEventCorrelator(t *testing.T) { correlator := NewEventCorrelator(&clock) for i := range testInput.previousEvents { event := testInput.previousEvents[i] - now := unversioned.NewTime(clock.Now()) + now := metav1.NewTime(clock.Now()) event.FirstTimestamp = now event.LastTimestamp = now result, err := correlator.EventCorrelate(&event) @@ -238,7 +238,7 @@ func TestEventCorrelator(t *testing.T) { } // update the input to current clock value - now := unversioned.NewTime(clock.Now()) + now := metav1.NewTime(clock.Now()) testInput.newEvent.FirstTimestamp = now testInput.newEvent.LastTimestamp = now result, err := correlator.EventCorrelate(&testInput.newEvent) diff --git a/staging/src/k8s.io/client-go/tools/record/fake.go b/staging/src/k8s.io/client-go/tools/record/fake.go index 81069e83f5a..95cc83bc5f1 100644 --- a/staging/src/k8s.io/client-go/tools/record/fake.go +++ b/staging/src/k8s.io/client-go/tools/record/fake.go @@ -19,7 +19,7 @@ package record import ( "fmt" - "k8s.io/client-go/pkg/api/unversioned" + metav1 "k8s.io/client-go/pkg/apis/meta/v1" "k8s.io/client-go/pkg/runtime" ) @@ -42,7 +42,7 @@ func (f *FakeRecorder) Eventf(object runtime.Object, eventtype, reason, messageF } } -func (f *FakeRecorder) PastEventf(object runtime.Object, timestamp unversioned.Time, eventtype, reason, messageFmt string, args ...interface{}) { +func (f *FakeRecorder) PastEventf(object runtime.Object, timestamp metav1.Time, eventtype, reason, messageFmt string, args ...interface{}) { } // NewFakeRecorder creates new fake event recorder with event channel with