Skip to content

Move pkg/helm to internal/helm #3537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmrodri merged 2 commits into from
Jul 27, 2020
Merged

Move pkg/helm to internal/helm #3537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86b255e
Move pkg/helm to internal/helm
hasbro17 Jul 25, 2020
d124a98
internal/helm: move types to internal/types
joelanford Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions changelog/fragments/mv-pkg-helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions cmd/helm-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 pkg/helm/client/client.go → internal/helm/client/client.go
View file
Open in desktop
File renamed without changes.
0 pkg/helm/client/doc.go → internal/helm/client/doc.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/helm/controller/controller.go → internal/helm/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
0 pkg/helm/controller/doc.go → internal/helm/controller/doc.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/helm/controller/reconcile.go → internal/helm/controller/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 pkg/helm/controller/reconcile_test.go → internal/helm/controller/reconcile_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/helm/flags/flag.go → internal/helm/flags/flag.go
View file
Open in desktop
File renamed without changes.
0 pkg/helm/internal/diff/diff.go → internal/helm/internal/diff/diff.go
View file
Open in desktop
File renamed without changes.
0 pkg/helm/internal/types/doc.go → internal/helm/internal/types/doc.go
View file
Open in desktop
File renamed without changes.
0 pkg/helm/internal/types/types.go → internal/helm/internal/types/types.go
View file
Open in desktop
File renamed without changes.
0 pkg/helm/internal/types/types_test.go → internal/helm/internal/types/types_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/helm/release/doc.go → internal/helm/release/doc.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/helm/release/manager.go → internal/helm/release/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions pkg/helm/release/manager_factory.go → internal/helm/release/manager_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 pkg/helm/release/manager_test.go → internal/helm/release/manager_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/helm/watches/watches.go → internal/helm/watches/watches.go
View file
Open in desktop
File renamed without changes.
0 pkg/helm/watches/watches_test.go → internal/helm/watches/watches_test.go
View file
Open in desktop
File renamed without changes.