Skip to content

Commit 7223e08

Browse files
ikethecoderikethecoder
committed
refactor edge templates
1 parent 938bb8a commit 7223e08

File tree

11 files changed

+177
-91
lines changed

11 files changed

+177
-91
lines changed

‎sdx/chart/sdx-edge/templates/fluentbit.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ apiVersion: apps/v1
44
metadata:
55
name: sdx-fluentbit
66
labels:
7-
app.kubernetes.io/name: fluentbit
8-
app.kubernetes.io/component: app
7+
app.kubernetes.io/name: sdx-edge
8+
app.kubernetes.io/component: fluentbit
99
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
1010
spec:
1111
replicas: 1
1212
selector:
1313
matchLabels:
14-
app.kubernetes.io/name: fluentbit
15-
app.kubernetes.io/component: app
14+
app.kubernetes.io/name: sdx-edge
15+
app.kubernetes.io/component: fluentbit
1616
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
1717
template:
1818
metadata:
1919
creationTimestamp: null
2020
labels:
2121
DataClass: Low
22-
app.kubernetes.io/name: fluentbit
23-
app.kubernetes.io/component: app
22+
app.kubernetes.io/name: sdx-edge
23+
app.kubernetes.io/component: fluentbit
2424
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
2525
spec:
2626
restartPolicy: Always
@@ -179,7 +179,7 @@ spec:
179179
targetPort: 24224
180180
protocol: TCP
181181
selector:
182-
app.kubernetes.io/name: fluentbit
183-
app.kubernetes.io/component: app
182+
app.kubernetes.io/name: sdx-edge
183+
app.kubernetes.io/component: fluentbit
184184
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
185185
{{ end }}

‎sdx/chart/sdx-edge/templates/hpa.yaml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎sdx/chart/sdx-edge/templates/job-cert-bootstrap.yaml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ kind: Job
77
metadata:
88
name: "{{ include "sdx-edge.fullname" . }}-boot-{{ sha256sum .Values.tls.client.bootstrap.token | trunc 8 }}"
99
labels:
10-
app.kubernetes.io/name: job-cert-bootstrap
10+
app.kubernetes.io/name: sdx-edge
11+
app.kubernetes.io/component: job-cert-bootstrap
1112
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
1213
data-plane: "{{ include "sdx-edge.fullname" . }}"
1314
spec:
@@ -20,7 +21,8 @@ spec:
2021
metadata:
2122
labels:
2223
DataClass: Low
23-
app.kubernetes.io/name: job-cert-bootstrap
24+
app.kubernetes.io/name: sdx-edge
25+
app.kubernetes.io/component: job-cert-bootstrap
2426
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
2527
data-plane: "{{ include "sdx-edge.fullname" . }}"
2628
spec:
@@ -37,7 +39,7 @@ spec:
3739
name: cert-bootstrap
3840
command:
3941
- /bin/bash
40-
- -x
42+
- +x
4143
- -e
4244
- -c
4345
- |-
@@ -127,14 +129,16 @@ apiVersion: v1
127129
metadata:
128130
name: sdx-job-cert-bootstrap
129131
labels:
130-
app.kubernetes.io/name: job-cert-bootstrap
132+
app.kubernetes.io/name: sdx-edge
133+
app.kubernetes.io/component: job-cert-bootstrap
131134
---
132135
apiVersion: rbac.authorization.k8s.io/v1
133136
kind: Role
134137
metadata:
135138
name: sdx-job-cert-bootstrap
136139
labels:
137-
app.kubernetes.io/name: job-cert-bootstrap
140+
app.kubernetes.io/name: sdx-edge
141+
app.kubernetes.io/component: job-cert-bootstrap
138142
rules:
139143
- verbs:
140144
- get
@@ -158,7 +162,8 @@ apiVersion: rbac.authorization.k8s.io/v1
158162
metadata:
159163
name: sdx-job-cert-bootstrap
160164
labels:
161-
app.kubernetes.io/name: job-cert-bootstrap
165+
app.kubernetes.io/name: sdx-edge
166+
app.kubernetes.io/component: job-cert-bootstrap
162167
roleRef:
163168
apiGroup: rbac.authorization.k8s.io
164169
kind: Role

