Skip to content

Commit

Permalink
Update dependencies (#230)
Browse files Browse the repository at this point in the history
Co-authored-by: Amanda Hager Lopes de Andrade Katz <[email protected]>
  • Loading branch information
lucasmdrs and Amanda Hager Lopes de Andrade Katz authored Oct 12, 2022
1 parent 9ddac64 commit 79fa2b4
Show file tree
Hide file tree
Showing 12 changed files with 468 additions and 179 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# Folders
_obj
_test
_tmp

# Architecture specific extensions/prefixes
*.[568vq]
Expand Down
16 changes: 14 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ VERSION ?= "0.0.0-dev-$(shell git rev-parse --short HEAD)"
GOHOSTOS=$(shell go env GOHOSTOS)
GOHOSTARCH=$(shell go env GOHOSTARCH)

.PHONY: all clean test-unit build
.PHONY: all clean update-codegen verify-codegen test-unit build

all: clean test-unit build
all: clean update-codegen verify-codegen test-unit build

# Cleans our project: deletes binaries
clean:
Expand Down Expand Up @@ -43,3 +43,15 @@ apply-crd:
dev-lint:
@printf "$(OK_COLOR)==> Linting code$(NO_COLOR)\n"
@docker run --rm -v $(CURDIR):/app -w /app golangci/golangci-lint:v1.42.1 golangci-lint run -v

update-codegen:
@printf "$(OK_COLOR)==> Running codegen update$(NO_COLOR)\n"
@go mod vendor
@./hack/update-codegen.sh
@rm -rf _tmp

verify-codegen:
@printf "$(OK_COLOR)==> Running codegen verification$(NO_COLOR)\n"
@go mod vendor
@./hack/verify-codegen.sh

20 changes: 17 additions & 3 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,27 @@ make apply-crd
go mod vendor
```

### 4. Build Kangal binary
### 4. Verify changes in generated code

```bash
make verify-codegen
```

In case of message "is out of date", it's necessary to run:

```bash
make update-codegen
```

**Attention**: Changes to generated code could represent changes to CRDs and possible break backwards compatibility

### 5. Build Kangal binary

```bash
make build
```

### 5. Set the environment variables
### 6. Set the environment variables

``` bash
export AWS_BUCKET_NAME=YOUR_BUCKET_NAME # name of the bucket for saving reports
Expand All @@ -133,7 +147,7 @@ export KANGAL_PROXY_URL=http://localhost:8080 # used to persist reports

For the full list of possible environment variables check [Kangal environment variables](env-vars.md)

### 6. Run both Kangal proxy and controller
### 7. Run both Kangal proxy and controller

```bash
WEB_HTTP_PORT=8888 ./kangal controller --kubeconfig=$KUBECONFIG
Expand Down
81 changes: 42 additions & 39 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,91 +3,94 @@ module github.com/hellofresh/kangal
go 1.17

require (
contrib.go.opencensus.io/exporter/prometheus v0.4.1
contrib.go.opencensus.io/exporter/prometheus v0.4.2
github.com/felixge/httpsnoop v1.0.3
github.com/go-chi/chi/v5 v5.0.7
github.com/go-chi/render v1.0.1
github.com/go-chi/render v1.0.2
github.com/golang/mock v1.6.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/minio/minio-go/v6 v6.0.57
github.com/rs/cors v1.8.2
github.com/spf13/afero v1.9.0
github.com/spf13/afero v1.9.2
github.com/spf13/cobra v1.5.0
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.0
github.com/technosophos/moniker v0.0.0-20210218184952-3ea787d3943b
github.com/tidwall/sjson v1.2.4
github.com/tidwall/sjson v1.2.5
go.opencensus.io v0.23.0
go.uber.org/zap v1.21.0
k8s.io/api v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/client-go v0.22.2
k8s.io/code-generator v0.22.2
go.uber.org/zap v1.23.0
k8s.io/api v0.25.1
k8s.io/apimachinery v0.25.1
k8s.io/client-go v0.25.1
k8s.io/code-generator v0.25.1
)

require (
github.com/ajg/form v1.5.1 // indirect
github.com/benbjohnson/clock v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // 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-openapi/swag v0.21.1 // 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/google/go-cmp v0.5.8 // 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/googleapis/gnostic v0.5.5 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.0.14 // indirect
github.com/klauspost/cpuid/v2 v2.1.2 // indirect
github.com/kr/pretty v0.2.1 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.35.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/statsd_exporter v0.22.5 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/statsd_exporter v0.22.8 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tidwall/gjson v1.14.1 // indirect
github.com/tidwall/gjson v1.14.3 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/net v0.0.0-20220630215102-69896b714898 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
golang.org/x/net v0.0.0-20221004154528-8021a29435af // indirect
golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
golang.org/x/sys v0.0.0-20221010170243-090e33056c14 // indirect
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
golang.org/x/tools v0.1.11 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
golang.org/x/tools v0.1.12 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20210915024840-94424faaec1f // indirect
k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
k8s.io/gengo v0.0.0-20221003092416-e83a76d3209c // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20220928191237-829ce0c27909 // indirect
k8s.io/utils v0.0.0-20221011040102-427025108f67 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 79fa2b4

Please sign in to comment.