Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit 9c6b457

Browse files
committed
k8s: qareports-web: make squad the first container in pod
This will help ssh'ing into squad frontent container easier Signed-off-by: Charles Oliveira <charles.oliveira@linaro.org>
1 parent 56ee8bd commit 9c6b457

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

k8s/qareports-web.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -115,32 +115,6 @@ spec:
115115
mountPath: /qareports_static
116116

117117
containers:
118-
- name: apache2
119-
image: httpd:2.4
120-
command: ["sh", "-c"]
121-
args:
122-
- cat qareports.conf >> conf/httpd.conf && httpd -D FOREGROUND
123-
124-
ports:
125-
- containerPort: 80
126-
127-
volumeMounts:
128-
- name: qareports-web-apache-conf
129-
mountPath: /usr/local/apache2/qareports.conf
130-
subPath: qareports.conf
131-
132-
- name: static-files
133-
mountPath: /qareports_static
134-
135-
resources:
136-
requests:
137-
memory: "128M"
138-
cpu: "250m"
139-
140-
limits:
141-
memory: "512M"
142-
cpu: "500m"
143-
144118
- name: qareports-web
145119
image: squadproject/squad:release
146120
imagePullPolicy: "Always"
@@ -183,6 +157,32 @@ spec:
183157
memory: "4096M"
184158
cpu: "2"
185159

160+
- name: apache2
161+
image: httpd:2.4
162+
command: ["sh", "-c"]
163+
args:
164+
- cat qareports.conf >> conf/httpd.conf && httpd -D FOREGROUND
165+
166+
ports:
167+
- containerPort: 80
168+
169+
volumeMounts:
170+
- name: qareports-web-apache-conf
171+
mountPath: /usr/local/apache2/qareports.conf
172+
subPath: qareports.conf
173+
174+
- name: static-files
175+
mountPath: /qareports_static
176+
177+
resources:
178+
requests:
179+
memory: "128M"
180+
cpu: "250m"
181+
182+
limits:
183+
memory: "512M"
184+
cpu: "500m"
185+
186186
volumes:
187187
- name: qareports-secret-key
188188
configMap:

0 commit comments

Comments
 (0)