Skip to content

update mysql/mongo/other for 4.15 error on restartPolicy#1365

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:masterfrom
weshayutin:restartPolicy
Mar 20, 2024
Merged

update mysql/mongo/other for 4.15 error on restartPolicy#1365
openshift-merge-bot[bot] merged 2 commits into
openshift:masterfrom
weshayutin:restartPolicy

Conversation

@weshayutin
Copy link
Copy Markdown
Contributor

@weshayutin weshayutin commented Mar 18, 2024

This seems to be a OCP 4.15 issue only. The restartPolicy is not required on any version afaict.

Error:
The Deployment "mysql" is invalid: spec.template.spec.containers[0].restartPolicy: Forbidden: may not be set for non-init containers

Error:
`The Deployment "mysql" is invalid:
spec.template.spec.containers[0].restartPolicy:
Forbidden: may not be set for non-init containers`
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 18, 2024
sseago
sseago previously approved these changes Mar 18, 2024
@sseago
Copy link
Copy Markdown
Contributor

sseago commented Mar 18, 2024

spec.container.restartPolicy is new as of kube 1.28/OCP4.15 and only valid for init containers. It didn't exist at all prior to 1.28, so removing it from the mysql and mongo yaml files is necessary. The parks-app removal is a different field (spec.restartPolicy) which should be valid across all versions, but it's fine to remove if the test doesn't require it to remove any confusion it might cause.

@mateusoliveira43
Copy link
Copy Markdown

@sseago deprecated folder is not used by our tests, so tests will not care

trying to remove it in #1283

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mateusoliveira43, sseago, weshayutin

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@mateusoliveira43
Copy link
Copy Markdown

/retest

@weshayutin
Copy link
Copy Markdown
Contributor Author

/lgtm

@weshayutin
Copy link
Copy Markdown
Contributor Author

/retest

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 20, 2024

@weshayutin: you cannot LGTM your own PR.

Details

In response to this:

/lgtm

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.

@sseago
Copy link
Copy Markdown
Contributor

sseago commented Mar 20, 2024

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Mar 20, 2024
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 20, 2024

@weshayutin: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot Bot merged commit d06f5f7 into openshift:master Mar 20, 2024
@mateusoliveira43
Copy link
Copy Markdown

/cherry-pick oadp-1.3

@openshift-cherrypick-robot
Copy link
Copy Markdown
Contributor

@mateusoliveira43: #1365 failed to apply on top of branch "oadp-1.3":

Applying: update mysql/mongo for 4.15 error on restartPolicy
Using index info to reconstruct a base tree...
M	tests/e2e/sample-applications/mongo-persistent/mongo-persistent-block.yaml
M	tests/e2e/sample-applications/mongo-persistent/mongo-persistent-csi.yaml
M	tests/e2e/sample-applications/mongo-persistent/mongo-persistent.yaml
M	tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml
M	tests/e2e/sample-applications/mysql-persistent/mysql-persistent-twovol-csi.yaml
M	tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml
CONFLICT (content): Merge conflict in tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml
Auto-merging tests/e2e/sample-applications/mysql-persistent/mysql-persistent-twovol-csi.yaml
CONFLICT (content): Merge conflict in tests/e2e/sample-applications/mysql-persistent/mysql-persistent-twovol-csi.yaml
Auto-merging tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml
CONFLICT (content): Merge conflict in tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml
Auto-merging tests/e2e/sample-applications/mongo-persistent/mongo-persistent.yaml
CONFLICT (content): Merge conflict in tests/e2e/sample-applications/mongo-persistent/mongo-persistent.yaml
Auto-merging tests/e2e/sample-applications/mongo-persistent/mongo-persistent-csi.yaml
CONFLICT (content): Merge conflict in tests/e2e/sample-applications/mongo-persistent/mongo-persistent-csi.yaml
Auto-merging tests/e2e/sample-applications/mongo-persistent/mongo-persistent-block.yaml
CONFLICT (content): Merge conflict in tests/e2e/sample-applications/mongo-persistent/mongo-persistent-block.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update mysql/mongo for 4.15 error on restartPolicy
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".

Details

In response to this:

/cherry-pick oadp-1.3

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-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants