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

Miscellaneous kubernetes deployment fixes #507

Merged
merged 3 commits into from
Sep 27, 2024
Merged

Conversation

rtuck99
Copy link
Contributor

@rtuck99 rtuck99 commented Sep 18, 2024

  • Enable hostNetwork in helmchart in order to access instrumentation network
  • Fix version extraction from folder path
  • Change image name to mx-bluesky to match the release CI workflow
  • Fix helmchart default log folder to not clash with non-containerised version
  • Do final docker image pip install with no-deps to prevent editable dodal being clobbered

* Enable hostNetwork to helmchart in order to access instrumentation network
* Fix version extraction from folder path
* Change helmchart image name to mx-bluesky to match the release CI workflow
* Fix helmchart default log folder to not clash with non-containerised version
* Do final docker image pip install with no-deps to prevent editable dodal being clobbered
Copy link
Contributor

@DominicOram DominicOram left a comment

Choose a reason for hiding this comment

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

Great, thanks. Happy to merge as is with the spun off issue. Would be good to understand hostNetwork better but not urgent.

@@ -111,3 +150,4 @@ spec:
name: logs
- mountPath: "/dls/{{ .Values.hyperion.beamline }}/data"
name: data
hostNetwork: true
Copy link
Contributor

Choose a reason for hiding this comment

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

@callumforrester or @DiamondJoseph why do we need this to talk to EPICS but blueapi seems fine without it?

Comment on lines +64 to +99
drop:
- AUDIT_WRITE
- CHOWN
- DAC_OVERRIDE
- FOWNER
- FSETID
- KILL
- MKNOD
- NET_BIND_SERVICE
- NET_RAW
- SETFCAP
- SETGID
- SETPCAP
- SETUID
- SYS_CHROOT
- AUDIT_CONTROL
- BLOCK_SUSPEND
- DAC_READ_SEARCH
- IPC_LOCK
- IPC_OWNER
- LEASE
- LINUX_IMMUTABLE
- MAC_ADMIN
- MAC_OVERRIDE
- SYS_ADMIN
- SYS_BOOT
- SYS_MODULE
- SYS_NICE
- SYS_PACCT
- SYS_MODULE
- SYS_PTRACE
- SYS_RESOURCE
- SYS_TIME
- SYS_TTY_CONFIG
- SYSLOG
- WAKE_ALARM
Copy link
Contributor

Choose a reason for hiding this comment

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

Should: As discussed, this may not be necessary or it may be better to drop ALL. Can you make an issue to chase up, feel free to add other k8s tidying to that issue if you think there's some needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Raised #534

Copy link

codecov bot commented Sep 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.90%. Comparing base (41d55a4) to head (f23ab1e).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #507   +/-   ##
=======================================
  Coverage   77.90%   77.90%           
=======================================
  Files          89       89           
  Lines        6711     6711           
=======================================
  Hits         5228     5228           
  Misses       1483     1483           
Components Coverage Δ
i24 SSX 57.12% <ø> (ø)
hyperion 96.25% <ø> (ø)
other 94.79% <ø> (ø)

@rtuck99 rtuck99 merged commit 9c1e4b1 into main Sep 27, 2024
21 checks passed
@rtuck99 rtuck99 deleted the k8s_helmchart_fixes branch September 27, 2024 10:36
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