Skip to content

Conversation

pmtk
Copy link
Member

@pmtk pmtk commented Dec 20, 2024

No description provided.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 20, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 20, 2024
@pmtk
Copy link
Member Author

pmtk commented Dec 20, 2024

/test ?

Copy link
Contributor

openshift-ci bot commented Dec 20, 2024

@pmtk: The following commands are available to trigger required jobs:

/test e2e-aws-footprint-and-performance
/test e2e-aws-tests
/test e2e-aws-tests-arm
/test e2e-aws-tests-bootc
/test e2e-aws-tests-bootc-arm
/test e2e-aws-tests-bootc-periodic
/test e2e-aws-tests-bootc-periodic-arm
/test e2e-aws-tests-cache
/test e2e-aws-tests-cache-arm
/test e2e-aws-tests-periodic
/test e2e-aws-tests-periodic-arm
/test images
/test ocp-full-conformance-rhel-eus
/test ocp-full-conformance-serial-rhel-eus
/test test-rpm
/test test-unit
/test verify

The following commands are available to trigger optional jobs:

/test security
/test test-rebase

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-microshift-main-e2e-aws-tests
pull-ci-openshift-microshift-main-e2e-aws-tests-arm
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc
pull-ci-openshift-microshift-main-e2e-aws-tests-bootc-arm
pull-ci-openshift-microshift-main-images
pull-ci-openshift-microshift-main-ocp-full-conformance-rhel-eus
pull-ci-openshift-microshift-main-ocp-full-conformance-serial-rhel-eus
pull-ci-openshift-microshift-main-security
pull-ci-openshift-microshift-main-test-rebase
pull-ci-openshift-microshift-main-test-unit
pull-ci-openshift-microshift-main-verify

In response to this:

/test ?

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.

@pmtk
Copy link
Member Author

pmtk commented Dec 20, 2024

/test e2e-aws-tests-periodic

@pmtk pmtk force-pushed the remove-csi-webhook branch from c73c705 to 0a503ea Compare December 20, 2024 13:44
@pmtk
Copy link
Member Author

pmtk commented Dec 20, 2024

/test e2e-aws-tests-periodic e2e-aws-tests-bootc-periodic

@pmtk pmtk changed the title WIP Remove CSI webhook as it is deprecated USHIFT-5226: Remove CSI webhook as it is deprecated Dec 20, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 20, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 20, 2024

@pmtk: This pull request references USHIFT-5226 which is a valid jira issue.

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 20, 2024
@pmtk pmtk force-pushed the remove-csi-webhook branch from 0a503ea to 4542387 Compare December 20, 2024 15:10
@pmtk
Copy link
Member Author

pmtk commented Dec 20, 2024

/test e2e-aws-tests-periodic e2e-aws-tests-bootc-periodic

@pmtk
Copy link
Member Author

pmtk commented Dec 20, 2024

/test e2e-aws-tests-periodic e2e-aws-tests-bootc-periodic

@pmtk
Copy link
Member Author

pmtk commented Dec 20, 2024

/retest

@ggiguash
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 20, 2024
Copy link
Contributor

openshift-ci bot commented Dec 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pmtk

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:

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

@pmtk pmtk changed the title USHIFT-5226: Remove CSI webhook as it is deprecated USHIFT-5226: Remove CSI webhook due to deprecation Dec 20, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD e8e9f28 and 2 for PR HEAD db26897 in total

Copy link
Contributor

openshift-ci bot commented Dec 20, 2024

@pmtk: all tests passed!

Full PR test history. Your PR dashboard.

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

@openshift-merge-bot openshift-merge-bot bot merged commit 80d5b31 into openshift:main Dec 20, 2024
15 checks passed
@pmtk
Copy link
Member Author

pmtk commented Jan 20, 2025

/cherrypick release-4.18

@openshift-cherrypick-robot

@pmtk: #4346 failed to apply on top of branch "release-4.18":

Applying: Remove CSI webhook as it is deprecated
Using index info to reconstruct a base tree...
M	assets/release/release-aarch64.json
M	assets/release/release-x86_64.json
M	cmd/generate-config/config/config-openapi-spec.json
M	docs/user/howto_config.md
M	packaging/microshift/config.yaml
A	pkg/healthcheck/microshift_core_workloads.go
A	pkg/healthcheck/workloads_test.go
M	test/suites/standard1/configuration.robot
Falling back to patching base and 3-way merge...
Auto-merging test/suites/standard1/configuration.robot
CONFLICT (modify/delete): pkg/healthcheck/workloads_test.go deleted in HEAD and modified in Remove CSI webhook as it is deprecated. Version Remove CSI webhook as it is deprecated of pkg/healthcheck/workloads_test.go left in tree.
CONFLICT (modify/delete): pkg/healthcheck/microshift_core_workloads.go deleted in HEAD and modified in Remove CSI webhook as it is deprecated. Version Remove CSI webhook as it is deprecated of pkg/healthcheck/microshift_core_workloads.go left in tree.
Auto-merging packaging/microshift/config.yaml
Auto-merging docs/user/howto_config.md
Auto-merging cmd/generate-config/config/config-openapi-spec.json
Auto-merging assets/release/release-x86_64.json
CONFLICT (content): Merge conflict in assets/release/release-x86_64.json
Auto-merging assets/release/release-aarch64.json
CONFLICT (content): Merge conflict in assets/release/release-aarch64.json
Removing assets/components/csi-snapshot-controller/webhook_serviceaccount.yaml
Removing assets/components/csi-snapshot-controller/webhook_service.yaml
Removing assets/components/csi-snapshot-controller/webhook_deployment.yaml
Removing assets/components/csi-snapshot-controller/webhook_config.yaml
Removing assets/components/csi-snapshot-controller/webhook_clusterrolebinding.yaml
Removing assets/components/csi-snapshot-controller/webhook_clusterrole.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Remove CSI webhook as it is deprecated

In response to this:

/cherrypick release-4.18

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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