Handle k8s service events and trigger SE generation #238
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nirvanagit
reviewed
Jul 1, 2022
admiral/pkg/clusters/registry.go
Outdated
|
|
||
| if err != nil { | ||
| return fmt.Errorf(" Error with GlobalTrafficController controller init: %v", err) | ||
| return fmt.Errorf(" Error with ServiceController controller init: %v", err) |
There was a problem hiding this comment.
nitpick: space before Error
nirvanagit
reviewed
Jul 1, 2022
admiral/pkg/clusters/registry.go
Outdated
|
|
||
| if err != nil { | ||
| return fmt.Errorf(" Error with DeploymentController controller init: %v", err) | ||
| return fmt.Errorf(" Error with GlobalTrafficController controller init: %v", err) |
There was a problem hiding this comment.
nitpick: space before Error
nirvanagit
reviewed
Jul 1, 2022
admiral/pkg/clusters/types.go
Outdated
| log.Infof(LogFormat, "Added", "service", obj.Name, sh.ClusterID, "received") | ||
| err := HandleEventForService(obj, sh.RemoteRegistry, sh.ClusterID) | ||
| if err != nil { | ||
| log.Infof(err.Error()) |
There was a problem hiding this comment.
Should we use Warnf or Errorf instead? (same comment for other related methods)
nirvanagit
reviewed
Jul 1, 2022
nirvanagit
reviewed
Jul 1, 2022
admiral/pkg/clusters/types.go
Outdated
| HandleEventForDeployment(admiral.Update, &deployment, remoteRegistry, clusterName) | ||
| } | ||
| if common.GetAdmiralParams().ArgoRolloutsEnabled { | ||
| rollouts := remoteRegistry.RemoteControllers[clusterName].RolloutController.GetRolloutBySelectorInNamespace(svc.Spec.Selector, svc.Namespace) |
There was a problem hiding this comment.
We could check for nil objects for remoteRegistry
nirvanagit
reviewed
Jul 1, 2022
nirvanagit
reviewed
Jul 1, 2022
nirvanagit
reviewed
Jul 1, 2022
| for lkey, lvalue := range serviceSelector { | ||
| // Rollouts controller adds a dynamic label with name rollouts-pod-template-hash to both active and passive replicasets. | ||
| // This dynamic label is not available on the rollout template. Hence ignoring the label with name rollouts-pod-template-hash | ||
| if lkey == common.ROLLOUT_POD_HASH_LABEL { |
There was a problem hiding this comment.
nitpick: ROLLOUT_POD_HASH_LABEL -> RolloutPodHashLabel
nirvanagit
reviewed
Jul 1, 2022
| if lkey == common.ROLLOUT_POD_HASH_LABEL { | ||
| continue | ||
| } | ||
| value, ok := rollout.Spec.Selector.MatchLabels[lkey] |
There was a problem hiding this comment.
We could check for nil object.
nirvanagit
reviewed
Jul 1, 2022
| if !cmp.Equal(serviceCache.Get("ns").Service["ns"][service.Name], service) { | ||
| t.Errorf("Incorrect service fount. Diff: %v", cmp.Diff(serviceCache.Get("ns").Service["ns"], service)) | ||
| if !cmp.Equal(serviceCache.Get("ns")[0], service) { | ||
| t.Errorf("Incorrect service fount. Diff: %v", cmp.Diff(serviceCache.Get("ns")[0], service)) |
Codecov Report
@@ Coverage Diff @@
## master #238 +/- ##
==========================================
- Coverage 75.00% 74.15% -0.86%
==========================================
Files 27 27
Lines 2613 2647 +34
==========================================
+ Hits 1960 1963 +3
- Misses 530 561 +31
Partials 123 123
Continue to review full report at Codecov.
|
nirvanagit
reviewed
Jul 1, 2022
admiral/pkg/clusters/handler_test.go
Outdated
| @@ -693,12 +693,11 @@ func TestGetServiceForRolloutCanary(t *testing.T) { | |||
| selectorMap["app"] = "test" | |||
|
|
|||
| service := &coreV1.Service{ | |||
| ObjectMeta: v12.ObjectMeta{Name: SERVICENAME, Namespace: NAMESPACE, CreationTimestamp: v12.NewTime(time.Now())}, | |||
There was a problem hiding this comment.
nitpick: ServiceName, Namespace
nirvanagit
reviewed
Jul 1, 2022
admiral/pkg/clusters/handler_test.go
Outdated
| @@ -711,15 +710,15 @@ func TestGetServiceForRolloutCanary(t *testing.T) { | |||
| service.Spec.Ports = ports | |||
|
|
|||
| stableService := &coreV1.Service{ | |||
| ObjectMeta: v12.ObjectMeta{Name: STABLESERVICENAME, Namespace: NAMESPACE}, | |||
| ObjectMeta: v12.ObjectMeta{Name: STABLESERVICENAME, Namespace: NAMESPACE, CreationTimestamp: v12.NewTime(time.Now().Add(time.Duration(-15)))}, | |||
There was a problem hiding this comment.
nitpick: StableServiceName
nirvanagit
reviewed
Jul 1, 2022
admiral/pkg/clusters/handler_test.go
Outdated
| Spec: coreV1.ServiceSpec{ | ||
| Selector: selectorMap, | ||
| Ports: ports, | ||
| }, | ||
| } | ||
|
|
||
| canaryService := &coreV1.Service{ | ||
| ObjectMeta: v12.ObjectMeta{Name: CANARYSERVICENAME, Namespace: NAMESPACE}, | ||
| ObjectMeta: v12.ObjectMeta{Name: CANARYSERVICENAME, Namespace: NAMESPACE, CreationTimestamp: v12.NewTime(time.Now().Add(time.Duration(-15)))}, |
There was a problem hiding this comment.
Nitpick: CanaryServiceName
nirvanagit
reviewed
Jul 1, 2022
| var filteredDeployments = make([]k8sAppsV1.Deployment, 0) | ||
|
|
||
| for _, deployment := range matchedDeployments.Items { | ||
| if deployment.Spec.Selector == nil || deployment.Spec.Selector.MatchLabels == nil { |
There was a problem hiding this comment.
We could check for nil values for .Selector and .MatchLabels
nirvanagit
reviewed
Jul 1, 2022
nirvanagit
reviewed
Jul 1, 2022
| if lkey == common.RolloutPodHashLabel { | ||
| continue | ||
| } | ||
| value, ok := rollout.Spec.Selector.MatchLabels[lkey] |
There was a problem hiding this comment.
We can use the labelSelector parameter in the list option to find deployments matching given labels.
nirvanagit
reviewed
Jul 1, 2022
| AdmiralIgnoreAnnotation = "admiral.io/ignore" | ||
| AdmiralCnameCaseSensitive = "admiral.io/cname-case-sensitive" | ||
| BlueGreenRolloutPreviewPrefix = "preview" | ||
| RolloutPodHashLabel string = "rollouts-pod-template-hash" |
There was a problem hiding this comment.
I think the formatting is off starting line 29.
nirvanagit
reviewed
Jul 1, 2022
nirvanagit
approved these changes
Jul 2, 2022
asushanthk
pushed a commit
that referenced
this pull request
Jul 21, 2022
Signed-off-by: sa <sushanth_a@intuit.com>
asushanthk
pushed a commit
that referenced
this pull request
Jul 21, 2022
Signed-off-by: sa <sushanth_a@intuit.com>
itsLucario
pushed a commit
to itsLucario/admiral
that referenced
this pull request
Aug 9, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes include: