Skip to content

Commit 700ec60

Browse files
authored
ACM-18716 Update to go 1.23 and UBI 9 (#379)
* ACM-18716 Update to UBI 9 Signed-off-by: Jorge Padilla <jpadilla@redhat.com> * Go 1.23 Signed-off-by: Jorge Padilla <jpadilla@redhat.com> * Clean dockerfile and dockerfile.rhtap Signed-off-by: Jorge Padilla <jpadilla@redhat.com> * Fix failing test Signed-off-by: Jorge Padilla <jpadilla@redhat.com> --------- Signed-off-by: Jorge Padilla <jpadilla@redhat.com>
1 parent fcbb274 commit 700ec60

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

.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: builder
33
namespace: stolostron
4-
tag: go1.22-linux
4+
tag: go1.23-linux

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright Contributors to the Open Cluster Management project
22

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

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

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

1111
ARG VCS_REF
1212
ARG VCS_URL
@@ -39,8 +39,7 @@ LABEL org.label-schema.vendor="Red Hat" \
3939
io.k8s.description="$IMAGE_DESCRIPTION" \
4040
io.openshift.tags="$IMAGE_OPENSHIFT_TAGS"
4141

42-
RUN microdnf update &&\
43-
microdnf install ca-certificates vi --nodocs &&\
42+
RUN microdnf install -y ca-certificates vi --nodocs &&\
4443
microdnf clean all
4544

4645
COPY --from=builder /go/src/github.com/stolostron/search-v2-api/main /bin/main

Dockerfile.rhtap

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright Contributors to the Open Cluster Management project
22

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

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

43-
RUN microdnf update -y &&\
44-
microdnf install -y ca-certificates vi --nodocs &&\
43+
RUN microdnf install -y ca-certificates vi --nodocs &&\
4544
microdnf clean all
4645

4746
COPY --from=builder /go/src/github.com/stolostron/search-v2-api/main /bin/main

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/stolostron/search-v2-api
22

3-
go 1.22
3+
go 1.23.0
44

55
require (
66
github.com/99designs/gqlgen v0.17.31

pkg/resolver/related_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func Test_SearchResolver_Relationships(t *testing.T) {
2828
mockRows := newMockRowsWithoutRBAC("./mocks/mock-rel-1.json", searchInput, "", 0)
2929
mockPool.EXPECT().Query(gomock.Any(),
3030
gomock.Eq(query),
31-
gomock.Eq([]interface{}{}),
31+
gomock.Any(),
3232
).Return(mockRows, nil)
3333

3434
// Mock SECOND database request.

0 commit comments

Comments
 (0)