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
980c8c49
Commit
980c8c49
authored
May 05, 2020
by
Geoff Simmons
Committed by
Tim Leers
Jul 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't check the dataplane reload state if none has ever been initiated.
parent
fbe16d57
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
haproxy.go
pkg/haproxy/haproxy.go
+7
-1
No files found.
pkg/haproxy/haproxy.go
View file @
980c8c49
...
@@ -200,6 +200,12 @@ func (hc *Controller) updateLoadStatus(inst *haproxyInst) error {
...
@@ -200,6 +200,12 @@ func (hc *Controller) updateLoadStatus(inst *haproxyInst) error {
// XXX initiate load
// XXX initiate load
}
}
if
inst
.
status
.
dplaneState
.
ID
==
""
{
hc
.
log
.
Infof
(
"Offloader instance %s: no known TLS config "
+
"reload state"
,
inst
.
name
)
return
nil
}
hc
.
log
.
Debugf
(
"Offloader instance %s: checking reload state: %s"
,
hc
.
log
.
Debugf
(
"Offloader instance %s: checking reload state: %s"
,
inst
.
name
,
inst
.
status
.
dplaneState
.
ID
)
inst
.
name
,
inst
.
status
.
dplaneState
.
ID
)
reloaded
,
state
,
err
:=
inst
.
dplane
.
Reloaded
(
inst
.
status
.
dplaneState
.
ID
)
reloaded
,
state
,
err
:=
inst
.
dplane
.
Reloaded
(
inst
.
status
.
dplaneState
.
ID
)
...
@@ -311,6 +317,7 @@ func (hc *Controller) updateInstance(inst *haproxyInst, spec *Spec) error {
...
@@ -311,6 +317,7 @@ func (hc *Controller) updateInstance(inst *haproxyInst, spec *Spec) error {
return
fmt
.
Errorf
(
"Offloader instance %s: TLS config %s load "
+
return
fmt
.
Errorf
(
"Offloader instance %s: TLS config %s load "
+
"failed or status unknown: %v"
,
inst
.
name
,
spec
,
state
)
"failed or status unknown: %v"
,
inst
.
name
,
spec
,
state
)
case
InProgress
:
case
InProgress
:
inst
.
status
.
dplaneState
=
state
hc
.
log
.
Debugf
(
"Offloader instance %s: checking reload state: "
+
hc
.
log
.
Debugf
(
"Offloader instance %s: checking reload state: "
+
"%s"
,
inst
.
name
,
inst
.
status
.
dplaneState
.
ID
)
"%s"
,
inst
.
name
,
inst
.
status
.
dplaneState
.
ID
)
reloaded
,
state
,
err
:=
inst
.
dplane
.
Reloaded
(
reloaded
,
state
,
err
:=
inst
.
dplane
.
Reloaded
(
...
@@ -431,7 +438,6 @@ func (hc *Controller) removeOffldrInstances(
...
@@ -431,7 +438,6 @@ func (hc *Controller) removeOffldrInstances(
switch
state
.
Status
{
switch
state
.
Status
{
case
Succeeded
:
case
Succeeded
:
inst
.
status
.
dplaneState
=
state
hc
.
log
.
Infof
(
"Offloader instance %s: TLS config "
+
hc
.
log
.
Infof
(
"Offloader instance %s: TLS config "
+
"sucessfully deleted at %s"
,
inst
.
name
,
"sucessfully deleted at %s"
,
inst
.
name
,
state
.
Timestamp
.
Format
(
time
.
RFC3339
))
state
.
Timestamp
.
Format
(
time
.
RFC3339
))
...
...
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