ROX-27234: Cleanup gh acs-fleetshard-operator build (#2114)

* Cleanup gh acs-fleetshard-operator build

* Delete makefile task

.github/workflows/ci.yaml

@@ -115,8 +115,8 @@ jobs:
           export PATH=${PATH}:$GOPATH/bin
           make verify binary test test/integration
         timeout-minutes: 14
-  build-push-images:
-    name: "Build and push fleet* images to quay.io"
+  build-push-fleet-manager-tools:
+    name: "Build and push fleet-manager-tools image to quay.io"
     runs-on: ubuntu-latest
     needs: [pre-commit, verify-test]
     # Skip for external contributions.
@@ -144,5 +144,3 @@ jobs:
         env:
           TAG: ${{ github.ref_name }}
         run: make image/push/fleet-manager-tools
-      - name: Build and push fleetshard-operator image to quay.io
-        run: make image/push/fleetshard-operator

.tekton/acs-fleetshard-operator-push.yaml

@@ -26,7 +26,7 @@ spec:
   - name: output-image
     value: quay.io/redhat-user-workloads/acscs-rhacs-tenant/acscs-main/acs-fleetshard-operator:{{revision}}
   - name: dockerfile
-    value: dp-terraform/helm/konflux.Dockerfile
+    value: dp-terraform/helm/Dockerfile
   - name: path-context
     value: dp-terraform/helm
 

Makefile

@@ -594,11 +594,6 @@ image/build/fleetshard-operator:
 	$(DOCKER) buildx build -t $(IMAGE_REF) --build-arg IMAGE_TAG=$(image_tag) --load ${PROJECT_PATH}/dp-terraform/helm
 .PHONY: image/build/fleetshard-operator
 
-image/push/fleetshard-operator: IMAGE_REF="$(external_image_registry)/fleetshard-operator:$(image_tag)"
-image/push/fleetshard-operator: image/build/fleetshard-operator
-	$(DOCKER) push $(IMAGE_REF)
-.PHONY: image/push/fleetshard-operator
-
 # push the image to the OpenShift internal registry
 image/push/fleetshard-operator/internal: IMAGE_TAG ?= $(image_tag)
 image/push/fleetshard-operator/internal: docker/login/internal

dp-terraform/helm/Dockerfile

@@ -13,16 +13,24 @@ RUN helm repo add external-secrets "https://charts.external-secrets.io/" && \
 
 RUN microdnf install gzip tar && \
     curl -L --retry 10 --silent --show-error --fail -o /tmp/yq_linux_amd64.tar.gz \
-        "https://github.com/mikefarah/yq/releases/download/v4.35.2/yq_linux_amd64.tar.gz" && \
+        "https://github.com/mikefarah/yq/releases/download/v4.44.5/yq_linux_amd64.tar.gz" && \
         tar -xzf /tmp/yq_linux_amd64.tar.gz ./yq_linux_amd64 && \
         mv yq_linux_amd64 /usr/local/bin/yq && \
         chmod +x /usr/local/bin/yq && \
         rm /tmp/yq_linux_amd64.tar.gz
 
+# Fix ignored securityContext.runAsUser set to null in values.yaml file.
+# Manually dropping  securityContext.runAsUser value from the external secret subchart.
+# This could be fixed with ose-helm-operator version bump.
+# See: https://github.com/operator-framework/operator-sdk/issues/6635
+RUN cd rhacs-terraform/charts && for filename in *.tgz; do tar -xf "$filename" && rm -f "$filename"; done && \
+        yq -i 'del(.securityContext.runAsUser) | del(.webhook.securityContext.runAsUser) | del(.certController.securityContext.runAsUser)' external-secrets/values.yaml
+
 ARG IMAGE_TAG=latest
 RUN yq -i ".global.image.tag = strenv(IMAGE_TAG)" rhacs-terraform/values.yaml
 
-FROM quay.io/operator-framework/helm-operator:v1.38.0
+# RH catalog see: https://catalog.redhat.com/software/containers/openshift4/ose-helm-operator
+FROM registry.redhat.io/openshift4/ose-helm-operator:v4.15.0-202411130135.p0.g52fc4b9.assembly.stream.el8
 
 ENV HOME=/opt/helm
 ENV ADDON_NAME=acs-fleetshard