k8s.io & go version bump (#393)

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v2
  with:
- go-version: 1.17
+ go-version: '1.20'
  - id: go-cache-paths
  run: |
  echo "::set-output name=go-build::$(go env GOCACHE)"
@@ -54,6 +54,6 @@ jobs:
  - name: Setup BATS framework
  run: sudo npm install -g bats
  - name: kubectx (Go) integration tests
- run: COMMAND=./dist/kubectx_linux_amd64/kubectx bats test/kubectx.bats
+ run: COMMAND=./dist/kubectx_linux_amd64_v1/kubectx bats test/kubectx.bats
  - name: kubens (Go) integration tests
- run: COMMAND=./dist/kubens_linux_amd64/kubens bats test/kubens.bats
+ run: COMMAND=./dist/kubens_linux_amd64_v1/kubens bats test/kubens.bats

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
  - name: Setup Go
  uses: actions/setup-go@v2
  with:
- go-version: 1.17
+ go-version: '1.20'
  - name: GoReleaser
  uses: goreleaser/goreleaser-action@v2
  with:

.goreleaser.yml

@@ -53,34 +53,40 @@ builds:
 archives:
 - id: kubectx-archive
  name_template: |-
- kubectx_{{ .Tag }}_{{ .Os }}_{{ .Arch -}}
+ kubectx_{{ .Tag }}_{{ .Os }}_
+ {{- with .Arch -}}
+ {{- if (eq . "386") -}}i386
+ {{- else if (eq . "amd64") -}}x86_64
+ {{- else -}}{{- . -}}
+ {{- end -}} 
+ {{ end }}
  {{- with .Arm -}}
  {{- if (eq . "6") -}}hf
  {{- else -}}v{{- . -}}
  {{- end -}}
  {{- end -}}
  builds:
  - kubectx
- replacements:
- 386: i386
- amd64: x86_64
  format_overrides:
  - goos: windows
  format: zip
  files: ["LICENSE"]
 - id: kubens-archive
  name_template: |-
- kubens_{{ .Tag }}_{{ .Os }}_{{ .Arch -}}
+ kubens_{{ .Tag }}_{{ .Os }}_
+ {{- with .Arch -}}
+ {{- if (eq . "386") -}}i386
+ {{- else if (eq . "amd64") -}}x86_64
+ {{- else -}}{{- . -}}
+ {{- end -}}
+ {{ end }}
  {{- with .Arm -}}
  {{- if (eq . "6") -}}hf
  {{- else -}}v{{- . -}}
  {{- end -}}
  {{- end -}}
  builds:
  - kubens
- replacements:
- 386: i386
- amd64: x86_64
  format_overrides:
  - goos: windows
  format: zip

go.mod

@@ -1,52 +1,54 @@
 module github.com/ahmetb/kubectx
 
-go 1.17
+go 1.20
 
 require (
  facette.io/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
  github.com/fatih/color v1.9.0
- github.com/google/go-cmp v0.5.2
+ github.com/google/go-cmp v0.5.9
  github.com/mattn/go-isatty v0.0.14
  github.com/pkg/errors v0.9.1
- gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
- k8s.io/apimachinery v0.21.0-alpha.1
- k8s.io/client-go v0.21.0-alpha.1
+ gopkg.in/yaml.v3 v3.0.1
+ k8s.io/apimachinery v0.27.3
+ k8s.io/client-go v0.27.3
 )
 
 require (
- cloud.google.com/go v0.54.0 // indirect
- github.com/Azure/go-autorest v14.2.0+incompatible // indirect
- github.com/Azure/go-autorest/autorest v0.11.12 // indirect
- github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect
- github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
- github.com/Azure/go-autorest/logger v0.2.0 // indirect
- github.com/Azure/go-autorest/tracing v0.6.0 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
- github.com/go-logr/logr v0.2.0 // indirect
- github.com/gogo/protobuf v1.3.1 // indirect
- github.com/golang/protobuf v1.4.3 // indirect
+ github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+ github.com/go-logr/logr v1.2.3 // indirect
+ github.com/go-openapi/jsonpointer v0.19.6 // indirect
+ github.com/go-openapi/jsonreference v0.20.1 // indirect
+ github.com/go-openapi/swag v0.22.3 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
+ github.com/google/gnostic v0.5.7-v3refs // indirect
  github.com/google/gofuzz v1.1.0 // indirect
- github.com/googleapis/gnostic v0.4.1 // indirect
+ github.com/google/uuid v1.3.0 // indirect
  github.com/imdario/mergo v0.3.9 // indirect
- github.com/json-iterator/go v1.1.10 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
+ github.com/json-iterator/go v1.1.12 // indirect
+ github.com/mailru/easyjson v0.7.7 // indirect
  github.com/mattn/go-colorable v0.1.4 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
- github.com/modern-go/reflect2 v1.0.1 // indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
- golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
- golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
- golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
- golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect
- golang.org/x/text v0.3.4 // indirect
- golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
- google.golang.org/appengine v1.6.5 // indirect
- google.golang.org/protobuf v1.25.0 // indirect
+ golang.org/x/net v0.8.0 // indirect
+ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
+ golang.org/x/sys v0.6.0 // indirect
+ golang.org/x/term v0.6.0 // indirect
+ golang.org/x/text v0.8.0 // indirect
+ golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/protobuf v1.28.1 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
- gopkg.in/yaml.v2 v2.2.8 // indirect
- k8s.io/api v0.21.0-alpha.1 // indirect
- k8s.io/klog/v2 v2.4.0 // indirect
- k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
- sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
- sigs.k8s.io/yaml v1.2.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ k8s.io/api v0.27.3 // indirect
+ k8s.io/klog/v2 v2.90.1 // indirect
+ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
+ k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+ sigs.k8s.io/yaml v1.3.0 // indirect
 )