Merge branch 'master' into akstag

Author: rawmind0

CHANGELOG.md

@@ -4,6 +4,7 @@ FEATURES:
 
 * **Deprecated Argument:** `rancher2_cluster.aks_config.tag` - (Deprecated) Use `tags` argument instead as []string
 * **New Argument:** `rancher2_cluster.aks_config.tags` - (Optional/Computed) Tags for Kubernetes cluster. For example, `["foo=bar","bar=foo"]` (list)
+* **New Argument:** `rancher2_cluster.agent_env_vars` - (Optional) Optional Agent Env Vars for Rancher agent. Just for Rancher v2.5.6 and above (list)
 
 ENHANCEMENTS:
 

docs/data-sources/cluster.md

@@ -25,6 +25,7 @@ The following arguments are supported:
 The following attributes are exported:
 
 * `id` - (Computed) The ID of the resource (string)
+* `agent_env_vars` - (Computed) Optional Agent Env Vars for Rancher agent. Just for Rancher v2.5.6 and above (list)
 * `cluster_registration_token` - (Computed) Cluster Registration Token generated for the cluster (list maxitems:1)
 * `default_project_id` - (Computed) Default project ID for the cluster (string)
 * `driver` - (Computed) The driver used for the Cluster. `imported`, `azurekubernetesservice`, `amazonelasticcontainerservice`, `googlekubernetesengine` and `rancherKubernetesEngine` are supported (string)

docs/resources/cluster.md

