Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release-0.18] Pin knative deps to release-0.18 #1025

Merged
merged 5 commits into from
Sep 23, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ require (
github.com/spf13/viper v1.7.0
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
gotest.tools v2.2.0+incompatible
k8s.io/api v0.18.7-rc.0
k8s.io/apimachinery v0.18.7-rc.0
k8s.io/api v0.18.8
k8s.io/apimachinery v0.18.8
k8s.io/cli-runtime v0.17.6
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
k8s.io/code-generator v0.18.6
knative.dev/eventing v0.17.0
knative.dev/pkg v0.0.0-20200812224206-44c860147a87
knative.dev/serving v0.17.0
k8s.io/code-generator v0.18.8
knative.dev/eventing v0.17.1-0.20200922201940-baa7cd3e8254
knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab
knative.dev/serving v0.17.1-0.20200922232940-9d0250fcaaec
sigs.k8s.io/yaml v1.2.0
)

Expand Down
79 changes: 61 additions & 18 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hack/update-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ VERSION="master"
# The list of dependencies that we track at HEAD and periodically
# float forward in this repository.
FLOATING_DEPS=(
"knative.dev/pkg@release-0.17"
"knative.dev/pkg@release-0.18"
"knative.dev/serving@${VERSION}"
"knative.dev/eventing@${VERSION}"
)
Expand All @@ -47,7 +47,7 @@ readonly GO_GET

if (( GO_GET )); then
go get -d ${FLOATING_DEPS[@]}
"${ROOT_DIR}/scripts/test-infra/update-test-infra.sh" --update --ref "release-0.17"
"${ROOT_DIR}/scripts/test-infra/update-test-infra.sh" --update --ref "release-0.18"
fi


Expand Down
2 changes: 1 addition & 1 deletion scripts/test-infra/COMMIT
Original file line number Diff line number Diff line change
@@ -1 +1 @@
afcd1747545fe346b7a564d77e9643ccc552a43c
37f1a12adbd3a54fa415fa1a9fc53e0e452f375e
42 changes: 10 additions & 32 deletions scripts/test-infra/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,33 +110,17 @@ main "$@"

This is a helper script for Knative E2E test scripts. To use it:

1. [optional] Customize the test cluster. Set the following environment
variables if the default values don't fit your needs:

- `E2E_CLUSTER_REGION`: Cluster region, defaults to `us-central1`.
- `E2E_CLUSTER_BACKUP_REGIONS`: Space-separated list of regions to retry test
cluster creation in case of stockout. Defaults to `us-west1 us-east1`.
- `E2E_CLUSTER_ZONE`: Cluster zone (e.g., `a`), defaults to none (i.e. use a
regional cluster).
- `E2E_CLUSTER_BACKUP_ZONES`: Space-separated list of zones to retry test
cluster creation in case of stockout. If defined,
`E2E_CLUSTER_BACKUP_REGIONS` will be ignored thus it defaults to none.
- `E2E_CLUSTER_MACHINE`: Cluster node machine type, defaults to
`e2-standard-4}`.
- `E2E_MIN_CLUSTER_NODES`: Minimum number of nodes in the cluster when
autoscaling, defaults to 1.
- `E2E_MAX_CLUSTER_NODES`: Maximum number of nodes in the cluster when
autoscaling, defaults to 3.
1. [optional] Customize the test cluster. Pass the flags as described
[here](../kntest/pkg/kubetest2/gke/README.md) to the `initialize` function
call if the default values don't fit your needs.

1. Source the script.

1. [optional] Write the `knative_setup()` function, which will set up your
system under test (e.g., Knative Serving). This function won't be called if
you use the `--skip-knative-setup` flag.
system under test (e.g., Knative Serving).

1. [optional] Write the `knative_teardown()` function, which will tear down your
system under test (e.g., Knative Serving). This function won't be called if
you use the `--skip-knative-setup` flag.
system under test (e.g., Knative Serving).

1. [optional] Write the `test_setup()` function, which will set up the test
resources.
Expand All @@ -160,7 +144,7 @@ This is a helper script for Knative E2E test scripts. To use it:
of items to skip in the command line if the flag was parsed successfully. For
example, return 1 for a simple flag, and 2 for a flag with a parameter.

1. Call the `initialize()` function passing `$@` (without quotes).
1. Call the `initialize()` function passing `"$@"`.

1. Write logic for the end-to-end tests. Run all go tests using `go_test_e2e()`
(or `report_go_test()` if you need a more fine-grained control) and call
Expand All @@ -170,8 +154,8 @@ This is a helper script for Knative E2E test scripts. To use it:

**Notes:**

1. Calling your script without arguments will create a new cluster in the GCP
project `$PROJECT_ID` and run the tests against it.
1. Calling your script without arguments will create a new cluster in your
current GCP project and run the tests against it.

1. Calling your script with `--run-tests` and the variable `KO_DOCKER_REPO` set
will immediately start the tests against the cluster currently configured for
Expand All @@ -183,10 +167,6 @@ This is a helper script for Knative E2E test scripts. To use it:
1. By default Istio is installed on the cluster via Addon, use
`--skip-istio-addon` if you choose not to have it preinstalled.

1. You can force running the tests against a specific GKE cluster version by
using the `--cluster-version` flag and passing a full version as the flag
value.

### Sample end-to-end test script

This script will test that the latest Knative Serving nightly release works. It
Expand All @@ -196,9 +176,6 @@ test cluster is created in a specific region, `us-west2`.

```bash

# This test requires a cluster in LA
E2E_CLUSTER_REGION=us-west2

source vendor/knative.dev/test-infra/scripts/e2e-tests.sh

function knative_setup() {
Expand All @@ -218,7 +195,8 @@ function parse_flags() {

WAIT_FOR_KNATIVE=1

initialize $@
# This test requires a cluster in LA
initialize $@ --region=us-west2

# TODO: use go_test_e2e to run the tests.
kubectl get pods || fail_test
Expand Down
Loading