Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Initial commit #696

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Initial commit #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b43b7f
Initial commit
Kaushik-Vijayakumar-1 May 11, 2024
106a8fa
Adding skip-reconcile feature
Kaushik-Vijayakumar-1 May 11, 2024
55bbf65
Adding cluster autoscaler safe-to-evict annotation
Kaushik-Vijayakumar-1 May 11, 2024
e108c4a
Bug Fix
Kaushik-Vijayakumar-1 May 11, 2024
d010b1e
Test
Kaushik-Vijayakumar-1 May 11, 2024
d95f426
Test
Kaushik-Vijayakumar-1 May 14, 2024
91e56b3
Debug
Kaushik-Vijayakumar-1 May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions mocks/service/k8s/Services.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions operator/redisfailover/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ func (r *RedisFailoverHandler) Handle(_ context.Context, obj runtime.Object) err
return fmt.Errorf("can't handle the received object: not a redisfailover")
}

if rf.Annotations != nil {
skipReconcile, ok := rf.Annotations["skip-reconcile"]
if ok && skipReconcile == "true" {
r.logger.Infoln("skip-reconcile set to true. Skipping reconcile for", rf.Name)
return nil
}
}

if err := rf.Validate(); err != nil {
r.mClient.SetClusterError(rf.Namespace, rf.Name)
return err
Expand Down
4 changes: 4 additions & 0 deletions operator/redisfailover/service/check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ func TestCheckAllSlavesFromMasterGetStatefulSetError(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(nil, errors.New(""))
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
mr := &mRedisService.Client{}

checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
Expand Down Expand Up @@ -186,6 +187,7 @@ func TestCheckAllSlavesFromMasterGetSlaveOfError(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
mr := &mRedisService.Client{}
mr.On("GetSlaveOf", "", "0", "").Once().Return("", errors.New(""))

Expand Down Expand Up @@ -214,6 +216,7 @@ func TestCheckAllSlavesFromMasterDifferentMaster(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
mr := &mRedisService.Client{}
mr.On("GetSlaveOf", "0.0.0.0", "0", "").Once().Return("1.1.1.1", nil)

Expand Down Expand Up @@ -242,6 +245,7 @@ func TestCheckAllSlavesFromMaster(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
mr := &mRedisService.Client{}
mr.On("GetSlaveOf", "0.0.0.0", "0", "").Once().Return("1.1.1.1", nil)

Expand Down
5 changes: 4 additions & 1 deletion operator/redisfailover/service/heal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ func (r *RedisFailoverHealer) MakeMaster(ip string, rf *redisfailoverv1.RedisFai
}
for _, rp := range rps.Items {
if rp.Status.PodIP == ip {
return r.setMasterLabelIfNecessary(rf.Namespace, rp)
err = r.setMasterLabelIfNecessary(rf.Namespace, rp)
if err != nil {
return err
}
}
}
return nil
Expand Down
8 changes: 8 additions & 0 deletions operator/redisfailover/service/heal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ func TestSetOldestAsMasterNewMasterError(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
mr := &mRedisService.Client{}
mr.On("MakeMaster", "0.0.0.0", "0", "").Once().Return(errors.New(""))

Expand Down Expand Up @@ -62,6 +63,7 @@ func TestSetOldestAsMaster(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
mr := &mRedisService.Client{}
mr.On("MakeMaster", "0.0.0.0", "0", "").Once().Return(nil)

Expand Down Expand Up @@ -94,6 +96,7 @@ func TestSetOldestAsMasterMultiplePodsMakeSlaveOfError(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
mr := &mRedisService.Client{}
mr.On("MakeMaster", "0.0.0.0", "0", "").Once().Return(nil)
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "").Once().Return(errors.New(""))
Expand Down Expand Up @@ -127,6 +130,7 @@ func TestSetOldestAsMasterMultiplePods(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
mr := &mRedisService.Client{}
mr.On("MakeMaster", "0.0.0.0", "0", "").Once().Return(nil)
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "").Once().Return(nil)
Expand Down Expand Up @@ -170,6 +174,7 @@ func TestSetOldestAsMasterOrdering(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
mr := &mRedisService.Client{}
mr.On("MakeMaster", "1.1.1.1", "0", "").Once().Return(nil)
mr.On("MakeSlaveOfWithPort", "0.0.0.0", "1.1.1.1", "0", "").Once().Return(nil)
Expand Down Expand Up @@ -203,6 +208,7 @@ func TestSetMasterOnAllMakeMasterError(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
mr := &mRedisService.Client{}
mr.On("IsMaster", "0.0.0.0", "0", "").Return(false, errors.New(""))
healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
Expand Down Expand Up @@ -234,6 +240,7 @@ func TestSetMasterOnAllMakeSlaveOfError(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
mr := &mRedisService.Client{}
mr.On("IsMaster", "0.0.0.0", "0", "").Return(true, nil)
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "").Once().Return(errors.New(""))
Expand Down Expand Up @@ -267,6 +274,7 @@ func TestSetMasterOnAll(t *testing.T) {
ms := &mK8SService.Services{}
ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
ms.On("UpdatePodLabels", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
mr := &mRedisService.Client{}
mr.On("IsMaster", "0.0.0.0", "0", "").Return(true, nil)
mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "").Once().Return(nil)
Expand Down
23 changes: 23 additions & 0 deletions service/k8s/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ type Pod interface {
DeletePod(namespace string, name string) error
ListPods(namespace string) (*corev1.PodList, error)
UpdatePodLabels(namespace, podName string, labels map[string]string) error
UpdatePodAnnotations(namespace, podName string, annotations map[string]string) error
}

// PodService is the pod service implementation using API calls to kubernetes.
Expand Down Expand Up @@ -128,3 +129,25 @@ func (p *PodService) UpdatePodLabels(namespace, podName string, labels map[strin
}
return err
}

func (p *PodService) UpdatePodAnnotations(namespace, podName string, annotations map[string]string) error {
p.logger.Infof("Update pod annotation, namespace: %s, pod name: %s, annotations: %v", namespace, podName, annotations)

var payloads []interface{}
for annotationKey, annotationValue := range annotations {
payload := PatchStringValue{
Op: "replace",
Path: "/metadata/annotations/" + annotationKey,
Value: annotationValue,
}
payloads = append(payloads, payload)
}
payloadBytes, _ := json.Marshal(payloads)

_, err := p.kubeClient.CoreV1().Pods(namespace).Patch(context.TODO(), podName, types.JSONPatchType, payloadBytes, metav1.PatchOptions{})
recordMetrics(namespace, "Pod", podName, "PATCH", err, p.metricsRecorder)
if err != nil {
p.logger.Errorf("Update pod annotations failed, namespace: %s, pod name: %s, error: %v", namespace, podName, err)
}
return err
}
2 changes: 1 addition & 1 deletion test/integration/redisfailover/creation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func TestRedisFailover(t *testing.T) {
require.True(ok, "the custom resource has to be created to continue")

// Giving time to the operator to create the resources
time.Sleep(3 * time.Minute)
time.Sleep(5 * time.Minute)

// Verify that auth is set and actually working
t.Run("Check that auth is set in sentinel and redis configs", clients.testAuth)
Expand Down
Loading