Skip to content

Commit 5768eb8

Browse files
committed
feat(nautobotop): release with the monorepo tag
nautobotop was released on its own nautobotop-vX.Y.Z tag, with the chart published to an OCI registry and a separate chart version pinned in the ArgoCD values. Release it the way openstack-sync-operator is instead. - Move the Helm chart to charts/nautobotop and deploy it from git at understack_ref. - Build the image from containers.yaml on the repo-wide v* tags and on changes under go/nautobotop. - Default the image tag to understack_ref when it is a release tag, otherwise latest. A tag pinned in the deploy repo still wins. - Remove the nautobotop-v* workflow, goreleaser config and the global.nautobotop.chartVersion value. - Stop labelling nautobotop-only changes skip-changelog, since they now ship with the platform release.
1 parent 0369d6b commit 5768eb8

25 files changed

Lines changed: 41 additions & 218 deletions

‎.github/labeler.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
# CLI utilities and operators, tagged understackctl/vX.Y.Z and friends
1616
- changed-files:
1717
- all-globs-to-all-files: ["go/understackctl/**"]
18-
- changed-files:
19-
- all-globs-to-all-files: ["go/nautobotop/**"]
2018
- changed-files:
2119
- all-globs-to-all-files: ["go/dexop/**"]
2220
- changed-files:

‎.github/workflows/build-nautobotop.yaml‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎.github/workflows/containers.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- "containers/ironic-nautobot-client/**"
1414
- "containers/ironic-vnc-container/**"
1515
- "containers/openstack-sync-operator/**"
16+
- "go/nautobotop/**"
1617
- "containers/understack-tests/**"
1718
- "python/**"
1819
- ".github/workflows/containers.yaml"
@@ -47,6 +48,10 @@ jobs:
4748
target: prod
4849
- name: nautobot
4950
target: prod
51+
- name: nautobotop
52+
target: ''
53+
dockerfile_path: ./go/nautobotop/Dockerfile
54+
context_path: "./go/nautobotop/"
5055
uses: ./.github/workflows/build-container-reuse.yaml
5156
secrets: inherit
5257
with:

‎RELEASING.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@ them. Pushing the tag triggers `containers.yaml` and `containers-openstack.yaml`
55
to publish container images, and `release-notes.yaml` to assemble the release
66
notes and create the GitHub release.
77

8-
Per-artifact tags (`understackctl/vX.Y.Z`, `nautobotop-vX.Y.Z`,
9-
`kubectl-us/vX.Y.Z`, `ironic-hardware-exporter/vX.Y.Z`, `dexop-vX.Y.Z`,
10-
`ironic-ipxe/vX.Y.Z`) are released independently. See
8+
`nautobotop` is released with the repository-wide tag: its image is built by
9+
`containers.yaml` and its Helm chart is deployed straight from
10+
`charts/nautobotop/` at `understack_ref`, like `openstack-sync-operator`.
11+
12+
Per-artifact tags (`understackctl/vX.Y.Z`, `kubectl-us/vX.Y.Z`,
13+
`ironic-hardware-exporter/vX.Y.Z`, `dexop-vX.Y.Z`, `ironic-ipxe/vX.Y.Z`) are released independently. See
1114
[Separately released artifacts](#separately-released-artifacts) below.
1215

1316
## Writing a release note

‎charts/argocd-understack/templates/application-nautobotop.yaml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,24 @@ spec:
1515
server: {{ $.Values.cluster_server }}
1616
project: understack
1717
sources:
18-
- chart: nautobotop
18+
- path: charts/nautobotop
19+
ref: understack
20+
repoURL: {{ include "understack.understack_url" $ }}
21+
targetRevision: {{ include "understack.understack_ref" $ }}
1922
helm:
2023
ignoreMissingValueFiles: true
2124
releaseName: nautobotop
2225
valueFiles:
26+
- $understack/charts/nautobotop/values.yaml
2327
- $deploy/{{ include "understack.deploy_path" $ }}/nautobotop/values.yaml
24-
repoURL: ghcr.io/rackerlabs/charts
25-
targetRevision: {{ $.Values.global.nautobotop.chartVersion }}
28+
{{- $ref := include "understack.understack_ref" $ }}
29+
{{- if regexMatch "^v[0-9]+\\.[0-9]+\\.[0-9]+$" $ref }}
30+
# Run the image built from the same release tag as the chart. Any other
31+
# ref (HEAD, main, a branch) has no matching tag, so the chart uses latest.
32+
parameters:
33+
- name: understackRef
34+
value: {{ $ref | quote }}
35+
{{- end }}
2636
- path: {{ include "understack.deploy_path" $ }}/nautobotop
2737
ref: deploy
2838
repoURL: {{ include "understack.deploy_url" $ }}

‎charts/argocd-understack/values.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ global:
165165
# -- Enable/disable deploying Nautobot Operator
166166
# @default -- false
167167
enabled: false
168-
# -- Chart version for Nautobot Operator
169-
# @default -- 0.0.3
170-
chartVersion: 0.0.3
171168

172169
# -- OpenEBS
173170
openebs:
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,3 @@ type: application
1414
# to the chart and its templates, including the app version.
1515
# Versions are expected to follow Semantic Versioning (https://semver.org/)
1616
version: 0.1.0
17-
# This is the version number of the application being deployed. This version number should be
18-
# incremented each time you make changes to the application. Versions are not expected to
19-
# follow Semantic Versioning. They should reflect the version the application is using.
20-
# It is recommended to use it with quotes.
21-
appVersion: 0.0.18

0 commit comments

Comments
 (0)