Merge pull request #209 from bart0sh/PR0061-fix-deployment-setup

fpga: fix deployment setup
This commit is contained in:
Alexander D. Kanevskiy 2019-08-27 16:26:13 +03:00 committed by GitHub
commit 9d585ea0b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 6 deletions

View File

@ -32,4 +32,4 @@ RUN chmod a+x /go/bin/fpga_admissionwebhook \
FROM scratch as final FROM scratch as final
COPY --from=builder /install_root / COPY --from=builder /install_root /
CMD ["/usr/local/bin/intel_fpga_admissionwebhook"] ENTRYPOINT ["/usr/local/bin/intel_fpga_admissionwebhook"]

View File

@ -38,7 +38,7 @@ RUN cd $DIR/cmd/fpga_crihook && \
FROM scratch as final FROM scratch as final
COPY --from=builder /install_root / COPY --from=builder /install_root /
ARG SRC_DIR=/usr/local/fpga-sw.src ARG SRC_DIR=/usr/local/fpga-sw
ARG DST_DIR=/opt/intel/fpga-sw ARG DST_DIR=/opt/intel/fpga-sw
# CRI hook # CRI hook
@ -64,4 +64,4 @@ ln -sf $HOOK_CONF_DST /etc/containers/oci/hooks.d/$HOOK_CONF\n\
rm $DST_DIR/deploy.sh\n\ rm $DST_DIR/deploy.sh\n\
">> $SRC_DIR/deploy.sh && chmod +x $SRC_DIR/deploy.sh ">> $SRC_DIR/deploy.sh && chmod +x $SRC_DIR/deploy.sh
CMD [ "/opt/intel/fpga-sw.src/deploy.sh" ] ENTRYPOINT [ "/usr/local/fpga-sw/deploy.sh" ]

View File

@ -15,8 +15,6 @@ spec:
- name: fpga-mutator - name: fpga-mutator
image: intel-fpga-admissionwebhook:devel image: intel-fpga-admissionwebhook:devel
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command:
- /usr/bin/intel_fpga_admissionwebhook
args: args:
- -tls-cert-file=/etc/webhook/certs/cert.pem - -tls-cert-file=/etc/webhook/certs/cert.pem
- -tls-private-key-file=/etc/webhook/certs/key.pem - -tls-private-key-file=/etc/webhook/certs/key.pem

View File

@ -19,7 +19,6 @@ spec:
- name: intel-fpga-initcontainer - name: intel-fpga-initcontainer
image: intel-fpga-initcontainer:devel image: intel-fpga-initcontainer:devel
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ['/opt/intel/fpga-sw.src/deploy.sh']
volumeMounts: volumeMounts:
- mountPath: /opt/intel/fpga-sw - mountPath: /opt/intel/fpga-sw
name: intel-fpga-sw name: intel-fpga-sw