Auto-update dependencies (#174)

Produced via:
  `dep ensure -update knative.dev/test-infra knative.dev/pkg`
/assign n3wscott
/cc n3wscott
This commit is contained in:
Matt Moore 2020-01-07 09:23:51 -08:00 committed by Knative Prow Robot
parent a0d7299838
commit 8165337c90
11 changed files with 68 additions and 45 deletions

6
Gopkg.lock generated
View File

@ -931,7 +931,7 @@
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:39b9c37fd5c6e531b1a2e740ab2ed2fbe237b3f142255fbd8ebae905a957d942" digest = "1:fc3b67f0e6eb15b4137fe05cd4e9c9541fb743cab8f0ecc2ded1026c78d743ae"
name = "knative.dev/pkg" name = "knative.dev/pkg"
packages = [ packages = [
"apis", "apis",
@ -950,7 +950,7 @@
"metrics/metricskey", "metrics/metricskey",
] ]
pruneopts = "T" pruneopts = "T"
revision = "169ef0797c1f7e548574e6aee289002c0f22dc0a" revision = "a43659c656a7ddc2a04e74b7e5b8ca3a5d4a04ed"
[[projects]] [[projects]]
branch = "master" branch = "master"
@ -961,7 +961,7 @@
"tools/dep-collector", "tools/dep-collector",
] ]
pruneopts = "UT" pruneopts = "UT"
revision = "c6031e2873d748338362bccaab46d2d347329d58" revision = "67effe44de5d3500046a77220f90cba376b2c104"
[[projects]] [[projects]]
digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c" digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c"

46
vendor/knative.dev/pkg/Gopkg.lock generated vendored
View File

