DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #539 from aledbf/migrate-client-go

Browse source 
Migrate to client-go
This commit is contained in:
Nick Sardo 2017-04-05 13:50:22 -07:00 • committed by GitHub
commit 12a0373d2e
2054 changed files with 414791 additions and 223145 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/pkg/ingress/annotations/authreq/main.go
View file

@ -21,7 +21,7 @@ import (
"regexp"
"strings"
"k8s.io/kubernetes/pkg/apis/extensions"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
"k8s.io/ingress/core/pkg/ingress/annotations/parser"
ing_errors "k8s.io/ingress/core/pkg/ingress/errors"

10
core/pkg/ingress/annotations/authreq/main_test.go
View file

@ -21,9 +21,11 @@ import (
"reflect"
"testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/util/intstr"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
"k8s.io/apimachinery/pkg/util/intstr"
)
func buildIngress() *extensions.Ingress {
@ -33,7 +35,7 @@ func buildIngress() *extensions.Ingress {
}
return &extensions.Ingress{
ObjectMeta: api.ObjectMeta{
ObjectMeta: meta_v1.ObjectMeta{
Name: "foo",
Namespace: api.NamespaceDefault,
},