Adding replica count check

Signed-off-by: kpharasi <[email protected]>
istio-ecosystem · Dec 10, 2024 · 79987d8 · 79987d8
1 parent 47c8619
commit 79987d8
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 25 deletions.
diff --git a/admiral/pkg/controller/admiral/job.go b/admiral/pkg/controller/admiral/job.go
@@ -158,13 +158,10 @@ func (p *JobController) DoesGenerationMatch(ctxLogger *log.Entry, obj interface{
 	return false, nil
 }
 
-<<<<<<< HEAD
-=======
 func (p *JobController) IsOnlyReplicaCountChanged(*log.Entry, interface{}, interface{}) (bool, error) {
 	return false, nil
 }
 
->>>>>>> 564f504f (Add replica count check)
 func NewJobController(stopCh <-chan struct{}, handler ClientDiscoveryHandler, config *rest.Config, resyncPeriod time.Duration, clientLoader loader.ClientLoader) (*JobController, error) {
 
 	jobController := JobController{}

diff --git a/admiral/pkg/controller/admiral/monovertex.go b/admiral/pkg/controller/admiral/monovertex.go
@@ -166,13 +166,10 @@ func (p *MonoVertexController) DoesGenerationMatch(ctxLogger *log.Entry, obj int
 	return false, nil
 }
 
-<<<<<<< HEAD
-=======
 func (p *MonoVertexController) IsOnlyReplicaCountChanged(*log.Entry, interface{}, interface{}) (bool, error) {
 	return false, nil
 }
 
->>>>>>> 564f504f (Add replica count check)
 func NewMonoVertexController(stopCh <-chan struct{}, handler ClientDiscoveryHandler, config *rest.Config, resyncPeriod time.Duration, clientLoader loader.ClientLoader) (*MonoVertexController, error) {
 
 	monoVertexController := MonoVertexController{}

diff --git a/admiral/pkg/controller/admiral/vertex.go b/admiral/pkg/controller/admiral/vertex.go
@@ -167,13 +167,10 @@ func (p *VertexController) DoesGenerationMatch(ctxLogger *log.Entry, obj interfa
 	return false, nil
 }
 
-<<<<<<< HEAD
-=======
 func (p *VertexController) IsOnlyReplicaCountChanged(*log.Entry, interface{}, interface{}) (bool, error) {
 	return false, nil
 }
 
->>>>>>> 564f504f (Add replica count check)
 func NewVertexController(stopCh <-chan struct{}, handler ClientDiscoveryHandler, config *rest.Config, resyncPeriod time.Duration, clientLoader loader.ClientLoader) (*VertexController, error) {
 
 	vertexController := VertexController{}

diff --git a/admiral/pkg/controller/common/config.go b/admiral/pkg/controller/common/config.go
@@ -473,27 +473,18 @@ func DoGenerationCheck() bool {
 	return wrapper.params.EnableGenerationCheck
 }
 
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
 func IsOnlyReplicaCountChanged() bool {
 	wrapper.RLock()
 	defer wrapper.RUnlock()
 	return wrapper.params.EnableIsOnlyReplicaCountChangedCheck
 }
 
->>>>>>> 564f504f (Add replica count check)
 func PreventSplitBrain() bool {
 	wrapper.RLock()
 	defer wrapper.RUnlock()
 	return wrapper.params.PreventSplitBrain
 }
 
-<<<<<<< HEAD
-=======
->>>>>>> 870eb6da (Add replica count check)
->>>>>>> 564f504f (Add replica count check)
 func GetResyncIntervals() util.ResyncIntervals {
 	wrapper.RLock()
 	defer wrapper.RUnlock()

diff --git a/admiral/pkg/controller/common/types.go b/admiral/pkg/controller/common/types.go
@@ -105,15 +105,8 @@ type AdmiralParams struct {
 	EnableSyncIstioResourcesToSourceClusters bool
 	DefaultWarmupDurationSecs                int64
 	EnableGenerationCheck                    bool
-<<<<<<< HEAD
-	PreventSplitBrain                        bool
-=======
-<<<<<<< HEAD
-=======
 	EnableIsOnlyReplicaCountChangedCheck     bool
 	PreventSplitBrain                        bool
->>>>>>> 870eb6da (Add replica count check)
->>>>>>> 564f504f (Add replica count check)
 
 	// Cartographer specific params
 	TrafficConfigPersona      bool