Merge branch 'release/v15' into backport-2137-release-v15

Author: matttrach

docs/data-sources/global_role_binding.md

@@ -25,5 +25,6 @@ data "rancher2_global_role_binding" "foo" {
 * `id` - (Computed) The ID of the resource (string)
 * `group_principal_id` - (Computed) The group principal ID to assign global role binding. Rancher v2.4.0 or higher is required (string)
 * `user_id` - (Computed) The user ID to assign global role binding (string)
+* `user_principal_id` - (Computed) The user principal ID to assign global role binding (string)
 * `annotations` - (Computed) Annotations of the resource (map)
 * `labels` - (Computed) Labels of the resource (map)

docs/resources/cluster.md

@@ -1368,7 +1368,7 @@ The following arguments are supported:
 * `node_groups` - (Optional/Computed) The EKS cluster name to import. Required to create a new cluster (list)
 * `private_access` - (Optional/Computed) The EKS cluster has private access (bool)
 * `public_access` - (Optional/Computed) The EKS cluster has public access (bool)
-* `public_access_sources` - (Optional/Computed) The EKS cluster public access sources (map)
+* `public_access_sources` - (Optional/Computed) The EKS cluster public access sources (list)
 * `region` - (Optional) The EKS cluster region. Default: `us-west-2` (string)
 * `secrets_encryption` - (Optional/Computed) Enable EKS cluster secret encryption (bool)
 * `security_groups` - (Optional/Computed) List of security groups to use for the cluster (list)

docs/resources/cluster_v2.md

@@ -300,10 +300,11 @@ RANCHER_ACCESS_KEY="<RANCHER_ACCESS_KEY>"
 RANCHER_SECRET_KEY="<RANCHER_SECRET_KEY>"
 HARVESTER_CLUSTER_ID="<HARVESTER_CLUSTER_ID>"
 CLUSTER_NAME="foo-harvester-v2-cloud-provider"
+NAMESPACE="default"
 curl -k -X POST ${RANCHER_SERVER_URL}/k8s/clusters/${HARVESTER_CLUSTER_ID}/v1/harvester/kubeconfig \
    -H 'Content-Type: application/json' \
    -u ${RANCHER_ACCESS_KEY}:${RANCHER_SECRET_KEY} \
-   -d '{"clusterRoleName": "harvesterhci.io:cloudprovider", "namespace": "default", "serviceAccountName": "'${CLUSTER_NAME}'"}' | xargs | sed 's/\\n/\n/g' > ${CLUSTER_NAME}-kubeconfig
+   -d '{"clusterRoleName": "harvesterhci.io:cloudprovider", "namespace": "'${NAMESPACE}'", "serviceAccountName": "'${CLUSTER_NAME}'"}' | xargs | sed 's/\\n/\n/g' > ${CLUSTER_NAME}-kubeconfig
 ```
 
 

docs/resources/global_role_binding.md

@@ -15,10 +15,16 @@ resource "rancher2_global_role_binding" "foo" {
   global_role_id = "admin"
   user_id = "user-XXXXX"
 }
-# Create a new rancher2 Global Role Binding using group_principal_id
+# Create a new rancher2 Global Role Binding using user_principal_id
 resource "rancher2_global_role_binding" "foo2" {
   name = "foo2"
   global_role_id = "admin"
+  user_principal_id = "local://user-XXXXX"
+}
+# Create a new rancher2 Global Role Binding using group_principal_id
+resource "rancher2_global_role_binding" "foo3" {
+  name = "foo3"
+  global_role_id = "admin"
   group_principal_id = "local://g-XXXXX"
 }
 ```
@@ -30,11 +36,12 @@ The following arguments are supported:
 * `global_role_id` - (Required/ForceNew) The role id from create global role binding (string)
 * `group_principal_id` - (Optional/Computed/ForceNew) The group principal ID to assign global role binding (only works with external auth providers that support groups). Rancher v2.4.0 or higher is required (string)
 * `user_id` - (Optional/Computed/ForceNew) The user ID to assign global role binding (string)
+* `user_principal_id` - (Optional/Computed/ForceNew) The user principal ID to assign global role binding (string)
 * `name` - (Optional/Computed/ForceNew) The name of the global role binding (string)
 * `annotations` - (Optional/Computed) Annotations for global role binding (map)
 * `labels` - (Optional/Computed) Labels for global role binding (map)
 
-**Note:** user `user_id` OR group `group_principal_id` must be defined
+**Note:** user `user_id` or `user_principal_id` OR group `group_principal_id` must be defined
 
 ## Attributes Reference
 

docs/resources/machine_config_v2.md

@@ -279,6 +279,8 @@ The following attributes are exported:
 * `password` - (Optional/Sensitive) OpenStack password. Mandatory on Rancher v2.0.x and v2.1.x. Use `rancher2_cloud_credential` from Rancher v2.2.x (string)
 * `private_key_file` - (Optional/Sensitive) Private key content to use for SSH (string)
 * `sec_groups` - (Optional) OpenStack comma separated security groups for the machine (string)
+* `server_group_id` - (Optional) OpenStack server group id to use for the instance (string)
+* `server_group_name` - (Optional) OpenStack server group name to use for the instance (string)
 * `ssh_port` - (Optional) OpenStack SSH port * Default `22` (string)
 * `ssh_user` - (Optional) OpenStack SSH user * Default: `root` (string)
 * `tenant_id` - (Required++) OpenStack tenant id. Conflicts with `tenant_name` (string)

docs/resources/node_template.md

@@ -392,6 +392,8 @@ The following attributes are exported:
 * `password` - (Optional/Sensitive) OpenStack password. Mandatory on Rancher v2.0.x and v2.1.x. Use `rancher2_cloud_credential` from Rancher v2.2.x (string)
 * `private_key_file` - (Optional/Sensitive) Private key content to use for SSH (string)
 * `sec_groups` - (Optional) OpenStack comma separated security groups for the machine (string)
+* `server_group_id` - (Optional) OpenStack server group id to use for the instance (string)
+* `server_group_name` - (Optional) OpenStack server group name to use for the instance (string)
 * `ssh_port` - (Optional) OpenStack SSH port * Default `22` (string)
 * `ssh_user` - (Optional) OpenStack SSH user * Default: `root` (string)
 * `tenant_id` - (Required**) OpenStack tenant id. Conflicts with `tenant_name` (string)

rancher2/data_source_rancher2_global_role_binding.go

@@ -24,6 +24,10 @@ func dataSourceRancher2GlobalRoleBinding() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"user_principal_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"group_principal_id": {
 				Type:     schema.TypeString,
 				Computed: true,

rancher2/schema_global_role_binding.go

@@ -4,7 +4,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
-// Shemas
+// Schemas
 
 func globalRoleBindingFields() map[string]*schema.Schema {
 	s := map[string]*schema.Schema{
@@ -19,6 +19,12 @@ func globalRoleBindingFields() map[string]*schema.Schema {
 			Computed: true,
 			ForceNew: true,
 		},
+		"user_principal_id": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Computed: true,
+			ForceNew: true,
+		},
 		"name": {
 			Type:     schema.TypeString,
 			Optional: true,

rancher2/schema_machine_config_v2_openstack.go

@@ -111,6 +111,14 @@ func machineConfigV2OpenstackFields() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Optional: true,
 		},
+		"server_group_id": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
+		"server_group_name": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
 		"ssh_port": {
 			Type:     schema.TypeString,
 			Optional: true,

rancher2/structure_global_role_binding.go

@@ -15,6 +15,7 @@ func flattenGlobalRoleBinding(d *schema.ResourceData, in *managementClient.Globa
 	d.SetId(in.ID)
 	d.Set("global_role_id", in.GlobalRoleID)
 	d.Set("user_id", in.UserID)
+	d.Set("user_principal_id", in.UserPrincipalID)
 	d.Set("name", in.Name)
 
 	if len(in.GroupPrincipalID) > 0 {
@@ -49,6 +50,7 @@ func expandGlobalRoleBinding(in *schema.ResourceData) *managementClient.GlobalRo
 
 	obj.GlobalRoleID = in.Get("global_role_id").(string)
 	obj.UserID = in.Get("user_id").(string)
+	obj.UserPrincipalID = in.Get("user_principal_id").(string)
 	obj.Name = in.Get("name").(string)
 
 	if v, ok := in.Get("group_principal_id").(string); ok && len(v) > 0 {