Skip to content

Commit e8888e5

Browse files
authored
Merge pull request #648 from jetstack/fz/collect-new-issuers
VC-39644 Collect info for the venafiConnection and more issuers
2 parents 11a2dbd + 7f2ed7d commit e8888e5

File tree

2 files changed

+203
-0
lines changed

2 files changed

+203
-0
lines changed

deploy/charts/venafi-kubernetes-agent/templates/configmap.yaml

+63
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,13 @@ data:
201201
version: v1
202202
group: route.openshift.io
203203
resource: routes
204+
- kind: "k8s-dynamic"
205+
name: "k8s/venaficonnections"
206+
config:
207+
resource-type:
208+
group: jetstack.io
209+
version: v1alpha1
210+
resource: venaficonnections
204211
- kind: "k8s-dynamic"
205212
name: "k8s/venaficlusterissuers"
206213
config:
@@ -222,4 +229,60 @@ data:
222229
group: firefly.venafi.com
223230
version: v1
224231
resource: issuers
232+
- kind: "k8s-dynamic"
233+
name: "k8s/stepissuers"
234+
config:
235+
resource-type:
236+
group: certmanager.step.sm
237+
version: v1beta1
238+
resource: stepissuers
239+
- kind: "k8s-dynamic"
240+
name: "k8s/stepclusterissuers"
241+
config:
242+
resource-type:
243+
group: certmanager.step.sm
244+
version: v1beta1
245+
resource: stepclusterissuers
246+
- kind: "k8s-dynamic"
247+
name: "k8s/originissuers"
248+
config:
249+
resource-type:
250+
group: cert-manager.k8s.cloudflare.com
251+
version: v1
252+
resource: originissuers
253+
- kind: "k8s-dynamic"
254+
name: "k8s/clusteroriginissuers"
255+
config:
256+
resource-type:
257+
group: cert-manager.k8s.cloudflare.com
258+
version: v1
259+
resource: clusteroriginissuers
260+
- kind: "k8s-dynamic"
261+
name: "k8s/freeipaissuers"
262+
config:
263+
resource-type:
264+
group: certmanager.freeipa.org
265+
version: v1beta1
266+
resource: issuers
267+
- kind: "k8s-dynamic"
268+
name: "k8s/freeipaclusterissuers"
269+
config:
270+
resource-type:
271+
group: certmanager.freeipa.org
272+
version: v1beta1
273+
resource: clusterissuers
274+
- kind: "k8s-dynamic"
275+
name: "k8s/ejbcaissuers"
276+
config:
277+
resource-type:
278+
group: ejbca-issuer.keyfactor.com
279+
version: v1alpha1
280+
resource: issuers
281+
- kind: "k8s-dynamic"
282+
name: "k8s/ejbcaclusterissuers"
283+
config:
284+
resource-type:
285+
group: ejbca-issuer.keyfactor.com
286+
version: v1alpha1
287+
resource: clusterissuers
225288
{{- end }}

deploy/charts/venafi-kubernetes-agent/templates/rbac.yaml

