Skip to content
This repository was archived by the owner on Jun 24, 2020. It is now read-only.

Commit d3e3d2e

Browse files
Vincentaliokk4leung4mattmoor
authored
Cherry pick for release 0.12 to support KUBECONFIG in OLM (#299)
* Support reading KubeConfig from KUBECONFIG env var (#293) * Add upgrade tests into the e2e-tests-latest-serving (#286) * Add upgrade tests into the e2e-tests-latest-serving This PR adds the tests to verify the correct number and names of knative serving deployments. The test tag postupgrade is added, marking the tests to run after upgrade to the latest HEAD of operator, with the latest generated manifest of knative serving. * Install the latest release of the operator and then upgrade * Split the long functions and rename the common package * Refactor the PR based on the comments * Update the library from jcrossley3/manifestival to manifestival * Update pkg/reconciler/knativeserving/common/gateway.go please fix Co-Authored-By: Matt Moore <[email protected]> Co-authored-by: Ali Ok <[email protected]> Co-authored-by: Kenny Leung <[email protected]> Co-authored-by: Matt Moore <[email protected]>
1 parent 855fd77 commit d3e3d2e

27 files changed

+558
-320
lines changed

‎Gopkg.lock

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ required = [
4949
version = "1.4.1"
5050

5151
[[constraint]]
52-
name = "github.com/jcrossley3/manifestival"
52+
name = "github.com/manifestival/manifestival"
5353
branch = "client-go"
5454

5555
[[override]]

‎cmd/manager/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"flag"
2020
"log"
2121

22-
"k8s.io/client-go/tools/clientcmd"
2322
"knative.dev/pkg/injection/sharedmain"
2423
"knative.dev/pkg/signals"
2524
"knative.dev/serving-operator/pkg/reconciler/knativeserving"
@@ -28,7 +27,7 @@ import (
2827
func main() {
2928
flag.Parse()
3029

31-
cfg, err := clientcmd.BuildConfigFromFlags(*knativeserving.MasterURL, *knativeserving.Kubeconfig)
30+
cfg, err := sharedmain.GetConfig(*knativeserving.MasterURL, *knativeserving.Kubeconfig)
3231
if err != nil {
3332
log.Fatal("Error building kubeconfig", err)
3433
}

‎pkg/reconciler/knativeserving/common/certs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package common
1919
import (
2020
"fmt"
2121

22-
mf "github.com/jcrossley3/manifestival"
22+
mf "github.com/manifestival/manifestival"
2323
"go.uber.org/zap"
2424
appsv1 "k8s.io/api/apps/v1"
2525
v1 "k8s.io/api/core/v1"

‎pkg/reconciler/knativeserving/common/config_maps.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616
package common
1717

1818
import (
19-
mf "github.com/jcrossley3/manifestival"
19+
mf "github.com/manifestival/manifestival"
2020
"go.uber.org/zap"
2121
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2222
servingv1alpha1 "knative.dev/serving-operator/pkg/apis/serving/v1alpha1"

‎pkg/reconciler/knativeserving/common/extensions.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616
package common
1717

1818
import (
19-
mf "github.com/jcrossley3/manifestival"
19+
mf "github.com/manifestival/manifestival"
2020
"go.uber.org/zap"
2121
"k8s.io/client-go/kubernetes"
2222
servingv1alpha1 "knative.dev/serving-operator/pkg/apis/serving/v1alpha1"

‎pkg/reconciler/knativeserving/common/gateway.go

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
11
package common
22

33
import (
4-
mf "github.com/jcrossley3/manifestival"
4+
/*
5+
Copyright 2020 The Knative Authors
6+
7+
Licensed under the Apache License, Version 2.0 (the "License");
8+
you may not use this file except in compliance with the License.
9+
You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
*/
19+
20+
mf "github.com/manifestival/manifestival"
521
"go.uber.org/zap"
622
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
723
servingv1alpha1 "knative.dev/serving-operator/pkg/apis/serving/v1alpha1"

‎pkg/reconciler/knativeserving/common/images.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package common
1818
import (
1919
"strings"
2020

21-
mf "github.com/jcrossley3/manifestival"
21+
mf "github.com/manifestival/manifestival"
2222
"go.uber.org/zap"
2323
appsv1 "k8s.io/api/apps/v1"
2424
corev1 "k8s.io/api/core/v1"

‎pkg/reconciler/knativeserving/controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ package knativeserving
1616
import (
1717
"context"
1818
"flag"
19+
"knative.dev/pkg/injection/sharedmain"
1920
"os"
2021
"path/filepath"
2122

2223
"github.com/go-logr/zapr"
23-
mf "github.com/jcrossley3/manifestival"
24+
mf "github.com/manifestival/manifestival"
2425
"go.uber.org/zap"
2526
"k8s.io/client-go/tools/cache"
26-
"k8s.io/client-go/tools/clientcmd"
2727
deploymentinformer "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"
2828
"knative.dev/pkg/configmap"
2929
"knative.dev/pkg/controller"
@@ -60,7 +60,7 @@ func NewController(
6060

6161
koDataDir := os.Getenv("KO_DATA_PATH")
6262

63-
cfg, err := clientcmd.BuildConfigFromFlags(*MasterURL, *Kubeconfig)
63+
cfg, err := sharedmain.GetConfig(*MasterURL, *Kubeconfig)
6464
if err != nil {
6565
c.Logger.Error(err, "Error building kubeconfig")
6666
}

‎pkg/reconciler/knativeserving/knativeserving_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222

23-
mf "github.com/jcrossley3/manifestival"
23+
mf "github.com/manifestival/manifestival"
2424
"go.uber.org/zap"
2525
appsv1 "k8s.io/api/apps/v1"
2626
corev1 "k8s.io/api/core/v1"

‎pkg/reconciler/knativeserving/minikube/minikube.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"go.uber.org/zap"
2020
"k8s.io/client-go/kubernetes"
2121

22-
mf "github.com/jcrossley3/manifestival"
22+
mf "github.com/manifestival/manifestival"
2323
"k8s.io/apimachinery/pkg/api/errors"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

‎test/e2e/e2e.go ‎test/client/setup.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright 2019 The Knative Authors
2+
Copyright 2020 The Knative Authors
33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.
55
You may obtain a copy of the License at
@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
1111
limitations under the License.
1212
*/
1313

14-
package e2e
14+
package client
1515

1616
import (
1717
"testing"
@@ -20,6 +20,7 @@ import (
2020
// Apparently just importing it is enough. @_@ side effects @_@.
2121
// https://github.com/kubernetes/client-go/issues/242
2222
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
23+
2324
pkgTest "knative.dev/pkg/test"
2425
"knative.dev/serving-operator/test"
2526
)

‎test/e2e-common.sh

+11-15
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ source $(dirname $0)/../vendor/knative.dev/test-infra/scripts/e2e-tests.sh
2020
# Latest serving release. This is intentionally hardcoded for now, but
2121
# will need the ability to test against the latest successful serving
2222
# CI runs in the future.
23-
readonly LATEST_SERVING_RELEASE_VERSION=0.6.0
23+
readonly LATEST_SERVING_RELEASE_VERSION=$(git describe --match "v[0-9]*" --abbrev=0)
2424
# Istio version we test with
25-
readonly ISTIO_VERSION=1.1.3
25+
readonly ISTIO_VERSION="1.4.2"
2626
# Test without Istio mesh enabled
2727
readonly ISTIO_MESH=0
2828
# Namespace used for tests
@@ -43,23 +43,16 @@ function istio_yaml() {
4343
local istio_mesh=$2
4444
local suffix=""
4545
if [[ $istio_mesh -eq 0 ]]; then
46-
suffix="-lean"
46+
suffix="ci-no-mesh"
47+
else
48+
suffix="ci-mesh"
4749
fi
48-
echo "third_party/istio-${istio_version}/istio${suffix}.yaml"
50+
echo "third_party/istio-${istio_version}/istio-${suffix}.yaml"
4951
}
5052

5153
# Install Istio.
5254
function install_istio() {
53-
local base_url="https://raw.githubusercontent.com/knative/serving/v${LATEST_SERVING_RELEASE_VERSION}"
54-
# Decide the Istio configuration to install.
55-
if [[ -z "$ISTIO_VERSION" ]]; then
56-
# Defaults to 1.1-latest
57-
ISTIO_VERSION=1.1-latest
58-
fi
59-
if [[ -z "$ISTIO_MESH" ]]; then
60-
# Defaults to using mesh.
61-
ISTIO_MESH=1
62-
fi
55+
local base_url="https://raw.githubusercontent.com/knative/serving/${LATEST_SERVING_RELEASE_VERSION}"
6356
INSTALL_ISTIO_CRD_YAML="${base_url}/$(istio_crds_yaml $ISTIO_VERSION)"
6457
INSTALL_ISTIO_YAML="${base_url}/$(istio_yaml $ISTIO_VERSION $ISTIO_MESH)"
6558

@@ -76,10 +69,13 @@ function install_istio() {
7669
kubectl apply -f "${INSTALL_ISTIO_YAML}" || return 1
7770
}
7871

79-
function install_serving_operator() {
72+
function create_namespace() {
8073
echo ">> Creating test namespaces"
74+
# All the custom resources and Knative Serving resources are created under this TEST_NAMESPACE.
8175
kubectl create namespace $TEST_NAMESPACE
76+
}
8277

78+
function install_serving_operator() {
8379
header "Installing Knative Serving operator"
8480
# Deploy the operator
8581
ko apply -f config/

‎test/e2e-tests.sh

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ source $(dirname $0)/e2e-common.sh
3030

3131
function knative_setup() {
3232
install_istio || fail_test "Istio installation failed"
33+
create_namespace
3334
install_serving_operator
3435
}
3536

‎test/e2e-tests-latest-serving.sh ‎test/e2e-upgrade-tests.sh

+46-3
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,47 @@ source $(dirname $0)/e2e-common.sh
3636
OPERATOR_DIR=$(dirname $0)/..
3737
KNATIVE_SERVING_DIR=${OPERATOR_DIR}/..
3838

39-
function knative_setup() {
39+
function install_latest_operator_release() {
40+
header "Installing Knative Serving operator latest public release"
41+
local full_url="https://github.com/knative/serving-operator/releases/download/${LATEST_SERVING_RELEASE_VERSION}/serving-operator.yaml"
42+
43+
local release_yaml="$(mktemp)"
44+
wget "${full_url}" -O "${release_yaml}" \
45+
|| fail_test "Unable to download latest Knative Serving Operator release."
46+
4047
install_istio || fail_test "Istio installation failed"
48+
kubectl apply -f "${release_yaml}" || fail_test "Knative Serving Operator latest release installation failed"
49+
create_custom_resource
50+
wait_until_pods_running ${TEST_NAMESPACE}
51+
}
52+
53+
function create_custom_resource() {
54+
echo ">> Creating the custom resource of Knative Serving:"
55+
cat <<EOF | kubectl apply -f -
56+
apiVersion: operator.knative.dev/v1alpha1
57+
kind: KnativeServing
58+
metadata:
59+
name: knative-serving
60+
namespace: ${TEST_NAMESPACE}
61+
spec:
62+
config:
63+
defaults:
64+
revision-timeout-seconds: "300" # 5 minutes
65+
autoscaler:
66+
stable-window: "60s"
67+
deployment:
68+
registriesSkippingTagResolving: "ko.local,dev.local"
69+
logging:
70+
loglevel.controller: "debug"
71+
EOF
72+
}
73+
74+
function knative_setup() {
75+
create_namespace
76+
install_latest_operator_release
77+
}
78+
79+
function install_head() {
4180
generate_latest_serving_manifest
4281
install_serving_operator
4382
}
@@ -74,12 +113,16 @@ function generate_latest_serving_manifest() {
74113
# Skip installing istio as an add-on
75114
initialize $@ --skip-istio-addon
76115

116+
TIMEOUT=20m
117+
118+
install_head
119+
77120
# If we got this far, the operator installed Knative Serving of the latest source code.
78121
header "Running tests for Knative Serving Operator"
79122
failed=0
80123

81-
# Run the integration tests
82-
go_test_e2e -timeout=20m ./test/e2e || failed=1
124+
# Run the postupgrade tests
125+
go_test_e2e -tags=postupgrade -timeout=${TIMEOUT} ./test/upgrade || failed=1
83126

84127
# Require that tests succeeded.
85128
(( failed )) && fail_test

0 commit comments

Comments
 (0)