@@ -505,6 +505,7 @@ resource "rancher2_cluster" "foo" {
 The following arguments are supported:
 
 * `name` - (Required) The name of the Cluster (string)
+* `agent_env_vars` - (Optional) Optional Agent Env Vars for Rancher agent. Just for Rancher v2.5.6 and above (list)
 * `rke_config` - (Optional/Computed) The RKE configuration for `rke` Clusters. Conflicts with `aks_config`, `eks_config`, `eks_config_v2`, `gke_config`, `gke_config_v2`, `oke_config` and `k3s_config` (list maxitems:1)
 * `rke2_config` - (Optional/Computed) The RKE2 configuration for `rke2` Clusters. Conflicts with `aks_config`, `eks_config`, `gke_config`, `oke_config`, `k3s_config` and `rke_config` (list maxitems:1)
 * `k3s_config` - (Optional/Computed) The K3S configuration for `k3s` imported Clusters. Conflicts with `aks_config`, `eks_config`, `eks_config_v2`, `gke_config`, `gke_config_v2`, `oke_config` and `rke_config` (list maxitems:1)
@@ -558,6 +559,13 @@ The following attributes are exported:
 
 ## Nested blocks
 
+### `agent_env_vars`
+
+#### Arguments
+
+* `name` - (Required) Rancher agent env var name (string)
+* `value` - (Required) Rancher agent env var value (string)
+
 ### `rke_config`
 
 **Note** `rke_config` works the same as within Rancher GUI; it will not _provision_ hosts when using no `cloud_provider` or when `cloud_provider` is set to custom. It is expected that nodes are registered by having the `node_command` run on each node. Running the `node_command` is outside the scope of this provider. 
@@ -1479,11 +1487,13 @@ The following arguments are supported:
 * `node_pool_subnet_name` - (Optional) Name for node pool subnet. Default `nodedns` (string)
 * `node_public_key_contents` - (Optional) The contents of the SSH public key file to use for the nodes (string)
 * `node_shape` - (Required) The shape of the node (determines number of CPUs and  amount of memory on each OKE node) (string)
+* `pod_cidr` - (Optional) A CIDR IP range from which to assign Kubernetes Pod IPs (string)
 * `private_key_contents` - (Required/Sensitive) The private API key file contents for the specified user, in PEM format (string)
 * `private_key_passphrase` - (Optional/Sensitive) The passphrase (if any) of the private key for the OKE cluster (string)
 * `quantity_of_node_subnets` - (Optional) Number of node subnets. Default `1` (int)
 * `quantity_per_subnet` - (Optional) Number of OKE worker nodes in each subnet / availability domain. Default `1` (int)
 * `region` - (Required) The availability domain within the region to host the cluster. See [here](https://docs.cloud.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm) for a list of region names. (string)
+* `service_cidr` - (Optional) A CIDR IP range from which to assign Kubernetes Service IPs (string)
 * `service_dns_domain_name` - (Optional) Name for DNS domain of service subnet. Default `svcdns` (string)
 * `skip_vcn_delete` - (Optional) Specifies whether to skip deleting the virtual cloud network (VCN) on destroy. Default `false` (bool)
 * `tenancy_id` - (Required) The OCID of the tenancy in which to create resources (string)

rancher2/data_source_rancher2_cluster.go

@@ -15,6 +15,14 @@ func dataSourceRancher2Cluster() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"agent_env_vars": {
+				Type:        schema.TypeList,
+				Computed:    true,
+				Description: "Optional Agent Env Vars for Rancher agent",
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
 			"driver": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -23,6 +31,11 @@ func dataSourceRancher2Cluster() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"ca_cert": {
+				Type:      schema.TypeString,
+				Computed:  true,
+				Sensitive: true,
+			},
 			"rke_config": {
 				Type:     schema.TypeList,
 				MaxItems: 1,

rancher2/resource_rancher2_cluster.go

@@ -261,6 +261,7 @@ func resourceRancher2ClusterUpdate(d *schema.ResourceData, meta interface{}) err
 	enableNetworkPolicy := d.Get("enable_network_policy").(bool)
 	update := map[string]interface{}{
 		"name":                               d.Get("name").(string),
+		"agentEnvVars":                       expandEnvVars(d.Get("agent_env_vars").([]interface{})),
 		"description":                        d.Get("description").(string),
 		"defaultPodSecurityPolicyTemplateId": d.Get("default_pod_security_policy_template_id").(string),
 		"desiredAgentImage":                  d.Get("desired_agent_image").(string),

rancher2/schema_cluster.go

@@ -470,6 +470,14 @@ func clusterFields() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Required: true,
 		},
+		"agent_env_vars": {
+			Type:        schema.TypeList,
+			Optional:    true,
+			Description: "Optional Agent Env Vars for Rancher agent",
+			Elem: &schema.Resource{
+				Schema: envVarFields(),
+			},
+		},
 		"driver": {
 			Type:         schema.TypeString,
 			Optional:     true,

rancher2/schema_cluster_oke_config.go

@@ -33,9 +33,11 @@ type OracleKubernetesEngineConfig struct {
 	PrivateKeyContents          string `json:"privateKeyContents,omitempty" yaml:"privateKeyContents,omitempty"`
 	PrivateKeyPassphrase        string `json:"privateKeyPassphrase,omitempty" yaml:"privateKeyPassphrase,omitempty"`
 	PrivateNodes                bool   `json:"enablePrivateNodes,omitempty" yaml:"enablePrivateNodes,omitempty"`
+	PodCidr                     string `json:"podCidr,omitempty" yaml:"podCidr,omitempty"`
 	QuantityOfSubnets           int64  `json:"quantityOfNodeSubnets,omitempty" yaml:"quantityOfNodeSubnets,omitempty"`
 	QuantityPerSubnet           int64  `json:"quantityPerSubnet,omitempty" yaml:"quantityPerSubnet,omitempty"`
 	Region                      string `json:"region,omitempty" yaml:"region,omitempty"`
+	ServiceCidr                 string `json:"serviceCidr,omitempty" yaml:"serviceCidr,omitempty"`
 	ServiceLBSubnet1Name        string `json:"loadBalancerSubnetName1,omitempty" yaml:"loadBalancerSubnetName1,omitempty"`
 	ServiceLBSubnet2Name        string `json:"loadBalancerSubnetName2,omitempty" yaml:"loadBalancerSubnetName2,omitempty"`
 	ServiceSubnetDNSDomainName  string `json:"serviceDnsDomainName,omitempty" yaml:"serviceDnsDomainName,omitempty"`
@@ -201,6 +203,16 @@ func clusterOKEConfigFields() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Additional CIDR from which to allow ingress to worker nodes",
 		},
+		"pod_cidr": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Optional specify the pod CIDR, defaults to 10.244.0.0/16",
+		},
+		"service_cidr": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "Optional specify the service CIDR, defaults to 10.96.0.0/16",
+		},
 	}
 
 	return s

rancher2/schema_env_var.go

@@ -0,0 +1,22 @@
+package rancher2
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+//Schemas
+
+func envVarFields() map[string]*schema.Schema {
+	s := map[string]*schema.Schema{
+		"name": {
+			Type:     schema.TypeString,
+			Required: true,
+		},
+		"value": {
+			Type:     schema.TypeString,
+			Required: true,
+		},
+	}
+
+	return s
+}

rancher2/structure_cluster.go

@@ -59,6 +59,10 @@ func flattenCluster(d *schema.ResourceData, in *Cluster, clusterRegToken *manage
 	d.Set("name", in.Name)
 	d.Set("description", in.Description)
 
+	if len(in.AgentEnvVars) > 0 {
+		d.Set("agent_env_vars", flattenEnvVars(in.AgentEnvVars))
+	}
+
 	err := d.Set("cluster_auth_endpoint", flattenClusterAuthEndpoint(in.LocalClusterAuthEndpoint))
 	if err != nil {
 		return err
@@ -396,6 +400,10 @@ func expandCluster(in *schema.ResourceData) (*Cluster, error) {
 	obj.Name = in.Get("name").(string)
 	obj.Description = in.Get("description").(string)
 
+	if v, ok := in.Get("agent_env_vars").([]interface{}); ok && len(v) > 0 {
+		obj.AgentEnvVars = expandEnvVars(v)
+	}
+
 	if v, ok := in.Get("cluster_auth_endpoint").([]interface{}); ok && len(v) > 0 {
 		obj.LocalClusterAuthEndpoint = expandClusterAuthEndpoint(v)
 	}

rancher2/structure_cluster_oke_config.go

@@ -75,6 +75,10 @@ func flattenClusterOKEConfig(in *OracleKubernetesEngineConfig, p []interface{})
 		obj["node_shape"] = in.NodeShape
 	}
 
+	if len(in.PodCidr) > 0 {
+		obj["pod_cidr"] = in.PodCidr
+	}
+
 	if len(in.PrivateKeyContents) > 0 {
 		obj["private_key_contents"] = in.PrivateKeyContents
 	}
@@ -95,6 +99,10 @@ func flattenClusterOKEConfig(in *OracleKubernetesEngineConfig, p []interface{})
 		obj["region"] = in.Region
 	}
 
+	if len(in.ServiceCidr) > 0 {
+		obj["service_cidr"] = in.ServiceCidr
+	}
+
 	if len(in.ServiceSubnetDNSDomainName) > 0 {
 		obj["service_dns_domain_name"] = in.ServiceSubnetDNSDomainName
 	}
@@ -205,6 +213,10 @@ func expandClusterOKEConfig(p []interface{}, name string) (*OracleKubernetesEngi
 		obj.NodeShape = v
 	}
 
+	if v, ok := in["pod_cidr"].(string); ok && len(v) > 0 {
+		obj.PodCidr = v
+	}
+
 	if v, ok := in["private_key_contents"].(string); ok && len(v) > 0 {
 		obj.PrivateKeyContents = v
 	}
@@ -229,6 +241,10 @@ func expandClusterOKEConfig(p []interface{}, name string) (*OracleKubernetesEngi
 		obj.ServiceSubnetDNSDomainName = v
 	}
 
+	if v, ok := in["service_cidr"].(string); ok && len(v) > 0 {
+		obj.ServiceCidr = v
+	}
+
 	if v, ok := in["skip_vcn_delete"].(bool); ok {
 		obj.SkipVCNDelete = v
 	}