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

Merge pull request #4164 from wenhuwang/upgrade_ingress_apigroup

Browse Source 
Upgrade ingress api version to networking.k8s.io/v1
This commit is contained in:
KubeSphere CI Bot
2021-08-23 12:59:51 +08:00
committed by GitHub
parent ddc645838d adfd3d7aaf
commit c740fef5b4
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/types.go
View File

@@ -106,7 +106,7 @@ var SupportedGroupVersionResources = map[ClientType][]schema.GroupVersionResourc
{Group: "batch", Version: "v1", Resource: "jobs"},
{Group: "batch", Version: "v1beta1", Resource: "cronjobs"},
{Group: "extensions", Version: "v1beta1", Resource: "ingresses"},
{Group: "networking.k8s.io", Version: "v1", Resource: "ingresses"},
{Group: "autoscaling", Version: "v2beta2", Resource: "horizontalpodautoscalers"},
},

2
pkg/apiserver/apiserver.go
View File

@@ -405,7 +405,7 @@ func (s *APIServer) waitForResourceSync(ctx context.Context) error {
{Group: "storage.k8s.io", Version: "v1", Resource: "storageclasses"},
{Group: "batch", Version: "v1", Resource: "jobs"},
{Group: "batch", Version: "v1beta1", Resource: "cronjobs"},
{Group: "extensions", Version: "v1beta1", Resource: "ingresses"},
{Group: "networking.k8s.io", Version: "v1", Resource: "ingresses"},
{Group: "autoscaling", Version: "v2beta2", Resource: "horizontalpodautoscalers"},
{Group: "networking.k8s.io", Version: "v1", Resource: "networkpolicies"},
}

2
pkg/models/quotas/quotas.go
View File

@@ -47,7 +47,7 @@ var supportedResources = map[string]schema.GroupVersionResource{
podsKey: {Group: "", Version: "v1", Resource: "pods"},
servicesKey: {Group: "", Version: "v1", Resource: "services"},
persistentvolumeclaimsKey: {Group: "", Version: "v1", Resource: "persistentvolumeclaims"},
ingressKey: {Group: "extensions", Version: "v1beta1", Resource: "ingresses"},
ingressKey: {Group: "networking.k8s.io", Version: "v1", Resource: "ingresses"},
jobsKey: {Group: "batch", Version: "v1", Resource: "jobs"},
cronJobsKey: {Group: "batch", Version: "v1beta1", Resource: "cronjobs"},
s2iBuilders: {Group: "devops.kubesphere.io", Version: "v1alpha1", Resource: "s2ibuilders"},

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

@@ -19,7 +19,7 @@ package ingress
import (
"sort"
"k8s.io/api/extensions/v1beta1"
v1 "k8s.io/api/networking/v1"
"k8s.io/client-go/informers"
"kubesphere.io/kubesphere/pkg/models/resources/v1alpha2"
@@ -37,10 +37,10 @@ func NewIngressSearcher(informers informers.SharedInformerFactory) v1alpha2.Inte
}
func (s *ingressSearcher) Get(namespace, name string) (interface{}, error) {
return s.informers.Extensions().V1beta1().Ingresses().Lister().Ingresses(namespace).Get(name)
return s.informers.Networking().V1().Ingresses().Lister().Ingresses(namespace).Get(name)
}
func (*ingressSearcher) match(match map[string]string, item *v1beta1.Ingress) bool {
func (*ingressSearcher) match(match map[string]string, item *v1.Ingress) bool {
for k, v := range match {
if !v1alpha2.ObjectMetaExactlyMath(k, v, item.ObjectMeta) {
return false
@@ -49,7 +49,7 @@ func (*ingressSearcher) match(match map[string]string, item *v1beta1.Ingress) bo
return true
}
func (*ingressSearcher) fuzzy(fuzzy map[string]string, item *v1beta1.Ingress) bool {
func (*ingressSearcher) fuzzy(fuzzy map[string]string, item *v1.Ingress) bool {
for k, v := range fuzzy {
if !v1alpha2.ObjectMetaFuzzyMath(k, v, item.ObjectMeta) {
return false
@@ -59,13 +59,13 @@ func (*ingressSearcher) fuzzy(fuzzy map[string]string, item *v1beta1.Ingress) bo
}
func (s *ingressSearcher) Search(namespace string, conditions *params.Conditions, orderBy string, reverse bool) ([]interface{}, error) {
ingresses, err := s.informers.Extensions().V1beta1().Ingresses().Lister().Ingresses(namespace).List(labels.Everything())
ingresses, err := s.informers.Networking().V1().Ingresses().Lister().Ingresses(namespace).List(labels.Everything())
if err != nil {
return nil, err
}
result := make([]*v1beta1.Ingress, 0)
result := make([]*v1.Ingress, 0)
if len(conditions.Match) == 0 && len(conditions.Fuzzy) == 0 {
result = ingresses

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)

2
pkg/models/resources/v1alpha3/resource/resource.go
View File

@@ -108,7 +108,7 @@ func NewResourceGetter(factory informers.InformerFactory, cache cache.Cache) *Re
namespacedResourceGetters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"}] = pod.New(factory.KubernetesSharedInformerFactory())
namespacedResourceGetters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "nodes"}] = node.New(factory.KubernetesSharedInformerFactory())
namespacedResourceGetters[schema.GroupVersionResource{Group: "", Version: "v1", Resource: "serviceaccounts"}] = serviceaccount.New(factory.KubernetesSharedInformerFactory())
namespacedResourceGetters[schema.GroupVersionResource{Group: "extensions", Version: "v1beta1", Resource: "ingresses"}] = ingress.New(factory.KubernetesSharedInformerFactory())
namespacedResourceGetters[schema.GroupVersionResource{Group: "networking.k8s.io", Version: "v1", Resource: "ingresses"}] = ingress.New(factory.KubernetesSharedInformerFactory())
namespacedResourceGetters[schema.GroupVersionResource{Group: "networking.k8s.io", Version: "v1", Resource: "networkpolicies"}] = networkpolicy.New(factory.KubernetesSharedInformerFactory())
namespacedResourceGetters[schema.GroupVersionResource{Group: "batch", Version: "v1", Resource: "jobs"}] = job.New(factory.KubernetesSharedInformerFactory())
namespacedResourceGetters[schema.GroupVersionResource{Group: "app.k8s.io", Version: "v1beta1", Resource: "applications"}] = application.New(cache)

4
staging/src/kubesphere.io/api/types/v1beta1/federatedingress_types.go
View File

@@ -17,7 +17,7 @@ limitations under the License.
package v1beta1
import (
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@@ -45,7 +45,7 @@ type FederatedIngressSpec struct {
}
type IngressTemplate struct {
Spec extensionsv1beta1.IngressSpec `json:"spec,omitempty"`
Spec networkingv1.IngressSpec `json:"spec,omitempty"`
}
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object