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

Add support for signing Builders and ClusterBuilders #1208

Conversation

stormqueen1990
Copy link
Contributor

@stormqueen1990 stormqueen1990 commented May 12, 2023

Changes

Fixes #942

@codecov-commenter
Copy link

codecov-commenter commented May 12, 2023

Codecov Report

Merging #1208 (4a76d00) into main (4d30b2a) will decrease coverage by 0.10%.
Report is 3 commits behind head on main.
The diff coverage is 65.75%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@            Coverage Diff             @@
##             main    #1208      +/-   ##
==========================================
- Coverage   67.41%   67.32%   -0.10%     
==========================================
  Files         133      133              
  Lines        8093     8205     +112     
==========================================
+ Hits         5456     5524      +68     
- Misses       2200     2231      +31     
- Partials      437      450      +13     
Files Coverage Δ
pkg/apis/build/v1alpha2/builder_types.go 22.22% <ø> (ø)
pkg/blob/fetch.go 58.90% <100.00%> (ø)
pkg/cnb/build_metadata.go 57.89% <100.00%> (ø)
pkg/cnb/create_builder.go 79.72% <100.00%> (+3.53%) ⬆️
pkg/cnb/env_vars.go 84.00% <100.00%> (ø)
pkg/dockercreds/parse_secrets.go 59.21% <100.00%> (ø)
pkg/registry/fetch.go 49.61% <100.00%> (ø)
pkg/secret/volume_secret_reader.go 67.56% <100.00%> (ø)
pkg/notary/repository.go 0.00% <0.00%> (ø)
pkg/apis/build/v1alpha2/builder_lifecycle.go 0.00% <0.00%> (ø)
... and 3 more

@stormqueen1990 stormqueen1990 force-pushed the feat/support-builder-signing branch from 7fd6d68 to c46e3c8 Compare May 25, 2023 17:52
@stormqueen1990 stormqueen1990 force-pushed the feat/support-builder-signing branch from c46e3c8 to 10108d0 Compare June 12, 2023 22:09
@stormqueen1990 stormqueen1990 changed the title Support builder/clusterbuilder signing Add support for signing Builders and ClusterBuilders Jun 12, 2023
@stormqueen1990 stormqueen1990 marked this pull request as ready for review June 12, 2023 22:15
Copy link
Contributor

@chenbh chenbh left a comment

Choose a reason for hiding this comment

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

What do we want to happen if we add a cosign secret after the [Cluster]Builder has been created?

Right now nothing happens, but we could get the builder and clusterbuilder reconcilers to track secrets? It does feel a little heavy hand to continuously read all new secrets in a namespace, but would that provide a better user experience?

