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

Support auth annotations for Upbound #295

Merged
merged 1 commit into from
May 18, 2023

Conversation

jastang
Copy link
Contributor

@jastang jastang commented May 3, 2023

Description of your changes

Bumps the build submodule to pick up changes that support adding ProviderConfig documentation for Upbound via the auth annotations (auth.yaml).

Fixes https://github.com/upbound/squad-upbound-cloud/issues/1218

I have:

  • Run make reviewable test to ensure this PR is ready for review.

How has this code been tested

Built and pushed the config & monolithic packages using this PR. The packages will be shared via a different communication channel.

@jastang
Copy link
Contributor Author

jastang commented May 3, 2023

Note -- this is not functioning in its current state. The package-level annotation is being injected, but not the CRD-level annotations on the ProviderConfig (even with a raw up xpkg build ... command). Needs further investigation before being ready for review.

@ulucinar
Copy link
Collaborator

ulucinar commented May 4, 2023

Hi @jastang,
If you prefer, I can take over from here and do the investigation. How do you feel about it?

@jastang
Copy link
Contributor Author

jastang commented May 4, 2023

Hi @jastang,

If you prefer, I can take over from here and do the investigation. How do you feel about it?

Go for it @ulucinar ! I am out til next week, so no rush on my end.

@ulucinar
Copy link
Collaborator

Let's wait for #299, which replaces the multiple versions of the package metadata (crossplane-config.yaml, crossplane-monolith.yaml and crossplane.yaml) with a template file. Once that one is merged, I will rebase this onto it and adjust accordingly.

Signed-off-by: Alper Rifat Ulucinar <[email protected]>
@ulucinar
Copy link
Collaborator

Hi @jastang,
The issue with the PR was that we currently don't support amending the provider package metadata with auth annotation for the v1 version of Provider.meta. Currently, only v1alpha1 is supported:
https://github.com/upbound/up/blob/7776c9db2c93d1f8dcce6ece05944dcf4a84ef2a/internal/xpkg/build.go#L196

I've rebased the PR and it's ready for review.

@ulucinar ulucinar marked this pull request as ready for review May 17, 2023 07:08
@ulucinar
Copy link
Collaborator

/test-examples="examples/cloudplatform/serviceaccount.yaml"

@jastang
Copy link
Contributor Author

jastang commented May 18, 2023

Hi @jastang, The issue with the PR was that we currently don't support amending the provider package metadata with auth annotation for the v1 version of Provider.meta. Currently, only v1alpha1 is supported: https://github.com/upbound/up/blob/7776c9db2c93d1f8dcce6ece05944dcf4a84ef2a/internal/xpkg/build.go#L196

I've rebased the PR and it's ready for review.

thanks @ulucinar! I don't think that should block this PR, but is there a reason to only support v1alpha1? cc @nullable-eth

Copy link
Collaborator

@sergenyalcin sergenyalcin left a comment

Choose a reason for hiding this comment

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

Thanks @jastang LGTM!

@ulucinar ulucinar merged commit a74e053 into crossplane-contrib:main May 18, 2023
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.

3 participants