Merge pull request #379 from fluxcd/no-tini

Remove the tini supervisor
fluxcd · May 24, 2023 · af1cc08 · af1cc08
2 parents 63a97fe + 041acac
commit af1cc08
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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" ]
diff --git a/...al/controllers/controllers_fuzzer_test.go → ...nal/controller/controllers_fuzzer_test.go b/...al/controllers/controllers_fuzzer_test.go → ...nal/controller/controllers_fuzzer_test.go
diff --git a/internal/controllers/database.go → internal/controller/database.go b/internal/controllers/database.go → internal/controller/database.go
diff --git a/...nal/controllers/imagepolicy_controller.go → ...rnal/controller/imagepolicy_controller.go b/...nal/controllers/imagepolicy_controller.go → ...rnal/controller/imagepolicy_controller.go
diff --git a/...ontrollers/imagepolicy_controller_test.go → ...controller/imagepolicy_controller_test.go b/...ontrollers/imagepolicy_controller_test.go → ...controller/imagepolicy_controller_test.go
diff --git a/...controllers/imagerepository_controller.go → .../controller/imagerepository_controller.go b/...controllers/imagerepository_controller.go → .../controller/imagerepository_controller.go
diff --git a/...ollers/imagerepository_controller_test.go → ...roller/imagerepository_controller_test.go b/...ollers/imagerepository_controller_test.go → ...roller/imagerepository_controller_test.go
diff --git a/internal/controllers/policy_test.go → internal/controller/policy_test.go b/internal/controllers/policy_test.go → internal/controller/policy_test.go
diff --git a/internal/controllers/scan_test.go → internal/controller/scan_test.go b/internal/controllers/scan_test.go → internal/controller/scan_test.go
diff --git a/internal/controllers/suite_test.go → internal/controller/suite_test.go b/internal/controllers/suite_test.go → internal/controller/suite_test.go
diff --git a/main.go b/main.go
@@ -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"
 )

diff --git a/tests/fuzz/oss_fuzz_prebuild.sh b/tests/fuzz/oss_fuzz_prebuild.sh
@@ -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