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

feat: Write pod cost to CRD #1134

Merged
merged 22 commits into from
Apr 26, 2023
Merged

feat: Write pod cost to CRD #1134

merged 22 commits into from
Apr 26, 2023

Conversation

patriknw
Copy link
Member

@patriknw patriknw commented Apr 19, 2023 •
edited
Loading

  • alternative to adding the Kubernetes annotation directly to the pod resource in case allowing PATCH verb is a security concern
  • a separate Kubernetes operator with more privilages would watch the CR and update the pod resource with the annotation

TODO:

  • add test similar to PodDeletionCostAnnotatorSpec
  • add integration test to integration-test/rollingupdate-kubernetes
  • docs
  • FIXMEs
  • maybe some more config for the CRD to be able to change the names

@patriknw patriknw requested a review from efgpinto April 19, 2023 13:48
@patriknw patriknw force-pushed the wip-pod-delete-crd-patriknw branch from f5316fe to 8702984 Compare April 19, 2023 14:55
johanandren
johanandren reviewed Apr 20, 2023
View reviewed changes
Copy link
Member

@johanandren johanandren left a comment

Choose a reason for hiding this comment

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

Looks good so far

rolling-update-kubernetes/src/main/scala/akka/rollingupdate/kubernetes/KubernetesApiImpl.scala Outdated Show resolved Hide resolved
rolling-update-kubernetes/src/main/scala/akka/rollingupdate/kubernetes/KubernetesApiImpl.scala Show resolved Hide resolved
rolling-update-kubernetes/src/main/scala/akka/rollingupdate/kubernetes/KubernetesApiImpl.scala Show resolved Hide resolved
rolling-update-kubernetes/src/main/scala/akka/rollingupdate/kubernetes/KubernetesApiImpl.scala Outdated Show resolved Hide resolved
patriknw
patriknw commented Apr 20, 2023
View reviewed changes
rolling-update-kubernetes/src/main/scala/akka/rollingupdate/kubernetes/KubernetesApiImpl.scala

log.debug("kubernetes access namespace: {}. Secure: {}", namespace, settings.secure)

override def updatePodDeletionCostAnnotation(podName: String, cost: Int): Future[Done] = {
Copy link
Member Author

Choose a reason for hiding this comment

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

This was "moved" from previous ApiRequests and PodDeletionCostAnnotator actor

rolling-update-kubernetes/src/main/scala/akka/rollingupdate/kubernetes/KubernetesApiImpl.scala

201 Created if it works
*/
override def readOrCreatePodCostResource(crName: String): Future[PodCostResource] = {
Copy link
Member Author

Choose a reason for hiding this comment

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

These methods for reading and updating the CR are based on the corresponding in the lease module.

rolling-update-kubernetes/src/main/scala/akka/rollingupdate/kubernetes/KubernetesApiImpl.scala Outdated Show resolved Hide resolved
@patriknw patriknw force-pushed the wip-pod-delete-crd-patriknw branch 2 times, most recently from 2cb3d9b to 5984b10 Compare April 21, 2023 12:43
@sebastian-alfers sebastian-alfers mentioned this pull request Apr 21, 2023
Merged
@patriknw patriknw marked this pull request as ready for review April 24, 2023 06:21
johanandren
johanandren approved these changes Apr 24, 2023
View reviewed changes
Copy link
Member

@johanandren johanandren left a comment

Choose a reason for hiding this comment

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

LGTM (but CI unhappy about some formatting and rolling upgrade integration test is failing)

rolling-update-kubernetes/src/main/scala/akka/rollingupdate/kubernetes/KubernetesApi.scala
if (normalized.length > 63)
throw new IllegalArgumentException(s"Too long resource name [$normalized]. At most 63 characters is accepted. " +
"A custom resource name can be defined in configuration `akka.rollingupdate.kubernetes.custom-resource.cr-name`.")
trim(normalized, List('-'))
Copy link
Member

Choose a reason for hiding this comment

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

👍

efgpinto
efgpinto approved these changes Apr 24, 2023
View reviewed changes
Copy link
Contributor

@efgpinto efgpinto left a comment

Choose a reason for hiding this comment

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

LGTM

This was referenced Apr 24, 2023
Merged
Merged
@patriknw patriknw force-pushed the wip-pod-delete-crd-patriknw branch 4 times, most recently from ab6a742 to ca164ed Compare April 25, 2023 13:37
patriknw added 14 commits April 26, 2023 15:34
@patriknw
feat: Write pod cost to CRD
fb90d33 
* alternative to adding the Kubernetes annotation directly to the pod resource
  in case allowing PATCH verb is a security concern
* a separate Kubernetes operator with more privilages would watch the CR and
  update the pod resource with the annotation
@patriknw
scalafmt
204f1f6
@patriknw
header
a728112
@patriknw
less flatMap
bb45b90
@patriknw
bug fixes and logging improvements
1fc6446
@patriknw
in case of Status.Failure mistake
be4541f
@patriknw
more config
7a6169d
@patriknw
integration test
e67f166
@patriknw
fix compilation error
faca5f9
@patriknw
update expected logging
1701ca1
@patriknw
more output if it fails
dfc2c4f
@patriknw
3 replicas
8f33e4c
@patriknw
PodDeletionCostAnnotatorCrSpec
83b702e
@patriknw
integration test tweaks
57a7ca0
@patriknw patriknw force-pushed the wip-pod-delete-crd-patriknw branch from 8656cb7 to 7800157 Compare April 26, 2023 13:34
@patriknw patriknw merged commit bd6c4c1 into main Apr 26, 2023
@patriknw patriknw deleted the wip-pod-delete-crd-patriknw branch April 26, 2023 13:53
@patriknw patriknw added this to the 1.3.1 milestone Apr 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sebastian-alfers sebastian-alfers sebastian-alfers left review comments

@johanandren johanandren johanandren approved these changes

@efgpinto efgpinto efgpinto approved these changes

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

Successfully merging this pull request may close these issues.
4 participants
@patriknw @sebastian-alfers @johanandren @efgpinto