Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2024-10-01 01:36:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

bootstrapper: return error on context cancel in WaitForCilium (#1534)

Browse Source
This commit is contained in:
Nils Hanke 2023-03-28 14:41:17 +02:00 committed by GitHub
parent ccb31c9570
commit 8e8124345b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bootstrapper/internal/kubernetes/k8sapi/k8sutil.go
View File

@ -252,23 +252,26 @@ func (k *KubernetesUtil) WaitForCilium(ctx context.Context, log *logger.Logger)
// wait for cilium pod to be healthy // wait for cilium pod to be healthy
client := http.Client{} client := http.Client{}
for { for {
time.Sleep(5 * time.Second) select {
req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://127.0.0.1:9879/healthz", http.NoBody) case <-ctx.Done():
if err != nil { return ctx.Err()
return fmt.Errorf("unable to create request: %w", err) default:
} time.Sleep(5 * time.Second)
resp, err := client.Do(req) req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://127.0.0.1:9879/healthz", http.NoBody)
if err != nil { if err != nil {
log.With(zap.Error(err)).Infof("Waiting for local Cilium DaemonSet - Pod not healthy yet") return fmt.Errorf("unable to create request: %w", err)
continue }
} resp, err := client.Do(req)
resp.Body.Close() if err != nil {
if resp.StatusCode == 200 { log.With(zap.Error(err)).Infof("Waiting for local Cilium DaemonSet - Pod not healthy yet")
break continue
}
resp.Body.Close()
if resp.StatusCode == 200 {
return nil
}
} }
} }
return nil
} }
// FixCilium fixes https://github.com/cilium/cilium/issues/19958 // FixCilium fixes https://github.com/cilium/cilium/issues/19958