Skip to content

Commit 48e443b

Browse files
authored
Sudermanjr/update deps and golang (#477)
* fix: update deps and golang version * fix: update alpine * fix: tidy * ci: update CI dependencies * fix: update call to watch * fix: goreleaser flag change * fix: update ci-image name
1 parent fef03e5 commit 48e443b

File tree

5 files changed

+139
-1689
lines changed

5 files changed

+139
-1689
lines changed

Diff for: .circleci/config.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
orbs:
4-
rok8s: fairwinds/rok8s-scripts@13
4+
rok8s: fairwinds/rok8s-scripts@14
55
oss-docs: fairwinds/oss-docs@0
66

77
references:
@@ -19,7 +19,7 @@ references:
1919
chainsaw_configuration: &chainsaw_configuration
2020
pre_script: e2e/pre.sh
2121
script: e2e/test.sh
22-
command_runner_image: quay.io/reactiveops/ci-images:v13-buster
22+
command_runner_image: quay.io/reactiveops/ci-images:v14-bullseye
2323
enable_docker_layer_caching: true
2424
attach-workspace: true
2525
requires:
@@ -34,15 +34,15 @@ references:
3434
jobs:
3535
test:
3636
docker:
37-
- image: cimg/go:1.20
37+
- image: cimg/go:1.22
3838
working_directory: /home/circleci/go/src/github.com/fairwindsops/rbac-manager
3939
steps:
4040
- checkout
4141
- run: go test ./... -coverprofile=coverage.txt -covermode=atomic
4242

4343
lint:
4444
docker:
45-
- image: golangci/golangci-lint:v1.52.2
45+
- image: golangci/golangci-lint:v1.59.1
4646
steps:
4747
- checkout
4848
- run: golangci-lint run --timeout=10m -v
@@ -52,7 +52,7 @@ jobs:
5252
resource_class: large
5353
shell: /bin/bash
5454
docker:
55-
- image: goreleaser/goreleaser:v1.18.2
55+
- image: goreleaser/goreleaser:v2.0.1
5656
environment:
5757
GO111MODULE: "on"
5858
steps:
@@ -70,11 +70,11 @@ jobs:
7070
working_directory: /home/circleci/go/src/github.com/fairwindsops/rbac-manager
7171
resource_class: large
7272
docker:
73-
- image: goreleaser/goreleaser:v1.18.2
73+
- image: goreleaser/goreleaser:v2.0.1
7474
steps:
7575
- checkout
7676
- setup_remote_docker
77-
- run: goreleaser --snapshot --skip-sign
77+
- run: goreleaser --snapshot --skip sign
7878
- run: mkdir -p /tmp/workspace/docker_save/
7979
- run: docker save quay.io/reactiveops/rbac-manager:${CIRCLE_SHA1}-amd64 > /tmp/workspace/docker_save/rbac-manager_${CIRCLE_SHA1}-amd64.tar
8080
- run: pwd; ls -la *
@@ -98,16 +98,16 @@ workflows:
9898
- test
9999
- lint
100100
- rok8s/kubernetes_e2e_tests:
101-
name: "End-To-End Kubernetes 1.25"
102-
kind_node_image: "kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1"
101+
name: "End-To-End Kubernetes 1.28"
102+
kind_node_image: "kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0"
103103
<<: *chainsaw_configuration
104104
- rok8s/kubernetes_e2e_tests:
105-
name: "End-To-End Kubernetes 1.26"
106-
kind_node_image: "kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb"
105+
name: "End-To-End Kubernetes 1.29"
106+
kind_node_image: "kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8"
107107
<<: *chainsaw_configuration
108108
- rok8s/kubernetes_e2e_tests:
109-
name: "End-To-End Kubernetes 1.27"
110-
kind_node_image: "kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72"
109+
name: "End-To-End Kubernetes 1.30"
110+
kind_node_image: "kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
111111
<<: *chainsaw_configuration
112112
release:
113113
jobs:

Diff for: Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.19
1+
FROM alpine:3.20
22

33
# 'nobody' user in alpine
44
USER 65534

Diff for: go.mod

+36-39
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,68 @@
11
module github.com/fairwindsops/rbac-manager
22

3-
go 1.20
3+
go 1.22.0
4+
5+
toolchain go1.22.4
46

57
require (
6-
github.com/prometheus/client_golang v1.17.0
8+
github.com/prometheus/client_golang v1.19.1
79
github.com/sirupsen/logrus v1.9.3
8-
github.com/stretchr/testify v1.8.4
9-
k8s.io/api v0.28.4
10-
k8s.io/apimachinery v0.28.4
11-
k8s.io/client-go v0.28.4
10+
github.com/stretchr/testify v1.9.0
11+
k8s.io/api v0.30.2
12+
k8s.io/apimachinery v0.30.2
13+
k8s.io/client-go v0.30.2
1214
k8s.io/klog v1.0.0
13-
sigs.k8s.io/controller-runtime v0.16.3
15+
sigs.k8s.io/controller-runtime v0.18.4
1416
)
1517

1618
require (
1719
github.com/beorn7/perks v1.0.1 // indirect
18-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
20+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1921
github.com/davecgh/go-spew v1.1.1 // indirect
20-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
22+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
2123
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
22-
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
23-
github.com/fsnotify/fsnotify v1.6.0 // indirect
24-
github.com/go-logr/logr v1.2.4 // indirect
25-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
26-
github.com/go-openapi/jsonreference v0.20.2 // indirect
27-
github.com/go-openapi/swag v0.22.4 // indirect
24+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
25+
github.com/fsnotify/fsnotify v1.7.0 // indirect
26+
github.com/go-logr/logr v1.4.2 // indirect
27+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
28+
github.com/go-openapi/jsonreference v0.21.0 // indirect
29+
github.com/go-openapi/swag v0.23.0 // indirect
2830
github.com/gogo/protobuf v1.3.2 // indirect
2931
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
30-
github.com/golang/protobuf v1.5.3 // indirect
31-
github.com/google/gnostic v0.7.0 // indirect
32+
github.com/golang/protobuf v1.5.4 // indirect
3233
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
33-
github.com/google/go-cmp v0.5.9 // indirect
34+
github.com/google/go-cmp v0.6.0 // indirect
3435
github.com/google/gofuzz v1.2.0 // indirect
35-
github.com/google/uuid v1.3.1 // indirect
36+
github.com/google/uuid v1.6.0 // indirect
3637
github.com/imdario/mergo v0.3.16 // indirect
3738
github.com/josharian/intern v1.0.0 // indirect
3839
github.com/json-iterator/go v1.1.12 // indirect
3940
github.com/mailru/easyjson v0.7.7 // indirect
40-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4141
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4242
github.com/modern-go/reflect2 v1.0.2 // indirect
4343
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4444
github.com/pkg/errors v0.9.1 // indirect
4545
github.com/pmezard/go-difflib v1.0.0 // indirect
46-
github.com/prometheus/client_model v0.5.0 // indirect
47-
github.com/prometheus/common v0.44.0 // indirect
48-
github.com/prometheus/procfs v0.12.0 // indirect
46+
github.com/prometheus/client_model v0.6.1 // indirect
47+
github.com/prometheus/common v0.55.0 // indirect
48+
github.com/prometheus/procfs v0.15.1 // indirect
4949
github.com/spf13/pflag v1.0.5 // indirect
50-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
51-
golang.org/x/net v0.17.0 // indirect
52-
golang.org/x/oauth2 v0.13.0 // indirect
53-
golang.org/x/sys v0.13.0 // indirect
54-
golang.org/x/term v0.13.0 // indirect
55-
golang.org/x/text v0.13.0 // indirect
56-
golang.org/x/time v0.3.0 // indirect
50+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
51+
golang.org/x/net v0.26.0 // indirect
52+
golang.org/x/oauth2 v0.21.0 // indirect
53+
golang.org/x/sys v0.21.0 // indirect
54+
golang.org/x/term v0.21.0 // indirect
55+
golang.org/x/text v0.16.0 // indirect
56+
golang.org/x/time v0.5.0 // indirect
5757
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
58-
google.golang.org/appengine v1.6.8 // indirect
59-
google.golang.org/protobuf v1.31.0 // indirect
58+
google.golang.org/protobuf v1.34.2 // indirect
6059
gopkg.in/inf.v0 v0.9.1 // indirect
6160
gopkg.in/yaml.v2 v2.4.0 // indirect
6261
gopkg.in/yaml.v3 v3.0.1 // indirect
63-
k8s.io/apiextensions-apiserver v0.28.3 // indirect
64-
k8s.io/component-base v0.28.3 // indirect
65-
k8s.io/klog/v2 v2.100.1 // indirect
66-
k8s.io/kube-openapi v0.0.0-20231009201959-f62364c3c354 // indirect
67-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
62+
k8s.io/klog/v2 v2.130.1 // indirect
63+
k8s.io/kube-openapi v0.0.0-20240620174524-b456828f718b // indirect
64+
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
6865
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
69-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
70-
sigs.k8s.io/yaml v1.3.0 // indirect
66+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
67+
sigs.k8s.io/yaml v1.4.0 // indirect
7168
)

0 commit comments

Comments
 (0)