Skip to content

Commit a4c1247

Browse files
committed
fpga: fix deployment setup
- used ENTRYPOINT instead of CMD in plugin and admission webhook Dockerfiles to avoid duplicating commands in the pod yamls - fixed path to deploy.sh script in fpga initcontainer Dockerfile
1 parent 7e4a66d commit a4c1247

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

build/docker/intel-fpga-admissionwebhook.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ RUN chmod a+x /go/bin/fpga_admissionwebhook \
3232

3333
FROM scratch as final
3434
COPY --from=builder /install_root /
35-
CMD ["/usr/local/bin/intel_fpga_admissionwebhook"]
35+
ENTRYPOINT ["/usr/local/bin/intel_fpga_admissionwebhook"]

build/docker/intel-fpga-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN cd $DIR/cmd/fpga_crihook && \
3838
FROM scratch as final
3939
COPY --from=builder /install_root /
4040

41-
ARG SRC_DIR=/usr/local/fpga-sw.src
41+
ARG SRC_DIR=/usr/local/fpga-sw
4242
ARG DST_DIR=/opt/intel/fpga-sw
4343

4444
# CRI hook
@@ -64,4 +64,4 @@ ln -sf $HOOK_CONF_DST /etc/containers/oci/hooks.d/$HOOK_CONF\n\
6464
rm $DST_DIR/deploy.sh\n\
6565
">> $SRC_DIR/deploy.sh && chmod +x $SRC_DIR/deploy.sh
6666

67-
CMD [ "/opt/intel/fpga-sw.src/deploy.sh" ]
67+
ENTRYPOINT [ "/usr/local/fpga-sw/deploy.sh" ]

deployments/fpga_admissionwebhook/deployment-tpl.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ spec:
1515
- name: fpga-mutator
1616
image: intel-fpga-admissionwebhook:devel
1717
imagePullPolicy: IfNotPresent
18-
command:
19-
- /usr/bin/intel_fpga_admissionwebhook
2018
args:
2119
- -tls-cert-file=/etc/webhook/certs/cert.pem
2220
- -tls-private-key-file=/etc/webhook/certs/key.pem

deployments/fpga_plugin/fpga_plugin.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ spec:
1919
- name: intel-fpga-initcontainer
2020
image: intel-fpga-initcontainer:devel
2121
imagePullPolicy: IfNotPresent
22-
command: ['/opt/intel/fpga-sw.src/deploy.sh']
2322
volumeMounts:
2423
- mountPath: /opt/intel/fpga-sw
2524
name: intel-fpga-sw

0 commit comments

Comments
 (0)