Skip to content

Commit 6fc0576

Browse files
authored
Update dependencies and docker image (#382)
* Update depencies and docker image * fix CI * typo * increase lint timeout * update vault
1 parent c4608a3 commit 6fc0576

File tree

5 files changed

+131
-1011
lines changed

5 files changed

+131
-1011
lines changed

Diff for: .circleci/config.yml

+17-12
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ references:
1010
name: install hashicorp vault
1111
command: |
1212
cd /tmp
13-
curl -LO https://releases.hashicorp.com/vault/1.9.3/vault_1.9.3_linux_amd64.zip
14-
unzip vault_1.9.3_linux_amd64.zip
13+
curl -LO https://releases.hashicorp.com/vault/1.12.5/vault_1.12.5_linux_amd64.zip
14+
unzip vault_1.12.5_linux_amd64.zip
1515
mv vault /usr/bin/vault
1616
apk --update add yq
1717
e2e_configuration: &e2e_configuration
@@ -32,22 +32,25 @@ references:
3232
jobs:
3333
test:
3434
docker:
35-
- image: circleci/golang:1.17
36-
37-
working_directory: /go/src/github.com/fairwindsops/rbac-manager
35+
- image: cimg/go:1.20
36+
working_directory: /home/circleci/go/src/github.com/fairwindsops/rbac-manager
3837
steps:
3938
- checkout
40-
- run: go get -u golang.org/x/lint/golint
41-
- run: go list ./... | grep -v vendor | xargs golint -set_exit_status
42-
- run: go list ./... | grep -v vendor | xargs go vet
4339
- run: go test ./... -coverprofile=coverage.txt -covermode=atomic
4440

41+
lint:
42+
docker:
43+
- image: golangci/golangci-lint:v1.52.2
44+
steps:
45+
- checkout
46+
- run: golangci-lint run --timeout=10m -v
47+
4548
build_and_release:
46-
working_directory: /go/src/github.com/fairwindsops/rbac-manager
49+
working_directory: /home/circleci/go/src/github.com/fairwindsops/rbac-manager
4750
resource_class: large
4851
shell: /bin/bash
4952
docker:
50-
- image: goreleaser/goreleaser:v1.5.0
53+
- image: goreleaser/goreleaser:v1.17.2
5154
environment:
5255
GO111MODULE: "on"
5356
steps:
@@ -62,10 +65,10 @@ jobs:
6265
password-variable: REACTIVEOPS_QUAY_TOKEN
6366
- run: goreleaser
6467
snapshot:
65-
working_directory: /go/src/github.com/fairwindsops/rbac-manager
68+
working_directory: /home/circleci/go/src/github.com/fairwindsops/rbac-manager
6669
resource_class: large
6770
docker:
68-
- image: goreleaser/goreleaser:v1.5.0
71+
- image: goreleaser/goreleaser:v1.17.2
6972
steps:
7073
- checkout
7174
- setup_remote_docker
@@ -86,10 +89,12 @@ workflows:
8689
tests:
8790
jobs:
8891
- test
92+
- lint
8993
- snapshot:
9094
context: org-global
9195
requires:
9296
- test
97+
- lint
9398
- rok8s/kubernetes_e2e_tests:
9499
name: "End-To-End Kubernetes 1.19"
95100
kind_node_image: "kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729"

Diff for: Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.16
1+
FROM alpine:3.17
22

33
# 'nobody' user in alpine
44
USER 65534

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ VERSION := "dev"
1010
all: test
1111
test:
1212
@printf "Linter:\n"
13-
$(GOCMD) list ./... | xargs -L1 golint | tee golint-report.out
13+
$(GOCMD) golangci-lint run
1414
@printf "\n\nTests:\n\n"
1515
$(GOCMD) test -v -coverprofile coverage.txt -covermode=atomic ./...
1616
$(GOCMD) vet ./... 2> govet-report.out

Diff for: go.mod

+37-44
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,69 @@
11
module github.com/fairwindsops/rbac-manager
22

3-
go 1.17
3+
go 1.20
44

55
require (
6-
github.com/prometheus/client_golang v1.12.2
6+
github.com/prometheus/client_golang v1.15.0
77
github.com/sirupsen/logrus v1.9.0
88
github.com/stretchr/testify v1.8.0
9-
k8s.io/api v0.24.4
10-
k8s.io/apimachinery v0.24.4
11-
k8s.io/client-go v0.24.4
9+
k8s.io/api v0.26.1
10+
k8s.io/apimachinery v0.26.1
11+
k8s.io/client-go v0.26.1
1212
k8s.io/klog v1.0.0
13-
sigs.k8s.io/controller-runtime v0.12.2
13+
sigs.k8s.io/controller-runtime v0.14.6
1414
)
1515

1616
require (
17-
cloud.google.com/go/compute v1.6.1 // indirect
18-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
19-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
20-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
21-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
22-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
23-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2417
github.com/beorn7/perks v1.0.1 // indirect
25-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
18+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2619
github.com/davecgh/go-spew v1.1.1 // indirect
27-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
28-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
29-
github.com/fsnotify/fsnotify v1.5.4 // indirect
20+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
21+
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
22+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
23+
github.com/fsnotify/fsnotify v1.6.0 // indirect
3024
github.com/go-logr/logr v1.2.3 // indirect
3125
github.com/go-openapi/jsonpointer v0.19.5 // indirect
3226
github.com/go-openapi/jsonreference v0.20.0 // indirect
33-
github.com/go-openapi/swag v0.21.1 // indirect
27+
github.com/go-openapi/swag v0.19.14 // indirect
3428
github.com/gogo/protobuf v1.3.2 // indirect
35-
github.com/golang-jwt/jwt/v4 v4.4.1 // indirect
3629
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
37-
github.com/golang/protobuf v1.5.2 // indirect
38-
github.com/google/gnostic v0.6.9 // indirect
39-
github.com/google/go-cmp v0.5.8 // indirect
40-
github.com/google/gofuzz v1.2.0 // indirect
41-
github.com/google/uuid v1.3.0 // indirect
42-
github.com/imdario/mergo v0.3.13 // indirect
30+
github.com/golang/protobuf v1.5.3 // indirect
31+
github.com/google/gnostic v0.5.7-v3refs // indirect
32+
github.com/google/go-cmp v0.5.9 // indirect
33+
github.com/google/gofuzz v1.1.0 // indirect
34+
github.com/google/uuid v1.1.2 // indirect
35+
github.com/imdario/mergo v0.3.6 // indirect
4336
github.com/josharian/intern v1.0.0 // indirect
4437
github.com/json-iterator/go v1.1.12 // indirect
45-
github.com/mailru/easyjson v0.7.7 // indirect
46-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
38+
github.com/mailru/easyjson v0.7.6 // indirect
39+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4740
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4841
github.com/modern-go/reflect2 v1.0.2 // indirect
4942
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5043
github.com/pkg/errors v0.9.1 // indirect
5144
github.com/pmezard/go-difflib v1.0.0 // indirect
52-
github.com/prometheus/client_model v0.2.0 // indirect
53-
github.com/prometheus/common v0.34.0 // indirect
54-
github.com/prometheus/procfs v0.7.3 // indirect
45+
github.com/prometheus/client_model v0.3.0 // indirect
46+
github.com/prometheus/common v0.42.0 // indirect
47+
github.com/prometheus/procfs v0.9.0 // indirect
48+
github.com/rogpeppe/go-internal v1.10.0 // indirect
5549
github.com/spf13/pflag v1.0.5 // indirect
56-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
57-
golang.org/x/net v0.2.0 // indirect
58-
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
59-
golang.org/x/sys v0.2.0 // indirect
60-
golang.org/x/term v0.2.0 // indirect
61-
golang.org/x/text v0.4.0 // indirect
62-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
50+
golang.org/x/net v0.7.0 // indirect
51+
golang.org/x/oauth2 v0.5.0 // indirect
52+
golang.org/x/sys v0.6.0 // indirect
53+
golang.org/x/term v0.5.0 // indirect
54+
golang.org/x/text v0.7.0 // indirect
55+
golang.org/x/time v0.3.0 // indirect
6356
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6457
google.golang.org/appengine v1.6.7 // indirect
65-
google.golang.org/protobuf v1.28.0 // indirect
58+
google.golang.org/protobuf v1.30.0 // indirect
6659
gopkg.in/inf.v0 v0.9.1 // indirect
6760
gopkg.in/yaml.v2 v2.4.0 // indirect
6861
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/component-base v0.24.2 // indirect
70-
k8s.io/klog/v2 v2.60.1 // indirect
71-
k8s.io/kube-openapi v0.0.0-20220603121420-31174f50af60 // indirect
72-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
73-
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
74-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
62+
k8s.io/component-base v0.26.1 // indirect
63+
k8s.io/klog/v2 v2.80.1 // indirect
64+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
65+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
66+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
67+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7568
sigs.k8s.io/yaml v1.3.0 // indirect
7669
)

0 commit comments

Comments
 (0)