Skip to content

Commit 85a5050

Browse files
authored
Merge pull request #692 from Ankit152/slsre-523
[SLSRE-523] [OSD Audit 2026] Addon-Operator - High Vulnerability Remediation
2 parents 5d2e02f + f74db1a commit 85a5050

12 files changed

Lines changed: 14 additions & 14 deletions

File tree

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: boilerplate
33
namespace: openshift
4-
tag: image-v7.4.0
4+
tag: image-v8.3.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
image-v7.4.0
1+
image-v8.3.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3a53b879fcefaa73705c6621d386953df95a4842
1+
e16189b1e1fb49e61237798a885a158e232a6ff5

boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY ${SAAS_OPERATOR_DIR} manifests
44
RUN initializer --permissive
55

66
# ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
7-
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
7+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
88

99
COPY --from=builder /bin/registry-server /bin/registry-server
1010
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe

boilerplate/openshift/golang-osd-operator/ensure.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fi
88
REPO_ROOT=$(git rev-parse --show-toplevel)
99
source $REPO_ROOT/boilerplate/_lib/common.sh
1010

11-
GOLANGCI_LINT_VERSION="2.0.2"
11+
GOLANGCI_LINT_VERSION="2.7.2"
1212
OPM_VERSION="v1.23.2"
1313
GRPCURL_VERSION="1.7.0"
1414
DEPENDENCY=${1:-}

build/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/redhat-services-prod/openshift/boilerplate:image-v7.4.0 AS builder
1+
FROM quay.io/redhat-services-prod/openshift/boilerplate:image-v8.3.1 AS builder
22

33
WORKDIR /workdir
44

@@ -10,7 +10,7 @@ COPY . .
1010
RUN make go-build
1111

1212
###
13-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1752564239
13+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1770267347
1414

1515
ENV USER_UID=1001 \
1616
USER_NAME=addon-operator

build/Dockerfile.olm-registry

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ COPY ${SAAS_OPERATOR_DIR} manifests
44
RUN initializer --permissive
55

66
# ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
7-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1752564239
7+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1770267347
88

99
COPY --from=builder /bin/registry-server /bin/registry-server
1010
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe

build/Dockerfile.webhook

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/redhat-services-prod/openshift/boilerplate:image-v7.0.0 AS builder
1+
FROM quay.io/redhat-services-prod/openshift/boilerplate:image-v8.3.1 AS builder
22

33
WORKDIR /workdir
44

@@ -10,7 +10,7 @@ COPY . .
1010
RUN GOOS=linux CGO_ENABLED=1 GOARCH=amd64 GOFLAGS="" go build -o build/_output/bin/addon-operator-webhook ./cmd/addon-operator-webhook
1111

1212
###
13-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1752564239
13+
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1770267347
1414

1515
ENV USER_UID=1001 \
1616
USER_NAME=addon-operator

deploy-extras/docker/Dockerfile.src.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Used for local dev only
2-
FROM registry.access.redhat.com/ubi8/ubi:8.8-1032
2+
FROM registry.access.redhat.com/ubi9/ubi:9.7-1770238273
33

44
RUN yum update -y && yum install -y python3 python3-pip
55

deploy-extras/docker/api-mock.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Used for local dev only
2-
FROM registry.access.redhat.com/ubi8/ubi:8.8-1032
2+
FROM registry.access.redhat.com/ubi9/ubi:9.7-1770238273
33

44
WORKDIR /
55

0 commit comments

Comments
 (0)