Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Networking/v1 as default group version in ingress manager #2175

Merged
merged 2 commits into from
Jul 13, 2023
Merged

Use Networking/v1 as default group version in ingress manager #2175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
488fbac
Make Networking/v1 as default group version for ingress
PrasadG193 Jul 13, 2023
290d06f
Merge branch 'master' into ing-manager-refactor
mergify[bot] Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 0 additions & 109 deletions pkg/kube/ingress/ingress_extbeta.go
View file
Open in desktop

This file was deleted.

109 changes: 0 additions & 109 deletions pkg/kube/ingress/ingress_netbeta.go
View file
Open in desktop

This file was deleted.

37 changes: 2 additions & 35 deletions pkg/kube/ingress/ingressmgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,10 @@ package ingress
import (
"context"

"github.com/pkg/errors"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
netv1 "k8s.io/api/networking/v1"
netv1beta1 "k8s.io/api/networking/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes"

"github.com/kanisterio/kanister/pkg/kube"
)

const (
Expand All @@ -52,34 +46,7 @@ type Manager interface {
Update(ctx context.Context, ingress *unstructured.Unstructured, opts metav1.UpdateOptions) (runtime.Object, error)
}

// NewManager can be used to get the Manager based on the APIVersion of the ingress resources on the cluster
// so that, respecitve methods from that APIVersion can be called
// NewManager can be used to get the ingress resource manager
func NewManager(ctx context.Context, kubeCli kubernetes.Interface) (Manager, error) {
exists, err := kube.IsResAvailableInGroupVersion(ctx, kubeCli.Discovery(), netv1.GroupName, netv1.SchemeGroupVersion.Version, ingressRes)
if err != nil {
return nil, errors.Errorf("Failed to call discovery APIs: %v", err)
}
if exists {
return NewNetworkingV1(kubeCli), nil
}

exists, err = kube.IsResAvailableInGroupVersion(ctx, kubeCli.Discovery(), extensionsv1beta1.GroupName, extensionsv1beta1.SchemeGroupVersion.Version, ingressRes)
if err != nil {
return nil, errors.Errorf("Failed to call discovery APIs: %v", err)
}
if exists {
return NewExtensionsV1beta1(kubeCli), nil
}

exists, err = kube.IsResAvailableInGroupVersion(ctx, kubeCli.Discovery(), netv1beta1.GroupName, netv1beta1.SchemeGroupVersion.Version, ingressRes)
if err != nil {
return nil, errors.Errorf("Failed to call discovery APIs: %v", err)
}
if exists {
return NewNetworkingV1beta1(kubeCli), nil
}

// We were not able to figure out which groupVersion, resource is available in.
// Most probably its because fake CLI was used, fallback to extensions/v1beta1
return NewExtensionsV1beta1(kubeCli), nil
return NewNetworkingV1(kubeCli), nil
}