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

OCM-6883 | fix: disable the feature for custom username of cluster admin #1887

Merged
merged 1 commit into from
Mar 29, 2024

Conversation

marcolan018
Copy link
Contributor

@marcolan018 marcolan018 commented Mar 29, 2024

Signed-off-by: marcolan018 [email protected]

disable the feature for 1.2.37 to avoid the conflicts with rosa admin commands

Copy link
Contributor

openshift-ci bot commented Mar 29, 2024

@marcolan018: 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/test-infra repository. I understand the commands that are listed here.

Copy link

codecov bot commented Mar 29, 2024

Codecov Report

Attention: Patch coverage is 20.00000% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 21.81%. Comparing base (d88d6b1) to head (b172dbb).

Files Patch % Lines
cmd/create/cluster/cmd.go 20.00% 4 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1887   +/-   ##
=======================================
  Coverage   21.81%   21.81%           
=======================================
  Files         117      117           
  Lines       18929    18929           
=======================================
+ Hits         4129     4130    +1     
+ Misses      14489    14488    -1     
  Partials      311      311           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@willkutler
Copy link
Contributor

/lgtm

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

ckandag commented Mar 29, 2024

/lgtm

@pvasant
Copy link
Contributor

pvasant commented Mar 29, 2024

/lgtm

Copy link
Contributor

openshift-ci bot commented Mar 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ckandag, marcolan018, pvasant, willkutler

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 29, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit f107b6f into openshift:master Mar 29, 2024
9 checks passed
@marcolan018 marcolan018 deleted the ocm-6883-1 branch March 29, 2024 16:23
@willkutler
Copy link
Contributor

/cherrypick release_1.2.37

@openshift-cherrypick-robot

@willkutler: #1887 failed to apply on top of branch "release_1.2.37":

Applying: OCM-6883 | fix: disable the feature for custom username of cluster admin Signed-off-by: marcolan018 <[email protected]>
Using index info to reconstruct a base tree...
M	cmd/create/cluster/cmd.go
Falling back to patching base and 3-way merge...
Auto-merging cmd/create/cluster/cmd.go
CONFLICT (content): Merge conflict in cmd/create/cluster/cmd.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCM-6883 | fix: disable the feature for custom username of cluster admin Signed-off-by: marcolan018 <[email protected]>
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:

/cherrypick release_1.2.37

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.

gdbranco pushed a commit that referenced this pull request Mar 29, 2024
OCM-6883 | fix: disable the feature for custom username of cluster admin
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.

5 participants