Skip to content

Commit

Permalink
chore(deps): update go from 1.20.5 to 1.20.6 (#7414)
Browse files Browse the repository at this point in the history
* chore(deps): bump golang from 1.20.5 to 1.20.6

Signed-off-by: Charly Molter <charly.molter@konghq.com>

* chore(deps): update to testcontainers main

Signed-off-by: slonka <slonka@users.noreply.github.com>

* chore: update dependencies.lock

Signed-off-by: Bart Smykla <bartek@smykla.com>

---------

Signed-off-by: Charly Molter <charly.molter@konghq.com>
Signed-off-by: Krzysztof Słonka <slonka@users.noreply.github.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
Signed-off-by: Bart Smykla <bartek@smykla.com>
Co-authored-by: Charly Molter <charly.molter@konghq.com>
Co-authored-by: Bart Smykla <bartek@smykla.com>
  • Loading branch information
3 people authored and kumahq[bot] committed Aug 2, 2023
1 parent 0167e60 commit b4c2e3f
Show file tree
Hide file tree
Showing 11 changed files with 352 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ parameters:
# These parameters are not meant to be changed they are more constants for the build change these in mk/dev.mk
go_version:
type: string
default: "1.20.5"
default: "1.20.6"
first_k8s_version:
type: string
default: "v1.20.15-k3s1"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/blackbox-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: "Set up Go"
uses: actions/setup-go@v4
with:
go-version: "1.20.5"
go-version: "1.20.6"
- name: "Configure go modules cache"
uses: actions/cache@v3
with:
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Golangci-lint
on:
push:
branches:
- master
- release-*
pull_request:
permissions:
contents: read
jobs:
golangci:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
cache: false
go-version: 1.20.6
- uses: golangci/golangci-lint-action@v3
with:
args: --verbose
version: v1.53.3
2 changes: 1 addition & 1 deletion .github/workflows/pr-comments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
GITHUB_TOKEN: ${{ steps.github-app-token.outputs.token }}
- uses: actions/setup-go@v4
with:
go-version: "1.20.5"
go-version: "1.20.6"
- uses: actions/cache@v3
with:
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
steps:
- uses: actions/setup-go@v4
with:
go-version: "1.20.5"
go-version: "1.20.6"
- name: install-kuma-ci-tools
run: |
echo $(go env GOPATH)/bin >> $GITHUB_PATH
Expand Down
73 changes: 73 additions & 0 deletions .github/workflows/update-docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: "Update docs"
on:
workflow_dispatch: {}
schedule:
- cron: 0 8 * * *
env:
DOCS_REPO: kumahq/kuma-website
OUTPUT_PATH: app/docs
VERSION_FILE: app/_data/versions.yml
EDITION: kuma
jobs:
generate-docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: master
path: repo
- uses: actions/setup-go@v4
with:
go-version: "1.20.6"
- name: "sync docs" # loop over all the branches and generate the docs
run: |
cd repo
for b in $(jq -r '.[]' active-branches.json); do
name=$(echo "${b}" | sed 's/release-\(.*\)/\1.x/g' | sed 's/master/dev/g')
echo "${b} ${name}"
git checkout --force "${b}"
mkdir -p ../docs-build/${name}
cp -R docs/generated/raw/* ../docs-build/${name}/
mkdir -p ../docs-build/raw
if [[ "${b}" == "master" ]]; then
if [[ -f UPGRADE.md ]]; then
cp UPGRADE.md ../docs-build/raw/
fi
cp CHANGELOG.md ../docs-build/raw/
cp versions.yml ../docs-build/raw/
fi
done
- uses: actions/checkout@v3
with:
repository: ${{ env.DOCS_REPO }}
path: docs
- name: "update versions"
run: |
cd docs
cp -R ../docs-build/* ${{ env.OUTPUT_PATH }}/
yq -i 'del(.[] | select(.edition == "${{ env.EDITION }}")) | . += load("${{ env.OUTPUT_PATH}}/raw/versions.yml")' ${{ env.VERSION_FILE }}
rm ${{ env.OUTPUT_PATH }}/raw/versions.yml
- name: Generate GitHub app token
id: github-app-token
uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92 # v1.8.0
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}
- name: "Create Pull Request"
uses: peter-evans/create-pull-request@v5
with:
path: docs
commit-message: "chore(deps): update docs from repo source"
signoff: true
branch: chore/docs-sync-${{github.repository}}
body: |
Syncing docs from source code.
Generated by [action](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
delete-branch: true
title: "chore(deps): update docs from repo source"
draft: false
token: ${{ steps.github-app-token.outputs.token }}
committer: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
author: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
2 changes: 1 addition & 1 deletion .github/workflows/update-insecure-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
ref: ${{ matrix.branch }}
- uses: actions/setup-go@v4
with:
go-version: "1.20.5"
go-version: "1.20.6"
- name: "Install tools"
run: |
go install github.com/google/osv-scanner/cmd/osv-scanner@v1
Expand Down
76 changes: 73 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,22 @@ require (
github.com/slok/go-http-metrics v0.10.0
github.com/soheilhy/cmux v0.1.5
github.com/spf13/cobra v1.7.0
<<<<<<< HEAD
github.com/spf13/viper v1.15.0
github.com/spiffe/go-spiffe/v2 v2.1.4
github.com/testcontainers/testcontainers-go v0.18.0
=======
github.com/spf13/viper v1.16.0
github.com/spiffe/go-spiffe/v2 v2.1.6
github.com/testcontainers/testcontainers-go v0.21.1-0.20230802082724-c0797a06f2c2 // UPDATE TO RELEASE TAG ASAP
github.com/tonglil/opentelemetry-go-datadog-propagator v0.1.0
>>>>>>> d75a50fd5 (chore(deps): update go from 1.20.5 to 1.20.6 (#7414))
github.com/vishvananda/netlink v1.2.1-beta.2
github.com/vishvananda/netns v0.0.4
go.opentelemetry.io/proto/otlp v0.19.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.24.0
<<<<<<< HEAD
golang.org/x/exp v0.0.0-20230124195608-d38c7dcee874
golang.org/x/net v0.8.0
golang.org/x/sync v0.1.0 // indirect
Expand All @@ -64,6 +72,18 @@ require (
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4
google.golang.org/grpc v1.54.0
google.golang.org/protobuf v1.30.0
=======
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
golang.org/x/net v0.13.0
golang.org/x/sys v0.10.0
golang.org/x/text v0.11.0
golang.org/x/time v0.3.0
gonum.org/v1/gonum v0.13.0
google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731193218-e0aa005b6bdf
google.golang.org/grpc v1.57.0
google.golang.org/protobuf v1.31.0
>>>>>>> d75a50fd5 (chore(deps): update go from 1.20.5 to 1.20.6 (#7414))
gopkg.in/natefinch/lumberjack.v2 v2.2.1
helm.sh/helm/v3 v3.11.2
istio.io/pkg v0.0.0-20221115183735-2aabb09bf0bb
Expand All @@ -83,12 +103,21 @@ require (
)

require (
<<<<<<< HEAD
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.18.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/logging v1.7.0 // indirect
cloud.google.com/go/longrunning v0.4.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
=======
cloud.google.com/go v0.110.4 // indirect
cloud.google.com/go/compute v1.20.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/logging v1.7.0 // indirect
cloud.google.com/go/longrunning v0.5.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
>>>>>>> d75a50fd5 (chore(deps): update go from 1.20.5 to 1.20.6 (#7414))
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
Expand All @@ -98,12 +127,22 @@ require (
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
<<<<<<< HEAD
github.com/containerd/containerd v1.7.0 // indirect
=======
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
github.com/containerd/containerd v1.7.3 // indirect
github.com/cpuguy83/dockercfg v0.3.1 // indirect
>>>>>>> d75a50fd5 (chore(deps): update go from 1.20.5 to 1.20.6 (#7414))
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
<<<<<<< HEAD
github.com/docker/docker v23.0.3+incompatible // indirect
=======
github.com/docker/docker v24.0.5+incompatible // indirect
>>>>>>> d75a50fd5 (chore(deps): update go from 1.20.5 to 1.20.6 (#7414))
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
Expand All @@ -122,15 +161,27 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.2.0 // indirect
<<<<<<< HEAD
github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
=======
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
>>>>>>> d75a50fd5 (chore(deps): update go from 1.20.5 to 1.20.6 (#7414))
github.com/gruntwork-io/go-commons v0.8.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/hcl v1.0.1-0.20190430135223-99e2f22d1c94 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
<<<<<<< HEAD
github.com/imdario/mergo v0.3.13 // indirect
=======
github.com/imdario/mergo v0.3.16 // indirect
>>>>>>> d75a50fd5 (chore(deps): update go from 1.20.5 to 1.20.6 (#7414))
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
Expand All @@ -139,7 +190,7 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.0 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
Expand All @@ -160,16 +211,22 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
github.com/opencontainers/runc v1.1.5 // indirect
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
github.com/opencontainers/runc v1.1.8 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pquerna/otp v1.2.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
<<<<<<< HEAD
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
=======
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
>>>>>>> d75a50fd5 (chore(deps): update go from 1.20.5 to 1.20.6 (#7414))
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.8.3 // indirect
Expand All @@ -180,6 +237,7 @@ require (
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
<<<<<<< HEAD
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
Expand All @@ -188,6 +246,18 @@ require (
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/api v0.110.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
=======
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/tools v0.11.1 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/api v0.126.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e // indirect
>>>>>>> d75a50fd5 (chore(deps): update go from 1.20.5 to 1.20.6 (#7414))
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit b4c2e3f

Please sign in to comment.