@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414limitations under the License.
1515*/
1616
17- package util
17+ package kapi
1818
1919import (
2020 "context"
@@ -29,15 +29,13 @@ import (
2929 meta "k8s.io/apimachinery/pkg/apis/meta/v1"
3030 "k8s.io/apimachinery/pkg/fields"
3131 "k8s.io/apimachinery/pkg/labels"
32- "k8s.io/apimachinery/pkg/runtime"
3332 "k8s.io/apimachinery/pkg/runtime/schema"
3433 "k8s.io/apimachinery/pkg/util/wait"
3534 "k8s.io/apimachinery/pkg/watch"
3635 "k8s.io/client-go/kubernetes"
37- "k8s.io/client-go/tools/cache"
3836 "k8s.io/client-go/tools/clientcmd"
3937 watchtools "k8s.io/client-go/tools/watch"
40- "k8s.io/kubernetes/cmd/kubeadm/app/constants"
38+ kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
4139 "k8s.io/minikube/pkg/minikube/proxy"
4240)
4341
4846 ReasonableStartTime = time .Minute * 5
4947)
5048
51- // PodStore stores pods
52- type PodStore struct {
53- cache.Store
54- stopCh chan struct {}
55- Reflector * cache.Reflector
56- }
57-
58- // List lists the pods
59- func (s * PodStore ) List () []* core.Pod {
60- objects := s .Store .List ()
61- pods := make ([]* core.Pod , 0 )
62- for _ , o := range objects {
63- pods = append (pods , o .(* core.Pod ))
64- }
65- return pods
66- }
67-
68- // Stop stops the pods
69- func (s * PodStore ) Stop () {
70- close (s .stopCh )
71- }
72-
73- // GetClient gets the client from config
74- func GetClient (kubectlContext ... string ) (kubernetes.Interface , error ) {
49+ // Client gets the kuberentes client from default kubeconfig
50+ func Client (kubectlContext ... string ) (kubernetes.Interface , error ) {
7551 loadingRules := clientcmd .NewDefaultClientConfigLoadingRules ()
7652 configOverrides := & clientcmd.ConfigOverrides {}
7753 if kubectlContext != nil {
@@ -92,50 +68,16 @@ func GetClient(kubectlContext ...string) (kubernetes.Interface, error) {
9268 return client , nil
9369}
9470
95- // NewPodStore creates a new PodStore
96- func NewPodStore (c kubernetes.Interface , namespace string , label fmt.Stringer , field fmt.Stringer ) * PodStore {
97- lw := & cache.ListWatch {
98- ListFunc : func (options meta.ListOptions ) (runtime.Object , error ) {
99- options .LabelSelector = label .String ()
100- options .FieldSelector = field .String ()
101- obj , err := c .CoreV1 ().Pods (namespace ).List (options )
102- return runtime .Object (obj ), err
103- },
104- WatchFunc : func (options meta.ListOptions ) (watch.Interface , error ) {
105- options .LabelSelector = label .String ()
106- options .FieldSelector = field .String ()
107- return c .CoreV1 ().Pods (namespace ).Watch (options )
108- },
109- }
110- store := cache .NewStore (cache .MetaNamespaceKeyFunc )
111- stopCh := make (chan struct {})
112- reflector := cache .NewReflector (lw , & core.Pod {}, store , 0 )
113- go reflector .Run (stopCh )
114- return & PodStore {Store : store , stopCh : stopCh , Reflector : reflector }
115- }
116-
117- // StartPods starts all pods
118- func StartPods (c kubernetes.Interface , namespace string , pod core.Pod , waitForRunning bool ) error {
119- pod .ObjectMeta .Labels ["name" ] = pod .Name
120- if waitForRunning {
121- label := labels .SelectorFromSet (labels .Set (map [string ]string {"name" : pod .Name }))
122- err := WaitForPodsWithLabelRunning (c , namespace , label )
123- if err != nil {
124- return fmt .Errorf ("error waiting for pod %s to be running: %v" , pod .Name , err )
125- }
126- }
127- return nil
128- }
129-
13071// WaitForPodsWithLabelRunning waits for all matching pods to become Running and at least one matching pod exists.
131- func WaitForPodsWithLabelRunning (c kubernetes.Interface , ns string , label labels.Selector ) error {
72+ func WaitForPodsWithLabelRunning (c kubernetes.Interface , ns string , label labels.Selector , timeOut ... time.Duration ) error {
73+ start := time .Now ()
13274 glog .Infof ("Waiting for pod with label %q in ns %q ..." , ns , label )
13375 lastKnownPodNumber := - 1
134- return wait . PollImmediate ( constants . APICallRetryInterval , ReasonableStartTime , func () (bool , error ) {
76+ f := func () (bool , error ) {
13577 listOpts := meta.ListOptions {LabelSelector : label .String ()}
13678 pods , err := c .CoreV1 ().Pods (ns ).List (listOpts )
13779 if err != nil {
138- glog .Infof ("error getting Pods with label selector %q [%v]\n " , label .String (), err )
80+ glog .Infof ("temporary error: getting Pods with label selector %q : [%v]\n " , label .String (), err )
13981 return false , nil
14082 }
14183
@@ -150,45 +92,23 @@ func WaitForPodsWithLabelRunning(c kubernetes.Interface, ns string, label labels
15092
15193 for _ , pod := range pods .Items {
15294 if pod .Status .Phase != core .PodRunning {
95+ glog .Infof ("waiting for pod %q, current state: %s: [%v]\n " , label .String (), pod .Status .Phase , err )
15396 return false , nil
15497 }
15598 }
15699
157100 return true , nil
158- })
159- }
160-
161- // WaitForPodDelete waits for a pod to be deleted
162- func WaitForPodDelete (c kubernetes.Interface , ns string , label fmt.Stringer ) error {
163- return wait .PollImmediate (constants .APICallRetryInterval , ReasonableMutateTime , func () (bool , error ) {
164- listOpts := meta.ListOptions {LabelSelector : label .String ()}
165- pods , err := c .CoreV1 ().Pods (ns ).List (listOpts )
166- if err != nil {
167- glog .Infof ("error getting Pods with label selector %q [%v]\n " , label .String (), err )
168- return false , nil
169- }
170- return len (pods .Items ) == 0 , nil
171- })
172- }
173-
174- // WaitForEvent waits for the given event to appear
175- func WaitForEvent (c kubernetes.Interface , ns string , reason string ) error {
176- return wait .PollImmediate (constants .APICallRetryInterval , ReasonableMutateTime , func () (bool , error ) {
177- events , err := c .EventsV1beta1 ().Events ("default" ).List (meta.ListOptions {})
178- if err != nil {
179- glog .Infof ("error getting events: %v" , err )
180- return false , nil
181- }
182- for _ , e := range events .Items {
183- if e .Reason == reason {
184- return true , nil
185- }
186- }
187- return false , nil
188- })
101+ }
102+ t := ReasonableStartTime
103+ if timeOut != nil {
104+ t = timeOut [0 ]
105+ }
106+ err := wait .PollImmediate (kconst .APICallRetryInterval , t , f )
107+ glog .Infof ("duration metric: took %s to wait for %s ..." , time .Since (start ), label )
108+ return err
189109}
190110
191- // WaitForRCToStabilize waits till the RC has a matching generation/replica count between spec and status.
111+ // WaitForRCToStabilize waits till the RC has a matching generation/replica count between spec and status. used by integration tests
192112func WaitForRCToStabilize (c kubernetes.Interface , ns , name string , timeout time.Duration ) error {
193113 options := meta.ListOptions {FieldSelector : fields.Set {
194114 "metadata.name" : name ,
@@ -222,7 +142,7 @@ func WaitForRCToStabilize(c kubernetes.Interface, ns, name string, timeout time.
222142 return err
223143}
224144
225- // WaitForDeploymentToStabilize waits till the Deployment has a matching generation/replica count between spec and status.
145+ // WaitForDeploymentToStabilize waits till the Deployment has a matching generation/replica count between spec and status. used by integrationt tests
226146func WaitForDeploymentToStabilize (c kubernetes.Interface , ns , name string , timeout time.Duration ) error {
227147 options := meta.ListOptions {FieldSelector : fields.Set {
228148 "metadata.name" : name ,
@@ -281,32 +201,6 @@ func WaitForService(c kubernetes.Interface, namespace, name string, exist bool,
281201 return nil
282202}
283203
284- // WaitForServiceEndpointsNum waits until the amount of endpoints that implement service to expectNum.
285- func WaitForServiceEndpointsNum (c kubernetes.Interface , namespace , serviceName string , expectNum int , interval , timeout time.Duration ) error {
286- return wait .Poll (interval , timeout , func () (bool , error ) {
287- glog .Infof ("Waiting for amount of service:%s endpoints to be %d" , serviceName , expectNum )
288- list , err := c .CoreV1 ().Endpoints (namespace ).List (meta.ListOptions {})
289- if err != nil {
290- return false , err
291- }
292-
293- for _ , e := range list .Items {
294- if e .Name == serviceName && countEndpointsNum (& e ) == expectNum {
295- return true , nil
296- }
297- }
298- return false , nil
299- })
300- }
301-
302- func countEndpointsNum (e * core.Endpoints ) int {
303- num := 0
304- for _ , sub := range e .Subsets {
305- num += len (sub .Addresses )
306- }
307- return num
308- }
309-
310204// IsRetryableAPIError returns if this error is retryable or not
311205func IsRetryableAPIError (err error ) bool {
312206 return apierr .IsTimeout (err ) || apierr .IsServerTimeout (err ) || apierr .IsTooManyRequests (err ) || apierr .IsInternalError (err )
0 commit comments