Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions boskos/crds/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ go_library(
"//boskos/common:go_default_library",
"//prow/interrupts:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
"@io_k8s_apiextensions_apiserver//pkg/client/clientset/clientset:go_default_library",
"@io_k8s_apimachinery//pkg/api/errors:go_default_library",
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
"@io_k8s_apimachinery//pkg/runtime:go_default_library",
"@io_k8s_apimachinery//pkg/runtime/schema:go_default_library",
Expand Down
60 changes: 0 additions & 60 deletions boskos/crds/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ import (
"time"

"github.com/sirupsen/logrus"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
Expand Down Expand Up @@ -74,10 +70,6 @@ func (o *KubernetesClientOptions) Client() (ctrlruntimeclient.Client, error) {
return nil, err
}

if err := registerResources(cfg); err != nil {
return nil, fmt.Errorf("failed to create CRDs: %v", err)
}

return ctrlruntimeclient.New(cfg, ctrlruntimeclient.Options{})
}

Expand All @@ -94,10 +86,6 @@ func (o *KubernetesClientOptions) CacheBackedClient(namespace string, startCache
return nil, err
}

if err := registerResources(cfg); err != nil {
return nil, fmt.Errorf("failed to create CRDs: %v", err)
}

mgr, err := manager.New(cfg, manager.Options{
LeaderElection: false,
Namespace: namespace,
Expand Down Expand Up @@ -178,51 +166,3 @@ type Collection interface {
SetItems([]Object)
GetItems() []Object
}

// registerResources sends a request to create CRDs
func registerResources(config *rest.Config) error {
c, err := apiextensionsclient.NewForConfig(config)
if err != nil {
return err
}

resourceCRD := &apiextensionsv1beta1.CustomResourceDefinition{
ObjectMeta: v1.ObjectMeta{
Name: fmt.Sprintf("%s.%s", ResourceType.Plural, group),
},
Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
Group: group,
Version: version,
Scope: apiextensionsv1beta1.NamespaceScoped,
Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
Singular: ResourceType.Singular,
Plural: ResourceType.Plural,
Kind: ResourceType.Kind,
ListKind: ResourceType.ListKind,
},
},
}
if _, err := c.ApiextensionsV1beta1().CustomResourceDefinitions().Create(resourceCRD); err != nil && !apierrors.IsAlreadyExists(err) {
return err
}
dlrcCRD := &apiextensionsv1beta1.CustomResourceDefinition{
ObjectMeta: v1.ObjectMeta{
Name: fmt.Sprintf("%s.%s", DRLCType.Plural, group),
},
Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
Group: group,
Version: version,
Scope: apiextensionsv1beta1.NamespaceScoped,
Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
Singular: DRLCType.Singular,
Plural: DRLCType.Plural,
Kind: DRLCType.Kind,
ListKind: DRLCType.ListKind,
},
},
}
if _, err := c.ApiextensionsV1beta1().CustomResourceDefinitions().Create(dlrcCRD); err != nil && !apierrors.IsAlreadyExists(err) {
return err
}
return nil
}
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ require (
gopkg.in/yaml.v2 v2.2.8 // indirect
gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
k8s.io/api v0.17.2
k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
k8s.io/apimachinery v0.17.2
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
k8s.io/code-generator v0.17.1
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/boskos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ metadata:
rules:
- apiGroups: ["apiextensions.k8s.io"]
verbs: ["*"]
resources: ["customresourcedefinitions"]
resources: ["customresourcedefinitions"] # TODO(#16281): remove once Boskos no longer attempts to create CRDs itself
- apiGroups: ["boskos.k8s.io"]
verbs: ["*"]
resources: ["*"]
Expand Down