Skip to content

Conversation

@jihoon-seo
Copy link
Member

@jihoon-seo jihoon-seo commented Mar 5, 2023

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Mar 5, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 5, 2023
@jihoon-seo jihoon-seo changed the title Backport cve-feed shortcode Backport cve-feed shortcode to dev-1.26-ko.1 branch Mar 5, 2023
@netlify
Copy link

netlify bot commented Mar 5, 2023

Deploy Preview for k8s-dev-ko ready!

Name Link
🔨 Latest commit 44334fa
🔍 Latest deploy log https://app.netlify.com/sites/k8s-dev-ko/deploys/6405bf37b142e30008703ff4
😎 Deploy Preview https://deploy-preview-39787--k8s-dev-ko.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@jihoon-seo
Copy link
Member Author

The Netlify preview build for this PR succeded without error.
After merging this into dev-1.26-ko.1 and getting each related PR rebased against the updated dev-1.26-ko.1, then the Netlify build error of those PRs will be resolved.
(FYI: dev-1.26-ko.1 is the working branch of the Korean localization job for 1.26 (main).)

Since this PR is touching the files under layouts/, it needs lgtm & approval from English approvers.
@mehabhalodiya @nate-double-u as the reviewers of this PR, please take a look!
(CC: @seokho-son)

@seokho-son
Copy link
Member

Hi @jihoon-seo
Making this change would not follow the Korean branch strategy. (we don't rebase the upstream development branch for Korean onto the main to keep the commit history. It is to check outdated contents by comparing two Korean dev branches.)

When we try to merge dev-1.26-ko.1 into the main branch, the commit in this PR possibly incur a conflict that may require rebasing dev-1.26-ko.1 onto the main.

How about cheery-picking the related commits? https://kubernetes.slack.com/archives/CA1MMM1HU/p1677746887238269?thread_ts=1677732886.663289&cid=CA1MMM1HU

@jihoon-seo
Copy link
Member Author

@seokho-son please note that this is the cherry-picking PR with the fix commit from #39719.
If needed, I will replace the cherry-picked commit with those from #38579 or e277fe5 (ref: https://kubernetes.slack.com/archives/CA1MMM1HU/p1677746887238269?thread_ts=1677732886.663289&cid=CA1MMM1HU).

@seokho-son
Copy link
Member

seokho-son commented Mar 6, 2023

@jihoon-seo
The cherry-picked commit in this PR is from release-1.25, and it does not exist in main branch.
So, for dev-1.26-ko.1, the commit in this PR is just new changes.

I guess we can minimize conflict with a bare minimum cherry-pick commit from the main when we merge commits in dev-1.26-ko.1 into the main branch. What do you think so ?

Copy link
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sftim

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 6, 2023
@sftim
Copy link
Contributor

sftim commented Mar 6, 2023

It'd be more useful to merge main into dev-1.26-ko.1 - if that suits the Korean team's workflow. However, this cherry-pick would also work.

@seokho-son
Copy link
Member

It'd be more useful to merge main into dev-1.26-ko.1 - if that suits the Korean team's workflow. However, this cherry-pick would also work.

Thanks @sftim
I agree that merging main into dev-1.26-ko.1 is more common way. Unfortunately, it may not fit with current Korean team's workflow. The Korean team's workflow have avoided merging main into an ongoing Korean localization dev branch. (to check outdated Korean contents by comparing differences between two dev branches)

I think it would be nice to use cherry-pick this time, and look forward to improving the Korean team's workflow.

Also add information about last update time on CVE table
@jihoon-seo jihoon-seo force-pushed the 230305_Backport_cve-feed_shortcode branch from d74d846 to 44334fa Compare March 6, 2023 10:23
@k8s-ci-robot k8s-ci-robot added the language/en Issues or PRs related to English language label Mar 6, 2023
@jihoon-seo jihoon-seo marked this pull request as ready for review March 6, 2023 10:32
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 6, 2023
@jihoon-seo
Copy link
Member Author

jihoon-seo commented Mar 6, 2023

@sftim Thank you for your approval.

@seokho-son as per your comment, I updated this PR to cherry-pick the commit e277fe5 which is in main branch.
Please note that during the cherry-pick process, the commit hash has been updated as 44334fa, and thus when we merge dev-1.26-ko.1 into main, I guess that Git will recognize those 2 PRs as different & separate ones, not the same one, and eventually we will have both e277fe5 and 44334fa as separate commits in main branch anyway.
And IMO if merge conflicts related with this occur when merging dev-1.26-ko.1 into main, then we might resolve the conflicts with appropriate merge commit.

@sftim
Copy link
Contributor

sftim commented Mar 6, 2023

Don't worry about the duplicate commits. Git is clever, at least about this sort of thing.

@seokho-son
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 6, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 8f7e36f7f67147942796c31fbe2453eaad085b0f

@k8s-ci-robot k8s-ci-robot merged commit 47c624c into kubernetes:dev-1.26-ko.1 Mar 6, 2023
@jihoon-seo jihoon-seo deleted the 230305_Backport_cve-feed_shortcode branch March 7, 2023 02:08
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants