Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
redis-operator
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
OT-CONTAINER-KIT
redis-operator
Commits
294da09f
Unverified
Commit
294da09f
authored
3 years ago
by
Mathieu Cesbron
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add RedisCluster finalizer (#205)
Signed-off-by:
Mathieu Cesbron
<
mathieu.cesbron@ecam-rennes.com
>
parent
19d7ecf3
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
controllers/rediscluster_controller.go
+8
-0
8 additions, 0 deletions
controllers/rediscluster_controller.go
k8sutils/finalizer.go
+77
-2
77 additions, 2 deletions
k8sutils/finalizer.go
with
85 additions
and
2 deletions
controllers/rediscluster_controller.go
+
8
−
0
View file @
294da09f
...
...
@@ -54,6 +54,14 @@ func (r *RedisClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
return
ctrl
.
Result
{},
err
}
if
err
:=
k8sutils
.
HandleRedisClusterFinalizer
(
instance
,
r
.
Client
);
err
!=
nil
{
return
ctrl
.
Result
{},
err
}
if
err
:=
k8sutils
.
AddRedisClusterFinalizer
(
instance
,
r
.
Client
);
err
!=
nil
{
return
ctrl
.
Result
{},
err
}
if
err
:=
controllerutil
.
SetControllerReference
(
instance
,
instance
,
r
.
Scheme
);
err
!=
nil
{
return
ctrl
.
Result
{},
err
}
...
...
This diff is collapsed.
Click to expand it.
k8sutils/finalizer.go
+
77
−
2
View file @
294da09f
...
...
@@ -3,14 +3,25 @@ package k8sutils
import
(
"context"
redisv1beta1
"redis-operator/api/v1beta1"
"strconv"
"github.com/go-logr/logr"
"k8s.io/apimachinery/pkg/api/errors"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
)
const
RedisFinalizer
string
=
"redisFinalizer"
const
(
RedisFinalizer
string
=
"redisFinalizer"
RedisClusterFinalizer
string
=
"redisClusterFinalizer"
)
// finalizeLogger will generate logging interface
func
finalizerLogger
(
namespace
string
,
name
string
)
logr
.
Logger
{
reqLogger
:=
log
.
WithValues
(
"Request.Service.Namespace"
,
namespace
,
"Request.Finalizer.Name"
,
name
)
return
reqLogger
}
// HandleRedisFinalizer finalize resource if instance is marked to be deleted
func
HandleRedisFinalizer
(
cr
*
redisv1beta1
.
Redis
,
cl
client
.
Client
)
error
{
...
...
@@ -31,6 +42,27 @@ func HandleRedisFinalizer(cr *redisv1beta1.Redis, cl client.Client) error {
return
nil
}
// HandleRedisClusterFinalizer finalize resource if instance is marked to be deleted
func
HandleRedisClusterFinalizer
(
cr
*
redisv1beta1
.
RedisCluster
,
cl
client
.
Client
)
error
{
logger
:=
finalizerLogger
(
cr
.
Namespace
,
RedisClusterFinalizer
)
if
cr
.
GetDeletionTimestamp
()
!=
nil
{
if
controllerutil
.
ContainsFinalizer
(
cr
,
RedisClusterFinalizer
)
{
if
err
:=
finalizeRedisClusterServices
(
cr
);
err
!=
nil
{
return
err
}
if
err
:=
finalizeRedisClusterPVC
(
cr
);
err
!=
nil
{
return
err
}
controllerutil
.
RemoveFinalizer
(
cr
,
RedisClusterFinalizer
)
if
err
:=
cl
.
Update
(
context
.
TODO
(),
cr
);
err
!=
nil
{
logger
.
Error
(
err
,
"Could not remove finalizer "
+
RedisClusterFinalizer
)
return
err
}
}
}
return
nil
}
// AddRedisFinalizer add finalizer for graceful deletion
func
AddRedisFinalizer
(
cr
*
redisv1beta1
.
Redis
,
cl
client
.
Client
)
error
{
if
!
controllerutil
.
ContainsFinalizer
(
cr
,
RedisFinalizer
)
{
...
...
@@ -40,6 +72,15 @@ func AddRedisFinalizer(cr *redisv1beta1.Redis, cl client.Client) error {
return
nil
}
// AddRedisClusterFinalizer add finalizer for graceful deletion
func
AddRedisClusterFinalizer
(
cr
*
redisv1beta1
.
RedisCluster
,
cl
client
.
Client
)
error
{
if
!
controllerutil
.
ContainsFinalizer
(
cr
,
RedisClusterFinalizer
)
{
controllerutil
.
AddFinalizer
(
cr
,
RedisClusterFinalizer
)
return
cl
.
Update
(
context
.
TODO
(),
cr
)
}
return
nil
}
// finalizeRedisServices delete Services
func
finalizeRedisServices
(
cr
*
redisv1beta1
.
Redis
)
error
{
serviceName
,
headlessServiceName
:=
cr
.
Name
,
cr
.
Name
+
"-headless"
...
...
@@ -52,8 +93,42 @@ func finalizeRedisServices(cr *redisv1beta1.Redis) error {
return
nil
}
// finalizeRedisClusterServices delete Services
func
finalizeRedisClusterServices
(
cr
*
redisv1beta1
.
RedisCluster
)
error
{
logger
:=
finalizerLogger
(
cr
.
Namespace
,
RedisClusterFinalizer
)
serviceName
,
headlessServiceName
:=
cr
.
Name
,
cr
.
Name
+
"-headless"
for
_
,
svc
:=
range
[]
string
{
serviceName
,
headlessServiceName
}
{
err
:=
generateK8sClient
()
.
CoreV1
()
.
Services
(
cr
.
Namespace
)
.
Delete
(
context
.
TODO
(),
svc
,
metav1
.
DeleteOptions
{})
if
err
!=
nil
&&
!
errors
.
IsNotFound
(
err
)
{
logger
.
Error
(
err
,
"Could not delete service "
+
svc
)
return
err
}
}
return
nil
}
// finalizeRedisPVC delete PVC
func
finalizeRedisPVC
(
cr
*
redisv1beta1
.
Redis
)
error
{
PVCName
:=
cr
.
Name
+
"-"
+
cr
.
Name
+
"-0"
return
generateK8sClient
()
.
CoreV1
()
.
PersistentVolumeClaims
(
cr
.
Namespace
)
.
Delete
(
context
.
TODO
(),
PVCName
,
metav1
.
DeleteOptions
{})
err
:=
generateK8sClient
()
.
CoreV1
()
.
PersistentVolumeClaims
(
cr
.
Namespace
)
.
Delete
(
context
.
TODO
(),
PVCName
,
metav1
.
DeleteOptions
{})
if
err
!=
nil
&&
!
errors
.
IsNotFound
(
err
)
{
return
err
}
return
nil
}
// finalizeRedisClusterPVC delete PVCs
func
finalizeRedisClusterPVC
(
cr
*
redisv1beta1
.
RedisCluster
)
error
{
logger
:=
finalizerLogger
(
cr
.
Namespace
,
RedisClusterFinalizer
)
for
_
,
role
:=
range
[]
string
{
"leader"
,
"follower"
}
{
for
i
:=
0
;
i
<
int
(
cr
.
Spec
.
GetReplicaCounts
(
role
));
i
++
{
PVCName
:=
cr
.
Name
+
"-"
+
role
+
"-"
+
cr
.
Name
+
"-"
+
role
+
"-"
+
strconv
.
Itoa
(
i
)
err
:=
generateK8sClient
()
.
CoreV1
()
.
PersistentVolumeClaims
(
cr
.
Namespace
)
.
Delete
(
context
.
TODO
(),
PVCName
,
metav1
.
DeleteOptions
{})
if
err
!=
nil
&&
!
errors
.
IsNotFound
(
err
)
{
logger
.
Error
(
err
,
"Could not delete Persistent Volume Claim "
+
PVCName
)
return
err
}
}
}
return
nil
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment