Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history 
bumping knative.dev/serving eaff0b3...09a8095:
  > 09a8095 Use dataplane-trust instead of internal-encryption (# 14301)
  > ae86b1d upgrade to latest dependencies (# 14302)
  > 43f7526 Do not skip TestTargetBurstCapacity when `dataplane-trust` is not specified (# 14300)
  > d39a379 Support conformance test with cgroup v2 (# 14297)
  > c63d9be Fix comment about Cgroup limit (# 14298)
  > 9ac8996 Update net-istio nightly (# 14293)
  > 59bfc12 Update net-certmanager nightly (# 14294)
  > 7aef47b Update net-contour nightly (# 14295)
  > 90046c3 Don't reset ENV vars (# 14276)
  > 82747ef Update net-kourier nightly (# 14292)
bumping knative.dev/networking 1d7920d...1e4e183:
  > 1e4e183 Improve InternalTLSEnabled util function (# 847)
bumping knative.dev/eventing a2e2aa3...eacaac5:
  > eacaac5 deprecate kntest (# 7211)
  > b5a4460 Added rekt test for broker eventtype autocreate (# 7202)
  > d547e2d [main] Format Go code (# 7206)
  > 25f7e03 Reflect on e2e flags that PingSource is now v1 (# 7208)
  > 0e8b7ca Move eventtype rekttest pingsource to experiment (# 7180)
  > 08cf00f Add rekt test for "Any" filter (# 7130)
  > 11f1ee4 Added rekt test for channel event autocreate (# 7198)
  > 0045fa9 Broker eventtype autocreate fixes (# 7161)
  > 7749771 Added benchmark for any filter (# 7195)
  > 4d8da11 Upgrade to latest dependencies (# 7190)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
@knative-automation
knative-automation committed Aug 29, 2023
1 parent 00f3529 commit 8f51f3b
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 34 deletions.
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ require (
k8s.io/client-go v0.26.5
k8s.io/code-generator v0.26.5
knative.dev/client-pkg v0.0.0-20230815131440-5abd12981b4b
knative.dev/eventing v0.38.1-0.20230822134255-a2e2aa3d515d
knative.dev/eventing v0.38.1-0.20230828144301-eacaac5a92d8
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0
knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e
knative.dev/networking v0.0.0-20230828082700-1e4e18318353
knative.dev/pkg v0.0.0-20230821102121-81e4ee140363
knative.dev/serving v0.38.1-0.20230823024257-eaff0b39b99e
knative.dev/serving v0.38.1-0.20230829044730-09a809549e10
sigs.k8s.io/yaml v1.3.0
)

Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,16 +835,16 @@ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJ
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/client-pkg v0.0.0-20230815131440-5abd12981b4b h1:Ln3mDUER89kC4sYHkCpoZVcwthGlMwjekQi2IdMH4vU=
knative.dev/client-pkg v0.0.0-20230815131440-5abd12981b4b/go.mod h1:GRVZm1rKOy0lpPBGRM1ugK5joDbhXFEvULINHqPoA9U=
knative.dev/eventing v0.38.1-0.20230822134255-a2e2aa3d515d h1:K8EcKbY3POUZ+D7uekPUqYY7m+Ci3nkYu1+SqpYiwdY=
knative.dev/eventing v0.38.1-0.20230822134255-a2e2aa3d515d/go.mod h1:InEIckt+XICxXXYy2P4kqEJ4nMDXqI1iCUZ84vGDRbM=
knative.dev/eventing v0.38.1-0.20230828144301-eacaac5a92d8 h1:KPK1wM2DgoNIlVt37EYEIyVxH6D7bTUxTOODPcsYo6w=
knative.dev/eventing v0.38.1-0.20230828144301-eacaac5a92d8/go.mod h1:inFfD7WirG7ALHi7jpoYm3INeJpe1uMNo0cfvVpRxpg=
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0 h1:n9YEGYuoj31pAkhGlNL+xTQAeXKYTLeMmIZLWA9fAeo=
knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e h1:9CcYOXJKJSiZ5aeNm0AJZ1DjOlisadZhMSa/O/hOSmE=
knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e/go.mod h1:1voQlQD0tuot6U3Kldw+uch33mK2LV85fi3MfbV0CP8=
knative.dev/networking v0.0.0-20230828082700-1e4e18318353 h1:Ll5uB/h54ghuaWjoVAOUoar4dTSVpV26XOmnvKKevHQ=
knative.dev/networking v0.0.0-20230828082700-1e4e18318353/go.mod h1:1voQlQD0tuot6U3Kldw+uch33mK2LV85fi3MfbV0CP8=
knative.dev/pkg v0.0.0-20230821102121-81e4ee140363 h1:TI2hMwTM5Bl+yaWu1gN5bXAHSvc+FtH9cqm3NzmDBtY=
knative.dev/pkg v0.0.0-20230821102121-81e4ee140363/go.mod h1:dA3TdhFTRm4KmmpvfknpGV43SbGNFkLHySjC8/+NczM=
knative.dev/serving v0.38.1-0.20230823024257-eaff0b39b99e h1:LbHIIoOPcHXDwoJO/5OYqBx46ChN5heEujHiJK71GBc=
knative.dev/serving v0.38.1-0.20230823024257-eaff0b39b99e/go.mod h1:/q/HksDFhDiPdwOiyFdDE464YF+GjOYL22x7q57NPB0=
knative.dev/serving v0.38.1-0.20230829044730-09a809549e10 h1:k1Szz3zJscVWwYhUtQqq4EkuU+VN/5jEE5CKGO4zjKc=
knative.dev/serving v0.38.1-0.20230829044730-09a809549e10/go.mod h1:LhC5vH2hhy0EgfWg3dMFptE/JAqkdes6DooWb2NXEtQ=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
Expand Down
14 changes: 11 additions & 3 deletions vendor/knative.dev/networking/pkg/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const (
// hostname for a Route's tag.
TagTemplateKey = "tag-template"

// InternalEncryptionKey is deprecated and replaced by InternalDataplaneTrustKey and internal-controlplane-trust
// InternalEncryptionKey is deprecated and replaced by InternalDataplaneTrustKey and ControlplaneTrustKey.
// InternalEncryptionKey is the name of the configuration whether
// internal traffic is encrypted or not.
InternalEncryptionKey = "internal-encryption"
Expand Down Expand Up @@ -445,9 +445,17 @@ func NewConfigFromMap(data map[string]string) (*Config, error) {
return nc, nil
}

// InternalTLSEnabled returns whether or not dataplane-trust is disabled
// InternalTLSEnabled returns whether or not InternalEncyrption is enabled.
// Currently only DataplaneTrust is considered.
func (c *Config) InternalTLSEnabled() bool {
return c.DataplaneTrust != TrustDisabled
return tlsEnabled(c.DataplaneTrust)
}

func tlsEnabled(trust Trust) bool {
return trust == TrustMinimal ||
trust == TrustEnabled ||
trust == TrustMutual ||
trust == TrustIdentity
}

// GetDomainTemplate returns the golang Template from the config map
Expand Down
38 changes: 19 additions & 19 deletions vendor/knative.dev/serving/test/e2e-common.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,44 +19,44 @@
source "$(dirname "${BASH_SOURCE[0]}")/../vendor/knative.dev/hack/e2e-tests.sh"
source "$(dirname "${BASH_SOURCE[0]}")/e2e-networking-library.sh"

export CERT_MANAGER_VERSION="latest"
export CERT_MANAGER_VERSION=${CERT_MANAGER_VERSION:-"latest"}
# Since default is istio, make default ingress as istio
export INGRESS_CLASS=${INGRESS_CLASS:-istio.ingress.networking.knative.dev}
export ISTIO_VERSION="latest"
export KOURIER_VERSION=""
export CONTOUR_VERSION=""
export GATEWAY_API_VERSION=""
export CERTIFICATE_CLASS=""
export ISTIO_VERSION=${ISTIO_VERSION:-"latest"}
export KOURIER_VERSION=${KOURIER_VERSION:-""}
export CONTOUR_VERSION=${CONTOUR_VERSION:-""}
export GATEWAY_API_VERSION=${GATEWAY_API_VERSION:-""}
export CERTIFICATE_CLASS=${CERTIFICATE_CLASS:-""}
# Only build linux/amd64 bit images
export KO_FLAGS="${KO_FLAGS:---platform=linux/amd64}"

export RUN_HTTP01_AUTO_TLS_TESTS=0
export HTTPS=0
export SHORT=0
export ENABLE_HA=0
export RUN_HTTP01_AUTO_TLS_TESTS=${RUN_HTTP01_AUTO_TLS_TESTS:-0}
export HTTPS=${HTTPS:-0}
export SHORT=${SHORT:-0}
export ENABLE_HA=${ENABLE_HA:-0}
export ENABLE_TLS=${ENABLE_TLS:-0}
export MESH=0
export MESH=${MESH:-0}
export AMBIENT=${AMBIENT:-0}
export PERF=0
export PERF=${PERF:-0}
export KIND=${KIND:-0}
export CLUSTER_DOMAIN=${CLUSTER_DOMAIN:-cluster.local}

# List of custom YAMLs to install, if specified (space-separated).
export INSTALL_CUSTOM_YAMLS=""
export INSTALL_SERVING_VERSION="HEAD"
export INSTALL_ISTIO_VERSION="HEAD"
export INSTALL_CUSTOM_YAMLS=${INSTALL_CUSTOM_YAMLS:-""}
export INSTALL_SERVING_VERSION=${INSTALL_SERVING_VERSION:-"HEAD"}
export INSTALL_ISTIO_VERSION=${INSTALL_ISTIO_VERSION:-"HEAD"}
export YTT_FILES=()

export TMP_DIR="${TMP_DIR:-$(mktemp -d -t ci-$(date +%Y-%m-%d-%H-%M-%S)-XXXXXXXXXX)}"

readonly E2E_YAML_DIR="${TMP_DIR}/e2e-yaml"
readonly E2E_YAML_DIR=${E2E_YAML_DIR:-"${TMP_DIR}/e2e-yaml"}

# This the namespace used to install Knative Serving. Use generated UUID as namespace.
export SYSTEM_NAMESPACE="${SYSTEM_NAMESPACE:-$(uuidgen | tr 'A-Z' 'a-z')}"

# Keep this in sync with test/ha/ha.go
readonly REPLICAS=3
readonly BUCKETS=10
readonly REPLICAS=${REPLICAS:-3}
readonly BUCKETS=${BUCKETS:-10}

export PVC=${PVC:-1}
export QUOTA=${QUOTA:-1}
Expand Down Expand Up @@ -385,7 +385,7 @@ function install() {

if (( ENABLE_TLS )); then
echo "Patch to config-network to enable internal encryption"
toggle_feature internal-encryption true config-network
toggle_feature dataplane-trust minimal config-network
if [[ "$INGRESS_CLASS" == "kourier.ingress.networking.knative.dev" ]]; then
echo "Point Kourier local gateway to custom server certificates"
toggle_feature cluster-cert-secret server-certs config-kourier
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ k8s.io/utils/trace
# knative.dev/client-pkg v0.0.0-20230815131440-5abd12981b4b
## explicit; go 1.18
knative.dev/client-pkg/pkg/kn/plugin
# knative.dev/eventing v0.38.1-0.20230822134255-a2e2aa3d515d
# knative.dev/eventing v0.38.1-0.20230828144301-eacaac5a92d8
## explicit; go 1.19
knative.dev/eventing/pkg/apis/config
knative.dev/eventing/pkg/apis/duck
Expand Down Expand Up @@ -973,7 +973,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake
# knative.dev/hack v0.0.0-20230818155117-9cc05a31e8c0
## explicit; go 1.18
knative.dev/hack
# knative.dev/networking v0.0.0-20230822003854-1d7920d27b9e
# knative.dev/networking v0.0.0-20230828082700-1e4e18318353
## explicit; go 1.18
knative.dev/networking/pkg
knative.dev/networking/pkg/apis/networking
Expand Down Expand Up @@ -1038,7 +1038,7 @@ knative.dev/pkg/tracing/config
knative.dev/pkg/tracing/propagation
knative.dev/pkg/tracing/propagation/tracecontextb3
knative.dev/pkg/tracker
# knative.dev/serving v0.38.1-0.20230823024257-eaff0b39b99e
# knative.dev/serving v0.38.1-0.20230829044730-09a809549e10
## explicit; go 1.18
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down

0 comments on commit 8f51f3b

Please sign in to comment.