Skip to content
This repository has been archived by the owner on Jun 19, 2022. It is now read-only.

Commit

Permalink
Skip CAL & Channel e2e tests - Moving deps to 0.12 (#503)
Browse files Browse the repository at this point in the history
* skipping cal e2e test

* skipping e2e channel tests

* changing toml

* updating to 0.12
  • Loading branch information
nachocano authored and knative-prow-robot committed Jan 22, 2020
1 parent a473d5c commit 7523775
Show file tree
Hide file tree
Showing 212 changed files with 308 additions and 184 deletions.
10 changes: 5 additions & 5 deletions Gopkg.lock

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

4 changes: 2 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ required = [
# This is a preemptive override.
[[override]]
name = "knative.dev/eventing"
branch = "master"
branch = "release-0.12"

# This is a preemptive override.
[[override]]
name = "knative.dev/serving"
branch = "master"
branch = "release-0.12"

[[override]]
name = "go.uber.org/zap"
Expand Down
6 changes: 6 additions & 0 deletions test/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,24 +104,28 @@ func TestChannelNamespaceDefaulter(t *testing.T) {
}

func TestEventTransformationForSubscription(t *testing.T) {
t.Skip("See issue https://github.com/google/knative-gcp/issues/504")
cancel := logstream.Start(t)
defer cancel()
e2ehelpers.EventTransformationForSubscriptionTestHelper(t, channelTestRunner, lib.DuplicatePubSubSecret)
}

func TestChannelChain(t *testing.T) {
t.Skip("See issue https://github.com/google/knative-gcp/issues/504")
cancel := logstream.Start(t)
defer cancel()
e2ehelpers.ChannelChainTestHelper(t, channelTestRunner, lib.DuplicatePubSubSecret)
}

func TestEventTransformationForTrigger(t *testing.T) {
t.Skip("See issue https://github.com/google/knative-gcp/issues/504")
cancel := logstream.Start(t)
defer cancel()
e2ehelpers.EventTransformationForTriggerTestHelper(t, channelTestRunner, lib.DuplicatePubSubSecret)
}

func TestBrokerChannelFlow(t *testing.T) {
t.Skip("See issue https://github.com/google/knative-gcp/issues/504")
cancel := logstream.Start(t)
defer cancel()
e2ehelpers.BrokerChannelFlowTestHelper(t, channelTestRunner, lib.DuplicatePubSubSecret)
Expand Down Expand Up @@ -197,6 +201,7 @@ func TestCloudPubSubSourceStackDriverMetrics(t *testing.T) {

// TestBrokerWithPubSubChannel tests we can knock a Knative Service from a broker with PubSub Channel.
func TestBrokerWithPubSubChannel(t *testing.T) {
t.Skip("See issue https://github.com/google/knative-gcp/issues/504")
cancel := logstream.Start(t)
defer cancel()
BrokerWithPubSubChannelTestImpl(t)
Expand All @@ -219,6 +224,7 @@ func TestCloudStorageSourceStackDriverMetrics(t *testing.T) {

// TestCloudAuditLogsSource tests we can knock down a target from an CloudAuditLogsSource.
func TestCloudAuditLogsSource(t *testing.T) {
t.Skip("See issue https://github.com/google/knative-gcp/issues/480")
cancel := logstream.Start(t)
defer cancel()
CloudAuditLogsSourceWithTestImpl(t)
Expand Down
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/100-namespace.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/200-clusterrole.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/200-serviceaccount.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/202-gateway.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/203-local-gateway.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/300-certificate.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/300-configuration.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/300-ingress.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/300-metric.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/300-pa.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/300-revision.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/300-route.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/300-service.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/300-sks.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/500-webhook-secret.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/999-cache.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/activator-hpa.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/activator.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/autoscaler-hpa.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/autoscaler.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-autoscaler.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-certmanager.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-defaults.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-deployment.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-domain.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-gc.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-istio.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-logging.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-network.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/config-tracing.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/controller.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/networking-istio.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/networking-ns-cert.yaml
1 change: 1 addition & 0 deletions vendor/knative.dev/serving/config/webhook.yaml

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 @@ -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 @@ -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.

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 @@ -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

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.

Loading

0 comments on commit 7523775

Please sign in to comment.