Skip to content

Commit 529c058

Browse files
authored
Merge pull request #92 from circonus-labs/CIRC-8161
[CIRC-8161] Improve default deployment user experience for recent k8s versions
2 parents 284ea4b + b0d08cf commit 529c058

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

deploy/default/authrbac.yaml

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1+
---
2+
## create namespace
3+
apiVersion: v1
4+
kind: Namespace
5+
metadata:
6+
labels:
7+
kubernetes.io/metadata.name: circonus-kubernetes-agent
8+
name: circonus-kubernetes-agent
19
---
210
## create cluster role providing readonly access to resources for collecting metrics
311
apiVersion: rbac.authorization.k8s.io/v1
412
kind: ClusterRole
513
metadata:
614
name: cka-readonly
15+
namespace: circonus-kubernetes-agent
716
labels:
817
app.kubernetes.io/name: circonus-kubernetes-agent
918
rules:
@@ -31,7 +40,7 @@
3140
kind: ServiceAccount
3241
metadata:
3342
name: circonus-kubernetes-agent
34-
namespace: default
43+
namespace: circonus-kubernetes-agent
3544
labels:
3645
app.kubernetes.io/name: circonus-kubernetes-agent
3746

@@ -41,6 +50,7 @@
4150
kind: ClusterRoleBinding
4251
metadata:
4352
name: cka-readonly
53+
namespace: circonus-kubernetes-agent
4454
labels:
4555
app.kubernetes.io/name: circonus-kubernetes-agent
4656
roleRef:
@@ -50,4 +60,4 @@
5060
subjects:
5161
- kind: ServiceAccount
5262
name: circonus-kubernetes-agent
53-
namespace: default
63+
namespace: circonus-kubernetes-agent

deploy/default/configuration.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
metadata:
1010
# versioned, cadence independent of app version
1111
name: cka-secrets-v1
12+
namespace: circonus-kubernetes-agent
1213
labels:
1314
app.kubernetes.io/name: circonus-kubernetes-agent
1415
stringData:
@@ -21,6 +22,7 @@
2122
metadata:
2223
# versioned, cadence independent of app version
2324
name: cka-config-v1
25+
namespace: circonus-kubernetes-agent
2426
labels:
2527
app.kubernetes.io/name: circonus-kubernetes-agent
2628
data:

deploy/default/deployment.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
kind: Deployment
44
metadata:
55
name: circonus-kubernetes-agent
6+
namespace: circonus-kubernetes-agent
67
labels:
78
app.kubernetes.io/name: circonus-kubernetes-agent
89
app.kubernetes.io/version: latest
@@ -19,10 +20,13 @@
1920
app.kubernetes.io/name: circonus-kubernetes-agent
2021
app.kubernetes.io/version: latest
2122
spec:
23+
securityContext:
24+
runAsUser: 1000
25+
runAsGroup: 1000
2226
serviceAccountName: circonus-kubernetes-agent
2327
containers:
2428
- name: circonus-kubernetes-agent
25-
image: circonus/circonus-kubernetes-agent:latest
29+
image: index.docker.io/circonus/circonus-kubernetes-agent:latest
2630
command: ["/circonus-kubernetes-agentd"]
2731
#args: ["--debug"]
2832
env:

0 commit comments

Comments
 (0)