Skip to content

Commit ae28b1e

Browse files
committed
Revert "feat: support ingress v1beta1"
This reverts commit 3c43392.
1 parent 3c43392 commit ae28b1e

File tree

6 files changed

+129
-388
lines changed

6 files changed

+129
-388
lines changed

internal/controller/indexer/indexer.go

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ func SetupIndexer(mgr ctrl.Manager) error {
6565
&gatewayv1.GatewayClass{}: setupGatewayClassIndexer,
6666
&v1alpha1.Consumer{}: setupConsumerIndexer,
6767
&networkingv1.Ingress{}: setupIngressIndexer,
68-
&networkingv1beta1.Ingress{}: setupIngressV1beta1Indexer,
6968
&networkingv1.IngressClass{}: setupIngressClassIndexer,
7069
&networkingv1beta1.IngressClass{}: setupIngressClassV1beta1Indexer,
7170
&v1alpha1.BackendTrafficPolicy{}: setupBackendTrafficPolicyIndexer,
@@ -413,37 +412,6 @@ func setupIngressIndexer(mgr ctrl.Manager) error {
413412
return nil
414413
}
415414

416-
func setupIngressV1beta1Indexer(mgr ctrl.Manager) error {
417-
if err := mgr.GetFieldIndexer().IndexField(
418-
context.Background(),
419-
&networkingv1beta1.Ingress{},
420-
IngressClassRef,
421-
IngressV1beta1ClassRefIndexFunc,
422-
); err != nil {
423-
return err
424-
}
425-
426-
if err := mgr.GetFieldIndexer().IndexField(
427-
context.Background(),
428-
&networkingv1beta1.Ingress{},
429-
ServiceIndexRef,
430-
IngressV1beta1ServiceIndexFunc,
431-
); err != nil {
432-
return err
433-
}
434-
435-
if err := mgr.GetFieldIndexer().IndexField(
436-
context.Background(),
437-
&networkingv1beta1.Ingress{},
438-
SecretIndexRef,
439-
IngressV1beta1SecretIndexFunc,
440-
); err != nil {
441-
return err
442-
}
443-
444-
return nil
445-
}
446-
447415
func setupBackendTrafficPolicyIndexer(mgr ctrl.Manager) error {
448416
if err := mgr.GetFieldIndexer().IndexField(
449417
context.Background(),
@@ -482,14 +450,6 @@ func IngressClassRefIndexFunc(rawObj client.Object) []string {
482450
return []string{*ingress.Spec.IngressClassName}
483451
}
484452

485-
func IngressV1beta1ClassRefIndexFunc(rawObj client.Object) []string {
486-
ingress := rawObj.(*networkingv1beta1.Ingress)
487-
if ingress.Spec.IngressClassName == nil {
488-
return nil
489-
}
490-
return []string{*ingress.Spec.IngressClassName}
491-
}
492-
493453
func IngressServiceIndexFunc(rawObj client.Object) []string {
494454
ingress := rawObj.(*networkingv1.Ingress)
495455
var services []string
@@ -510,26 +470,6 @@ func IngressServiceIndexFunc(rawObj client.Object) []string {
510470
return services
511471
}
512472

513-
func IngressV1beta1ServiceIndexFunc(rawObj client.Object) []string {
514-
ingress := rawObj.(*networkingv1beta1.Ingress)
515-
var services []string
516-
517-
for _, rule := range ingress.Spec.Rules {
518-
if rule.HTTP == nil {
519-
continue
520-
}
521-
522-
for _, path := range rule.HTTP.Paths {
523-
if path.Backend.ServiceName == "" {
524-
continue
525-
}
526-
key := GenIndexKey(ingress.Namespace, path.Backend.ServiceName)
527-
services = append(services, key)
528-
}
529-
}
530-
return services
531-
}
532-
533473
func IngressSecretIndexFunc(rawObj client.Object) []string {
534474
ingress := rawObj.(*networkingv1.Ingress)
535475
secrets := make([]string, 0)
@@ -545,21 +485,6 @@ func IngressSecretIndexFunc(rawObj client.Object) []string {
545485
return secrets
546486
}
547487

548-
func IngressV1beta1SecretIndexFunc(rawObj client.Object) []string {
549-
ingress := rawObj.(*networkingv1beta1.Ingress)
550-
secrets := make([]string, 0)
551-
552-
for _, tls := range ingress.Spec.TLS {
553-
if tls.SecretName == "" {
554-
continue
555-
}
556-
557-
key := GenIndexKey(ingress.Namespace, tls.SecretName)
558-
secrets = append(secrets, key)
559-
}
560-
return secrets
561-
}
562-
563488
func GatewaySecretIndexFunc(rawObj client.Object) (keys []string) {
564489
gateway := rawObj.(*gatewayv1.Gateway)
565490
var m = make(map[string]struct{})

0 commit comments

Comments
 (0)