‎sdx/chart/sdx-edge/templates/job-cert-renewal.yaml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ kind: CronJob
88
metadata:
99
name: "{{ include "sdx-edge.fullname" . }}-cert-renewal"
1010
labels:
11-
app.kubernetes.io/name: job-cert-renewal
11+
app.kubernetes.io/name: sdx-edge
12+
app.kubernetes.io/component: job-cert-renewal
1213
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
1314
data-plane: "{{ include "sdx-edge.fullname" . }}"
1415
spec:
@@ -27,7 +28,8 @@ spec:
2728
metadata:
2829
labels:
2930
DataClass: Low
30-
app.kubernetes.io/name: job-cert-renewal
31+
app.kubernetes.io/name: sdx-edge
32+
app.kubernetes.io/component: job-cert-renewal
3133
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
3234
data-plane: "{{ include "sdx-edge.fullname" . }}"
3335
spec:
@@ -60,9 +62,6 @@ spec:
6062
curl -sLO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
6163
chmod +x kubectl
6264
63-
kubectl delete secret ${EDGE_NAME}-client || true
64-
kubectl delete secret ${EDGE_NAME}-server || true
65-
6665
kubectl create secret \
6766
--save-config --dry-run=client -o yaml \
6867
tls ${EDGE_NAME}-client \
@@ -121,18 +120,22 @@ apiVersion: v1
121120
metadata:
122121
name: sdx-job-cert-renewal
123122
labels:
124-
app.kubernetes.io/name: job-cert-renewal
123+
app.kubernetes.io/name: sdx-edge
124+
app.kubernetes.io/component: job-cert-renewal
125125
---
126126
apiVersion: rbac.authorization.k8s.io/v1
127127
kind: Role
128128
metadata:
129129
name: sdx-job-cert-renewal
130130
labels:
131-
app.kubernetes.io/name: job-cert-renewal
131+
app.kubernetes.io/name: sdx-edge
132+
app.kubernetes.io/component: job-cert-renewal
132133
rules:
133134
- verbs:
134135
- get
135136
- patch
137+
- create
138+
- delete
136139
apiGroups:
137140
- ''
138141
resources:
@@ -150,7 +153,8 @@ apiVersion: rbac.authorization.k8s.io/v1
150153
metadata:
151154
name: sdx-job-cert-renewal
152155
labels:
153-
app.kubernetes.io/name: job-cert-renewal
156+
app.kubernetes.io/name: sdx-edge
157+
app.kubernetes.io/component: job-cert-renewal
154158
roleRef:
155159
apiGroup: rbac.authorization.k8s.io
156160
kind: Role

sdx/chart/sdx-edge/templates/deployment.yaml renamed to sdx/chart/sdx-edge/templates/kong.yaml

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ metadata:
44
name: {{ include "sdx-edge.fullname" . }}
55
labels:
66
app.kubernetes.io/name: sdx-edge
7-
app.kubernetes.io/component: app
7+
app.kubernetes.io/component: kong
88
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
99
data-plane: "{{ include "sdx-edge.fullname" . }}"
1010
spec:
1111
revisionHistoryLimit: 10
1212
selector:
1313
matchLabels:
1414
app.kubernetes.io/name: sdx-edge
15-
app.kubernetes.io/component: app
15+
app.kubernetes.io/component: kong
1616
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
1717
strategy:
1818
rollingUpdate:
@@ -28,7 +28,7 @@ spec:
2828
labels:
2929
DataClass: Medium
3030
app.kubernetes.io/name: sdx-edge
31-
app.kubernetes.io/component: app
31+
app.kubernetes.io/component: kong
3232
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
3333
data-plane: "{{ include "sdx-edge.fullname" . }}"
3434
spec:
@@ -175,6 +175,54 @@ spec:
175175
secretName: sdx-edge-ca
176176
- name: kong-nginx-proxy-include
177177
secret:
178-
secretName: kong-nginx-proxy-include
178+
secretName: {{ include "sdx-edge.fullname" . }}-proxy-include
179179
- emptyDir: {}
180180
name: dotluarocks
181+
---
182+
apiVersion: autoscaling/v2
183+
kind: HorizontalPodAutoscaler
184+
metadata:
185+
name: "{{ include "sdx-edge.fullname" . }}"
186+
labels:
187+
app.kubernetes.io/name: kong
188+
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
189+
data-plane: "{{ include "sdx-edge.fullname" . }}"
190+
spec:
191+
scaleTargetRef:
192+
apiVersion: apps/v1
193+
kind: Deployment
194+
name: "{{ include "sdx-edge.fullname" . }}"
195+
minReplicas: {{ .Values.hpa.minReplicas }}
196+
maxReplicas: {{ .Values.hpa.maxReplicas }}
197+
metrics:
198+
- resource:
199+
name: cpu
200+
target:
201+
averageUtilization: 60
202+
type: Utilization
203+
type: Resource
204+
---
205+
apiVersion: v1
206+
kind: Service
207+
metadata:
208+
name: {{ include "sdx-edge.fullname" . }}
209+
labels:
210+
app.kubernetes.io/name: kong
211+
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
212+
data-plane: "{{ include "sdx-edge.fullname" . }}"
213+
enable-metrics: "true"
214+
spec:
215+
type: ClusterIP
216+
ports:
217+
- name: kong-proxy
218+
port: 80
219+
targetPort: 8000
220+
protocol: TCP
221+
- name: kong-proxy-tls
222+
port: 443
223+
targetPort: 8443
224+
protocol: TCP
225+
selector:
226+
app.kubernetes.io/name: sdx-edge
227+
app.kubernetes.io/component: kong
228+
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"

