Skip to content

Commit b9478f9

Browse files
authored
chore: set user agent on release (#1013)
1 parent 0b35805 commit b9478f9

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ include Makefile-az.mk
44
LDFLAGS ?= -ldflags=-X=sigs.k8s.io/karpenter/pkg/operator.Version=$(shell git describe --tags --always | cut -d"v" -f2)
55

66
GOFLAGS ?= $(LDFLAGS)
7-
WITH_GOFLAGS = GOFLAGS="$(GOFLAGS)"
87

98
# # CR for local builds of Karpenter
109
KARPENTER_NAMESPACE ?= kube-system
@@ -116,10 +115,10 @@ codegen: ## Auto generate files based on Azure API responses
116115
./hack/codegen.sh
117116

118117
snapshot: az-login ## Builds and publishes snapshot release
119-
$(WITH_GOFLAGS) ./hack/release/snapshot.sh
118+
./hack/release/snapshot.sh
120119

121120
release: az-login ## Builds and publishes stable release
122-
$(WITH_GOFLAGS) ./hack/release/release.sh
121+
./hack/release/release.sh
123122

124123
toolchain: ## Install developer toolchain
125124
./hack/toolchain.sh

hack/release/common.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ buildAndPublish() {
7070
exit 1
7171
fi
7272

73-
img="$(GOFLAGS=${GOFLAGS:-} \
73+
img="$(GOFLAGS="${GOFLAGS:-} -ldflags=-X=sigs.k8s.io/karpenter/pkg/operator.Version=${version}" \
7474
SOURCE_DATE_EPOCH="${date_epoch}" KO_DATA_DATE_EPOCH="${date_epoch}" KO_DOCKER_REPO="${oci_repo}" \
7575
ko publish -B --sbom none -t "${version}" ./cmd/controller)"
76-
img_nap="$(GOFLAGS="${GOFLAGS:-} -tags=ccp" \
76+
img_nap="$(GOFLAGS="${GOFLAGS:-} -ldflags=-X=sigs.k8s.io/karpenter/pkg/operator.Version=${version}-aks -tags=ccp" \
7777
SOURCE_DATE_EPOCH="${date_epoch}" KO_DATA_DATE_EPOCH="${date_epoch}" KO_DOCKER_REPO="${oci_repo}" \
7878
ko publish -B --sbom none -t "${version}"-aks ./cmd/controller)"
7979

pkg/auth/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ import (
2323
)
2424

2525
func GetUserAgentExtension() string {
26-
return fmt.Sprintf("karpenter-aks/v%s", operator.Version)
26+
return fmt.Sprintf("karpenter/v%s", operator.Version)
2727
}

0 commit comments

Comments
 (0)