move statusreaders to it's own package

Signed-off-by: Austin Abro <AustinAbro321@gmail.com>

internal/statusreaders/job_status_reader.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube
+package statusreaders
 
 // This file was copied and modified from https://github.com/fluxcd/kustomize-controller/blob/main/internal/statusreaders/job.go
 

internal/statusreaders/job_status_reader_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube
+package statusreaders
 
 // This file was copied and modified from https://github.com/fluxcd/kustomize-controller/blob/main/internal/statusreaders/job.go
 import (

internal/statusreaders/pod_status_reader.go

@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube
+package statusreaders
-
-// This file was copied and modified from https://github.com/fluxcd/kustomize-controller/blob/main/internal/statusreaders/job.go
 
 import (
 	"context"

internal/statusreaders/pod_status_reader_test.go

@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kube
+package statusreaders
 
-// This file was copied and modified from https://github.com/fluxcd/kustomize-controller/blob/main/internal/statusreaders/job.go
 import (
 	"testing"
 

pkg/kube/statuswait.go

@@ -23,6 +23,7 @@ import (
 	"sort"
 	"time"
 
+	helmStatusReaders "helm.sh/helm/v4/internal/statusreaders"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -55,8 +56,8 @@ func (w *statusWaiter) WatchUntilReady(resourceList ResourceList, timeout time.D
 	defer cancel()
 	w.log("waiting for %d pods and jobs to complete with a timeout of %s", len(resourceList), timeout)
 	sw := watcher.NewDefaultStatusWatcher(w.client, w.restMapper)
-	jobSR := NewCustomJobStatusReader(w.restMapper)
+	jobSR := helmStatusReaders.NewCustomJobStatusReader(w.restMapper)
-	podSR := NewCustomPodStatusReader(w.restMapper)
+	podSR := helmStatusReaders.NewCustomPodStatusReader(w.restMapper)
 	// We don't want to wait on any other resources as watchUntilReady is only for Helm hooks
 	genericSR := statusreaders.NewGenericStatusReader(w.restMapper, alwaysReady)
 
@@ -84,7 +85,7 @@ func (w *statusWaiter) WaitWithJobs(resourceList ResourceList, timeout time.Dura
 	defer cancel()
 	w.log("beginning wait for %d resources with timeout of %s", len(resourceList), timeout)
 	sw := watcher.NewDefaultStatusWatcher(w.client, w.restMapper)
-	newCustomJobStatusReader := NewCustomJobStatusReader(w.restMapper)
+	newCustomJobStatusReader := helmStatusReaders.NewCustomJobStatusReader(w.restMapper)
 	customSR := statusreaders.NewStatusReader(w.restMapper, newCustomJobStatusReader)
 	sw.StatusReader = customSR
 	return w.wait(ctx, resourceList, sw)