Merge pull request #50 from cloudify-incubator/update_version_1.9.6

0lvin · web-flow · commit bf75ba8bf252 · 2018-04-24T11:52:05.000+03:00
Update kubernetes 1.9.4-&gt;1.9.6
diff --git a/Makefile b/Makefile
@@ -1,6 +1,12 @@
 .PHONY: all
 all: bin/cfy-go bin/cfy-kubernetes bin/cfy-autoscale
 
+ifdef SystemRoot
+OSTYPE := Windows
+else
+OSTYPE ?= $(shell uname -s)
+endif
+
 AUTOSCALEPACKAGE := k8s.io/autoscaler/cluster-autoscaler/cloudprovider
 KUBERNETESPACKAGE := k8s.io/kubernetes/pkg/cloudprovider/providers/cloudifyprovider
 PACKAGEPATH := github.com/cloudify-incubator/cloudify-rest-go-client
@@ -17,6 +23,7 @@ reformat:
 	gofmt -w src/${PACKAGEPATH}/cloudify/utils/*.go
 	gofmt -w src/${PACKAGEPATH}/cloudify/tests/*.go
 	gofmt -w src/${PACKAGEPATH}/cloudify/*.go
+	gofmt -w src/${PACKAGEPATH}/container/*.go
 	gofmt -w src/${PACKAGEPATH}/cfy-go/*.go
 	gofmt -w src/${PACKAGEPATH}/kubernetes/*.go
 	# kubernetes parts
@@ -58,6 +65,17 @@ pkg/linux_amd64/${PACKAGEPATH}/cloudify/utils.a: ${CLOUDIFYUTILS}
 	$(call colorecho,"Build: ", $@)
 	go build -v -i -o pkg/linux_amd64/${PACKAGEPATH}/cloudify/utils.a ${CLOUDIFYUTILS}
 
+# container
+ifeq ($(OSTYPE),Linux)
+CLOUDIFYCONTAINER := src/${PACKAGEPATH}/container/container_linux.go
+else
+CLOUDIFYCONTAINER := src/${PACKAGEPATH}/container/container_darwin.go
+endif
+
+pkg/linux_amd64/${PACKAGEPATH}/container.a: ${CLOUDIFYCONTAINER}
+	$(call colorecho,"Build: ",$@)
+	go build -v -i -o pkg/linux_amd64/${PACKAGEPATH}/container.a ${CLOUDIFYCONTAINER}
+
 # cloudify
 CLOUDIFYCOMMON := \
 	src/${PACKAGEPATH}/cloudify/scalegroup.go \
@@ -83,6 +101,7 @@ pkg/linux_amd64/${PACKAGEPATH}/cloudify.a: ${CLOUDIFYCOMMON} pkg/linux_amd64/${P
 CFYGOLIBS := \
 	pkg/linux_amd64/${PACKAGEPATH}/cloudify/utils.a \
 	pkg/linux_amd64/${PACKAGEPATH}/kubernetes.a \
+	pkg/linux_amd64/${PACKAGEPATH}/container.a \
 	pkg/linux_amd64/${PACKAGEPATH}/cloudify.a
 
 # cfy-go
@@ -98,6 +117,7 @@ CFYGO := \
 	src/${PACKAGEPATH}/cfy-go/nodes.go \
 	src/${PACKAGEPATH}/cfy-go/plugins.go \
 	src/${PACKAGEPATH}/cfy-go/scaling.go \
+	src/${PACKAGEPATH}/cfy-go/container.go \
 	src/${PACKAGEPATH}/cfy-go/tenants.go
 
 bin/cfy-go: ${CFYGO} ${CFYGOLIBS}
diff --git a/examples/cluster_blueprint/README.md b/examples/cluster_blueprint/README.md
@@ -8,8 +8,8 @@ This blueprint creates an example Kubernetes cluster. It is intended as an examp
 Regardless of your infrastructure choice, this blueprint installs and configures on each VM:
 - The Kubernetes Yum repo will be installed on your VMs.
 - Docker, version 1.12.6-28.git1398f24.el7.centos
-- kubelet, version 1.9.4-0.
-- kubeadm, version 1.9.4-0.
+- kubelet, version 1.9.6-0.
+- kubeadm, version 1.9.6-0.
 - kubernetes-cni, version 0.6.0-0.
 - weave
 
diff --git a/examples/cluster_blueprint/aws-blueprint.yaml b/examples/cluster_blueprint/aws-blueprint.yaml
@@ -7,7 +7,7 @@ imports:
   - http://www.getcloudify.org/spec/cloudify/4.3/types.yaml
   - plugin:cloudify-diamond-plugin?version=1.3.8
   - plugin:cloudify-fabric-plugin?version=1.5.1
-  - plugin:cloudify-utilities-plugin?version=1.5.0.1
+  - plugin:cloudify-utilities-plugin?version=1.5.2
   - imports/kubernetes.yaml
   - https://github.com/cloudify-cosmo/cloudify-aws-plugin/releases/download/1.5.1.2/plugin.yaml
   - imports/cloud-config.yaml
diff --git a/examples/cluster_blueprint/azure-blueprint.yaml b/examples/cluster_blueprint/azure-blueprint.yaml
@@ -7,7 +7,7 @@ description: >
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.3/types.yaml
   - plugin:cloudify-azure-plugin
-  - plugin:cloudify-utilities-plugin?version=1.5.0.1
+  - plugin:cloudify-utilities-plugin?version=1.5.2
   - plugin:cloudify-diamond-plugin
   - plugin:cloudify-fabric-plugin
   - imports/kubernetes.yaml
@@ -85,7 +85,7 @@ node_templates:
                       EOF
                       setenforce 0
                     - |
-                      yum -t -y install docker-1.12.6 kubelet-1.9.4-0 kubeadm-1.9.4-0 kubectl-1.9.4-0 kubernetes-cni-0.6.0-0 ca-certificates
+                      yum -t -y install docker-1.12.6 kubelet-1.9.6-0 kubeadm-1.9.6-0 kubectl-1.9.6-0 kubernetes-cni-0.6.0-0 ca-certificates
                       sudo update-ca-trust force-enable
                       swapon -s | awk '{print "sudo swapoff " $1}' | grep -v "Filename" | sh -
                       sudo sed -i 's|cgroup-driver=systemd|cgroup-driver=systemd --provider-id='`hostname`'|g' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
@@ -126,7 +126,7 @@ node_templates:
                       EOF
                       setenforce 0
                     - |
-                      yum -t -y install docker-1.12.6 kubelet-1.9.4-0 kubeadm-1.9.4-0 kubectl-1.9.4-0 kubernetes-cni-0.6.0-0 ca-certificates
+                      yum -t -y install docker-1.12.6 kubelet-1.9.6-0 kubeadm-1.9.6-0 kubectl-1.9.6-0 kubernetes-cni-0.6.0-0 ca-certificates
                       sudo update-ca-trust force-enable
                       swapon -s | awk '{print "sudo swapoff " $1}' | grep -v "Filename" | sh -
                       sudo sed -i 's|cgroup-driver=systemd|cgroup-driver=systemd --provider-id='`hostname`'|g' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
diff --git a/examples/cluster_blueprint/gcp-blueprint.yaml b/examples/cluster_blueprint/gcp-blueprint.yaml
@@ -8,7 +8,7 @@ imports:
   - http://www.getcloudify.org/spec/cloudify/4.3/types.yaml
   - plugin:cloudify-diamond-plugin?version=1.3.8
   - plugin:cloudify-fabric-plugin?version=1.5.1
-  - plugin:cloudify-utilities-plugin?version=1.5.0.1
+  - plugin:cloudify-utilities-plugin?version=1.5.2
   - plugin:cloudify-gcp-plugin
   - imports/kubernetes.yaml
 
@@ -118,7 +118,7 @@ node_templates:
               chmod 0444 /etc/yum.repos.d/kubernetes.repo
               setenforce 0
             - |
-              yum -t -y install docker-1.12.6 kubelet-1.9.4-0 kubeadm-1.9.4-0 kubectl-1.9.4-0 kubernetes-cni-0.6.0-0 ca-certificates
+              yum -t -y install docker-1.12.6 kubelet-1.9.6-0 kubeadm-1.9.6-0 kubectl-1.9.6-0 kubernetes-cni-0.6.0-0 ca-certificates
               sudo update-ca-trust force-enable
               swapon -s | awk '{print "sudo swapoff " $1}' | grep -v "Filename" | sh -
               sudo sed -i 's|cgroup-driver=systemd|cgroup-driver=systemd --provider-id='`hostname`'|g' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
diff --git a/examples/cluster_blueprint/imports/cloud-config.yaml b/examples/cluster_blueprint/imports/cloud-config.yaml
@@ -31,9 +31,9 @@ node_templates:
         packages:
           - [ca-certificates, 2017.2.14]
           - [docker, 1.12.6]
-          - [kubelet, 1.9.4-0]
-          - [kubeadm, 1.9.4-0]
-          - [kubectl, 1.9.4-0]
+          - [kubelet, 1.9.6-0]
+          - [kubeadm, 1.9.6-0]
+          - [kubectl, 1.9.6-0]
           - [kubernetes-cni, 0.6.0-0]
         runcmd:
           - [ setenforce, 0 ]
diff --git a/examples/cluster_blueprint/openstack-blueprint.yaml b/examples/cluster_blueprint/openstack-blueprint.yaml
@@ -8,7 +8,7 @@ imports:
   - http://www.getcloudify.org/spec/cloudify/4.3/types.yaml
   - plugin:cloudify-diamond-plugin?version=1.3.8
   - plugin:cloudify-fabric-plugin?version=1.5.1
-  - plugin:cloudify-utilities-plugin?version=1.5.0.1
+  - plugin:cloudify-utilities-plugin?version=1.5.2
   - imports/kubernetes.yaml
   - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/2.6.0/plugin.yaml
   - imports/cloud-config.yaml
diff --git a/examples/cluster_blueprint/scripts/vsphere/kubernetes.sh b/examples/cluster_blueprint/scripts/vsphere/kubernetes.sh
@@ -21,7 +21,7 @@ sudo yum makecache
 
 sudo setenforce 0
 
-sudo yum -y install kubelet-1.9.4-0 kubeadm-1.9.4-0 kubectl-1.9.4-0 kubernetes-cni-0.6.0-0 ca-certificates docker-1.12.6
+sudo yum -y install kubelet-1.9.6-0 kubeadm-1.9.6-0 kubectl-1.9.6-0 kubernetes-cni-0.6.0-0 ca-certificates docker-1.12.6
 sudo update-ca-trust force-enable
 
 sudo groupadd docker
diff --git a/examples/cluster_blueprint/vsphere-blueprint.yaml b/examples/cluster_blueprint/vsphere-blueprint.yaml
@@ -7,10 +7,9 @@ imports:
   - http://www.getcloudify.org/spec/cloudify/4.3/types.yaml
   - plugin:cloudify-diamond-plugin?version=1.3.8
   - plugin:cloudify-fabric-plugin?version=1.5.1
-  - plugin:cloudify-utilities-plugin?version=1.5.0
+  - plugin:cloudify-utilities-plugin?version=1.5.2
   - imports/kubernetes.yaml
-
-  - http://www.getcloudify.org/spec/vsphere-plugin/2.3.0/plugin.yaml
+  - http://www.getcloudify.org/spec/vsphere-plugin/2.6.0/plugin.yaml
 
 inputs:
 
diff --git a/src/github.com/cloudify-incubator/cloudify-rest-go-client b/src/github.com/cloudify-incubator/cloudify-rest-go-client
@@ -1 +1 @@
-Subproject commit c1b7736f4418c47fc7ee8f7de86f6097bcc8d8f8
+Subproject commit f3746e0580e32273bc1408b6f610a58b6bff6b93
diff --git a/src/k8s.io/kubernetes b/src/k8s.io/kubernetes
@@ -1 +1 @@
-Subproject commit d77ffba5b1fda5cd3f19d0f88be00b5bc53b144b
+Subproject commit 2753cb8301568083b06ae3a4e9fcde2f977e6f5f
