feat: Remove outdated Calico extension

Signed-off-by: Devon Crouse <[email protected]>

Author: devoncrouse

docs/src/dependencies.md

@@ -24,7 +24,6 @@
 |------|--------|---------|
 | <a name="module_bastion"></a> [bastion](#module\_bastion) | ./modules/bastion | n/a |
 | <a name="module_cluster"></a> [cluster](#module\_cluster) | ./modules/cluster | n/a |
-| <a name="module_drg"></a> [drg](#module\_drg) | oracle-terraform-modules/drg/oci | 1.0.3 |
 | <a name="module_extensions"></a> [extensions](#module\_extensions) | ./modules/extensions | n/a |
 | <a name="module_iam"></a> [iam](#module\_iam) | ./modules/iam | n/a |
 | <a name="module_network"></a> [network](#module\_network) | ./modules/network | n/a |

docs/src/guide/extensions_networking.md

@@ -16,20 +16,6 @@
 
 ****
 
-## Calico CNI
-
-### Usage
-```javascript
-{{#include ../../../examples/extensions/vars-extensions-calico.auto.tfvars:4:}}
-```
-
-### References
-* [System requirements](https://docs.tigera.io/calico/latest/getting-started/openstack/requirements)
-* [Overlay networks](https://docs.tigera.io/calico/latest/networking/determine-best-networking#overlay-networks)
-* [Installing Calico and Setting Up Network Policies](https://docs.oracle.com/en-us/iaas/Content/ContEng/Tasks/contengsettingupcalico.htm)
-
-****
-
 ## Cilium CNI
 
 ### Usage

docs/src/inputs_root.md

@@ -19,9 +19,6 @@ The module supports the following configuration for created resources:
 | <a name="input_assign_dns"></a> [assign\_dns](#input\_assign\_dns)| Whether to assign DNS records to created instances or disable DNS resolution of hostnames in the VCN.|  bool|  true|  no|
 | <a name="input_bastion_is_public"></a> [bastion\_is\_public](#input\_bastion\_is\_public)| Whether to create allocate a public IP and subnet for the created bastion host.|  bool|  true|  no|
 | <a name="input_bastion_upgrade"></a> [bastion\_upgrade](#input\_bastion\_upgrade)| Whether to upgrade bastion packages after provisioning.|  bool|  false|  no|
-| <a name="input_calico_apiserver_install"></a> [calico\_apiserver\_install](#input\_calico\_apiserver\_install)| Whether to enable the Calico apiserver.|  bool|  false|  no|
-| <a name="input_calico_install"></a> [calico\_install](#input\_calico\_install)| Whether to install calico for network pod security policy. NOTE: Provided only as a convenience and not supported by or sourced from Oracle - use at your own risk.|  bool|  false|  no|
-| <a name="input_calico_typha_install"></a> [calico\_typha\_install](#input\_calico\_typha\_install)| Whether to enable Typha (automatically enabled for > 50 nodes).|  bool|  false|  no|
 | <a name="input_cluster_autoscaler_install"></a> [cluster\_autoscaler\_install](#input\_cluster\_autoscaler\_install)| Whether to deploy the Kubernetes Cluster Autoscaler Helm chart. See <a href=https://github.com/kubernetes/autoscaler>kubernetes/autoscaler</a>. NOTE: Provided only as a convenience and not supported by or sourced from Oracle - use at your own risk.|  bool|  false|  no|
 | <a name="input_control_plane_is_public"></a> [control\_plane\_is\_public](#input\_control\_plane\_is\_public)| Whether the Kubernetes control plane endpoint should be allocated a public IP address to enable access over public internet.|  bool|  false|  no|
 | <a name="input_create_bastion"></a> [create\_bastion](#input\_create\_bastion)| Whether to create a bastion host.|  bool|  true|  no|
@@ -55,6 +52,8 @@ The module supports the following configuration for created resources:
 | <a name="input_use_signed_images"></a> [use\_signed\_images](#input\_use\_signed\_images)| Whether to enforce the use of signed images. If set to true, at least 1 RSA key must be provided through image\_signing\_keys.|  bool|  false|  no|
 | <a name="input_whereabouts_install"></a> [whereabouts\_install](#input\_whereabouts\_install)| Whether to deploy the MPI Operator. See <a href=https://github.com/k8snetworkplumbingwg/whereabouts>k8snetworkplumbingwg/whereabouts</a>. NOTE: Provided only as a convenience and not supported by or sourced from Oracle - use at your own risk.|  bool|  false|  no|
 | <a name="input_worker_disable_default_cloud_init"></a> [worker\_disable\_default\_cloud\_init](#input\_worker\_disable\_default\_cloud\_init)| Whether to disable the default OKE cloud init and only use the cloud init explicitly passed to the worker pool in 'worker\_cloud\_init'.|  bool|  false|  no|
+| <a name="input_worker_drain_delete_local_data"></a> [worker\_drain\_delete\_local\_data](#input\_worker\_drain\_delete\_local\_data)| Whether to accept removal of data stored locally on draining worker pools. See <a href=https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#drain>kubectl drain</a> for more information.|  bool|  true|  no|
+| <a name="input_worker_drain_ignore_daemonsets"></a> [worker\_drain\_ignore\_daemonsets](#input\_worker\_drain\_ignore\_daemonsets)| Whether to ignore DaemonSet-managed Pods when draining worker pools. See <a href=https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#drain>kubectl drain</a> for more information.|  bool|  true|  no|
 | <a name="input_worker_is_public"></a> [worker\_is\_public](#input\_worker\_is\_public)| Whether to provision workers with public IPs allocated by default when unspecified on a pool.|  bool|  false|  no|
 | <a name="input_worker_pv_transit_encryption"></a> [worker\_pv\_transit\_encryption](#input\_worker\_pv\_transit\_encryption)| Whether to enable in-transit encryption for the data volume's paravirtualized attachment by default when unspecified on a pool.|  bool|  false|  no|
 | <a name="input_internet_gateway_route_rules"></a> [internet\_gateway\_route\_rules](#input\_internet\_gateway\_route\_rules)| (Updatable) List of routing rules to add to Internet Gateway Route Table.|  list(map(string))|  null|  no|
@@ -103,9 +102,8 @@ The module supports the following configuration for created resources:
 | <a name="input_worker_node_metadata"></a> [worker\_node\_metadata](#input\_worker\_node\_metadata)| Map of additional worker node instance metadata. Merged with metadata defined on each pool.|  map(string)|  {}|  no|
 | <a name="input_workers_defined_tags"></a> [workers\_defined\_tags](#input\_workers\_defined\_tags)| Defined tags applied to created resources.|  map(string)|  {}|  no|
 | <a name="input_workers_freeform_tags"></a> [workers\_freeform\_tags](#input\_workers\_freeform\_tags)| Freeform tags applied to created resources.|  map(string)|  {}|  no|
-| <a name="input_calico_mtu"></a> [calico\_mtu](#input\_calico\_mtu)| Interface MTU for Calico device(s) (0 = auto).|  number|  0|  no|
-| <a name="input_calico_typha_replicas"></a> [calico\_typha\_replicas](#input\_calico\_typha\_replicas)| The number of replicas for the Typha deployment (0 = auto).|  number|  0|  no|
 | <a name="input_max_pods_per_node"></a> [max\_pods\_per\_node](#input\_max\_pods\_per\_node)| The default maximum number of pods to deploy per node when unspecified on a pool. Absolute maximum is 110. Ignored when when cni\_type != 'npn'.|  number|  31|  no|
+| <a name="input_worker_drain_timeout_seconds"></a> [worker\_drain\_timeout\_seconds](#input\_worker\_drain\_timeout\_seconds)| The length of time to wait before giving up on draining nodes in a pool. See <a href=https://kubernetes.io/docs/reference/generated/kubectl/kubectl-commands#drain>kubectl drain</a> for more information.|  number|  900|  no|
 | <a name="input_worker_pool_size"></a> [worker\_pool\_size](#input\_worker\_pool\_size)| Default size for worker pools when unspecified on a pool.|  number|  0|  no|
 | <a name="input_platform_config"></a> [platform\_config](#input\_platform\_config)| Default platform\_config for self-managed worker pools created with mode: 'instance', 'instance-pool', or 'cluster-network'. See <a href=https://docs.oracle.com/en-us/iaas/api/#/en/iaas/20160918/datatypes/PlatformConfig>PlatformConfig</a> for more information.|  object({<br>    type                                           = optional(string),<br>    are\_virtual\_instructions\_enabled               = optional(bool),<br>    is\_access\_control\_service\_enabled              = optional(bool),<br>    is\_input\_output\_memory\_management\_unit\_enabled = optional(bool),<br>    is\_measured\_boot\_enabled                       = optional(bool),<br>    is\_memory\_encryption\_enabled                   = optional(bool),<br>    is\_secure\_boot\_enabled                         = optional(bool),<br>    is\_symmetric\_multi\_threading\_enabled           = optional(bool),<br>    is\_trusted\_platform\_module\_enabled             = optional(bool),<br>    numa\_nodes\_per\_socket                          = optional(number),<br>    percentage\_of\_cores\_enabled                    = optional(bool),<br>  })|  null|  no|
 | <a name="input_control_plane_nsg_ids"></a> [control\_plane\_nsg\_ids](#input\_control\_plane\_nsg\_ids)| An additional list of network security groups (NSG) ids for the cluster endpoint.|  set(string)|  []|  no|
@@ -122,10 +120,6 @@ The module supports the following configuration for created resources:
 | <a name="input_bastion_image_type"></a> [bastion\_image\_type](#input\_bastion\_image\_type)| Whether to use a platform or custom image for the created bastion instance. When custom is set, the bastion\_image\_id must be specified.|  string|  "platform"|  no|
 | <a name="input_bastion_public_ip"></a> [bastion\_public\_ip](#input\_bastion\_public\_ip)| The IP address of an existing bastion host, if create\_bastion = false.|  string|  null|  no|
 | <a name="input_bastion_user"></a> [bastion\_user](#input\_bastion\_user)| User for SSH access through bastion host.|  string|  "opc"|  no|
-| <a name="input_calico_mode"></a> [calico\_mode](#input\_calico\_mode)| The type of Calico manifest to install. The default of 'policy-only' is recommended.|  string|  "policy-only"|  no|
-| <a name="input_calico_staging_dir"></a> [calico\_staging\_dir](#input\_calico\_staging\_dir)| Directory on the operator instance to stage Calico install files.|  string|  "/tmp/calico\_install"|  no|
-| <a name="input_calico_url"></a> [calico\_url](#input\_calico\_url)| Optionally override the Calico manifest URL (empty string = auto).|  string|  ""|  no|
-| <a name="input_calico_version"></a> [calico\_version](#input\_calico\_version)| The version of Calico to install.|  string|  "3.24.1"|  no|
 | <a name="input_cluster_autoscaler_helm_version"></a> [cluster\_autoscaler\_helm\_version](#input\_cluster\_autoscaler\_helm\_version)| Version of the Helm chart to install. List available releases using `helm search repo [keyword] --versions`.|  string|  "9.24.0"|  no|
 | <a name="input_cluster_autoscaler_namespace"></a> [cluster\_autoscaler\_namespace](#input\_cluster\_autoscaler\_namespace)| Kubernetes namespace for deployed resources.|  string|  "kube-system"|  no|
 | <a name="input_cluster_ca_cert"></a> [cluster\_ca\_cert](#input\_cluster\_ca\_cert)| Base64+PEM-encoded cluster CA certificate for unmanaged instance pools. Determined automatically when 'create\_cluster' = true or 'cluster\_id' is provided.|  string|  null|  no|

docs/src/outputs.md

@@ -60,9 +60,11 @@
 <!-- BEGIN_TF_WORKERS -->
 
 * **`worker_count_expected`**&nbsp;&nbsp; # of nodes expected from created worker pools
-* **`worker_instance_ids`**&nbsp;&nbsp; Created worker instance IDs (mode == 'instance'). Excludes pool-managed instances.
+* **`worker_drain_expected`**&nbsp;&nbsp; # of nodes expected to be draining in worker pools
+* **`worker_instances`**&nbsp;&nbsp; Created worker pools (mode == 'instance')
 * **`worker_pool_ids`**&nbsp;&nbsp; Created worker pool IDs
-* **`worker_pools`**&nbsp;&nbsp; Created worker pools
+* **`worker_pool_ips`**&nbsp;&nbsp; Created worker instance private IPs by pool for available modes ('node-pool', 'instance').
+* **`worker_pools`**&nbsp;&nbsp; Created worker pools (mode != 'instance')
 
 <!-- END_TF_WORKERS -->
 

examples/rms/oke-cluster-only/main.tf

@@ -79,17 +79,6 @@ module "oke" {
   services_cidr           = var.services_cidr
   use_signed_images       = var.use_signed_images
 
-  # CNI: Calico
-  calico_install           = var.calico_install
-  calico_apiserver_install = var.calico_apiserver_install
-  calico_mode              = var.calico_mode
-  calico_mtu               = var.calico_mtu
-  calico_staging_dir       = var.calico_staging_dir
-  calico_typha_install     = var.calico_typha_install
-  calico_typha_replicas    = var.calico_typha_replicas
-  calico_url               = var.calico_url
-  calico_version           = var.calico_version
-
   # CNI: Cilium
   cilium_install           = var.cilium_install
   cilium_reapply           = var.cilium_reapply

examples/rms/oke-cluster-only/schema.yaml

@@ -20,8 +20,6 @@ variableGroups:
       - timezone
       - subnets
       - await_node_readiness
-      - calico_helm_values
-      - calico_helm_values_files
 
   - title: "Identity"
     variables:
@@ -117,7 +115,6 @@ variableGroups:
       - dcgm_exporter_install
       - gatekeeper_install
       - multus_install
-      - calico_install
       - cilium_install
       - whereabouts_install
       - sriov_device_plugin_install
@@ -175,18 +172,6 @@ variableGroups:
       - multus_daemonset_url
       - multus_version
 
-  - title: "Calico"
-    visible: calico_install
-    variables:
-      - calico_namespace
-      - calico_reapply
-      - calico_apiserver_install
-      - calico_version
-      - calico_url
-      - calico_typha_replicas
-      - calico_mtu
-      - calico_helm_version
-
   - title: "Cilium"
     visible: cilium_install
     variables:
@@ -724,44 +709,6 @@ variables:
     dependsOn:
       compartmentId: ${compartment_ocid}
 
-  # CNI: Calico
-  calico_install:
-    title: Install Calico
-    description: Deploy Calico with Oracle Cloud configuration. See <a href=https://docs.tigera.io/calico/latest/getting-started>Install Calico</a> for more information.
-    type: boolean
-    default: false
-    required: true
-  calico_namespace:
-    title: Kubernetes namespace
-    type: string
-  calico_reapply:
-    title: Re-apply
-    type: boolean
-    default: false
-    required: true
-  calico_apiserver_install:
-    title: Install Calico API Server
-    type: boolean
-    default: false
-    required: true
-  calico_mode:
-    visible: false
-  calico_staging_dir:
-    visible: false
-  calico_typha_install:
-    title: Install Typha
-    visible: ${calico_install}
-  calico_helm_version:
-    visible: false
-  calico_mtu:
-    visible: false
-  calico_typha_replicas:
-    visible: false
-  calico_url:
-    visible: false
-  calico_version:
-    visible: false
-
   # Metrics server
   metrics_server_install:
     title: Install Metrics Server

examples/rms/oke-cluster-only/variables-extensions.tf

@@ -1,21 +1,6 @@
 # Copyright (c) 2023 Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
-# CNI: Calico
-
-variable "calico_install" { default = false }
-variable "calico_reapply" { default = false }
-variable "calico_version" { default = "3.24.1" }
-variable "calico_mode" { default = "policy-only" }
-variable "calico_mtu" { default = 0 }
-variable "calico_url" { default = "" }
-variable "calico_apiserver_install" { default = false }
-variable "calico_typha_install" { default = false }
-variable "calico_typha_replicas" { default = 0 }
-variable "calico_staging_dir" { default = "/tmp/calico_install" }
-variable "calico_namespace" { default = "network" }
-variable "calico_helm_version" { default = "3.25.0" }
-
 # CNI: Multus
 
 variable "multus_install" { default = false }

module-extensions.tf

@@ -24,17 +24,6 @@ module "extensions" {
   cni_type  = var.cni_type
   pods_cidr = var.pods_cidr
 
-  # CNI: Calico
-  calico_install           = var.calico_install
-  calico_apiserver_install = var.calico_apiserver_install
-  calico_mode              = var.calico_mode
-  calico_mtu               = var.calico_mtu
-  calico_staging_dir       = var.calico_staging_dir
-  calico_typha_install     = var.calico_typha_install
-  calico_typha_replicas    = var.calico_typha_replicas
-  calico_url               = var.calico_url
-  calico_version           = var.calico_version
-
   # CNI: Multus
   multus_install       = var.multus_install
   multus_namespace     = var.multus_namespace