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

Remove the tini supervisor #379

Merged
merged 2 commits into from
May 24, 2023
Merged

Remove the tini supervisor #379

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
dd6f8b0
Rename controllers to controller
stefanprodan May 24, 2023
041acac
Remove the tini supervisor
stefanprodan May 24, 2023
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
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ RUN xx-go build -trimpath -a -o image-reflector-controller main.go

FROM alpine:3.18

LABEL org.opencontainers.image.source="https://github.com/fluxcd/image-reflector-controller"
ARG TARGETPLATFORM

RUN apk add --no-cache ca-certificates tini
RUN apk --no-cache add ca-certificates \
&& update-ca-certificates

COPY --from=builder /workspace/image-reflector-controller /usr/local/bin/

USER 65534:65534

ENTRYPOINT [ "/sbin/tini", "--", "image-reflector-controller" ]
ENTRYPOINT [ "image-reflector-controller" ]
0 ...al/controllers/controllers_fuzzer_test.go → ...nal/controller/controllers_fuzzer_test.go
View file
Open in desktop
File renamed without changes.
0 internal/controllers/database.go → internal/controller/database.go
View file
Open in desktop
File renamed without changes.
0 ...nal/controllers/imagepolicy_controller.go → ...rnal/controller/imagepolicy_controller.go
View file
Open in desktop
File renamed without changes.
0 ...ontrollers/imagepolicy_controller_test.go → ...controller/imagepolicy_controller_test.go
View file
Open in desktop
File renamed without changes.
0 ...controllers/imagerepository_controller.go → .../controller/imagerepository_controller.go
View file
Open in desktop
File renamed without changes.
0 ...ollers/imagerepository_controller_test.go → ...roller/imagerepository_controller_test.go
View file
Open in desktop
File renamed without changes.
0 internal/controllers/policy_test.go → internal/controller/policy_test.go
View file
Open in desktop
File renamed without changes.
0 internal/controllers/scan_test.go → internal/controller/scan_test.go
View file
Open in desktop
File renamed without changes.
0 internal/controllers/suite_test.go → internal/controller/suite_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import (
// +kubebuilder:scaffold:imports

imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
"github.com/fluxcd/image-reflector-controller/internal/controllers"
"github.com/fluxcd/image-reflector-controller/internal/controller"
"github.com/fluxcd/image-reflector-controller/internal/database"
"github.com/fluxcd/image-reflector-controller/internal/features"
)
Expand Down
4 changes: 2 additions & 2 deletions tests/fuzz/oss_fuzz_prebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ set -euxo pipefail

# Some tests requires embedded resources. Embedding does not allow
# for traversing into ascending dirs, therefore we copy those contents here:
mkdir -p internal/controllers/testdata/crd
cp config/crd/bases/*.yaml internal/controllers/testdata/crd
mkdir -p internal/controller/testdata/crd
cp config/crd/bases/*.yaml internal/controller/testdata/crd