public/rancher-docs
1
0
Fork 0
mirror of https://github.com/rancher/rancher-docs.git synced 2026-09-25 04:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing weird merge behavior

Browse Source
This commit is contained in:
Mark Bishop
2018-07-05 10:45:30 -07:00
committed by Mark Bishop
parent 04c1a2703e
commit 0424778bab
2 changed files with 3 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/rancher/v2.x/en/tasks/projects/_index.md
-58
View File
@@ -3,62 +3,4 @@ title: Projects
weight: 3650
draft: true
---
<<<<<<< HEAD
_Projects_ are a new feature in Rancher that allows you to group namespaces. Users can be added as members to the project, and the project owner can assign roles to each member to control their project access.
=======
Coming Soon
## Creating a Project
Coming Soon
## Switching Projects
Coming Soon
## Adding / Managing Project Members
Coming Soon
## Adding SSL Certificates
SSL certificates can be added at both, Project and Namespace level. A project scoped certificate will be available in all its namespaces.
1. Select the project you want to add Certificates in UI under Global dropdown.
2. Under Resources dropdown, select Certificates.
3. Click on Add Certificate option and give it a name.
4. If you don't want the certificate to be available in all namespaces, Select the **Available to a single namespace** option.
- Choose the desired namespace. You can also add a new namespace by clicking on Add to a new namespace on the top of the namespace bar.
5. Copy-paste or use the **Read From File** option to upload your Private Key and Certificates.
Note: Certificates are just kubernetes Secrets of type TLS, so their names shouldn't be same as any existing secret or private registry.
## Adding Configuration Maps
Coming Soon
## Enabling Project Logging
Coming Soon
## Adding Project Alerts
Coming Soon
## Using Private Registries
Coming Soon
## Adding a Secret
Coming Soon
## Launching a Catalog App
Coming Soon
## Creating a Pod Security Policy
Coming Soon
>>>>>>> task: adding certs
content/rancher/v2.x/en/tasks/projects/add-ssl-certificates/_index.md
+3 -3
View File
@@ -5,7 +5,7 @@ draft: true
---
When you create an ingress within Rancher/Kubernetes, you must provide it with a TLS private key and certificate, which are used to encrypt and decrypt communications that come through the ingress. You can make certificates available for ingress use by navigating to its project or namespace, and then uploading the certificate.
SSL certificates to either projects, namespaces, or both. A project scoped certificate will be available in all its namespaces.
Add SSL certificates to either projects, namespaces, or both. A project scoped certificate will be available in all its namespaces.
>**Prerequisites:** You must have a TLS private key and certificate available to upload.
@@ -19,9 +19,9 @@ SSL certificates to either projects, namespaces, or both. A project scoped certi
1. Select the **Scope** of the certificate.
- **Available to all namespaces in this project:** The certificate is available for deployments to all namespaces in the project.
- **Available to all namespaces in this project:** The certificate is available for any deployment in any namespaces in the project.
- **Available to a single namespace:** The certificate is only available for deployments to one namespace. If you choose this option, select a **Namespace** from the drop-down list or click **Add to a new namespace** to add the certificate to a namespace you create on the fly.
- **Available to a single namespace:** The certificate is only available for the deployments in one namespace. If you choose this option, select a **Namespace** from the drop-down list or click **Add to a new namespace** to add the certificate to a namespace you create on the fly.
1. From **Private Key**, either copy and paste your certificate's private key into the text box (include the header and footer), or click **Read from a file** to browse to the private key on your file system. If possible, we recommend using **Read from a file** to reduce likelihood of error.