Update CloudLabels field description

kubernetes · Feb 15, 2021 · b285794 · b285794
1 parent d52fd9f
commit b285794
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -505,7 +505,8 @@ spec:
               cloudLabels:
                 additionalProperties:
                   type: string
-                description: Tags for AWS resources
+                description: CloudLabels defines additional tags or labels on cloud
+                  provider resources
                 type: object
               cloudProvider:
                 description: The CloudProvider to use (aws or gce)

diff --git a/k8s/crds/kops.k8s.io_instancegroups.yaml b/k8s/crds/kops.k8s.io_instancegroups.yaml
@@ -90,8 +90,8 @@ spec:
               cloudLabels:
                 additionalProperties:
                   type: string
-                description: CloudLabels indicates the labels for instances in this
-                  group, at the AWS level
+                description: CloudLabels defines additional tags or labels on cloud
+                  provider resources
                 type: object
               compressUserData:
                 description: CompressUserData compresses parts of the user data to

diff --git a/pkg/apis/kops/cluster.go b/pkg/apis/kops/cluster.go
@@ -177,7 +177,7 @@ type ClusterSpec struct {
 	Authorization *AuthorizationSpec `json:"authorization,omitempty"`
 	// NodeAuthorization defined the custom node authorization configuration
 	NodeAuthorization *NodeAuthorizationSpec `json:"nodeAuthorization,omitempty"`
-	// Tags for AWS instance groups
+	// CloudLabels defines additional tags or labels on cloud provider resources
 	CloudLabels map[string]string `json:"cloudLabels,omitempty"`
 	// Hooks for custom actions e.g. on first installation
 	Hooks []HookSpec `json:"hooks,omitempty"`

diff --git a/pkg/apis/kops/instancegroup.go b/pkg/apis/kops/instancegroup.go
@@ -131,7 +131,7 @@ type InstanceGroupSpec struct {
 	AssociatePublicIP *bool `json:"associatePublicIp,omitempty"`
 	// AdditionalSecurityGroups attaches additional security groups (e.g. i-123456)
 	AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"`
-	// CloudLabels indicates the labels for instances in this group, at the AWS level
+	// CloudLabels defines additional tags or labels on cloud provider resources
 	CloudLabels map[string]string `json:"cloudLabels,omitempty"`
 	// NodeLabels indicates the kubernetes labels for nodes in this group
 	NodeLabels map[string]string `json:"nodeLabels,omitempty"`

diff --git a/pkg/apis/kops/v1alpha2/cluster.go b/pkg/apis/kops/v1alpha2/cluster.go
@@ -176,7 +176,7 @@ type ClusterSpec struct {
 	Authorization *AuthorizationSpec `json:"authorization,omitempty"`
 	// NodeAuthorization defined the custom node authorization configuration
 	NodeAuthorization *NodeAuthorizationSpec `json:"nodeAuthorization,omitempty"`
-	// Tags for AWS resources
+	// CloudLabels defines additional tags or labels on cloud provider resources
 	CloudLabels map[string]string `json:"cloudLabels,omitempty"`
 	// Hooks for custom actions e.g. on first installation
 	Hooks []HookSpec `json:"hooks,omitempty"`

diff --git a/pkg/apis/kops/v1alpha2/instancegroup.go b/pkg/apis/kops/v1alpha2/instancegroup.go
@@ -128,7 +128,7 @@ type InstanceGroupSpec struct {
 	AssociatePublicIP *bool `json:"associatePublicIp,omitempty"`
 	// AdditionalSecurityGroups attaches additional security groups (e.g. i-123456)
 	AdditionalSecurityGroups []string `json:"additionalSecurityGroups,omitempty"`
-	// CloudLabels indicates the labels for instances in this group, at the AWS level
+	// CloudLabels defines additional tags or labels on cloud provider resources
 	CloudLabels map[string]string `json:"cloudLabels,omitempty"`
 	// NodeLabels indicates the kubernetes labels for nodes in this group
 	NodeLabels map[string]string `json:"nodeLabels,omitempty"`