Skip to content
This repository was archived by the owner on Sep 9, 2026. It is now read-only.

OSAC-1407: Whitelist committed overlays in .gitignore - #258

Closed
tchughesiv wants to merge 1 commit into
osac-project:mainfrom
tchughesiv:chore/overlays-whitelist-gitignore
Closed

tchughesiv wants to merge 1 commit into
osac-project:mainfrom
tchughesiv:chore/overlays-whitelist-gitignore

Conversation

@tchughesiv

@tchughesiv tchughesiv commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Add overlay whitelist rules to the root .gitignore so only committed overlay directories (_shared, development, caas-ci, vmaas-ci, osac-integration, hypershift2) are tracked. Any other path under overlays/ is ignored by default.
  • Add a brief note to the root README that personal overlays (overlays/<project-name>) are gitignored and won't appear in git status.

Personal overlays use any directory not on the whitelist (e.g. overlays/tohughes-dev). To add a new committed overlay, update the whitelist entries in the root .gitignore.

Jira

OSAC-1407

Test plan

  • git check-ignore confirms unlisted paths (e.g. overlays/<project-name>/) are ignored
  • git check-ignore confirms whitelisted overlays (development, _shared) are not ignored
  • Tracked overlay files remain in git ls-files overlays/

Summary by CodeRabbit

  • Documentation
    • Clarified that personal overlay directories under overlays/<project-name> are gitignored by default, so they don’t appear in version control status.
    • Explained that only explicitly whitelisted overlay directories in the root overlays/.gitignore are tracked.
  • Chores
    • Updated ignore rules to ignore all overlays/* by default, while re-including the committed shared overlay tree and selected named overlay directories.

@openshift-ci
openshift-ci Bot requested review from danmanor and trewest June 10, 2026 21:48
@coderabbitai

coderabbitai Bot commented Jun 10, 2026

Copy link
Copy Markdown

Review Change Stack

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: osac-project/coderabbit/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Enterprise

Run ID: 19c8bfd2-997a-4fe4-82d6-66c2c2387ab0

📥 Commits

Reviewing files that changed from the base of the PR and between 98b500f and 0afca98.

📒 Files selected for processing (2)
  • .gitignore
  • README.md

Walkthrough

This PR updates .gitignore to ignore overlay directories by default while re-including selected tracked overlays, and updates the README to document the overlay tracking behavior.

Changes

Overlay Directory Git Tracking

Layer / File(s) Summary
Whitelist-style overlay gitignore and documentation
.gitignore, README.md
.gitignore ignores all overlays/* by default, then re-includes _shared and five named shared overlays (caas-ci, development, hypershift2, osac-integration, vmaas-ci) with explanatory comments. README documents that personal overlays under overlays/<project-name> are gitignored by default and only whitelisted overlays are tracked.

Estimated code review effort: 1 (Trivial) | ~3 minutes

🚥 Pre-merge checks | ✅ 11
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main change: whitelisting committed overlays in the root .gitignore.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
No-Hardcoded-Secrets ✅ Passed The diff only adds README text and .gitignore whitelist rules; no secret literals, embedded creds, or api_key/secret/token/password assignments appear in the added lines.
No-Weak-Crypto ✅ Passed Only README.md and .gitignore changed; the diff contains no crypto code, weak algorithms, or secret comparisons.
No-Injection-Vectors ✅ Passed Only README.md and .gitignore changed; no code paths or risky sinks like eval, shell=True, os.system, or unsafe YAML/pickle use were introduced.
Container-Privileges ✅ Passed Diff only changes README.md and .gitignore; no container/K8s manifests or privilege settings were added.
No-Sensitive-Data-In-Logs ✅ Passed PR only changes README and .gitignore; the added lines describe overlay ignore rules and contain no new logging or sensitive-data exposure.
Ai-Attribution ✅ Passed HEAD commit uses an Assisted-by trailer for Claude Code, and no AI-related Co-Authored-By trailer is present.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@tchughesiv tchughesiv changed the title Whitelist tracked overlays and document overlays/local for personal use Whitelist tracked overlays and document personal overlay workflow Jun 10, 2026
@tchughesiv
tchughesiv marked this pull request as draft June 10, 2026 21:51
@tchughesiv tchughesiv changed the title Whitelist tracked overlays and document personal overlay workflow Whitelist tracked overlays in overlays/.gitignore Jun 11, 2026
@tchughesiv tchughesiv changed the title Whitelist tracked overlays in overlays/.gitignore Add overlays/.gitignore to ignore personal overlay directories Jun 11, 2026
@tchughesiv
tchughesiv force-pushed the chore/overlays-whitelist-gitignore branch from f2ae1ae to 04c87a2 Compare June 11, 2026 16:35
@tchughesiv
tchughesiv marked this pull request as ready for review June 11, 2026 16:36
@openshift-ci
openshift-ci Bot requested review from jhernand and tzumainn June 11, 2026 16:36
@tchughesiv tchughesiv changed the title Add overlays/.gitignore to ignore personal overlay directories OSAC-1407: Add overlays/.gitignore to ignore personal overlay directories Jun 11, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 11, 2026

Copy link
Copy Markdown

@tchughesiv: This pull request references OSAC-1407 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

  • Add overlays/.gitignore with an explicit whitelist of shared overlay directories (_shared, development, caas-ci, vmaas-ci, osac-integration, hypershift2). Any other path under overlays/ is ignored by default.
  • Add a brief note to the root README that personal overlays (overlays/<project-name>) are gitignored and won't appear in git status.

Personal overlays use any directory not on the whitelist (e.g. overlays/tohughes-dev). To add a new shared overlay, update the whitelist entries in overlays/.gitignore.

Jira

OSAC-1407

Test plan

  • git check-ignore confirms unlisted paths (e.g. overlays/tohughes-dev/) are ignored
  • git check-ignore confirms whitelisted overlays (development, _shared) are not ignored
  • Tracked overlay files remain in git ls-files overlays/

Summary by CodeRabbit

  • Documentation

  • Updated README to clarify how personal overlay directories are handled by git, explaining that personal overlays are gitignored by default and won't appear in git status.

  • Chores

  • Updated overlay gitignore configuration to implement a whitelist approach, which explicitly tracks only specified overlay directories while ignoring all others by default.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@tchughesiv tchughesiv changed the title OSAC-1407: Add overlays/.gitignore to ignore personal overlay directories OSAC-1407: Whitelist shared overlays in root .gitignore Jun 12, 2026
@tchughesiv tchughesiv changed the title OSAC-1407: Whitelist shared overlays in root .gitignore OSAC-1407: Whitelist shared overlays in .gitignore Jun 12, 2026
@tchughesiv tchughesiv changed the title OSAC-1407: Whitelist shared overlays in .gitignore OSAC-1407: Whitelist committed overlays in .gitignore Jun 12, 2026
coderabbitai[bot]
coderabbitai Bot previously requested changes Jun 18, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@README.md`:
- Line 195: The README.md file has markdown linting violations (MD031) where
fenced code blocks are missing required blank lines. Add a blank line
immediately before each opening triple backticks (```yaml and other code block
markers) and immediately after each closing triple backticks on lines 195, 207,
218, 227, and 245. Ensure there is whitespace separating the code blocks from
surrounding text to comply with markdown formatting standards.
- Around line 190-192: The README.md file contains multiple instances of "bare
metal" that are used as compound adjectives modifying following nouns and should
be hyphenated as "bare-metal" for grammatical correctness. Search for all
occurrences of "bare metal" in the file and replace those that function as
compound adjectives (such as in phrases like "bare-metal fulfillment",
"bare-metal provider", "bare-metal management", and "bare-metal host") with the
hyphenated form "bare-metal". Ensure consistent application across all locations
where this compound adjective appears, while noting that proper nouns like "Bare
Metal Fulfillment Operator" may be exempt from this rule.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: osac-project/coderabbit/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Enterprise

Run ID: 848e63b2-a458-4625-a7a0-b92a44fed17d

📥 Commits

Reviewing files that changed from the base of the PR and between ea527bb and 98b500f.

📒 Files selected for processing (1)
  • README.md

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Caution

Inline review comments failed to post. This is likely due to GitHub's internal server error or limits when posting large numbers of comments. If you are seeing this consistently it is likely a permissions issue. Please check "Moderation" -> "Code review limits" under your organization settings.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@README.md`:
- Line 195: The README.md file has markdown linting violations (MD031) where
fenced code blocks are missing required blank lines. Add a blank line
immediately before each opening triple backticks (```yaml and other code block
markers) and immediately after each closing triple backticks on lines 195, 207,
218, 227, and 245. Ensure there is whitespace separating the code blocks from
surrounding text to comply with markdown formatting standards.
- Around line 190-192: The README.md file contains multiple instances of "bare
metal" that are used as compound adjectives modifying following nouns and should
be hyphenated as "bare-metal" for grammatical correctness. Search for all
occurrences of "bare metal" in the file and replace those that function as
compound adjectives (such as in phrases like "bare-metal fulfillment",
"bare-metal provider", "bare-metal management", and "bare-metal host") with the
hyphenated form "bare-metal". Ensure consistent application across all locations
where this compound adjective appears, while noting that proper nouns like "Bare
Metal Fulfillment Operator" may be exempt from this rule.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: osac-project/coderabbit/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Enterprise

Run ID: 848e63b2-a458-4625-a7a0-b92a44fed17d

📥 Commits

Reviewing files that changed from the base of the PR and between ea527bb and 98b500f.

📒 Files selected for processing (1)
  • README.md
🛑 Comments failed to post (2)
README.md (2)

190-192: 🧹 Nitpick | 🔵 Trivial | 💤 Low value

Use hyphens for "bare-metal" when used as a compound adjective.

LanguageTool flagged several instances where "bare metal" is used as a compound adjective modifying a following noun. When used in this context, it should be hyphenated as "bare-metal" for grammatical correctness:

  • Line 190: "For bare-metal fulfillment, copy each..."
  • Line 194: "OpenStack credentials for the bare-metal provider:"
  • Line 206: "inventory source configuration for bare-metal management:" (if added)
  • Line 217: "management cloud configuration for bare-metal environments:" (if added)
  • Line 226: "one entry per bare-metal host provisioning profile:"

Note: "Bare Metal Fulfillment Operator" as a proper noun may be exempt, but compound adjectives should consistently use hyphens.

Also applies to: 194-194, 206-206, 217-217, 226-226, 242-249

🧰 Tools
🪛 LanguageTool

[uncategorized] ~190-~190: If this is a compound adjective that modifies the following noun, use a hyphen.
Context: ...ally. - In kustomization.yaml: For bare metal fulfillment, copy each .example file ...

(EN_COMPOUND_ADJECTIVE_INTERNAL)

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@README.md` around lines 190 - 192, The README.md file contains multiple
instances of "bare metal" that are used as compound adjectives modifying
following nouns and should be hyphenated as "bare-metal" for grammatical
correctness. Search for all occurrences of "bare metal" in the file and replace
those that function as compound adjectives (such as in phrases like "bare-metal
fulfillment", "bare-metal provider", "bare-metal management", and "bare-metal
host") with the hyphenated form "bare-metal". Ensure consistent application
across all locations where this compound adjective appears, while noting that
proper nouns like "Bare Metal Fulfillment Operator" may be exempt from this
rule.

Source: Linters/SAST tools


195-195: 🧹 Nitpick | 🔵 Trivial | 💤 Low value

Add blank lines before and after fenced code blocks (markdownlint MD031).

Markdown linting flagged missing blank lines around several code blocks. Add a blank line immediately before each opening triple backticks and immediately after each closing triple backticks for consistent formatting:

Some text above.
[blank line here]
```yaml
code here

[blank line here]
Some text below.


Affected lines: 195, 207, 218, 227, 245.







Also applies to: 207-207, 218-218, 227-227, 245-245

<details>
<summary>🧰 Tools</summary>

<details>
<summary>🪛 markdownlint-cli2 (0.22.1)</summary>

[warning] 195-195: Fenced code blocks should be surrounded by blank lines

(MD031, blanks-around-fences)

</details>

</details>

<details>
<summary>🤖 Prompt for AI Agents</summary>

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In @README.md at line 195, The README.md file has markdown linting violations
(MD031) where fenced code blocks are missing required blank lines. Add a blank
line immediately before each opening triple backticks (```yaml and other code
block markers) and immediately after each closing triple backticks on lines 195,
207, 218, 227, and 245. Ensure there is whitespace separating the code blocks
from surrounding text to comply with markdown formatting standards.


</details>

<!-- fingerprinting:phantom:triton:mongoose -->

<!-- cr-comment:v1:8c6e8fbf9a1e768c2637a9bb -->

_Source: Linters/SAST tools_

<!-- This is an auto-generated comment by CodeRabbit -->

</blockquote></details>

</blockquote></details>

<!-- This is an auto-generated comment by CodeRabbit for review status -->

@tchughesiv

tchughesiv commented Jun 18, 2026

Copy link
Copy Markdown
Contributor Author

Response to CodeRabbit review

Thanks for the review. Both actionable items are on README sections that came in from the recent main merge (bare-metal overlay docs, ~lines 190–249), not from the OSAC-1407 changes in this PR (root .gitignore whitelist + the four-line note at ~114–116).

1. "bare metal" → "bare-metal" hyphenation (lines 190–249) — Declining for this PR. Valid style nit, but out of scope for a gitignore whitelist change. Happy to address in a separate docs cleanup PR if the team wants consistency pass on the bare-metal section.

2. MD031 blank lines around fenced code blocks (lines 195, 207, 218, 227, 245) — Declining for this PR. Same reason: pre-existing formatting in merged README content, not introduced by this diff. A docs-only follow-up is a better home for markdownlint fixes across the whole file.

No code changes needed from my side for these items. CI is green; remaining merge blockers are human review (/lgtm) and approver (/approve from @trewest per OWNERS).

Side note: openshift-ci flagged OSAC-1407 missing target version 5.0.0 — I'll set that on the Jira task.

@tchughesiv

tchughesiv commented Jun 18, 2026

Copy link
Copy Markdown
Contributor Author

@coderabbitai review

@coderabbitai

coderabbitai Bot commented Jun 18, 2026

Copy link
Copy Markdown
✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@tchughesiv
tchughesiv force-pushed the chore/overlays-whitelist-gitignore branch from 98b500f to 558a4af Compare June 23, 2026 15:14
@openshift-ci

openshift-ci Bot commented Jun 23, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tchughesiv
Once this PR has been reviewed and has the lgtm label, please assign sk-ilya for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tchughesiv
tchughesiv force-pushed the chore/overlays-whitelist-gitignore branch 2 times, most recently from 4530fd9 to 7fd99b1 Compare June 26, 2026 21:50
Move overlay whitelist rules into the root .gitignore so ignore policy
lives in one place. Personal overlays under overlays/<project-name> stay
ignored; only committed overlay directories are tracked. Document the
behavior in README using "committed" terminology from AGENTS.md.

Assisted-by: Claude Code <noreply@anthropic.com>
@tchughesiv
tchughesiv force-pushed the chore/overlays-whitelist-gitignore branch from 7fd99b1 to 0afca98 Compare July 9, 2026 14:30
@tchughesiv

tchughesiv commented Jul 9, 2026

Copy link
Copy Markdown
Contributor Author

Closing as obsolete after OSAC-1677 (#398) removed Kustomize from the installer.

  • overlays/ is no longer tracked or used for deployment; install is Helm-only via values/<env>/values.yaml
  • The .gitignore whitelist and README note no longer serve an active workflow

If we still want to gitignore local legacy overlays/ directories, we can open a smaller follow-up scoped to that.

@tchughesiv tchughesiv closed this Jul 9, 2026
@tchughesiv
tchughesiv deleted the chore/overlays-whitelist-gitignore branch July 9, 2026 14:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants