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

merge main into release branch to make reviewing certain PRs easier #859

Merged
merged 47 commits into from
Sep 18, 2023

Conversation

martyav
Copy link
Contributor

@martyav martyav commented Sep 18, 2023

Description

When I switched the target for a recent PR, it flooded the commit history with commits on main that are missing from 2.8. There's a similar problem with a PR targeting 2.7.

Comments

btat and others added 30 commits August 17, 2023 10:49
…--protect-kernel-defaults and updating notes
…--protect-kernel-defaults and updating notes
Co-authored-by: Marty Hernandez Avedon <[email protected]>
* canonicized manage-project-resource-quotas

* canonicized manage-projects
* Fix typo: vSphere port is required.

* Update versioned_docs/version-2.7/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md

---------

Co-authored-by: Marty Hernandez Avedon <[email protected]>
Add v2.7.6 entry to versions table
* added ui instructions for cluster list to access-clusters

* re-org access-clusters so that 'Cluster List' becomes a searchable heading

* rewording

* added instructions and links for Global Settings

* added global config + retitle/rephrase

retitle to disambiguate global settings from global config

listed some relevant global config items that need more info

* correction: updated access-clusters page in /docs, not /versioned_docs

* added Nodes UI instructions

* download kubeconfig UI instructions added/modified

one file contained correct instructions but they were somewhat convoluted, as you can download the file from a page mentioned earlier in the suggested instructions and the button thery describe is an icon, not labeled with any text

* restoring formatting

* updated pathway for image list downloads

* finding rancher-images.txt

* added instructions for Apps Marketplace

* link pointing to v1 monitoring

* link pointing to v1 dashboards

* added links for v1 notifiers, logging tools

* global dns entries, global dns providers, catalog links added

* Rancher portal > Rancher UI

* updated access-clusters page

* rm note & add third way to access cluster dashboard

* heading levels

* addressed comments in global-configuration

* addressed comments for nodes-and-node-pools

* addressed comment on authorized-cluster-endpoint

* rm'd create apps steps

* updated kubeconfig download instructions

* adjusting headers

* updated images list instructions as version # is now an About link

* restored intro to monitoring-and-alerting

* KubeConfig > kubeconfig (except for naming the UI label)

* left navigation sidebar > left navigation

* Update docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md

Co-authored-by: Billy Tat <[email protected]>

* applied changes to v2.7 docs

---------

Co-authored-by: Billy Tat <[email protected]>
* clarified location of project  ID field

* v2.7 page sync

---------

Co-authored-by: martyav <[email protected]>
* note added & revised wording on section about s3 backups

* added warning to backup-configuration.md

* Apply suggestions from code review

Co-authored-by: Sunil Singh <[email protected]>

---------

Co-authored-by: Sunil Singh <[email protected]>
* 748 Update info about which K8s distros can enable ACE

* rephrase, typo fix, links, acronyms

* avilable > available

* Rancher, not Kubernetes

* Apply suggestions from code review

Co-authored-by: Brad Davidson <[email protected]>
Co-authored-by: Billy Tat <[email protected]>

* added missing 2.6 page

* ace available on imported clusters as well as rancher-provisioned

---------

Co-authored-by: Brad Davidson <[email protected]>
Co-authored-by: Billy Tat <[email protected]>
* canonicized troubleshooting/kubernetes-components

* canonicized troubleshooting/other-troubleshooting-tips

* canonicized troubleshooting

* files for 2.0-2.4, and 2.5
* #420 canonical links for FAQ

* missing files for 2.0-2.4, 2.5
* canonicized cluster-provisioning/rke-clusters/options/options.md

* canonicized security scans

* canonicized contributing to rancher

* canonicized 'what is rancher?'
Update k3s-hardening-guide based on CIS-1.24 and CIS-1.7
Updates the webhook docs to point toward the docs for individual checks,
and adds docs for common issues/version specific issues
MbolotSuse and others added 17 commits September 11, 2023 12:36
- Remove latest to cis-1.7 version
- Improve wording

Co-authored-by: Marty Hernandez Avedon <[email protected]>
* #793 RKE2 cluster templates #793

* syncing 2.6 after testing confirmed
Update rke-hardening-guide based on CIS-1.24 and CIS-1.7
Update rke2-hardening-guide based on CIS-1.24 and CIS-1.7
* 686 clarify when values should be raw or manually base64 encoded

* rm'd section as duplicate of https://ranchermanager.docs.rancher.com/reference-guides/backup-restore-configuration/backup-configuration#example-credentialsecret

* UI instructions for finding Backup: Create + link to how-to on secret creation

* sync language

* Apply suggestions from code review

Co-authored-by: Billy Tat <[email protected]>

---------

Co-authored-by: Billy Tat <[email protected]>
* added PR template, made all templates consistent with format seen in Release Notes repo template

* Apply suggestions from code review

Co-authored-by: Sunil Singh <[email protected]>

* Update .github/pull_request_template.md

Co-authored-by: Billy Tat <[email protected]>

* Update request-an-update.md - spacing + connected > related

* Update request-a-new-feature.md - consistent wording

* updated PR template with link to readme, removed comment tags from reminder section as readme link wouldn't be clickable otherwise

---------

Co-authored-by: Sunil Singh <[email protected]>
Co-authored-by: Billy Tat <[email protected]>
* Added page about moving/renaming docs, new headings for readme

* added navigation section

* revised README

* revised moving-or-renaming-docs

* Apply suggestions from code review

Co-authored-by: Lucas Saintarbor <[email protected]>

* Update moving-or-renaming-docs.md - revamping schema example

* json > js

* typos, extra explanation

* json > js

* various changes

---------

Co-authored-by: Lucas Saintarbor <[email protected]>
Fix broken links and update Chinese docs
* Adjust command to install cert-manager

The directory `cert-manager` is not created when using `helm install`
instead of `helm template --output-dir .`.

Also, the CRDs are downloaded in the current directory, so adjust the
commands as well.

* Convert helm template to helm upgrade/install

Since we're using Helm hooks, we cannot use `helm template`, otherwise
things will break. The commands are updated to use `helm install` and
`helm upgrade`.
…restore (#848)

* canonicized about-the-api

* canonicized backup-restore-configuration
* canonicized rancher-managed-clusters

* canonicized rancher-server
…config (#850)

* canonicized cli-with-rancher

* canonicized machine-configuration

* canonicized node-template-configuration

* canonicized gke-cluster-configuration

* canonicized use-existing-nodes

* canonicized rancher-server-configuration
@martyav martyav requested a review from btat September 18, 2023 20:08
@btat btat merged commit 7def78d into 2023-Q4-2.8x Sep 18, 2023
1 check passed
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.

9 participants