rearrange helm library related code to internal/legacy/

operator-framework · Nov 1, 2021 · fff4b47 · fff4b47
1 parent d147756
commit fff4b47
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 32 deletions.
diff --git a/internal/cmd/helm-operator/run/cmd.go b/internal/cmd/helm-operator/run/cmd.go
@@ -22,13 +22,13 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/operator-framework/helm-operator-plugins/internal/controller"
 	"github.com/operator-framework/helm-operator-plugins/internal/flags"
+	"github.com/operator-framework/helm-operator-plugins/internal/legacy/controller"
+	"github.com/operator-framework/helm-operator-plugins/internal/legacy/release"
+	watches "github.com/operator-framework/helm-operator-plugins/internal/legacy/watches"
 	"github.com/operator-framework/helm-operator-plugins/internal/metrics"
-	"github.com/operator-framework/helm-operator-plugins/internal/release"
 	"github.com/operator-framework/helm-operator-plugins/internal/version"
 	helmmgr "github.com/operator-framework/helm-operator-plugins/pkg/manager"
-	watches "github.com/operator-framework/helm-operator-plugins/pkg/watches/helm"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"

diff --git a/internal/cmd/hybrid-operator/run/cmd.go b/internal/cmd/hybrid-operator/run/cmd.go
@@ -28,7 +28,7 @@ import (
 	"github.com/operator-framework/helm-operator-plugins/pkg/annotation"
 	helmmgr "github.com/operator-framework/helm-operator-plugins/pkg/manager"
 	"github.com/operator-framework/helm-operator-plugins/pkg/reconciler"
-	watches "github.com/operator-framework/helm-operator-plugins/pkg/watches/hybrid"
+	"github.com/operator-framework/helm-operator-plugins/pkg/watches"
 	"github.com/spf13/cobra"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"

diff --git a/internal/controller/controller.go → internal/legacy/controller/controller.go b/internal/controller/controller.go → internal/legacy/controller/controller.go
@@ -36,7 +36,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 	"sigs.k8s.io/yaml"
 
-	"github.com/operator-framework/helm-operator-plugins/internal/release"
+	"github.com/operator-framework/helm-operator-plugins/internal/legacy/release"
 	"github.com/operator-framework/helm-operator-plugins/pkg/sdk/controllerutil"
 	libhandler "github.com/operator-framework/operator-lib/handler"
 	"github.com/operator-framework/operator-lib/predicate"

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

diff --git a/internal/controller/reconcile_test.go → internal/legacy/controller/reconcile_test.go b/internal/controller/reconcile_test.go → internal/legacy/controller/reconcile_test.go
diff --git a/pkg/client/helm/client/client.go → internal/legacy/helm/client/client.go b/pkg/client/helm/client/client.go → internal/legacy/helm/client/client.go
diff --git a/pkg/client/helm/client/client_test.go → internal/legacy/helm/client/client_test.go b/pkg/client/helm/client/client_test.go → internal/legacy/helm/client/client_test.go
diff --git a/pkg/client/helm/client/doc.go → internal/legacy/helm/client/doc.go b/pkg/client/helm/client/doc.go → internal/legacy/helm/client/doc.go
diff --git a/internal/helm/diff/diff.go → internal/legacy/helm/diff/diff.go b/internal/helm/diff/diff.go → internal/legacy/helm/diff/diff.go
diff --git a/internal/helm/types/doc.go → internal/legacy/helm/types/doc.go b/internal/helm/types/doc.go → internal/legacy/helm/types/doc.go
diff --git a/internal/helm/types/types.go → internal/legacy/helm/types/types.go b/internal/helm/types/types.go → internal/legacy/helm/types/types.go
diff --git a/internal/helm/types/types_test.go → internal/legacy/helm/types/types_test.go b/internal/helm/types/types_test.go → internal/legacy/helm/types/types_test.go
diff --git a/internal/manifestutil/resource_policy.go → ...al/legacy/manifestutil/resource_policy.go b/internal/manifestutil/resource_policy.go → ...al/legacy/manifestutil/resource_policy.go
diff --git a/internal/release/doc.go → internal/legacy/release/doc.go b/internal/release/doc.go → internal/legacy/release/doc.go
diff --git a/internal/release/manager.go → internal/legacy/release/manager.go b/internal/release/manager.go → internal/legacy/release/manager.go
@@ -41,8 +41,8 @@ import (
 	"k8s.io/cli-runtime/pkg/resource"
 	"k8s.io/client-go/discovery"
 
-	"github.com/operator-framework/helm-operator-plugins/internal/helm/types"
-	"github.com/operator-framework/helm-operator-plugins/internal/manifestutil"
+	"github.com/operator-framework/helm-operator-plugins/internal/legacy/helm/types"
+	"github.com/operator-framework/helm-operator-plugins/internal/legacy/manifestutil"
 )
 
 // Manager manages a Helm release. It can install, upgrade, reconcile,

diff --git a/internal/release/manager_factory.go → internal/legacy/release/manager_factory.go b/internal/release/manager_factory.go → internal/legacy/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/helm-operator-plugins/internal/helm/types"
-	"github.com/operator-framework/helm-operator-plugins/pkg/client/helm/client"
+	"github.com/operator-framework/helm-operator-plugins/internal/legacy/helm/client"
+	"github.com/operator-framework/helm-operator-plugins/internal/legacy/helm/types"
 )
 
 // ManagerFactory creates Managers that are specific to custom resources. It is

diff --git a/internal/release/manager_test.go → internal/legacy/release/manager_test.go b/internal/release/manager_test.go → internal/legacy/release/manager_test.go
diff --git a/pkg/watches/helm/watches.go → internal/legacy/watches/watches.go b/pkg/watches/helm/watches.go → internal/legacy/watches/watches.go
diff --git a/pkg/watches/helm/watches_test.go → internal/legacy/watches/watches_test.go b/pkg/watches/helm/watches_test.go → internal/legacy/watches/watches_test.go
diff --git a/pkg/watches/hybrid/watches.go → pkg/watches/watches.go b/pkg/watches/hybrid/watches.go → pkg/watches/watches.go
diff --git a/pkg/watches/hybrid/watches_suite_test.go → pkg/watches/watches_suite_test.go b/pkg/watches/hybrid/watches_suite_test.go → pkg/watches/watches_suite_test.go
diff --git a/pkg/watches/hybrid/watches_test.go → pkg/watches/watches_test.go b/pkg/watches/hybrid/watches_test.go → pkg/watches/watches_test.go
@@ -36,15 +36,15 @@ var _ = Describe("LoadReader", func() {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     key: value
 `
 		expectedWatches = []Watch{
 			{
 				GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyKind"},
-				ChartPath:               "../../../pkg/internal/testdata/test-chart",
+				ChartPath:               "../../pkg/internal/testdata/test-chart",
 				WatchDependentResources: &falseVal,
 				OverrideValues:          map[string]string{"key": "value"},
 			},
@@ -61,15 +61,15 @@ var _ = Describe("LoadReader", func() {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     key: $MY_VALUE
 `
 		expectedWatches = []Watch{
 			{
 				GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyKind"},
-				ChartPath:               "../../../pkg/internal/testdata/test-chart",
+				ChartPath:               "../../pkg/internal/testdata/test-chart",
 				WatchDependentResources: &falseVal,
 				OverrideValues:          map[string]string{"key": "value"},
 			},
@@ -90,7 +90,7 @@ var _ = Describe("LoadReader", func() {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
   watchDependentResources: false
   reconcilePeriod: 1s
   maxConcurrentReconciles: 2
@@ -100,7 +100,7 @@ var _ = Describe("LoadReader", func() {
 		expectedWatches = []Watch{
 			{
 				GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyKind"},
-				ChartPath:               "../../../pkg/internal/testdata/test-chart",
+				ChartPath:               "../../pkg/internal/testdata/test-chart",
 				WatchDependentResources: &falseVal,
 				OverrideValues:          map[string]string{"key": "value"},
 				MaxConcurrentReconciles: &concurrentReconciles,
@@ -122,7 +122,7 @@ var _ = Describe("LoadReader", func() {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     repo: '{{ ("$MY_IMAGE" | split ":")._0 }}'
@@ -131,7 +131,7 @@ var _ = Describe("LoadReader", func() {
 		expectedWatches = []Watch{
 			{
 				GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyKind"},
-				ChartPath:               "../../../pkg/internal/testdata/test-chart",
+				ChartPath:               "../../pkg/internal/testdata/test-chart",
 				WatchDependentResources: &falseVal,
 				OverrideValues: map[string]string{
 					"repo": "quay.io/operator-framework/helm-operator",
@@ -154,7 +154,7 @@ var _ = Describe("LoadReader", func() {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
   overrideValues:
     repo: '{{ ("$MY_IMAGE" | split ":")._0 }}'
     tag: '{{ ("$MY_IMAGE" | split ":")._1'
@@ -173,21 +173,21 @@ var _ = Describe("LoadReader", func() {
 - group: mygroup
   version: v1alpha1
   kind: MyFirstKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
 - group: mygroup
   version: v1alpha1
   kind: MySecondKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
 `
 		expectedWatches = []Watch{
 			{
 				GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyFirstKind"},
-				ChartPath:               "../../../pkg/internal/testdata/test-chart",
+				ChartPath:               "../../pkg/internal/testdata/test-chart",
 				WatchDependentResources: &trueVal,
 			},
 			{
 				GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MySecondKind"},
-				ChartPath:               "../../../pkg/internal/testdata/test-chart",
+				ChartPath:               "../../pkg/internal/testdata/test-chart",
 				WatchDependentResources: &trueVal,
 			},
 		}
@@ -202,11 +202,11 @@ var _ = Describe("LoadReader", func() {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
 `
 		watchesData := bytes.NewBufferString(data)
 		watches, err := LoadReader(watchesData)
@@ -218,7 +218,7 @@ var _ = Describe("LoadReader", func() {
 		data = `---
 - group: mygroup
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
 `
 		watchesData := bytes.NewBufferString(data)
 		watches, err := LoadReader(watchesData)
@@ -230,7 +230,7 @@ var _ = Describe("LoadReader", func() {
 		data = `---
 - group: mygroup
   version: v1alpha1
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
 `
 		watchesData := bytes.NewBufferString(data)
 		watches, err := LoadReader(watchesData)
@@ -256,7 +256,7 @@ var _ = Describe("LoadReader", func() {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
   overrideValues:
     key1:
       key2: value
@@ -290,7 +290,7 @@ var _ = Describe("Load", func() {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../pkg/internal/testdata/test-chart
+  chart: ../../pkg/internal/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     key: value
@@ -299,7 +299,7 @@ var _ = Describe("Load", func() {
 		expectedWatches = []Watch{
 			{
 				GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyKind"},
-				ChartPath:               "../../../pkg/internal/testdata/test-chart",
+				ChartPath:               "../../pkg/internal/testdata/test-chart",
 				WatchDependentResources: &falseVal,
 				OverrideValues:          map[string]string{"key": "value"},
 			},