Skip to content

Commit 10d0d54

Browse files
authored
update deps and alpine version (#390)
* udpate deps and alpine version * update again. fix Makefile * fix * fix cache
1 parent 5ed2730 commit 10d0d54

File tree

5 files changed

+161
-136
lines changed

5 files changed

+161
-136
lines changed

Diff for: .circleci/config.yml

+13-16
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@ references:
99
run:
1010
name: install hashicorp vault
1111
command: |
12+
apk --update add curl yq
1213
cd /tmp
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
14+
curl -LO https://releases.hashicorp.com/vault/1.13.2/vault_1.13.2_linux_amd64.zip
15+
sha256sum vault_1.13.2_linux_amd64.zip | grep f7930279de8381de7c532164b4a4408895d9606c0d24e2e9d2f9acb5dfe99b3c
16+
unzip vault_1.13.2_linux_amd64.zip
1517
mv vault /usr/bin/vault
16-
apk --update add yq
1718
e2e_configuration: &e2e_configuration
1819
pre_script: e2e/pre.sh
1920
script: e2e/test.sh
20-
command_runner_image: quay.io/reactiveops/ci-images:v11-stretch
21+
command_runner_image: quay.io/reactiveops/ci-images:v12-buster
2122
enable_docker_layer_caching: true
2223
attach-workspace: true
2324
requires:
@@ -50,7 +51,7 @@ jobs:
5051
resource_class: large
5152
shell: /bin/bash
5253
docker:
53-
- image: goreleaser/goreleaser:v1.17.2
54+
- image: goreleaser/goreleaser:v1.18.2
5455
environment:
5556
GO111MODULE: "on"
5657
steps:
@@ -68,7 +69,7 @@ jobs:
6869
working_directory: /home/circleci/go/src/github.com/fairwindsops/rbac-manager
6970
resource_class: large
7071
docker:
71-
- image: goreleaser/goreleaser:v1.17.2
72+
- image: goreleaser/goreleaser:v1.18.2
7273
steps:
7374
- checkout
7475
- setup_remote_docker
@@ -96,20 +97,16 @@ workflows:
9697
- test
9798
- lint
9899
- rok8s/kubernetes_e2e_tests:
99-
name: "End-To-End Kubernetes 1.19"
100-
kind_node_image: "kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729"
100+
name: "End-To-End Kubernetes 1.23"
101+
kind_node_image: "kindest/node:v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61"
101102
<<: *e2e_configuration
102103
- rok8s/kubernetes_e2e_tests:
103-
name: "End-To-End Kubernetes 1.20"
104-
kind_node_image: "kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9"
104+
name: "End-To-End Kubernetes 1.24"
105+
kind_node_image: "kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315"
105106
<<: *e2e_configuration
106107
- rok8s/kubernetes_e2e_tests:
107-
name: "End-To-End Kubernetes 1.21"
108-
kind_node_image: "kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6"
109-
<<: *e2e_configuration
110-
- rok8s/kubernetes_e2e_tests:
111-
name: "End-To-End Kubernetes 1.22"
112-
kind_node_image: "kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047"
108+
name: "End-To-End Kubernetes 1.25"
109+
kind_node_image: "kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1"
113110
<<: *e2e_configuration
114111
release:
115112
jobs:

Diff for: Makefile

+1-2
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) golangci-lint run
13+
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
@@ -22,5 +22,4 @@ clean:
2222
$(GOCLEAN)
2323
$(GOCMD) fmt ./...
2424
rm -f $(BINARY_NAME)
25-
packr2 clean
2625
# Cross compilation

Diff for: go.mod

+30-31
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,66 @@ module github.com/fairwindsops/rbac-manager
33
go 1.20
44

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

1616
require (
1717
github.com/beorn7/perks v1.0.1 // indirect
1818
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1919
github.com/davecgh/go-spew v1.1.1 // indirect
20-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
20+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
2121
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
2222
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2323
github.com/fsnotify/fsnotify v1.6.0 // indirect
24-
github.com/go-logr/logr v1.2.3 // indirect
25-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
26-
github.com/go-openapi/jsonreference v0.20.0 // indirect
27-
github.com/go-openapi/swag v0.19.14 // indirect
24+
github.com/go-logr/logr v1.2.4 // indirect
25+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
26+
github.com/go-openapi/jsonreference v0.20.2 // indirect
27+
github.com/go-openapi/swag v0.22.3 // indirect
2828
github.com/gogo/protobuf v1.3.2 // indirect
2929
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3030
github.com/golang/protobuf v1.5.3 // indirect
31-
github.com/google/gnostic v0.5.7-v3refs // indirect
31+
github.com/google/gnostic v0.6.9 // indirect
3232
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
33+
github.com/google/gofuzz v1.2.0 // indirect
34+
github.com/google/uuid v1.3.0 // indirect
35+
github.com/imdario/mergo v0.3.15 // indirect
3636
github.com/josharian/intern v1.0.0 // indirect
3737
github.com/json-iterator/go v1.1.12 // indirect
38-
github.com/mailru/easyjson v0.7.6 // indirect
38+
github.com/mailru/easyjson v0.7.7 // indirect
3939
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4040
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4141
github.com/modern-go/reflect2 v1.0.2 // indirect
4242
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4343
github.com/pkg/errors v0.9.1 // indirect
4444
github.com/pmezard/go-difflib v1.0.0 // 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
45+
github.com/prometheus/client_model v0.4.0 // indirect
46+
github.com/prometheus/common v0.44.0 // indirect
47+
github.com/prometheus/procfs v0.10.0 // indirect
4948
github.com/spf13/pflag v1.0.5 // 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
49+
golang.org/x/net v0.10.0 // indirect
50+
golang.org/x/oauth2 v0.8.0 // indirect
51+
golang.org/x/sys v0.8.0 // indirect
52+
golang.org/x/term v0.8.0 // indirect
53+
golang.org/x/text v0.9.0 // indirect
5554
golang.org/x/time v0.3.0 // indirect
56-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
55+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
5756
google.golang.org/appengine v1.6.7 // indirect
5857
google.golang.org/protobuf v1.30.0 // indirect
5958
gopkg.in/inf.v0 v0.9.1 // indirect
6059
gopkg.in/yaml.v2 v2.4.0 // indirect
6160
gopkg.in/yaml.v3 v3.0.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
61+
k8s.io/component-base v0.27.2 // indirect
62+
k8s.io/klog/v2 v2.100.1 // indirect
63+
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
64+
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
65+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6766
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
6867
sigs.k8s.io/yaml v1.3.0 // indirect
6968
)

0 commit comments

Comments
 (0)