Skip to content

Commit

Permalink
fix: Upgrade Tekton to 0.8.0, remove Knative Build
Browse files Browse the repository at this point in the history
Note that the original plan was to upgrade to 0.9.x, but that turns
out to be...messy. Tekton 0.9.x depends on k8s 1.13.x at compile time,
which results in a bunch of mock/fake changes being needed on our
side. Going to 0.8.0, with its dependency on k8s 1.12.x, did require
some changes, but not as many.

And more importantly than changes here, going to k8s 1.13.x at compile
time results in breaking changes to compilation for Knative Build and
Serving, Cert Manager, and Bankvault. While some of these can be
solved by upgrading, Knative Build ended at 0.7.0 (which depends on
k8s 1.12.x, and which we're upgrading our dependency to here, even
though we also remove all the Knative Build usage here at the same
time), and even if we remove our `go.mod` dependency on Knative Build,
we then end up pulling in 0.2.0 thanks to our Prow
dependency. So...things need to be reworked in some janky ways to
upgrade all the way to 0.9.2.

This also removes Knative Build - the addon is left around for now,
but any code actually using it is gone. go.mod still references it,
because otherwise we'd pick up Knative Build 0.2.0 via depending on
Prow, which would just mix things up more. I'm working on a Prow
change to remove Knative Build there which will completely eradicate
Knative Build.

fixes #6317, #4230

Signed-off-by: Andrew Bayer <andrew.bayer@gmail.com>
  • Loading branch information
abayer authored and jenkins-x-bot committed Jan 7, 2020
1 parent 526324e commit e577736
Show file tree
Hide file tree
Showing 180 changed files with 2,417 additions and 3,085 deletions.
2 changes: 1 addition & 1 deletion Makefile.codegen
Expand Up @@ -6,7 +6,7 @@ CODE_GEN_BUILDFLAGS := -gcflags "all=-N -l" $(CODE_GEN_BUILDFLAGS)
endif

PEGOMOCK_VERSION := v2.7.0
CLIENTSET_GENERATOR_VERSION := kubernetes-1.11.3
CLIENTSET_GENERATOR_VERSION := kubernetes-1.12.9
GEN_APIDOCS_VERSION := 9642bd3f4de5
OPENAPI_GEN_VERSION := 36ebc4887cdc

Expand Down
45 changes: 22 additions & 23 deletions go.mod
Expand Up @@ -2,6 +2,7 @@ module github.com/jenkins-x/jx

