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

Jump to bottom

fix: missing package-system.mk #96

Merged
merged 2 commits into from
Apr 23, 2024
Merged

fix: missing package-system.mk #96

merged 2 commits into from
Apr 23, 2024

Conversation

kvaps
Copy link
Member

@kvaps kvaps commented Apr 23, 2024 •
edited
Loading

fix regression introduced by #86

Makefile:4: ../../../hack/package-system.mk: No such file or directory

and

make: Leaving directory '/cozystack/packages/system/cilium'
make: flux: No such file or directory
make: *** [../../../scripts/package-system.mk:17: suspend] Error 127

@kvaps kvaps requested a review from themoriarti April 23, 2024 07:34
@kvaps kvaps marked this pull request as draft April 23, 2024 07:38
@kvaps
fix: flux dependency
f8b8719 
Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
@kvaps kvaps marked this pull request as ready for review April 23, 2024 07:43
themoriarti
themoriarti approved these changes Apr 23, 2024
View reviewed changes
Copy link
Collaborator

@themoriarti themoriarti left a comment

Choose a reason for hiding this comment

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

LGTM

@themoriarti themoriarti merged commit be0603f into main Apr 23, 2024
stefanprodan
stefanprodan reviewed Apr 23, 2024
View reviewed changes
scripts/package-system.mk
@@ -14,7 +14,7 @@ diff: ## Diff Helm release against objects in a Kubernetes cluster
kubectl get hr -n $(NAMESPACE) $(NAME) -o jsonpath='{.spec.values}' | helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) . -f -

suspend: ## Suspend reconciliation for an existing Helm release
flux suspend hr -n $(NAMESPACE) $(NAME)
kubectl patch hr -n $(NAMESPACE) $(NAME) -p '{"spec": {"suspend": true}}' --type=merge
Copy link

Choose a reason for hiding this comment

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

Flux does not tolerate kubectl edits https://fluxcd.io/flux/faq/#why-are-kubectl-edits-rolled-back-by-flux

Copy link
Member Author

Choose a reason for hiding this comment

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

@stefanprodan thank you for your note! I just added PR for fixing this #101

@kvaps kvaps mentioned this pull request Apr 23, 2024
Merged
@themoriarti themoriarti deleted the missing-makefile branch August 5, 2024 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefanprodan stefanprodan stefanprodan left review comments

@themoriarti themoriarti themoriarti approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kvaps @stefanprodan @themoriarti