Repository navigation
Fix the duplicate fleet name check in the fleetctl new GitOps template - #55353
Conversation
The template's gitops.sh used `! perl ... | grep . -cq`, which never stops the script: set -e ignores a command that starts with `!`. This applies the same fix fleetdm#53469 made to .github/actions/gitops/gitops.sh. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
WalkthroughThe generated GitOps script now detects duplicate fleet names, prints an error to stderr, and exits with status 1. A changelog entry describes this change and relates it to a prior fix in Fleet’s GitOps action. Priority: ⬇️ Low Merge Risk: ⚪ Minimal · up to
|
|
Thanks for the contribution, @chrsdrhm! We appreciate you taking the time to fix this. We are converting this to draft while we review it through our community contribution process. We will follow up here once the review is complete. |
There was a problem hiding this comment.
🔵 Needs a closer look
The visible script change has no identified issues, but the excluded file requires human review before full approval.
No open issues 🎉
1 file not reviewed
changes/53726-gitops-template-duplicate-fleet-check: Excluded by your content exclusion settings
What changed in this PR
Updates the fleetctl new GitOps template to match the duplicate-name validation introduced in #53469.
Changes:
- Replaces the negated pipeline with an explicit duplicate-name check.
- Prints an error and exits before GitOps runs when duplicate names are found.
| File | Description |
|---|---|
cmd/fleetctl/fleetctl/templates/new/.github/fleet-gitops/gitops.sh |
Stops generated GitOps workflows on duplicate fleet names. |
Review effort: Balanced
**Related issue:** NA Adds Fleet's November 2026 newsletter (`articles/newsletter-2026-11.md`), which covers October 2026. It publishes at `fleetdm.com/newsletters/newsletter-2026-11`. - **Email subject line:** `Fleet news: November 2026` - **Category:** `newsletter`, singular, which the website build accepts (#52120). No website changes are needed. - **Author:** Aube Paul (`robinedev`), matching the September and October issues. ## Open questions for reviewers - **New "📺 Fleet Virtual Summit" section** for the November 10 LinkedIn Live event, placed before workshops. Keep it or fold it into the workshops section. If it stays, it's a new entry in the newsletter's section emoji table. - **The roadmap preview is linked even though November isn't a quarter's first month.** The October preview published October 13, after the October issue went out, so readers haven't seen it in the newsletter yet. - **Article and guide picks are editorial**, not based on traffic numbers. Reorder them if you have analytics. There were no case studies in October. - **The community section has one post, and it's personal.** Henry Stamerjohann's MacSysAdmin talk. Fleet's company-page post about the "Apple in the enterprise" research is another option, but it repeats the research article in "Worth reading." No engagement numbers were available. - **Community contributors with five or more merged PRs in October:** Prajwal Janbandhu (8, in the thank-you line), Michael Alt (6, highlighted), Dhvanit (6, returning, not named), and Shreyash Agare (5, returning, not named). Confirm none of them is a contractor whose account isn't in the org. - **Several first-time contributors only edited the handbook.** None appear in Fleet's Slack, so they stay in the thank-you line. ## How each section was sourced - **Shipped:** the Fleet 4.93.0 and 4.94.0 release articles, cross-checked against tagged releases. The three highlights are macOS patch notifications (Premium), Android zero-touch enrollment (Premium), and self-service configuration profiles (not Premium), so the section isn't all Premium. Patch releases 4.93.1 and 4.93.2 are covered by the "See every release" link. - **Planned:** the release planning board (view 10, filtered to milestone 4.95.0), not the milestone fallback. There are 22 stories, all assigned. 5.0.0 is due December 4, so November holds one release. - **Workshops:** fleetdm.com/workshops, with the next five after the send date. - **Community contributions:** PRs merged in public `fleetdm` repos in October by authors outside the `fleetdm` org, minus bots. ## Left out on purpose - **"Windows: force standard account"** was in the planned section in both September and October and hasn't shipped. It's not on the 4.95.0 board, so it isn't mentioned a third time. - **Multiple versions of the same App Store app** is named in the 4.94.0 release article's title, but the article marks it as moved to 4.95. It's listed under "Also on deck" instead of "shipped." - **Amsterdam workshop (November 3):** past by the time this sends. - **Fleet staff or contractors whose accounts aren't in the org:** @TraiLynne and @thomcrowe. Both are confirmed in Fleet's Slack. - **Other October content:** the warehouse inventory article and Retriever guide, the PHP2Shell and eMudhra pieces, and every `industry news` article. The routine doesn't feature that category. <details> <summary>Suggested <code>~/fleet-newsletters/contributors.tsv</code> lines (append once confirmed)</summary> ``` TraiLynne fleet Trai Lynne Compton, Fleet staff (Slack); not an org member thomcrowe fleet Thom Crowe, Fleet contractor (website); not an org member ``` </details> <details> <summary>Ledger append block: run only after this issue is sent</summary> `~/fleet-newsletters/ledger.jsonl` didn't exist before this issue. Repeats were checked against the September and October issues in the repo instead. This block creates the ledger and records every item in this issue. ```bash mkdir -p ~/fleet-newsletters && cat >> ~/fleet-newsletters/ledger.jsonl <<'EOF' {"issue":"2026-11","section":"shipped","id":"4.93.0"} {"issue":"2026-11","section":"shipped","id":"4.94.0"} {"issue":"2026-11","section":"planned","id":"51599"} {"issue":"2026-11","section":"planned","id":"39176"} {"issue":"2026-11","section":"planned","id":"51979"} {"issue":"2026-11","section":"planned","id":"53284"} {"issue":"2026-11","section":"planned","id":"33062"} {"issue":"2026-11","section":"planned","id":"52534"} {"issue":"2026-11","section":"planned","id":"47904"} {"issue":"2026-11","section":"events","id":"fleet-virtual-summit-2026"} {"issue":"2026-11","section":"events","id":"2003719976388"} {"issue":"2026-11","section":"events","id":"2003716644422"} {"issue":"2026-11","section":"events","id":"2002266719658"} {"issue":"2026-11","section":"events","id":"2002266872114"} {"issue":"2026-11","section":"events","id":"2002267524064"} {"issue":"2026-11","section":"articles","id":"apple-in-the-enterprise-2026"} {"issue":"2026-11","section":"articles","id":"nvidia-gtc-2026"} {"issue":"2026-11","section":"articles","id":"tailworm-what-to-do-about-tailscale-ssh-before-the-fix-ships"} {"issue":"2026-11","section":"articles","id":"revert-a-bad-change-in-gitops"} {"issue":"2026-11","section":"articles","id":"block-chrome-extensions"} {"issue":"2026-11","section":"articles","id":"block-edge-extensions"} {"issue":"2026-11","section":"articles","id":"block-firefox-extensions"} {"issue":"2026-11","section":"articles","id":"block-safari-extensions"} {"issue":"2026-11","section":"articles","id":"use-claude-code-with-fleet"} {"issue":"2026-11","section":"articles","id":"roadmap-preview-october-2026"} {"issue":"2026-11","section":"social","id":"7513481631123394560"} {"issue":"2026-11","section":"community","id":"#50836"} {"issue":"2026-11","section":"community","id":"#53407"} {"issue":"2026-11","section":"community","id":"#53670"} {"issue":"2026-11","section":"community","id":"#53768"} {"issue":"2026-11","section":"community","id":"#53810"} {"issue":"2026-11","section":"community","id":"#53824"} {"issue":"2026-11","section":"community","id":"#54019"} {"issue":"2026-11","section":"community","id":"#54181"} {"issue":"2026-11","section":"community","id":"#54296"} {"issue":"2026-11","section":"community","id":"#54411"} {"issue":"2026-11","section":"community","id":"#54502"} {"issue":"2026-11","section":"community","id":"#54509"} {"issue":"2026-11","section":"community","id":"#54592"} {"issue":"2026-11","section":"community","id":"#54685"} {"issue":"2026-11","section":"community","id":"#54708"} {"issue":"2026-11","section":"community","id":"#54726"} {"issue":"2026-11","section":"community","id":"#54785"} {"issue":"2026-11","section":"community","id":"#55056"} {"issue":"2026-11","section":"community","id":"#55058"} {"issue":"2026-11","section":"community","id":"#55072"} {"issue":"2026-11","section":"community","id":"#55089"} {"issue":"2026-11","section":"community","id":"#55097"} {"issue":"2026-11","section":"community","id":"#55127"} {"issue":"2026-11","section":"community","id":"#55249"} {"issue":"2026-11","section":"community","id":"#55266"} {"issue":"2026-11","section":"community","id":"#55353"} {"issue":"2026-11","section":"community","id":"#55471"} {"issue":"2026-11","section":"community","id":"#55492"} {"issue":"2026-11","section":"community","id":"#55547"} {"issue":"2026-11","section":"community","id":"#55841"} {"issue":"2026-11","section":"community","id":"#55900"} {"issue":"2026-11","section":"community","id":"#55903"} {"issue":"2026-11","section":"community","id":"#55946"} {"issue":"2026-11","section":"community","id":"#56072"} {"issue":"2026-11","section":"community","id":"#56085"} {"issue":"2026-11","section":"community","id":"#56148"} {"issue":"2026-11","section":"community","id":"#56214"} {"issue":"2026-11","section":"community","id":"#56266"} {"issue":"2026-11","section":"community","id":"#56287"} {"issue":"2026-11","section":"community","id":"#56376"} {"issue":"2026-11","section":"community","id":"#56403"} {"issue":"2026-11","section":"community","id":"#56486"} {"issue":"2026-11","section":"community","id":"#56498"} {"issue":"2026-11","section":"community","id":"#56575"} {"issue":"2026-11","section":"community","id":"#56596"} {"issue":"2026-11","section":"community","id":"#56609"} {"issue":"2026-11","section":"community","id":"#56657"} {"issue":"2026-11","section":"community","id":"#56708"} {"issue":"2026-11","section":"community","id":"#56719"} {"issue":"2026-11","section":"community","id":"#56983"} {"issue":"2026-11","section":"community","id":"#56984"} {"issue":"2026-11","section":"community","id":"#56985"} EOF ``` </details> ## Testing - [x] Confirmed the markdown passes the website build's metadata checks: required meta tags, ISO `publishedOn`, description at 139 of 150 characters, `category` set to `newsletter`, H1 matching `articleTitle`, and no Vue-template braces. - [x] Verified all 54 fleetdm.com, GitHub, and Eventbrite links return 200. LinkedIn returns 999 to automated requests, so the profile links come from the handbook and the post link was opened in a browser. - [x] Checked the copy against Fleet's content style: no em dashes, sentence-case headings, Oxford commas, and Fleet Premium labels carried through from the release articles. - [ ] QA'd all new/changed functionality manually ## AI **AI:** Claude Code (claude-opus-5-5) --------- Co-authored-by: robinedev <aubedev@outlook.com>
Related issue: #53726 (follow-up to #53469)
#53469 fixed the duplicate fleet name check in Fleet's own GitOps action (
.github/actions/gitops/gitops.sh), but the copy thatfleetctl newgenerates (cmd/fleetctl/fleetctl/templates/new/.github/fleet-gitops/gitops.sh) still has! perl … | sort | uniq -d | grep . -cq. Underset -e, a command starting with!never stops the script, so GitOps repos created withfleetctl newcarry on even when two fleet files share a name. This applies the same change to the template.Checklist for submitter
changes/.Testing
fleets/*.ymlfiles that share aname:, the script now stops with "Error: duplicate fleet names found" (exit 1); with distinct names it carries on. The same change has been running in afleetctl new-based GitOps repo's CI.AI
AI: Claude Code (claude-opus-5-5)
🤖 Generated with Claude Code
Summary by CodeRabbit