Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add correct binary for manager and set runAsUser: 1000 in deployment.yaml #313

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −5
Open

fix: add correct binary for manager and set runAsUser: 1000 in deployment.yaml #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f1699c
fix controlplane dockerfile and deployment
jokestax Dec 3, 2024
a13aa4c
Merge branch 'main' into fix-dockerfile
jokestax Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions build/Containerfile.controlplane
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx-tools

FROM --platform=$BUILDPLATFORM rust:alpine
ARG TARGETPLATFORM
ARG PROJECT_DIR=/workspace
ARG BUILD_DIR=$PROJECT_DIR/build
FROM --platform=$BUILDPLATFORM rust:alpine AS builder

RUN apk add --no-cache clang lld
COPY --from=xx-tools / /

WORKDIR /workspace

COPY --from=xx-tools / /

ARG TARGETPLATFORM
ARG PROJECT_DIR=/workspace
ARG BUILD_DIR=$PROJECT_DIR/build

jokestax marked this conversation as resolved.
Show resolved Hide resolved
RUN --mount=type=bind,source=../controlplane/src/,target=src \
--mount=type=bind,source=../controlplane/Cargo.toml,target=Cargo.toml \
--mount=type=bind,source=../controlplane/Cargo.lock,target=Cargo.lock \
xx-cargo build --release --target-dir $BUILD_DIR && \
xx-verify ./build/$(xx-cargo --print-target-triple)/release/controller

RUN cp ./build/$(xx-cargo --print-target-triple)/release/controller /workspace/manager
jokestax marked this conversation as resolved.
Show resolved Hide resolved

FROM alpine:latest

WORKDIR /

COPY --from=builder /workspace/manager /manager

RUN chmod +x /manager
jokestax marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we don't need this line?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do not.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the late reply,been travelling to attend Kubecon India 😅,and since we have used ./manger to start the controller,not sure why we dont need this line

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because the manager binary is already executable

1 change: 1 addition & 0 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ spec:
name: manager
securityContext:
allowPrivilegeEscalation: false
runAsUser: 1000
jokestax marked this conversation as resolved.
Show resolved Hide resolved
jokestax marked this conversation as resolved.
Show resolved Hide resolved
capabilities:
drop:
- "ALL"
Expand Down
Loading