sdx/chart/sdx-edge/templates/ocp_networkpolicy.yml renamed to sdx/chart/sdx-edge/templates/ocp-netpols.yml

File renamed without changes.

‎sdx/chart/sdx-edge/templates/ocp-route.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: "{{- .Values.route.host }}"
55
labels:
66
app.kubernetes.io/name: sdx-edge
7-
app.kubernetes.io/component: app
7+
app.kubernetes.io/component: ocp-route
88
app.kubernetes.io/instance: "{{ include "sdx-edge.fullname" . }}"
99
data-plane: "{{ include "sdx-edge.fullname" . }}"
1010
spec:

‎sdx/chart/sdx-edge/templates/prometheus.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ apiVersion: apps/v1
44
metadata:
55
name: sdx-prometheus-server
66
labels:
7-
app.kubernetes.io/name: prometheus
8-
app.kubernetes.io/component: server
7+
app.kubernetes.io/name: sdx-edge
8+
app.kubernetes.io/component: prometheus
99
spec:
1010
replicas: 1
1111
selector:
1212
matchLabels:
13-
app.kubernetes.io/name: prometheus
14-
app.kubernetes.io/component: server
13+
app.kubernetes.io/name: sdx-edge
14+
app.kubernetes.io/component: prometheus
1515
template:
1616
metadata:
1717
labels:
1818
DataClass: Low
19-
app.kubernetes.io/name: prometheus
20-
app.kubernetes.io/component: server
19+
app.kubernetes.io/name: sdx-edge
20+
app.kubernetes.io/component: prometheus
2121
spec:
2222
restartPolicy: Always
2323
schedulerName: default-scheduler
@@ -108,8 +108,8 @@ apiVersion: v1
108108
metadata:
109109
name: sdx-prometheus-server
110110
labels:
111-
app.kubernetes.io/name: prometheus
112-
app.kubernetes.io/component: server
111+
app.kubernetes.io/name: sdx-edge
112+
app.kubernetes.io/component: prometheus
113113
data:
114114
alerting_rules.yml: |
115115
{}
@@ -183,8 +183,8 @@ apiVersion: v1
183183
metadata:
184184
name: sdx-prometheus-server
185185
labels:
186-
app.kubernetes.io/component: server
187-
app.kubernetes.io/name: prometheus
186+
app.kubernetes.io/name: sdx-edge
187+
app.kubernetes.io/component: prometheus
188188
spec:
189189
ports:
190190
- name: http
@@ -206,16 +206,16 @@ apiVersion: v1
206206
metadata:
207207
name: sdx-prometheus
208208
labels:
209-
app.kubernetes.io/name: prometheus
210-
app.kubernetes.io/component: server
209+
app.kubernetes.io/name: sdx-edge
210+
app.kubernetes.io/component: prometheus
211211
---
212212
apiVersion: rbac.authorization.k8s.io/v1
213213
kind: Role
214214
metadata:
215215
name: sdx-prometheus
216216
labels:
217-
app.kubernetes.io/name: prometheus
218-
app.kubernetes.io/component: server
217+
app.kubernetes.io/name: sdx-edge
218+
app.kubernetes.io/component: prometheus
219219
rules:
220220
- verbs:
221221
- list
@@ -232,8 +232,8 @@ apiVersion: rbac.authorization.k8s.io/v1
232232
metadata:
233233
name: sdx-prometheus
234234
labels:
235-
app.kubernetes.io/name: prometheus
236-
app.kubernetes.io/component: server
235+
app.kubernetes.io/name: sdx-edge
236+
app.kubernetes.io/component: prometheus
237237
roleRef:
238238
apiGroup: rbac.authorization.k8s.io
239239
kind: Role

sdx/chart/sdx-edge/templates/secret.yaml renamed to sdx/chart/sdx-edge/templates/secrets.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type: Opaque
2020
kind: Secret
2121
apiVersion: v1
2222
metadata:
23-
name: kong-nginx-proxy-include
23+
name: {{ include "sdx-edge.fullname" . }}-proxy-include
2424
data:
2525
config: {{ .Values.nginx_conf | b64enc | quote }}
2626
type: Opaque

‎sdx/chart/sdx-edge/templates/service.yaml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)