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

Simplifies target matching logic per spec PR review #1166

Merged
merged 8 commits into from
Jul 31, 2023

Conversation

natalieparellano
Copy link
Member

@natalieparellano natalieparellano commented Jul 28, 2023

Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
…as missing values are wildcard matches

Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
@natalieparellano
Copy link
Member Author

@jabrown85 I added 135d78f with stricter validation for rebase (if the original run image had distribution information, then the new run image should also have it). I think that is more consistent with what we have in the spec:

- **If** `<force>` is `true`, the following [target data](#target-data) values in the output `<image>` config MUST be derived from the new `<run-image>`:
  - `os`
  - `architecture`
  - `variant` (if specified)
  - `io.buildpacks.base.distro.name` (if specified)
  - `io.buildpacks.base.distro.version` (if specified)
- **Else** the target data above MUST match the old run image if `<force>` is `false`

@natalieparellano natalieparellano merged commit 87d4f05 into release/0.17.0-rc.4 Jul 31, 2023
7 checks passed
@natalieparellano natalieparellano deleted the fix/target-matching branch July 31, 2023 13:42
natalieparellano added a commit that referenced this pull request Aug 9, 2023
* restorer gets layers flag again

Signed-off-by: Joe Kimmel <[email protected]>

* add explanatory debug logs so a reader knows why the buildpacks are read twice.

Signed-off-by: Joe Kimmel <[email protected]>

* warn when a positional argument might have been a flag (#1147)

Signed-off-by: Joe Kimmel <[email protected]>

* Add test for empty digest not returned

Signed-off-by: Natalie Arellano <[email protected]>

* Fix acceptance by providing a base image when we instantiate the remote run image

Signed-off-by: Natalie Arellano <[email protected]>

* timestamp logs and phase error message cherry-picks (#1164)

* timestamp logs for entry/exit for all the top-level Lifecycle package functions

Signed-off-by: Joe Kimmel <[email protected]>

fixing names

Signed-off-by: Joe Kimmel <[email protected]>

using defer to make one-liners for fun and profit

Signed-off-by: Joe Kimmel <[email protected]>

and today we thank our brave linters for preventing critical defects such as unnecessary trailing newlines from being merged. Its about time somebody thought of the children.

Signed-off-by: Joe Kimmel <[email protected]>

* be more helpful when you dont recognize the phase

Signed-off-by: Joe Kimmel <[email protected]>

---------

Signed-off-by: Joe Kimmel <[email protected]>

* Simplifies target matching logic per spec PR review (#1166)

* Update units without updating code

Signed-off-by: Natalie Arellano <[email protected]>

* Update code

Signed-off-by: Natalie Arellano <[email protected]>

* Unpend test

Signed-off-by: Natalie Arellano <[email protected]>

* Add units for rebase without updating code

Signed-off-by: Natalie Arellano <[email protected]>

* Update rebase code

Signed-off-by: Natalie Arellano <[email protected]>

* Fix lint

Signed-off-by: Natalie Arellano <[email protected]>

* When we read the descriptor file, don't fill in "*" as a magic value as missing values are wildcard matches

Signed-off-by: Natalie Arellano <[email protected]>

* Stricter validation for rebase

Signed-off-by: Natalie Arellano <[email protected]>

---------

Signed-off-by: Natalie Arellano <[email protected]>

* Add -daemon to restorer (#1168)

This is needed when extensions were used to switch (but not extend) the run image
and we need to re-read the target data from the image config.

In such cases, we don't need the run image to exist in a registry,
because we don't need a manifest for kaniko.

Signed-off-by: Natalie Arellano <[email protected]>

* Remove CNB_TARGET_ID according to buildpacks/spec#374 and buildpacks/spec#375 (#1175)

Signed-off-by: Natalie Arellano <[email protected]>

* Field renames per spec review (#1170)

* Rename distributions -> distros in the buildpack spec

Signed-off-by: Natalie Arellano <[email protected]>

* Rename distributions -> distros in the platform spec

Signed-off-by: Natalie Arellano <[email protected]>

---------

Signed-off-by: Natalie Arellano <[email protected]>

* force pack acceptance tests to build with a version of go that can still make HTTP requests to docker daemon (#1158)

Signed-off-by: Joe Kimmel <[email protected]>

---------

Signed-off-by: Joe Kimmel <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
Co-authored-by: Joe Kimmel <[email protected]>
Co-authored-by: Joe Kimmel <[email protected]>
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