diff --git a/.tekton/cloud-ingress-operator-agentic-sdlc-check-pull-request.yaml b/.tekton/cloud-ingress-operator-agentic-sdlc-check-pull-request.yaml index 873a2994..c9d2472d 100644 --- a/.tekton/cloud-ingress-operator-agentic-sdlc-check-pull-request.yaml +++ b/.tekton/cloud-ingress-operator-agentic-sdlc-check-pull-request.yaml @@ -43,7 +43,7 @@ spec: - name: url value: https://github.com/openshift/boilerplate - name: revision - value: a8a3172411f3f2b8848f64333843e028ef4b3ed1 + value: dd27890d331492ff5bd0a044cb880eac9cb56ba9 - name: pathInRepo value: pipelines/agentic-sdlc-check/pipeline.yaml status: {} diff --git a/boilerplate/_data/last-boilerplate-commit b/boilerplate/_data/last-boilerplate-commit index d198b673..765f8f6d 100644 --- a/boilerplate/_data/last-boilerplate-commit +++ b/boilerplate/_data/last-boilerplate-commit @@ -1 +1 @@ -a8a3172411f3f2b8848f64333843e028ef4b3ed1 +dd27890d331492ff5bd0a044cb880eac9cb56ba9 diff --git a/boilerplate/openshift/golang-osd-e2e/.coderabbit.yaml b/boilerplate/openshift/golang-osd-e2e/.coderabbit.yaml new file mode 100644 index 00000000..e4fdc1ba --- /dev/null +++ b/boilerplate/openshift/golang-osd-e2e/.coderabbit.yaml @@ -0,0 +1,5 @@ +inheritance: true +reviews: + path_filters: + # Boilerplate-managed: skip review of boilerplate changes + - "!boilerplate/**" diff --git a/boilerplate/openshift/golang-osd-e2e/update b/boilerplate/openshift/golang-osd-e2e/update index fbd86675..4e3a06aa 100755 --- a/boilerplate/openshift/golang-osd-e2e/update +++ b/boilerplate/openshift/golang-osd-e2e/update @@ -10,6 +10,14 @@ source $CONVENTION_ROOT/_lib/common.sh # Expect POST [[ "$1" == "POST" ]] || err "Got a parameter I don't understand: '$1'. Did the infrastructure change?" +# Seed CodeRabbit configuration without overwriting repo customizations. +if [[ ! -f "${REPO_ROOT}/.coderabbit.yaml" ]]; then + echo "Copying .coderabbit.yaml to your repository root." + cp "${HERE}/.coderabbit.yaml" "${REPO_ROOT}/.coderabbit.yaml" +else + echo ".coderabbit.yaml already exists; leaving it unchanged." +fi + REPO_ROOT=$(git rev-parse --show-toplevel) OPERATOR_NAME=$(sed -n 's/.*OperatorName .*=.*"\([^"]*\)".*/\1/p' "${REPO_ROOT}/config/config.go") GO_MODULE_PATH=$(awk '/^module / { print $2; exit }' "${REPO_ROOT}/go.mod") diff --git a/boilerplate/openshift/golang-osd-operator/.coderabbit.yaml b/boilerplate/openshift/golang-osd-operator/.coderabbit.yaml index ae0cf3b2..e4fdc1ba 100644 --- a/boilerplate/openshift/golang-osd-operator/.coderabbit.yaml +++ b/boilerplate/openshift/golang-osd-operator/.coderabbit.yaml @@ -1,14 +1,5 @@ inheritance: true reviews: path_filters: - # Exclude boilerplate changes from review + # Boilerplate-managed: skip review of boilerplate changes - "!boilerplate/**" - - # Exclude build artifacts and dependencies - - "!build/**" - - "!.venv/**" - - "!vendor/**" - - # Exclude test fixtures - - "!**/testdata/**" - - "!**/.test-fixtures/**" diff --git a/boilerplate/openshift/golang-osd-operator/update b/boilerplate/openshift/golang-osd-operator/update index 8a625a93..0318348d 100755 --- a/boilerplate/openshift/golang-osd-operator/update +++ b/boilerplate/openshift/golang-osd-operator/update @@ -14,9 +14,14 @@ source $CONVENTION_ROOT/_lib/common.sh echo "Copying .codecov.yml to your repository root." cp ${HERE}/.codecov.yml $REPO_ROOT -# Add CodeRabbit configuration -echo "Copying .coderabbit.yaml to your repository root." -cp ${HERE}/.coderabbit.yaml $REPO_ROOT +# Seed CodeRabbit configuration without overwriting repo customizations. +CODERABBIT_CONFIG="${REPO_ROOT}/.coderabbit.yaml" +if [[ ! -f "${CODERABBIT_CONFIG}" ]]; then + echo "Copying .coderabbit.yaml to your repository root." + cp "${HERE}/.coderabbit.yaml" "${CODERABBIT_CONFIG}" +else + echo ".coderabbit.yaml already exists; leaving it unchanged." +fi # Add OWNERS_ALIASES to $REPO_ROOT echo "Copying OWNERS_ALIASES to your repository root." diff --git a/build/Dockerfile b/build/Dockerfile index cb607638..b8059ed7 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -8,7 +8,7 @@ COPY . . RUN make go-build #### -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1788166357 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1789349365 ENV USER_UID=1001 \ USER_NAME=cloud-ingress-operator diff --git a/build/Dockerfile.olm-registry b/build/Dockerfile.olm-registry index 08bf2be5..1ef66c46 100644 --- a/build/Dockerfile.olm-registry +++ b/build/Dockerfile.olm-registry @@ -4,7 +4,7 @@ COPY ${SAAS_OPERATOR_DIR} manifests RUN initializer --permissive # ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1788166357 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1789349365 COPY --from=builder /bin/registry-server /bin/registry-server COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe