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.

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

Change enable to act on root app #165

Merged
merged 7 commits into from
Oct 3, 2024
Merged

Change enable to act on root app #165

merged 7 commits into from
Oct 3, 2024

Conversation

marcelldls
Copy link
Collaborator

@marcelldls marcelldls commented Sep 10, 2024

Change patch of enable to be on the root app. This allows ec to work with ec-helm-charts 4.0.0+b1 which aims to have enabled recorded in the git repo.
Question:

  • Should this be ec stop <service> --temp? (with the git backend pushing changes to enabled being a default)
  • Should we allow this at all - Because the patch sits on top of what is in the repo so we need to revert if you want to track the repo again. It has some benefits though for not relying on "the internet" and speed (directly communicate with argocd rather than git + sync argocd) + reducing number of commits added to the deployment repo

@marcelldls
Copy link
Collaborator Author

We can identify patches to params exposed to the root app using the roots app values.yaml by comparing the source manifests argocd app manifests <ns>/<rootApp> and the live state argocd app get <ns>/<rootApp> -o yaml

@gilesknap
Copy link
Member

I'm getting the feeling that the concept of temporary vs permanent stop is over complicated.

I think that if we support ec making changes to the repo we should probably drop overrides to avoid confusion.

Base automatically changed from merge-argocd-prs to main September 10, 2024 10:18
Copy link

codecov bot commented Sep 11, 2024

Codecov Report

Attention: Patch coverage is 90.16393% with 12 lines in your changes missing coverage. Please review.

Project coverage is 81.04%. Comparing base (e4fef83) to head (d24a0e8).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
src/edge_containers_cli/cli.py 40.00% 6 Missing ⚠️
src/edge_containers_cli/utils.py 90.90% 3 Missing ⚠️
src/edge_containers_cli/git.py 89.47% 2 Missing ⚠️
src/edge_containers_cli/backend.py 87.50% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #165      +/-   ##
==========================================
+ Coverage   80.46%   81.04%   +0.57%     
==========================================
  Files          15       15              
  Lines         809      897      +88     
==========================================
+ Hits          651      727      +76     
- Misses        158      170      +12     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Implement --temp for stop/start

Checkpoint - untested start implementation

Break into reusable code

Reorder sync request

Linting

Fix tests, some linting

missing test data
@marcelldls
Copy link
Collaborator Author

@gilesknap Are you willing to try demo this? I have tried it against an auto-synced and non auto-synced app-of-apps

@gilesknap
Copy link
Member

Sure. Let's discuss tomorrow

@marcelldls
Copy link
Collaborator Author

@gilesknap Working against https://github.com/epics-containers/p47-deployment with the discussed helm chart changes captured in epics-containers/ec-helm-charts#33 under a beta release

@marcelldls
Copy link
Collaborator Author

@gilesknap Ready - Please review against p47 and ec-helm-charts

@gilesknap
Copy link
Member

gilesknap commented Oct 3, 2024

I just want to record here that we have discussed the --temp feature and:

  • it is good that the default is to update the repo as this keeps a record of beamline state
  • but we do need --temp for when the git server is offline
  • reporting that you can try --temp when trying to update the repo makes this temp feature discoverable
  • we do need to work out what to do about authN though
    • maybe not give scientists write access to the repo - particularly because that involves fiddly config
    • using a web version of ec could mitigate this
    • but then perhaps we still need a way to supply --temp from the web UI for when the git server is offline?

@gilesknap
Copy link
Member

I tried this and it looks all good.

And I like the comments in apps.yaml (I might add a linefeed before the first line of the ec_services comment?)

Lets merge and release!

@marcelldls marcelldls marked this pull request as ready for review October 3, 2024 11:50
@marcelldls marcelldls merged commit 4834535 into main Oct 3, 2024
17 checks passed
@marcelldls marcelldls deleted the argocd-root-enable branch October 3, 2024 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants