Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ACM-18716 Update to go 1.23 and UBI 9 #379

Merged
merged 5 commits into from
Mar 19, 2025
Merged

ACM-18716 Update to go 1.23 and UBI 9 #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a90153
ACM-18716 Update to UBI 9
jlpadilla Mar 12, 2025
7f2bbb6
Go 1.23
jlpadilla Mar 18, 2025
d055000
Merge branch 'main' into jorge/ubi9
jlpadilla Mar 18, 2025
83e9630
Clean dockerfile and dockerfile.rhtap
jlpadilla Mar 19, 2025
474ef9e
Fix failing test
jlpadilla Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: builder
namespace: stolostron
tag: go1.22-linux
tag: go1.23-linux
7 changes: 3 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Copyright Contributors to the Open Cluster Management project

FROM registry.ci.openshift.org/stolostron/builder:go1.22-linux AS builder
FROM registry.ci.openshift.org/stolostron/builder:go1.23-linux AS builder

WORKDIR /go/src/github.com/stolostron/search-v2-api
COPY . .
RUN CGO_ENABLED=1 GOGC=25 go build -trimpath -o main main.go

FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1216
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest

ARG VCS_REF
ARG VCS_URL
Expand Down Expand Up @@ -39,8 +39,7 @@ LABEL org.label-schema.vendor="Red Hat" \
io.k8s.description="$IMAGE_DESCRIPTION" \
io.openshift.tags="$IMAGE_OPENSHIFT_TAGS"

RUN microdnf update &&\
microdnf install ca-certificates vi --nodocs &&\
RUN microdnf install -y ca-certificates vi --nodocs &&\
microdnf clean all

COPY --from=builder /go/src/github.com/stolostron/search-v2-api/main /bin/main
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile.rhtap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright Contributors to the Open Cluster Management project

FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 AS builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 AS builder

WORKDIR /go/src/github.com/stolostron/search-v2-api
COPY . .
Expand Down Expand Up @@ -40,8 +40,7 @@ LABEL org.label-schema.vendor="Red Hat" \
io.k8s.description="$IMAGE_DESCRIPTION" \
io.openshift.tags="$IMAGE_OPENSHIFT_TAGS"

RUN microdnf update -y &&\
microdnf install -y ca-certificates vi --nodocs &&\
RUN microdnf install -y ca-certificates vi --nodocs &&\
microdnf clean all

COPY --from=builder /go/src/github.com/stolostron/search-v2-api/main /bin/main
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/stolostron/search-v2-api

go 1.22
go 1.23.0

require (
github.com/99designs/gqlgen v0.17.31
Expand Down
2 changes: 1 addition & 1 deletion pkg/resolver/related_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func Test_SearchResolver_Relationships(t *testing.T) {
mockRows := newMockRowsWithoutRBAC("./mocks/mock-rel-1.json", searchInput, "", 0)
mockPool.EXPECT().Query(gomock.Any(),
gomock.Eq(query),
gomock.Eq([]interface{}{}),
gomock.Any(),
).Return(mockRows, nil)

// Mock SECOND database request.
Expand Down