diff --git a/pkg/kube/job_status_reader.go b/internal/statusreaders/job_status_reader.go similarity index 99% rename from pkg/kube/job_status_reader.go rename to internal/statusreaders/job_status_reader.go index f6eb8d3d9..d493d9e13 100644 --- a/pkg/kube/job_status_reader.go +++ b/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 diff --git a/pkg/kube/job_status_reader_test.go b/internal/statusreaders/job_status_reader_test.go similarity index 99% rename from pkg/kube/job_status_reader_test.go rename to internal/statusreaders/job_status_reader_test.go index cd0dcedeb..70e4ee29a 100644 --- a/pkg/kube/job_status_reader_test.go +++ b/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 ( diff --git a/pkg/kube/pod_status_reader.go b/internal/statusreaders/pod_status_reader.go similarity index 95% rename from pkg/kube/pod_status_reader.go rename to internal/statusreaders/pod_status_reader.go index c44af542e..d3daf7cc3 100644 --- a/pkg/kube/pod_status_reader.go +++ b/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 - -// This file was copied and modified from https://github.com/fluxcd/kustomize-controller/blob/main/internal/statusreaders/job.go +package statusreaders import ( "context" diff --git a/pkg/kube/pod_status_reader_test.go b/internal/statusreaders/pod_status_reader_test.go similarity index 95% rename from pkg/kube/pod_status_reader_test.go rename to internal/statusreaders/pod_status_reader_test.go index bb08f041a..a151f1aed 100644 --- a/pkg/kube/pod_status_reader_test.go +++ b/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" diff --git a/pkg/kube/statuswait.go b/pkg/kube/statuswait.go index 4aff42ff2..eaa473cd4 100644 --- a/pkg/kube/statuswait.go +++ b/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) - podSR := NewCustomPodStatusReader(w.restMapper) + jobSR := helmStatusReaders.NewCustomJobStatusReader(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)