From ec72c3e1eae0356d26b5576d174cbbb9cb39e197 Mon Sep 17 00:00:00 2001 From: raffaelespazzoli Date: Wed, 8 May 2024 18:44:55 -0600 Subject: [PATCH] ubi9 Signed-off-by: raffaelespazzoli --- Dockerfile | 2 +- api/v1alpha1/groupversion_info.go | 4 ++-- ci.Dockerfile | 2 +- controllers/patch_controller.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1c0b947..97b987a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -o manager main.go # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -FROM gcr.io/distroless/static:nonroot +FROM registry.access.redhat.com/ubi9/ubi-minimal WORKDIR / COPY --from=builder /workspace/manager . USER 65532:65532 diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index 5a1aa40..ecfd6c1 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/api/v1alpha1/groupversion_info.go @@ -15,8 +15,8 @@ limitations under the License. */ // Package v1alpha1 contains API Schema definitions for the redhatcop v1alpha1 API group -//+kubebuilder:object:generate=true -//+groupName=redhatcop.redhat.io +// +kubebuilder:object:generate=true +// +groupName=redhatcop.redhat.io package v1alpha1 import ( diff --git a/ci.Dockerfile b/ci.Dockerfile index 1c17792..724b6a1 100644 --- a/ci.Dockerfile +++ b/ci.Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal WORKDIR / COPY bin/manager . USER 65532:65532 diff --git a/controllers/patch_controller.go b/controllers/patch_controller.go index 237a6ac..42d6e4d 100644 --- a/controllers/patch_controller.go +++ b/controllers/patch_controller.go @@ -206,7 +206,7 @@ func (r *PatchReconciler) manageCleanUpLogic(ctx context.Context, instance *redh return nil } -//ManageError manage error sets an error status in the CR and fires an event, finally it returns the error so the operator can re-attempt +// ManageError manage error sets an error status in the CR and fires an event, finally it returns the error so the operator can re-attempt func (er *PatchReconciler) ManageError(ctx context.Context, instance *redhatcopv1alpha1.Patch, issue error) (reconcile.Result, error) { rlog := log.FromContext(ctx) er.GetRecorder().Event(instance, "Warning", "ProcessingError", issue.Error())