Add Application and Secret watches #18

maruina · 2021-02-19T09:24:29Z

Fix #5

Add defer GinkgoRecover() when starting k8sManager so we can see the real issue. Instead of a Ginkgo panic, we can see the real issue. First screenshot is without the defer.

Add ArgoCD Application CRD to fix the issue above
Add scripts to import ArgoCD Application package
Use recommended Ginkgo CI settings
Restructure test to allow multiple Describe block
Randomize namespace creation for each Describe block
Add test for checking if a secret is an ArgoCD cluster
Add tests for watches
Build only when we merge into main
Add RBAC for watching secrets and applications
Added a predicate to the secret watch to get an event on labels update as per https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.8.2/pkg/predicate#LabelChangedPredicate
Create utils package for internal common utilities

controllers/progressiverollout_controller_test.go

Makefile

api/v1alpha1/progressiverollout_types.go

config/crd/bases/argoproj.io_application.yaml

controllers/progressiverollout_controller.go

internal/utils.go

.github/workflows/test-build.yaml

api/v1alpha1/progressiverollout_types.go

internal/utils.go

controllers/progressiverollout_controller.go

internal/utils.go

sledigabel · 2021-02-23T09:13:51Z

controllers/progressiverollout_controller.go

@@ -73,7 +78,8 @@ func (r *ProgressiveRolloutReconciler) SetupWithManager(mgr ctrl.Manager) error
 			&source.Kind{Type: &argov1alpha1.Application{}},
 			handler.EnqueueRequestsFromMapFunc(r.requestsForApplicationChange)).
 		Watches(
-			&source.Kind{Type: &corev1.Secret{}}, handler.EnqueueRequestsFromMapFunc(r.requestsForSecretChange)).
+			&source.Kind{Type: &corev1.Secret{}}, handler.EnqueueRequestsFromMapFunc(r.requestsForSecretChange),
+			builder.WithPredicates(predicate.Or(predicate.GenerationChangedPredicate{}, predicate.LabelChangedPredicate{}))).


sledigabel

LGTM

* main: Add Application and Secret watches (#18)

maruina added 11 commits February 18, 2021 21:56

Add tools and instruction to import argocd application

e8ca79e

Import kubernetes 1.20.1 with go-mod-hack

6000a95

Import argov1alpha1

9487249

Add application to scheme

8e11810

Register argocd application in test suite

d6a1f9e

Add watch for Applications

ca592bb

Add script to install argocd application

9834b5f

Defer GinkgoRecover() to see real errors when the manager fails

ee7b7b1

Add application and secret watches

74a722e

Add Application watch filtering logic

0178157

Use recommended ginkgo cli config

ed1e872

maruina force-pushed the watch branch from aad2235 to c38692e Compare February 19, 2021 17:14

Restructure test suite to allow multiple describe

8761c6c

maruina force-pushed the watch branch from c38692e to 8761c6c Compare February 19, 2021 17:28

maruina added 3 commits February 19, 2021 20:40

Move codeql on a separate job to improve parallelism

f634ed7

Append random suffix to namespace

ac33a02

Add test for filtering owned application

b8c0ad0

maruina force-pushed the watch branch from 70e35c9 to b8c0ad0 Compare February 19, 2021 21:54

maruina commented Feb 19, 2021

View reviewed changes

controllers/progressiverollout_controller_test.go Outdated Show resolved Hide resolved

Fix flaky test by setting ownership only in the specific test

26524c6

maruina force-pushed the watch branch from a042bf3 to 26524c6 Compare February 20, 2021 09:07

maruina added 4 commits February 20, 2021 11:13

Add test for non owned application

41a386c

Install ginkgo in ci

77b9d6a

Add sourceRef

b44391b

Add requestsForSecretChange logic

4fa016b

maruina force-pushed the watch branch from e91df45 to 4fa016b Compare February 20, 2021 21:21

Add utils test

d23f247

maruina force-pushed the watch branch from c2e7280 to d23f247 Compare February 21, 2021 07:22

maruina added 2 commits February 21, 2021 09:32

Add HasOwnerReference test

135a7d2

Add requestsForSecretChange tests

3479282

maruina requested review from danmx, Smirl, nebojsa-prodana, sledigabel and ikarpovich February 21, 2021 11:09

maruina added 2 commits February 21, 2021 16:06

Build only when we merge into main

00f2ac5

Use eventually to avoid flaky tests

71a4197

maruina mentioned this pull request Feb 22, 2021

Add targets selection logic #21

Merged

Smirl requested changes Feb 22, 2021

View reviewed changes

sledigabel reviewed Feb 22, 2021

View reviewed changes

internal/utils.go Outdated Show resolved Hide resolved

maruina added 4 commits February 22, 2021 14:25

Refactor function name

25926f4

Increase golangci-lint timeout

4b1dce7

Move application crd outside the controller configuration

3249846

Add deduplication logic

725ae58

Smirl previously approved these changes Feb 22, 2021

View reviewed changes

Use expect instead of eventually when we call a specific function

0947a2a

maruina dismissed Smirl’s stale review via 0947a2a February 22, 2021 15:55

maruina force-pushed the watch branch from 066fa0e to 0947a2a Compare February 22, 2021 15:55

maruina added 5 commits February 22, 2021 16:56

Move utils in their own package

880f601

Add RBAC rules for secrets and applications

3320f5a

Move constants in a separate file

16fda6b

Add predicates to get events on label change

8e30b9f

Add RBAC with kubebuilder annotations

2930140

sledigabel mentioned this pull request Feb 23, 2021

Move the Argo Appset names constant to a separate package #23

Closed

sledigabel reviewed Feb 23, 2021

View reviewed changes

sledigabel approved these changes Feb 23, 2021

View reviewed changes

maruina merged commit a13aacf into main Feb 23, 2021

maruina deleted the watch branch February 23, 2021 09:16

maruina added a commit that referenced this pull request Feb 23, 2021

Merge branch 'main' into targets

b562e85

* main: Add Application and Secret watches (#18)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Application and Secret watches #18

Add Application and Secret watches #18

maruina commented Feb 19, 2021 •

edited

sledigabel Feb 23, 2021

sledigabel left a comment

Add Application and Secret watches #18

Add Application and Secret watches #18

Conversation

maruina commented Feb 19, 2021 • edited

sledigabel Feb 23, 2021

Choose a reason for hiding this comment

sledigabel left a comment

Choose a reason for hiding this comment

maruina commented Feb 19, 2021 •

edited