kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69527 from liggitt/remove-quorum 

Remove deprecated --etcd-quorum-read flag

Kubernetes-commit: f9acfd8e384488d2216b18196152dcb7b3cc92d8
This commit is contained in:
Kubernetes Publisher 2018-10-08 23:38:02 -07:00
parent 1f59ae3a4c bd604a62aa
commit f2a92f83c3
9 changed files with 208 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

392
Godeps/Godeps.json generated
View File

@ -1,6 +1,6 @@
{ {
"ImportPath": "k8s.io/apiserver", "ImportPath": "k8s.io/apiserver",
"GoVersion": "go1.10", "GoVersion": "go1.11",
"GodepVersion": "v80", "GodepVersion": "v80",
"Packages": [ "Packages": [
"./..." "./..."
@ -864,131 +864,131 @@
}, },
{ {
"ImportPath": "k8s.io/api/admission/v1beta1", "ImportPath": "k8s.io/api/admission/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1", "ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/admissionregistration/v1beta1", "ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/apps/v1", "ImportPath": "k8s.io/api/apps/v1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/apps/v1beta1", "ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/apps/v1beta2", "ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/authentication/v1", "ImportPath": "k8s.io/api/authentication/v1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/authentication/v1beta1", "ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/authorization/v1", "ImportPath": "k8s.io/api/authorization/v1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/authorization/v1beta1", "ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/autoscaling/v1", "ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/autoscaling/v2beta1", "ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/autoscaling/v2beta2", "ImportPath": "k8s.io/api/autoscaling/v2beta2",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/batch/v1", "ImportPath": "k8s.io/api/batch/v1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/batch/v1beta1", "ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/batch/v2alpha1", "ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/certificates/v1beta1", "ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/coordination/v1beta1", "ImportPath": "k8s.io/api/coordination/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/core/v1", "ImportPath": "k8s.io/api/core/v1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/events/v1beta1", "ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/extensions/v1beta1", "ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/networking/v1", "ImportPath": "k8s.io/api/networking/v1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/policy/v1beta1", "ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/rbac/v1", "ImportPath": "k8s.io/api/rbac/v1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/rbac/v1alpha1", "ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/rbac/v1beta1", "ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/scheduling/v1alpha1", "ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/scheduling/v1beta1", "ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/settings/v1alpha1", "ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/storage/v1", "ImportPath": "k8s.io/api/storage/v1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/storage/v1alpha1", "ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/api/storage/v1beta1", "ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "ded30614edd77e131ec4fb340f049041faebe692" "Rev": "942fd07262c19357041a676f7170ed250f58b69a"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting", "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
@ -1204,655 +1204,655 @@
}, },
{ {
"ImportPath": "k8s.io/client-go/discovery", "ImportPath": "k8s.io/client-go/discovery",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/discovery/fake", "ImportPath": "k8s.io/client-go/discovery/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers", "ImportPath": "k8s.io/client-go/informers",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/admissionregistration", "ImportPath": "k8s.io/client-go/informers/admissionregistration",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1", "ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1", "ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/apps", "ImportPath": "k8s.io/client-go/informers/apps",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/apps/v1", "ImportPath": "k8s.io/client-go/informers/apps/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/apps/v1beta1", "ImportPath": "k8s.io/client-go/informers/apps/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/apps/v1beta2", "ImportPath": "k8s.io/client-go/informers/apps/v1beta2",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/autoscaling", "ImportPath": "k8s.io/client-go/informers/autoscaling",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/autoscaling/v1", "ImportPath": "k8s.io/client-go/informers/autoscaling/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1", "ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta2", "ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta2",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/batch", "ImportPath": "k8s.io/client-go/informers/batch",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/batch/v1", "ImportPath": "k8s.io/client-go/informers/batch/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/batch/v1beta1", "ImportPath": "k8s.io/client-go/informers/batch/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/batch/v2alpha1", "ImportPath": "k8s.io/client-go/informers/batch/v2alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/certificates", "ImportPath": "k8s.io/client-go/informers/certificates",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/certificates/v1beta1", "ImportPath": "k8s.io/client-go/informers/certificates/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/coordination", "ImportPath": "k8s.io/client-go/informers/coordination",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/coordination/v1beta1", "ImportPath": "k8s.io/client-go/informers/coordination/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/core", "ImportPath": "k8s.io/client-go/informers/core",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/core/v1", "ImportPath": "k8s.io/client-go/informers/core/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/events", "ImportPath": "k8s.io/client-go/informers/events",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/events/v1beta1", "ImportPath": "k8s.io/client-go/informers/events/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/extensions", "ImportPath": "k8s.io/client-go/informers/extensions",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/extensions/v1beta1", "ImportPath": "k8s.io/client-go/informers/extensions/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/internalinterfaces", "ImportPath": "k8s.io/client-go/informers/internalinterfaces",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/networking", "ImportPath": "k8s.io/client-go/informers/networking",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/networking/v1", "ImportPath": "k8s.io/client-go/informers/networking/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/policy", "ImportPath": "k8s.io/client-go/informers/policy",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/policy/v1beta1", "ImportPath": "k8s.io/client-go/informers/policy/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/rbac", "ImportPath": "k8s.io/client-go/informers/rbac",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/rbac/v1", "ImportPath": "k8s.io/client-go/informers/rbac/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1", "ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/rbac/v1beta1", "ImportPath": "k8s.io/client-go/informers/rbac/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/scheduling", "ImportPath": "k8s.io/client-go/informers/scheduling",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1", "ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/scheduling/v1beta1", "ImportPath": "k8s.io/client-go/informers/scheduling/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/settings", "ImportPath": "k8s.io/client-go/informers/settings",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/settings/v1alpha1", "ImportPath": "k8s.io/client-go/informers/settings/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/storage", "ImportPath": "k8s.io/client-go/informers/storage",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/storage/v1", "ImportPath": "k8s.io/client-go/informers/storage/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/storage/v1alpha1", "ImportPath": "k8s.io/client-go/informers/storage/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/informers/storage/v1beta1", "ImportPath": "k8s.io/client-go/informers/storage/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes", "ImportPath": "k8s.io/client-go/kubernetes",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/fake", "ImportPath": "k8s.io/client-go/kubernetes/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/scheme", "ImportPath": "k8s.io/client-go/kubernetes/scheme",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1", "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1", "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2", "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1", "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1", "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1", "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2", "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta2/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1", "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1", "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1", "ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1", "ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1", "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1", "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1", "ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1", "ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1", "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1", "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1", "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake", "ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1", "ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1", "ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/apps/v1", "ImportPath": "k8s.io/client-go/listers/apps/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/apps/v1beta1", "ImportPath": "k8s.io/client-go/listers/apps/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/apps/v1beta2", "ImportPath": "k8s.io/client-go/listers/apps/v1beta2",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/autoscaling/v1", "ImportPath": "k8s.io/client-go/listers/autoscaling/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1", "ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta2", "ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta2",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/batch/v1", "ImportPath": "k8s.io/client-go/listers/batch/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/batch/v1beta1", "ImportPath": "k8s.io/client-go/listers/batch/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/batch/v2alpha1", "ImportPath": "k8s.io/client-go/listers/batch/v2alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/certificates/v1beta1", "ImportPath": "k8s.io/client-go/listers/certificates/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/coordination/v1beta1", "ImportPath": "k8s.io/client-go/listers/coordination/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/core/v1", "ImportPath": "k8s.io/client-go/listers/core/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/events/v1beta1", "ImportPath": "k8s.io/client-go/listers/events/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/extensions/v1beta1", "ImportPath": "k8s.io/client-go/listers/extensions/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/networking/v1", "ImportPath": "k8s.io/client-go/listers/networking/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/policy/v1beta1", "ImportPath": "k8s.io/client-go/listers/policy/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/rbac/v1", "ImportPath": "k8s.io/client-go/listers/rbac/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1", "ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/rbac/v1beta1", "ImportPath": "k8s.io/client-go/listers/rbac/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1", "ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/scheduling/v1beta1", "ImportPath": "k8s.io/client-go/listers/scheduling/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/settings/v1alpha1", "ImportPath": "k8s.io/client-go/listers/settings/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/storage/v1", "ImportPath": "k8s.io/client-go/listers/storage/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/storage/v1alpha1", "ImportPath": "k8s.io/client-go/listers/storage/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/listers/storage/v1beta1", "ImportPath": "k8s.io/client-go/listers/storage/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication", "ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1", "ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1", "ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/pkg/version", "ImportPath": "k8s.io/client-go/pkg/version",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/plugin/pkg/client/auth/exec", "ImportPath": "k8s.io/client-go/plugin/pkg/client/auth/exec",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/rest", "ImportPath": "k8s.io/client-go/rest",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/rest/watch", "ImportPath": "k8s.io/client-go/rest/watch",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/testing", "ImportPath": "k8s.io/client-go/testing",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/tools/auth", "ImportPath": "k8s.io/client-go/tools/auth",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/tools/cache", "ImportPath": "k8s.io/client-go/tools/cache",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/tools/clientcmd", "ImportPath": "k8s.io/client-go/tools/clientcmd",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/tools/clientcmd/api", "ImportPath": "k8s.io/client-go/tools/clientcmd/api",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest", "ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1", "ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/tools/metrics", "ImportPath": "k8s.io/client-go/tools/metrics",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/tools/pager", "ImportPath": "k8s.io/client-go/tools/pager",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/tools/reference", "ImportPath": "k8s.io/client-go/tools/reference",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/transport", "ImportPath": "k8s.io/client-go/transport",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/util/buffer", "ImportPath": "k8s.io/client-go/util/buffer",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/util/cert", "ImportPath": "k8s.io/client-go/util/cert",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/util/connrotation", "ImportPath": "k8s.io/client-go/util/connrotation",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/util/flowcontrol", "ImportPath": "k8s.io/client-go/util/flowcontrol",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/util/homedir", "ImportPath": "k8s.io/client-go/util/homedir",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/util/integer", "ImportPath": "k8s.io/client-go/util/integer",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/client-go/util/retry", "ImportPath": "k8s.io/client-go/util/retry",
"Rev": "1f8420dc261fe36c5bb6945b410ae0834b763f32" "Rev": "2ccedc1ac86406f224e9844768b3ed1f5e9d23cd"
}, },
{ {
"ImportPath": "k8s.io/kube-openapi/pkg/builder", "ImportPath": "k8s.io/kube-openapi/pkg/builder",

4
pkg/server/options/etcd.go
View File

@ -162,10 +162,6 @@ func (s *EtcdOptions) AddFlags(fs *pflag.FlagSet) {
fs.StringVar(&s.StorageConfig.CAFile, "etcd-cafile", s.StorageConfig.CAFile, fs.StringVar(&s.StorageConfig.CAFile, "etcd-cafile", s.StorageConfig.CAFile,
"SSL Certificate Authority file used to secure etcd communication.") "SSL Certificate Authority file used to secure etcd communication.")
fs.BoolVar(&s.StorageConfig.Quorum, "etcd-quorum-read", s.StorageConfig.Quorum,
"If true, enable quorum read. It defaults to true and is strongly recommended not setting to false.")
fs.MarkDeprecated("etcd-quorum-read", "This flag is deprecated and the ability to switch off quorum read will be removed in a future release.")
fs.StringVar(&s.EncryptionProviderConfigFilepath, "experimental-encryption-provider-config", s.EncryptionProviderConfigFilepath, fs.StringVar(&s.EncryptionProviderConfigFilepath, "experimental-encryption-provider-config", s.EncryptionProviderConfigFilepath,
"The file containing configuration for encryption providers to be used for storing secrets in etcd") "The file containing configuration for encryption providers to be used for storing secrets in etcd")

4
pkg/server/options/etcd_test.go
View File

@ -40,7 +40,6 @@ func TestEtcdOptionsValidate(t *testing.T) {
ServerList: nil, ServerList: nil,
Prefix: "/registry", Prefix: "/registry",
DeserializationCacheSize: 0, DeserializationCacheSize: 0,
Quorum: false,
KeyFile: "/var/run/kubernetes/etcd.key", KeyFile: "/var/run/kubernetes/etcd.key",
CAFile: "/var/run/kubernetes/etcdca.crt", CAFile: "/var/run/kubernetes/etcdca.crt",
CertFile: "/var/run/kubernetes/etcdce.crt", CertFile: "/var/run/kubernetes/etcdce.crt",
@ -64,7 +63,6 @@ func TestEtcdOptionsValidate(t *testing.T) {
ServerList: []string{"http://127.0.0.1"}, ServerList: []string{"http://127.0.0.1"},
Prefix: "/registry", Prefix: "/registry",
DeserializationCacheSize: 0, DeserializationCacheSize: 0,
Quorum: false,
KeyFile: "/var/run/kubernetes/etcd.key", KeyFile: "/var/run/kubernetes/etcd.key",
CAFile: "/var/run/kubernetes/etcdca.crt", CAFile: "/var/run/kubernetes/etcdca.crt",
CertFile: "/var/run/kubernetes/etcdce.crt", CertFile: "/var/run/kubernetes/etcdce.crt",
@ -88,7 +86,6 @@ func TestEtcdOptionsValidate(t *testing.T) {
ServerList: []string{"http://127.0.0.1"}, ServerList: []string{"http://127.0.0.1"},
Prefix: "/registry", Prefix: "/registry",
DeserializationCacheSize: 0, DeserializationCacheSize: 0,
Quorum: false,
KeyFile: "/var/run/kubernetes/etcd.key", KeyFile: "/var/run/kubernetes/etcd.key",
CAFile: "/var/run/kubernetes/etcdca.crt", CAFile: "/var/run/kubernetes/etcdca.crt",
CertFile: "/var/run/kubernetes/etcdce.crt", CertFile: "/var/run/kubernetes/etcdce.crt",
@ -112,7 +109,6 @@ func TestEtcdOptionsValidate(t *testing.T) {
ServerList: []string{"http://127.0.0.1"}, ServerList: []string{"http://127.0.0.1"},
Prefix: "/registry", Prefix: "/registry",
DeserializationCacheSize: 0, DeserializationCacheSize: 0,
Quorum: false,
KeyFile: "/var/run/kubernetes/etcd.key", KeyFile: "/var/run/kubernetes/etcd.key",
CAFile: "/var/run/kubernetes/etcdca.crt", CAFile: "/var/run/kubernetes/etcdca.crt",
CertFile: "/var/run/kubernetes/etcdce.crt", CertFile: "/var/run/kubernetes/etcdce.crt",

15
pkg/storage/etcd3/store.go
View File

@ -82,16 +82,10 @@ type objState struct {
// New returns an etcd3 implementation of storage.Interface. // New returns an etcd3 implementation of storage.Interface.
func New(c *clientv3.Client, codec runtime.Codec, prefix string, transformer value.Transformer, pagingEnabled bool) storage.Interface { func New(c *clientv3.Client, codec runtime.Codec, prefix string, transformer value.Transformer, pagingEnabled bool) storage.Interface {
return newStore(c, true, pagingEnabled, codec, prefix, transformer) return newStore(c, pagingEnabled, codec, prefix, transformer)
} }
// NewWithNoQuorumRead returns etcd3 implementation of storage.Interface func newStore(c *clientv3.Client, pagingEnabled bool, codec runtime.Codec, prefix string, transformer value.Transformer) *store {
// where Get operations don't require quorum read.
func NewWithNoQuorumRead(c *clientv3.Client, codec runtime.Codec, prefix string, transformer value.Transformer, pagingEnabled bool) storage.Interface {
return newStore(c, false, pagingEnabled, codec, prefix, transformer)
}
func newStore(c *clientv3.Client, quorumRead, pagingEnabled bool, codec runtime.Codec, prefix string, transformer value.Transformer) *store {
versioner := etcd.APIObjectVersioner{} versioner := etcd.APIObjectVersioner{}
result := &store{ result := &store{
client: c, client: c,
@ -106,11 +100,6 @@ func newStore(c *clientv3.Client, quorumRead, pagingEnabled bool, codec runtime.
watcher: newWatcher(c, codec, versioner, transformer), watcher: newWatcher(c, codec, versioner, transformer),
leaseManager: newDefaultLeaseManager(c), leaseManager: newDefaultLeaseManager(c),
} }
if !quorumRead {
// In case of non-quorum reads, we can set WithSerializable()
// options for all Get operations.
result.getOps = append(result.getOps, clientv3.WithSerializable())
}
return result return result
} }

14
pkg/storage/etcd3/store_test.go
View File

@ -677,7 +677,7 @@ func TestTransformationFailure(t *testing.T) {
codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
defer cluster.Terminate(t) defer cluster.Terminate(t)
store := newStore(cluster.RandClient(), false, false, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)}) store := newStore(cluster.RandClient(), false, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)})
ctx := context.Background() ctx := context.Background()
preset := []struct { preset := []struct {
@ -754,8 +754,8 @@ func TestList(t *testing.T) {
codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
defer cluster.Terminate(t) defer cluster.Terminate(t)
store := newStore(cluster.RandClient(), false, true, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)}) store := newStore(cluster.RandClient(), true, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)})
disablePagingStore := newStore(cluster.RandClient(), false, false, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)}) disablePagingStore := newStore(cluster.RandClient(), false, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)})
ctx := context.Background() ctx := context.Background()
// Setup storage with the following structure: // Setup storage with the following structure:
@ -1074,7 +1074,7 @@ func TestListContinuation(t *testing.T) {
codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
defer cluster.Terminate(t) defer cluster.Terminate(t)
store := newStore(cluster.RandClient(), false, true, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)}) store := newStore(cluster.RandClient(), true, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)})
ctx := context.Background() ctx := context.Background()
// Setup storage with the following structure: // Setup storage with the following structure:
@ -1185,7 +1185,7 @@ func TestListInconsistentContinuation(t *testing.T) {
codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
defer cluster.Terminate(t) defer cluster.Terminate(t)
store := newStore(cluster.RandClient(), false, true, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)}) store := newStore(cluster.RandClient(), true, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)})
ctx := context.Background() ctx := context.Background()
// Setup storage with the following structure: // Setup storage with the following structure:
@ -1330,7 +1330,7 @@ func TestListInconsistentContinuation(t *testing.T) {
func testSetup(t *testing.T) (context.Context, *store, *integration.ClusterV3) { func testSetup(t *testing.T) (context.Context, *store, *integration.ClusterV3) {
codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion) codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
store := newStore(cluster.RandClient(), false, true, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)}) store := newStore(cluster.RandClient(), true, codec, "", prefixTransformer{prefix: []byte(defaultTestPrefix)})
ctx := context.Background() ctx := context.Background()
// As 30s is the default timeout for testing in glboal configuration, // As 30s is the default timeout for testing in glboal configuration,
// we cannot wait longer than that in a single time: change it to 10 // we cannot wait longer than that in a single time: change it to 10
@ -1366,7 +1366,7 @@ func TestPrefix(t *testing.T) {
"/registry": "/registry", "/registry": "/registry",
} }
for configuredPrefix, effectivePrefix := range testcases { for configuredPrefix, effectivePrefix := range testcases {
store := newStore(cluster.RandClient(), false, true, codec, configuredPrefix, transformer) store := newStore(cluster.RandClient(), true, codec, configuredPrefix, transformer)
if store.pathPrefix != effectivePrefix { if store.pathPrefix != effectivePrefix {
t.Errorf("configured prefix of %s, expected effective prefix of %s, got %s", configuredPrefix, effectivePrefix, store.pathPrefix) t.Errorf("configured prefix of %s, expected effective prefix of %s, got %s", configuredPrefix, effectivePrefix, store.pathPrefix)
} }

4
pkg/storage/etcd3/watcher_test.go
View File

@ -225,13 +225,13 @@ func TestWatchError(t *testing.T) {
codec := &testCodec{apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)} codec := &testCodec{apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)}
cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1}) cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
defer cluster.Terminate(t) defer cluster.Terminate(t)
invalidStore := newStore(cluster.RandClient(), false, true, codec, "", prefixTransformer{prefix: []byte("test!")}) invalidStore := newStore(cluster.RandClient(), true, codec, "", prefixTransformer{prefix: []byte("test!")})
ctx := context.Background() ctx := context.Background()
w, err := invalidStore.Watch(ctx, "/abc", "0", storage.Everything) w, err := invalidStore.Watch(ctx, "/abc", "0", storage.Everything)
if err != nil { if err != nil {
t.Fatalf("Watch failed: %v", err) t.Fatalf("Watch failed: %v", err)
} }
validStore := newStore(cluster.RandClient(), false, true, codec, "", prefixTransformer{prefix: []byte("test!")}) validStore := newStore(cluster.RandClient(), true, codec, "", prefixTransformer{prefix: []byte("test!")})
validStore.GuaranteedUpdate(ctx, "/abc", &example.Pod{}, true, nil, storage.SimpleUpdate( validStore.GuaranteedUpdate(ctx, "/abc", &example.Pod{}, true, nil, storage.SimpleUpdate(
func(runtime.Object) (runtime.Object, error) { func(runtime.Object) (runtime.Object, error) {
return &example.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}, nil return &example.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}, nil

3
pkg/storage/storagebackend/config.go
View File

@ -42,8 +42,6 @@ type Config struct {
KeyFile string KeyFile string
CertFile string CertFile string
CAFile string CAFile string
// Quorum indicates that whether read operations should be quorum-level consistent.
Quorum bool
// Paging indicates whether the server implementation should allow paging (if it is // Paging indicates whether the server implementation should allow paging (if it is
// supported). This is generally configured by feature gating, or by a specific // supported). This is generally configured by feature gating, or by a specific
// resource type not wishing to allow paging, and is not intended for end users to // resource type not wishing to allow paging, and is not intended for end users to
@ -74,6 +72,5 @@ func NewDefaultConfig(prefix string, codec runtime.Codec) *Config {
DeserializationCacheSize: 0, DeserializationCacheSize: 0,
Codec: codec, Codec: codec,
CompactionInterval: DefaultCompactInterval, CompactionInterval: DefaultCompactInterval,
Quorum: true,
} }
} }

5
pkg/storage/storagebackend/factory/etcd3.go
View File

@ -123,8 +123,5 @@ func newETCD3Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, e
if transformer == nil { if transformer == nil {
transformer = value.IdentityTransformer transformer = value.IdentityTransformer
} }
if c.Quorum { return etcd3.New(client, c.Codec, c.Prefix, transformer, c.Paging), destroyFunc, nil
return etcd3.New(client, c.Codec, c.Prefix, transformer, c.Paging), destroyFunc, nil
}
return etcd3.NewWithNoQuorumRead(client, c.Codec, c.Prefix, transformer, c.Paging), destroyFunc, nil
} }

4
pkg/storage/storagebackend/factory/factory.go
View File

@ -32,10 +32,6 @@ func Create(c storagebackend.Config) (storage.Interface, DestroyFunc, error) {
case "etcd2": case "etcd2":
return nil, nil, fmt.Errorf("%v is no longer a supported storage backend", c.Type) return nil, nil, fmt.Errorf("%v is no longer a supported storage backend", c.Type)
case storagebackend.StorageTypeUnset, storagebackend.StorageTypeETCD3: case storagebackend.StorageTypeUnset, storagebackend.StorageTypeETCD3:
// TODO: We have the following features to implement:
// - Support secure connection by using key, cert, and CA files.
// - Honor "https" scheme to support secure connection in gRPC.
// - Support non-quorum read.
return newETCD3Storage(c) return newETCD3Storage(c)
default: default:
return nil, nil, fmt.Errorf("unknown storage type: %s", c.Type) return nil, nil, fmt.Errorf("unknown storage type: %s", c.Type)