Skip to content

Commit 7f1fdc5

Browse files
tiltfile tidy up
1 parent 67f4776 commit 7f1fdc5

2 files changed

Lines changed: 65 additions & 17 deletions

File tree

Infrastructure/k8s/metrics-rbac.yaml

Lines changed: 59 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,38 @@
11
# RBAC permissions for metrics server
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
4+
metadata:
5+
name: system:aggregated-metrics-reader
6+
labels:
7+
rbac.authorization.k8s.io/aggregate-to-view: "true"
8+
rbac.authorization.k8s.io/aggregate-to-edit: "true"
9+
rbac.authorization.k8s.io/aggregate-to-admin: "true"
10+
rules:
11+
- apiGroups: ["metrics.k8s.io"]
12+
resources: ["pods", "nodes"]
13+
verbs: ["get", "list", "watch"]
14+
---
15+
apiVersion: rbac.authorization.k8s.io/v1
16+
kind: ClusterRole
417
metadata:
518
name: system:metrics-server
619
rules:
7-
- apiGroups:
8-
- ""
9-
resources:
10-
- pods
11-
- nodes
12-
- nodes/stats
13-
- nodes/metrics
14-
- namespaces
15-
- configmaps
16-
verbs:
17-
- get
18-
- list
19-
- watch
20+
- apiGroups:
21+
- ""
22+
resources:
23+
- nodes/metrics
24+
verbs:
25+
- get
26+
- apiGroups:
27+
- ""
28+
resources:
29+
- pods
30+
- nodes
31+
- namespaces
32+
verbs:
33+
- get
34+
- list
35+
- watch
2036
---
2137
apiVersion: rbac.authorization.k8s.io/v1
2238
kind: ClusterRoleBinding
@@ -27,9 +43,36 @@ roleRef:
2743
kind: ClusterRole
2844
name: system:metrics-server
2945
subjects:
30-
- kind: ServiceAccount
31-
name: metrics-server
32-
namespace: kube-system
46+
- kind: ServiceAccount
47+
name: metrics-server
48+
namespace: kube-system
49+
---
50+
apiVersion: rbac.authorization.k8s.io/v1
51+
kind: ClusterRoleBinding
52+
metadata:
53+
name: metrics-server:system:auth-delegator
54+
roleRef:
55+
apiGroup: rbac.authorization.k8s.io
56+
kind: ClusterRole
57+
name: system:auth-delegator
58+
subjects:
59+
- kind: ServiceAccount
60+
name: metrics-server
61+
namespace: kube-system
62+
---
63+
apiVersion: rbac.authorization.k8s.io/v1
64+
kind: RoleBinding
65+
metadata:
66+
name: metrics-server-auth-reader
67+
namespace: kube-system
68+
roleRef:
69+
apiGroup: rbac.authorization.k8s.io
70+
kind: Role
71+
name: extension-apiserver-authentication-reader
72+
subjects:
73+
- kind: ServiceAccount
74+
name: metrics-server
75+
namespace: kube-system
3376
---
3477
apiVersion: rbac.authorization.k8s.io/v1
3578
kind: ClusterRoleBinding

Tiltfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ docker_build(
2323
# Apply Kubernetes manifests
2424
k8s_yaml([
2525
'ECommerceApp/k8s/sealedsecret.yaml',
26-
'ECommerceApp/k8s/hpa.yaml',
26+
# 'ECommerceApp/k8s/hpa.yaml', # Removed for now - metrics-server not fully configured
2727
'ECommerceApp/k8s/deployment.yaml',
2828
'ECommerceApp/k8s/ingress.yaml',
2929
'ECommerceApp/k8s/service.yaml',
@@ -73,3 +73,8 @@ k8s_resource(
7373
# Let's add metrics server if it's needed
7474
k8s_yaml('Infrastructure/k8s/metrics-server.yaml')
7575
k8s_yaml('Infrastructure/k8s/metrics-rbac.yaml')
76+
77+
k8s_resource(
78+
'metrics-server',
79+
labels=["infrastructure"]
80+
)

0 commit comments

Comments
 (0)