require (
code.gitea.io/sdk v0.0.0-20180702024448-79a281c4e34a
contrib.go.opencensus.io/exporter/prometheus v0.1.0 // indirect
github.com/Azure/draft v0.15.0
github.com/Comcast/kuberhealthy v1.0.2
github.com/IBM-Cloud/bluemix-go v0.0.0-20181008063305-d718d474c7c2
Expand All @@ -14,6 +15,8 @@ require (
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect
github.com/alecthomas/jsonschema v0.0.0-20190504002508-159cbd5dba26
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/alexflint/go-filemutex v0.0.0-20171028004239-d358565f3c3f
github.com/andygrunwald/go-gerrit v0.0.0-20181026193842-43cfd7a94eb4
github.com/andygrunwald/go-jira v1.5.0
Expand All @@ -33,13 +36,12 @@ require (
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.3.3 // indirect
github.com/docker/docker v0.0.0-20171206114025-5e5fadb3c020
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect
github.com/emirpasic/gods v1.9.0 // indirect
github.com/evanphx/json-patch v4.1.0+incompatible
github.com/evanphx/json-patch v4.5.0+incompatible
github.com/fatih/color v1.7.0
github.com/fatih/structs v1.1.0
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
Expand All @@ -51,8 +53,7 @@ require (
github.com/go-openapi/spec v0.19.2
github.com/gobwas/glob v0.2.3 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/protobuf v1.2.0
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
github.com/golang/protobuf v1.3.1
github.com/google/go-cmp v0.3.0
github.com/google/go-containerregistry v0.0.0-20190317040536-ebbba8469d06 // indirect
github.com/google/go-github v17.0.0+incompatible
Expand All @@ -71,9 +72,9 @@ require (
github.com/jenkins-x/golang-jenkins v0.0.0-20180919102630-65b83ad42314
github.com/jetstack/cert-manager v0.5.2
github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55 // indirect
github.com/knative/build v0.5.0
github.com/knative/pkg v0.0.0-20190402181056-ff46edef0ae5
github.com/knative/serving v0.5.0
github.com/knative/build v0.7.0
github.com/knative/pkg v0.0.0-20190624141606-d82505e6c5b4
github.com/knative/serving v0.7.0
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect
Expand All @@ -92,13 +93,11 @@ require (
github.com/petergtz/pegomock v2.7.0+incompatible
github.com/pierrec/lz4 v2.0.5+incompatible // indirect
github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15
github.com/pkg/errors v0.8.0
github.com/prometheus/common v0.2.0 // indirect
github.com/pkg/errors v0.8.1
github.com/rickar/props v0.0.0-20170718221555-0b06aeb2f037
github.com/rodaine/hclencoder v0.0.0-20180926060551-0680c4321930
github.com/rollout/rox-go v0.0.0-20181220111955-29ddae74a8c4
github.com/russross/blackfriday v1.5.2
github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 // indirect
github.com/satori/go.uuid v1.2.1-0.20180103174451-36e9d2ebbde5
github.com/sergi/go-diff v1.0.0 // indirect
github.com/sethvargo/go-password v0.1.2
Expand All @@ -111,7 +110,7 @@ require (
github.com/src-d/gcfg v1.3.0 // indirect
github.com/stoewer/go-strcase v1.0.1
github.com/stretchr/testify v1.4.0
github.com/tektoncd/pipeline v0.5.1
github.com/tektoncd/pipeline v0.8.0
github.com/trivago/tgo v1.0.1 // indirect
github.com/ulikunitz/xz v0.5.6 // indirect
github.com/viniciuschiele/tarx v0.0.0-20151205142357-6e3da540444d // indirect
Expand All @@ -123,49 +122,49 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.1.0
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
go.opencensus.io v0.22.2 // indirect
gocloud.dev v0.9.0
golang.org/x/net v0.0.0-20190620200207-3b0461eec859 // indirect
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sync v0.0.0-20190423024810-112230192c58
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect
google.golang.org/api v0.1.0 // indirect
google.golang.org/genproto v0.0.0-20190219182410-082222b4a5c5 // indirect
gopkg.in/AlecAivazis/survey.v1 v1.8.3
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
gopkg.in/src-d/go-billy.v4 v4.2.0 // indirect
gopkg.in/src-d/go-git-fixtures.v3 v3.3.0 // indirect
gopkg.in/src-d/go-git.v4 v4.5.0
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.2.2
k8s.io/api v0.0.0-20190126160303-ccdd560a045f
k8s.io/apiextensions-apiserver v0.0.0-20190308081736-3a66ae4d2f93
k8s.io/api v0.0.0-20190718183219-b59d8169aab5
k8s.io/apiextensions-apiserver v0.0.0-20190718185103-d1ef975d28ce
k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76
k8s.io/client-go v10.0.0+incompatible
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/helm v2.7.2+incompatible
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
k8s.io/kubernetes v1.11.3
k8s.io/metrics v0.0.0-20180620010437-b11cf31b380b
k8s.io/test-infra v0.0.0-20190131093439-a22cef183a8f
knative.dev/pkg v0.0.0-20191217184203-cf220a867b3d
sigs.k8s.io/yaml v1.1.0

)

replace k8s.io/api => k8s.io/api v0.0.0-20181128191700-6db15a15d2d3
replace k8s.io/api => k8s.io/api v0.0.0-20190528110122-9ad12a4af326

replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc

replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible
replace k8s.io/client-go => k8s.io/client-go v0.0.0-20190528110200-4f3abb12cae2

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20181128195303-1f84094d7e8e
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190528110544-fa58353d80f3

replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

replace github.com/sirupsen/logrus => github.com/jtnord/logrus v1.4.2-0.20190423161236-606ffcaf8f5d

replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v21.1.0+incompatible

replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v10.15.5+incompatible
replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v10.14.0+incompatible

replace github.com/banzaicloud/bank-vaults => github.com/banzaicloud/bank-vaults v0.0.0-20190508130850-5673d28c46bd

0 comments on commit e577736

Please sign in to comment.