Merge pull request #60455 from p0lyn0mial/reapers_clean_up

Automatic merge from submit-queue (batch tested with PRs 60455, 61365, 61375, 61597, 61491). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

removes custom scalers from kubectl

**What this PR does / why we need it**: this PR removes custom scalers from kubectl and uses the genericScaler instead.

**Release note**:

```
NONE
```

Kubernetes-commit: eda9fab0032b9cfbd8b55ab07a16fe35e921f775
This commit is contained in:
Kubernetes Publisher 2018-03-26 15:34:39 -07:00
commit ae5d73243c
2 changed files with 86 additions and 83 deletions

164
Godeps/Godeps.json generated
View File

@ -248,331 +248,331 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "7e796de92438aede7cb5d6bcf6c10f4fa65db560"
"Rev": "055879e38033d1526b0fe169089a055c33fa3990"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
"Rev": "7175867f4d9f782220ceae4fc323e3aaae35f23a"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -196,7 +196,10 @@ func (c *namespacedScaleClient) Update(resource schema.GroupResource, scale *aut
Body(scaleUpdateBytes).
Do()
if err := result.Error(); err != nil {
return nil, fmt.Errorf("could not update the scale for %s %s: %v", resource.String(), scale.Name, err)
// propagate "raw" error from the API
// this allows callers to interpret underlying Reason field
// for example: errors.IsConflict(err)
return nil, err
}
scaleBytes, err := result.Raw()