Skip to content
This repository has been archived by the owner on Jan 12, 2024. It is now read-only.

build: merge dependency updates from master to release-0.27 #1040

Merged
merged 21 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8849870
build(deps): update google-github-actions/release-please-action actio…
renovate[bot] Jul 25, 2023
8807f90
build(deps): update golang.org/x/exp digest to 302865e (#1014)
renovate[bot] Jul 25, 2023
7f6744c
build(deps): update kubernetes packages to v0.26.7 (#1012)
renovate[bot] Jul 25, 2023
e2821a2
fix: add override for google.golang.org/protobuf v1.30.0 (#1016)
j-poecher Jul 26, 2023
be2c99c
build: release 0.27.1 (#1017)
github-actions[bot] Jul 31, 2023
f40ee11
build: merge pull request #1018 from keptn-contrib/merge-release-0.27…
j-poecher Jul 31, 2023
e9e75b2
build(deps): update google-github-actions/release-please-action actio…
renovate[bot] Nov 23, 2023
cd79e4e
build(deps): update module google.golang.org/protobuf to v1.31.0 (#1019)
renovate[bot] Nov 23, 2023
2fdd159
build(deps): update actions/checkout action to v4 (#1028)
renovate[bot] Nov 23, 2023
dd96583
build(deps): update dawidd6/action-download-artifact action to v2.28.…
renovate[bot] Nov 23, 2023
a4dd73e
build(deps): update actions/setup-go action to v4.1.0 (#1023)
renovate[bot] Nov 23, 2023
34d10f1
build(deps): update golang.org/x/exp digest to 9a3e603 (#1015)
renovate[bot] Nov 23, 2023
a1dee65
build(deps): update kubernetes packages to v0.26.11 (#1026)
renovate[bot] Nov 23, 2023
08659e6
build(deps): update reviewdog/action-golangci-lint action to v2.3.6 (…
renovate[bot] Nov 23, 2023
e057ae2
build(deps): update golang docker tag to v1.20.10 (#1020)
renovate[bot] Nov 23, 2023
38a7827
build(deps): update module github.com/keptn/go-utils to v0.20.3 (#1021)
renovate[bot] Nov 23, 2023
e4167d4
build(deps): update kubernetes packages to v0.27.8 (#1035)
renovate[bot] Nov 24, 2023
2dbac1c
build(deps): bump go.opentelemetry.io/contrib/instrumentation/net/htt…
dependabot[bot] Nov 24, 2023
9a8c421
build(deps): bump github.com/nats-io/nkeys from 0.4.4 to 0.4.6 (#1034)
dependabot[bot] Nov 24, 2023
92d8478
build(deps): update reviewdog/action-golangci-lint action to v2.5.0 (…
renovate[bot] Nov 24, 2023
a30fb1d
Merge branch 'master' into prepare-changes-for-release-0.27.2
j-poecher Nov 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/unit-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ runs:
using: "composite"
steps:
- name: Check out code.
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
- name: Install Go
uses: actions/setup-go@v4.0.1
uses: actions/setup-go@v4.1.0
with:
go-version-file: "go.mod"
- name: Test
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Check out repository
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
- name: Unit tests
uses: ./.github/actions/unit-tests

Expand All @@ -51,7 +51,7 @@ jobs:
NEXT-VERSION: ${{ steps.verify-next-version.outputs.NEXT-VERSION }}
steps:
- name: Checkout repo
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
- name: Overwrite version variable from prepare_ci_run in case of a release-please-branch
id: verify-next-version
run: |
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
GIT_SHA: ${{ needs.prepare_ci_run.outputs.GIT_SHA }}
steps:
- name: Checkout Code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1

- name: Load CI Environment from .ci_env
id: load_ci_env
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
GIT_SHA: ${{ needs.prepare_ci_run.outputs.GIT_SHA }}
steps:
- name: Checkout Code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1

- name: Load CI Environment from .ci_env
id: load_ci_env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-helm-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
RELEASE_BUILD: ${{ inputs.release }}
steps:
- name: Checkout Code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1

# load Image variable from .ci_env
- name: Load CI Environment from .ci_env
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
branch: ${{ steps.current_branch.outputs.branch }}
steps:
- name: Checkout repo
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
token: ${{ secrets.KEPTN_BOT_TOKEN }}
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
KEPTN_BOT_NAME: ${{ env.KEPTN_BOT_NAME }}
KEPTN_BOT_EMAIL: ${{ env.KEPTN_BOT_EMAIL }}
id: release_please
uses: google-github-actions/release-please-action@v3.7.11
uses: google-github-actions/release-please-action@v3.7.13
with:
command: release-pr
release-type: go
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:

- name: Checkout repo
if: ${{ !needs.release-please.outputs.release_created }}
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
ref: release-please--branches--${{ needs.prepare.outputs.branch }}--components--dynatrace-service
fetch-depth: 0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
branch: ${{ steps.current_branch.outputs.branch }}
steps:
- name: Checkout repo
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
token: ${{ secrets.KEPTN_BOT_TOKEN }}
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
KEPTN_BOT_NAME: ${{ env.KEPTN_BOT_NAME }}
KEPTN_BOT_EMAIL: ${{ env.KEPTN_BOT_EMAIL }}
id: release_please
uses: google-github-actions/release-please-action@v3.7.11
uses: google-github-actions/release-please-action@v3.7.13
with:
command: github-release
release-type: go
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
VERSION: ${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }}.${{ needs.release-please.outputs.patch }}
steps:
- name: Checkout Code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1

# load DOCKER_ORGANIZATION & IMAGE variable from .ci_env
- name: Load CI Environment from .ci_env
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create_release_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
BRANCH: ${{ steps.determine_branch.outputs.BRANCH }}
steps:
- name: Check out code.
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1

- name: Create downloads folder
run: mkdir ~/downloads
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
REPO_SLUG: "keptn-contrib/dynatrace-service"
steps:
- name: Check out code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1

- name: Debug - Output Branch
run: echo $BRANCH
Expand All @@ -89,7 +89,7 @@ jobs:
echo "::set-output name=RUN_ID::$RUN_ID"

- name: Download all artifacts from last successful build of specified branch
uses: dawidd6/action-download-artifact@v2.27.0
uses: dawidd6/action-download-artifact@v2.28.0
with:
github_token: ${{secrets.GITHUB_TOKEN}}
# Required, workflow file name or ID
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Check out repository
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
- name: Unit tests
uses: ./.github/actions/unit-tests

Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
fi

- name: Checkout repo
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
token: ${{ secrets.KEPTN_BOT_TOKEN }}
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
VERSION: ${{ needs.prepare.outputs.next-version }}
steps:
- name: Checkout Code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1

# load DOCKER_ORGANIZATION & IMAGE variable from .ci_env
- name: Load CI Environment from .ci_env
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
needs: [prepare, docker_build, build-helm-chart]
steps:
- name: Checkout repo
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
token: ${{ secrets.KEPTN_BOT_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Check out repository
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
- name: Unit tests
uses: ./.github/actions/unit-tests

Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
fi

- name: Checkout repo
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
token: ${{ secrets.KEPTN_BOT_TOKEN }}
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
VERSION: ${{ needs.prepare.outputs.next-version }}
steps:
- name: Checkout Code
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1

# load DOCKER_ORGANIZATION & IMAGE variable from .ci_env
- name: Load CI Environment from .ci_env
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
needs: [prepare, docker_build, build-helm-chart]
steps:
- name: Checkout repo
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
token: ${{ secrets.KEPTN_BOT_TOKEN }}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/reviewdog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code.
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
- name: golangci-lint
uses: reviewdog/action-golangci-lint@v2.3.3
uses: reviewdog/action-golangci-lint@v2.5.0
with:
go_version_file: "go.mod"
tool_name: "github-pr-review"
github_token: ${{ secrets.GITHUB_TOKEN }}
fail_on_error: true
reviewdog_version: v0.14.2
golangci_lint_version: v1.53.3
golangci_lint_flags: "--timeout=10m"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Use the offical Golang image to create a build artifact.
# This is based on Debian and sets the GOPATH to /go.
# https://hub.docker.com/_/golang
FROM golang:1.20.6 as builder
FROM golang:1.20.10 as builder

ARG version=develop

Expand Down
61 changes: 31 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,72 +5,73 @@ go 1.20
require (
github.com/cloudevents/sdk-go/v2 v2.14.0
github.com/go-test/deep v1.1.0
github.com/keptn/go-utils v0.20.1
github.com/keptn/go-utils v0.20.3
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
golang.org/x/exp v0.0.0-20230725012225-302865e7556b
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.26.7
k8s.io/apimachinery v0.26.7
k8s.io/client-go v0.26.7
k8s.io/api v0.27.8
k8s.io/apimachinery v0.27.8
k8s.io/client-go v0.27.8
)

require (
github.com/avast/retry-go v3.0.0+incompatible // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/cloudevents/sdk-go/observability/opentelemetry/v2 v2.13.0 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/cloudevents/sdk-go/observability/opentelemetry/v2 v2.14.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // 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/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // 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/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/mailru/easyjson v0.7.7 // 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/nats-io/nats.go v1.24.0 // indirect
github.com/nats-io/nkeys v0.3.0 // indirect
github.com/nats-io/nats.go v1.28.0 // indirect
github.com/nats-io/nkeys v0.4.6 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
go.opentelemetry.io/otel v1.18.0 // indirect
go.opentelemetry.io/otel/metric v1.18.0 // indirect
go.opentelemetry.io/otel/trace v1.18.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.6.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // 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
)

replace google.golang.org/protobuf => google.golang.org/protobuf v1.30.0
replace google.golang.org/protobuf => google.golang.org/protobuf v1.31.0
Loading
Loading