@ -857,10 +857,11 @@
version = "v2.2.4" version = "v2.2.4"
[[projects]] [[projects]]
digest = "1:2b55f57d7b6d9f0f23478f2432b03273073f1bf93aed18620472e7117eb4451e" digest = "1:d77b48cc0ea74f3edbc8e0515a0ce2fa2154eb414137dd4fb5a642a73296d403"
name = "k8s.io/api" name = "k8s.io/api"
packages = [ packages = [
"admission/v1beta1", "admission/v1beta1",
"admissionregistration/v1",
"admissionregistration/v1beta1", "admissionregistration/v1beta1",
"apps/v1", "apps/v1",
"apps/v1beta1", "apps/v1beta1",
@ -880,6 +881,7 @@
"coordination/v1", "coordination/v1",
"coordination/v1beta1", "coordination/v1beta1",
"core/v1", "core/v1",
"discovery/v1alpha1",
"events/v1beta1", "events/v1beta1",
"extensions/v1beta1", "extensions/v1beta1",
"networking/v1", "networking/v1",
@ -899,32 +901,37 @@
"storage/v1beta1", "storage/v1beta1",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "3544db3b9e4494309507e02eced5cd9dcff47e6a" revision = "2a24ef1ce092b529249c747df24d66a55fe97ad0"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[projects]] [[projects]]
digest = "1:efa94711dcabead5fd1dba5e3fccaa735201223a3ae55bb203a8741ad719e4b4" digest = "1:afd0dcc3994c4cb27d6322160bae23e602ccca2050b18b8d0f178224acd71c04"
name = "k8s.io/apiextensions-apiserver" name = "k8s.io/apiextensions-apiserver"
packages = [ packages = [
"pkg/apis/apiextensions", "pkg/apis/apiextensions",
"pkg/apis/apiextensions/v1",
"pkg/apis/apiextensions/v1beta1", "pkg/apis/apiextensions/v1beta1",
"pkg/client/clientset/clientset", "pkg/client/clientset/clientset",
"pkg/client/clientset/clientset/fake", "pkg/client/clientset/clientset/fake",
"pkg/client/clientset/clientset/scheme", "pkg/client/clientset/clientset/scheme",
"pkg/client/clientset/clientset/typed/apiextensions/v1",
"pkg/client/clientset/clientset/typed/apiextensions/v1/fake",
"pkg/client/clientset/clientset/typed/apiextensions/v1beta1", "pkg/client/clientset/clientset/typed/apiextensions/v1beta1",
"pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake", "pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake",
"pkg/client/informers/externalversions", "pkg/client/informers/externalversions",
"pkg/client/informers/externalversions/apiextensions", "pkg/client/informers/externalversions/apiextensions",
"pkg/client/informers/externalversions/apiextensions/v1",
"pkg/client/informers/externalversions/apiextensions/v1beta1", "pkg/client/informers/externalversions/apiextensions/v1beta1",
"pkg/client/informers/externalversions/internalinterfaces", "pkg/client/informers/externalversions/internalinterfaces",
"pkg/client/listers/apiextensions/v1",
"pkg/client/listers/apiextensions/v1beta1", "pkg/client/listers/apiextensions/v1beta1",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "0dbe462fe92dfa8b56cc9facf0658a17d0c70fc5" revision = "bbf2aa1c9d0f69788f9cbd29ad5520574f91133c"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[projects]] [[projects]]
digest = "1:ba294a7c42266533c2f109a7bff93f8bd2ec87d4406fee1bbde67c1d649d08e4" digest = "1:e00f750d45d512f0e7bf9c2c566e3cb13233b0c035a2b89d8c096dfc98e2e1c7"
name = "k8s.io/apimachinery" name = "k8s.io/apimachinery"
packages = [ packages = [
"pkg/api/equality", "pkg/api/equality",
@ -975,11 +982,11 @@
"third_party/forked/golang/reflect", "third_party/forked/golang/reflect",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "f2f3a405f61d6c2cdc0d00687c1b5d90de91e9f0" revision = "72ed19daf4bb788ae595ae4103c404cb0fa09c84"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[projects]] [[projects]]
digest = "1:f3d53e8c6ee1c0312bbf66e5a98aee44288388a19e8dc164d8beeeae0b32a925" digest = "1:b03297e45cd203dee7e9449141555d3973d04d5323ece6b4e20562b80185767e"
name = "k8s.io/client-go" name = "k8s.io/client-go"
packages = [ packages = [
"discovery", "discovery",
@ -988,6 +995,7 @@
"dynamic/fake", "dynamic/fake",
"informers", "informers",
"informers/admissionregistration", "informers/admissionregistration",
"informers/admissionregistration/v1",
"informers/admissionregistration/v1beta1", "informers/admissionregistration/v1beta1",
"informers/apps", "informers/apps",
"informers/apps/v1", "informers/apps/v1",
@ -1010,6 +1018,8 @@
"informers/coordination/v1beta1", "informers/coordination/v1beta1",
"informers/core", "informers/core",
"informers/core/v1", "informers/core/v1",
"informers/discovery",
"informers/discovery/v1alpha1",
"informers/events", "informers/events",
"informers/events/v1beta1", "informers/events/v1beta1",
"informers/extensions", "informers/extensions",
@ -1040,6 +1050,8 @@
"kubernetes", "kubernetes",
"kubernetes/fake", "kubernetes/fake",
"kubernetes/scheme", "kubernetes/scheme",
"kubernetes/typed/admissionregistration/v1",
"kubernetes/typed/admissionregistration/v1/fake",
"kubernetes/typed/admissionregistration/v1beta1", "kubernetes/typed/admissionregistration/v1beta1",
"kubernetes/typed/admissionregistration/v1beta1/fake", "kubernetes/typed/admissionregistration/v1beta1/fake",
"kubernetes/typed/apps/v1", "kubernetes/typed/apps/v1",
@ -1078,6 +1090,8 @@
"kubernetes/typed/coordination/v1beta1/fake", "kubernetes/typed/coordination/v1beta1/fake",
"kubernetes/typed/core/v1", "kubernetes/typed/core/v1",
"kubernetes/typed/core/v1/fake", "kubernetes/typed/core/v1/fake",
"kubernetes/typed/discovery/v1alpha1",
"kubernetes/typed/discovery/v1alpha1/fake",
"kubernetes/typed/events/v1beta1", "kubernetes/typed/events/v1beta1",
"kubernetes/typed/events/v1beta1/fake", "kubernetes/typed/events/v1beta1/fake",
"kubernetes/typed/extensions/v1beta1", "kubernetes/typed/extensions/v1beta1",
@ -1112,6 +1126,7 @@
"kubernetes/typed/storage/v1alpha1/fake", "kubernetes/typed/storage/v1alpha1/fake",
"kubernetes/typed/storage/v1beta1", "kubernetes/typed/storage/v1beta1",
"kubernetes/typed/storage/v1beta1/fake", "kubernetes/typed/storage/v1beta1/fake",
"listers/admissionregistration/v1",
"listers/admissionregistration/v1beta1", "listers/admissionregistration/v1beta1",
"listers/apps/v1", "listers/apps/v1",
"listers/apps/v1beta1", "listers/apps/v1beta1",
@ -1127,6 +1142,7 @@
"listers/coordination/v1", "listers/coordination/v1",
"listers/coordination/v1beta1", "listers/coordination/v1beta1",
"listers/core/v1", "listers/core/v1",
"listers/discovery/v1alpha1",
"listers/events/v1beta1", "listers/events/v1beta1",
"listers/extensions/v1beta1", "listers/extensions/v1beta1",
"listers/networking/v1", "listers/networking/v1",
@ -1176,11 +1192,11 @@
"util/workqueue", "util/workqueue",
] ]
pruneopts = "NUT" pruneopts = "NUT"
revision = "e14f31a72a77f7aa82a95eaf542d1194fb027d04" revision = "20ea64f01e4d4026bce06d61d697368390aeda4e"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[projects]] [[projects]]
digest = "1:f41480fd8c5f54b13326ee0f2ee398d5734789b790dbc4db57f9b08a0d63139a" digest = "1:a6aa236db5d07dff9ea1160ef316b17e131d2b1b2ad7d177431206bf389d241e"
name = "k8s.io/code-generator" name = "k8s.io/code-generator"
packages = [ packages = [
"cmd/client-gen", "cmd/client-gen",
@ -1205,8 +1221,8 @@
"pkg/util", "pkg/util",
] ]
pruneopts = "T" pruneopts = "T"
revision = "18da4a14b22b17d2fa761e50037fabfbacec225b" revision = "8e001e5d18949be7e823ccb9cfe9b60026e7bda0"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[projects]] [[projects]]
branch = "master" branch = "master"

View File

@ -17,23 +17,23 @@ required = [
[[constraint]] [[constraint]]
name = "k8s.io/api" name = "k8s.io/api"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[override]] [[override]]
name = "k8s.io/apiextensions-apiserver" name = "k8s.io/apiextensions-apiserver"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[constraint]] [[constraint]]
name = "k8s.io/apimachinery" name = "k8s.io/apimachinery"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[constraint]] [[constraint]]
name = "k8s.io/client-go" name = "k8s.io/client-go"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[constraint]] [[constraint]]
name = "k8s.io/code-generator" name = "k8s.io/code-generator"
version = "kubernetes-1.15.3" version = "kubernetes-1.16.4"
[[constraint]] [[constraint]]
name = "github.com/gogo/protobuf" name = "github.com/gogo/protobuf"

View File

@ -52,6 +52,9 @@ type ConditionManager interface {
// set to true. // set to true.
IsHappy() bool IsHappy() bool
// GetTopLevelCondition finds and returns the top level Condition (happy Condition).
GetTopLevelCondition() *Condition
// GetCondition finds and returns the Condition that matches the ConditionType // GetCondition finds and returns the Condition that matches the ConditionType
// previously set on Conditions. // previously set on Conditions.
GetCondition(t ConditionType) *Condition GetCondition(t ConditionType) *Condition
@ -139,13 +142,15 @@ func (r ConditionSet) Manage(status ConditionsAccessor) ConditionManager {
} }
} }
// IsHappy looks at the happy condition and returns true if that condition is // IsHappy looks at the top level Condition (happy Condition) and returns true if that condition is
// set to true. // set to true.
func (r conditionsImpl) IsHappy() bool { func (r conditionsImpl) IsHappy() bool {
if c := r.GetCondition(r.happy); c == nil || !c.IsTrue() { return r.GetTopLevelCondition().IsTrue()
return false
} }
return true
// GetTopLevelCondition finds and returns the top level Condition (happy Condition).
func (r conditionsImpl) GetTopLevelCondition() *Condition {
return r.GetCondition(r.happy)
} }
// GetCondition finds and returns the Condition that matches the ConditionType // GetCondition finds and returns the Condition that matches the ConditionType

View File

@ -106,7 +106,7 @@ func MainWithContext(ctx context.Context, component string, ctors ...injection.C
cfg, err := GetConfig(*masterURL, *kubeconfig) cfg, err := GetConfig(*masterURL, *kubeconfig)
if err != nil { if err != nil {
log.Fatal("Error building kubeconfig", err) log.Fatalf("Error building kubeconfig: %v", err)
} }
MainWithConfig(ctx, component, cfg, ctors...) MainWithConfig(ctx, component, cfg, ctors...)
} }
@ -134,7 +134,7 @@ func MainWithConfig(ctx context.Context, component string, cfg *rest.Config, cto
// Set up our logger. // Set up our logger.
loggingConfig, err := GetLoggingConfig(ctx) loggingConfig, err := GetLoggingConfig(ctx)
if err != nil { if err != nil {
log.Fatal("Error reading/parsing logging configuration:", err) log.Fatalf("Error reading/parsing logging configuration: %v", err)
} }
logger, atomicLevel := logging.NewLoggerFromConfig(loggingConfig, component) logger, atomicLevel := logging.NewLoggerFromConfig(loggingConfig, component)
defer flush(logger) defer flush(logger)
@ -168,7 +168,7 @@ func MainWithConfig(ctx context.Context, component string, cfg *rest.Config, cto
metav1.GetOptions{}); err == nil { metav1.GetOptions{}); err == nil {
cmw.Watch(logging.ConfigMapName(), logging.UpdateLevelFromConfigMap(logger, atomicLevel, component)) cmw.Watch(logging.ConfigMapName(), logging.UpdateLevelFromConfigMap(logger, atomicLevel, component))
} else if !apierrors.IsNotFound(err) { } else if !apierrors.IsNotFound(err) {
logger.Fatalw("Error reading ConfigMap: "+logging.ConfigMapName(), zap.Error(err)) logger.With(zap.Error(err)).Fatalf("Error reading ConfigMap %q", logging.ConfigMapName())
} }
// Watch the observability config map // Watch the observability config map
@ -178,17 +178,17 @@ func MainWithConfig(ctx context.Context, component string, cfg *rest.Config, cto
metrics.UpdateExporterFromConfigMap(component, logger), metrics.UpdateExporterFromConfigMap(component, logger),
profilingHandler.UpdateFromConfigMap) profilingHandler.UpdateFromConfigMap)
} else if !apierrors.IsNotFound(err) { } else if !apierrors.IsNotFound(err) {
logger.Fatalw("Error reading ConfigMap: "+metrics.ConfigMapName(), zap.Error(err)) logger.With(zap.Error(err)).Fatalf("Error reading ConfigMap %q", metrics.ConfigMapName())
} }
if err := cmw.Start(ctx.Done()); err != nil { if err := cmw.Start(ctx.Done()); err != nil {
logger.Fatalw("failed to start configuration manager", zap.Error(err)) logger.Fatalw("Failed to start configuration manager", zap.Error(err))
} }
// Start all of the informers and wait for them to sync. // Start all of the informers and wait for them to sync.
logger.Info("Starting informers.") logger.Info("Starting informers.")
if err := controller.StartInformers(ctx.Done(), informers...); err != nil { if err := controller.StartInformers(ctx.Done(), informers...); err != nil {
logger.Fatalw("Failed to start informers", err) logger.Fatalw("Failed to start informers", zap.Error(err))
} }
// Start all of the controllers. // Start all of the controllers.

View File

@ -212,7 +212,7 @@ func createMetricsConfig(ops ExporterOptions, logger *zap.SugaredLogger) (*metri
if !allowCustomMetrics { if !allowCustomMetrics {
servingOrEventing := metricskey.KnativeRevisionMetrics.Union( servingOrEventing := metricskey.KnativeRevisionMetrics.Union(
metricskey.KnativeTriggerMetrics) metricskey.KnativeTriggerMetrics).Union(metricskey.KnativeBrokerMetrics)
mc.recorder = func(ctx context.Context, ms stats.Measurement, ros ...stats.Options) error { mc.recorder = func(ctx context.Context, ms stats.Measurement, ros ...stats.Options) error {
metricType := path.Join(mc.stackdriverMetricTypePrefix, ms.Measure().Name()) metricType := path.Join(mc.stackdriverMetricTypePrefix, ms.Measure().Name())

View File

@ -67,5 +67,6 @@ var (
"knative.dev/internal/serving/controller/cert_expiration_durations", "knative.dev/internal/serving/controller/cert_expiration_durations",
"knative.dev/internal/serving/controller/cert_total_num", "knative.dev/internal/serving/controller/cert_total_num",
"knative.dev/internal/serving/controller/cert_issuance_latencies", "knative.dev/internal/serving/controller/cert_issuance_latencies",
"knative.dev/internal/serving/controller/cert_creation_count",
) )
) )

View File

@ -85,14 +85,14 @@ func writeMetaData(cluster *container.Cluster, project string) {
} }
// Create creates a GKE cluster and configures gcloud after successful GKE create request // Create creates a GKE cluster and configures gcloud after successful GKE create request
func Create(o *options.RequestWrapper) error { func Create(o *options.RequestWrapper) (*clm.GKECluster, error) {
o.Prep() o.Prep()
gkeClient := clm.GKEClient{} gkeClient := clm.GKEClient{}
clusterOps := gkeClient.Setup(o.Request) clusterOps := gkeClient.Setup(o.Request)
gkeOps := clusterOps.(*clm.GKECluster) gkeOps := clusterOps.(*clm.GKECluster)
if err := gkeOps.Acquire(); err != nil || gkeOps.Cluster == nil { if err := gkeOps.Acquire(); err != nil || gkeOps.Cluster == nil {
return fmt.Errorf("failed acquiring GKE cluster: '%v'", err) return nil, fmt.Errorf("failed acquiring GKE cluster: '%v'", err)
} }
// At this point we should have a cluster ready to run test. Need to save // At this point we should have a cluster ready to run test. Need to save
@ -104,11 +104,11 @@ func Create(o *options.RequestWrapper) error {
// TODO(chaodaiG): this probably should also be part of clustermanager lib // TODO(chaodaiG): this probably should also be part of clustermanager lib
if out, err := common.StandardExec("gcloud", "beta", "container", "clusters", "get-credentials", if out, err := common.StandardExec("gcloud", "beta", "container", "clusters", "get-credentials",
gkeOps.Cluster.Name, "--region", gkeOps.Cluster.Location, "--project", gkeOps.Project); err != nil { gkeOps.Cluster.Name, "--region", gkeOps.Cluster.Location, "--project", gkeOps.Project); err != nil {
return fmt.Errorf("failed connecting to cluster: %q, '%v'", out, err) return nil, fmt.Errorf("failed connecting to cluster: %q, '%v'", out, err)
} }
if out, err := common.StandardExec("gcloud", "config", "set", "project", gkeOps.Project); err != nil { if out, err := common.StandardExec("gcloud", "config", "set", "project", gkeOps.Project); err != nil {
return fmt.Errorf("failed setting gcloud: %q, '%v'", out, err) return nil, fmt.Errorf("failed setting gcloud: %q, '%v'", out, err)
} }
return nil return gkeOps, nil
} }

View File

@ -17,11 +17,12 @@ limitations under the License.
package actions package actions
import ( import (
clm "knative.dev/pkg/testutils/clustermanager/e2e-tests"
"knative.dev/pkg/testutils/clustermanager/prow-cluster-operation/options" "knative.dev/pkg/testutils/clustermanager/prow-cluster-operation/options"
) )
// Get gets a GKE cluster // Get gets a GKE cluster
func Get(o *options.RequestWrapper) error { func Get(o *options.RequestWrapper) (*clm.GKECluster, error) {
o.Prep() o.Prep()
o.Request.SkipCreation = true o.Request.SkipCreation = true
// Reuse `Create` for getting operation, so that we can reuse the same logic // Reuse `Create` for getting operation, so that we can reuse the same logic

View File

@ -45,11 +45,11 @@ func main() {
} }
switch { switch {
case create: case create:
err = actions.Create(o) _, err = actions.Create(o)
case delete: case delete:
err = actions.Delete(o) err = actions.Delete(o)
case get: case get:
err = actions.Get(o) _, err = actions.Get(o)
default: default:
err = errors.New("Must pass one of --create, --delete, --get") err = errors.New("Must pass one of --create, --delete, --get")
} }

View File

@ -37,7 +37,7 @@ const (
// the Kubernetes minimum version required by Knative. // the Kubernetes minimum version required by Knative.
KubernetesMinVersionKey = "KUBERNETES_MIN_VERSION" KubernetesMinVersionKey = "KUBERNETES_MIN_VERSION"
defaultMinimumVersion = "v1.14.0" defaultMinimumVersion = "v1.15.0"
) )
func getMinimumVersion() string { func getMinimumVersion() string {