Skip to content

Commit 33c27c0

Browse files
ahmetbahmetb
authored
k8s.io & go version bump (#393)
1 parent 7560b8f commit 33c27c0

File tree

5 files changed

+238
-170
lines changed

5 files changed

+238
-170
lines changed

‎.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Go
2626
uses: actions/setup-go@v2
2727
with:
28-
go-version: 1.17
28+
go-version: '1.20'
2929
- id: go-cache-paths
3030
run: |
3131
echo "::set-output name=go-build::$(go env GOCACHE)"
@@ -54,6 +54,6 @@ jobs:
5454
- name: Setup BATS framework
5555
run: sudo npm install -g bats
5656
- name: kubectx (Go) integration tests
57-
run: COMMAND=./dist/kubectx_linux_amd64/kubectx bats test/kubectx.bats
57+
run: COMMAND=./dist/kubectx_linux_amd64_v1/kubectx bats test/kubectx.bats
5858
- name: kubens (Go) integration tests
59-
run: COMMAND=./dist/kubens_linux_amd64/kubens bats test/kubens.bats
59+
run: COMMAND=./dist/kubens_linux_amd64_v1/kubens bats test/kubens.bats

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup Go
2727
uses: actions/setup-go@v2
2828
with:
29-
go-version: 1.17
29+
go-version: '1.20'
3030
- name: GoReleaser
3131
uses: goreleaser/goreleaser-action@v2
3232
with:

‎.goreleaser.yml

+14-8
Original file line numberDiff line numberDiff line change
@@ -53,34 +53,40 @@ builds:
5353
archives:
5454
- id: kubectx-archive
5555
name_template: |-
56-
kubectx_{{ .Tag }}_{{ .Os }}_{{ .Arch -}}
56+
kubectx_{{ .Tag }}_{{ .Os }}_
57+
{{- with .Arch -}}
58+
{{- if (eq . "386") -}}i386
59+
{{- else if (eq . "amd64") -}}x86_64
60+
{{- else -}}{{- . -}}
61+
{{- end -}}
62+
{{ end }}
5763
{{- with .Arm -}}
5864
{{- if (eq . "6") -}}hf
5965
{{- else -}}v{{- . -}}
6066
{{- end -}}
6167
{{- end -}}
6268
builds:
6369
- kubectx
64-
replacements:
65-
386: i386
66-
amd64: x86_64
6770
format_overrides:
6871
- goos: windows
6972
format: zip
7073
files: ["LICENSE"]
7174
- id: kubens-archive
7275
name_template: |-
73-
kubens_{{ .Tag }}_{{ .Os }}_{{ .Arch -}}
76+
kubens_{{ .Tag }}_{{ .Os }}_
77+
{{- with .Arch -}}
78+
{{- if (eq . "386") -}}i386
79+
{{- else if (eq . "amd64") -}}x86_64
80+
{{- else -}}{{- . -}}
81+
{{- end -}}
82+
{{ end }}
7483
{{- with .Arm -}}
7584
{{- if (eq . "6") -}}hf
7685
{{- else -}}v{{- . -}}
7786
{{- end -}}
7887
{{- end -}}
7988
builds:
8089
- kubens
81-
replacements:
82-
386: i386
83-
amd64: x86_64
8490
format_overrides:
8591
- goos: windows
8692
format: zip

‎go.mod

+35-33
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,54 @@
11
module github.com/ahmetb/kubectx
22

3-
go 1.17
3+
go 1.20
44

55
require (
66
facette.io/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
77
github.com/fatih/color v1.9.0
8-
github.com/google/go-cmp v0.5.2
8+
github.com/google/go-cmp v0.5.9
99
github.com/mattn/go-isatty v0.0.14
1010
github.com/pkg/errors v0.9.1
11-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
12-
k8s.io/apimachinery v0.21.0-alpha.1
13-
k8s.io/client-go v0.21.0-alpha.1
11+
gopkg.in/yaml.v3 v3.0.1
12+
k8s.io/apimachinery v0.27.3
13+
k8s.io/client-go v0.27.3
1414
)
1515

1616
require (
17-
cloud.google.com/go v0.54.0 // indirect
18-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
19-
github.com/Azure/go-autorest/autorest v0.11.12 // indirect
20-
github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect
21-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
22-
github.com/Azure/go-autorest/logger v0.2.0 // indirect
23-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2417
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
26-
github.com/go-logr/logr v0.2.0 // indirect
27-
github.com/gogo/protobuf v1.3.1 // indirect
28-
github.com/golang/protobuf v1.4.3 // indirect
18+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
19+
github.com/go-logr/logr v1.2.3 // indirect
20+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
21+
github.com/go-openapi/jsonreference v0.20.1 // indirect
22+
github.com/go-openapi/swag v0.22.3 // indirect
23+
github.com/gogo/protobuf v1.3.2 // indirect
24+
github.com/golang/protobuf v1.5.3 // indirect
25+
github.com/google/gnostic v0.5.7-v3refs // indirect
2926
github.com/google/gofuzz v1.1.0 // indirect
30-
github.com/googleapis/gnostic v0.4.1 // indirect
27+
github.com/google/uuid v1.3.0 // indirect
3128
github.com/imdario/mergo v0.3.9 // indirect
32-
github.com/json-iterator/go v1.1.10 // indirect
29+
github.com/josharian/intern v1.0.0 // indirect
30+
github.com/json-iterator/go v1.1.12 // indirect
31+
github.com/mailru/easyjson v0.7.7 // indirect
3332
github.com/mattn/go-colorable v0.1.4 // indirect
3433
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
35-
github.com/modern-go/reflect2 v1.0.1 // indirect
34+
github.com/modern-go/reflect2 v1.0.2 // indirect
35+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3636
github.com/spf13/pflag v1.0.5 // indirect
37-
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
38-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
39-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
40-
golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect
41-
golang.org/x/text v0.3.4 // indirect
42-
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
43-
google.golang.org/appengine v1.6.5 // indirect
44-
google.golang.org/protobuf v1.25.0 // indirect
37+
golang.org/x/net v0.8.0 // indirect
38+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
39+
golang.org/x/sys v0.6.0 // indirect
40+
golang.org/x/term v0.6.0 // indirect
41+
golang.org/x/text v0.8.0 // indirect
42+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
43+
google.golang.org/appengine v1.6.7 // indirect
44+
google.golang.org/protobuf v1.28.1 // indirect
4545
gopkg.in/inf.v0 v0.9.1 // indirect
46-
gopkg.in/yaml.v2 v2.2.8 // indirect
47-
k8s.io/api v0.21.0-alpha.1 // indirect
48-
k8s.io/klog/v2 v2.4.0 // indirect
49-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
50-
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
51-
sigs.k8s.io/yaml v1.2.0 // indirect
46+
gopkg.in/yaml.v2 v2.4.0 // indirect
47+
k8s.io/api v0.27.3 // indirect
48+
k8s.io/klog/v2 v2.90.1 // indirect
49+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
50+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
51+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
52+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
53+
sigs.k8s.io/yaml v1.3.0 // indirect
5254
)

0 commit comments

Comments
 (0)