Merge pull request #462 from adambkaplan/osdk-v018

Bump operator-sdk to v0.18, k8s to 1.18

Makefile

@@ -190,11 +190,11 @@ install-strategies: install-apis
 
 local: install-strategies build
 	OPERATOR_NAME=build-operator \
-	operator-sdk run --local --operator-flags="$(ZAP_FLAGS)"
+	operator-sdk run local --operator-flags="$(ZAP_FLAGS)"
 
 local-plain: build-plain
 	OPERATOR_NAME=build-operator \
-	operator-sdk run --local --operator-flags="$(ZAP_FLAGS)"
+	operator-sdk run local --operator-flags="$(ZAP_FLAGS)"
 
 clean:
 	rm -rf $(OUTPUT_DIR)

go.mod

@@ -1,36 +1,43 @@
 module github.com/shipwright-io/build
 
-go 1.13
+go 1.14
 
 require (
+	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
 	github.com/go-logr/logr v0.2.0
 	github.com/go-openapi/spec v0.19.6
 	github.com/onsi/ginkgo v1.12.1
 	github.com/onsi/gomega v1.10.1
-	github.com/operator-framework/operator-sdk v0.17.0
+	github.com/operator-framework/operator-sdk v0.18.2
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.6.0
 	github.com/prometheus/client_model v0.2.0
 	github.com/spf13/pflag v1.0.5
-	github.com/tektoncd/pipeline v0.17.1
-	k8s.io/api v0.18.7-rc.0
+	github.com/tektoncd/pipeline v0.17.1-0.20201006183654-d5df1c164a48
+	k8s.io/api v0.18.10
 	k8s.io/apimachinery v0.19.0
 	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/code-generator v0.18.6
+	k8s.io/code-generator v0.18.10
 	k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
-	k8s.io/kubectl v0.17.4
+	k8s.io/kubectl v0.18.10
 	k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
-	knative.dev/pkg v0.0.0-20200831162708-14fb2347fb77
+	knative.dev/pkg v0.0.0-20201026165741-2f75016c1368
 	sigs.k8s.io/controller-runtime v0.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
 	github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
+	// github.com/operator-framework/operator-registry requires Sirupsen/[email protected]
+	github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.7.0
+	// Pin docker/* to versions used to spinning up local test registries by operator-sdk
+	github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
+	github.com/docker/docker => github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce
 	github.com/go-logr/logr => github.com/go-logr/logr v0.1.0 // v0.2.0 release doesn't have logr.InfoLogger
-	k8s.io/apimachinery => k8s.io/apimachinery v0.17.6
-	k8s.io/client-go => k8s.io/client-go v0.17.4 // Required by prometheus-operator
-	k8s.io/code-generator => k8s.io/code-generator v0.17.4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.18.10
+	k8s.io/client-go => k8s.io/client-go v0.18.10 // Required by prometheus-operator
+	k8s.io/code-generator => k8s.io/code-generator v0.18.10
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 // resolve `case-insensitive import collision` for gnostic/openapiv2 package
-	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.5.2
+	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.1
+
 )

hack/install-kind.sh

@@ -11,7 +11,7 @@
 set -eu
 
 # kind version
-KIND_VERSION="${KIND_VERSION:-v0.7.0}"
+KIND_VERSION="${KIND_VERSION:-v0.8.0}"
 
 if [ ! -f "${GOPATH}/bin/kind" ] ; then
     echo "# Installing KinD..."
@@ -25,7 +25,7 @@ kind --version
 KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-kind}"
 
 # kind cluster version
-KIND_CLUSTER_VERSION="${KIND_CLUSTER_VERSION:-v1.17.0}"
+KIND_CLUSTER_VERSION="${KIND_CLUSTER_VERSION:-v1.18.2}"
 
 echo "# Creating a new Kubernetes cluster..."
 kind create cluster --quiet --name="${KIND_CLUSTER_NAME}" --image="kindest/node:${KIND_CLUSTER_VERSION}" --wait=120s

hack/install-operator-sdk.sh

@@ -10,7 +10,7 @@
 
 set -eu
 
-SDK_VERSION="${SDK_VERSION:-v0.17.0}"
+SDK_VERSION="${SDK_VERSION:-v0.18.2}"
 
 SDK_HOST="github.com"
 SDK_HOST_PATH="operator-framework/operator-sdk/releases/download"

hack/install-registry.sh

@@ -22,7 +22,7 @@ if [[ ! -z "${ACTION}" ]] && [[ "${ACTION}" != "show" ]] ; then
 fi
 
 # contrainer registry name
-REGISTRY_NAME="${REGISTRY_NAME:-registry}"
+REGISTRY_NAME="${REGISTRY_NAME:-kind-registry}"
 # container registry port
 REGISTRY_PORT="${REGISTRY_PORT:-5000}"
 
@@ -41,6 +41,7 @@ function start_registry () {
         --publish="${REGISTRY_PORT}:5000" \
         --restart="always" \
         --detach \
+        --net=kind \
         registry:2
 
     cat << EOS
@@ -51,7 +52,7 @@ EOS
 }
 
 function show_ipaddr () {
-    docker inspect --format='{{ .NetworkSettings.IPAddress }}' "${REGISTRY_NAME}"
+    docker inspect --format='{{ .NetworkSettings.Networks.kind.IPAddress }}' "${REGISTRY_NAME}"
 }
 
 if [ "${ACTION}" == "" ] ; then