updated pre-requisites and path from master to main branch (oracle-te…

…rraform-modules#294)

Closes oracle-terraform-modules#292

CONTRIBUTORS.adoc

@@ -1,6 +1,6 @@
 == GitHub userids of contributors
 
-OWNERS # have admin access and can merge code to master:
+OWNERS # have admin access and can merge code to main:
 
 - @hyder
 - @markxnelson

README.adoc

@@ -5,8 +5,8 @@
 
 :uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-oke
 
-:uri-rel-file-base: link:{uri-repo}/blob/master
-:uri-rel-tree-base: link:{uri-repo}/tree/master
+:uri-rel-file-base: link:{uri-repo}/blob/main
+:uri-rel-tree-base: link:{uri-repo}/tree/main
 
 :uri-docs: {uri-rel-file-base}/docs
 

README.md

@@ -2,32 +2,32 @@
 
 [uri-repo]: https://github.com/oracle-terraform-modules/terraform-oci-oke
 
-[uri-docs]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/docs
+[uri-docs]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/docs
 
-[uri-changelog]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/CHANGELOG.adoc
-[uri-configuration]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/docs/configuration.adoc
+[uri-changelog]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/CHANGELOG.adoc
+[uri-configuration]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/docs/configuration.adoc
 
-[uri-contribute]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/CONTRIBUTING.adoc
-[uri-contributors]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/CONTRIBUTORS.adoc
+[uri-contribute]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/CONTRIBUTING.adoc
+[uri-contributors]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/CONTRIBUTORS.adoc
 
-[uri-instructions]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/docs/instructions.adoc
-[uri-license]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/LICENSE
+[uri-instructions]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/docs/instructions.adoc
+[uri-license]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/LICENSE
 [uri-canonical-license]: https://oss.oracle.com/licenses/upl/
 [uri-kubernetes]: https://kubernetes.io/
 [uri-networks-subnets-cidr]: https://erikberg.com/notes/networks.html
 [uri-oci]: https://cloud.oracle.com/cloud-infrastructure
 [uri-oci-documentation]: https://docs.cloud.oracle.com/iaas/Content/home.htm
 [uri-oke]: https://docs.cloud.oracle.com/iaas/Content/ContEng/Concepts/contengoverview.htm
 [uri-oracle]: https://www.oracle.com
-[uri-prereqs]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/docs/prerequisites.adoc
-[uri-quickstart]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/docs/quickstart.adoc
+[uri-prereqs]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/docs/prerequisites.adoc
+[uri-quickstart]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/docs/quickstart.adoc
 
 [uri-terraform]: https://www.terraform.io
-[uri-terraform-dependencies]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/docs/dependencies.adoc
+[uri-terraform-dependencies]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/docs/dependencies.adoc
 [uri-terraform-cidrsubnet-deconstructed]: http://blog.itsjustcode.net/blog/2017/11/18/terraform-cidrsubnet-deconstructed/
 [uri-terraform-oci]: https://www.terraform.io/docs/providers/oci/index.html
-[uri-terraform-oke-sample]: https://github.com/terraform-providers/terraform-provider-oci/tree/master/examples/container_engine
-[uri-terraform-options]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/docs/terraformoptions.adoc
+[uri-terraform-oke-sample]: https://github.com/terraform-providers/terraform-provider-oci/tree/main/examples/container_engine
+[uri-terraform-options]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/main/docs/terraformoptions.adoc
 [uri-terraform-hashircorp-examples]: https://github.com/hashicorp/terraform-guides/tree/master/infrastructure-as-code/terraform-0.12-examples
 [uri-topology]: https://github.com/oracle-terraform-modules/terraform-oci-oke/blob/master/docs/topology.adoc
 

docs/configuration.adoc

@@ -7,8 +7,8 @@
 
 :uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-oke
 
-:uri-rel-file-base: link:{uri-repo}/blob/master
-:uri-rel-tree-base: link:{uri-repo}/tree/master
+:uri-rel-file-base: link:{uri-repo}/blob/main
+:uri-rel-tree-base: link:{uri-repo}/tree/main
 :uri-docs: {uri-rel-file-base}/docs
 
 :uri-calico: https://www.projectcalico.org/
@@ -28,7 +28,7 @@
 :uri-oci-documentation: https://docs.cloud.oracle.com/iaas/Content/home.htm
 :uri-oci-instance-principal: https://docs.cloud.oracle.com/iaas/Content/Identity/Tasks/callingservicesfrominstances.htm
 :uri-oci-kms: https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm
-:uri-oci-loadbalancer-annotations: https://github.com/oracle/oci-cloud-controller-manager/blob/master/docs/load-balancer-annotations.md
+:uri-oci-loadbalancer-annotations: https://github.com/oracle/oci-cloud-controller-manager/blob/main/docs/load-balancer-annotations.md
 :uri-oci-region: https://docs.cloud.oracle.com/iaas/Content/General/Concepts/regions.htm
 :uri-oci-ocir: https://docs.cloud.oracle.com/iaas/Content/Registry/Concepts/registryoverview.htm
 :uri-oke: https://docs.cloud.oracle.com/iaas/Content/ContEng/Concepts/contengoverview.htm

docs/dependencies.adoc

@@ -6,8 +6,8 @@
 
 :uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-oke
 
-:uri-rel-file-base: link:{uri-repo}/blob/master
-:uri-rel-tree-base: link:{uri-repo}/tree/master
+:uri-rel-file-base: link:{uri-repo}/blob/main
+:uri-rel-tree-base: link:{uri-repo}/tree/main
 
 :uri-docs: {uri-rel-file-base}/docs
 :uri-terraform-options: {uri-docs}/terraformoptions.adoc

docs/instructions.adoc

@@ -7,8 +7,8 @@
 
 :uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-oke
 
-:uri-rel-file-base: link:{uri-repo}/blob/master
-:uri-rel-tree-base: link:{uri-repo}/tree/master
+:uri-rel-file-base: link:{uri-repo}/blob/main
+:uri-rel-tree-base: link:{uri-repo}/tree/main
 
 :uri-docs: {uri-rel-file-base}/docs
 

docs/prerequisites.adoc

@@ -6,8 +6,8 @@
 :sectnums:
 :uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-oke
 
-:uri-rel-file-base: link:{uri-repo}/blob/master
-:uri-rel-tree-base: link:{uri-repo}/tree/master
+:uri-rel-file-base: link:{uri-repo}/blob/main
+:uri-rel-tree-base: link:{uri-repo}/tree/main
 
 :uri-docs: {uri-rel-file-base}/docs
 
@@ -43,8 +43,7 @@ You can proceed to {uri-instructions}[creating the cluster] if you have already
 
 The Terraform user must have the permission to:
 
-. manage dynamic groups
-. manage policies in root tenancy
+. manage dynamic groups (instance_principal and KMS integration)
 . manage cluster-family in compartment
 . manage virtual-network-family in compartment
 . manage instance-family in compartment

docs/quickstart.adoc

@@ -6,8 +6,8 @@
 
 
 :uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-oke
-:uri-rel-file-base: link:{uri-repo}/blob/master
-:uri-rel-tree-base: link:{uri-repo}/tree/master
+:uri-rel-file-base: link:{uri-repo}/blob/main
+:uri-rel-tree-base: link:{uri-repo}/tree/main
 :uri-docs: {uri-rel-file-base}/docs
 :uri-instructions: {uri-docs}/instructions.adoc
 :uri-oci-keys: https://docs.cloud.oracle.com/iaas/Content/API/Concepts/apisigningkey.htm

docs/terraformoptions.adoc

@@ -5,8 +5,8 @@
 :sectnums:
 :uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-oke
 
-:uri-rel-file-base: link:{uri-repo}/blob/master
-:uri-rel-tree-base: link:{uri-repo}/tree/master
+:uri-rel-file-base: link:{uri-repo}/blob/main
+:uri-rel-tree-base: link:{uri-repo}/tree/main
 :uri-calico: https://www.projectcalico.org/
 :uri-calico-policy: https://docs.projectcalico.org/getting-started/kubernetes/flannel/flannel
 :uri-cert-manager: https://cert-manager.readthedocs.io/en/latest/

docs/topology.adoc

@@ -5,8 +5,8 @@
 :bl: pass:[ +]
 :uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-oke
 
-:uri-rel-file-base: link:{uri-repo}/blob/master
-:uri-rel-tree-base: link:{uri-repo}/tree/master
+:uri-rel-file-base: link:{uri-repo}/blob/main
+:uri-rel-tree-base: link:{uri-repo}/tree/main
 :uri-docs: {uri-rel-file-base}/docs
 :uri-networks-subnets-cidr: https://erikberg.com/notes/networks.html
 :uri-oci-configure-cli: https://docs.cloud.oracle.com/iaas/Content/API/SDKDocs/cliinstall.htm#SettinguptheConfigFile
@@ -55,7 +55,7 @@ By default, the following resources are created:
 
 [Important]
 ====
-. The Kubernetes Master Nodes run in Oracle's tenancy and are not shown here.
+. The Kubernetes Control Plane Nodes run in Oracle's tenancy and are not shown here.
 . Although the recommended approach is to now deploy private clusters, we are currently keeping the default setting to public. This is to give our users the time to adjust other configurations e.g. their CI/CD tools and such.
 ====
 

docs/upgrade.adoc

@@ -6,8 +6,8 @@
 
 
 :uri-repo: https://github.com/oracle-terraform-modules/terraform-oci-oke
-:uri-rel-file-base: link:{uri-repo}/blob/master
-:uri-rel-tree-base: link:{uri-repo}/tree/master
+:uri-rel-file-base: link:{uri-repo}/blob/main
+:uri-rel-tree-base: link:{uri-repo}/tree/main
 :uri-docs: {uri-rel-file-base}/docs
 :uri-instructions: {uri-docs}/instructions.adoc
 :uri-oci-keys: https://docs.cloud.oracle.com/iaas/Content/API/Concepts/apisigningkey.htm
@@ -24,7 +24,7 @@
 
 This section documents how to upgrade the OKE Cluster using this project. At a high level, upgrading the OKE cluster is fairly straightforward:
 
-1. Upgrade the master nodes
+1. Upgrade the control plane nodes
 2. Upgrade the worker nodes using either {uri-upgrade-oke}[in-place or out-of-place] approach
 
 This has to be done in order.
@@ -36,7 +36,7 @@ This project supports only the out-of-place method of upgrading the worker nodes
 . bastion host is created
 . operator host is created
 
-=== Upgrading the master nodes
+=== Upgrading the control plane nodes
 
 . Locate your `kubernetes_version` in your terraform variable file and change:
 
@@ -58,7 +58,7 @@ kubernetes_version = "v1.18.10"
 terraform apply --auto-approve
 ----
 
-This will upgrade the master nodes. You can verify this in the OCI Console.
+This will upgrade the control plane nodes. You can verify this in the OCI Console.
 
 
 === Upgrading the worker nodes using the out-of-place method