Move pkg/helm to internal/helm (#3537)

* Move pkg/helm to internal/helm * internal/helm: move types to internal/types Co-authored-by: Joe Lanford <[email protected]>
operator-framework · Jul 27, 2020 · 8b95fdc · 8b95fdc
1 parent 62a8f29
commit 8b95fdc
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 11 deletions.
diff --git a/changelog/fragments/mv-pkg-helm.yaml b/changelog/fragments/mv-pkg-helm.yaml
@@ -0,0 +1,15 @@
+# entries is a list of entries to include in
+# release notes and/or the migration guide
+entries:
+  - description: >
+      Move pkg/helm to internal/helm
+
+    kind: "removal"
+
+    # Is this a breaking change?
+    breaking: yes
+
+    migration:
+      header: Move pkg/helm to internal/helm
+      body: >
+        TBD
diff --git a/cmd/helm-operator/main.go b/cmd/helm-operator/main.go
@@ -30,12 +30,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 
+	"github.com/operator-framework/operator-sdk/internal/helm/controller"
+	"github.com/operator-framework/operator-sdk/internal/helm/flags"
+	"github.com/operator-framework/operator-sdk/internal/helm/release"
+	"github.com/operator-framework/operator-sdk/internal/helm/watches"
 	"github.com/operator-framework/operator-sdk/internal/log/zap"
 	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
-	"github.com/operator-framework/operator-sdk/pkg/helm/controller"
-	"github.com/operator-framework/operator-sdk/pkg/helm/flags"
-	"github.com/operator-framework/operator-sdk/pkg/helm/release"
-	"github.com/operator-framework/operator-sdk/pkg/helm/watches"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 )
 

diff --git a/pkg/helm/client/client.go → internal/helm/client/client.go b/pkg/helm/client/client.go → internal/helm/client/client.go
diff --git a/pkg/helm/client/doc.go → internal/helm/client/doc.go b/pkg/helm/client/doc.go → internal/helm/client/doc.go
diff --git a/pkg/helm/controller/controller.go → internal/helm/controller/controller.go b/pkg/helm/controller/controller.go → internal/helm/controller/controller.go
@@ -35,8 +35,8 @@ import (
 
 	libhandler "github.com/operator-framework/operator-lib/handler"
 	"github.com/operator-framework/operator-lib/predicate"
+	"github.com/operator-framework/operator-sdk/internal/helm/release"
 	"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
-	"github.com/operator-framework/operator-sdk/pkg/helm/release"
 )
 
 var log = logf.Log.WithName("helm.controller")

diff --git a/pkg/helm/controller/doc.go → internal/helm/controller/doc.go b/pkg/helm/controller/doc.go → internal/helm/controller/doc.go
diff --git a/pkg/helm/controller/reconcile.go → internal/helm/controller/reconcile.go b/pkg/helm/controller/reconcile.go → internal/helm/controller/reconcile.go
@@ -34,9 +34,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	"github.com/operator-framework/operator-sdk/pkg/helm/internal/diff"
-	"github.com/operator-framework/operator-sdk/pkg/helm/internal/types"
-	"github.com/operator-framework/operator-sdk/pkg/helm/release"
+	"github.com/operator-framework/operator-sdk/internal/helm/internal/diff"
+	"github.com/operator-framework/operator-sdk/internal/helm/internal/types"
+	"github.com/operator-framework/operator-sdk/internal/helm/release"
 )
 
 // blank assignment to verify that HelmOperatorReconciler implements reconcile.Reconciler

diff --git a/pkg/helm/controller/reconcile_test.go → internal/helm/controller/reconcile_test.go b/pkg/helm/controller/reconcile_test.go → internal/helm/controller/reconcile_test.go
diff --git a/pkg/helm/flags/flag.go → internal/helm/flags/flag.go b/pkg/helm/flags/flag.go → internal/helm/flags/flag.go
diff --git a/pkg/helm/internal/diff/diff.go → internal/helm/internal/diff/diff.go b/pkg/helm/internal/diff/diff.go → internal/helm/internal/diff/diff.go
diff --git a/pkg/helm/internal/types/doc.go → internal/helm/internal/types/doc.go b/pkg/helm/internal/types/doc.go → internal/helm/internal/types/doc.go
diff --git a/pkg/helm/internal/types/types.go → internal/helm/internal/types/types.go b/pkg/helm/internal/types/types.go → internal/helm/internal/types/types.go
diff --git a/pkg/helm/internal/types/types_test.go → internal/helm/internal/types/types_test.go b/pkg/helm/internal/types/types_test.go → internal/helm/internal/types/types_test.go
diff --git a/pkg/helm/release/doc.go → internal/helm/release/doc.go b/pkg/helm/release/doc.go → internal/helm/release/doc.go
diff --git a/pkg/helm/release/manager.go → internal/helm/release/manager.go b/pkg/helm/release/manager.go → internal/helm/release/manager.go
@@ -39,7 +39,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/cli-runtime/pkg/resource"
 
-	"github.com/operator-framework/operator-sdk/pkg/helm/internal/types"
+	"github.com/operator-framework/operator-sdk/internal/helm/internal/types"
 )
 
 // Manager manages a Helm release. It can install, upgrade, reconcile,

diff --git a/pkg/helm/release/manager_factory.go → internal/helm/release/manager_factory.go b/pkg/helm/release/manager_factory.go → internal/helm/release/manager_factory.go
@@ -28,8 +28,8 @@ import (
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	crmanager "sigs.k8s.io/controller-runtime/pkg/manager"
 
-	"github.com/operator-framework/operator-sdk/pkg/helm/client"
-	"github.com/operator-framework/operator-sdk/pkg/helm/internal/types"
+	"github.com/operator-framework/operator-sdk/internal/helm/client"
+	"github.com/operator-framework/operator-sdk/internal/helm/internal/types"
 )
 
 // ManagerFactory creates Managers that are specific to custom resources. It is

diff --git a/pkg/helm/release/manager_test.go → internal/helm/release/manager_test.go b/pkg/helm/release/manager_test.go → internal/helm/release/manager_test.go
diff --git a/pkg/helm/watches/watches.go → internal/helm/watches/watches.go b/pkg/helm/watches/watches.go → internal/helm/watches/watches.go
diff --git a/pkg/helm/watches/watches_test.go → internal/helm/watches/watches_test.go b/pkg/helm/watches/watches_test.go → internal/helm/watches/watches_test.go