Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-07 11:15:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve cluster sync wait

Browse Source
This commit is contained in:
stefanprodan
2020-06-09 16:12:40 +03:00
parent e612a8a496
commit 51ca2ee9d8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/tk/bootstrap_github.go
View File

@@ -181,7 +181,7 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error {
} }
if err := createGitHubDeployKey(ctx, key, ghHostname, ghOwner, ghRepository, ghToken, ghPersonal); err != nil { if err := createGitHubDeployKey(ctx, key, ghHostname, ghOwner, ghRepository, ghToken, ghPersonal); err != nil {
return nil return err
} }
logSuccess("deploy key configured") logSuccess("deploy key configured")
} }
@@ -446,6 +446,12 @@ func applyGitHubKustomization(ctx context.Context, kubeClient client.Client, nam
} }
logWaiting("waiting for cluster sync") logWaiting("waiting for cluster sync")
if err := wait.PollImmediate(pollInterval, timeout,
isGitRepositoryReady(ctx, kubeClient, name, namespace)); err != nil {
return err
}
if err := wait.PollImmediate(pollInterval, timeout, if err := wait.PollImmediate(pollInterval, timeout,
isKustomizationReady(ctx, kubeClient, name, namespace)); err != nil { isKustomizationReady(ctx, kubeClient, name, namespace)); err != nil {
return err return err
@@ -515,12 +521,8 @@ func createGitHubDeployKey(ctx context.Context, key, hostname, owner, name, toke
return err return err
} }
keyName := fmt.Sprintf("tk-%s", namespace) keyName := fmt.Sprintf("tk-%s", namespace)
org := ""
if !isPersonal {
org = owner
}
isReadOnly := true isReadOnly := true
_, _, err = gh.Repositories.CreateKey(ctx, org, name, &github.Key{ _, _, err = gh.Repositories.CreateKey(ctx, owner, name, &github.Key{
Title: &keyName, Title: &keyName,
Key: &key, Key: &key,
ReadOnly: &isReadOnly, ReadOnly: &isReadOnly,