Merge pull request #23 from oracle/jlamillan/support_OEL

jlamillan/support oel 7.4

Author: jlamillan

README.md

@@ -164,14 +164,14 @@ worker_ssh_ingress = "0.0.0.0/0"
 $ terraform output ssh_private_key > generated/instances_id_rsa
 # Retrieve public IP for etcd nodes
 $ terraform output etcd_public_ips
-# Log in as user ubuntu to the Canonical Ubuntu OS
-$ ssh -i `pwd`/generated/instances_id_rsa ubuntu@ETCD_INSTANCE_IP
+# Log in as user opc to the OEL OS
+$ ssh -i `pwd`/generated/instances_id_rsa opc@ETCD_INSTANCE_IP
 # Retrieve public IP for k8s masters
 $ terraform output master_public_ips
-$ ssh -i `pwd`/generated/instances_id_rsa ubuntu@K8SMASTER_INSTANCE_IP
+$ ssh -i `pwd`/generated/instances_id_rsa opc@K8SMASTER_INSTANCE_IP
 # Retrieve public IP for k8s workers
 $ terraform output worker_public_ips
-$ ssh -i `pwd`/generated/instances_id_rsa ubuntu@K8SWORKER_INSTANCE_IP
+$ ssh -i `pwd`/generated/instances_id_rsa opc@K8SWORKER_INSTANCE_IP
 ```
 
 ### Mandatory Input Variables:
@@ -232,13 +232,13 @@ worker_nodeport_ingress             | 10.0.0.0/16 (VCN only)  | A CIDR notation
 #### Software Versions Installed on OCI Instances
 name                                | default            | description
 ------------------------------------|--------------------|------------
-docker_ver                          | 17.03              | Version of Docker to install
+docker_ver                          | 17.03.1            | Version of Docker to install
 etcd_ver                            | v3.2.2             | Version of etcd to install
 flannel_ver                         | v0.7.1             | Version of Flannel to install
 k8s_ver                             | 1.7.4              | Version of K8s to install (master and workers)
 k8s_dns_ver                         | 1.14.2             | Version of Kube DNS to install
 k8s_dashboard_ver                   | 1.6.3              | Version of Kubernetes dashboard to install
-instance_os_ver                     | 16.04              | Version of Ubuntu operating system
+instance_os_ver                     | 7.4                | Version of OEL operating system
 
 #### Other
 name                                | default                 | description
@@ -353,10 +353,10 @@ See [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 ## Installed on OCI Instances
 
-* Canonical Ubuntu (14.04)
+* Oracle Linux Enterprise (7.4)
 * etcd - (default v3.2.2)
 * flannel - (default v0.7.1)
-* docker - (default 17.03.0-ce)
+* docker - (default 17.03.1.ce)
 * apt-transport-https - (default 1.2.20)
 * kubernetes - (default v1.7.4)
   * master(s) (`kube-apiserver`, `kube-controller-manager`, `kube-scheduler`, `kubernetes-cni`, `kubectl`)

instances/etcd/cloud_init/bootstrap.template.sh

@@ -1,16 +1,23 @@
 #!/bin/bash -x
 
-# Set working dir
-cd /home/ubuntu
+# Turn off SELinux
+setenforce 0
 
-# Install Docker dependencies
-until apt-get install -y aufs-tools cgroupfs-mount libltdl7; do sleep 1 && echo -n "."; done
+# Set working dir
+cd /home/opc
 
-# Download Docker
-curl -L --retry 3 https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/${docker_ver}.deb -o /tmp/${docker_ver}.deb
+# enable ol7 addons
+yum-config-manager --disable ol7_UEKR3
+yum-config-manager --enable ol7_addons ol7_latest ol7_UEKR4 ol7_optional ol7_optional_latest
 
 # Install Docker
-until dpkg -i /tmp/${docker_ver}.deb; do sleep 1 && echo -n "."; done
+until yum -y install docker-engine-${docker_ver}; do sleep 1 && echo -n "."; done
+
+# Start Docker
+systemctl daemon-reload
+systemctl restart docker
+
+docker info
 
 ###################
 # Drop firewall rules
@@ -19,7 +26,7 @@ iptables -F
 ###################
 # etcd
 
-# Get IP Adress of self
+# Get IP Address of self
 IP_LOCAL=$(ip route show to 0.0.0.0/0 | awk '{ print $5 }' | xargs ip addr show | grep -Po 'inet \K[\d.]+')
 SUBNET=$(getent hosts $IP_LOCAL | awk '{print $2}' | cut -d. -f2)
 
@@ -28,7 +35,7 @@ FQDN_HOSTNAME="$(getent hosts $IP_LOCAL | awk '{print $2}')"
 
 docker run -d \
 	-p 2380:2380 -p 2379:2379 \
-	-v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt \
+	-v /etc/ssl/certs/ca-bundle.crt:/etc/ssl/certs/ca-bundle.crt \
 	--net=host \
 	quay.io/coreos/etcd:${etcd_ver} \
 	/usr/local/bin/etcd \
@@ -38,11 +45,11 @@ docker run -d \
 	-listen-peer-urls http://0.0.0.0:2380 \
 	-discovery ${etcd_discovery_url}
 
-# download etcdctl client  etcd_ver
+# Download etcdctl client etcd_ver
 curl -L --retry 3 https://github.com/coreos/etcd/releases/download/${etcd_ver}/etcd-${etcd_ver}-linux-amd64.tar.gz -o /tmp/etcd-${etcd_ver}-linux-amd64.tar.gz
 tar zxf /tmp/etcd-${etcd_ver}-linux-amd64.tar.gz -C /tmp/ && cp /tmp/etcd-${etcd_ver}-linux-amd64/etcd* /usr/local/bin/
 
-# Generate a flannel configuration that we will store into etcd using curl.
+# Generate a flannel configuration JSON that we will store into etcd using curl.
 cat >/tmp/flannel-network.json <<EOF
 {
   "Network": "${flannel_network_cidr}",
@@ -62,7 +69,3 @@ done
 
 # put the flannel config in etcd
 curl -sf -L http://$FQDN_HOSTNAME:2379/v2/keys/flannel/network/config -X PUT --data-urlencode value@/tmp/flannel-network.json
-
-# make sure ubuntu owns home dir
-chown ubuntu:ubuntu /home/ubuntu
-

instances/etcd/datasources.tf

@@ -1,7 +1,7 @@
-# Cloud call to get the OCID of the OS image to use
+# Gets the OCID of the OS image to use
 data "oci_core_images" "ImageOCID" {
   compartment_id           = "${var.compartment_ocid}"
-  operating_system         = "Canonical Ubuntu"
+  operating_system         = "Oracle Linux"
   operating_system_version = "${var.instance_os_ver}"
 }
 

instances/etcd/main.tf

@@ -12,10 +12,11 @@ resource "oci_core_instance" "TFInstanceEtcd" {
   shape               = "${var.shape}"
   subnet_id           = "${var.subnet_id}"
 
-  metadata {
+  extended_metadata {
     roles               = "etcd"
     ssh_authorized_keys = "${var.ssh_public_key_openssh}"
     user_data           = "${base64encode(data.template_file.etcd-bootstrap.rendered)}"
+    tags = "group:etcd"
   }
 
   timeouts {

instances/etcd/variables.tf

@@ -10,17 +10,16 @@ variable "shape" {
 variable "subnet_id" {}
 variable "ssh_public_key_openssh" {}
 variable "domain_name" {}
-
 variable "label_prefix" {
   default = ""
 }
 
 variable "docker_ver" {
-  default = "docker-ce_17.03.0~ce-0~ubuntu-xenial_amd64"
+  default = "17.03.1.ce"
 }
 
 variable "instance_os_ver" {
-  default = "16.04"
+  default = "7.4"
 }
 
 variable "etcd_ver" {

instances/k8smaster/cloud_init/bootstrap.template.yaml

@@ -1,13 +1,17 @@
 #cloud-config
 
+bootcmd:
+  # Turn off SELinux
+  - setenforce 0
+
 write_files:
 # setup script
-  - path: "/tmp/setup.preflight.sh"
+  - path: "/root/setup.preflight.sh"
     permissions: "0777"
     encoding: b64
     content: |
       ${setup_preflight_sh_content}
-  - path: "/tmp/setup.sh"
+  - path: "/root/setup.sh"
     permissions: "0777"
     encoding: b64
     content: |
@@ -23,7 +27,7 @@ write_files:
     encoding: b64
     content: |
       ${kube_controller_manager_template_content}
-  - path: "/etc/kubernetes/manifests/kube-dns.yaml"
+  - path: "/root/services/kube-dns.yaml"
     permissions: "0755"
     encoding: b64
     content: |
@@ -38,38 +42,39 @@ write_files:
     encoding: b64
     content: |
       ${kube_scheduler_template_content}
-  - path: "/etc/kubernetes/manifests/kubernetes-dashboard.yaml"
+  - path: "/root/services/kubernetes-dashboard.yaml"
     permissions: "0755"
     encoding: b64
     content: |
       ${kube_dashboard_template_content}
+  - path: "/root/services/docker.service"
   - path: "/etc/kubernetes/manifests/kube-rbac-role-binding.yaml"
     permissions: "0755"
     encoding: b64
     content: |
       ${kube_rbac_content}
-  - path: "/home/ubuntu/services/docker.service"
+  - path: "/root/services/docker.service"
     permissions: "0600"
     encoding: b64
     content: |
       ${docker_service_content}
-  - path: "/home/ubuntu/services/flannel.service"
+  - path: "/root/services/flannel.service"
     permissions: "0600"
     encoding: b64
     content: |
       ${flannel_service_content}
-  - path: "/home/ubuntu/services/cni-bridge.service"
+  - path: "/root/services/cni-bridge.service"
     permissions: "0600"
     encoding: b64
     content: |
       ${cnibridge_service_content}
-  - path: "/home/ubuntu/services/cni-bridge.sh"
+  - path: "/root/services/cni-bridge.sh"
     permissions: "0600"
     encoding: b64
     content: |
       ${cnibridge_sh_content}
 # systemd services
-  - path: "/home/ubuntu/services/kubelet.service"
+  - path: "/root/services/kubelet.service"
     permissions: "0600"
     encoding: b64
     content: |
@@ -99,5 +104,5 @@ write_files:
 
 runcmd:
  - echo "Running k8s init..."
- - /tmp/setup.preflight.sh
+ - /root/setup.preflight.sh
  - echo "Finished k8s init."

instances/k8smaster/datasources.tf

@@ -1,7 +1,7 @@
 # Gets the OCID of the OS image to use
 data "oci_core_images" "ImageOCID" {
   compartment_id           = "${var.compartment_ocid}"
-  operating_system         = "Canonical Ubuntu"
+  operating_system         = "Oracle Linux"
   operating_system_version = "${var.instance_os_ver}"
 }
 

instances/k8smaster/main.tf

@@ -12,12 +12,14 @@ resource "oci_core_instance" "TFInstanceK8sMaster" {
   shape               = "${var.shape}"
   subnet_id           = "${var.subnet_id}"
 
-  metadata {
+  extended_metadata {
     roles               = "masters"
     ssh_authorized_keys = "${var.ssh_public_key_openssh}"
     user_data           = "${data.template_cloudinit_config.master.rendered}"
+    tags = "group:k8s-master"
   }
 
+
   timeouts {
     create = "60m"
   }

instances/k8smaster/scripts/docker.service

@@ -1,8 +1,8 @@
 [Unit]
 Description=Docker Application Container Engine
 Documentation=https://docs.docker.com
-After=network.target docker.socket firewalld.service cni-bridge.service
-Requires=docker.socket cni-bridge.service
+After=network.target firewalld.service cni-bridge.service
+Requires=cni-bridge.service
 
 [Service]
 Type=notify
@@ -17,7 +17,6 @@ ExecReload=/bin/kill -s HUP $MAINPID
 LimitNOFILE=1048576
 LimitNPROC=infinity
 LimitCORE=infinity
-TasksMax=infinity
 TimeoutStartSec=0
 Delegate=yes
 KillMode=process

instances/k8smaster/scripts/setup.preflight.sh

@@ -4,4 +4,4 @@ EXTERNAL_IP=$(curl -s -m 10 http://whatismyip.akamai.com/)
 
 mkdir -p /etc/kubernetes/auth /etc/kubernetes/manifests/
 
-bash -x /tmp/setup.sh | tee -a /root/setup.log
+bash -x /root/setup.sh | tee -a /root/setup.log