Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
k8s-ingress
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
uplex-varnish
k8s-ingress
Commits
538e6507
Commit
538e6507
authored
Apr 11, 2024
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unclutter the controller log a bit.
parent
52e64fda
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
10 deletions
+24
-10
ingress.go
pkg/controller/ingress.go
+24
-10
No files found.
pkg/controller/ingress.go
View file @
538e6507
...
...
@@ -35,6 +35,7 @@ import (
"encoding/base64"
"fmt"
"strconv"
"strings"
vcr_v1alpha1
"code.uplex.de/uplex-varnish/k8s-ingress/pkg/apis/varnishingress/v1alpha1"
"code.uplex.de/uplex-varnish/k8s-ingress/pkg/haproxy"
...
...
@@ -1010,6 +1011,19 @@ func (worker *NamespaceWorker) ings2OffloaderSpec(
return
offldrSpec
,
nil
}
func
ingsArrayString
(
ings
[]
*
net_v1
.
Ingress
)
string
{
var
s
strings
.
Builder
s
.
WriteRune
(
'['
)
for
_
,
ing
:=
range
ings
{
s
.
WriteRune
(
' '
)
s
.
WriteString
(
ing
.
Namespace
)
s
.
WriteRune
(
'/'
)
s
.
WriteString
(
ing
.
Name
)
}
s
.
WriteString
(
" ]"
)
return
s
.
String
()
}
// Update the status.loadBalancer field of each suuccessfully synced
// Ingress, using network addresses of the Services that expose the
// http and https ports.
...
...
@@ -1021,24 +1035,24 @@ func (worker *NamespaceWorker) updateIngStatus(
if
errors
.
IsNotFound
(
err
)
{
worker
.
log
.
Warnf
(
"No Service found in namespace %s "
+
"with label %s=%s, will not update "
+
"status.loadBalancer for Ingress(es): %
v
"
,
"status.loadBalancer for Ingress(es): %
s
"
,
worker
.
namespace
,
vikingPubSvcKey
,
vikingPubSvcVal
,
ings
)
vikingPubSvcVal
,
ings
ArrayString
(
ings
)
)
return
update
.
MakeSuccess
(
""
)
}
return
update
.
MakeFatal
(
"Error searching for Services with label %s=%s in "
+
"namespace %s, cannot update "
+
"status.loadBalancer for Ingress(es) %
v
: %v"
,
"status.loadBalancer for Ingress(es) %
s
: %v"
,
vikingPubSvcKey
,
vikingPubSvcVal
,
worker
.
namespace
,
ings
,
err
)
ings
ArrayString
(
ings
)
,
err
)
}
if
len
(
svcs
)
==
0
{
worker
.
log
.
Warnf
(
"No Service found in namespace %s "
+
"with label %s=%s, will not update "
+
"status.loadBalancer for Ingress(es): %
v
"
,
"status.loadBalancer for Ingress(es): %
s
"
,
worker
.
namespace
,
vikingPubSvcKey
,
vikingPubSvcVal
,
ings
)
ings
ArrayString
(
ings
)
)
return
update
.
MakeSuccess
(
""
)
}
...
...
@@ -1079,17 +1093,17 @@ func (worker *NamespaceWorker) updateIngStatus(
default
:
worker
.
log
.
Warnf
(
"Service %s/%s has label %s=%s but "
+
"type %s, not adding to status.loadBalancer "
+
"for Ingress(es): %
v
"
,
svc
.
Namespace
,
svc
.
Name
,
"for Ingress(es): %
s
"
,
svc
.
Namespace
,
svc
.
Name
,
vikingPubSvcKey
,
vikingPubSvcVal
,
svc
.
Spec
.
Type
,
ings
)
ings
ArrayString
(
ings
)
)
}
}
if
len
(
ips
)
+
len
(
hosts
)
==
0
{
worker
.
log
.
Warnf
(
"No public addresses found for Services in "
+
"namespace %s with label %s=%s, will not update "
+
"status.loadBalancer for Ingress(es): %
v
"
,
"status.loadBalancer for Ingress(es): %
s
"
,
worker
.
namespace
,
vikingPubSvcKey
,
vikingPubSvcVal
,
ings
)
ings
ArrayString
(
ings
)
)
return
update
.
MakeSuccess
(
""
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment