From d338042e69c34950196d20337da920a8db44ff67 Mon Sep 17 00:00:00 2001 From: Chuck Ha Date: Wed, 17 Jul 2019 15:03:08 -0400 Subject: [PATCH] fix examples and bump CAPI to v0.1.7 Signed-off-by: Chuck Ha --- cmd/capdctl/main.go | 2 +- examples/simple-cluster.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/capdctl/main.go b/cmd/capdctl/main.go index 1e2d7d2..b8948e3 100644 --- a/cmd/capdctl/main.go +++ b/cmd/capdctl/main.go @@ -63,7 +63,7 @@ func (mo *machineDeploymentOptions) initFlags(fs *flag.FlagSet) { func main() { setup := flag.NewFlagSet("setup", flag.ExitOnError) managementClusterName := setup.String("cluster-name", "management", "The name of the management cluster") - version := setup.String("capi-version", "v0.1.6", "The CRD versions to pull from CAPI. Does not support < v0.1.6.") + version := setup.String("capi-version", "v0.1.7", "The CRD versions to pull from CAPI. Does not support < v0.1.7.") capdImage := setup.String("capd-image", "gcr.io/kubernetes1-226021/capd-manager:latest", "The capd manager image to run") capiImage := setup.String("capi-image", "", "This is normally left blank and filled in automatically. But this will override the generated image name.") diff --git a/examples/simple-cluster.yaml b/examples/simple-cluster.yaml index 8987cf9..d477d85 100644 --- a/examples/simple-cluster.yaml +++ b/examples/simple-cluster.yaml @@ -19,6 +19,8 @@ metadata: set: "controlplane" spec: providerSpec: {} + versions: + controlPlane: "v1.14.2" --- apiVersion: "cluster.k8s.io/v1alpha1" kind: Machine @@ -31,3 +33,5 @@ metadata: name: "my-cluster-worker" spec: providerSpec: {} + versions: + kubelet: "v1.14.2"