Skip to content

Commit

Permalink
add mod file for controller pkg (#4062)
Browse files Browse the repository at this point in the history
* add controller pkg.

* delete deprecate buildah

* add mod file for controller pkg

* delete useless module used in sealos cli

* go mod tidy

* delete payment

* fix go. work

* fix module error
  • Loading branch information
lingdie committed Oct 11, 2023
1 parent f8764c8 commit 0362392
Show file tree
Hide file tree
Showing 65 changed files with 915 additions and 7,975 deletions.
14 changes: 6 additions & 8 deletions controllers/account/api/v1/debt_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ import (
"os"
"strings"

"github.com/labring/sealos/controllers/pkg/code"

userV1 "github.com/labring/sealos/controllers/user/api/v1"

account2 "github.com/labring/sealos/controllers/pkg/account"
"github.com/labring/sealos/controllers/pkg/code"
userv1 "github.com/labring/sealos/controllers/user/api/v1"

admissionV1 "k8s.io/api/admission/v1"
admissionv1 "k8s.io/api/admission/v1"
"k8s.io/apimachinery/pkg/types"

"github.com/go-logr/logr"
Expand Down Expand Up @@ -68,7 +66,7 @@ func init() {
func (d DebtValidate) Handle(ctx context.Context, req admission.Request) admission.Response {
logger.V(1).Info("checking user", "userInfo", req.UserInfo, "req.Namespace", req.Namespace, "req.Name", req.Name, "req.gvrk", getGVRK(req), "req.Operation", req.Operation)
// skip delete request (删除quota资源除外)
if req.Operation == admissionV1.Delete && !strings.Contains(getGVRK(req), "quotas") {
if req.Operation == admissionv1.Delete && !strings.Contains(getGVRK(req), "quotas") {
return admission.Allowed("")
}

Expand Down Expand Up @@ -98,7 +96,7 @@ func (d DebtValidate) Handle(ctx context.Context, req admission.Request) admissi
if req.Kind.Kind == "Namespace" {
return admission.Denied(fmt.Sprintf("ns %s request %s %s permission denied", req.Namespace, req.Kind.Kind, req.Operation))
}
if req.Kind.Kind == "Payment" && req.Operation == admissionV1.Update {
if req.Kind.Kind == "Payment" && req.Operation == admissionv1.Update {
return admission.Denied(fmt.Sprintf("ns %s request %s %s permission denied", req.Namespace, req.Kind.Kind, req.Operation))
}
return checkOption(ctx, logger, d.Client, req.Namespace)
Expand Down Expand Up @@ -142,7 +140,7 @@ func checkOption(ctx context.Context, logger logr.Logger, c client.Client, nsNam
return admission.Allowed("namespace not found")
}
// Check if it is a user namespace
user, ok := ns.Labels[userV1.UserLabelOwnerKey]
user, ok := ns.Labels[userv1.UserLabelOwnerKey]
if !ok {
return admission.ValidationResponse(false, fmt.Sprintf("this namespace is not user namespace %s,or have not create", ns.Name))
}
Expand Down
28 changes: 13 additions & 15 deletions controllers/account/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/go-logr/logr v1.2.4
github.com/labring/sealos v0.0.0
github.com/labring/sealos/controllers/pkg v0.0.0-00010101000000-000000000000
github.com/labring/sealos/controllers/user v0.0.0
github.com/matoous/go-nanoid/v2 v2.0.0
github.com/onsi/ginkgo v1.16.5
Expand Down Expand Up @@ -38,7 +38,7 @@ require (
github.com/imdario/mergo v0.3.16 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -54,30 +54,28 @@ require (
github.com/prometheus/procfs v0.9.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/stripe/stripe-go/v74 v74.26.0 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/wechatpay-apiv3/wechatpay-go v0.2.14 // indirect
github.com/stripe/stripe-go/v74 v74.30.0 // indirect
github.com/wechatpay-apiv3/wechatpay-go v0.2.17 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.1 // indirect
github.com/xdg-go/stringprep v1.0.3 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
go.mongodb.org/mongo-driver v1.11.4 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.mongodb.org/mongo-driver v1.12.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/term v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand All @@ -92,6 +90,6 @@ require (
)

replace (
github.com/labring/sealos => ../../
github.com/labring/sealos/controllers/pkg => ../pkg
github.com/labring/sealos/controllers/user => ../../controllers/user
)

0 comments on commit 0362392

Please sign in to comment.