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 new manifest deployer update strategies #624

Merged
merged 5 commits into from
Oct 25, 2022

Conversation

reshnm
Copy link
Member

@reshnm reshnm commented Oct 25, 2022

How to categorize this PR?

/area manifest-deployer
/kind enhancement
/priority 3

What this PR does / why we need it:

The previously available manifest deployer update strategies update and patch were not sufficient for resources that are being modified by a kubernetes controller after being created (like Gardener Shoots). The available strategies would always overwrite these modfications.

This PR introduces two new update strategies to accomodate the use case scenarios:

  • merge: The manifest deployer will merge the results of the rendered manifests into the resources on the cluster. Fields that already exist in the resources on the cluster, will not be overwritten.
  • mergeOverwrite: The manifest deployer will merge the results of the rendered manifests into the resources on the cluster. Fields that already exist in the resources on the cluster, will be overwritten when the rendered field is not empty.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Release note:

Add manifest deployer update strategies "merge" and "mergeOverwrite".

@reshnm reshnm requested a review from a team as a code owner October 25, 2022 07:32
@reshnm reshnm requested review from Diaphteiros and In-Ko October 25, 2022 07:32
@gardener-robot gardener-robot added area/manifest-deployer Manifest Deployer related kind/enhancement Enhancement, improvement, extension priority/3 Priority (lower number equals higher priority) needs/review Needs review size/l Size of pull request is large (see gardener-robot robot/bots/size.py) needs/second-opinion Needs second review by someone else labels Oct 25, 2022
@reshnm reshnm added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 25, 2022
@gardener-robot-ci-2 gardener-robot-ci-2 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 25, 2022
Copy link
Contributor

@Diaphteiros Diaphteiros left a comment

Choose a reason for hiding this comment

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

/lgtm

@gardener-robot gardener-robot added reviewed/lgtm Has approval for merging and removed needs/review Needs review needs/second-opinion Needs second review by someone else labels Oct 25, 2022
@reshnm
Copy link
Member Author

reshnm commented Oct 25, 2022

/test

@testmachinery
Copy link

testmachinery bot commented Oct 25, 2022

Testrun: e2e-28frm
Workflow: e2e-28frm-wf
Phase: Failed

+--------------------+--------------------+-----------+----------+
|        NAME        |        STEP        |   PHASE   | DURATION |
+--------------------+--------------------+-----------+----------+
| create-cluster     | create-cluster     | Succeeded | 3m13s    |
| create-registry    | create-registry    | Succeeded | 2m46s    |
| install-landscaper | install-landscaper | Succeeded | 53s      |
| integration-test   | test               | Failed    | 6m15s    |
| delete-cluster     | delete-cluster     | Omitted   | 0s       |
| delete-registry    | delete-registry    | Omitted   | 0s       |
+--------------------+--------------------+-----------+----------+

@gardener-robot gardener-robot added needs/second-opinion Needs second review by someone else and removed reviewed/lgtm Has approval for merging labels Oct 25, 2022
@reshnm reshnm added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 25, 2022
@gardener-robot-ci-1 gardener-robot-ci-1 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 25, 2022
@reshnm reshnm added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 25, 2022
@gardener-robot-ci-3 gardener-robot-ci-3 removed the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 25, 2022
@reshnm reshnm merged commit ee7a348 into gardener:master Oct 25, 2022
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Oct 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/manifest-deployer Manifest Deployer related kind/enhancement Enhancement, improvement, extension needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/second-opinion Needs second review by someone else priority/3 Priority (lower number equals higher priority) size/l Size of pull request is large (see gardener-robot robot/bots/size.py) status/closed Issue is closed (either delivered or triaged)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants