From 636336365bbff953cc1f6ddca81ed1ea40926a61 Mon Sep 17 00:00:00 2001 From: martyav Date: Thu, 16 Nov 2023 15:50:37 -0500 Subject: [PATCH 1/4] 135 cloud-provider(aws): Need to correct content on cluster id in aws tagging section --- .../set-up-cloud-providers/amazon.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index 5943ee01710..9e15a67c1db 100644 --- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -147,17 +147,19 @@ Do not tag multiple security groups. Tagging multiple groups generates an error ::: -When you create an [Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be tagged manually. +When you create an [Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be manually tagged. Use the following tag: -**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `owned` +**Key** = `kubernetes.io/cluster/` **Value** = `owned` -`CLUSTERID` can be any string you like, as long as it is equal across all tags set. +Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. -Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. If you share resources between clusters, you can change the tag to: +If you share resources between clusters, you can change the tag to: -**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `shared`. +**Key** = `kubernetes.io/cluster/` **Value** = `shared`. + +The string value, ``, should be the Kubernetes cluster's ID. Technically, the `` value can be any string you like, as long as you use the same value across all tags set. In practice, if the `ClusterID` is automatically configured for some nodes, as it is with Amazon EC2 nodes, you should consistently use that same string across all of your resources, even if you have to manually set the tag. ### Using Amazon Elastic Container Registry (ECR) From 85fd70d7aa66a9bb9920c47c760e094300399aaa Mon Sep 17 00:00:00 2001 From: martyav Date: Thu, 16 Nov 2023 16:03:58 -0500 Subject: [PATCH 2/4] versioning --- .../set-up-cloud-providers/amazon.md | 12 +++++++----- .../set-up-cloud-providers/amazon.md | 12 +++++++----- .../set-up-cloud-providers/amazon.md | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index bf37f1fc39c..b9c5b2525e4 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -147,17 +147,19 @@ Do not tag multiple security groups. Tagging multiple groups generates an error ::: -When you create an [Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be tagged manually. +When you create an [Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be manually tagged. Use the following tag: -**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `owned` +**Key** = `kubernetes.io/cluster/` **Value** = `owned` -`CLUSTERID` can be any string you like, as long as it is equal across all tags set. +Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. -Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. If you share resources between clusters, you can change the tag to: +If you share resources between clusters, you can change the tag to: -**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `shared`. +**Key** = `kubernetes.io/cluster/` **Value** = `shared`. + +The string value, ``, should be the Kubernetes cluster's ID. Technically, the `` value can be any string you like, as long as you use the same value across all tags set. In practice, if the `ClusterID` is automatically configured for some nodes, as it is with Amazon EC2 nodes, you should consistently use that same string across all of your resources, even if you have to manually set the tag. ### Using Amazon Elastic Container Registry (ECR) diff --git a/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index 5943ee01710..9e15a67c1db 100644 --- a/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -147,17 +147,19 @@ Do not tag multiple security groups. Tagging multiple groups generates an error ::: -When you create an [Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be tagged manually. +When you create an [Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be manually tagged. Use the following tag: -**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `owned` +**Key** = `kubernetes.io/cluster/` **Value** = `owned` -`CLUSTERID` can be any string you like, as long as it is equal across all tags set. +Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. -Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. If you share resources between clusters, you can change the tag to: +If you share resources between clusters, you can change the tag to: -**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `shared`. +**Key** = `kubernetes.io/cluster/` **Value** = `shared`. + +The string value, ``, should be the Kubernetes cluster's ID. Technically, the `` value can be any string you like, as long as you use the same value across all tags set. In practice, if the `ClusterID` is automatically configured for some nodes, as it is with Amazon EC2 nodes, you should consistently use that same string across all of your resources, even if you have to manually set the tag. ### Using Amazon Elastic Container Registry (ECR) diff --git a/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index 5943ee01710..9e15a67c1db 100644 --- a/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -147,17 +147,19 @@ Do not tag multiple security groups. Tagging multiple groups generates an error ::: -When you create an [Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be tagged manually. +When you create an [Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be manually tagged. Use the following tag: -**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `owned` +**Key** = `kubernetes.io/cluster/` **Value** = `owned` -`CLUSTERID` can be any string you like, as long as it is equal across all tags set. +Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. -Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. If you share resources between clusters, you can change the tag to: +If you share resources between clusters, you can change the tag to: -**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `shared`. +**Key** = `kubernetes.io/cluster/` **Value** = `shared`. + +The string value, ``, should be the Kubernetes cluster's ID. Technically, the `` value can be any string you like, as long as you use the same value across all tags set. In practice, if the `ClusterID` is automatically configured for some nodes, as it is with Amazon EC2 nodes, you should consistently use that same string across all of your resources, even if you have to manually set the tag. ### Using Amazon Elastic Container Registry (ECR) From 631c5e485b3f1c6cb05095d311e45e2b835aea3e Mon Sep 17 00:00:00 2001 From: Marty Hernandez Avedon Date: Fri, 17 Nov 2023 10:19:19 -0500 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: Billy Tat --- .../set-up-cloud-providers/amazon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index 9e15a67c1db..10700b418d4 100644 --- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -159,7 +159,7 @@ If you share resources between clusters, you can change the tag to: **Key** = `kubernetes.io/cluster/` **Value** = `shared`. -The string value, ``, should be the Kubernetes cluster's ID. Technically, the `` value can be any string you like, as long as you use the same value across all tags set. In practice, if the `ClusterID` is automatically configured for some nodes, as it is with Amazon EC2 nodes, you should consistently use that same string across all of your resources, even if you have to manually set the tag. +The string value, ``, is the Kubernetes cluster's ID. ### Using Amazon Elastic Container Registry (ECR) From 42e24305a4d3e315f6244bf65ee11c9f90ca593c Mon Sep 17 00:00:00 2001 From: martyav Date: Fri, 17 Nov 2023 10:30:34 -0500 Subject: [PATCH 4/4] Amazon only uses EC2, so 'use anything' is a moot point --- .../set-up-cloud-providers/amazon.md | 2 +- .../set-up-cloud-providers/amazon.md | 2 +- .../set-up-cloud-providers/amazon.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index b9c5b2525e4..e72de8b8b03 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -159,7 +159,7 @@ If you share resources between clusters, you can change the tag to: **Key** = `kubernetes.io/cluster/` **Value** = `shared`. -The string value, ``, should be the Kubernetes cluster's ID. Technically, the `` value can be any string you like, as long as you use the same value across all tags set. In practice, if the `ClusterID` is automatically configured for some nodes, as it is with Amazon EC2 nodes, you should consistently use that same string across all of your resources, even if you have to manually set the tag. +The string value, ``, is the Kubernetes cluster's ID. ### Using Amazon Elastic Container Registry (ECR) diff --git a/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index 9e15a67c1db..10700b418d4 100644 --- a/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/versioned_docs/version-2.7/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -159,7 +159,7 @@ If you share resources between clusters, you can change the tag to: **Key** = `kubernetes.io/cluster/` **Value** = `shared`. -The string value, ``, should be the Kubernetes cluster's ID. Technically, the `` value can be any string you like, as long as you use the same value across all tags set. In practice, if the `ClusterID` is automatically configured for some nodes, as it is with Amazon EC2 nodes, you should consistently use that same string across all of your resources, even if you have to manually set the tag. +The string value, ``, is the Kubernetes cluster's ID. ### Using Amazon Elastic Container Registry (ECR) diff --git a/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md index 9e15a67c1db..10700b418d4 100644 --- a/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md +++ b/versioned_docs/version-2.8/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md @@ -159,7 +159,7 @@ If you share resources between clusters, you can change the tag to: **Key** = `kubernetes.io/cluster/` **Value** = `shared`. -The string value, ``, should be the Kubernetes cluster's ID. Technically, the `` value can be any string you like, as long as you use the same value across all tags set. In practice, if the `ClusterID` is automatically configured for some nodes, as it is with Amazon EC2 nodes, you should consistently use that same string across all of your resources, even if you have to manually set the tag. +The string value, ``, is the Kubernetes cluster's ID. ### Using Amazon Elastic Container Registry (ECR)