Fixed up container for UBI8

RedHatInsights · May 5, 2022 · 81fd866 · 81fd866
1 parent ba5c247
commit 81fd866
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,9 +19,7 @@ USER 0
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -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/ubi8/ubi-minimal:8.5
 WORKDIR /
 COPY --from=builder /workspace/manager .
 USER 65532:65532

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -13,7 +13,6 @@ rules:
   - events
   - namespaces
   - persistentvolumeclaims
-  - secrets
   - serviceaccounts
   - services
   verbs:

diff --git a/controllers/frontend_controller.go b/controllers/frontend_controller.go
@@ -84,7 +84,7 @@ type FrontendReconciler struct {
 //+kubebuilder:rbac:groups=cloud.redhat.com,resources=bundles/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=cloud.redhat.com,resources=bundles/finalizers,verbs=update
 
-// +kubebuilder:rbac:groups="",resources=serviceaccounts;configmaps;services;persistentvolumeclaims;secrets;events;namespaces,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups="",resources=serviceaccounts;configmaps;services;persistentvolumeclaims;events;namespaces,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=get;list;watch;create;update;patch;delete

diff --git a/deploy.yml b/deploy.yml
@@ -907,7 +907,6 @@ objects:
     - events
     - namespaces
     - persistentvolumeclaims
-    - secrets
     - serviceaccounts
     - services
     verbs:
@@ -1191,7 +1190,7 @@ objects:
         terminationGracePeriodSeconds: 10
 parameters:
 - name: IMAGE_TAG
-  value: latest
+  required: true
 - name: IMAGE
   value: quay.io/cloudservices/frontend-operator
 
diff --git a/template.yml b/template.yml
@@ -4,7 +4,7 @@ metadata:
   name: frontend-operator
 parameters:
 - name: IMAGE_TAG
-  value: latest
+  required: true
 - name: IMAGE
   value: quay.io/cloudservices/frontend-operator
 objects: []