Bug 1929577: Fix to avoid overriding of d/dc pod template container values

[divyanshiGupta]

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1929577
Fixes: https://issues.redhat.com/browse/ODC-5546

Root Cause:
Currently on editing d/dc using edit flow overrides the current resource containers completely with new resource containers https://github.com/openshift/console/pull/4517/files#diff-7fd530a4a1b4113f74f1e7e64beadbdb448845c1fad06d6a4d4824425583c2d6R53-R55 not taking in account the values that we dont add from UI like envFrom, imagePullPolicy etc thereby removing these values from the containers.

In container image flow when imagestream from internal registry is selected then its name is wrongly used as container name in the trigger annotation.

Solution:
Do not completely override the containers instead update only the values that we add from UI and leave other values as is.
Use correct container name in trigger annotation.

Gif:

Unit Test Coverage:

/kind bug

[openshift-ci-robot]

@divyanshiGupta: This pull request references Bugzilla bug 1929577, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.8.0) matches configured target release for branch (4.8.0)
• bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1929577: Fix to avoid overriding of d/dc pod template container values

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[divyanshiGupta]

/cc: @christianvogt

[spadgett]

Hi, @divyanshiGupta. Does this also address the incorrect image.openshift.io/triggers annotation? (See the comments in the Bugzilla.)

[divyanshiGupta]

@spadgett I created a separate bug https://issues.redhat.com/browse/ODC-5546 for that issue. But if needed I can add the fix in this PR only or raise a separate PR tomorrow.

[spadgett]

@spadgett I created a separate bug https://issues.redhat.com/browse/ODC-5546 for that issue. But if needed I can add the fix in this PR only or raise a separate PR tomorrow.

OK, thanks. We'll probably want to backport both fixes. I'd recommend either fixing both in one PR or creating separate Bugzilla bugs.

[openshift-ci-robot]

@divyanshiGupta: This pull request references Bugzilla bug 1929577, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.8.0) matches configured target release for branch (4.8.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1929577: Fix to avoid overriding of d/dc pod template container values

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-ci-robot]

@divyanshiGupta: This pull request references Bugzilla bug 1929577, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target release (4.8.0) matches configured target release for branch (4.8.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1929577: Fix to avoid overriding of d/dc pod template container values

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[jerolimov]

/assign @andrewballantyne

[spadgett]

/cherry-pick release-4.7

[openshift-cherrypick-robot]

@spadgett: once the present PR merges, I will cherry-pick it on top of release-4.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[spadgett]

/cherry-pick release-4.6

[openshift-cherrypick-robot]

@spadgett: once the present PR merges, I will cherry-pick it on top of release-4.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[rohitkrai03]

/assign

[rohitkrai03]

/approve

Code changes looks good to me. Tested locally for both env variables and trigger annotation issue. Works as expected.

[rohitkrai03]

/lgtm

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: divyanshiGupta, rohitkrai03

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:

• frontend/packages/dev-console/OWNERS [rohitkrai03]
• frontend/packages/knative-plugin/OWNERS [rohitkrai03]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-ci-robot]

@divyanshiGupta: All pull requests linked via external trackers have merged:

• openshift/console#8201

Bugzilla bug 1929577 has been moved to the MODIFIED state.

In response to this:

Bug 1929577: Fix to avoid overriding of d/dc pod template container values

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@spadgett: new pull request created: #8248

In response to this:

/cherry-pick release-4.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@spadgett: #8201 failed to apply on top of branch "release-4.6":

Applying: Do not override/remove container values
Using index info to reconstruct a base tree...
M	frontend/packages/dev-console/src/components/edit-application/edit-application-utils.ts
M	frontend/packages/dev-console/src/components/import/advanced/DeploymentConfigSection.tsx
A	frontend/packages/dev-console/src/utils/__tests__/resource-label-utils-data.ts
A	frontend/packages/dev-console/src/utils/__tests__/resource-label-utils.spec.tsx
M	frontend/packages/dev-console/src/utils/resource-label-utils.ts
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/dev-console/src/utils/resource-label-utils.ts
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/utils/resource-label-utils.ts
CONFLICT (modify/delete): frontend/packages/dev-console/src/utils/__tests__/resource-label-utils.spec.tsx deleted in HEAD and modified in Do not override/remove container values. Version Do not override/remove container values of frontend/packages/dev-console/src/utils/__tests__/resource-label-utils.spec.tsx left in tree.
CONFLICT (modify/delete): frontend/packages/dev-console/src/utils/__tests__/resource-label-utils-data.ts deleted in HEAD and modified in Do not override/remove container values. Version Do not override/remove container values of frontend/packages/dev-console/src/utils/__tests__/resource-label-utils-data.ts left in tree.
Auto-merging frontend/packages/dev-console/src/components/import/advanced/DeploymentConfigSection.tsx
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/import/advanced/DeploymentConfigSection.tsx
Auto-merging frontend/packages/dev-console/src/components/edit-application/edit-application-utils.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Do not override/remove container values
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[spadgett]

@divyanshiGupta Looks like we will need to manually backport to 4.6.z unfortunately.