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

Commit

Permalink
Migrate serving-operator to isito.io/client-go apis (#240)
Browse files Browse the repository at this point in the history
* Migrate to istio.io/client-go apis

* Update dependencies with ./hack/update-deps.sh
  • Loading branch information
Slavomir Kaslev authored and knative-prow-robot committed Dec 11, 2019
1 parent 7fb0acc commit 4a2430b
Show file tree
Hide file tree
Showing 401 changed files with 78,061 additions and 6,257 deletions.
87 changes: 60 additions & 27 deletions Gopkg.lock

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

8 changes: 8 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ required = [
name = "k8s.io/metrics"
version = "kubernetes-1.15.3"

[[constraint]]
name = "istio.io/api"
version = "1.4.1"

[[constraint]]
name = "istio.io/client-go"
version = "1.4.1"

[[constraint]]
name = "github.com/jcrossley3/manifestival"
branch = "client-go"
Expand Down
5 changes: 3 additions & 2 deletions pkg/reconciler/knativeserving/common/gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/kubernetes/scheme"

"knative.dev/pkg/apis/istio/v1alpha3"
istiov1alpha3 "istio.io/api/networking/v1alpha3"
"istio.io/client-go/pkg/apis/networking/v1alpha3"
servingv1alpha1 "knative.dev/serving-operator/pkg/apis/serving/v1alpha1"
)

Expand Down Expand Up @@ -132,7 +133,7 @@ func validateUnstructedGatewayChanged(t *testing.T, tt *updateGatewayTest, u *un

func makeUnstructuredGateway(t *testing.T, tt *updateGatewayTest) unstructured.Unstructured {
gateway := v1alpha3.Gateway{
Spec: v1alpha3.GatewaySpec{
Spec: istiov1alpha3.Gateway{
Selector: tt.in,
},
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/reconciler/reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/client-go/tools/record"

sharedclientset "knative.dev/pkg/client/clientset/versioned"
sharedclient "knative.dev/pkg/client/injection/client"
kubeclient "knative.dev/pkg/client/injection/kube/client"
istioclientset "knative.dev/pkg/client/istio/clientset/versioned"
istioclient "knative.dev/pkg/client/istio/injection/client"
"knative.dev/pkg/configmap"
"knative.dev/pkg/controller"
"knative.dev/pkg/injection/clients/dynamicclient"
Expand All @@ -46,8 +46,8 @@ type Base struct {
// KubeClientSet allows us to talk to the k8s for core APIs
KubeClientSet kubernetes.Interface

// SharedClientSet allows us to configure shared objects
SharedClientSet sharedclientset.Interface
// IstioClientSet allows us to configure Istio objects
IstioClientSet istioclientset.Interface

// ServingClientSet allows us to configure Serving objects
KnativeServingClientSet clientset.Interface
Expand Down Expand Up @@ -111,7 +111,7 @@ func NewBase(ctx context.Context, controllerAgentName string, cmw configmap.Watc

base := &Base{
KubeClientSet: kubeClient,
SharedClientSet: sharedclient.Get(ctx),
IstioClientSet: istioclient.Get(ctx),
KnativeServingClientSet: servingclient.Get(ctx),
DynamicClientSet: dynamicclient.Get(ctx),
ConfigMapWatcher: cmw,
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/reconciler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"context"
"testing"

_ "knative.dev/pkg/client/injection/client/fake"
_ "knative.dev/pkg/client/injection/kube/client/fake"
_ "knative.dev/pkg/client/istio/injection/client/fake"
_ "knative.dev/pkg/injection/clients/dynamicclient/fake"
_ "knative.dev/serving-operator/pkg/client/injection/client/fake"

Expand Down
Loading

0 comments on commit 4a2430b

Please sign in to comment.