Merge pull request #221 from fluxcd/controller-runtime-update

Upgrade controller-runtime to v0.7.0

.github/workflows/e2e.yaml

@@ -80,6 +80,8 @@ jobs:
         run: |
           kubectl -n impersonation apply -f ./config/testdata/impersonation
           kubectl -n impersonation wait kustomizations/podinfo --for=condition=ready --timeout=4m
+          kubectl -n impersonation delete kustomizations/podinfo
+          until kubectl -n impersonation get deploy/podinfo 2>&1 | grep NotFound ; do sleep 2; done
       - name: Run image overide tests
         run: |
           kubectl -n override-test apply -f ./config/testdata/overrides

api/go.mod

@@ -4,8 +4,8 @@ go 1.15
 
 require (
 	github.com/fluxcd/pkg/apis/meta v0.5.0
-	github.com/fluxcd/pkg/runtime v0.4.0
+	github.com/fluxcd/pkg/runtime v0.6.0
 	k8s.io/api v0.19.4
 	k8s.io/apimachinery v0.19.4
-	sigs.k8s.io/controller-runtime v0.6.4
+	sigs.k8s.io/controller-runtime v0.7.0
 )

api/v1beta1/kustomization_types.go

@@ -238,9 +238,9 @@ func (in *Kustomization) GetStatusConditions() *[]metav1.Condition {
 }
 
 const (
-	// SourceIndexKey is the key used for indexing kustomizations
+	// GitRepositoryIndexKey is the key used for indexing kustomizations
 	// based on their Git sources.
-	SourceIndexKey string = ".metadata.source"
+	GitRepositoryIndexKey string = ".metadata.gitRepository"
 	// BucketIndexKey is the key used for indexing kustomizations
 	// based on their S3 sources.
 	BucketIndexKey string = ".metadata.bucket"

config/manager/deployment.yaml

@@ -43,7 +43,7 @@ spec:
         args:
           - --watch-all-namespaces
           - --log-level=info
-          - --log-json
+          - --log-encoding=json
           - --enable-leader-election
         readinessProbe:
           httpGet:

config/rbac/leader_election_role.yaml

@@ -4,23 +4,41 @@ kind: Role
 metadata:
   name: leader-election-role
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
-  - delete
-- apiGroups:
-  - ""
-  resources:
-  - configmaps/status
-  verbs:
-  - get
-  - update
-  - patch
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps/status
+    verbs:
+      - get
+      - update
+      - patch
+  - apiGroups:
+      - ""
+    resources:
+      - events
+    verbs:
+      - create
+  - apiGroups:
+      - "coordination.k8s.io"
+    resources:
+      - leases
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete

config/rbac/role.yaml

@@ -13,6 +13,15 @@ rules:
   verbs:
   - create
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  - serviceaccounts
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - kustomize.toolkit.fluxcd.io
   resources: