Skip to content

Commit 08494ac

Browse files
Inbaraj-SInbaraj-S
authored
OKE-27716: Duplicate LB Bug
- Added additional checks for lb exceptions
1 parent 36327ca commit 08494ac

File tree

10 files changed

+81
-29
lines changed

10 files changed

+81
-29
lines changed

‎deploy/manifests/oci-native-ingress-controller/templates/deployment.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ metadata:
1818
name: oci-native-ingress-controller
1919
namespace: native-ingress-controller-system
2020
labels:
21-
helm.sh/chart: oci-native-ingress-controller-1.0.0
21+
helm.sh/chart: oci-native-ingress-controller-1.2.0
2222
app.kubernetes.io/name: oci-native-ingress-controller
2323
app.kubernetes.io/instance: oci-native-ingress-controller
24-
app.kubernetes.io/version: "1.0.0"
24+
app.kubernetes.io/version: "1.2.0"
2525
app.kubernetes.io/managed-by: Helm
2626
spec:
2727
replicas: 1
@@ -51,7 +51,7 @@ spec:
5151
readOnlyRootFilesystem: true
5252
runAsNonRoot: true
5353
runAsUser: 1000
54-
image: "ghcr.io/oracle/oci-native-ingress-controller:v1.0.0"
54+
image: "ghcr.io/oracle/oci-native-ingress-controller:v1.2.0"
5555
imagePullPolicy: Always
5656
args:
5757
- --lease-lock-name=oci-native-ingress-controller

‎deploy/manifests/oci-native-ingress-controller/templates/rbac.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ kind: ClusterRole
1111
metadata:
1212
name: oci-native-ingress-controller-role
1313
labels:
14-
helm.sh/chart: oci-native-ingress-controller-1.0.0
14+
helm.sh/chart: oci-native-ingress-controller-1.2.0
1515
app.kubernetes.io/name: oci-native-ingress-controller
1616
app.kubernetes.io/instance: oci-native-ingress-controller
17-
app.kubernetes.io/version: "1.0.0"
17+
app.kubernetes.io/version: "1.2.0"
1818
app.kubernetes.io/managed-by: Helm
1919
rules:
2020
- apiGroups: [""]
@@ -48,10 +48,10 @@ kind: ClusterRoleBinding
4848
metadata:
4949
name: oci-native-ingress-controller-rolebinding
5050
labels:
51-
helm.sh/chart: oci-native-ingress-controller-1.0.0
51+
helm.sh/chart: oci-native-ingress-controller-1.2.0
5252
app.kubernetes.io/name: oci-native-ingress-controller
5353
app.kubernetes.io/instance: oci-native-ingress-controller
54-
app.kubernetes.io/version: "1.0.0"
54+
app.kubernetes.io/version: "1.2.0"
5555
app.kubernetes.io/managed-by: Helm
5656
roleRef:
5757
apiGroup: rbac.authorization.k8s.io
@@ -69,10 +69,10 @@ metadata:
6969
name: oci-native-ingress-controller-leader-election-role
7070
namespace: native-ingress-controller-system
7171
labels:
72-
helm.sh/chart: oci-native-ingress-controller-1.0.0
72+
helm.sh/chart: oci-native-ingress-controller-1.2.0
7373
app.kubernetes.io/name: oci-native-ingress-controller
7474
app.kubernetes.io/instance: oci-native-ingress-controller
75-
app.kubernetes.io/version: "1.0.0"
75+
app.kubernetes.io/version: "1.2.0"
7676
app.kubernetes.io/managed-by: Helm
7777
rules:
7878
- apiGroups: ["coordination.k8s.io"]
@@ -90,10 +90,10 @@ metadata:
9090
name: oci-native-ingress-controller-leader-election-rolebinding
9191
namespace: native-ingress-controller-system
9292
labels:
93-
helm.sh/chart: oci-native-ingress-controller-1.0.0
93+
helm.sh/chart: oci-native-ingress-controller-1.2.0
9494
app.kubernetes.io/name: oci-native-ingress-controller
9595
app.kubernetes.io/instance: oci-native-ingress-controller
96-
app.kubernetes.io/version: "1.0.0"
96+
app.kubernetes.io/version: "1.2.0"
9797
app.kubernetes.io/managed-by: Helm
9898
roleRef:
9999
apiGroup: rbac.authorization.k8s.io

‎deploy/manifests/oci-native-ingress-controller/templates/service.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ metadata:
1212
name: oci-native-ingress-controller
1313
namespace: native-ingress-controller-system
1414
labels:
15-
helm.sh/chart: oci-native-ingress-controller-1.0.0
15+
helm.sh/chart: oci-native-ingress-controller-1.2.0
1616
app.kubernetes.io/name: oci-native-ingress-controller
1717
app.kubernetes.io/instance: oci-native-ingress-controller
18-
app.kubernetes.io/version: "1.0.0"
18+
app.kubernetes.io/version: "1.2.0"
1919
app.kubernetes.io/managed-by: Helm
2020
spec:
2121
type: ClusterIP

‎deploy/manifests/oci-native-ingress-controller/templates/serviceaccount.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ metadata:
1212
name: oci-native-ingress-controller
1313
namespace: native-ingress-controller-system
1414
labels:
15-
helm.sh/chart: oci-native-ingress-controller-1.0.0
15+
helm.sh/chart: oci-native-ingress-controller-1.2.0
1616
app.kubernetes.io/name: oci-native-ingress-controller
1717
app.kubernetes.io/instance: oci-native-ingress-controller
18-
app.kubernetes.io/version: "1.0.0"
18+
app.kubernetes.io/version: "1.2.0"
1919
app.kubernetes.io/managed-by: Helm

‎deploy/manifests/oci-native-ingress-controller/templates/webhook.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ kind: MutatingWebhookConfiguration
3636
metadata:
3737
name: oci-native-ingress-controller-webhook
3838
labels:
39-
helm.sh/chart: oci-native-ingress-controller-1.0.0
39+
helm.sh/chart: oci-native-ingress-controller-1.2.0
4040
app.kubernetes.io/name: oci-native-ingress-controller
4141
app.kubernetes.io/instance: oci-native-ingress-controller
42-
app.kubernetes.io/version: "1.0.0"
42+
app.kubernetes.io/version: "1.2.0"
4343
app.kubernetes.io/managed-by: Helm
4444
annotations:
4545
cert-manager.io/inject-ca-from: native-ingress-controller-system/oci-native-ingress-controller-webhook-serving-cert

‎helm/oci-native-ingress-controller/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ apiVersion: v2
88
name: oci-native-ingress-controller
99
description: OCI Native Ingress Controller
1010
type: application
11-
version: 1.0.0
12-
appVersion: "1.0.0"
11+
version: 1.2.0
12+
appVersion: "1.2.0"
1313

1414
maintainers:
1515
- name: OKE Foundations team

‎helm/oci-native-ingress-controller/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ image:
2121
repository: ghcr.io/oracle/oci-native-ingress-controller
2222
pullPolicy: Always
2323
# Overrides the image tag whose default is the chart appVersion.
24-
tag: "v1.0.0"
24+
tag: "v1.2.0"
2525

2626
imagePullSecrets: []
2727
nameOverride: ""

‎pkg/controllers/ingressclass/ingressclass.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"time"
1717

1818
"github.com/oracle/oci-native-ingress-controller/pkg/client"
19-
"github.com/oracle/oci-native-ingress-controller/pkg/exception"
2019
"k8s.io/klog/v2"
2120

2221
ctrcache "sigs.k8s.io/controller-runtime/pkg/cache"
@@ -196,22 +195,28 @@ func (c *Controller) sync(key string) error {
196195
func (c *Controller) getLoadBalancer(ic *networkingv1.IngressClass) (*ociloadbalancer.LoadBalancer, error) {
197196
lbID := util.GetIngressClassLoadBalancerId(ic)
198197
if lbID == "" {
199-
return nil, &exception.NotFoundServiceError{}
198+
klog.Errorf("LB id not set for ingressClass: %s", ic.Name)
199+
return nil, nil // LoadBalancer ID not set, Trigger new LB creation
200200
}
201201

202202
lb, _, err := c.client.GetLbClient().GetLoadBalancer(context.TODO(), lbID)
203203
if err != nil {
204+
klog.Errorf("Error while fetching LB %s for ingressClass: %s, err: %s", lbID, ic.Name, err.Error())
205+
206+
// Check if Service error 404, then ignore it since LB is not found.
207+
svcErr, ok := common.IsServiceError(err)
208+
if ok && svcErr.GetHTTPStatusCode() == 404 {
209+
return nil, nil // Redirect new LB creation
210+
}
204211
return nil, err
205212
}
206-
207213
return lb, nil
208214
}
209215

210216
func (c *Controller) ensureLoadBalancer(ic *networkingv1.IngressClass) error {
211217

212218
lb, err := c.getLoadBalancer(ic)
213-
svcErr, ok := common.IsServiceError(err)
214-
if err != nil && (ok && svcErr.GetHTTPStatusCode() != 404) {
219+
if err != nil {
215220
return err
216221
}
217222

‎pkg/controllers/ingressclass/ingressclass_test.go‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
. "github.com/onsi/gomega"
1010
"github.com/oracle/oci-go-sdk/v65/common"
1111
ociloadbalancer "github.com/oracle/oci-go-sdk/v65/loadbalancer"
12+
"github.com/oracle/oci-native-ingress-controller/pkg/exception"
1213

1314
"github.com/oracle/oci-go-sdk/v65/waf"
1415
"github.com/oracle/oci-native-ingress-controller/pkg/client"
@@ -38,6 +39,42 @@ func TestEnsureLoadBalancer(t *testing.T) {
3839
Expect(err).Should(BeNil())
3940
}
4041

42+
func TestEnsureLoadBalancerWithLbIdSet(t *testing.T) {
43+
RegisterTestingT(t)
44+
ctx := context.TODO()
45+
46+
ingressClassList := util.GetIngressClassListWithLBSet("id")
47+
c := inits(ctx, ingressClassList)
48+
49+
err := c.ensureLoadBalancer(&ingressClassList.Items[0])
50+
Expect(err).Should(BeNil())
51+
}
52+
53+
func TestEnsureLoadBalancerWithNotFound(t *testing.T) {
54+
RegisterTestingT(t)
55+
ctx := context.TODO()
56+
57+
ingressClassList := util.GetIngressClassListWithLBSet("notfound")
58+
c := inits(ctx, ingressClassList)
59+
60+
ic := &ingressClassList.Items[0]
61+
err := c.ensureLoadBalancer(ic)
62+
Expect(err).Should(BeNil())
63+
64+
}
65+
66+
func TestEnsureLoadBalancerWithNetworkError(t *testing.T) {
67+
RegisterTestingT(t)
68+
ctx := context.TODO()
69+
70+
ingressClassList := util.GetIngressClassListWithLBSet("networkerror")
71+
c := inits(ctx, ingressClassList)
72+
73+
err := c.ensureLoadBalancer(&ingressClassList.Items[0])
74+
Expect(err).Should(Not(BeNil()))
75+
Expect(err.Error()).Should(Equal("Failure due to network error"))
76+
}
77+
4178
func TestIngressClassAdd(t *testing.T) {
4279
RegisterTestingT(t)
4380
ctx, cancel := context.WithCancel(context.Background())
@@ -245,10 +282,24 @@ type MockLoadBalancerClient struct {
245282
}
246283

247284
func (m MockLoadBalancerClient) GetLoadBalancer(ctx context.Context, request ociloadbalancer.GetLoadBalancerRequest) (ociloadbalancer.GetLoadBalancerResponse, error) {
285+
if *request.LoadBalancerId == "networkerror" {
286+
return ociloadbalancer.GetLoadBalancerResponse{}, NetworkError{}
287+
}
288+
if *request.LoadBalancerId == "notfound" {
289+
return ociloadbalancer.GetLoadBalancerResponse{}, &exception.NotFoundServiceError{}
290+
}
291+
248292
res := util.SampleLoadBalancerResponse()
249293
return res, nil
250294
}
251295

296+
type NetworkError struct {
297+
}
298+
299+
func (n NetworkError) Error() string {
300+
return "Failure due to network error"
301+
}
302+
252303
func (m MockLoadBalancerClient) UpdateLoadBalancer(ctx context.Context, request ociloadbalancer.UpdateLoadBalancerRequest) (response ociloadbalancer.UpdateLoadBalancerResponse, err error) {
253304
return ociloadbalancer.UpdateLoadBalancerResponse{
254305
RawResponse: nil,

‎pkg/controllers/routingpolicy/util.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
networkingv1 "k8s.io/api/networking/v1"
1818
"k8s.io/apimachinery/pkg/util/sets"
1919
corelisters "k8s.io/client-go/listers/core/v1"
20-
"k8s.io/klog/v2"
2120
)
2221

2322
type listenerPath struct {
@@ -93,8 +92,5 @@ func processRoutingPolicy(ingresses []*networkingv1.Ingress, serviceLister corel
9392
}
9493
}
9594
}
96-
if len(listenerPaths) > 0 {
97-
klog.Infof("Listener paths for routing policy: %s", util.PrettyPrint(listenerPaths))
98-
}
9995
return nil
10096
}

0 commit comments

Comments
 (0)