From 256e8e8e5ae85deca9f70805a72700f63957fc8f Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Wed, 5 Sep 2018 12:42:53 -0700 Subject: [PATCH 1/4] adding content to RKE about tagging amazon resources with a cluster id --- .../cloud-providers/aws/_index.md | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md b/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md index 639b77d85d1..35595a11f88 100644 --- a/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md +++ b/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md @@ -53,3 +53,34 @@ In order to use Elastic Load Balancers (ELBs) and EBS with Kubernetes, the node( ] } ``` + +## Tagging Amazon Resources + +If you have configured your cluster to use Amazon as **Cloud Provider**, tag your AWS resources with a cluster ID. + +[Amazon Documentation: Tagging Your Amazon EC2 Resources](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) + +>**Note:** You can use Amazon EC2 instances without configuring a cloud provider in Kubernetes. You only have to configure the cloud provider if you want to use specific Kubernetes cloud provider functionality. For more information, see [Kubernetes Cloud Providers](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/) + + +The following resources need to tagged with a `ClusterID`: + +- **Nodes**: All hosts added in Rancher. +- **Subnet**: The subnet used for your cluster +- **Security Group**: The security group used for your cluster. + + >**Note:** Do not tag multiple security groups. Tagging multiple groups generates an error when creating Elastic Load Balancer. + +The tag that should be used is: + +``` +Key=kubernetes.io/cluster/, Value=owned +``` + +`` can be any string you choose. However, the same string must be used on every resource you tag. Setting the tag value to `owned` informs the cluster that all resources tagged with the `` are owned and managed by this cluster. + +If you share resources between clusters, you can change the tag to: + +``` +Key=kubernetes.io/cluster/CLUSTERID, Value=shared +``` From 9a423dbe662877f88f27a6e31dffd19f54938a1d Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Thu, 6 Sep 2018 13:36:19 -0700 Subject: [PATCH 2/4] cleaning up redundant and unnecessary info --- .../v0.1.x/en/config-options/cloud-providers/aws/_index.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md b/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md index 35595a11f88..7d376f40f45 100644 --- a/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md +++ b/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md @@ -56,13 +56,10 @@ In order to use Elastic Load Balancers (ELBs) and EBS with Kubernetes, the node( ## Tagging Amazon Resources -If you have configured your cluster to use Amazon as **Cloud Provider**, tag your AWS resources with a cluster ID. +Any resources used in a Kubernetes cluster with the Amazon cloud provider must be tagged with a cluster ID. [Amazon Documentation: Tagging Your Amazon EC2 Resources](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) ->**Note:** You can use Amazon EC2 instances without configuring a cloud provider in Kubernetes. You only have to configure the cloud provider if you want to use specific Kubernetes cloud provider functionality. For more information, see [Kubernetes Cloud Providers](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/) - - The following resources need to tagged with a `ClusterID`: - **Nodes**: All hosts added in Rancher. From b1b0b5a796338ad4ffb753dcd5c54e52b9392d1d Mon Sep 17 00:00:00 2001 From: Mark Bishop Date: Tue, 4 Sep 2018 17:03:44 -0700 Subject: [PATCH 3/4] making procedure for recommended way of deleting catalog apps --- content/rancher/v2.x/en/catalog/_index.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/content/rancher/v2.x/en/catalog/_index.md b/content/rancher/v2.x/en/catalog/_index.md index d7e17fca250..da42806e49f 100644 --- a/content/rancher/v2.x/en/catalog/_index.md +++ b/content/rancher/v2.x/en/catalog/_index.md @@ -95,3 +95,15 @@ After you've either enabled the built-in catalogs or added your own custom catal - **Workloads** view - **Catalog Apps** view + +## Deleting Catalog Application Deployments + +As a safeguard to prevent you from unintentionally deleting other catalog applications that share a namespace, deleting catalog applications themselves does not delete the namespace they're assigned to. Therefore, when you want to delete a deployed catalog application, assuming that it's the only app in its namespace, delete the namespace rather than the catalog app itself. Deleting the namespace deletes both the namespace and the catalog app, whereas deleting the catalog app only deletes the app but not the namespace. + +1. From the **Global** view, open the project that contains the catalog application that you want to delete. + +1. From the main menu, choose **Namespaces**. + +1. Find the namespace running your catalog app. Select it and click **Delete**. + +**Result:** The catalog application deployment and its namespace are deleted. \ No newline at end of file From cb8af40eac719cf56877c3a2dd878c4acf3cc9c2 Mon Sep 17 00:00:00 2001 From: Denise Date: Thu, 6 Sep 2018 14:30:42 -0700 Subject: [PATCH 4/4] Update _index.md --- .../rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md b/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md index 7d376f40f45..278a54b1230 100644 --- a/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md +++ b/content/rke/v0.1.x/en/config-options/cloud-providers/aws/_index.md @@ -3,7 +3,7 @@ title: AWS Cloud Provider weight: 251 --- -To enable the AWS cloud provider, there are no configuration options. You only need to set the name as `aws`. In order to use the AWS cloud provider, all cluster nodes must have already been configured with an appropriate IAM role. +To enable the AWS cloud provider, there are no configuration options. You only need to set the name as `aws`. In order to use the AWS cloud provider, all cluster nodes must have already been configured with an [appropriate IAM role](#iam-requirements) and your AWS resources must be [tagged with a cluster ID](#tagging-amazon-resources). ```yaml cloud_provider: