Skip to content

Commit 8702137

Browse files
Merge pull request #34 from VaishnaviHire/sync_2.25
Sync changes for 2.25 release
2 parents 7c6cd89 + cc0cc6c commit 8702137

31 files changed

+201
-116
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Each line is a file pattern followed by one or more owners.
2+
3+
# These owners will be the default owners for everything in
4+
# the repo. Unless a later match takes precedence,
5+
* @cdoern @derekhiggins @Elbehery @leseb @mfleader @nathan-weinberg @rhdedgar @rhuss @skamenan7 @VaishnaviHire

.github/workflows/code-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
1717
with:
18-
go-version: '1.21'
18+
go-version-file: go.mod
1919

2020
- name: Set up limgo
2121
uses: GoTestTools/limgo-action@d4a725a46ab3bdbbf23186bbbe54b4ff4a35d5a7 # v1.0.2

.github/workflows/generate-release.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ permissions:
1919
env:
2020
GIT_USER_NAME: github-actions[bot]
2121
GIT_USER_EMAIL: github-actions[bot]@users.noreply.github.com
22-
GO_VERSION: '1.23'
2322

2423
jobs:
2524
generate-release:
@@ -91,9 +90,9 @@ jobs:
9190
fi
9291
9392
- name: Set up Go
94-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
93+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 #v 5.5.0
9594
with:
96-
go-version: ${{ env.GO_VERSION }}
95+
go-version-file: go.mod
9796

9897
- name: Prepare release files
9998
shell: bash
@@ -244,9 +243,9 @@ jobs:
244243
GH_TOKEN: ${{ github.token }}
245244

246245
- name: Set up Go
247-
uses: actions/setup-go@a26af69be951a213d495a4c3e4e4022e16d87065
246+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
248247
with:
249-
go-version: ${{ env.GO_VERSION }}
248+
go-version-file: go.mod
250249

251250
- name: Build release image
252251
shell: bash

.github/workflows/main-build-image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
1414
runs-on: ubuntu-24.04
1515
steps:
16-
- name: Set up Go 1.23
17-
uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
18-
with:
19-
go-version: '1.23'
20-
2116
- name: Checkout code
2217
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
2318

19+
- name: Set up Go 1.24
20+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
21+
with:
22+
go-version-file: go.mod
23+
2424
- name: Login to Quay.io
2525
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
2626
with:

.github/workflows/odh-build-image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
build-latest-image:
1414
runs-on: ubuntu-24.04
1515
steps:
16-
- name: Set up Go 1.23
17-
uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495
18-
with:
19-
go-version: '1.23'
20-
2116
- name: Checkout code
2217
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
2318

19+
- name: Set up Go 1.24
20+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
21+
with:
22+
go-version-file: go.mod
23+
2424
- name: Login to Quay.io
2525
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
2626
with:

.github/workflows/release-image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
build-release-image:
2121
runs-on: ubuntu-24.04
2222
steps:
23-
- name: Set up Go 1.23
24-
uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
23+
- name: Set up Go 1.24
24+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2525
with:
26-
go-version: '1.23'
26+
go-version-file: go.mod
2727

2828
- name: Checkout code
2929
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

.github/workflows/run-e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
1717
with:
18-
go-version: '1.21'
18+
go-version-file: go.mod
1919

2020
- name: Set up Docker Buildx
2121
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# Build the manager binary
2-
ARG GOLANG_VERSION=1.23
2+
ARG GOLANG_VERSION=1.24
33

4-
FROM registry.access.redhat.com/ubi8/go-toolset:${GOLANG_VERSION} as builder
4+
FROM registry.access.redhat.com/ubi9/go-toolset:${GOLANG_VERSION} as builder
55
ARG TARGETOS=linux
66
ARG TARGETARCH
7-
ARG CGO_ENABLED=0
7+
ARG CGO_ENABLED=1
8+
ARG GOTAGS=strictfipsruntime,openssl
9+
ENV GOEXPERIMENT=strictfipsruntime
810

911
WORKDIR /workspace
1012
# Copy the Go Modules manifests
@@ -26,14 +28,15 @@ USER root
2628

2729
# GOARCH is intentionally left empty to automatically detect the host architecture
2830
# This ensures the binary matches the platform where image-build is executed
29-
RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -o manager main.go
31+
RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -a -tags=${GOTAGS} -o manager main.go
3032

3133
# Use distroless as minimal base image to package the manager binary
3234
# Refer to https://github.com/GoogleContainerTools/distroless for more details
3335
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
3436
WORKDIR /
3537
COPY --from=builder /workspace/manager .
3638
COPY --from=builder /workspace/controllers/manifests ./manifests/
39+
RUN microdnf install -y openssl && microdnf clean all
3740
USER 1001
3841

3942
ENTRYPOINT ["/manager"]

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ test-e2e: ## Run e2e tests
151151
GOLANGCI_LINT_TIMEOUT ?= 5m0s
152152
.PHONY: lint
153153
lint: golangci-lint ## Run golangci-lint against code.
154-
$(GOLANGCI_LINT) run --timeout=$(GOLANGCI_LINT_TIMEOUT) --sort-results
154+
$(GOLANGCI_LINT) run --timeout=$(GOLANGCI_LINT_TIMEOUT)
155155

156156
.PHONY: lint-fix
157157
lint-fix: golangci-lint ## Run golangci-lint fix against code.
158-
$(GOLANGCI_LINT) run --fix --sort-results
158+
$(GOLANGCI_LINT) run --fix
159159

160160
##@ Build
161161

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ kubectl apply -f config/samples/example-with-configmap.yaml
109109
### Prerequisites
110110

111111
- Kubernetes cluster (v1.20 or later)
112-
- Go version **go1.23**
112+
- Go version **go1.24**
113113
- operator-sdk **v1.39.2** (v4 layout) or newer
114114
- kubectl configured to access your cluster
115115
- A running inference server:

0 commit comments

Comments
 (0)