-
Notifications
You must be signed in to change notification settings - Fork 56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adding support for installing Kubernetes 1.8.4 #311
Conversation
cluster/Vagrantfile
Outdated
@@ -32,6 +32,7 @@ k8s_ver = ENV['CONTIV_K8S_VERSION'] || DEFAULT_K8S_VERSION | |||
orc_path = case k8s_ver | |||
when /^v1\.[45]\./ then 'k8s1.4/' | |||
when /^v1\.[67]\./ then 'k8s1.6/' | |||
when /^v1\.[89]\./ then 'k8s1.8/' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would probably just have this match 1.8 for now... otherwise people might try 1.9 (and we'll allow them to!) before we've verified that 1.9 actually works 😉
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point :)
cluster/Vagrantfile
Outdated
@@ -4,7 +4,7 @@ require 'rubygems' | |||
require 'fileutils' | |||
require 'yaml' | |||
|
|||
DEFAULT_K8S_VERSION = 'v1.6.5'.freeze | |||
DEFAULT_K8S_VERSION = 'v1.8.2'.freeze |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why 1.8.2 instead of 1.8.4 (latest)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will test with 1.8.4
Turn off swap for k8x 1.8
install/k8s/k8s1.8/aci_gw.yaml
Outdated
@@ -0,0 +1,61 @@ | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need a new copy of the yaml files if they are an exact copy of 1.6 folder?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While it's true that the files in install/k8s/k8s1.6 and k8s1.8 are the same, the files in cluster/k8s/k8s1.6 and k8s1.8 are not the same, so it seems weird to me to in one case point to 1.6 files for 1.8, and in another case, point to 1.8 files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There maybe additional change for 1.8 testing. I think it is cleaner to have a separated folder for 1.8.
install/k8s/install.sh
Outdated
@@ -17,8 +17,10 @@ fi | |||
k8sversion=$($kubectl version --short | grep "Server Version") | |||
if [[ "$k8sversion" == *"v1.4"* ]] || [[ "$k8sversion" == *"v1.5"* ]]; then | |||
k8sfolder="k8s1.4" | |||
else | |||
elif [[ "$k8sversion" == *"v1.6"* ]] || [[ "$k8sversion" == *"v1.7"* ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we use the same folder for 1.8 as well, if required rename it to 1.8?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While it's true that the files in install/k8s/k8s1.6 and k8s1.8 are the same, the files in cluster/k8s/k8s1.6 and k8s1.8 are not the same, so it seems weird to me to in one case point to 1.6 files for 1.8, and in another case, point to 1.8 files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it make sense to rename install/k8s/k8s1.6 to install/k8s/rbac and install/k8s/k8s1.4 to install/k8s/pre-rbac? The primary difference between the two versions is that RBAC was added post 1.4. Cluster scripts install a specific version and are more version specific rather that being related to a featureset like the yaml files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's an interesting idea, but I'm envisioning what that would look like with the next big feature set. In the future, we'd add another feature, create a new directory, but it won't be obvious that rbac is included with the new feature. It won't be obvious that it is cumulative, in other words. Would it be better to make the k8s1.8 directory a sim link to k8s1.6?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Talked with Neelima. Here is the plan: we'll leave the k8s1.4 directory intact, as it will go away soonish. The k8s1.6 directory will be renamed rbac, and 1.6, 1.7 and 1.8 will use this directory.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thanks for making the changes.
Fixes-Jira: CNTV-100