Skip to content

Include harvester-cloud-provider-config in sensitive resourceset#666

Merged
jbiers merged 1 commit intorancher:mainfrom
jbiers:include-harvester-secret-in-sensitive-backups
Feb 12, 2025
Merged

Include harvester-cloud-provider-config in sensitive resourceset#666
jbiers merged 1 commit intorancher:mainfrom
jbiers:include-harvester-secret-in-sensitive-backups

Conversation

@jbiers
Copy link
Contributor

@jbiers jbiers commented Feb 12, 2025

@jbiers jbiers requested a review from a team as a code owner February 12, 2025 17:07
@jbiers jbiers force-pushed the include-harvester-secret-in-sensitive-backups branch from 2c8f6a8 to 6a0b905 Compare February 12, 2025 17:11
@jbiers jbiers merged commit 1bc18e6 into rancher:main Feb 12, 2025
7 checks passed
@mallardduck
Copy link
Member

/backport release/v6.x 2.10.7

@github-actions
Copy link

Not creating port PR, there was an error running git am -3:

Applying: Include harvester-cloud-provider-config in sensitive resourceset
Using index info to reconstruct a base tree...
A	charts/rancher-backup/files/sensitive-resourceset-contents/provisioningv2.yaml
A	e2e/test/data/rancher-resource-set-full.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): e2e/test/data/rancher-resource-set-full.yaml deleted in HEAD and modified in Include harvester-cloud-provider-config in sensitive resourceset. Version Include harvester-cloud-provider-config in sensitive resourceset of e2e/test/data/rancher-resource-set-full.yaml left in tree.
CONFLICT (modify/delete): charts/rancher-backup/files/sensitive-resourceset-contents/provisioningv2.yaml deleted in HEAD and modified in Include harvester-cloud-provider-config in sensitive resourceset. Version Include harvester-cloud-provider-config in sensitive resourceset of charts/rancher-backup/files/sensitive-resourceset-contents/provisioningv2.yaml left in tree.
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 set advice.mergeConflict false"
Patch failed at 0001 Include harvester-cloud-provider-config in sensitive resourceset

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants