Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
drupal
paas
drupalSite-operator
Commits
e04d6e0d
Commit
e04d6e0d
authored
Nov 28, 2021
by
Konstantinos Samaras-Tsakiris
Browse files
Apply 3 suggestion(s) to 1 file(s)
parent
f36361c8
Pipeline
#3294179
failed with stages
in 6 minutes and 25 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
controllers/drupalsite_controller.go
View file @
e04d6e0d
...
...
@@ -273,7 +273,7 @@ func (r *DrupalSiteReconciler) Reconcile(ctx context.Context, req ctrl.Request)
installed
,
err
:=
r
.
isDrupalSiteInstalled
(
ctx
,
drupalSite
)
if
err
!=
nil
{
// Initialized? Unknown
update
=
setConditionStatus
(
drupalSite
,
"Initialized"
,
fals
e
,
err
,
true
)
||
update
update
=
setConditionStatus
(
drupalSite
,
"Initialized"
,
tru
e
,
err
,
true
)
||
update
}
else
if
installed
{
update
=
setInitialized
(
drupalSite
)
||
update
}
else
{
...
...
@@ -463,7 +463,7 @@ func (r *DrupalSiteReconciler) isDrupalSiteInstalled(ctx context.Context, d *web
_
,
stderr
,
err
:=
r
.
execToServerPod
(
ctx
,
d
,
"php-fpm"
,
nil
,
checkIfSiteIsInstalled
()
...
)
// Error running exec => condition unknown
if
err
!=
nil
{
return
fals
e
,
newApplicationError
(
err
,
ErrClientK8s
)
return
tru
e
,
newApplicationError
(
err
,
ErrClientK8s
)
}
// The script executed and returned this error message
// TODO: check error code instead of message!
...
...
@@ -472,7 +472,7 @@ func (r *DrupalSiteReconciler) isDrupalSiteInstalled(ctx context.Context, d *web
}
return
true
,
nil
}
return
false
,
nil
return
true
,
newApplicationError
(
fmt
.
Errorf
(
"Can't check install status"
),
ErrTemporary
)
}
// isDBODProvisioned checks if the DBOD has been provisioned by checking the status of DBOD custom resource
...
...
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