From 31e6446b8e16e45a22084a5b54cd78646804b322 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Fri, 2 Feb 2018 14:59:59 -0800 Subject: [PATCH] ref(glide): remove need for scripts/setup-apimachinery.sh (#3446) --- Makefile | 1 - glide.lock | 78 ++++++++++++++++++++++++++++------- glide.yaml | 20 +++++---- scripts/setup-apimachinery.sh | 24 ----------- 4 files changed, 74 insertions(+), 49 deletions(-) delete mode 100755 scripts/setup-apimachinery.sh diff --git a/Makefile b/Makefile index a5bdf1b8f..9c780f7ec 100644 --- a/Makefile +++ b/Makefile @@ -139,6 +139,5 @@ ifndef HAS_HG endif glide install --strip-vendor go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go - scripts/setup-apimachinery.sh include versioning.mk diff --git a/glide.lock b/glide.lock index 4821be9f0..e14766948 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 5d2ef5e5355854c577bb3f4844228c90548629959c4c0666952bea502b14bf0f -updated: 2018-01-04T22:28:37.378122Z +hash: c4a1f6e380baf38d371d428fa5c8f7b2363663d811c728e982300692287a58e4 +updated: 2018-02-02T20:15:49.706602Z imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 @@ -52,7 +52,7 @@ imports: subpackages: - winterm - name: github.com/Azure/go-autorest - version: 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d + version: e14a70c556c8e0db173358d1a903dca345a8e75e subpackages: - autorest - autorest/adal @@ -128,8 +128,6 @@ imports: version: ff4f55a206334ef123e4f79bbf348980da81ca46 subpackages: - log -- name: github.com/emicklei/go-restful-swagger12 - version: dcef7f55730566d41eae5db10e7d6981829720f6 - name: github.com/evanphx/json-patch version: 944e07253867aacae43c04b2e6a239005443f33a - name: github.com/exponent-io/jsonpath @@ -145,9 +143,9 @@ imports: - name: github.com/go-openapi/jsonreference version: 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272 - name: github.com/go-openapi/spec - version: 6aced65f8501fe1217321abf0749d354824ba2ff + version: 7abd5745472fff5eb3685386d5fb8bf38683154d - name: github.com/go-openapi/swag - version: 1d0bd113de87027671077d3c71eb3ac5d7dbba72 + version: f3f9494671f93fcff853e3c6e9e948b3eb71e590 - name: github.com/gobwas/glob version: bea32b9cd2d6f55753d94a28e959b13f0244797a subpackages: @@ -188,7 +186,7 @@ imports: - compiler - extensions - name: github.com/gophercloud/gophercloud - version: 2bf16b94fdd9b01557c4d076e567fe5cbbe5a961 + version: 8183543f90d1aef267a5ecc209f2e0715b355acb subpackages: - openstack - openstack/identity/v2/tenants @@ -226,7 +224,7 @@ imports: - name: github.com/juju/ratelimit version: 5b9ff866471762aa2ab2dced63c9fb6f53921342 - name: github.com/mailru/easyjson - version: d5b7844b561a7bc640052f1b935f7b800330d7e0 + version: 2f5df55504ebc322e4d52d34df6a1f5b503bf26d subpackages: - buffer - jlexer @@ -286,7 +284,7 @@ imports: - name: github.com/russross/blackfriday version: 300106c228d52c8941d4b3de6054a6062a86dda3 - name: github.com/satori/go.uuid - version: 879c5887cd475cd7864858769793b2ceb0d44feb + version: f58768cc1a7a7e77a3bd49e98cdd21419399b6a3 - name: github.com/shurcooL/sanitized_anchor_name version: 10ef21a441db47d8b13ebcc5fd2310f636973c77 - name: github.com/sirupsen/logrus @@ -402,12 +400,45 @@ imports: version: 8a331561fe74dadba6edfc59f3be66c22c3b065d - name: gopkg.in/yaml.v2 version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 +- name: k8s.io/api + version: 006a217681ae70cbacdd66a5e2fca1a61a8ff28e + subpackages: + - admission/v1beta1 + - admissionregistration/v1alpha1 + - admissionregistration/v1beta1 + - apps/v1 + - apps/v1beta1 + - apps/v1beta2 + - authentication/v1 + - authentication/v1beta1 + - authorization/v1 + - authorization/v1beta1 + - autoscaling/v1 + - autoscaling/v2beta1 + - batch/v1 + - batch/v1beta1 + - batch/v2alpha1 + - certificates/v1beta1 + - core/v1 + - events/v1beta1 + - extensions/v1beta1 + - imagepolicy/v1alpha1 + - networking/v1 + - policy/v1beta1 + - rbac/v1 + - rbac/v1alpha1 + - rbac/v1beta1 + - scheduling/v1alpha1 + - settings/v1alpha1 + - storage/v1 + - storage/v1alpha1 + - storage/v1beta1 - name: k8s.io/apiextensions-apiserver version: a5bbfd114a9b122acd741c61d88c84812375d9e1 subpackages: - pkg/features - name: k8s.io/apimachinery - version: 3b05bbfa0a45413bfa184edbf9af617e277962fb + version: 68f9c3a1feb3140df59c67ced62d3a5df8e6c9c2 subpackages: - pkg/api/equality - pkg/api/errors @@ -424,7 +455,6 @@ imports: - pkg/apis/meta/v1alpha1 - pkg/conversion - pkg/conversion/queryparams - - pkg/conversion/unstructured - pkg/fields - pkg/labels - pkg/runtime @@ -464,7 +494,7 @@ imports: - third_party/forked/golang/netutil - third_party/forked/golang/reflect - name: k8s.io/apiserver - version: c1e53d745d0fe45bf7d5d44697e6eface25fceca + version: 2a1092aaa7202e8f9b188281ff9424a014ce61c2 subpackages: - pkg/apis/audit - pkg/authentication/authenticator @@ -475,7 +505,7 @@ imports: - pkg/util/feature - pkg/util/flag - name: k8s.io/client-go - version: 82aa063804cf055e16e8911250f888bc216e8b61 + version: 78700dec6369ba22221b72770783300f143df150 subpackages: - discovery - discovery/fake @@ -483,7 +513,9 @@ imports: - informers - informers/admissionregistration - informers/admissionregistration/v1alpha1 + - informers/admissionregistration/v1beta1 - informers/apps + - informers/apps/v1 - informers/apps/v1beta1 - informers/apps/v1beta2 - informers/autoscaling @@ -497,6 +529,8 @@ imports: - informers/certificates/v1beta1 - informers/core - informers/core/v1 + - informers/events + - informers/events/v1beta1 - informers/extensions - informers/extensions/v1beta1 - informers/internalinterfaces @@ -514,12 +548,17 @@ imports: - informers/settings/v1alpha1 - informers/storage - informers/storage/v1 + - informers/storage/v1alpha1 - informers/storage/v1beta1 - kubernetes - kubernetes/fake - kubernetes/scheme - kubernetes/typed/admissionregistration/v1alpha1 - kubernetes/typed/admissionregistration/v1alpha1/fake + - kubernetes/typed/admissionregistration/v1beta1 + - kubernetes/typed/admissionregistration/v1beta1/fake + - kubernetes/typed/apps/v1 + - kubernetes/typed/apps/v1/fake - kubernetes/typed/apps/v1beta1 - kubernetes/typed/apps/v1beta1/fake - kubernetes/typed/apps/v1beta2 @@ -546,6 +585,8 @@ imports: - kubernetes/typed/certificates/v1beta1/fake - kubernetes/typed/core/v1 - kubernetes/typed/core/v1/fake + - kubernetes/typed/events/v1beta1 + - kubernetes/typed/events/v1beta1/fake - kubernetes/typed/extensions/v1beta1 - kubernetes/typed/extensions/v1beta1/fake - kubernetes/typed/networking/v1 @@ -564,9 +605,13 @@ imports: - kubernetes/typed/settings/v1alpha1/fake - kubernetes/typed/storage/v1 - kubernetes/typed/storage/v1/fake + - kubernetes/typed/storage/v1alpha1 + - kubernetes/typed/storage/v1alpha1/fake - kubernetes/typed/storage/v1beta1 - kubernetes/typed/storage/v1beta1/fake - listers/admissionregistration/v1alpha1 + - listers/admissionregistration/v1beta1 + - listers/apps/v1 - listers/apps/v1beta1 - listers/apps/v1beta2 - listers/autoscaling/v1 @@ -576,6 +621,7 @@ imports: - listers/batch/v2alpha1 - listers/certificates/v1beta1 - listers/core/v1 + - listers/events/v1beta1 - listers/extensions/v1beta1 - listers/networking/v1 - listers/policy/v1beta1 @@ -585,6 +631,7 @@ imports: - listers/scheduling/v1alpha1 - listers/settings/v1alpha1 - listers/storage/v1 + - listers/storage/v1alpha1 - listers/storage/v1beta1 - pkg/version - plugin/pkg/client/auth @@ -611,6 +658,7 @@ imports: - tools/remotecommand - transport - transport/spdy + - util/buffer - util/cert - util/exec - util/flowcontrol @@ -626,7 +674,7 @@ imports: - pkg/util/proto - pkg/util/proto/validation - name: k8s.io/kubernetes - version: 3a1c9449a956b6026f075fa3134ff92f7d55f812 + version: 5fa2db2bd46ac79e5e00a4e6ed24191080aa463b subpackages: - pkg/api/events - pkg/api/legacyscheme diff --git a/glide.yaml b/glide.yaml index 1f07f6182..81bb8ebe1 100644 --- a/glide.yaml +++ b/glide.yaml @@ -9,7 +9,6 @@ import: version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7 - package: github.com/Masterminds/vcs version: ~1.11.0 - # Pin version of mergo that is compatible with both sprig and Kubernetes - package: github.com/imdario/mergo version: 6633656539c1639d9d78127b7d47c622b5d7b6dc @@ -27,15 +26,13 @@ import: - ptypes/timestamp - package: google.golang.org/grpc version: 1.7.2 -- package: k8s.io/kubernetes - version: ~1.9.0 - package: github.com/gosuri/uitable - package: github.com/asaskevich/govalidator version: ^4.0.0 - package: golang.org/x/crypto subpackages: - openpgp - # pin version of golang.org/x/sys that is compatible with golang.org/x/crypto +# pin version of golang.org/x/sys that is compatible with golang.org/x/crypto - package: golang.org/x/sys version: 43eea11 subpackages: @@ -55,15 +52,20 @@ import: repo: https://github.com/fvbommel/util.git vcs: git -- package: k8s.io/kube-openapi - version: 39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1 +- package: k8s.io/kubernetes + version: ~1.9.2 +- package: k8s.io/client-go + version: ~6.0.0 +- package: k8s.io/api + version: kubernetes-1.9.2 +- package: k8s.io/apimachinery + version: kubernetes-1.9.2 +- package: k8s.io/apiserver + version: kubernetes-1.9.2 - package: cloud.google.com/go/compute repo: https://github.com/GoogleCloudPlatform/google-cloud-go.git -ignore: - - k8s.io/api - testImports: - package: github.com/stretchr/testify version: ^1.1.4 diff --git a/scripts/setup-apimachinery.sh b/scripts/setup-apimachinery.sh deleted file mode 100755 index e6b2808a2..000000000 --- a/scripts/setup-apimachinery.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2016 The Kubernetes Authors All rights reserved. -# -# 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. - -# Copies the current versions of apimachinery and client-go out of the -# main kubernetes repo. These repos are currently out of sync and not -# versioned. -set -euo pipefail - -rm -rf ./vendor/k8s.io/{api,kube-aggregator,apiserver,apimachinery,client-go,metrics} - -cp -r ./vendor/k8s.io/kubernetes/staging/src/k8s.io/{api,kube-aggregator,apiserver,apimachinery,client-go,metrics} ./vendor/k8s.io