+140
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,33 @@ subjects:
263263
---
264264
apiVersion: rbac.authorization.k8s.io/v1
265265
kind: ClusterRole
266+
metadata:
267+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-venafi-connection-reader
268+
labels:
269+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
270+
rules:
271+
- apiGroups: ["jetstack.io"]
272+
resources:
273+
- venaficonnections
274+
verbs: ["get", "list", "watch"]
275+
---
276+
apiVersion: rbac.authorization.k8s.io/v1
277+
kind: ClusterRoleBinding
278+
metadata:
279+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-venafi-connection-reader
280+
labels:
281+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
282+
roleRef:
283+
kind: ClusterRole
284+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-venafi-connection-reader
285+
apiGroup: rbac.authorization.k8s.io
286+
subjects:
287+
- kind: ServiceAccount
288+
name: {{ include "venafi-kubernetes-agent.serviceAccountName" . }}
289+
namespace: {{ .Release.Namespace }}
290+
---
291+
apiVersion: rbac.authorization.k8s.io/v1
292+
kind: ClusterRole
266293
metadata:
267294
name: {{ include "venafi-kubernetes-agent.fullname" . }}-venafi-enhanced-reader
268295
labels:
@@ -315,3 +342,116 @@ subjects:
315342
- kind: ServiceAccount
316343
name: {{ include "venafi-kubernetes-agent.serviceAccountName" . }}
317344
namespace: {{ .Release.Namespace }}
345+
---
346+
apiVersion: rbac.authorization.k8s.io/v1
347+
kind: ClusterRole
348+
metadata:
349+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-step-reader
350+
labels:
351+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
352+
rules:
353+
- apiGroups: ["certmanager.step.sm"]
354+
resources:
355+
- stepissuers
356+
- stepclusterissuers
357+
verbs: ["get", "list", "watch"]
358+
---
359+
apiVersion: rbac.authorization.k8s.io/v1
360+
kind: ClusterRoleBinding
361+
metadata:
362+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-step-reader
363+
labels:
364+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
365+
roleRef:
366+
kind: ClusterRole
367+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-step-reader
368+
apiGroup: rbac.authorization.k8s.io
369+
subjects:
370+
- kind: ServiceAccount
371+
name: {{ include "venafi-kubernetes-agent.serviceAccountName" . }}
372+
namespace: {{ .Release.Namespace }}
373+
---
374+
apiVersion: rbac.authorization.k8s.io/v1
375+
kind: ClusterRole
376+
metadata:
377+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-cloudflare-reader
378+
labels:
379+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
380+
rules:
381+
- apiGroups: ["cert-manager.k8s.cloudflare.com"]
382+
resources:
383+
- originissuers
384+
- clusteroriginissuers
385+
verbs: ["get", "list", "watch"]
386+
---
387+
apiVersion: rbac.authorization.k8s.io/v1
388+
kind: ClusterRoleBinding
389+
metadata:
390+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-cloudflare-reader
391+
labels:
392+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
393+
roleRef:
394+
kind: ClusterRole
395+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-cloudflare-reader
396+
apiGroup: rbac.authorization.k8s.io
397+
subjects:
398+
- kind: ServiceAccount
399+
name: {{ include "venafi-kubernetes-agent.serviceAccountName" . }}
400+
namespace: {{ .Release.Namespace }}
401+
---
402+
apiVersion: rbac.authorization.k8s.io/v1
403+
kind: ClusterRole
404+
metadata:
405+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-freeipa-reader
406+
labels:
407+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
408+
rules:
409+
- apiGroups: ["certmanager.freeipa.org"]
410+
resources:
411+
- issuers
412+
- clusterissuers
413+
verbs: ["get", "list", "watch"]
414+
---
415+
apiVersion: rbac.authorization.k8s.io/v1
416+
kind: ClusterRoleBinding
417+
metadata:
418+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-freeipa-reader
419+
labels:
420+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
421+
roleRef:
422+
kind: ClusterRole
423+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-freeipa-reader
424+
apiGroup: rbac.authorization.k8s.io
425+
subjects:
426+
- kind: ServiceAccount
427+
name: {{ include "venafi-kubernetes-agent.serviceAccountName" . }}
428+
namespace: {{ .Release.Namespace }}
429+
---
430+
apiVersion: rbac.authorization.k8s.io/v1
431+
kind: ClusterRole
432+
metadata:
433+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-keyfactor-reader
434+
labels:
435+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
436+
rules:
437+
- apiGroups: ["ejbca-issuer.keyfactor.com"]
438+
resources:
439+
- issuers
440+
- clusterissuers
441+
verbs: ["get", "list", "watch"]
442+
---
443+
apiVersion: rbac.authorization.k8s.io/v1
444+
kind: ClusterRoleBinding
445+
metadata:
446+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-keyfactor-reader
447+
labels:
448+
{{- include "venafi-kubernetes-agent.labels" . | nindent 4 }}
449+
roleRef:
450+
kind: ClusterRole
451+
name: {{ include "venafi-kubernetes-agent.fullname" . }}-keyfactor-reader
452+
apiGroup: rbac.authorization.k8s.io
453+
subjects:
454+
- kind: ServiceAccount
455+
name: {{ include "venafi-kubernetes-agent.serviceAccountName" . }}
456+
namespace: {{ .Release.Namespace }}
457+

0 commit comments

Comments
 (0)