Skip to content

Revert boskos client changes #16259

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

Closed
alvaroaleman wants to merge 2 commits into from
Closed

Revert boskos client changes #16259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4d60f4
Revert "Merge pull request #16249 from alvaroaleman/boskos-cache"
alvaroaleman Feb 12, 2020
87e13af
Revert "Merge pull request #16206 from alvaroaleman/boskos-ctrl-client"
alvaroaleman Feb 12, 2020
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 boskos/cleaner/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ go_test(
"//boskos/common:go_default_library",
"//boskos/mason:go_default_library",
"//boskos/ranch:go_default_library",
"@io_k8s_sigs_controller_runtime//pkg/client/fake:go_default_library",
"//boskos/storage:go_default_library",
],
)
6 changes: 2 additions & 4 deletions boskos/cleaner/cleaner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@ limitations under the License.
package cleaner

import (
"context"
"testing"
"time"

fakectrlruntimeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"

"k8s.io/test-infra/boskos/common"
"k8s.io/test-infra/boskos/mason"
"k8s.io/test-infra/boskos/ranch"
"k8s.io/test-infra/boskos/storage"
)

const (
Expand All @@ -45,7 +43,7 @@ type fakeBoskos struct {
// Create a fake client
func createFakeBoskos(resources []common.Resource, dlrcs []common.DynamicResourceLifeCycle) (*ranch.Storage, boskosClient, chan releasedResource) {
names := make(chan releasedResource, 100)
s, _ := ranch.NewStorage(context.Background(), fakectrlruntimeclient.NewFakeClient(), "", "")
s, _ := ranch.NewStorage(storage.NewMemoryStorage(), storage.NewMemoryStorage(), "")
r, _ := ranch.NewRanch("", s, testTTL)

for _, lc := range dlrcs {
Expand Down
1 change: 0 additions & 1 deletion boskos/cmd/boskos/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ go_library(
"@com_github_prometheus_client_golang//prometheus:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"@com_github_spf13_viper//:go_default_library",
"@io_k8s_api//core/v1:go_default_library",
],
)

Expand Down
14 changes: 9 additions & 5 deletions boskos/cmd/boskos/boskos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
"github.com/spf13/viper"
corev1 "k8s.io/api/core/v1"

"k8s.io/test-infra/boskos/crds"
"k8s.io/test-infra/boskos/handlers"
Expand All @@ -54,7 +53,6 @@ var (
requestTTL = flag.Duration("request-ttl", defaultRequestTTL, "request TTL before losing priority in the queue")
kubeClientOptions crds.KubernetesClientOptions
logLevel = flag.String("log-level", "info", fmt.Sprintf("Log level is one of %v.", logrus.AllLevels))
namespace = flag.String("namespace", corev1.NamespaceDefault, "namespace to install on")
)

var (
Expand Down Expand Up @@ -91,12 +89,18 @@ func main() {
// main server with the main mux until we're ready
health := pjutil.NewHealth()

client, err := kubeClientOptions.CacheBackedClient(*namespace, &crds.ResourceObject{}, &crds.DRLCObject{})
rc, err := kubeClientOptions.Client(crds.ResourceType)
if err != nil {
logrus.WithError(err).Fatal("unable to get client")
logrus.WithError(err).Fatal("unable to create a Resource CRD client")
}
dc, err := kubeClientOptions.Client(crds.DRLCType)
if err != nil {
logrus.WithError(err).Fatal("unable to create a DynamicResourceLifeCycle CRD client")
}

storage, err := ranch.NewStorage(interrupts.Context(), client, *namespace, *storagePath)
resourceStorage := crds.NewCRDStorage(rc)
dRLCStorage := crds.NewCRDStorage(dc)
storage, err := ranch.NewStorage(resourceStorage, dRLCStorage, *storagePath)
if err != nil {
logrus.WithError(err).Fatal("failed to create storage")
}
Expand Down
1 change: 0 additions & 1 deletion boskos/cmd/cleaner/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ go_library(
"//boskos/crds:go_default_library",
"//boskos/ranch:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"@io_k8s_api//core/v1:go_default_library",
],
)

Expand Down
12 changes: 5 additions & 7 deletions boskos/cmd/cleaner/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@ limitations under the License.
package main

import (
"context"
"flag"
"os"
"os/signal"
"syscall"
"time"

"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"

"k8s.io/test-infra/boskos/cleaner"
"k8s.io/test-infra/boskos/client"
Expand All @@ -45,7 +43,6 @@ var (
boskosURL string
username string
passwordFile string
namespace string
cleanerCount int
)

Expand All @@ -54,7 +51,6 @@ func init() {
flag.StringVar(&username, "username", "", "Username used to access the Boskos server")
flag.StringVar(&passwordFile, "password-file", "", "The path to password file used to access the Boskos server")
flag.IntVar(&cleanerCount, "cleaner-count", defaultCleanerCount, "Number of threads running cleanup")
flag.StringVar(&namespace, "namespace", corev1.NamespaceDefault, "namespace to install on")
kubeClientOptions.AddFlags(flag.CommandLine)
}

Expand All @@ -63,11 +59,13 @@ func main() {
kubeClientOptions.Validate()

logrus.SetFormatter(&logrus.JSONFormatter{})
kubeClient, err := kubeClientOptions.Client()
dc, err := kubeClientOptions.Client(crds.DRLCType)
if err != nil {
logrus.WithError(err).Fatal("failed to construct kube client")
logrus.WithError(err).Fatal("unable to create a Resource CRD client")
}
st, _ := ranch.NewStorage(context.Background(), kubeClient, namespace, "")

resStorage := crds.NewCRDStorage(dc)
st, _ := ranch.NewStorage(nil, resStorage, "")

logrus.SetFormatter(&logrus.JSONFormatter{})
client, err := client.NewClient(defaultOwner, boskosURL, username, passwordFile)
Expand Down
1 change: 0 additions & 1 deletion boskos/cmd/fake-mason/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ go_library(
"//boskos/mason:go_default_library",
"//boskos/ranch:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"@io_k8s_api//core/v1:go_default_library",
],
)

Expand Down
14 changes: 7 additions & 7 deletions boskos/cmd/fake-mason/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ import (
"syscall"
"time"

"k8s.io/test-infra/boskos/crds"
"k8s.io/test-infra/boskos/ranch"

"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"

"k8s.io/test-infra/boskos/client"
"k8s.io/test-infra/boskos/common"
"k8s.io/test-infra/boskos/crds"
"k8s.io/test-infra/boskos/mason"
"k8s.io/test-infra/boskos/ranch"
)

const (
Expand All @@ -47,7 +47,6 @@ var (
username = flag.String("username", "", "Username used to access the Boskos server")
passwordFile = flag.String("password-file", "", "The path to password file used to access the Boskos server")
cleanerCount = flag.Int("cleaner-count", defaultCleanerCount, "Number of threads running cleanup")
namespace = flag.String("namespace", corev1.NamespaceDefault, "namespace to install on")
kubeClientOptions crds.KubernetesClientOptions
)

Expand All @@ -69,12 +68,13 @@ func main() {

logrus.SetFormatter(&logrus.JSONFormatter{})

kubeClient, err := kubeClientOptions.Client()
dc, err := kubeClientOptions.Client(crds.DRLCType)
if err != nil {
logrus.WithError(err).Fatal("failed to create kubeClient")
logrus.WithError(err).Fatal("unable to create a DynamicResourceLifeCycle CRD client")
}

st, _ := ranch.NewStorage(context.Background(), kubeClient, *namespace, "")
dRLCStorage := crds.NewCRDStorage(dc)
st, _ := ranch.NewStorage(nil, dRLCStorage, "")

flag.Parse()
logrus.SetFormatter(&logrus.JSONFormatter{})
Expand Down
2 changes: 1 addition & 1 deletion boskos/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ func (ud *UserData) FromMap(m UserDataMap) {
func ItemToResource(i Item) (Resource, error) {
res, ok := i.(Resource)
if !ok {
return Resource{}, fmt.Errorf("expected item to be of type Resource, was %T", i)
return Resource{}, fmt.Errorf("cannot construct Resource from received object %v", i)
}
return res, nil
}
10 changes: 3 additions & 7 deletions boskos/crds/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,24 @@ go_library(
name = "go_default_library",
srcs = [
"client.go",
"crd_storage.go",
"drlc_crd.go",
"register.go",
"resource_crd.go",
],
importpath = "k8s.io/test-infra/boskos/crds",
visibility = ["//visibility:public"],
deps = [
"//boskos/common:go_default_library",
"//prow/interrupts:go_default_library",
"@com_github_sirupsen_logrus//:go_default_library",
"//boskos/storage: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",
"@io_k8s_client_go//kubernetes/scheme:go_default_library",
"@io_k8s_apimachinery//pkg/runtime/serializer:go_default_library",
"@io_k8s_client_go//rest:go_default_library",
"@io_k8s_client_go//tools/clientcmd:go_default_library",
"@io_k8s_sigs_controller_runtime//pkg/client:go_default_library",
"@io_k8s_sigs_controller_runtime//pkg/client/fake:go_default_library",
"@io_k8s_sigs_controller_runtime//pkg/manager:go_default_library",
],
)

Expand Down
Loading