diff --git a/content/rancher/v2.x/en/concepts/authentication/_index.md b/content/rancher/v2.x/en/concepts/authentication/_index.md index 41163187fcd..370be872e5b 100644 --- a/content/rancher/v2.x/en/concepts/authentication/_index.md +++ b/content/rancher/v2.x/en/concepts/authentication/_index.md @@ -13,8 +13,8 @@ This centralized user authentication is accomplished using the {{< product >}} a The {{< product >}} authentication proxy integrates with the following external authentication services. - - Microsoft Active Directory - - GitHub +- Microsoft Active Directory +- GitHub However, {{< product >}} also provides local authentication. diff --git a/content/rancher/v2.x/en/concepts/clusters/_index.md b/content/rancher/v2.x/en/concepts/clusters/_index.md index dcae0b1e637..ee1cfe234f5 100644 --- a/content/rancher/v2.x/en/concepts/clusters/_index.md +++ b/content/rancher/v2.x/en/concepts/clusters/_index.md @@ -28,70 +28,6 @@ The control plane nodes are used to run the Kubernetes API server, scheduler, an Worker nodes are used to run the kubelet and the workload. It also runs the storage and networking drivers and ingress controllers when required. You create as many worker nodes as needed for your workload needs. -### Cluster Providers - -#### Rancher Kubernetes Engine (RKE) - -RKE is Rancher’s own lightweight Kubernetes installer. It works with any cloud providers, virtualization platforms, or bare metal servers. It integrates with node drivers to automatically provision nodes on AWS, Azure, DigitalOcean, vSphere, OpenStack, etc. Users can add custom nodes to the cluster by running the Rancher agent on these nodes. - -#### Cloud-Managed Kubernetes Clusters - -Rancher integrates with cloud APIs so users can provision GKE, EKS, and AKS clusters directly from Rancher. New cloud managed Kubernetes clusters will be added as they become available. - -#### Imported Clusters - -Users can existing Kubernetes cluster into Rancher. Rancher does not automate the provisioning, scaling, and upgrade of imported Kubernetes clusters. All other cluster management, policy management, and workload management capabilities of Rancher apply to imported clustered. - -##### RKE and Amazon AWS EC2: Adding Hosts - -When setting up a custom cluster configured to run with an AWS cloud provider, any hosts you add to the cluster: - -- Must be an AWS EC2 instance. -- Must have the following IAM policy at minimum: - -``` -{ - "Effect": "Allow", - "Action": "ec2:Describe*", - "Resource": "*" -} -``` -In order to use Amazon Elastic Load Balancers (ELBs) and EBS with Kubernetes, the host requires the IAM role with appropriate access. - -**Example Policy for IAM Role** - -``` -{ - "Version": "2012-10-17", - "Statement": [ - { - "Effect": "Allow", - "Action": "ec2:Describe*", - "Resource": "*" - }, - { - "Effect": "Allow", - "Action": "ec2:AttachVolume", - "Resource": "*" - }, - { - "Effect": "Allow", - "Action": "ec2:DetachVolume", - "Resource": "*" - }, - { - "Effect": "Allow", - "Action": ["ec2:*"], - "Resource": ["*"] - }, - { - "Effect": "Allow", - "Action": ["elasticloadbalancing:*"], - "Resource": ["*"] - } - ] -} -```