Skip to content

Commit 999173c

Browse files
SaschaSchwarze0SaschaSchwarze0
committed
Update dependencies
1 parent 8484a79 commit 999173c

File tree

9 files changed

+89
-22
lines changed

9 files changed

+89
-22
lines changed

‎.github/workflows/e2e.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ jobs:
1414
matrix:
1515
kubernetes:
1616
- v1.20.7
17-
max-parallel: 1
17+
- v1.21.2
18+
max-parallel: 2
1819
runs-on: ubuntu-latest
1920
steps:
2021
- name: Setup Go
2122
uses: actions/setup-go@v2
2223
with:
23-
go-version: ^1.16
24+
go-version: ^1.17
2425

2526
- name: Check out code into the Go module directory
2627
uses: actions/checkout@v2

‎.github/workflows/unit.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ jobs:
1919
- name: Setup Go
2020
uses: actions/setup-go@v2
2121
with:
22-
go-version: ^1.16
22+
go-version: ^1.17
2323

2424
- name: Check out code into the Go module directory
2525
uses: actions/checkout@v2
2626

2727
- name: Install Tools
2828
run: sudo apt-get update && sudo apt-get install -y make gcc
2929

30-
- name: Build Application (shp)
31-
run: make build
32-
3330
- name: Run Unit Tests
3431
run: make test-unit

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.vscode/
12
_output/
23
/shp
34
/shp-*

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ GO_TEST_FLAGS ?= -race -cover
1313
ARGS ?=
1414

1515
# Tekton and Shipwright Build Controller versions for CI
16-
TEKTON_VERSION ?= v0.25.0
17-
SHIPWRIGHT_VERSION ?= v0.6.0
16+
TEKTON_VERSION ?= v0.30.0
17+
SHIPWRIGHT_VERSION ?= v0.7.0
1818

1919
.EXPORT_ALL_VARIABLES:
2020

‎go.mod

Lines changed: 64 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,74 @@
11
module github.com/shipwright-io/cli
22

3-
go 1.15
3+
go 1.17
44

55
require (
6-
github.com/mailru/easyjson v0.7.1 // indirect
7-
github.com/onsi/gomega v1.10.3
8-
github.com/shipwright-io/build v0.6.0
6+
github.com/onsi/gomega v1.17.0
7+
github.com/shipwright-io/build v0.7.0
98
github.com/spf13/cobra v1.2.1
109
github.com/spf13/pflag v1.0.5
1110
github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c
12-
k8s.io/api v0.20.6
13-
k8s.io/apimachinery v0.20.6
14-
k8s.io/cli-runtime v0.20.2
15-
k8s.io/client-go v0.20.6
16-
k8s.io/klog/v2 v2.5.0
17-
k8s.io/utils v0.0.0-20210629042839-4a2b36d8d73f
11+
k8s.io/api v0.21.7
12+
k8s.io/apimachinery v0.21.7
13+
k8s.io/cli-runtime v0.21.7
14+
k8s.io/client-go v0.21.7
15+
k8s.io/klog/v2 v2.9.0
16+
k8s.io/utils v0.0.0-20210802155522-efc7438f0176
17+
)
18+
19+
require (
20+
github.com/PuerkitoBio/purell v1.1.1 // indirect
21+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
22+
github.com/davecgh/go-spew v1.1.1 // indirect
23+
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
24+
github.com/go-errors/errors v1.0.1 // indirect
25+
github.com/go-logr/logr v0.4.0 // indirect
26+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
27+
github.com/go-openapi/jsonreference v0.19.5 // indirect
28+
github.com/go-openapi/spec v0.20.3 // indirect
29+
github.com/go-openapi/swag v0.19.15 // indirect
30+
github.com/gogo/protobuf v1.3.2 // indirect
31+
github.com/golang/protobuf v1.5.2 // indirect
32+
github.com/google/btree v1.0.0 // indirect
33+
github.com/google/go-cmp v0.5.6 // indirect
34+
github.com/google/gofuzz v1.2.0 // indirect
35+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
36+
github.com/google/uuid v1.3.0 // indirect
37+
github.com/googleapis/gnostic v0.5.5 // indirect
38+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
39+
github.com/imdario/mergo v0.3.12 // indirect
40+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
41+
github.com/josharian/intern v1.0.0 // indirect
42+
github.com/json-iterator/go v1.1.11 // indirect
43+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
44+
github.com/mailru/easyjson v0.7.7 // indirect
45+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
46+
github.com/modern-go/reflect2 v1.0.1 // indirect
47+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
48+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
49+
github.com/pkg/errors v0.9.1 // indirect
50+
github.com/pmezard/go-difflib v1.0.0 // indirect
51+
github.com/stretchr/testify v1.7.0 // indirect
52+
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
53+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
54+
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
55+
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
56+
golang.org/x/sys v0.0.0-20210917161153-d61c044b1678 // indirect
57+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
58+
golang.org/x/text v0.3.6 // indirect
59+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
60+
google.golang.org/appengine v1.6.7 // indirect
61+
google.golang.org/protobuf v1.27.1 // indirect
62+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
63+
gopkg.in/inf.v0 v0.9.1 // indirect
64+
gopkg.in/yaml.v2 v2.4.0 // indirect
65+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
66+
k8s.io/kube-openapi v0.0.0-20211110012726-3cc51fd1e909 // indirect
67+
sigs.k8s.io/controller-runtime v0.9.7 // indirect
68+
sigs.k8s.io/kustomize/api v0.8.8 // indirect
69+
sigs.k8s.io/kustomize/kyaml v0.10.17 // indirect
70+
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
71+
sigs.k8s.io/yaml v1.3.0 // indirect
1872
)
1973

