Merge pull request #258 from kinvolk/asymmetric/1.10

Kubernetes 1.10

.circleci/config.yml

@@ -8,19 +8,20 @@ jobs:
       - run:
           name: setup
           environment:
-            K8S_VERSION: v1.9.0
-            MINIKUBE_VERSION: v0.25.2
+            K8S_VERSION: v1.10.0
+            MINIKUBE_VERSION: v0.26.1
             CHANGE_MINIKUBE_NONE_USER: true
           command: |
             curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
             curl -Lo minikube https://github.com/kubernetes/minikube/releases/download/${MINIKUBE_VERSION}/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
             sudo minikube config set WantReportErrorPrompt false
-            sudo -E minikube start --vm-driver=none --kubernetes-version=${K8S_VERSION} --extra-config=apiserver.Authorization.Mode=RBAC
+            # TODO: remove the --bootstrapper flag once this issue is solved: https://github.com/kubernetes/minikube/issues/2704
+            sudo -E minikube start --vm-driver=none --bootstrapper=localkube --kubernetes-version=${K8S_VERSION} --extra-config=apiserver.Authorization.Mode=RBAC
       - run:
           name: code-gen script
           environment:
             CODEGEN_PKG: ../../../../src/k8s.io/code-generator
-            CODEGEN_VERSION: release-1.9
+            CODEGEN_VERSION: kubernetes-1.10.0
             GOPATH: /home/circleci/.go_workspace
           command: |
             mkdir -p $CODEGEN_PKG
@@ -46,7 +47,9 @@ jobs:
           name: print habitat object logs
           command: kubectl logs -lhabitat-operator=true --tail=100
           when: on_fail
-      - run:
-          name: print minikube logs
-          command: minikube logs
-          when: on_fail
+      # NOTE: this relies on journalctl, which is not present on the version of
+      # Ubuntu currently run by CircleCI
+      # - run:
+          # - name: print minikube logs
+          # - command: minikube logs
+          # - when: on_fail

.travis.yml

@@ -8,9 +8,9 @@ go_import_path: github.com/habitat-sh/habitat-operator
 env:
   global:
     - CHANGE_MINIKUBE_NONE_USER=true
-    - K8S_VERSION=v1.9.0
-    - MINIKUBE_VERSION=v0.25.2
-    - CODEGEN_VERSION=release-1.9
+    - K8S_VERSION=v1.10.0
+    - MINIKUBE_VERSION=v0.26.1
+    - CODEGEN_VERSION=kubernetes-1.10.0
 
 # Skip installation of dependencies since they are already in vendor.
 install: true
@@ -27,7 +27,8 @@ before_script:
 # Download minikube.
 - curl -Lo minikube https://github.com/kubernetes/minikube/releases/download/${MINIKUBE_VERSION}/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
 - sudo minikube config set WantReportErrorPrompt false
-- sudo minikube start --vm-driver=none --kubernetes-version=${K8S_VERSION} --extra-config=apiserver.Authorization.Mode=RBAC
+# TODO: remove the --bootstrapper flag once this issue is solved: https://github.com/kubernetes/minikube/issues/2704
+- sudo minikube start --vm-driver=none --bootstrapper=localkube --kubernetes-version=${K8S_VERSION} --extra-config=apiserver.Authorization.Mode=RBAC
 # Fix the kubectl context, as it's often stale.
 - minikube update-context
 # Clone the code generator repo

Gopkg.toml

@@ -27,16 +27,16 @@
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "v6.0.0"
+  version = "v7.0.0"
 
 [[constraint]]
   name = "k8s.io/api"
-  version = "kubernetes-1.9.0"
+  version = "kubernetes-1.10.0"
 
 [[constraint]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.9.0"
+  version = "kubernetes-1.10.0"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.9.0"
+  version = "kubernetes-1.10.0"

README.md

@@ -16,7 +16,8 @@ For a more detailed description of the Habitat type have a look [here](https://g
 ## Prerequisites
 
 - Habitat `>= 0.52.0`
-- Kubernetes cluster with version `1.7.x`, `1.8.x` or `1.9.x`.
+- Kubernetes cluster with version `1.8.x`, `1.9.x` or `1.10.x`
+- Kubectl version `1.9.x` or `1.10.x`
 
 ## Installing
 

hack/boilerplate.go.txt

@@ -12,5 +12,3 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// This file was automatically generated, DO NOT EDIT.
-

hack/update-codegen.sh

@@ -20,9 +20,9 @@
 # First of all, the code-generator needs to be fetched:
 # $ go get -u k8s.io/code-generator
 #
-# Now checkout the appropriate branch for the Kubernetes version that
+# Now checkout the appropriate tag for the Kubernetes version that
 # you're building for. For example if you're building for Kubernetes
-# 1.10.0 you would checkout the `release-1.10` branch.
+# 1.10.0 you would checkout the `kubernetes-1.10.0` tag.
 #
 # Then run this from the repo's root with:
 # $ CODEGEN_PKG=../../../k8s.io/code-generator hack/update-codegen.sh