Skip to content

Commit

Permalink
update dependencies and CI (#340)
Browse files Browse the repository at this point in the history
* update dependencies and CI

* typo

* Fix config

* try something
  • Loading branch information
sudermanjr authored May 30, 2023
1 parent 0cfc20b commit 0435d65
Show file tree
Hide file tree
Showing 4 changed files with 140 additions and 111 deletions.
41 changes: 19 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
version: 2.1

orbs:
rok8s: fairwinds/rok8s-scripts@11
rok8s: fairwinds/rok8s-scripts@12
oss-docs: fairwinds/oss-docs@0

executors:
golang-exec:
docker:
- image: cimg/go:1.19
- image: cimg/go:1.20

references:
e2e_config: &e2e_config
command_runner_image: quay.io/reactiveops/ci-images:v11-stretch
e2e_configuration: &e2e_configuration
command_runner_image: quay.io/reactiveops/ci-images:v12-buster
executor: golang-exec
pre_script: e2e/pre.sh
store-test-results: /tmp/test-results
Expand All @@ -29,14 +29,15 @@ references:
command: |
apk --update add curl yq
cd /tmp
curl -LO https://releases.hashicorp.com/vault/1.9.10/vault_1.9.10_linux_amd64.zip
unzip vault_1.9.10_linux_amd64.zip
curl -LO https://releases.hashicorp.com/vault/1.13.2/vault_1.13.2_linux_amd64.zip
sha256sum vault_1.13.2_linux_amd64.zip | grep f7930279de8381de7c532164b4a4408895d9606c0d24e2e9d2f9acb5dfe99b3c
unzip vault_1.13.2_linux_amd64.zip
mv vault /usr/bin/vault
jobs:
test:
working_directory: /home/circleci/go/src/github.com/fairwindsops/rbac-lookup
docker:
- image: cimg/go:1.19
- image: cimg/go:1.20
environment:
GO111MODULE: "on"
steps:
Expand All @@ -47,7 +48,7 @@ jobs:
working_directory: /go/src/github.com/fairwindsops/rbac-lookup
resource_class: large
docker:
- image: goreleaser/goreleaser:v1.13.1
- image: goreleaser/goreleaser:v1.18.2
steps:
- checkout
- setup_remote_docker
Expand All @@ -59,7 +60,7 @@ jobs:
resource_class: large
working_directory: /go/src/github.com/fairwindsops/rbac-lookup
docker:
- image: goreleaser/goreleaser:v1.13.1
- image: goreleaser/goreleaser:v1.18.2
steps:
- checkout
- setup_remote_docker
Expand Down Expand Up @@ -89,21 +90,17 @@ workflows:
tags:
ignore: /.*/
- rok8s/kubernetes_e2e_tests:
name: "End-To-End Kubernetes 1.19"
kind_node_image: "kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729"
<<: *e2e_config
name: "End-To-End Kubernetes 1.23"
kind_node_image: "kindest/node:v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61"
<<: *e2e_configuration
- rok8s/kubernetes_e2e_tests:
name: "End-To-End Kubernetes 1.20"
kind_node_image: "kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9"
<<: *e2e_config
name: "End-To-End Kubernetes 1.24"
kind_node_image: "kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315"
<<: *e2e_configuration
- rok8s/kubernetes_e2e_tests:
name: "End-To-End Kubernetes 1.21"
kind_node_image: "kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6"
<<: *e2e_config
- rok8s/kubernetes_e2e_tests:
name: "End-To-End Kubernetes 1.22"
kind_node_image: "kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047"
<<: *e2e_config
name: "End-To-End Kubernetes 1.25"
kind_node_image: "kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1"
<<: *e2e_configuration
release:
jobs:
- release:
Expand Down
2 changes: 1 addition & 1 deletion e2e/pre.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

set -e

go build -ldflags "-s -w" -o rbac-lookup
CGO_ENABLED=0 go build -ldflags "-s -w" -o rbac-lookup

docker cp ./ e2e-command-runner:/rbac-lookup
55 changes: 29 additions & 26 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
module github.com/fairwindsops/rbac-lookup

go 1.19
go 1.20

require (
github.com/spf13/cobra v1.6.1
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.1
golang.org/x/net v0.5.0
golang.org/x/oauth2 v0.4.0
google.golang.org/api v0.109.0
k8s.io/api v0.26.1
k8s.io/apimachinery v0.26.1
k8s.io/client-go v0.26.1
golang.org/x/net v0.10.0
golang.org/x/oauth2 v0.8.0
google.golang.org/api v0.124.0
k8s.io/api v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
)

require (
cloud.google.com/go/compute v1.14.0 // indirect
cloud.google.com/go/compute v1.19.3 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.9.1 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -44,20 +45,22 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
google.golang.org/grpc v1.51.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/grpc v1.55.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221205233837-bacb3aba404b // indirect
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // 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
Expand Down
Loading

0 comments on commit 0435d65

Please sign in to comment.