Skip to content

Commit d233b2f

Browse files
authored
Merge pull request #701 from akutz/feature/capi-0.2.8
Cluster API 0.2.8
2 parents 702d873 + 202a424 commit d233b2f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

examples/generate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CLUSTER_NAME="${CLUSTER_NAME:-capv-mgmt-example}"
3131
ENV_VAR_REQ=':?required'
3232

3333
CABPK_MANAGER_IMAGE="${CABPK_MANAGER_IMAGE:-us.gcr.io/k8s-artifacts-prod/capi-kubeadm/cluster-api-kubeadm-controller:v0.1.5}"
34-
CAPI_MANAGER_IMAGE="${CAPI_MANAGER_IMAGE:-us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.2.7}"
34+
CAPI_MANAGER_IMAGE="${CAPI_MANAGER_IMAGE:-us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.2.8}"
3535
CAPV_MANAGER_IMAGE="${CAPV_MANAGER_IMAGE:-gcr.io/cluster-api-provider-vsphere/release/manager:latest}"
3636
K8S_IMAGE_REPOSITORY="${K8S_IMAGE_REPOSITORY:-k8s.gcr.io}"
3737

@@ -327,7 +327,7 @@ kustomize build "${SRC_DIR}/machinedeployment" | envsubst >"${MACHINEDEPLOYMENT_
327327
echo "Generated ${MACHINEDEPLOYMENT_GENERATED_FILE}"
328328

329329
# Generate Cluster API provider components file.
330-
kustomize build "github.com/kubernetes-sigs/cluster-api/config/default/?ref=v0.2.7" >"${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
330+
kustomize build "github.com/kubernetes-sigs/cluster-api/config/default/?ref=v0.2.8" >"${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
331331
echo "Generated ${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
332332

333333
# Generate Kubeadm Bootstrap Provider components file.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
1717
k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
1818
k8s.io/klog v0.4.0
19-
sigs.k8s.io/cluster-api v0.2.7
19+
sigs.k8s.io/cluster-api v0.2.8
2020
sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm v0.1.5
2121
sigs.k8s.io/controller-runtime v0.3.0
2222
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,8 @@ modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03
349349
modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
350350
modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
351351
sigs.k8s.io/cluster-api v0.2.5/go.mod h1:Agc72Ra5LMOkQQ2v/Ywv1KUemaYAwvkQ+G59Ym5H8e4=
352-
sigs.k8s.io/cluster-api v0.2.7 h1:WjhtuvyjnMgo62kKlVizhI/nYs4DJxHNf+ZMSk/uUsM=
353-
sigs.k8s.io/cluster-api v0.2.7/go.mod h1:Agc72Ra5LMOkQQ2v/Ywv1KUemaYAwvkQ+G59Ym5H8e4=
352+
sigs.k8s.io/cluster-api v0.2.8 h1:sDxjJaRbdaqs8ELyswkvyyJ0RLvMMDwfAJ9Jsumy3Dc=
353+
sigs.k8s.io/cluster-api v0.2.8/go.mod h1:Agc72Ra5LMOkQQ2v/Ywv1KUemaYAwvkQ+G59Ym5H8e4=
354354
sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm v0.1.5 h1:NC5z0GfiarpEiOwLp+kgpTiUHG9Hp422YklHDPnzYds=
355355
sigs.k8s.io/cluster-api-bootstrap-provider-kubeadm v0.1.5/go.mod h1:916zreHrHzA66A3yzL0M0HCW8JeddmJa6Nzjnrfop4U=
356356
sigs.k8s.io/controller-runtime v0.3.0 h1:ZtdgqJXVHsIytjdmDuk0QjagnzyLq9FjojXRqIp+dU4=

scripts/e2e/e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ fi
163163

164164
VERSION=$(git describe --dirty --always 2>/dev/null)
165165
export VERSION
166-
export CAPI_VERSION=v0.2.7
166+
export CAPI_VERSION=v0.2.8
167167
echo "build vSphere controller version: ${VERSION}"
168168
echo "using clusterctl version: ${CAPI_VERSION}"
169169

0 commit comments

Comments
 (0)