1
0
mirror of https://github.com/rancher/norman.git synced 2025-09-02 07:44:51 +00:00

Changes to make conditions less chatty

This commit is contained in:
Darren Shepherd
2018-01-17 15:42:31 -07:00
parent 6f8ed342d9
commit 9e6ea56442
5 changed files with 30 additions and 7 deletions

View File

@@ -140,7 +140,11 @@ func (c Cond) doInternal(obj runtime.Object, f func() (runtime.Object, error)) (
} }
if err != nil { if err != nil {
if _, ok := err.(*controller.ForgetError); !ok { if _, ok := err.(*controller.ForgetError); ok {
if c.IsFalse(obj) {
c.Unknown(obj)
}
} else {
c.False(obj) c.False(obj)
} }
c.ReasonAndMessageFromError(obj, err) c.ReasonAndMessageFromError(obj, err)

View File

@@ -16,7 +16,7 @@ import (
) )
var ( var (
resyncPeriod = 5 * time.Minute resyncPeriod = 2 * time.Hour
) )
type HandlerFunc func(key string) error type HandlerFunc func(key string) error

View File

@@ -143,7 +143,7 @@ func writeData(c *websocket.Conn, header string, buf []byte) error {
if _, err := messageWriter.Write([]byte(`}`)); err != nil { if _, err := messageWriter.Write([]byte(`}`)); err != nil {
return err return err
} }
return nil return messageWriter.Close()
} }
func streamStore(ctx context.Context, eg *errgroup.Group, apiContext *types.APIContext, schema *types.Schema, result chan map[string]interface{}) { func streamStore(ctx context.Context, eg *errgroup.Group, apiContext *types.APIContext, schema *types.Schema, result chan map[string]interface{}) {

View File

@@ -9,14 +9,33 @@ import (
"github.com/rancher/norman/types/convert" "github.com/rancher/norman/types/convert"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/rest"
) )
type Factory struct { type Factory struct {
APIExtClientSet apiextclientset.Interface APIExtClientSet clientset.Interface
}
func NewFactoryFromConfig(config rest.Config) (*Factory, error) {
dynamicConfig := config
if dynamicConfig.NegotiatedSerializer == nil {
configConfig := dynamic.ContentConfig()
dynamicConfig.NegotiatedSerializer = configConfig.NegotiatedSerializer
}
apiExtClient, err := clientset.NewForConfig(&dynamicConfig)
if err != nil {
return nil, err
}
return &Factory{
APIExtClientSet: apiExtClient,
}, nil
} }
func (c *Factory) AddSchemas(ctx context.Context, schemas ...*types.Schema) (map[*types.Schema]*apiext.CustomResourceDefinition, error) { func (c *Factory) AddSchemas(ctx context.Context, schemas ...*types.Schema) (map[*types.Schema]*apiext.CustomResourceDefinition, error) {

View File

@@ -48,7 +48,7 @@ func ToString(value interface{}) string {
if single == nil { if single == nil {
return "" return ""
} }
return fmt.Sprint(single) return strings.TrimSpace(fmt.Sprint(single))
} }
func ToTimestamp(value interface{}) (int64, error) { func ToTimestamp(value interface{}) (int64, error) {
@@ -164,7 +164,7 @@ func ToStringSlice(data interface{}) []string {
return v return v
} }
if v, ok := data.([]interface{}); ok { if v, ok := data.([]interface{}); ok {
result := []string{} var result []string
for _, item := range v { for _, item := range v {
result = append(result, ToString(item)) result = append(result, ToString(item))
} }