-
Notifications
You must be signed in to change notification settings - Fork 171
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: remove k8s package (#2627)
## Description This is the final PR to completlty remove the k8s package. It refactors some of the cluster creation and moves constants that are still needed. ## Related Issue Fixes #2507 ## Checklist before merging - [x] Test, docs, adr added or updated as needed - [x] [Contributor Guide Steps](https://github.com/defenseunicorns/zarf/blob/main/.github/CONTRIBUTING.md#developer-workflow) followed Co-authored-by: Austin Abro <37223396+AustinAbro321@users.noreply.github.com> Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
- Loading branch information
1 parent
a3c4a7d
commit ccd509c
Showing
17 changed files
with
176 additions
and
296 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2021-Present The Zarf Authors | ||
|
|
||
| // Package cluster contains Zarf-specific cluster management functions. | ||
| package cluster | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "time" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/client-go/kubernetes" | ||
| "k8s.io/client-go/rest" | ||
| "sigs.k8s.io/cli-utils/pkg/kstatus/watcher" | ||
|
|
||
| pkgkubernetes "github.com/defenseunicorns/pkg/kubernetes" | ||
|
|
||
| "github.com/defenseunicorns/zarf/src/pkg/message" | ||
| ) | ||
|
|
||
| const ( | ||
| // DefaultTimeout is the default time to wait for a cluster to be ready. | ||
| DefaultTimeout = 30 * time.Second | ||
| // AgentLabel is used to give instructions to the Zarf agent | ||
| AgentLabel = "zarf.dev/agent" | ||
| ) | ||
|
|
||
| // Cluster Zarf specific cluster management functions. | ||
| type Cluster struct { | ||
| Clientset kubernetes.Interface | ||
| RestConfig *rest.Config | ||
| Watcher watcher.StatusWatcher | ||
| } | ||
|
|
||
| // NewClusterWithWait creates a new Cluster instance and waits for the given timeout for the cluster to be ready. | ||
| func NewClusterWithWait(ctx context.Context) (*Cluster, error) { | ||
| spinner := message.NewProgressSpinner("Waiting for cluster connection") | ||
| defer spinner.Stop() | ||
|
|
||
| c, err := NewCluster() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| err = waitForHealthyCluster(ctx, c.Clientset) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| spinner.Success() | ||
|
|
||
| return c, nil | ||
| } | ||
|
|
||
| // NewCluster creates a new Cluster instance and validates connection to the cluster by fetching the Kubernetes version. | ||
| func NewCluster() (*Cluster, error) { | ||
| clientset, config, err := pkgkubernetes.ClientAndConfig() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| watcher, err := pkgkubernetes.WatcherForConfig(config) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| c := &Cluster{ | ||
| Clientset: clientset, | ||
| RestConfig: config, | ||
| Watcher: watcher, | ||
| } | ||
| // Dogsled the version output. We just want to ensure no errors were returned to validate cluster connection. | ||
| _, err = c.Clientset.Discovery().ServerVersion() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return c, nil | ||
| } | ||
|
|
||
| // WaitForHealthyCluster checks for an available K8s cluster every second until timeout. | ||
| func waitForHealthyCluster(ctx context.Context, client kubernetes.Interface) error { | ||
| const waitDuration = 1 * time.Second | ||
|
|
||
| timer := time.NewTimer(0) | ||
| defer timer.Stop() | ||
|
|
||
| for { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return fmt.Errorf("error waiting for cluster to report healthy: %w", ctx.Err()) | ||
| case <-timer.C: | ||
| // Make sure there is at least one running Node | ||
| nodeList, err := client.CoreV1().Nodes().List(ctx, metav1.ListOptions{}) | ||
| if err != nil || len(nodeList.Items) < 1 { | ||
| message.Debug("No nodes reporting healthy yet: %v\n", err) | ||
| timer.Reset(waitDuration) | ||
| continue | ||
| } | ||
|
|
||
| // Get the cluster pod list | ||
| pods, err := client.CoreV1().Pods(corev1.NamespaceAll).List(ctx, metav1.ListOptions{}) | ||
| if err != nil { | ||
| message.Debug("Could not get the pod list: %w", err) | ||
| timer.Reset(waitDuration) | ||
| continue | ||
| } | ||
|
|
||
| // Check that at least one pod is in the 'succeeded' or 'running' state | ||
| for _, pod := range pods.Items { | ||
| if pod.Status.Phase == corev1.PodSucceeded || pod.Status.Phase == corev1.PodRunning { | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| message.Debug("No pods reported 'succeeded' or 'running' state yet.") | ||
| timer.Reset(waitDuration) | ||
| } | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.