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

charts/deployment: adjust for wrapper script and release v0.23.0 #127

Merged
merged 2 commits into from
Nov 27, 2023

Conversation

jecluis
Copy link
Contributor

@jecluis jecluis commented Oct 14, 2023

By using a wrapper script as the container entrypoint, we abstract how arguments to the underlying radosgw binary are passed. Instead, pass arguments known by the script, and let it do what is best.

This pull request has a companion pull request in aquarist-labs/s3gw#758 .

Also, this patchset also releases v0.23.0.

Signed-off-by: Joao Eduardo Luis <[email protected]>

@jecluis jecluis added the kind/enhancement Change that positively impacts existing code label Oct 14, 2023
@jecluis jecluis requested review from m-ildefons and giubacc October 14, 2023 11:10
@jecluis jecluis added this to the v0.22.0 milestone Oct 14, 2023
@jecluis jecluis force-pushed the wip-wrap-container-entrypoint branch from 36c3420 to 5ac1481 Compare October 14, 2023 11:15
@jecluis
Copy link
Contributor Author

jecluis commented Oct 14, 2023

It's not clear whether the test is failing due to aquarist-labs/s3gw#758 not being merged.

@m-ildefons is there any way we can test the chart with a custom container version, other than modifying the workflow?

@m-ildefons
Copy link
Contributor

In charts/s3gw/ci you'll find yaml files. The test workflow iterates over those files, executing an installation of the chart using each of the yaml files in charts/s3gw/ci in place of the values.yaml. You can define custom images in there, e.g.:

imageRegistry: "quay.io"
imageName: "s3gw/s3gw-joao-custom"
imageTag: "v1.2.3-test"

@giubacc
Copy link
Contributor

giubacc commented Oct 17, 2023

I don't think we have tests ensuring rgwCustomArgs: [] and rgwCustomEnvs: [] functionality in charts; given that they are very useful for developing purposes, please @jecluis, have a check to ensure they continue working as expected with this patch.

@jecluis jecluis modified the milestones: v0.22.0, v0.23.0 Oct 24, 2023
@jecluis jecluis self-assigned this Nov 13, 2023
By using a wrapper script as the container entrypoint, we abstract how
arguments to the underlying radosgw binary are passed. Instead, pass
arguments known by the script, and let it do what is best.

Signed-off-by: Joao Eduardo Luis <[email protected]>
@jecluis jecluis force-pushed the wip-wrap-container-entrypoint branch from 5ac1481 to 896864c Compare November 15, 2023 12:21
@jecluis
Copy link
Contributor Author

jecluis commented Nov 15, 2023

@m-ildefons passed with the custom image 🥳 That last commit is to be dropped before merge, and I expect the PR to actually pass anyway once the image changes are merged on aquarist-labs/s3gw .

@giubacc there's no reason for rgwCustomArgs to not work. As for rgwCustomEnv, I'm not sure what to provide to it to actually test it. Insights welcome.

@giubacc
Copy link
Contributor

giubacc commented Nov 15, 2023

@giubacc there's no reason for rgwCustomArgs to not work. As for rgwCustomEnv, I'm not sure what to provide to it to actually test it. Insights welcome.

eg, for rgwCustomArgs :

  helm upgrade --wait --install -n s3gw-ha --create-namespace s3gw-ha s3gw/s3gw 
  ...
    --set rgwCustomArgs="{--rgw_relaxed_region_enforcement,1}"

(the rgwCustomEnv has the same pattern usage)

@jecluis
Copy link
Contributor Author

jecluis commented Nov 15, 2023

(the rgwCustomEnv has the same pattern usage)

I understand that, but what key/values would you use with that?

@giubacc
Copy link
Contributor

giubacc commented Nov 15, 2023

(the rgwCustomEnv has the same pattern usage)

I understand that, but what key/values would you use with that?

it doesn't matter, you can just put KEY=VALUE and verify that in the s3gw pod you have that env var set and we are good.

@vmoutoussamy vmoutoussamy added the priority/1 Should be fixed for next release label Nov 15, 2023
@jecluis
Copy link
Contributor Author

jecluis commented Nov 15, 2023

(the rgwCustomEnv has the same pattern usage)

I understand that, but what key/values would you use with that?

it doesn't matter, you can just put KEY=VALUE and verify that in the s3gw pod you have that env var set and we are good.

This update does nothing to environment variables for the pod. Those will still be available the same way they have been.

Are you using that to pass env vars to the pod, not the radosgw binary? Because if so, then having this option named as rgwCustomEnv might not make a lot of sense.

@giubacc
Copy link
Contributor

giubacc commented Nov 16, 2023

Are you using that to pass env vars to the pod, not the radosgw binary? Because if so, then having this option named as rgwCustomEnv might not make a lot of sense.

I think this was the original idea: passing arbitrary env vars to the s3gw pod for dev purposes.
Agree that these names should be now be changed in Custom* dropping the rgw part given that we are in the path to hide the underlying radosgw implementation to the user.

@jecluis
Copy link
Contributor Author

jecluis commented Nov 16, 2023

Okay, then that's something to do in a different patch set.

@m-ildefons any other thing comes to mind about this? Otherwise I'll consider it good to merge after merging https://github.com/aquarist-labs/s3gw/pull/758 , dropping the test patch from this PR, and ensuring it is working.

@jecluis jecluis force-pushed the wip-wrap-container-entrypoint branch from 896864c to ce35341 Compare November 16, 2023 16:20
@jecluis
Copy link
Contributor Author

jecluis commented Nov 16, 2023

Well, the tests will fail nonetheless, even after merging aquarist-labs/s3gw#758 because merging that PR doesn't actually push a new image with the latest code to quay -- and we test the chart using whatever is latest on quay. So it will be testing the code against the current image anyway. This workflow seems broken to me.

We will have to wait until we create the next release to merge this.

Signed-off-by: Joao Eduardo Luis <[email protected]>
(cherry picked from commit cf61082)
Signed-off-by: Joao Eduardo Luis <[email protected]>
@jecluis jecluis changed the title charts/deployment: adjust for wrapper script charts/deployment: adjust for wrapper script and release v0.23.0 Nov 27, 2023
Copy link
Contributor

@m-ildefons m-ildefons left a comment

Choose a reason for hiding this comment

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

LGTM

@jecluis jecluis merged commit 2f8d5b1 into s3gw-tech:main Nov 27, 2023
4 checks passed
@jecluis jecluis deleted the wip-wrap-container-entrypoint branch November 27, 2023 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Change that positively impacts existing code priority/1 Should be fixed for next release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

docs: explain how to use --rgw-dns-name to enable hostname style buckets
4 participants