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.

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

🌱 synch dockerfiles with grpc-health-probe version in go.mod #1577

Merged
merged 2 commits into from
Feb 12, 2025

Conversation

grokspawn
Copy link
Contributor

Resolves #1561

This sets the grpc-health-probe version used in all project Dockerfiles to use the same version as the go.mod.

Description of the change:

Motivation for the change:

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 10, 2025
Copy link

codecov bot commented Feb 10, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 46.77%. Comparing base (81056f9) to head (cb99c30).
Report is 6 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1577      +/-   ##
==========================================
+ Coverage   46.76%   46.77%   +0.01%     
==========================================
  Files         135      135              
  Lines       15776    15883     +107     
==========================================
+ Hits         7377     7429      +52     
- Misses       7358     7413      +55     
  Partials     1041     1041              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -5,7 +5,7 @@ WORKDIR /build

COPY . .
RUN make static
RUN GRPC_HEALTH_PROBE_VERSION=v0.4.28 && \
RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we maybe do something like

Suggested change
RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \
RUN GRPC_HEALTH_PROBE_VERSION=$(go list -m github.com/grpc-ecosystem/grpc-health-probe | cut -d " " -f2) && \

?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and we should fix the FROM/AS case parity on line 1, i.e. FROM golang:1.23-alpine AS builder

@@ -2,7 +2,7 @@
# build opm images. See the configurations in .goreleaser.yaml
# and .github/workflows/release.yaml.

FROM ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.29 as grpc_health_probe
FROM ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.37 as grpc_health_probe
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.37 as grpc_health_probe
FROM ghcr.io/grpc-ecosystem/grpc-health-probe:v0.4.37 AS grpc_health_probe

@@ -5,7 +5,7 @@ WORKDIR /build

COPY . .
RUN make static
RUN GRPC_HEALTH_PROBE_VERSION=v0.4.28 && \
RUN GRPC_HEALTH_PROBE_VERSION=v0.4.37 && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should fix the FROM/AS case parity in this one too
i.e. line 1 goes to FROM golang:1.23-alpine AS builder

Signed-off-by: Jordan Keister <[email protected]>
Copy link
Contributor

openshift-ci bot commented Feb 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: grokspawn, perdasilva

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [grokspawn,perdasilva]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@grokspawn grokspawn added this pull request to the merge queue Feb 12, 2025
Merged via the queue into operator-framework:master with commit 57fd364 Feb 12, 2025
11 of 12 checks passed
@grokspawn grokspawn deleted the bump-health-probe branch February 12, 2025 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OPM image has critical security vulnerability
2 participants