From 6e92ccf42d0c7dfdf4db5fae9d9da1faca5e1a61 Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Fri, 19 Mar 2021 10:44:47 -0700 Subject: [PATCH 1/2] Edit SSH info in Azure quick start guide #3108 --- .../quick-start-guide/deployment/microsoft-azure-qs/_index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/rancher/v2.5/en/quick-start-guide/deployment/microsoft-azure-qs/_index.md b/content/rancher/v2.5/en/quick-start-guide/deployment/microsoft-azure-qs/_index.md index e6ea9eaa8a4..29a316b16eb 100644 --- a/content/rancher/v2.5/en/quick-start-guide/deployment/microsoft-azure-qs/_index.md +++ b/content/rancher/v2.5/en/quick-start-guide/deployment/microsoft-azure-qs/_index.md @@ -39,7 +39,6 @@ Suggestions include: - `azure_location` - Microsoft Azure region, choose the closest instead of the default - `prefix` - Prefix for all created resources - `instance_type` - Compute instance size used, minimum is `Standard_DS2_v2` but `Standard_DS2_v3` or `Standard_DS3_v2` could be used if within budget - - `ssh_key_file_name` - Use a specific SSH key instead of `~/.ssh/id_rsa` (public key is assumed to be `${ssh_key_file_name}.pub`) 1. Run `terraform init`. @@ -56,7 +55,7 @@ Suggestions include: ``` 1. Paste the `rancher_server_url` from the output above into the browser. Log in when prompted (default username is `admin`, use the password set in `rancher_server_admin_password`). - +2. ssh to the Rancher Server using the `id_rsa` key generated in `quickstart/azure`. #### Result Two Kubernetes clusters are deployed into your Azure account, one running Rancher Server and the other ready for experimentation deployments. From be837e7f5ede4b21a911bbbef27e42f278164876 Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Thu, 25 Mar 2021 20:47:19 -0700 Subject: [PATCH 2/2] Modify EKS permissions #3127 --- .../hosted-kubernetes-clusters/eks/_index.md | 5 +++++ .../hosted-kubernetes-clusters/eks/_index.md | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/content/rancher/v2.0-v2.4/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md b/content/rancher/v2.0-v2.4/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md index 3d2bac5a6c4..4bbe6983d39 100644 --- a/content/rancher/v2.0-v2.4/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md +++ b/content/rancher/v2.0-v2.4/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md @@ -231,6 +231,7 @@ Resource targeting uses `*` as the ARN of many of the resources created cannot b "Sid": "EC2Permisssions", "Effect": "Allow", "Action": [ + "ec2:RunInstances", "ec2:RevokeSecurityGroupIngress", "ec2:RevokeSecurityGroupEgress", "ec2:DescribeVpcs", @@ -238,6 +239,8 @@ Resource targeting uses `*` as the ARN of many of the resources created cannot b "ec2:DescribeSubnets", "ec2:DescribeSecurityGroups", "ec2:DescribeRouteTables", + "ec2:DescribeLaunchTemplateVersions", + "ec2:DescribeLaunchTemplates", "ec2:DescribeKeyPairs", "ec2:DescribeInternetGateways", "ec2:DescribeImages", @@ -248,6 +251,8 @@ Resource targeting uses `*` as the ARN of many of the resources created cannot b "ec2:DeleteKeyPair", "ec2:CreateTags", "ec2:CreateSecurityGroup", + "ec2:CreateLaunchTemplateVersion", + "ec2:CreateLaunchTemplate", "ec2:CreateKeyPair", "ec2:AuthorizeSecurityGroupIngress", "ec2:AuthorizeSecurityGroupEgress" diff --git a/content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md b/content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md index 1c793684ff9..96145e9268d 100644 --- a/content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md +++ b/content/rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/eks/_index.md @@ -518,6 +518,7 @@ Resource targeting uses `*` as the ARN of many of the resources created cannot b "Sid": "EC2Permisssions", "Effect": "Allow", "Action": [ + "ec2:RunInstances", "ec2:RevokeSecurityGroupIngress", "ec2:RevokeSecurityGroupEgress", "ec2:DescribeVpcs", @@ -525,6 +526,8 @@ Resource targeting uses `*` as the ARN of many of the resources created cannot b "ec2:DescribeSubnets", "ec2:DescribeSecurityGroups", "ec2:DescribeRouteTables", + "ec2:DescribeLaunchTemplateVersions", + "ec2:DescribeLaunchTemplates", "ec2:DescribeKeyPairs", "ec2:DescribeInternetGateways", "ec2:DescribeImages", @@ -535,6 +538,8 @@ Resource targeting uses `*` as the ARN of many of the resources created cannot b "ec2:DeleteKeyPair", "ec2:CreateTags", "ec2:CreateSecurityGroup", + "ec2:CreateLaunchTemplateVersion", + "ec2:CreateLaunchTemplate", "ec2:CreateKeyPair", "ec2:AuthorizeSecurityGroupIngress", "ec2:AuthorizeSecurityGroupEgress"