(I don't have an opinion either way, just want to pick your brains a bit and maybe explicitly document this)

cmd/completion/main.go Outdated Show resolved Hide resolved
pkg/cosign/test_util.go Outdated Show resolved Hide resolved
pkg/reconciler/builder/builder_test.go Outdated Show resolved Hide resolved
test/execute_build_test.go Outdated Show resolved Hide resolved
pkg/cosign/image_signer.go Outdated Show resolved Hide resolved
pkg/cosign/image_signer.go Outdated Show resolved Hide resolved
pkg/apis/build/v1alpha2/builder_types.go Outdated Show resolved Hide resolved
pkg/apis/build/v1alpha2/builder_types.go Outdated Show resolved Hide resolved
pkg/cosign/image_signer.go Outdated Show resolved Hide resolved
@stormqueen1990 stormqueen1990 force-pushed the feat/support-builder-signing branch from 685f565 to 588b5e7 Compare July 3, 2023 21:38
@stormqueen1990
Copy link
Contributor Author

What do we want to happen if we add a cosign secret after the [Cluster]Builder has been created?

Right now nothing happens, but we could get the builder and clusterbuilder reconcilers to track secrets? It does feel a little heavy hand to continuously read all new secrets in a namespace, but would that provide a better user experience?

(I don't have an opinion either way, just want to pick your brains a bit and maybe explicitly document this)

For UX purposes, it sounds to me like that would be the best way to go forward. I'll wait for other opinions before making changes though.

@stormqueen1990 stormqueen1990 requested a review from chenbh July 4, 2023 15:20
pkg/cnb/create_builder_test.go Outdated Show resolved Hide resolved
pkg/cnb/create_builder_test.go Outdated Show resolved Hide resolved
test/execute_build_test.go Outdated Show resolved Hide resolved
@stormqueen1990 stormqueen1990 force-pushed the feat/support-builder-signing branch from fcddd14 to a7a9f0a Compare July 7, 2023 15:19
@stormqueen1990 stormqueen1990 requested a review from chenbh July 7, 2023 15:27
pkg/cosign/image_signer.go Outdated Show resolved Hide resolved
pkg/reconciler/builder/builder.go Outdated Show resolved Hide resolved
test/cosign_e2e_test.go Show resolved Hide resolved
@chenbh
Copy link
Contributor

chenbh commented Jul 7, 2023

What do we want to happen if we add a cosign secret after the [Cluster]Builder has been created?

We're going to bring this up at the next kpack wg, but from early talks with @tomkennedy513 and @matthewmcnew, we have some ideas:

  • Do nothing, the user will have to recreate the Builder to get it signed by every secret
  • Rely on the natural resync period for Builders (once every 10~12 hrs) and diff the current secrets found vs secrets used in the last run to see if we need a rebuild/resign
  • Watch all service accounts referenced by Builders and queue for reconcile if any service account changes
  • Watch all secrets and queue for reconcile if any cosign secrets (i.e. those that have cosign.blah in the data fields)

@stormqueen1990 stormqueen1990 force-pushed the feat/support-builder-signing branch from a7a9f0a to 4873c59 Compare July 12, 2023 21:25
@stormqueen1990 stormqueen1990 requested a review from a team as a code owner July 12, 2023 21:25
@stormqueen1990 stormqueen1990 force-pushed the feat/support-builder-signing branch from 4873c59 to 529ce1f Compare July 12, 2023 21:26
@stormqueen1990 stormqueen1990 requested a review from chenbh July 13, 2023 13:11
@chenbh
Copy link
Contributor

chenbh commented Jul 17, 2023

We're going to bring this up at the next kpack wg, but from early talks with @tomkennedy513 and @matthewmcnew, we have some ideas:

We ended up deciding that because there's no exit-early when reconciling builders, it's ok to rely on the natural (10-hour) resync period. So if the cosign secrets changed, the users will have to wait up to 10 hours before kpack pushes a new builder with the updated signature(s).

@chenbh
Copy link
Contributor

chenbh commented Jul 17, 2023

I think this PR is in a good place once #1208 (comment) is addressed, @stormqueen1990 do you mind cleaning/squashing up the commits a little? There are several of them titled "changes from code review" with wildly different changes in them that should really be separated into different commits or squashed into another commit.

Just to be clear, I don't care about the amount of commits as long as each individual commit is immediately obvious to what it's trying to do and is focused on one "unit of work"

@stormqueen1990
Copy link
Contributor Author

I think this PR is in a good place once #1208 (comment) is addressed, @stormqueen1990 do you mind cleaning/squashing up the commits a little? There are several of them titled "changes from code review" with wildly different changes in them that should really be separated into different commits or squashed into another commit.

Just to be clear, I don't care about the amount of commits as long as each individual commit is immediately obvious to what it's trying to do and is focused on one "unit of work"

Hi there, @chenbh! 👋

Sure thing! I was planning to squash commits into more meaningful chunks once this is good to go. I am a bit busy this week but will try to make all changes (squashing included) by EOD Thursday.

@stormqueen1990
Copy link
Contributor Author

Hi there, @chenbh! Sorry for the delay, I started facing issues after rebasing the branch for the last time. I'll have to investigate it and will push the updated and squashed branch as soon as possible.

@stormqueen1990 stormqueen1990 force-pushed the feat/support-builder-signing branch 2 times, most recently from 177fb39 to 82c847f Compare July 21, 2023 21:27
Copy link
Contributor

@chenbh chenbh left a comment

Choose a reason for hiding this comment

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

lgtm!

@chenbh
Copy link
Contributor

chenbh commented Aug 16, 2023

@tomkennedy513 @matthewmcnew @samj1912 do one of you mind taking a quick 👀 at this PR? It's a pretty beefy one and I would like at least one more review on it before merging

Copy link
Collaborator

@tomkennedy513 tomkennedy513 left a comment

Choose a reason for hiding this comment

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

Hey @stormqueen1990 would you be able to rebase this pr?

* Implement general logic for finding secrets and signing Builders and
  ClusterBuilders using cosign.
* Create new Fetcher interface to aid testing.
* Refactor the cosign ImageSigner to remove unused logger field.
* Fix typo in constant name for image signer.
* Add unit and e2e tests to verify changes.

Signed-off-by: Mauren Berti <stormqueen1990@gmail.com>
@stormqueen1990 stormqueen1990 force-pushed the feat/support-builder-signing branch from 82c847f to 4a76d00 Compare October 2, 2023 03:37
@stormqueen1990
Copy link
Contributor Author

stormqueen1990 commented Oct 2, 2023

Hey @stormqueen1990 would you be able to rebase this pr?

Hi there, @tomkennedy513! Yes, just rebased it. Please let me know if there's anything else that's needed to move this PR forward 🙏

I also squashed it to a single commit as my previous squash didn't really break this work into atomic pieces.

@tomkennedy513
Copy link
Collaborator

Thank you so much for this work! @stormqueen1990

@tomkennedy513 tomkennedy513 merged commit 08a114c into buildpacks-community:main Oct 2, 2023
1 check passed
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.

Support signing for images resulting from Builders/ClusterBuilders
4 participants