Skip to content

Commit

Permalink
adding knative9 vendor changes + duck API changes (kubeflow#543)
Browse files Browse the repository at this point in the history 
* adding knative9

* update knative serving and duck api
  • Loading branch information
@animeshsingh @k8s-ci-robot
animeshsingh authored and k8s-ci-robot committed Dec 2, 2019
1 parent d7c6718 commit e7f466c
Show file tree
Hide file tree
Showing 157 changed files with 5,860 additions and 1,135 deletions.
24 changes: 15 additions & 9 deletions Gopkg.lock
View file

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
View file
Expand Up @@ -46,7 +46,7 @@ version="v1.4.7"

[[constraint]]
name = "knative.dev/serving"
version = "=v0.8.0"
version = "=v0.9"

[[override]]
name="sigs.k8s.io/controller-runtime"
Expand All @@ -59,7 +59,7 @@ version="v1.4.7"

[[override]]
name = "knative.dev/pkg"
branch = "release-0.8"
branch = "release-0.9"

[[override]]
name = "k8s.io/api"
Expand Down
37 changes: 19 additions & 18 deletions pkg/apis/serving/v1alpha2/inferenceservice_status_test.go
View file
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/kubeflow/kfserving/pkg/constants"
"k8s.io/api/core/v1"
"knative.dev/pkg/apis/duck"
duckv1 "knative.dev/pkg/apis/duck/v1"
duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1"
"knative.dev/serving/pkg/apis/serving/v1alpha1"
"testing"
Expand Down Expand Up @@ -59,8 +60,8 @@ func TestInferenceServiceIsReady(t *testing.T) {
}, {
name: "Different condition type should not be ready",
defaultServiceStatus: v1alpha1.ServiceStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{{
Status: duckv1.Status{
Conditions: duckv1.Conditions{{
Type: "Foo",
Status: v1.ConditionTrue,
}},
Expand All @@ -70,8 +71,8 @@ func TestInferenceServiceIsReady(t *testing.T) {
}, {
name: "False condition status should not be ready",
defaultServiceStatus: v1alpha1.ServiceStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{{
Status: duckv1.Status{
Conditions: duckv1.Conditions{{
Type: v1alpha1.ServiceConditionReady,
Status: v1.ConditionFalse,
}},
Expand All @@ -81,8 +82,8 @@ func TestInferenceServiceIsReady(t *testing.T) {
}, {
name: "Unknown condition status should not be ready",
defaultServiceStatus: v1alpha1.ServiceStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{{
Status: duckv1.Status{
Conditions: duckv1.Conditions{{
Type: v1alpha1.ServiceConditionReady,
Status: v1.ConditionUnknown,
}},
Expand All @@ -92,8 +93,8 @@ func TestInferenceServiceIsReady(t *testing.T) {
}, {
name: "Missing condition status should not be ready",
defaultServiceStatus: v1alpha1.ServiceStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{{
Status: duckv1.Status{
Conditions: duckv1.Conditions{{
Type: v1alpha1.ConfigurationConditionReady,
}},
},
Expand All @@ -102,8 +103,8 @@ func TestInferenceServiceIsReady(t *testing.T) {
}, {
name: "True condition status should be ready",
defaultServiceStatus: v1alpha1.ServiceStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{{
Status: duckv1.Status{
Conditions: duckv1.Conditions{{
Type: v1alpha1.ConfigurationConditionReady,
Status: v1.ConditionTrue,
}},
Expand All @@ -121,8 +122,8 @@ func TestInferenceServiceIsReady(t *testing.T) {
}, {
name: "Default service, route conditions with ready status should be ready",
defaultServiceStatus: v1alpha1.ServiceStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{{
Status: duckv1.Status{
Conditions: duckv1.Conditions{{
Type: "Foo",
Status: v1.ConditionTrue,
}, {
Expand All @@ -144,17 +145,17 @@ func TestInferenceServiceIsReady(t *testing.T) {
}, {
name: "Default/canary service, route conditions with ready status should be ready",
defaultServiceStatus: v1alpha1.ServiceStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{{
Status: duckv1.Status{
Conditions: duckv1.Conditions{{
Type: v1alpha1.ConfigurationConditionReady,
Status: v1.ConditionTrue,
},
},
},
},
canaryServiceStatus: v1alpha1.ServiceStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{{
Status: duckv1.Status{
Conditions: duckv1.Conditions{{
Type: v1alpha1.ConfigurationConditionReady,
Status: v1.ConditionTrue,
},
Expand All @@ -173,8 +174,8 @@ func TestInferenceServiceIsReady(t *testing.T) {
}, {
name: "Multiple conditions with ready status false should not be ready",
defaultServiceStatus: v1alpha1.ServiceStatus{
Status: duckv1beta1.Status{
Conditions: duckv1beta1.Conditions{{
Status: duckv1.Status{
Conditions: duckv1.Conditions{{
Type: "Foo",
Status: v1.ConditionTrue,
}, {
Expand Down
37 changes: 19 additions & 18 deletions pkg/controller/inferenceservice/controller_test.go
View file
Expand Up @@ -31,14 +31,15 @@ import (
testutils "github.com/kubeflow/kfserving/pkg/testing"
v1 "k8s.io/api/core/v1"
"knative.dev/pkg/apis"
"knative.dev/serving/pkg/apis/serving/v1beta1"
knservingv1 "knative.dev/serving/pkg/apis/serving/v1"

"github.com/kubeflow/kfserving/pkg/apis/serving/v1alpha2"
kfserving "github.com/kubeflow/kfserving/pkg/apis/serving/v1alpha2"
"github.com/onsi/gomega"
"golang.org/x/net/context"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
duckv1 "knative.dev/pkg/apis/duck/v1"
duckv1beta1 "knative.dev/pkg/apis/duck/v1beta1"
"knative.dev/pkg/apis/istio/common/v1alpha1"
istiov1alpha1 "knative.dev/pkg/apis/istio/common/v1alpha1"
Expand Down Expand Up @@ -175,7 +176,7 @@ func TestInferenceServiceWithOnlyPredictor(t *testing.T) {
},
},
Spec: knservingv1alpha1.RevisionSpec{
RevisionSpec: v1beta1.RevisionSpec{
RevisionSpec: knservingv1.RevisionSpec{
TimeoutSeconds: &constants.DefaultPredictorTimeout,
PodSpec: v1.PodSpec{
Containers: []v1.Container{
Expand Down Expand Up @@ -206,7 +207,7 @@ func TestInferenceServiceWithOnlyPredictor(t *testing.T) {
updateDefault.Status.LatestCreatedRevisionName = "revision-v1"
updateDefault.Status.LatestReadyRevisionName = "revision-v1"
updateDefault.Status.URL, _ = apis.ParseURL("http://revision-v1.myns.myingress.com")
updateDefault.Status.Conditions = duckv1beta1.Conditions{
updateDefault.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand Down Expand Up @@ -406,7 +407,7 @@ func TestInferenceServiceWithDefaultAndCanaryPredictor(t *testing.T) {
},
},
Spec: knservingv1alpha1.RevisionSpec{
RevisionSpec: v1beta1.RevisionSpec{
RevisionSpec: knservingv1.RevisionSpec{
TimeoutSeconds: &constants.DefaultPredictorTimeout,
PodSpec: v1.PodSpec{
Containers: []v1.Container{
Expand Down Expand Up @@ -438,7 +439,7 @@ func TestInferenceServiceWithDefaultAndCanaryPredictor(t *testing.T) {
updateDefault.Status.LatestCreatedRevisionName = "revision-v1"
updateDefault.Status.LatestReadyRevisionName = "revision-v1"
updateDefault.Status.URL, _ = apis.ParseURL("http://revision-v1.myns.myingress.com")
updateDefault.Status.Conditions = duckv1beta1.Conditions{
updateDefault.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand All @@ -451,7 +452,7 @@ func TestInferenceServiceWithDefaultAndCanaryPredictor(t *testing.T) {
updateCanary.Status.LatestCreatedRevisionName = "revision-v2"
updateCanary.Status.LatestReadyRevisionName = "revision-v2"
updateCanary.Status.URL, _ = apis.ParseURL("http://revision-v2.myns.myingress.com")
updateCanary.Status.Conditions = duckv1beta1.Conditions{
updateCanary.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand Down Expand Up @@ -664,7 +665,7 @@ func TestCanaryDelete(t *testing.T) {
updateDefault.Status.LatestCreatedRevisionName = "revision-v1"
updateDefault.Status.LatestReadyRevisionName = "revision-v1"
updateDefault.Status.URL, _ = apis.ParseURL("http://revision-v1.myns.myingress.com")
updateDefault.Status.Conditions = duckv1beta1.Conditions{
updateDefault.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand All @@ -677,7 +678,7 @@ func TestCanaryDelete(t *testing.T) {
updateCanary.Status.LatestCreatedRevisionName = "revision-v2"
updateCanary.Status.LatestReadyRevisionName = "revision-v2"
updateCanary.Status.URL, _ = apis.ParseURL("http://revision-v2.myns.myingress.com")
updateCanary.Status.Conditions = duckv1beta1.Conditions{
updateCanary.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand Down Expand Up @@ -962,7 +963,7 @@ func TestInferenceServiceWithTransformer(t *testing.T) {
},
},
Spec: knservingv1alpha1.RevisionSpec{
RevisionSpec: v1beta1.RevisionSpec{
RevisionSpec: knservingv1.RevisionSpec{
TimeoutSeconds: &constants.DefaultTransformerTimeout,
PodSpec: v1.PodSpec{
Containers: []v1.Container{
Expand Down Expand Up @@ -995,7 +996,7 @@ func TestInferenceServiceWithTransformer(t *testing.T) {
updateDefault.Status.LatestCreatedRevisionName = "revision-v1"
updateDefault.Status.LatestReadyRevisionName = "revision-v1"
updateDefault.Status.URL, _ = apis.ParseURL("http://revision-v1.myns.myingress.com")
updateDefault.Status.Conditions = duckv1beta1.Conditions{
updateDefault.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand All @@ -1008,7 +1009,7 @@ func TestInferenceServiceWithTransformer(t *testing.T) {
updateCanary.Status.LatestCreatedRevisionName = "revision-v2"
updateCanary.Status.LatestReadyRevisionName = "revision-v2"
updateCanary.Status.URL, _ = apis.ParseURL("http://revision-v2.myns.myingress.com")
updateCanary.Status.Conditions = duckv1beta1.Conditions{
updateCanary.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand All @@ -1024,7 +1025,7 @@ func TestInferenceServiceWithTransformer(t *testing.T) {
updateDefault.Status.LatestCreatedRevisionName = "t-revision-v1"
updateDefault.Status.LatestReadyRevisionName = "t-revision-v1"
updateDefault.Status.URL, _ = apis.ParseURL("http://t-revision-v1.myns.myingress.com")
updateDefault.Status.Conditions = duckv1beta1.Conditions{
updateDefault.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand All @@ -1037,7 +1038,7 @@ func TestInferenceServiceWithTransformer(t *testing.T) {
updateCanary.Status.LatestCreatedRevisionName = "t-revision-v2"
updateCanary.Status.LatestReadyRevisionName = "t-revision-v2"
updateCanary.Status.URL, _ = apis.ParseURL("http://t-revision-v2.myns.myingress.com")
updateCanary.Status.Conditions = duckv1beta1.Conditions{
updateCanary.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand Down Expand Up @@ -1494,7 +1495,7 @@ func TestInferenceServiceWithExplainer(t *testing.T) {
},
},
Spec: knservingv1alpha1.RevisionSpec{
RevisionSpec: v1beta1.RevisionSpec{
RevisionSpec: knservingv1.RevisionSpec{
TimeoutSeconds: &constants.DefaultExplainerTimeout,
PodSpec: v1.PodSpec{
Containers: []v1.Container{
Expand Down Expand Up @@ -1529,7 +1530,7 @@ func TestInferenceServiceWithExplainer(t *testing.T) {
updateDefault.Status.LatestCreatedRevisionName = "revision-v1"
updateDefault.Status.LatestReadyRevisionName = "revision-v1"
updateDefault.Status.URL, _ = apis.ParseURL("http://revision-v1.myns.myingress.com")
updateDefault.Status.Conditions = duckv1beta1.Conditions{
updateDefault.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand All @@ -1542,7 +1543,7 @@ func TestInferenceServiceWithExplainer(t *testing.T) {
updateCanary.Status.LatestCreatedRevisionName = "revision-v2"
updateCanary.Status.LatestReadyRevisionName = "revision-v2"
updateCanary.Status.URL, _ = apis.ParseURL("http://revision-v2.myns.myingress.com")
updateCanary.Status.Conditions = duckv1beta1.Conditions{
updateCanary.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand All @@ -1558,7 +1559,7 @@ func TestInferenceServiceWithExplainer(t *testing.T) {
updateDefault.Status.LatestCreatedRevisionName = "e-revision-v1"
updateDefault.Status.LatestReadyRevisionName = "e-revision-v1"
updateDefault.Status.URL, _ = apis.ParseURL("http://e-revision-v1.myns.myingress.com")
updateDefault.Status.Conditions = duckv1beta1.Conditions{
updateDefault.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand All @@ -1571,7 +1572,7 @@ func TestInferenceServiceWithExplainer(t *testing.T) {
updateCanary.Status.LatestCreatedRevisionName = "e-revision-v2"
updateCanary.Status.LatestReadyRevisionName = "e-revision-v2"
updateCanary.Status.URL, _ = apis.ParseURL("http://e-revision-v2.myns.myingress.com")
updateCanary.Status.Conditions = duckv1beta1.Conditions{
updateCanary.Status.Conditions = duckv1.Conditions{
{
Type: knservingv1alpha1.ServiceConditionReady,
Status: "True",
Expand Down

0 comments on commit e7f466c

Please sign in to comment.