diff --git a/go.mod.dev b/go.mod.dev new file mode 100644 index 00000000..032f45ef --- /dev/null +++ b/go.mod.dev @@ -0,0 +1,64 @@ +module github.com/rancher/steve + +go 1.13 + +replace ( + git.apache.org/thrift.git => github.com/apache/thrift v0.12.0 + github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.2.0+incompatible + github.com/crewjam/saml => github.com/rancher/saml v0.0.0-20180713225824-ce1532152fde + github.com/knative/pkg => github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e + github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 + github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.3 + + k8s.io/api => k8s.io/api v0.18.0 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0 + k8s.io/apimachinery => k8s.io/apimachinery v0.18.0 + k8s.io/apiserver => k8s.io/apiserver v0.18.0 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0 + k8s.io/client-go => github.com/rancher/client-go v1.18.0-rancher.1 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0 + k8s.io/code-generator => k8s.io/code-generator v0.18.0 + k8s.io/component-base => k8s.io/component-base v0.18.0 + k8s.io/cri-api => k8s.io/cri-api v0.18.0 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0 + k8s.io/kubectl => k8s.io/kubectl v0.18.0 + k8s.io/kubelet => k8s.io/kubelet v0.18.0 + k8s.io/kubernetes => k8s.io/kubernetes v1.18.0 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0 + k8s.io/metrics => k8s.io/metrics v0.18.0 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0 + + github.com/rancher/rancher/pkg/auth => ../rancher/pkg/auth +) + +require ( + github.com/golang/protobuf v1.3.2 + github.com/gorilla/mux v1.7.3 + github.com/pkg/errors v0.9.1 + github.com/rancher/apiserver v0.0.0-20200612212259-10457317eb0b + github.com/rancher/dynamiclistener v0.2.1-0.20200213165308-111c5b43e932 + github.com/rancher/norman v0.0.0-20200517050325-f53cae161640 + github.com/rancher/rancher/pkg/auth v0.0.0-20200612062006-9ccb702b9571 + github.com/rancher/wrangler v0.6.2-0.20200515155908-1923f3f8ec3f + github.com/rancher/wrangler v0.6.1-0.20200515193802-dcf70881b087 + github.com/sirupsen/logrus v1.4.2 + github.com/urfave/cli v1.22.2 + github.com/urfave/cli/v2 v2.1.1 + golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e + helm.sh/helm/v3 v3.2.0 + k8s.io/api v0.18.0 + k8s.io/apiextensions-apiserver v0.18.0 + k8s.io/apimachinery v0.18.0 + k8s.io/apiserver v0.18.0 + k8s.io/client-go v12.0.0+incompatible + k8s.io/helm v2.16.7+incompatible + k8s.io/klog v1.0.0 + k8s.io/kube-aggregator v0.18.0 + k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c + sigs.k8s.io/yaml v1.2.0 +) diff --git a/loop.sh b/loop.sh new file mode 100644 index 00000000..9312499a --- /dev/null +++ b/loop.sh @@ -0,0 +1,39 @@ +#kubectl create -f - << EOF +#kind: ConfigMap +#apiVersion: v1 +#metadata: +# name: test +# ownerReferences: +# - kind: bad +# apiVersion: bad +# name: bad +# uid: "${RANDOM}${RANDOM}" +#EOF +# +#while true; do +# kubectl apply -f - << EOF +#kind: ConfigMap +#apiVersion: v1 +#metadata: +# name: test +# ownerReferences: +# - kind: bad +# apiVersion: bad +# name: bad +# uid: "${RANDOM}${RANDOM}" +#EOF +# +#done +while true; do + (kubectl create -f - -o json | kubectl delete -f - ) << EOF +kind: ConfigMap +apiVersion: v1 +metadata: + generateName: test- + ownerReferences: + - kind: bad + apiVersion: bad + name: bad + uid: "${RANDOM}${RANDOM}" +EOF +done diff --git a/pkg/accesscontrol/access_store.go b/pkg/accesscontrol/access_store.go index cefe3a83..c14ee6e6 100644 --- a/pkg/accesscontrol/access_store.go +++ b/pkg/accesscontrol/access_store.go @@ -7,7 +7,7 @@ import ( "sort" "time" - v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1" + v1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" "k8s.io/apimachinery/pkg/util/cache" "k8s.io/apiserver/pkg/authentication/user" ) diff --git a/pkg/accesscontrol/policy_rule_index.go b/pkg/accesscontrol/policy_rule_index.go index 501277f7..fb77370e 100644 --- a/pkg/accesscontrol/policy_rule_index.go +++ b/pkg/accesscontrol/policy_rule_index.go @@ -4,7 +4,7 @@ import ( "hash" "sort" - v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1" + v1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/pkg/accesscontrol/role_revision_index.go b/pkg/accesscontrol/role_revision_index.go index d6c193a4..e6ee05ca 100644 --- a/pkg/accesscontrol/role_revision_index.go +++ b/pkg/accesscontrol/role_revision_index.go @@ -4,7 +4,7 @@ import ( "context" "sync" - rbac "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1" + rbac "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" "github.com/rancher/wrangler/pkg/kv" rbacv1 "k8s.io/api/rbac/v1" ) diff --git a/pkg/controllers/schema/schemas.go b/pkg/controllers/schema/schemas.go index 93647543..f2f4431d 100644 --- a/pkg/controllers/schema/schemas.go +++ b/pkg/controllers/schema/schemas.go @@ -11,8 +11,8 @@ import ( "github.com/rancher/steve/pkg/resources/common" schema2 "github.com/rancher/steve/pkg/schema" "github.com/rancher/steve/pkg/schema/converter" - apiextcontrollerv1beta1 "github.com/rancher/wrangler-api/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" - v1 "github.com/rancher/wrangler-api/pkg/generated/controllers/apiregistration.k8s.io/v1" + apiextcontrollerv1beta1 "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" + v1 "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io/v1" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/pkg/schema/converter/crd.go b/pkg/schema/converter/crd.go index d0ea92af..faa952da 100644 --- a/pkg/schema/converter/crd.go +++ b/pkg/schema/converter/crd.go @@ -4,7 +4,7 @@ import ( "github.com/rancher/apiserver/pkg/types" "github.com/rancher/steve/pkg/attributes" "github.com/rancher/steve/pkg/schema/table" - "github.com/rancher/wrangler-api/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" + "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" "github.com/rancher/wrangler/pkg/schemas" beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/schema/converter/k8stonorman.go b/pkg/schema/converter/k8stonorman.go index 6fd39775..1262dd64 100644 --- a/pkg/schema/converter/k8stonorman.go +++ b/pkg/schema/converter/k8stonorman.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/rancher/apiserver/pkg/types" - "github.com/rancher/wrangler-api/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" + "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" ) diff --git a/pkg/server/config.go b/pkg/server/config.go index b50558c4..c821064b 100644 --- a/pkg/server/config.go +++ b/pkg/server/config.go @@ -11,14 +11,14 @@ import ( "github.com/rancher/steve/pkg/client" "github.com/rancher/steve/pkg/schema" "github.com/rancher/steve/pkg/server/router" - "github.com/rancher/wrangler-api/pkg/generated/controllers/apiextensions.k8s.io" - apiextensionsv1beta1 "github.com/rancher/wrangler-api/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" - "github.com/rancher/wrangler-api/pkg/generated/controllers/apiregistration.k8s.io" - apiregistrationv1 "github.com/rancher/wrangler-api/pkg/generated/controllers/apiregistration.k8s.io/v1" - "github.com/rancher/wrangler-api/pkg/generated/controllers/core" - corev1 "github.com/rancher/wrangler-api/pkg/generated/controllers/core/v1" - "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac" - rbacv1 "github.com/rancher/wrangler-api/pkg/generated/controllers/rbac/v1" + "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io" + apiextensionsv1beta1 "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1beta1" + "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io" + apiregistrationv1 "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io/v1" + "github.com/rancher/wrangler/pkg/generated/controllers/core" + corev1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1" + "github.com/rancher/wrangler/pkg/generated/controllers/rbac" + rbacv1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1" "github.com/rancher/wrangler/pkg/generic" "github.com/rancher/wrangler/pkg/ratelimit" "github.com/rancher/wrangler/pkg/start"