Skip to content

Commit 7bc288a

Browse files
authored
build: bring back v prefix in releases (#760)
**What problem does this PR solve?**: In v0.11.0 release we discovered that the "v" was unintentionally dropped [in this PR](https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pull/745/files). Bringing it back. **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent e106072 commit 7bc288a

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

.goreleaser.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ before:
4141
name: caren-system
4242
$(helm template {{ .ProjectName }} ./charts/{{ .ProjectName }} \
4343
--namespace caren-system \
44-
--set-string image.tag={{ .Version }} \
45-
--set-string helmRepositoryImage.tag={{ .Version }}{{ if .IsSnapshot }}-{{ .Env.GOARCH }} \
44+
--set-string image.tag=v{{ trimprefix .Version "v" }} \
45+
--set-string helmRepositoryImage.tag=v{{ trimprefix .Version "v" }}{{ if .IsSnapshot }}-{{ .Env.GOARCH }} \
4646
--set-string image.repository=ko.local/{{ .ProjectName }}{{ end }} \
4747
)
4848
EOF'
49-
- sed -i -e 's/\${/$${/g' -e 's/v0.0.0-dev/{{ .Version }}/g' runtime-extension-components.yaml
49+
- sed -i -e 's/\${/$${/g' -e 's/v0.0.0-dev/v{{ trimprefix .Version "v" }}/g' runtime-extension-components.yaml
5050
- |
5151
sh -ec 'gojq --yaml-input --yaml-output \
5252
".releaseSeries |= (. + [{contract: \"v1beta1\", major: {{ .Major }}, minor: {{ .Minor }}}] | unique)" \
@@ -66,7 +66,7 @@ builds:
6666
- -X 'k8s.io/component-base/version.buildDate={{ .CommitDate }}'
6767
- -X 'k8s.io/component-base/version.gitCommit={{ .FullCommit }}'
6868
- -X 'k8s.io/component-base/version.gitTreeState={{ .Env.GIT_TREE_STATE }}'
69-
- -X 'k8s.io/component-base/version.gitVersion={{ .Version }}'
69+
- -X 'k8s.io/component-base/version.gitVersion=v{{ trimprefix .Version "v" }}'
7070
- -X 'k8s.io/component-base/version.major={{ .Major }}'
7171
- -X 'k8s.io/component-base/version.minor={{ .Minor }}'
7272
- -X 'k8s.io/component-base/version/verflag.programName={{ .ProjectName }}'
@@ -85,18 +85,18 @@ builds:
8585
KO_DOCKER_REPO=ko.local/{{ .ProjectName }} \
8686
ko build \
8787
--bare \
88-
-t {{ .Version }} \
88+
-t v{{ trimprefix .Version "v" }} \
8989
./cmd
9090
fi'
9191
9292
archives:
93-
- name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}'
93+
- name_template: '{{ .ProjectName }}_v{{ trimprefix .Version "v" }}_{{ .Os }}_{{ .Arch }}'
9494
builds:
9595
- cluster-api-runtime-extensions-nutanix
9696

9797
dockers:
9898
- image_templates:
99-
- 'ghcr.io/nutanix-cloud-native/caren-helm-reg:{{ .Version }}-amd64'
99+
- 'ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-amd64'
100100
use: buildx
101101
dockerfile: ./hack/addons/mindthegap-helm-registry/Dockerfile
102102
extra_files:
@@ -107,11 +107,11 @@ dockers:
107107
- "--label=org.opencontainers.image.created={{.CommitDate}}"
108108
- "--label=org.opencontainers.image.title=caren-helm-reg"
109109
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
110-
- '--label=org.opencontainers.image.version={{ .Version }}'
110+
- '--label=org.opencontainers.image.version=v{{ trimprefix .Version "v" }}'
111111
- "--label=org.opencontainers.image.source={{.GitURL}}"
112112
goarch: amd64
113113
- image_templates:
114-
- 'ghcr.io/nutanix-cloud-native/caren-helm-reg:{{ .Version }}-arm64'
114+
- 'ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-arm64'
115115
use: buildx
116116
dockerfile: ./hack/addons/mindthegap-helm-registry/Dockerfile
117117
extra_files:
@@ -122,15 +122,15 @@ dockers:
122122
- "--label=org.opencontainers.image.created={{.CommitDate}}"
123123
- "--label=org.opencontainers.image.title=caren-helm-reg"
124124
- "--label=org.opencontainers.image.revision={{.FullCommit}}"
125-
- '--label=org.opencontainers.image.version={{ .Version }}'
125+
- '--label=org.opencontainers.image.version=v{{ trimprefix .Version "v" }}'
126126
- "--label=org.opencontainers.image.source={{.GitURL}}"
127127
goarch: arm64
128128

129129
docker_manifests:
130-
- name_template: ghcr.io/nutanix-cloud-native/caren-helm-reg:{{ .Version }}
130+
- name_template: ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}
131131
image_templates:
132-
- ghcr.io/nutanix-cloud-native/caren-helm-reg:{{ .Version }}-amd64
133-
- ghcr.io/nutanix-cloud-native/caren-helm-reg:{{ .Version }}-arm64
132+
- ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-amd64
133+
- ghcr.io/nutanix-cloud-native/caren-helm-reg:v{{ trimprefix .Version "v" }}-arm64
134134

135135
kos:
136136
- id: cluster-api-runtime-extensions-nutanix
@@ -141,23 +141,23 @@ kos:
141141
- -X 'k8s.io/component-base/version.buildDate={{ .CommitDate }}'
142142
- -X 'k8s.io/component-base/version.gitCommit={{ .FullCommit }}'
143143
- -X 'k8s.io/component-base/version.gitTreeState={{ .Env.GIT_TREE_STATE }}'
144-
- -X 'k8s.io/component-base/version.gitVersion={{ .Version }}'
144+
- -X 'k8s.io/component-base/version.gitVersion=v{{ trimprefix .Version "v" }}'
145145
- -X 'k8s.io/component-base/version.major={{ .Major }}'
146146
- -X 'k8s.io/component-base/version.minor={{ .Minor }}'
147147
- -X 'k8s.io/component-base/version/verflag.programName={{ .ProjectName }}'
148148
labels:
149149
org.opencontainers.image.created: "{{ .CommitDate }}"
150150
org.opencontainers.image.title: "{{ .ProjectName }}"
151151
org.opencontainers.image.revision: "{{ .FullCommit }}"
152-
org.opencontainers.image.version: "{{ .Version }}"
152+
org.opencontainers.image.version: 'v{{ trimprefix .Version "v" }}'
153153
org.opencontainers.image.source: "{{ .GitURL }}"
154154
platforms:
155155
- linux/amd64
156156
- linux/arm64
157157
repository: ghcr.io/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix
158158
bare: true
159159
tags:
160-
- "{{ .Version }}"
160+
- 'v{{ trimprefix .Version "v" }}'
161161

162162
checksum:
163163
name_template: 'checksums.txt'

0 commit comments

Comments
 (0)