admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade ingress api version to networking.k8s.io/v1

Browse Source 
Signed-off-by: wenhuwang <976400757@qq.com>
This commit is contained in:
wenhuwang
2021-08-19 15:36:04 +08:00
parent 1ad5a07a58
commit adfd3d7aaf
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/models/resources/v1alpha3/ingress/ingresses.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package ingress
import (
"k8s.io/api/extensions/v1beta1"
v1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/informers"
@@ -35,12 +35,12 @@ func New(sharedInformers informers.SharedInformerFactory) v1alpha3.Interface {
}
func (g *ingressGetter) Get(namespace, name string) (runtime.Object, error) {
return g.sharedInformers.Extensions().V1beta1().Ingresses().Lister().Ingresses(namespace).Get(name)
return g.sharedInformers.Networking().V1().Ingresses().Lister().Ingresses(namespace).Get(name)
}
func (g *ingressGetter) List(namespace string, query *query.Query) (*api.ListResult, error) {
// first retrieves all deployments within given namespace
ingresses, err := g.sharedInformers.Extensions().V1beta1().Ingresses().Lister().Ingresses(namespace).List(query.Selector())
ingresses, err := g.sharedInformers.Networking().V1().Ingresses().Lister().Ingresses(namespace).List(query.Selector())
if err != nil {
return nil, err
}
@@ -55,12 +55,12 @@ func (g *ingressGetter) List(namespace string, query *query.Query) (*api.ListRes
func (g *ingressGetter) compare(left runtime.Object, right runtime.Object, field query.Field) bool {
leftIngress, ok := left.(*v1beta1.Ingress)
leftIngress, ok := left.(*v1.Ingress)
if !ok {
return false
}
rightIngress, ok := right.(*v1beta1.Ingress)
rightIngress, ok := right.(*v1.Ingress)
if !ok {
return false
}
@@ -74,7 +74,7 @@ func (g *ingressGetter) compare(left runtime.Object, right runtime.Object, field
}
func (g *ingressGetter) filter(object runtime.Object, filter query.Filter) bool {
deployment, ok := object.(*v1beta1.Ingress)
deployment, ok := object.(*v1.Ingress)
if !ok {
return false
}

10
pkg/models/resources/v1alpha3/ingress/ingresses_test.go
View File

@@ -20,7 +20,7 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"k8s.io/api/extensions/v1beta1"
v1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake"
@@ -81,20 +81,20 @@ func TestListIngresses(t *testing.T) {
}
var (
foo1 = &v1beta1.Ingress{
foo1 = &v1.Ingress{
ObjectMeta: metav1.ObjectMeta{
Name: "foo1",
Namespace: "bar",
},
}
foo2 = &v1beta1.Ingress{
foo2 = &v1.Ingress{
ObjectMeta: metav1.ObjectMeta{
Name: "foo2",
Namespace: "bar",
},
}
bar1 = &v1beta1.Ingress{
bar1 = &v1.Ingress{
ObjectMeta: metav1.ObjectMeta{
Name: "bar1",
Namespace: "bar",
@@ -109,7 +109,7 @@ func prepare() v1alpha3.Interface {
informer := informers.NewSharedInformerFactory(client, 0)
for _, ingress := range ingresses {
informer.Extensions().V1beta1().Ingresses().Informer().GetIndexer().Add(ingress)
informer.Networking().V1().Ingresses().Informer().GetIndexer().Add(ingress)
}
return New(informer)