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.

Sign up for GitHub

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

Jump to bottom

Move cert-manager to the github.com/cert-manager organization #624

Merged
merged 23 commits into from Feb 2, 2022
Merged

Move cert-manager to the github.com/cert-manager organization #624

merged 23 commits into from Feb 2, 2022

Conversation

wallrj
Copy link
Member

@wallrj wallrj commented Feb 2, 2022 •
edited

  • Updated references to jetstack/cert-manager
  • Updated references to org: jetstack for cert-manager related tests and config
  • Remove unnecessary repo specific config which is now inherited from cert-manager organization
  • Removed some lingering references to jetstack/cert-manager-webhook-example, which has already been moved to cert-manager org.

Based on @jakexks 's original PR:

@wallrj
Use cert-manager organization for cert-manager global config
55f8a40 
Remove unnecessary repo specific config which cert-manager now gets from the org config

Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@jetstack-bot jetstack-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 2, 2022
@wallrj
Update the labels config
8f617d8 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update triggers
5751905 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update milestone applier
b649397 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update require-matching-label plugin
85c2904 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update the cert-manager plugins
053b13c 
The release-note plugin is the only one that is not inherited from the org

Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
The webhook-example repo has already been moved to the cert-manager org
923df41 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update the label-sync cronjob
eb586df 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update triage-party
d25c803 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@jetstack-bot jetstack-bot added the area/prow Indicates a PR related to prow label Feb 2, 2022
@wallrj
Update the PR retester and rotten and stale issues bot
60c1e35 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@jetstack-bot jetstack-bot added the area/testing Indicates a PR related to testing label Feb 2, 2022
@wallrj
Update master periodics
85369f4 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update master presubmits
7b07ecb 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@jetstack-bot jetstack-bot added area/cert-manager Indicates a PR related to cert-manager size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 2, 2022
@wallrj
Update release-previous periodics
2a0542b 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update release-previous presubmits
958bdd9 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update release-next periodics
49e8320 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Update references to jetstack/cert-manager in the documentation
0c6b483 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj wallrj changed the title WIP: Move cert-manager to the github.com/cert-manager organization Move cert-manager to the github.com/cert-manager organization Feb 2, 2022
@jetstack-bot jetstack-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 2, 2022
@wallrj
Forbid merging any PRs in cert-manager/cert-manager that have the rel…
3b13569 
…ease-not-label-needed label

Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj wallrj requested a review from jakexks February 2, 2022 10:18
@wallrj wallrj requested a review from munnerz February 2, 2022 10:18
munnerz
munnerz reviewed Feb 2, 2022
View reviewed changes
config/config.yaml Outdated Show resolved Hide resolved
munnerz
munnerz reviewed Feb 2, 2022
View reviewed changes
config/config.yaml Outdated Show resolved Hide resolved
munnerz
munnerz reviewed Feb 2, 2022
View reviewed changes
config/config.yaml
@@ -292,23 +298,6 @@ tide:
- do-not-merge/cherry-pick-not-approved
- do-not-merge/work-in-progress
- needs-rebase
# Maintain separate cert-manager configuration to make it easy to enable code freeze
Copy link
Member

Choose a reason for hiding this comment

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

Have we not been freezing merges during a codefreeze near release? If so, +1 to this going. But this was here so that we could block merges unless they were explicitly in the milestone we are soon to be releasing.

(i.e. near 1.7 release, PRs must have the v1.7 milestone on them to be merged to master). The idea being to make it possible to lgtm/approve stuff despite it being targeted to land in the v1.8 release.

Copy link
Member Author

Choose a reason for hiding this comment

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

That's not the documented process anyway. https://cert-manager.io/docs/contributing/release-process/#process-for-releasing-a-version

We fast-forward the release-x.y.z branch for alpha releases and for the first beta release
and then do cherry-picks after that.

What's the use-case for / advantage of the milestone check?
I guess if there's a feature which is definitely not to be in the next release and that is being merged in parts and partly merged even before the first beta, then that should be merged not into master, but into a feature-branch which can then be merged once the feature is complete.

Copy link
Member

Choose a reason for hiding this comment

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

The idea stems from the "code freeze" concept in Kubernetes where after a certain point in the release (I believe when the first beta is cut), "milestone maintainers" are the only ones that can use the /milestone command to add a milestone to PRs.

The master branch begins requiring that PRs into master must be explicitly approved for the upcoming release - so anything that isn't approved won't actually merge until the code freeze is lifted (which I believe in k8s is when the first RC of the next release is cut).

This means:

  • during the 'alpha' phase (i.e. immediately after release N-1), PRs targeting master must have lgtm and approved only (like we do today)
  • during the 'beta' phase (i.e. immediately after the first beta of release N), PRs targeting master must have lgtm, approved and target milestone N. We then continue to fast forward the release branch to the tip of HEAD. The idea is to encourage PRs that focus on stability of the upcoming release (or in some instances, feature PRs that have been excepted as they are almost ready and just need a few extra fixes/deemed to be critical and there's been a discussion to allow it).
  • during the 'rc' phase (i.e. immediately after the first RC release of N), PRs must be cherry picked into the appropriate release branch as 'master' is now tracking release N+1.

After the stable 'N' is cut, not much changes from the RC phase except things targeting the release branch are now going to land in vMAJOR.N.1 (i.e. the first patch release of release N after the initial stable).

We don't do release candidates (RCs) so that step hasn't really ever been done, but we've enforced this for a handful of releases in the past (though not recently!)

@wallrj
Enforce DCO check org-wide
6955381 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Duplicate the Tide required and forbidden labels for cert-manager/cer…
650d8a9 
…t-manager

In case they are not combined with the org-wide label requirements

Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj wallrj requested a review from munnerz February 2, 2022 12:56
@wallrj
Move all the cert-manager related jobs into a cert-manager sub-directory
6658849 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Fix indentation
c01d55f 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Not sure if needs-kind is appropriate for the whole cert-manager org
5a347db 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@wallrj
Revert unintended re-ordering of missingLabels
b295af4 
Signed-off-by: Richard Wall <richard.wall@jetstack.io>
@munnerz
Copy link
Member

munnerz commented Feb 2, 2022

/lgtm

@jetstack-bot jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 2, 2022
@jetstack-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: munnerz, wallrj

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

@jetstack-bot jetstack-bot merged commit 6833241 into cert-manager:master Feb 2, 2022
@jetstack-bot
Copy link
Contributor

@wallrj: Updated the following 4 configmaps:

  • label-config configmap in namespace default at cluster default using the following files:
    • key labels.yaml using file config/labels.yaml
  • plugins configmap in namespace default at cluster default using the following files:
    • key plugins.yaml using file config/plugins.yaml
  • config configmap in namespace default at cluster default using the following files:
    • key config.yaml using file config/config.yaml
  • job-config configmap in namespace default at cluster default using the following files:
    • key cert-manager-periodics.yaml using file ``
    • key cert-manager-periodics.yaml using file config/jobs/cert-manager/cert-manager/cert-manager-periodics.yaml
    • key cert-manager-presubmits.yaml using file ``
    • key cert-manager-presubmits.yaml using file config/jobs/cert-manager/cert-manager/cert-manager-presubmits.yaml
    • key cert-manager-release-next-periodics.yaml using file ``
    • key cert-manager-release-next-periodics.yaml using file config/jobs/cert-manager/cert-manager/release-next/cert-manager-release-next-periodics.yaml
    • key cert-manager-release-previous-periodics.yaml using file ``
    • key cert-manager-release-previous-periodics.yaml using file config/jobs/cert-manager/cert-manager/release-previous/cert-manager-release-previous-periodics.yaml
    • key cert-manager-release-previous-presubmits.yaml using file ``
    • key cert-manager-release-previous-presubmits.yaml using file config/jobs/cert-manager/cert-manager/release-previous/cert-manager-release-previous-presubmits.yaml
    • key testing-periodics.yaml using file config/jobs/testing/testing-periodics.yaml

In response to this:

  • Updated references to jetstack/cert-manager
  • Updated references to org: jetstack for cert-manager related tests and config
  • Remove unnecessary repo specific config which is now inherited from cert-manager organization
  • Removed some lingering references to jetstack/cert-manager-webhook-example, which has already been moved to cert-manager org.

Based on @jakexks 's original PR:

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.

@wallrj wallrj deleted the cert-manager-repo-move branch February 2, 2022 14:16
@SgtCoDFish SgtCoDFish mentioned this pull request Feb 3, 2022
Closed
3 tasks
@wallrj wallrj mentioned this pull request Feb 8, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@munnerz munnerz munnerz approved these changes

@jakexks jakexks Awaiting requested review from jakexks

Assignees

@munnerz munnerz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/cert-manager Indicates a PR related to cert-manager area/prow Indicates a PR related to prow area/testing Indicates a PR related to testing dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@wallrj @munnerz @jetstack-bot