Merge pull request #326 from kubenow/k8s-1.9.2

Upgraded flannel, kubeadm version and StorageClass settings
kubenow · Feb 3, 2018 · 6ded0e7 · 6ded0e7
2 parents bb3f76b + 31e6b8b
commit 6ded0e7
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ ENV SHADE_VERSION=1.21.0
 ENV OPENSTACKCLIENT_VERSION=3.11.0
 ENV GLANCECLIENT_VERSION=2.8.0
 ENV AWSCLI_VERSION=1.11.177
-ENV AZURE_CLI_VERSION=2.0.18
+ENV AZURE_CLI_VERSION=2.0.25
 ENV GOOGLE_CLOUD_SDK_VERSION=179.0.0-0
 # Terraform plugin versions
 ENV PLUGIN_OPENSTACK=0.2.2

diff --git a/bootstrap/master.sh b/bootstrap/master.sh
@@ -31,10 +31,10 @@ echo "Inititializing the master...."
 
 if [ -n "$API_ADVERTISE_ADDRESSES" ]; then
   # shellcheck disable=SC2154
-  kubeadm init --token "${kubeadm_token}" --pod-network-cidr=10.244.0.0/16 --kubernetes-version=v1.7.5 --api-advertise-address="$API_ADVERTISE_ADDRESSES"
+  kubeadm init --token "${kubeadm_token}" --pod-network-cidr=10.244.0.0/16 --kubernetes-version=v1.9.2 --api-advertise-address="$API_ADVERTISE_ADDRESSES"
 else
   # shellcheck disable=SC2154
-  kubeadm init --token "${kubeadm_token}" --pod-network-cidr=10.244.0.0/16 --kubernetes-version=v1.7.5
+  kubeadm init --token "${kubeadm_token}" --pod-network-cidr=10.244.0.0/16 --kubernetes-version=v1.9.2
 fi
 
 # Copy Kubernetes configuration created by kubeadm (admin.conf to .kube/config)

diff --git a/bootstrap/node.sh b/bootstrap/node.sh
@@ -29,4 +29,4 @@ modprobe dm_thin_pool
 
 echo "Try to join master..."
 # shellcheck disable=SC2154
-kubeadm join --token "${kubeadm_token}" "${master_ip}:6443"
+kubeadm join --discovery-token-unsafe-skip-ca-verification --token "${kubeadm_token}" "${master_ip}:6443"
diff --git a/playbooks/roles/flannel-network/tasks/main.yml b/playbooks/roles/flannel-network/tasks/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: "install flannel-network"
-  command: kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/v0.9.0/Documentation/kube-flannel.yml
+  command: kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/v0.9.1/Documentation/kube-flannel.yml
diff --git a/playbooks/roles/heketi-gluster/tasks/storage-creation.yml b/playbooks/roles/heketi-gluster/tasks/storage-creation.yml
@@ -71,3 +71,13 @@
   command: >
     kubectl apply -f
     $HOME/.kubernetes-yaml/heketi/storage-class.yml
+
+- name: render object-store storage-class
+  template:
+    src: object-store-sc.yml
+    dest: "~/.kubernetes-yaml/heketi/object-store-sc.yml"
+
+- name: create storage-class
+  command: >
+    kubectl apply -f
+    $HOME/.kubernetes-yaml/heketi/object-store-sc.yml
diff --git a/playbooks/roles/heketi-gluster/templates/object-store-sc.yml b/playbooks/roles/heketi-gluster/templates/object-store-sc.yml
@@ -0,0 +1,16 @@
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: object-store-sc
+  namespace: storage-heketi
+  annotations:
+    storageclass.kubernetes.io/is-default-class: "false"
+provisioner: kubernetes.io/glusterfs
+parameters:
+  resturl: "http://{{ heketi_endpoint }}"
+  volumetype: {{volumetype}}
+  volumeoptions: "stat-prefetch off, quick-read off, read-ahead off, io-cache off, remote-dio on, quorum-type auto, server-quorum-type server"
+mountOptions:
+  - entry-timeout=0
+  - attribute-timeout=0
diff --git a/playbooks/roles/heketi-gluster/templates/storage-class.yml b/playbooks/roles/heketi-gluster/templates/storage-class.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: gluster-heketi

diff --git a/templates/terraform.tfvars.aws-template b/templates/terraform.tfvars.aws-template
@@ -4,7 +4,7 @@ cluster_prefix = "your-cluster-prefix" # Your cluster prefix
 kubeadm_token = "your-kubeadm-token" # Autogenerated kubeadm token (don't change it)
 aws_region = "eu-west-1" # Some region
 availability_zone = "eu-west-1a" # Some availability zone
-boot_image = "kubenow-v040"
+boot_image = "kubenow-v050b1"
 
 # Credentials
 aws_access_key_id = "your-acces-key-id"

diff --git a/templates/terraform.tfvars.azure-template b/templates/terraform.tfvars.azure-template
@@ -3,7 +3,7 @@ provider = "azure" # cloud provider for this config(don't change it)
 cluster_prefix = "your-cluster-prefix" # Your cluster prefix
 kubeadm_token = "your-kubeadm-token" # Autogenerated kubeadm token (don't change it)
 location = "West Europe"  # Some location
-boot_image = "kubenow-v040"
+boot_image = "kubenow-v050b1"
 
 # Credentials
 subscription_id = "your-subscription_id"

diff --git a/templates/terraform.tfvars.gce-template b/templates/terraform.tfvars.gce-template
@@ -2,7 +2,7 @@
 provider = "gce" # cloud provider for this config(don't change it)
 cluster_prefix = "your-cluster-prefix" # Your cluster prefix
 kubeadm_token = "your-kubeadm-token" # Autogenerated kubeadm token (don't change it)
-boot_image = "kubenow-v040"
+boot_image = "kubenow-v050b1"
 
 # Google credetials
 gce_project = "your_project_id" # Google project id

diff --git a/templates/terraform.tfvars.openstack-template b/templates/terraform.tfvars.openstack-template
@@ -4,7 +4,7 @@ cluster_prefix = "your-cluster-prefix" # Your cluster prefix
 kubeadm_token = "your-kubeadm-token" # Autogenerated kubeadm token (don't change it)
 floating_ip_pool = "your-pool-name"
 external_network_uuid = "external-net-uuid" # The uuid of the external network in the OpenStack tenancy
-boot_image = "kubenow-v040"
+boot_image = "kubenow-v050b1"
 
 # Master configuration
 # obs: too small flavors might cause diffuse errors on your installation