Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 Add test-extension patch artifacts to git ignore #7137

Merged
merged 1 commit into from
Sep 1, 2022
Merged

🌱 Add test-extension patch artifacts to git ignore #7137

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ test/e2e/data/infrastructure-docker/v1beta1/cluster-template*.yaml
# E2e test extension deployment
test/e2e/data/test-extension/deployment.yaml

# Output of Makefile targets using sed on MacOS systems
*.yaml-e

Copy link
Member

Choose a reason for hiding this comment

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

Just to clarify those files are not generated. They are some side-effect of afaik an editor (or maybe something else?).

I also have them from time to time, but only very rarely (and up until now I only had them for the files which are overwritten when running make docker-build, e.g. config/default/manager_image_patch.yaml)

Or?

Copy link
Member

@sbueringer sbueringer Aug 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Given the way we change those files I would guess some tmp files of sed

xref: https://stackoverflow.com/questions/34533893/sed-command-creating-unwanted-duplicates-of-file-with-e-extension

Just a random finding on stackoverflow, but maybe there's a way to fix our sed calls that those files never occur

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was trying to track down what created them - I assume it's either kustomize or intellij, but I still haven't figured it out 🙁.

Good to have them in the .gitignore anyway IMO - also have them for the manager*.yaml-e already.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good find! This seems to be an OSX issue, and I think it's well enough taken care of by adding it to gitignore. Might be a good idea for me to add gnu sed to my env though!

Copy link
Member

@sbueringer sbueringer Aug 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I'm fine with just adding them, let's just do it for all (as you suggested) and let's add a short comment where those files are ~ coming from.

This should only affect ~ two files per manager which should be the ones we run sed / that make target on

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How does the latest version look?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Confirmed btw that gnu-sed on MacOS doesn't have this issue. Our flags for sed aren't fully portable. I'll create an issue for that to track it, but it's low impact and priority imo

Copy link
Member

Choose a reason for hiding this comment

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

How does the latest version look?

Perfect. I didn't know we already had the gitignore for manager YAMLs. But explains why you're only seeing that issue now

# Output of the go coverage tool, specifically when used with LiteIDE
*.out

Expand Down Expand Up @@ -48,8 +51,6 @@ config/ci/rbac/auth_proxy_role.yaml
config/ci/rbac/auth_proxy_role_binding.yaml
config/ci/rbac/auth_proxy_service.yaml
config/ci/manager/manager.yaml
manager_image_patch.yaml-e
manager_pull_policy.yaml-e

# Sample config files auto-generated by kubebuilder
config/samples
Expand Down