Skip to content

Commit bfcd4bf

Browse files
authored
Merge pull request #159 from michaelhtm/export/pkg
Export certain packages from `internal` to `pkg`
2 parents 45cac11 + cd35c39 commit bfcd4bf

31 files changed

+18
-18
lines changed

cmd/controller/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ import (
3232
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3333

3434
xv1alpha1 "github.com/awslabs/kro/api/v1alpha1"
35-
kroclient "github.com/awslabs/kro/internal/client"
3635
resourcegroupctrl "github.com/awslabs/kro/internal/controller/resourcegroup"
37-
"github.com/awslabs/kro/internal/dynamiccontroller"
3836
"github.com/awslabs/kro/internal/graph"
37+
kroclient "github.com/awslabs/kro/pkg/client"
38+
"github.com/awslabs/kro/pkg/dynamiccontroller"
3939
//+kubebuilder:scaffold:imports
4040
)
4141

internal/controller/instance/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import (
2828
ctrl "sigs.k8s.io/controller-runtime"
2929

3030
"github.com/awslabs/kro/api/v1alpha1"
31-
kroclient "github.com/awslabs/kro/internal/client"
3231
"github.com/awslabs/kro/internal/graph"
3332
"github.com/awslabs/kro/internal/metadata"
33+
kroclient "github.com/awslabs/kro/pkg/client"
3434
)
3535

3636
// ReconcileConfig holds configuration parameters for the recnociliation process.

internal/controller/instance/controller_reconcile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"k8s.io/client-go/dynamic"
2727

2828
"github.com/awslabs/kro/internal/metadata"
29-
"github.com/awslabs/kro/internal/requeue"
3029
"github.com/awslabs/kro/internal/runtime"
30+
"github.com/awslabs/kro/pkg/requeue"
3131
)
3232

3333
// instanceGraphReconciler is responsible for reconciling a single instance and

internal/controller/instance/controller_status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323

2424
"github.com/awslabs/kro/api/v1alpha1"
25-
"github.com/awslabs/kro/internal/requeue"
25+
"github.com/awslabs/kro/pkg/requeue"
2626
)
2727

2828
func createCondition(conditionType v1alpha1.ConditionType, status corev1.ConditionStatus, reason, message string, generation int64) map[string]interface{} {

internal/controller/resourcegroup/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/reconcile"
2525

2626
"github.com/awslabs/kro/api/v1alpha1"
27-
kroclient "github.com/awslabs/kro/internal/client"
28-
"github.com/awslabs/kro/internal/dynamiccontroller"
2927
"github.com/awslabs/kro/internal/graph"
3028
"github.com/awslabs/kro/internal/metadata"
29+
kroclient "github.com/awslabs/kro/pkg/client"
30+
"github.com/awslabs/kro/pkg/dynamiccontroller"
3131
)
3232

3333
//+kubebuilder:rbac:groups=kro.run,resources=resourcegroups,verbs=get;list;watch;create;update;patch;delete

internal/controller/resourcegroup/controller_reconcile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424

2525
"github.com/awslabs/kro/api/v1alpha1"
2626
instancectrl "github.com/awslabs/kro/internal/controller/instance"
27-
"github.com/awslabs/kro/internal/dynamiccontroller"
2827
"github.com/awslabs/kro/internal/graph"
2928
"github.com/awslabs/kro/internal/metadata"
29+
"github.com/awslabs/kro/pkg/dynamiccontroller"
3030
)
3131

3232
// reconcileResourceGroup orchestrates the reconciliation of a ResourceGroup by:

internal/graph/builder.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ import (
2929
"k8s.io/client-go/rest"
3030

3131
"github.com/awslabs/kro/api/v1alpha1"
32-
krocel "github.com/awslabs/kro/internal/cel"
33-
"github.com/awslabs/kro/internal/cel/ast"
3432
"github.com/awslabs/kro/internal/graph/crd"
3533
"github.com/awslabs/kro/internal/graph/dag"
3634
"github.com/awslabs/kro/internal/graph/emulator"
3735
"github.com/awslabs/kro/internal/graph/parser"
3836
"github.com/awslabs/kro/internal/graph/schema"
3937
"github.com/awslabs/kro/internal/graph/variable"
4038
"github.com/awslabs/kro/internal/metadata"
41-
"github.com/awslabs/kro/internal/simpleschema"
39+
krocel "github.com/awslabs/kro/pkg/cel"
40+
"github.com/awslabs/kro/pkg/cel/ast"
41+
"github.com/awslabs/kro/pkg/simpleschema"
4242
)
4343

4444
// NewBuilder creates a new GraphBuilder instance.

internal/graph/schema/conversion_cel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/google/cel-go/common/types/ref"
2020
extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2121

22-
krocel "github.com/awslabs/kro/internal/cel"
22+
krocel "github.com/awslabs/kro/pkg/cel"
2323
)
2424

2525
// inferSchemaFromCELValue infers a JSONSchemaProps from a CEL value.

internal/runtime/runtime.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"golang.org/x/exp/maps"
2323
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2424

25-
krocel "github.com/awslabs/kro/internal/cel"
2625
"github.com/awslabs/kro/internal/graph/variable"
2726
"github.com/awslabs/kro/internal/runtime/resolver"
27+
krocel "github.com/awslabs/kro/pkg/cel"
2828
)
2929

3030
// Compile time proof to ensure that ResourceGroupRuntime implements the

internal/runtime/runtime_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2424
"k8s.io/apimachinery/pkg/runtime/schema"
2525

26-
krocel "github.com/awslabs/kro/internal/cel"
2726
"github.com/awslabs/kro/internal/graph/variable"
27+
krocel "github.com/awslabs/kro/pkg/cel"
2828
)
2929

3030
func Test_RuntimeWorkflow(t *testing.T) {

0 commit comments

Comments
 (0)