Merge pull request #64346 from dims/deprecate-in-tree-keystone-plugin

Automatic merge from submit-queue (batch tested with PRs 64057, 63223, 64346, 64562, 64408). 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>.

Deprecate the in-tree keystone plugin

**What this PR does / why we need it**:

We now have the `client-keystone-auth` in cloud-provider-openstack
repository:
https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/using-client-keystone-auth.md

So let's drop the in-tree one, so we can remove it in 1.12

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
in-tree support for openstack credentials is now deprecated. please use the "client-keystone-auth" from the cloud-provider-openstack repository. details on how to use this new capability is documented here - https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/using-client-keystone-auth.md
```

Kubernetes-commit: 10d0c5c19e8e0a0a8e3e4a1a9bfe6baf9cde1bc4
This commit is contained in:
Kubernetes Publisher 2018-06-02 02:10:11 -07:00
commit 91354d62fb
2 changed files with 82 additions and 81 deletions

162
Godeps/Godeps.json generated
View File

@ -1,6 +1,6 @@
{
"ImportPath": "k8s.io/client-go",
"GoVersion": "go1.9",
"GoVersion": "go1.10",
"GodepVersion": "v80",
"Packages": [
"./..."
@ -268,323 +268,323 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "667186a598c34df1953d343c18c571086f78f872"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "1e6ce0f30d47d3c48634eabcc5b25a594654e7a5"
"Rev": "5204d3828432611e41488a8042bc1d16a7c12e05"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -140,6 +140,7 @@ func newOpenstackAuthProvider(_ string, config map[string]string, persister rest
var ttlDuration time.Duration
var err error
glog.Warningf("WARNING: in-tree openstack auth plugin is now deprecated. please use the \"client-keystone-auth\" kubectl/client-go credential plugin instead")
ttl, found := config["ttl"]
if !found {
ttlDuration = DefaultTTLDuration