Skip to content

Commit

Permalink
Vendor serving v0.12.0 (knative#618)
Browse files Browse the repository at this point in the history
- Vendor serving release v0.12.0
 - Update `kn version command` to print serving v0.12.0
 - Update latest release e2e tests script to setup serving v0.12.0

Co-authored-by: Roland Huß <[email protected]>
  • Loading branch information
2 people authored and knative-prow-robot committed Jan 22, 2020
1 parent 5001dcd commit 8c417c1
Show file tree
Hide file tree
Showing 57 changed files with 152 additions and 314 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ require (
k8s.io/cli-runtime v0.0.0-20191016113937-7693ce2cae74
k8s.io/client-go v0.0.0-20191016110837-54936ba21026
knative.dev/eventing v0.12.0
knative.dev/pkg v0.0.0-20200113182502-b8dc5fbc6d2f
knative.dev/serving v0.11.0
knative.dev/pkg v0.0.0-20200120180006-96d3b8c24c34
knative.dev/serving v0.12.0
knative.dev/test-infra v0.0.0-20200116044902-d5990f0e5a05
sigs.k8s.io/yaml v1.1.0
)
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -523,10 +523,10 @@ k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn
k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
knative.dev/eventing v0.12.0 h1:u3Ck5+dpr2affDlsGfRKnBTb87Is/tfzWNfZz1FSAMI=
knative.dev/eventing v0.12.0/go.mod h1:UxweNv8yXhsdHJitcb9R6rmfNaUD2DFi9GWwNRyIs58=
knative.dev/pkg v0.0.0-20200113182502-b8dc5fbc6d2f h1:EFhlUkg97lfwyAxsNZUqbmHxVzQ0YpPdNyf/o16WkAw=
knative.dev/pkg v0.0.0-20200113182502-b8dc5fbc6d2f/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
knative.dev/serving v0.11.0 h1:FK8aPpMuiBHZbfBfT+Avxyk11TaIlOMDEw/Va2sw1w0=
knative.dev/serving v0.11.0/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0=
knative.dev/pkg v0.0.0-20200120180006-96d3b8c24c34 h1:rzwD07KAeJ8IfHMV8VWZ0y4txfWHhA07fH2G1mYvKYs=
knative.dev/pkg v0.0.0-20200120180006-96d3b8c24c34/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q=
knative.dev/serving v0.12.0 h1:Jdtc3WwaBNhDY8n5mKwmLqldXra5RKk8FesjIR8k4ts=
knative.dev/serving v0.12.0/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0=
knative.dev/test-infra v0.0.0-20200116044902-d5990f0e5a05 h1:DALgmfmA58b52qfouySXvyHCbc692C3RJUSYNjHNG5U=
knative.dev/test-infra v0.0.0-20200116044902-d5990f0e5a05/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
Expand Down
2 changes: 1 addition & 1 deletion pkg/kn/commands/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var GitRevision string
// update this var as we add more deps
var apiVersions = map[string][]string{
"serving": {
"serving.knative.dev/v1alpha1 (knative-serving v0.11.0)",
"serving.knative.dev/v1alpha1 (knative-serving v0.12.0)",
},
"eventing": {
"sources.eventing.knative.dev/v1alpha1 (knative-eventing v0.12.0)",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kn/commands/version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Build Date: {{.BuildDate}}
Git Revision: {{.GitRevision}}
Supported APIs:
* Serving
- serving.knative.dev/v1alpha1 (knative-serving v0.11.0)
- serving.knative.dev/v1alpha1 (knative-serving v0.12.0)
* Eventing
- sources.eventing.knative.dev/v1alpha1 (knative-eventing v0.12.0)
- eventing.knative.dev/v1alpha1 (knative-eventing v0.12.0)
Expand Down
2 changes: 1 addition & 1 deletion test/presubmit-integration-tests-latest-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# We currently take 0.10.0 for Serving and 0.10.2 for Eventing as the
# latest release version.

export KNATIVE_SERVING_VERSION="0.11.0"
export KNATIVE_SERVING_VERSION="0.12.0"
export KNATIVE_EVENTING_VERSION="0.11.0"

$(dirname $0)/presubmit-tests.sh --integration-tests
6 changes: 6 additions & 0 deletions vendor/knative.dev/pkg/metrics/config_observability.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ import (
const (
// The following is used to set the default log url template
DefaultLogURLTemplate = "http://localhost:8001/api/v1/namespaces/knative-monitoring/services/kibana-logging/proxy/app/kibana#/discover?_a=(query:(match:(kubernetes.labels.knative-dev%2FrevisionUID:(query:'${REVISION_UID}',type:phrase))))"

// The following is used to set the default metrics backend
DefaultRequestMetricsBackend = "prometheus"

// The env var name for config-observability
ConfigMapNameEnv = "CONFIG_OBSERVABILITY_NAME"
)
Expand Down Expand Up @@ -84,6 +88,8 @@ func NewObservabilityConfigFromConfigMap(configMap *corev1.ConfigMap) (*Observab

if mb, ok := configMap.Data["metrics.request-metrics-backend-destination"]; ok {
oc.RequestMetricsBackend = mb
} else {
oc.RequestMetricsBackend = DefaultRequestMetricsBackend
}

if prof, ok := configMap.Data["profiling.enable"]; ok {
Expand Down
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ Pivotal Software, Inc.
IBM Corp
Red Hat, Inc.
Cisco Systems, Inc.
VMware, Inc.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ type PodAutoscalerSpec struct {
// This property will be dropped in future Knative releases and should
// not be used - use metadata.generation
//
// Tracking issue: https://knative.dev/serving/issues/643
// Tracking issue: https://github.com/knative/serving/issues/643
//
// +optional
DeprecatedGeneration int64 `json:"generation,omitempty"`
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
// unlikely to change from version to version.

// ProtocolType is an enumeration of the supported application-layer protocols
// See also: https://knative.dev/serving/blob/master/docs/runtime-contract.md#protocols-and-ports
// See also: https://github.com/knative/serving/blob/master/docs/runtime-contract.md#protocols-and-ports
type ProtocolType string

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,9 @@ func (s *IngressSpec) SetDefaults(ctx context.Context) {

// SetDefaults populates default values in IngressTLS
func (t *IngressTLS) SetDefaults(ctx context.Context) {
// Default Secret key for ServerCertificate is `tls.crt`.
if t.ServerCertificate == "" {
t.ServerCertificate = "tls.crt"
}
// Default Secret key for PrivateKey is `tls.key`.
if t.PrivateKey == "" {
t.PrivateKey = "tls.key"
}
// Deprecated, do not use.
t.DeprecatedServerCertificate = ""
t.DeprecatedPrivateKey = ""
}

// SetDefaults populates default values in IngressRule
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ var ingressCondSet = apis.NewLivingConditionSet(
IngressConditionLoadBalancerReady,
)

// VirtualServiceNotReconciled is used for the reason of MarkLoadBalancerFailed
// when VirtualService is failed to be reconciled.
var VirtualServiceNotReconciled = "ReconcileVirtualServiceFailed"

// GetGroupVersionKind returns SchemeGroupVersion of an Ingress
func (i *Ingress) GetGroupVersionKind() schema.GroupVersionKind {
return SchemeGroupVersion.WithKind("Ingress")
Expand Down Expand Up @@ -79,7 +75,7 @@ func (is *IngressStatus) MarkLoadBalancerReady(lbs []LoadBalancerIngressStatus,
// reflect that the load balancer is not ready yet.
func (is *IngressStatus) MarkLoadBalancerNotReady() {
ingressCondSet.Manage(is).MarkUnknown(IngressConditionLoadBalancerReady, "Uninitialized",
"Waiting for VirtualService to be ready")
"Waiting for load balancer to be ready")
}

// MarkLoadBalancerFailed marks the "IngressConditionLoadBalancerReady" condition to false.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ type IngressSpec struct {
// This property will be dropped in future Knative releases and should
// not be used - use metadata.generation
//
// Tracking issue: https://knative.dev/serving/issues/643
// Tracking issue: https://github.com/knative/serving/issues/643
//
// +optional
DeprecatedGeneration int64 `json:"generation,omitempty"`
Expand Down Expand Up @@ -143,12 +143,12 @@ type IngressTLS struct {
// ServerCertificate identifies the certificate filename in the secret.
// Defaults to `tls.crt`.
// +optional
ServerCertificate string `json:"serverCertificate,omitempty"`
DeprecatedServerCertificate string `json:"serverCertificate,omitempty"`

// PrivateKey identifies the private key filename in the secret.
// Defaults to `tls.key`.
// +optional
PrivateKey string `json:"privateKey,omitempty"`
DeprecatedPrivateKey string `json:"privateKey,omitempty"`
}

// IngressRule represents the rules mapping the paths under a specified host to
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ var (
// The port is named "user-port" on the deployment, but a user cannot set an arbitrary name on the port
// in Configuration. The name field is reserved for content-negotiation. Currently 'h2c' and 'http1' are
// allowed.
// https://knative.dev/serving/blob/master/docs/runtime-contract.md#inbound-network-connectivity
// https://github.com/knative/serving/blob/master/docs/runtime-contract.md#inbound-network-connectivity
validPortNames = sets.NewString(
"h2c",
"http1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
// Users create new Revisions by updating the Configuration's spec.
// The "latest created" revision's name is available under status, as is the
// "latest ready" revision's name.
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#configuration
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#configuration
type Configuration struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
// references a container image. Revisions are created by updates to a
// Configuration.
//
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#revision
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#revision
type Revision struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
// referencing the Configuration responsible for creating them; in these cases
// the Route is additionally responsible for monitoring the Configuration for
// "latest ready revision" changes, and smoothly rolling out latest revisions.
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#route
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#route
type Route struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
// The Service's controller will track the statuses of its owned Configuration
// and Route, reflecting their statuses and conditions as its own.
//
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#service
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#service
type Service struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
// Users create new Revisions by updating the Configuration's spec.
// The "latest created" revision's name is available under status, as is the
// "latest ready" revision's name.
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#configuration
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#configuration
type Configuration struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down Expand Up @@ -68,7 +68,7 @@ type ConfigurationSpec struct {
// This property will be dropped in future Knative releases and should
// not be used - use metadata.generation
//
// Tracking issue: https://knative.dev/serving/issues/643
// Tracking issue: https://github.com/knative/serving/issues/643
//
// +optional
DeprecatedGeneration int64 `json:"generation,omitempty"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ const (
// UserQueueMetricsPortName specifies the port name to use for metrics
// emitted by queue-proxy for end user.
UserQueueMetricsPortName = "http-usermetric"

// ServiceQueueMetricsPortName is the name of the port that serves metrics
// on the Kubernetes service.
ServiceQueueMetricsPortName = "http-metrics"
)

var revCondSet = apis.NewLivingConditionSet(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
// materializing that container image from source. Revisions are created by
// updates to a Configuration.
//
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#revision
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#revision
type Revision struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down Expand Up @@ -72,7 +72,7 @@ type RevisionTemplateSpec struct {
}

// DeprecatedRevisionServingStateType is an enumeration of the levels of serving readiness of the Revision.
// See also: https://knative.dev/serving/blob/master/docs/spec/errors.md#error-conditions-and-reporting
// See also: https://github.com/knative/serving/blob/master/docs/spec/errors.md#error-conditions-and-reporting
type DeprecatedRevisionServingStateType string

const (
Expand All @@ -87,7 +87,7 @@ const (
// anymore. It should not have any Istio routes or Kubernetes resources.
// A Revision may be brought out of retirement, but it may take longer than
// it would from a "Reserve" state.
// Note: currently not set anywhere. See https://knative.dev/serving/issues/1203
// Note: currently not set anywhere. See https://github.com/knative/serving/issues/1203
DeprecatedRevisionServingStateRetired DeprecatedRevisionServingStateType = "Retired"
)

Expand Down Expand Up @@ -118,7 +118,7 @@ type RevisionSpec struct {
// This property will be dropped in future Knative releases and should
// not be used - use metadata.generation
//
// Tracking issue: https://knative.dev/serving/issues/643
// Tracking issue: https://github.com/knative/serving/issues/643
//
// +optional
DeprecatedGeneration int64 `json:"generation,omitempty"`
Expand Down Expand Up @@ -153,7 +153,7 @@ type RevisionSpec struct {
// this Container, including: name and lifecycle.
// See also the runtime contract for more information about the execution
// environment:
// https://knative.dev/serving/blob/master/docs/runtime-contract.md
// https://github.com/knative/serving/blob/master/docs/runtime-contract.md
// +optional
DeprecatedContainer *corev1.Container `json:"container,omitempty"`
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
// referencing the Configuration responsible for creating them; in these cases
// the Route is additionally responsible for monitoring the Configuration for
// "latest ready" revision changes, and smoothly rolling out latest revisions.
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#route
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#route
type Route struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down Expand Up @@ -83,7 +83,7 @@ type RouteSpec struct {
// This property will be dropped in future Knative releases and should
// not be used - use metadata.generation
//
// Tracking issue: https://knative.dev/serving/issues/643
// Tracking issue: https://github.com/knative/serving/issues/643
//
// +optional
DeprecatedGeneration int64 `json:"generation,omitempty"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
// The Service's controller will track the statuses of its owned Configuration
// and Route, reflecting their statuses and conditions as its own.
//
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#service
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#service
type Service struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down Expand Up @@ -73,7 +73,7 @@ type ServiceSpec struct {
// This property will be dropped in future Knative releases and should
// not be used - use metadata.generation
//
// Tracking issue: https://knative.dev/serving/issues/643
// Tracking issue: https://github.com/knative/serving/issues/643
//
// +optional
DeprecatedGeneration int64 `json:"generation,omitempty"`
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
// Users create new Revisions by updating the Configuration's spec.
// The "latest created" revision's name is available under status, as is the
// "latest ready" revision's name.
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#configuration
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#configuration
type Configuration struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
// references a container image. Revisions are created by updates to a
// Configuration.
//
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#revision
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#revision
type Revision struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
// referencing the Configuration responsible for creating them; in these cases
// the Route is additionally responsible for monitoring the Configuration for
// "latest ready revision" changes, and smoothly rolling out latest revisions.
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#route
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#route
type Route struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
// The Service's controller will track the statuses of its owned Configuration
// and Route, reflecting their statuses and conditions as its own.
//
// See also: https://knative.dev/serving/blob/master/docs/spec/overview.md#service
// See also: https://github.com/knative/serving/blob/master/docs/spec/overview.md#service
type Service struct {
metav1.TypeMeta `json:",inline"`
// +optional
Expand Down
Loading

0 comments on commit 8c417c1

Please sign in to comment.