Skip to content

move controllers into pkg #542

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
mikhail-aws merged 1 commit into from
Nov 23, 2023
Merged

move controllers into pkg #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ vet: ## Vet the code and dependencies

.PHONY: test
test: ## Run tests.
go test ./pkg/... ./controllers/... -coverprofile coverage.out
go test ./pkg/... -coverprofile coverage.out

.PHONY: toolchain
toolchain: ## Install developer toolchain
Expand Down
2 changes: 1 addition & 1 deletion cmd/aws-application-networking-k8s/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
gateway_api_v1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
gateway_api_v1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"

"github.com/aws/aws-application-networking-k8s/controllers"
"github.com/aws/aws-application-networking-k8s/pkg/controllers"

//+kubebuilder:scaffold:imports
anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
Expand Down
0 controllers/accesslogpolicy_controller.go → ...controllers/accesslogpolicy_controller.go
View file
Open in desktop
File renamed without changes.
0 controllers/errors.go → pkg/controllers/errors.go
View file
Open in desktop
File renamed without changes.
0 controllers/eventhandlers/gateway.go → pkg/controllers/eventhandlers/gateway.go
View file
Open in desktop
File renamed without changes.
0 controllers/eventhandlers/gatewayclass.go → ...controllers/eventhandlers/gatewayclass.go
View file
Open in desktop
File renamed without changes.
0 controllers/eventhandlers/mapper.go → pkg/controllers/eventhandlers/mapper.go
View file
Open in desktop
File renamed without changes.
0 controllers/eventhandlers/mapper_test.go → pkg/controllers/eventhandlers/mapper_test.go
View file
Open in desktop
File renamed without changes.
0 controllers/eventhandlers/policy.go → pkg/controllers/eventhandlers/policy.go
View file
Open in desktop
File renamed without changes.
0 controllers/eventhandlers/policy_test.go → pkg/controllers/eventhandlers/policy_test.go
View file
Open in desktop
File renamed without changes.
0 controllers/eventhandlers/service.go → pkg/controllers/eventhandlers/service.go
View file
Open in desktop
File renamed without changes.
0 controllers/eventhandlers/service_test.go → ...controllers/eventhandlers/service_test.go
View file
Open in desktop
File renamed without changes.
0 controllers/eventhandlers/serviceimport.go → ...ontrollers/eventhandlers/serviceimport.go
View file
Open in desktop
File renamed without changes.
0 ...llers/eventhandlers/serviceimport_test.go → ...llers/eventhandlers/serviceimport_test.go
View file
Open in desktop
File renamed without changes.
0 ...s/eventhandlers/vpc_association_policy.go → ...s/eventhandlers/vpc_association_policy.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion controllers/gateway_controller.go → pkg/controllers/gateway_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"fmt"

anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
"github.com/aws/aws-application-networking-k8s/pkg/controllers/eventhandlers"

"github.com/aws/aws-application-networking-k8s/pkg/aws"
"github.com/aws/aws-application-networking-k8s/pkg/config"
Expand All @@ -40,7 +41,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
gwv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"

"github.com/aws/aws-application-networking-k8s/controllers/eventhandlers"
"github.com/aws/aws-application-networking-k8s/pkg/aws/services"
deploy "github.com/aws/aws-application-networking-k8s/pkg/deploy/lattice"
model "github.com/aws/aws-application-networking-k8s/pkg/model/lattice"
Expand Down
0 controllers/gatewayclass_controller.go → pkg/controllers/gatewayclass_controller.go
View file
Open in desktop
File renamed without changes.
0 controllers/iamauthpolicy_controller.go → pkg/controllers/iamauthpolicy_controller.go
View file
Open in desktop
File renamed without changes.
0 controllers/iamauthpolicy_controller_test.go → ...trollers/iamauthpolicy_controller_test.go
View file
Open in desktop
File renamed without changes.
0 controllers/pod_controller.go → pkg/controllers/pod_controller.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion controllers/route_controller.go → pkg/controllers/route_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (

"sigs.k8s.io/external-dns/endpoint"

"github.com/aws/aws-application-networking-k8s/controllers/eventhandlers"
anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
"github.com/aws/aws-application-networking-k8s/pkg/aws"
"github.com/aws/aws-application-networking-k8s/pkg/config"
"github.com/aws/aws-application-networking-k8s/pkg/controllers/eventhandlers"
"github.com/aws/aws-application-networking-k8s/pkg/deploy"
"github.com/aws/aws-application-networking-k8s/pkg/deploy/lattice"
"github.com/aws/aws-application-networking-k8s/pkg/gateway"
Expand Down
0 controllers/route_controller_test.go → pkg/controllers/route_controller_test.go
View file
Open in desktop
File renamed without changes.
0 controllers/service_controller.go → pkg/controllers/service_controller.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion controllers/serviceexport_controller.go → pkg/controllers/serviceexport_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

"github.com/aws/aws-application-networking-k8s/controllers/eventhandlers"
"github.com/aws/aws-application-networking-k8s/pkg/controllers/eventhandlers"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
Expand Down
0 controllers/serviceimport_controller.go → pkg/controllers/serviceimport_controller.go
View file
Open in desktop
File renamed without changes.
0 controllers/suite_test.go → pkg/controllers/suite_test.go
View file
Open in desktop
File renamed without changes.
0 controllers/targetgrouppolicy_controller.go → ...ntrollers/targetgrouppolicy_controller.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ollers/vpcassociationpolicy_controller.go → ...ollers/vpcassociationpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
deploy "github.com/aws/aws-application-networking-k8s/pkg/deploy/lattice"
"github.com/aws/aws-application-networking-k8s/pkg/utils/gwlog"

"github.com/aws/aws-application-networking-k8s/controllers/eventhandlers"
"github.com/aws/aws-application-networking-k8s/pkg/controllers/eventhandlers"
"github.com/aws/aws-application-networking-k8s/pkg/k8s"
"github.com/aws/aws-application-networking-k8s/pkg/utils"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down
2 changes: 1 addition & 1 deletion test/pkg/test/framework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ import (
gwv1 "sigs.k8s.io/gateway-api/apis/v1"
gwv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"

"github.com/aws/aws-application-networking-k8s/controllers"
anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
"github.com/aws/aws-application-networking-k8s/pkg/config"
"github.com/aws/aws-application-networking-k8s/pkg/controllers"
"github.com/aws/aws-application-networking-k8s/pkg/model/core"
model "github.com/aws/aws-application-networking-k8s/pkg/model/lattice"
"github.com/aws/aws-application-networking-k8s/pkg/utils"
Expand Down
2 changes: 1 addition & 1 deletion test/suites/integration/iamauthpolicy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"time"

"github.com/aws/aws-application-networking-k8s/controllers"
anv1alpha1 "github.com/aws/aws-application-networking-k8s/pkg/apis/applicationnetworking/v1alpha1"
"github.com/aws/aws-application-networking-k8s/pkg/controllers"
model "github.com/aws/aws-application-networking-k8s/pkg/model/lattice"
"github.com/aws/aws-application-networking-k8s/test/pkg/test"
"github.com/aws/aws-sdk-go/aws"
Expand Down