kubernetes-sigs / structured-merge-diff

Test cases and implementation for "server-side apply"
Apache License 2.0
105 stars 62 forks source link

add field-level element relationship which overrides referred type #220

Closed alexzielenski closed 2 years ago

alexzielenski commented 2 years ago

Part of our solution for https://github.com/kubernetes/kubernetes/pull/110495

Adds necessary functionality to support field-level annotations which may override the annotation of the referred type.

alexzielenski commented 2 years ago

/cc @Jefftree

alexzielenski commented 2 years ago

Added tests, addressed comments.

alexzielenski commented 2 years ago

tests added, newline removed ;)

alexzielenski commented 2 years ago

/restest

I double checked the diff from that gofmt error. My checkout does not contain those changes. I tried to re-run gofmt locally but saw no changes. Not seeing the same thing on my side... Maybe the CI is confused?

It is expecting changes in comments replacing * with -

alexzielenski commented 2 years ago

/retest

Had typo in last attempt.

lavalamp commented 2 years ago

/lgtm /approve

k8s-ci-robot commented 2 years ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alexzielenski, lavalamp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/kubernetes-sigs/structured-merge-diff/blob/master/OWNERS)~~ [lavalamp] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
apelisse commented 2 years ago

I tagged the merged commit with v4.2.2.

apelisse commented 2 years ago

I suspect the schema change to pointer is backwards incompatible, I'll have to fix the tag and change the release branch to v5.

apelisse commented 2 years ago

I removed the v4.2.2 tag since I think it was not correct semver.