2074
replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3 // Needed, otherwise we will hit this https://github.com/knative/client/pull/1207#issuecomment-770845105

‎hack/install-kind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ kind --version
1717
KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-kind}"
1818

1919
# kind cluster version
20-
KIND_CLUSTER_VERSION="${KIND_CLUSTER_VERSION:-v1.20.2}"
20+
KIND_CLUSTER_VERSION="${KIND_CLUSTER_VERSION:-v1.21.2}"
2121

2222
echo "# Creating a new Kubernetes cluster..."
2323
kind create cluster --quiet --name="${KIND_CLUSTER_NAME}" --image="kindest/node:${KIND_CLUSTER_VERSION}" --wait=120s

‎hack/install-shipwright.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -eu
77

88
SHIPWRIGHT_HOST="github.com"
99
SHIPWRIGHT_HOST_PATH="shipwright-io/build/releases/download"
10-
SHIPWRIGHT_VERSION="${SHIPWRIGHT_VERSION:-v0.6.0}"
10+
SHIPWRIGHT_VERSION="${SHIPWRIGHT_VERSION:-v0.7.0}"
1111

1212
echo "# Deploying Shipwright Controller '${SHIPWRIGHT_VERSION}'"
1313

‎hack/install-tekton.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
set -eu
77

8-
TEKTON_VERSION="${TEKTON_VERSION:-v0.25.0}"
8+
TEKTON_VERSION="${TEKTON_VERSION:-v0.30.0}"
99

1010
TEKTON_HOST="github.com"
1111
TEKTON_HOST_PATH="tektoncd/pipeline/releases/download"

‎pkg/shp/flags/map_value_test.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,21 @@ func TestNewMapValue(t *testing.T) {
3838
g.Expect(len(spec.Output.Labels)).To(o.Equal(3))
3939
g.Expect(spec.Output.Labels["c"]).To(o.Equal("d e"))
4040

41+
// verify the map status
42+
g.Expect(c.kvMap).To(o.BeEquivalentTo(map[string]string{
43+
"a": "b",
44+
"b": "c,d,e=f",
45+
"c": "d e",
46+
}))
47+
4148
// making sure the string representation produced is as expected
4249
s := c.String()
43-
g.Expect(s).To(o.BeEquivalentTo("[a=b,\"b=c,d,e=f\",c=d e]"))
50+
g.Expect(s).To(o.BeElementOf(
51+
"[a=b,\"b=c,d,e=f\",c=d e]",
52+
"[a=b,c=d e,\"b=c,d,e=f\"]",
53+
"[\"b=c,d,e=f\",a=b,c=d e]",
54+
"[\"b=c,d,e=f\",c=d e,a=b]",
55+
"[c=d e,a=b,\"b=c,d,e=f\"]",
56+
"[c=d e,\"b=c,d,e=f\",a=b,\"b=c,d,e=f\"]",
57+
))
4458
}

0 commit comments

Comments
 (0)