Skip to content

[VC-45997] Fix agent version by adding gomodule_name to handle go module / repo mismatch #733

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[VC-45997] Fix agent version by adding gomodule_name to handle go module / repo mismatch #733

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f97684d
Use gomodule_name to handle go module/repo mismatch
wallrj-cyberark Oct 16, 2025
294fcba
remove trailing \
Oct 17, 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
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// TODO(wallrj): Rename the Go module to match the repository name
module github.com/jetstack/preflight

go 1.24.4
Expand Down
27 changes: 15 additions & 12 deletions make/00_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
repo_name := github.com/jetstack/jetstack-secure
# TODO(wallrj): This is a hack to allow use the old preflight repo name in the
# gci section of the golangci-lint config until we can rename the go module.
# Without this hack, golangci-lint will complain that the
# github.com/jetstack/preflight imports should be grouped with all the other
# third-party modules.
generate-golangci-lint-config: repo_name := github.com/jetstack/preflight
# This is a work around for the mismatch between the repo name and the go module
# name. It allows golangci-lint to group the github.com/jetstack/preflight
# imports correctly. And it allows the version information to be injected into
# the version package via Go ldflags.
#
# TODO(wallrj): Rename the Go module to match the repository name.
gomodule_name := github.com/jetstack/preflight

generate-golangci-lint-config: repo_name := $(gomodule_name)

license_ignore := gitlab.com/venafi,github.com/jetstack

Expand All @@ -16,12 +19,12 @@ build_names := preflight
go_preflight_main_dir := .
go_preflight_mod_dir := .
go_preflight_ldflags := \
-X $(repo_name)/pkg/version.PreflightVersion=$(VERSION) \
-X $(repo_name)/pkg/version.Commit=$(GITCOMMIT) \
-X $(repo_name)/pkg/version.BuildDate=$(shell date "+%F-%T-%Z") \
-X $(repo_name)/pkg/client.ClientID=k3TrDbfLhCgnpAbOiiT2kIE1AbovKzjo \
-X $(repo_name)/pkg/client.ClientSecret=f39w_3KT9Vp0VhzcPzvh-uVbudzqCFmHER3Huj0dvHgJwVrjxsoOQPIw_1SDiCfa \
-X $(repo_name)/pkg/client.AuthServerDomain=auth.jetstack.io
-X $(gomodule_name)/pkg/version.PreflightVersion=$(VERSION) \
-X $(gomodule_name)/pkg/version.Commit=$(GITCOMMIT) \
-X $(gomodule_name)/pkg/version.BuildDate=$(shell date "+%F-%T-%Z") \
-X $(gomodule_name)/pkg/client.ClientID=k3TrDbfLhCgnpAbOiiT2kIE1AbovKzjo \
-X $(gomodule_name)/pkg/client.ClientSecret=f39w_3KT9Vp0VhzcPzvh-uVbudzqCFmHER3Huj0dvHgJwVrjxsoOQPIw_1SDiCfa \
-X $(gomodule_name)/pkg/client.AuthServerDomain=auth.jetstack.io

oci_preflight_base_image_flavor := static
oci_preflight_image_name := quay.io/jetstack/venafi-agent
Expand Down
6 changes: 3 additions & 3 deletions make/ark/00_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ build_names += ark
go_ark_main_dir := ./cmd/ark
go_ark_mod_dir := .
go_ark_ldflags := \
-X $(repo_name)/pkg/version.PreflightVersion=$(VERSION) \
-X $(repo_name)/pkg/version.Commit=$(GITCOMMIT) \
-X $(repo_name)/pkg/version.BuildDate=$(shell date "+%F-%T-%Z") \
-X $(gomodule_name)/pkg/version.PreflightVersion=$(VERSION) \
-X $(gomodule_name)/pkg/version.Commit=$(GITCOMMIT) \
-X $(gomodule_name)/pkg/version.BuildDate=$(shell date "+%F-%T-%Z") \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Extra \ at the end.


oci_ark_base_image_flavor := static
oci_ark_image_name := quay.io/jetstack/disco-agent
Expand Down