Skip to content

Commit

Permalink
refactor: remove old v2 apis and move jx requirements into the v4beta…
Browse files Browse the repository at this point in the history
…1 folder

also bump major module version as this contains breaking changes
  • Loading branch information
rawlingsj committed Nov 25, 2020
1 parent 253bbf4 commit e8c4a50
Show file tree
Hide file tree
Showing 108 changed files with 1,793 additions and 2,295 deletions.
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
module github.com/jenkins-x/jx-api/v3
module github.com/jenkins-x/jx-api/v4

go 1.15

require (
github.com/alecthomas/jsonschema v0.0.0-20190504002508-159cbd5dba26
github.com/ghodss/yaml v1.0.0
github.com/imdario/mergo v0.3.9
github.com/jenkins-x/jx-api v0.0.24 // indirect
github.com/jenkins-x/jx-api/v3 v3.0.3
github.com/jenkins-x/jx-logging/v3 v3.0.0
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
github.com/pkg/errors v0.9.1
Expand Down
122 changes: 122 additions & 0 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hack/linter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ golangci-lint run \
--verbose \
--build-tags build \
--skip-dirs pkg/client \
--skip-files pkg/apis/jenkins.io/v1/zz_generated.deepcopy.go
--skip-files pkg/apis/jenkins.io/v4beta1/zz_generated.deepcopy.go
10 changes: 5 additions & 5 deletions hack/update-codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ rm -rf "${SCRIPT_ROOT}"/pkg/client
# k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
# instead of the $GOPATH directly. For normal projects this can be dropped.
bash hack/generate-groups.sh all \
github.com/jenkins-x/jx-api/v3/pkg/client github.com/jenkins-x/jx-api/v3/pkg/apis \
jenkins.io:v1 \
github.com/jenkins-x/jx-api/v4/pkg/client github.com/jenkins-x/jx-api/v4/pkg/apis \
jenkins.io:v4beta1 \
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
--go-header-file "${SCRIPT_ROOT}"/hack/custom-boilerplate.go.txt

cp -R "${SCRIPT_ROOT}"/v3/pkg/client/ "${SCRIPT_ROOT}"/pkg/client
cp -R "${SCRIPT_ROOT}"/v3/pkg/apis/jenkins.io/v1/zz_generated.deepcopy.go "${SCRIPT_ROOT}"/pkg/apis/jenkins.io/v1/zz_generated.deepcopy.go
cp -R "${SCRIPT_ROOT}"/v4/pkg/client/ "${SCRIPT_ROOT}"/pkg/client
cp -R "${SCRIPT_ROOT}"/v4/pkg/apis/jenkins.io/v4beta1/zz_generated.deepcopy.go "${SCRIPT_ROOT}"/pkg/apis/jenkins.io/v4beta1/zz_generated.deepcopy.go

rm -rf "${SCRIPT_ROOT}"/v3
rm -rf "${SCRIPT_ROOT}"/v4
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
// +k8s:openapi-gen=true
// Package v1 is the v1 version of the API.
// +groupName=jenkins.io
package v1
package v4beta1
Loading

0 comments on commit e8c4a50

Please sign in to comment.