Merge pull request #49 from ibm-cloud-architecture/ocp46

Ocp46 - major merge from azure repo

.gitignore

@@ -9,6 +9,8 @@
 *.tfvars
 openshift_pull_secret.json
 .terraform.lock.hcl
+*.pem
+installer-files/**
 
 # OS X files
 .DS_Store

README.md

@@ -30,17 +30,6 @@ This project uses mainly Terraform as infrastructure management and installation
    git --version
    ```
 
-3. Install OpenShift command line `oc` cli:
-
-   ```bash
-   wget https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux-4.x.xx.tar.gz
-   tar -xvf openshift-client-linux-4.x.xx.tar.gz
-   chmod u+x oc kubectl
-   sudo mv oc /usr/local/bin
-   sudo mv kubectl /usr/local/bin
-   oc version
-   ```
-
 4. Install wget command:
 
     - MacOS:
@@ -54,8 +43,6 @@ This project uses mainly Terraform as infrastructure management and installation
       zypper install wget
       ```
 
-5. Install jq: see [https://stedolan.github.io/jq/download/](https://stedolan.github.io/jq/download/)
-
 6. Get the Terraform code
 
    ```bash
@@ -123,37 +110,33 @@ This project installs the OpenShift 4 in several stages where each stage automat
 cluster_name = "ocp4"
 base_domain = "example.com"
 openshift_pull_secret = "./openshift_pull_secret.json"
-openshift_installer_url = "https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.6.28"
+openshift_version = "4.6.28"
 
-aws_access_key_id = "AAAA"
-aws_secret_access_key = "AbcDefGhiJkl"
-aws_ami = "ami-06f85a7940faa3217"
 aws_extra_tags = {
   "owner" = "admin"
   }
-aws_azs = [
-  "us-east-1a",
-  "us-east-1b",
-  "us-east-1c"
-  ]
 aws_region = "us-east-1"
 aws_publish_strategy = "External"
 ```
 
 |name | required  | description and value        |
 |----------------|------------|--------------|
-| `cluster_name`     | yes  | The name of the OpenShift cluster you will install     |
-| `base_domain` | yes | The domain that has been created in Route53 public hosted zone |
+| `cluster_name` | yes  | The name of the OpenShift cluster you will install     |
+| `base_domain`  | yes | The domain that has been created in Route53 public hosted zone |
 | `openshift_pull_secret` | no | The value refers to a file name that contain downloaded pull secret from https://cloud.redhat.com/openshift/pull-secret; the default name is `openshift_pull_secret.json` |
-| `openshift_installer_url` | no | The URL to the download site for Red Hat OpenShift installation and client codes.  |
+| `openshift_version` | yes | The openshift version to be installed.  |
 | `aws_region`   | yes  | AWS region that the VPC will be created in.  By default, uses `us-east-2`.  Note that for an HA installation, the AWS selected region should have at least 3 availability zones. |
 | `aws_extra_tags`  | no  | AWS tag to identify a resource for example owner:myname     |
-| `aws_ami` | yes | Red Hat CoreOS ami for your region (see [here](https://docs.openshift.com/container-platform/4.6/installing/installing_aws/installing-aws-user-infra.html#installation-aws-user-infra-rhcos-ami_installing-aws-user-infra)). Other platforms images information can be found [here](https://github.com/openshift/installer/blob/master/data/data/rhcos.json) |
-| `aws_secret_access_key` | yes | adding aws_secret_access_key to the cluster |
-| `aws_access_key_id` | yes | adding aws_access_key_id to the cluster |
-| `aws_azs` | yes | list of availability zones to deploy VMs |
+| `aws_azs` | no | list of availability zones to deploy VMs - default to the [`a`, `b`, `c`] |
+| `openshift_byo_dns` | no | whether to ignore DNS resources (you still need a public zone defined) |
+| `openshift_ssh_key` | no | whether to use a specific public key  |
+| `openshift_additional_trust_bundle` | no | additional trust bundle for accessing resources - ie proxy or repo | 
 | `aws_publish_strategy` | no | Whether to publish the API endpoint externally - Default: "External" |
 | `airgapped` | no | A map with enabled (true/false) and repository name - This must be used with `aws_publish_strategy` of `Internal` |
+| `proxy_config` | no | To be implemented  |
+| `use_ipv4` | no | To be implemented  |
+| `use_ipv6` | no | To be implemented  |
+
 
 
 See [Terraform documentation](https://www.terraform.io/intro/getting-started/variables.html) for the format of this file.

config.tf

@@ -43,7 +43,56 @@ variable "openshift_pull_secret" {
   description = "File containing pull secret - get it from https://cloud.redhat.com/openshift/install/pull-secret"
 }
 
-variable "openshift_installer_url" {
-  type = string
-  description = "URL of the appropriate OpenShift installer under https://mirror.openshift.com/pub/openshift-v4/clients/ocp/"
+variable "use_ipv4" {
+  type    = bool
+  default = true
+  description = "not implemented"
+}
+
+variable "use_ipv6" {
+  type    = bool
+  default = false
+  description = "not implemented"
+}
+
+variable "openshift_version" {
+  type    = string
+  default = "4.6.28"
+}
+
+variable "airgapped" {
+  type = map(string)
+  default = {
+    enabled  = false
+    repository = ""
+  }
+}
+
+variable "proxy_config" {
+  type = map(string)
+  description = "Not implemented"
+  default = {
+    enabled    = false
+    httpProxy  = "http://user:password@ip:port"
+    httpsProxy = "http://user:password@ip:port"
+    noProxy    = "ip1,ip2,ip3,.example.com,cidr/mask"
+  }
+}
+
+variable "openshift_additional_trust_bundle" {
+  description = "path to a file with all your additional ca certificates"
+  type        = string
+  default     = ""
+}
+
+variable "openshift_ssh_key" {
+  description = "Path to SSH Public Key file to use for OpenShift Installation"
+  type        = string
+  default     = ""
+}
+
+variable "openshift_byo_dns" {
+  description = "Do not deploy any public or private DNS zone into Azure"
+  type        = bool
+  default     = false
 }

helper.tf

@@ -0,0 +1,12 @@
+locals {
+  major_version   = join(".", slice(split(".", var.openshift_version), 0, 2))
+  aws_azs         = (var.aws_azs != null) ? var.aws_azs : tolist([join("",[var.aws_region,"a"]),join("",[var.aws_region,"b"]),join("",[var.aws_region,"c"])])
+  rhcos_image     = lookup(lookup(lookup(jsondecode(data.http.images.body), "amis"), "${var.aws_region}"),"hvm")
+}
+
+data "http" "images" {
+  url = "https://raw.githubusercontent.com/openshift/installer/release-${local.major_version}/data/data/rhcos.json"
+  request_headers = {
+    Accept = "application/json"
+  }
+}

install/aws_cleanup.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-path=$(dirname $0)
-clusterId=$(cat $path/infraID)
+path=$(dirname $0) 
+clusterId=$(cat $path/../installer-files/infraID)
 
 if [ -z "$clusterId" ]; then
-  exit 99
+  exit 
 fi
 
 if [ -z "$AWS_ACCESS_KEY_ID" ]; then
@@ -13,6 +13,10 @@ fi
 if [ -z "$AWS_SECRET_ACCESS_KEY" ]; then
   exit 80
 fi
+if [ -z "$AWS_DEFAULT_REGION" ]; then
+  exit 80
+fi
+
 
 echo "0 - Start processing for cluster $clusterId - waiting for masters to be destroyed"
 masters=3
@@ -24,7 +28,6 @@ while [ $masters -gt 0 ]; do
     sleep 10
   fi
 done
-
 workers=$(echo "$nodes" | cut -d$'\t' -f1)
 
 echo "1 - Deleting workers - $workers -"