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

Use main branch as the stable branch in Ingress demo #2368

Merged
merged 1 commit into from
Jul 15, 2021

Conversation

rikatz
Copy link
Contributor

@rikatz rikatz commented Jul 14, 2021

We've renamed master to main (actually created a new one, over the stable branch and not the development branch).

So now we can use again the file present directly in main branch, assuming main is going to be the stable and that as soon as we release Ingress v1 that branch is gonna get merged into this one

@k8s-ci-robot k8s-ci-robot requested review from aojea and neolit123 July 14, 2021 22:17
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 14, 2021
@rikatz
Copy link
Contributor Author

rikatz commented Jul 14, 2021

/cc @strongjz

@k8s-ci-robot
Copy link
Contributor

@rikatz: GitHub didn't allow me to request PR reviews from the following users: strongjz.

Note that only kubernetes-sigs members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @strongjz

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.

Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 14, 2021
@aojea
Copy link
Contributor

aojea commented Jul 14, 2021

So now we can use again the file present directly in main branch, assuming main is going to be the stable and that as soon as we release Ingress v1 that branch is gonna get merged into this one

I can't follow, once you release v1 do we need to change again this file?

@rikatz
Copy link
Contributor Author

rikatz commented Jul 15, 2021

Nope, we are going to use the main branch as the stable once we release v1.

So I'm going to merge the v1 branch into main branch, and we can add a note to people using k8s < v1.19 to point to the deprecated branch (which is called release-v1beta1 but we are going to find a better naming)

@BenTheElder
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, rikatz

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 Jul 15, 2021
@k8s-ci-robot k8s-ci-robot merged commit fceb70d into kubernetes-sigs:main Jul 15, 2021
@aojea
Copy link
Contributor

aojea commented Jul 15, 2021

Thanks Ricardo for the hard work

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants