Ensure config files are in from sigs.k8s.io/cluster-api

Author: deitch

Makefile

@@ -43,6 +43,7 @@ all: test manager clusterctl
 # vendor
 vendor:
 	$(GO) mod vendor
+	./hack/update-vendor.sh
 
 # Run tests
 test: vendor generate fmt vet manifests

go.vendor

@@ -0,0 +1 @@
+sigs.k8s.io/cluster-api

hack/update-vendor.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# Copyright 2019 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# this is here until we can get to cluster-api v0.1.7 which includes this
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
+source "${KUBE_ROOT}/vendor/sigs.k8s.io/cluster-api/hack/ensure-go.sh"
+
+go mod tidy
+go mod vendor
+
+# Copy full dependencies if needed.
+for dep in $(cat ${KUBE_ROOT}/go.vendor); do
+    src=$(go mod download -json ${dep} | jq -r .Dir)
+    dst="${KUBE_ROOT}/vendor/${dep}"
+    cp -af "${src}/" "${dst}"
+    chmod -R +w ${dst}
+done
+
+go mod verify

tools.go

@@ -19,5 +19,6 @@ package main
 import (
 	_ "k8s.io/code-generator"
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
+	_ "sigs.k8s.io/cluster-api/hack"
 )
 

vendor/modules.txt

@@ -114,14 +114,14 @@ github.com/onsi/gomega/internal/asyncassertion
 github.com/onsi/gomega/internal/testingtsupport
 github.com/onsi/gomega/matchers
 github.com/onsi/gomega/types
+github.com/onsi/gomega/gbytes
+github.com/onsi/gomega/gexec
 github.com/onsi/gomega/internal/oraclematcher
 github.com/onsi/gomega/format
 github.com/onsi/gomega/matchers/support/goraph/bipartitegraph
 github.com/onsi/gomega/matchers/support/goraph/edge
 github.com/onsi/gomega/matchers/support/goraph/node
 github.com/onsi/gomega/matchers/support/goraph/util
-github.com/onsi/gomega/gbytes
-github.com/onsi/gomega/gexec
 # github.com/packethost/packngo v0.0.0-20190507131943-1343be729ca2
 github.com/packethost/packngo
 # github.com/pborman/uuid v1.2.0
@@ -535,6 +535,7 @@ k8s.io/klog
 # k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058
 k8s.io/kube-openapi/pkg/util/proto
 # sigs.k8s.io/cluster-api v0.1.7
+sigs.k8s.io/cluster-api/hack
 sigs.k8s.io/cluster-api/cmd/clusterctl/cmd
 sigs.k8s.io/cluster-api/pkg/apis/cluster/common
 sigs.k8s.io/cluster-api/pkg/apis