Skip to content

Commit 50f6815

Browse files
review comments implementation
1 parent c033814 commit 50f6815

File tree

6 files changed

+38
-22
lines changed

6 files changed

+38
-22
lines changed

components/secretstore-gen-secrets/templates/secrets.yaml.tmpl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
{{- $site := .Values.site }}
2-
{{- $secretStore := $site.secretStore }}
3-
{{- range $site.secrets }}
1+
{{- $secretStore := .Values.secretStore }}
2+
{{- range .Values.secrets }}
43
---
54
apiVersion: external-secrets.io/v1
65
kind: ExternalSecret
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
site:
2-
name: uc-iad3-dev
3-
partition: uc-dev
4-
env: dev
5-
role: aio
6-
secretStore:
7-
kind: SecretStore
8-
name: vault
1+
---

workflows/nautobot/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ resources:
99

1010
# noutobot secret
1111
- serviceaccounts/k8s-secret-events-nautobot.yaml
12+
- serviceaccounts/k8s-job-create.yaml
1213
- eventsources/k8s-secret-nautobot-token.yaml
1314
- sensors/k8s-nautobot-secret.yaml

workflows/nautobot/sensors/k8s-nautobot-secret.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
this process ensures the user is created in Nautobot and a corresponding token is provisioned.
1010
spec:
1111
template:
12-
serviceAccountName: k8s-events-secret-nautobot
12+
serviceAccountName: k8s-job-create
1313
dependencies:
1414
- name: nautobot-token-secret
1515
eventSourceName: k8s-secret-nautobot-token
@@ -38,7 +38,7 @@ spec:
3838
spec:
3939
containers:
4040
- name: nautobot-create-token
41-
image: ghcr.io/rackerlabs/understack/ansible:pr-1256
41+
image: ghcr.io/rackerlabs/understack/ansible:latest
4242
imagePullPolicy: Always
4343
command:
4444
- "ansible-runner"
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
apiVersion: v1
3+
kind: ServiceAccount
4+
metadata:
5+
name: k8s-job-create
6+
7+
---
8+
apiVersion: rbac.authorization.k8s.io/v1
9+
kind: Role
10+
metadata:
11+
name: k8s-job
12+
rules:
13+
- apiGroups: ["batch"]
14+
resources: ["jobs"]
15+
verbs: ["create", "get", "list", "watch"]
16+
17+
---
18+
apiVersion: rbac.authorization.k8s.io/v1
19+
kind: RoleBinding
20+
metadata:
21+
name: k8s-job-binding
22+
roleRef:
23+
apiGroup: rbac.authorization.k8s.io
24+
kind: Role
25+
name: k8s-job
26+
subjects:
27+
- kind: ServiceAccount
28+
name: k8s-job-create
29+
namespace: nautobot

workflows/nautobot/serviceaccounts/k8s-secret-events-nautobot.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,15 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
name: k8s-events-secret-nautobot
6-
76
---
87
apiVersion: rbac.authorization.k8s.io/v1
98
kind: Role
109
metadata:
1110
name: secret-reader
1211
rules:
13-
- apiGroups:
14-
- ""
15-
- batch
16-
resources:
17-
- secrets
18-
- jobs
19-
verbs:
20-
- '*'
12+
- apiGroups: [""]
13+
resources: ["secrets"]
14+
verbs: ["list", "watch"]
2115

2216
---
2317
apiVersion: rbac.authorization.k8s.io/v1

0 commit comments

Comments
 (0)