Skip to content
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

change package of common-controller crd #1810

Merged
merged 1 commit into from
Oct 10, 2023
Merged

change package of common-controller crd #1810

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
892 changes: 446 additions & 446 deletions common-controller/coverage.out
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common-controller/internal/cache/datastore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"sync"

logger "github.com/sirupsen/logrus"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
2 changes: 1 addition & 1 deletion common-controller/internal/operator/PROJECT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ resources:
domain: wso2.com
group: dp
kind: RateLimitPolicy
path: github.com/wso2/apk/common-controller/api/v1alpha1
path: github.com/wso2/apk/common-controller/api/dp/v1alpha1
version: v1alpha1
version: "3"
Empty file added common-controller/internal/operator/apis/cp/.gitKeep
View file
Open in desktop
Empty file.
0 ...ternal/operator/api/v1alpha1/api_types.go → ...al/operator/apis/dp/v1alpha1/api_types.go
View file
Open in desktop
File renamed without changes.
0 ...rnal/operator/api/v1alpha1/api_webhook.go → .../operator/apis/dp/v1alpha1/api_webhook.go
View file
Open in desktop
File renamed without changes.
0 ...operator/api/v1alpha1/api_webhook_test.go → ...ator/apis/dp/v1alpha1/api_webhook_test.go
View file
Open in desktop
File renamed without changes.
0 .../operator/api/v1alpha1/apipolicy_types.go → ...rator/apis/dp/v1alpha1/apipolicy_types.go
View file
Open in desktop
File renamed without changes.
0 ...perator/api/v1alpha1/apipolicy_webhook.go → ...tor/apis/dp/v1alpha1/apipolicy_webhook.go
View file
Open in desktop
File renamed without changes.
0 ...al/operator/api/v1alpha1/backend_types.go → ...perator/apis/dp/v1alpha1/backend_types.go
View file
Open in desktop
File renamed without changes.
0 .../operator/api/v1alpha1/backend_webhook.go → ...rator/apis/dp/v1alpha1/backend_webhook.go
View file
Open in desktop
File renamed without changes.
0 ...operator/api/v1alpha1/backendjwt_types.go → ...ator/apis/dp/v1alpha1/backendjwt_types.go
View file
Open in desktop
File renamed without changes.
0 ...erator/api/v1alpha1/backendjwt_webhook.go → ...or/apis/dp/v1alpha1/backendjwt_webhook.go
View file
Open in desktop
File renamed without changes.
0 ...r/api/v1alpha1/custom_ratelimit_policy.go → ...is/dp/v1alpha1/custom_ratelimit_policy.go
View file
Open in desktop
File renamed without changes.
0 ...perator/api/v1alpha1/groupversion_info.go → ...tor/apis/dp/v1alpha1/groupversion_info.go
View file
Open in desktop
File renamed without changes.
0 .../api/v1alpha1/interceptorservice_types.go → ...s/dp/v1alpha1/interceptorservice_types.go
View file
Open in desktop
File renamed without changes.
0 ...pi/v1alpha1/interceptorservice_webhook.go → ...dp/v1alpha1/interceptorservice_webhook.go
View file
Open in desktop
File renamed without changes.
0 ...tor/api/v1alpha1/ratelimitpolicy_types.go → ...apis/dp/v1alpha1/ratelimitpolicy_types.go
View file
Open in desktop
File renamed without changes.
0 ...r/api/v1alpha1/ratelimitpolicy_webhook.go → ...is/dp/v1alpha1/ratelimitpolicy_webhook.go
View file
Open in desktop
File renamed without changes.
0 ...operator/api/v1alpha1/resolveRatelimit.go → ...ator/apis/dp/v1alpha1/resolveRatelimit.go
View file
Open in desktop
File renamed without changes.
0 ...erator/api/v1alpha1/webhook_suite_test.go → ...or/apis/dp/v1alpha1/webhook_suite_test.go
View file
Open in desktop
File renamed without changes.
0 ...tor/api/v1alpha1/zz_generated.deepcopy.go → ...apis/dp/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion common-controller/internal/operator/controller/ratelimitpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
cache "github.com/wso2/apk/common-controller/internal/cache"
"github.com/wso2/apk/common-controller/internal/config"
loggers "github.com/wso2/apk/common-controller/internal/loggers"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
constants "github.com/wso2/apk/common-controller/internal/operator/constant"
xds "github.com/wso2/apk/common-controller/internal/xds"
)
Expand Down
2 changes: 1 addition & 1 deletion common-controller/internal/operator/controller/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
//+kubebuilder:scaffold:imports
)

Expand Down
2 changes: 1 addition & 1 deletion common-controller/internal/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/wso2/apk/adapter/pkg/logging"
cache "github.com/wso2/apk/common-controller/internal/cache"
"github.com/wso2/apk/common-controller/internal/loggers"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
dpcontrollers "github.com/wso2/apk/common-controller/internal/operator/controller"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
Expand Down
2 changes: 1 addition & 1 deletion common-controller/internal/xds/ratelimiter_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
logger "github.com/sirupsen/logrus"
"github.com/wso2/apk/adapter/pkg/logging"
"github.com/wso2/apk/common-controller/internal/loggers"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
constants "github.com/wso2/apk/common-controller/internal/operator/constant"
)

Expand Down
2 changes: 1 addition & 1 deletion common-controller/internal/xds/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

corev3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
envoy_cachev3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/api/v1alpha1"
dpv1alpha1 "github.com/wso2/apk/common-controller/internal/operator/apis/dp/v1alpha1"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion common-controller/revive.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ warningCode = 0
[rule.context-as-argument]
[rule.context-keys-type]
[rule.dot-imports]
exclude = ["internal/operator/api/v1alpha1/webhook_suite_test.go", "internal/operator/controller/suite_test.go"]
exclude = ["internal/operator/apis/dp/v1alpha1/webhook_suite_test.go", "internal/operator/controller/suite_test.go"]
[rule.error-return]
[rule.error-strings]
[rule.error-naming]
Expand Down
Loading