Merge pull request #26 from Mirantis/ivan4th/k8s-1.12

Add k8s 1.12 support

Author: jellonek

.circleci/config.yml

@@ -84,6 +84,11 @@ jobs:
     environment:
       K8S_VERSION: "1.11"
 
+  deployment-test-1.12:
+    <<: *deployment_test
+    environment:
+      K8S_VERSION: "1.12"
+
 workflows:
   version: 2
   build-test-and-publish:
@@ -118,13 +123,22 @@ workflows:
             only: /^v.*/
           branches:
             only: /.*/
+    - deployment-test-1.12:
+        requires:
+        - build
+        filters:
+          tags:
+            only: /^v.*/
+          branches:
+            only: /.*/
 
     - publish:
         requires:
         - build
         - deployment-test-1.9
         - deployment-test-1.10
         - deployment-test-1.11
+        - deployment-test-1.12
         filters:
           tags:
             only: /v.*/

README.md

@@ -5,7 +5,7 @@ same node and run CRI implementations inside pods. CRI Proxy is
 currently used by [Virtlet](https://github.com/Mirantis/virtlet)
 project but it can be used by other CRI implementations, too.
 
-It supports Kubernetes versions 1.8.x, 1.9.x, 1.10.x and 1.11.x.
+It supports Kubernetes versions 1.9.x through 1.12.x.
 
 ## Installation
 

hack/update.sh

@@ -4,8 +4,8 @@ set -o nounset
 set -o pipefail
 set -o errtrace
 
-TARGET_PKGS=(v1_9 v1_10)
-K8S_TAGS=(v1.9.7 v1.10.2)
+TARGET_PKGS=(v1_9 v1_12)
+K8S_TAGS=(v1.9.11 v1.12.3)
 SUBDIRS=(pkg/kubelet/apis/cri/v1alpha1/runtime pkg/kubelet/apis/cri/runtime/v1alpha2)
 FILES=(api.pb.go api.proto constants.go)
 
@@ -35,5 +35,5 @@ sed -i 's@^\(type StorageIdentifier struct\)@/* +k8s:conversion-gen=false */ \1@
 go fmt pkg/runtimeapis/v1_9/api.pb.go
 
 tar --exclude='vendor' --exclude='.git' -c . |
-    docker run --rm -i ishvedunov/criproxy-build:0.0.4 \
+    docker run --rm -i ishvedunov/criproxy-build:0.0.6 \
            /bin/bash -c 'cd /go/src/github.com/Mirantis/criproxy && tar -x && hack/generate.sh && tar -c $(find . -name "*_generated.go")' | tar -xv

main.go

@@ -43,7 +43,7 @@ var (
 	streamPort    = flag.Int("streamPort", 11250, "streaming port of the default runtime")
 	streamUrl     = flag.String("streamUrl", "", "streaming url of the default runtime (-streamPort is ignored if this value is set)")
 	apiServerHost = flag.String("apiserver", "", "apiserver URL")
-	criVersions   = []proxy.CRIVersion{&proxy.CRI19{}, &proxy.CRI110{}}
+	criVersions   = []proxy.CRIVersion{&proxy.CRI19{}, &proxy.CRI112{}}
 )
 
 // runCriProxy starts CRI proxy