Merge pull request #691 from fluxcd/no-tini

Remove the tini supervisor, and other nits
fluxcd · May 24, 2023 · 9250364 · 9250364
2 parents e546364 + c29360a
commit 9250364
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,13 +33,11 @@ RUN xx-go build -trimpath -a -o helm-controller main.go
 
 FROM alpine:3.18
 
-# link repo to the GitHub Container Registry image
-LABEL org.opencontainers.image.source="https://github.com/fluxcd/helm-controller"
-
-RUN apk add --no-cache ca-certificates tini
+RUN apk add --no-cache ca-certificates \
+    && update-ca-certificates
 
 COPY --from=builder /workspace/helm-controller /usr/local/bin/
 
 USER 65534:65534
 
-ENTRYPOINT [ "/sbin/tini", "--", "helm-controller" ]
+ENTRYPOINT [ "helm-controller" ]
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ BUILD_PLATFORMS ?= linux/amd64
 ENVTEST_ARCH ?= amd64
 
 # API (doc) generation utilities
-CONTROLLER_GEN_VERSION ?= v0.11.1
+CONTROLLER_GEN_VERSION ?= v0.12.0
 GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
 
 all: manager

diff --git a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: helmreleases.helm.toolkit.fluxcd.io
 spec:
   group: helm.toolkit.fluxcd.io

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:

diff --git a/...nal/controllers/helmrelease_controller.go → ...rnal/controller/helmrelease_controller.go b/...nal/controllers/helmrelease_controller.go → ...rnal/controller/helmrelease_controller.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

diff --git a/...ntrollers/helmrelease_controller_chart.go → ...ontroller/helmrelease_controller_chart.go b/...ntrollers/helmrelease_controller_chart.go → ...ontroller/helmrelease_controller_chart.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

diff --git a/...lers/helmrelease_controller_chart_test.go → ...ller/helmrelease_controller_chart_test.go b/...lers/helmrelease_controller_chart_test.go → ...ller/helmrelease_controller_chart_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

diff --git a/...llers/helmrelease_controller_fuzz_test.go → ...oller/helmrelease_controller_fuzz_test.go b/...llers/helmrelease_controller_fuzz_test.go → ...oller/helmrelease_controller_fuzz_test.go
@@ -17,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

diff --git a/...ontrollers/helmrelease_controller_test.go → ...controller/helmrelease_controller_test.go b/...ontrollers/helmrelease_controller_test.go → ...controller/helmrelease_controller_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

diff --git a/internal/controllers/source_predicate.go → internal/controller/source_predicate.go b/internal/controllers/source_predicate.go → internal/controller/source_predicate.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"sigs.k8s.io/controller-runtime/pkg/event"

diff --git a/internal/controllers/suite_test.go → internal/controller/suite_test.go b/internal/controllers/suite_test.go → internal/controller/suite_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"fmt"

diff --git a/main.go b/main.go
@@ -51,7 +51,7 @@ import (
 	v2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	// +kubebuilder:scaffold:imports
 
-	"github.com/fluxcd/helm-controller/internal/controllers"
+	"github.com/fluxcd/helm-controller/internal/controller"
 	"github.com/fluxcd/helm-controller/internal/features"
 	intkube "github.com/fluxcd/helm-controller/internal/kube"
 	"github.com/fluxcd/helm-controller/internal/oomwatch"
@@ -233,7 +233,7 @@ func main() {
 	}
 
 	pollingOpts := polling.Options{}
-	if err = (&controllers.HelmReleaseReconciler{
+	if err = (&controller.HelmReleaseReconciler{
 		Client:              mgr.GetClient(),
 		Config:              mgr.GetConfig(),
 		Scheme:              mgr.GetScheme(),
@@ -245,7 +245,7 @@ func main() {
 		PollingOpts:         pollingOpts,
 		StatusPoller:        polling.NewStatusPoller(mgr.GetClient(), mgr.GetRESTMapper(), pollingOpts),
 		ControllerName:      controllerName,
-	}).SetupWithManager(ctx, mgr, controllers.HelmReleaseReconcilerOptions{
+	}).SetupWithManager(ctx, mgr, controller.HelmReleaseReconcilerOptions{
 		DependencyRequeueInterval: requeueDependency,
 		HTTPRetry:                 httpRetry,
 		RateLimiter:               helper.GetRateLimiter(rateLimiterOptions),