Merge pull request #654 from akutz/feature/capi-0.2.7

Cluster API 0.2.7
kubernetes-sigs · Nov 1, 2019 · 6e00cf7 · 6e00cf7
2 parents 2d56142 + 2389e7d
commit 6e00cf7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/examples/generate.sh b/examples/generate.sh
@@ -31,7 +31,7 @@ CLUSTER_NAME="${CLUSTER_NAME:-capv-mgmt-example}"
 ENV_VAR_REQ=':?required'
 
 CABPK_MANAGER_IMAGE="${CABPK_MANAGER_IMAGE:-us.gcr.io/k8s-artifacts-prod/capi-kubeadm/cluster-api-kubeadm-controller:v0.1.5}"
-CAPI_MANAGER_IMAGE="${CAPI_MANAGER_IMAGE:-us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.2.6}"
+CAPI_MANAGER_IMAGE="${CAPI_MANAGER_IMAGE:-us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.2.7}"
 CAPV_MANAGER_IMAGE="${CAPV_MANAGER_IMAGE:-gcr.io/cluster-api-provider-vsphere/release/manager:latest}"
 K8S_IMAGE_REPOSITORY="${K8S_IMAGE_REPOSITORY:-k8s.gcr.io}"
 
@@ -327,7 +327,7 @@ kustomize build "${SRC_DIR}/machinedeployment" | envsubst >"${MACHINEDEPLOYMENT_
 echo "Generated ${MACHINEDEPLOYMENT_GENERATED_FILE}"
 
 # Generate Cluster API provider components file.
-kustomize build "github.com/kubernetes-sigs/cluster-api/config/default/?ref=v0.2.6" >"${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
+kustomize build "github.com/kubernetes-sigs/cluster-api/config/default/?ref=v0.2.7" >"${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
 echo "Generated ${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
 
 # Generate Kubeadm Bootstrap Provider components file.

diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
 	k8s.io/cluster-bootstrap v0.0.0-20190516232516-d7d78ab2cfe7
 	k8s.io/klog v0.4.0
-	sigs.k8s.io/cluster-api v0.2.6
+	sigs.k8s.io/cluster-api v0.2.7
 	sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm v0.1.5
 	sigs.k8s.io/controller-runtime v0.3.0
 )
diff --git a/go.sum b/go.sum
@@ -349,8 +349,8 @@ modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03
 modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
 sigs.k8s.io/cluster-api v0.2.5/go.mod h1:Agc72Ra5LMOkQQ2v/Ywv1KUemaYAwvkQ+G59Ym5H8e4=
-sigs.k8s.io/cluster-api v0.2.6 h1:XG6qhUOirRiYs3BSGyijb+G/LmtK6uajVZyRieG2F3w=
-sigs.k8s.io/cluster-api v0.2.6/go.mod h1:Agc72Ra5LMOkQQ2v/Ywv1KUemaYAwvkQ+G59Ym5H8e4=
+sigs.k8s.io/cluster-api v0.2.7 h1:WjhtuvyjnMgo62kKlVizhI/nYs4DJxHNf+ZMSk/uUsM=
+sigs.k8s.io/cluster-api v0.2.7/go.mod h1:Agc72Ra5LMOkQQ2v/Ywv1KUemaYAwvkQ+G59Ym5H8e4=
 sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm v0.1.5 h1:NC5z0GfiarpEiOwLp+kgpTiUHG9Hp422YklHDPnzYds=
 sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm v0.1.5/go.mod h1:916zreHrHzA66A3yzL0M0HCW8JeddmJa6Nzjnrfop4U=
 sigs.k8s.io/controller-runtime v0.3.0 h1:ZtdgqJXVHsIytjdmDuk0QjagnzyLq9FjojXRqIp+dU4=

diff --git a/scripts/e2e/e2e.sh b/scripts/e2e/e2e.sh
@@ -154,7 +154,7 @@ fi
 
 VERSION=$(git describe --dirty --always 2>/dev/null)
 export VERSION
-export CAPI_VERSION=v0.2.6
+export CAPI_VERSION=v0.2.7
 echo "build vSphere controller version: ${VERSION}"
 echo "using clusterctl version: ${CAPI_VERSION}"
 

diff --git a/scripts/e2e/generate-e2e-spec.sh b/scripts/e2e/generate-e2e-spec.sh
@@ -35,7 +35,7 @@ docker run --rm \
     -e VSPHERE_NETWORK="sddc-cgw-network-5" \
     -e VSPHERE_RESOURCE_POOL="clusterapi" \
     -e VSPHERE_FOLDER="clusterapi" \
-    -e VSPHERE_TEMPLATE="ubuntu-1804-kube-v1.13.6" \
+    -e VSPHERE_TEMPLATE="ubuntu-1804-kube-v1.14.8" \
     -e SSH_AUTHORIZED_KEY="N/A" \
     "${MANIFESTS_IMAGE}" \
     -c "${CLUSTER_NAME}" \