- Added admin server in private subnet. use bastion only as jump host…

…. need more testing and update docs

- Added python3 and oci-cli to admin host
- Using oci-cli to generate kubeconfig instead of uploading
- Sort all variables in alphabetical order
- Use standard naming for enabled parameters
- Added additional checks to prevent locals in policies module looking up a dynamic group when instance_principal is not created and use_encryption=false and updated terraform.tfvars.example to remove unused bastion parameters
- Use compartment id instead of compartment name to write policy statement
- Update Kubernetes available versions in Terraform options doc
- Updated diagrams with admin host
- Kubeconfig v2 on admin host
- Updated changelog
- Updated topology diagrams and subnet masks
- Prevent the bastion/admin from destroying and recreating itself if the image ocid changes
- Changed uri of protocol numbers to https
- Upgrade to helm v3 (resolves #100)
- Removed quotes for references, (resolves #103)
- Added enable_instance_principal parameter for admin module

Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com>

.gitignore

@@ -9,7 +9,6 @@
 *.tfvars
 
 generated/**
-scripts/tesseract.sh
 
 # visual code
  **/.vscode/*

CHANGELOG.adoc

@@ -7,6 +7,21 @@ All notable changes to this project are documented in this file.
 
 The format is based on {uri-changelog}[Keep a Changelog].
 
+== v2.0.0-beta.2 (November 21, 2019)
+* Helm upgraded to version 3.0.0 #100
+* incubator and jetstack helm repos removed as they can now be searched from helm hub #100
+* tiller disabled and option to enable it is removed #100
+* Fixed bug for empty tuple in data.oci_core_images.oracle_images when use_autonomous=true #103
+* Set minimum version of Terraform to 0.12.16
+
+== v2.0.0-beta.1 (November 14, 2019)
+* Added admin host for operations instead of using the bastion server #91
+* Installed Python3, oci-cli #91
+* Switched from kubeconfig v1 to v2, generated by oci-cli instead of uploading #98
+* Switched all operations from bastion to admin host #91
+* Use compartment id instead of compartment name for policies #86
+* Updated available list of Kubernetes versions in Terraform options #90
+
 == v1.0.0 (September 27,2019)
 
 === Changes

docs/configuration.adoc

@@ -17,8 +17,6 @@
 :uri-contribute: {uri-rel-file-base}/CONTRIBUTING.adoc
 :uri-contributors: {uri-rel-file-base}/CONTRIBUTORS.adoc
 :uri-helm: https://helm.sh/
-:uri-helm-incubator: https://kubernetes-charts-incubator.storage.googleapis.com/
-:uri-helm-jetstack: https://charts.jetstack.io
 :uri-instructions: {uri-docs}/instructions.adoc
 :uri-license: {uri-rel-file-base}/LICENSE.txt
 :uri-kubernetes: https://kubernetes.io/
@@ -52,6 +50,7 @@
 . link:#configure-oci-parameters[Configure OCI parameters]
 . link:#configure-oci-networking-parameters[Configure OCI Networking parameters]
 . link:#configure-bastion-host-parameters[Configure Bastion Host parameters]
+. link:#configure-admin-host-parameters[Configure Admin Host parameters]
 . link:#configure-oke-parameters[Configure OKE parameters]
 . link:#configure-oke-load-balancer-parameters[Configure OKE Load Balancer parameters]
 . link:#configure-ocir-parameters[Configure OCIR parameters]
@@ -143,9 +142,13 @@ If you need to change the default VCN's CIDR, note the following:
 
 === Configure bastion host parameters
 
-The bastion host parameters concern whether you want to enable the bastion. 1 parameter to keep in mind here is the enable_instance_principal. Be aware that if this is enabled, it gives API access to the bastion host without authentication.
+The bastion host parameters concern whether you want to enable the bastion. 
 
-Read {uri-instructions}#enabling-instance_principal-on-the-bastion-host[more] about {uri-oci-instance-principal}[instance_principal].
+=== Configure admin host parameters
+
+The admin host parameters concern whether you want to enable the bastion. 1 parameter to keep in mind here is the admin_instance_principal. Be aware that if this is enabled, it gives API access to the admin host without authentication.
+
+Read {uri-instructions}#enabling-instance_principal-on-the-admin-host[more] about {uri-oci-instance-principal}[instance_principal].
 
 {uri-terraform-options}#bastion-host[Reference]
 
@@ -197,10 +200,7 @@ kubectl --namespace=kube-system get secret ocirsecret --export -o yaml | kubectl
 
 === Configure helm parameters
 
-The {uri-helm}[helm] parameters control the installation and the version of the helm client as well as optional helm repos to add and initialize on the bastion host. Additional helm repos include the following:
-
-. {uri-helm-incubator}[incubator]
-. {uri-helm-jetstack}[jetstack]
+The {uri-helm}[helm] parameters control the installation and the version of the helm client as well as optional helm repos to add and initialize on the bastion host.
 
 {uri-terraform-options}#helm[Reference]
 
@@ -221,8 +221,9 @@ The Kubernetes Metrics Server parameter controls the installation of {uri-metric
 The KMS integration parameters control whether {uri-oci-kms}[OCI Key Management Service] will be used for encrypting Kubernetes secrets. Additionally, the bastion host must be enabled as well as instance_principal on the bastion.
 
 ----
-create_bastion = true
-enable_instance_principal = true
+bastion_enabled = true
+admin_enabled = true
+admin_instance_principal = true
 use_encryption = true
 existing_key_id = <existing_key_id>
 ----

docs/instructions.adoc

@@ -101,18 +101,15 @@ Use the parameter *cluster_name* to change the name of the cluster as per your n
 
 === Adding the bastion host
 
-If you want to use bastion host, set the parameter *create_bastion* to *true* in terraform.tfvars. Refer to {uri-terraform-options}#bastion-host[Bastion Host] for other available bastion related parameters.
+If you want to use bastion host, set the parameter *bastion_enabled* to *true* in terraform.tfvars. Refer to {uri-terraform-options}#bastion-host[Bastion Host] for other available bastion related parameters.
 
-==== package_update and package_upgrade
+==== bastion_package_upgrade
 
-There are 2 additional parameters for the bastion:
+There is 1 additional parameter for the bastion:
 
-* bastion_package_update
 * bastion_package_upgrade
 
-_bastion_package_update_ will update the apt database *if* you choose Ubuntu as the Linux distribution for the bastion host.
-
-_bastion_package_upgrade_ will upgrade the bastion compute instance on first boot. If you choose Ubuntu for bastion host and you set _bastion_package_upgrade_ to *true*, you should also set the _bastion_package_update_ to *true*.
+_bastion_package_upgrade_ will upgrade the bastion compute instance on first boot. 
 
 ****
 N.B. It is good and recommended practice to upgrade your bastion host to the latest packages to minimize the possibility of vulnerabilities. However, it will also take slightly longer before the bastion host is available.
@@ -121,7 +118,7 @@ N.B. It is good and recommended practice to upgrade your bastion host to the lat
 === Using the bastion host
 
 ****
-*Assumption: you have set the create_bastion parameter to true in terraform.tfvars*
+*Assumption: you have set the bastion_enabled parameter to true in terraform.tfvars*
 ****
 
 Once the terraform apply is successful you will get the bastion_public_ip as output and also a ssh command .You can also run the below command to get the output:
@@ -136,21 +133,51 @@ A utility script is also generated that contains the command to ssh to the basti
 scripts/tesseract.sh
 ----
 
-==== Enabling instance_principal on the bastion host
+=== Adding the admin host
+
+The admin host is used to minimize local dependencies such as oci-cli, kubectl and so on. 
+
+If you want to use the admin host, set the parameter *admin_enabled* to *true* in terraform.tfvars. Refer to {uri-terraform-options}#admin-host[Admin Host] for other available bastion related parameters.
+
+==== admin_package_upgrade
+
+There is 1 additional parameter for the admin:
+
+* admin_package_upgrade
+
+_admin_package_upgrade_ will upgrade the admin compute packages on first boot. 
+
+****
+N.B. It is good and recommended practice to upgrade your package host to the latest packages to minimize the possibility of vulnerabilities. However, it will also take slightly longer before the package host is available.
+****
+
+=== Using the admin host
+
+****
+*Assumption: you have set the admin_enabled parameter to true in terraform.tfvars*
+****
+
+Once the terraform apply is successful you will get the admin_private_ip as output and also a ssh command .You can also run the below command to get the output:
+
+----
+terraform output
+----
+
+==== Enabling instance_principal on the admin host
 {uri-oci-instance-principal}[instance_principal] is an IAM service feature that enables instances to be authorized actors (or principals) to perform actions on service resources. Each compute instance has its own identity, and it authenticates using the certificates that are added to it. These certificates are automatically created, assigned to instances and rotated, preventing the need for you to distribute credentials to your hosts and rotate them.
 
 Any user who has access to the instance (who can SSH to the instance), automatically inherits the privileges granted to the instance. Before you enable this feature, ensure that you know who can access it, and that they should be authorized with the permissions you are granting to the instance.
 
-By default, this feature is *_disabled_*. However, it is *_required_* at the time of cluster creation *_if_* you wish to enable link:#kms-integration[KMS Integration].
+By default, this feature is *_disabled_*. However, it is *_required_* at the time of cluster creation *_if_* you wish to enable link:#kms-integration[KMS Integration], calico, metricserver, helm or creating the OCIR secret.
 
-When you enable this feature, by default, the bastion has privileges to all resources in the compartment. If you are enabling it for link:#kms-integration[KMS Integration], the bastion host will also have rights to create policies in the root tenancy. 
+When you enable this feature, by default, the admin host will have privileges to all resources in the compartment. If you are enabling it for link:#kms-integration[KMS Integration], the admin host will also have rights to create policies in the root tenancy. 
 
-You can also turn on and off the feature at any time without impact on the bastion or the cluster.
+You can also turn on and off the feature at any time without impact on the admin or the cluster.
 
-To enable, set enable_instance_principal to true:
+To enable, set admin_instance_principal to true:
 
 ----
-enable_instance_principal = "true"
+admin_instance_principal = "true"
 ----
 
 and verify:
@@ -159,13 +186,13 @@ and verify:
 oci network vcn list --compartment-id <compartment-id>
 ----
 
-==== Disabling instance_principal on the bastion host
+==== Disabling instance_principal on the admin host
 
-. Set enable_instance_principal to false in terraform.tfvars
+. Set admin_instance_principal to false in terraform.tfvars
 
 +
 ----
-enable_instance_principal = false
+admin_instance_principal = false
 ----
 
 . Run terraform apply again:
@@ -177,8 +204,8 @@ terraform apply
 
 ==== Recommendations for using instance_principal
 
-. Do not enable instance_principal if you are not using link:#kms-integration[KMS Integration]
-. Enable instance_principal *_if and only if_* you are using link:#kms-integration[KMS Integration]
+. Do not enable instance_principal if you are not using link:#kms-integration[KMS Integration] or calico
+. Enable instance_principal *_if and only if_* you are using link:#kms-integration[KMS Integration], calico, metricserver, helm or creating the OCIR secret.
 . Disable instance_principal once the cluster is created
 
 === Interacting with the OKE Cluster locally

docs/quickstart.adoc

@@ -64,7 +64,7 @@ cp terraform.tfvars.example terraform.tfvars
 * ssh_public_key_path
 * vcn_dns_label
 * vcn_name
-* create_bastion
+* bastion_enabled
 * cluster_name
 * worker_mode