Skip to content

Declare Module Correctly On sentinel #478

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

Merged
shubham-cmyk merged 4 commits into from
Apr 4, 2023
Merged

Declare Module Correctly On sentinel #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61f0829
Fixed StatefulSet(sentinel) Label for Service(Selector) #434 #435
muicoder Feb 20, 2023
8c47ad7
Revert "Fixed StatefulSet(sentinel) Label for Service(Selector) #434 …
shubham-cmyk Feb 20, 2023
bc4b757
Declare Module Correctly : Sentinel
shubham-cmyk Apr 2, 2023
7221f1c
Merge branch 'master' into sentinel
shubham-cmyk Apr 2, 2023
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
5 changes: 3 additions & 2 deletions controllers/redissentinel_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ package controllers

import (
"context"
"redis-operator/k8sutils"
"time"

"github.com/OT-CONTAINER-KIT/redis-operator/k8sutils"

"github.com/go-logr/logr"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

redisv1beta1 "redis-operator/api/v1beta1"
redisv1beta1 "github.com/OT-CONTAINER-KIT/redis-operator/api/v1beta1"
)

// RedisSentinelReconciler reconciles a RedisSentinel object
Expand Down
3 changes: 2 additions & 1 deletion k8sutils/redis-sentinel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package k8sutils
import (
"context"
"encoding/json"
redisv1beta1 "redis-operator/api/v1beta1"

redisv1beta1 "github.com/OT-CONTAINER-KIT/redis-operator/api/v1beta1"

corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down