Skip to content

Commit

Permalink
Update depdencies (#507)
Browse files Browse the repository at this point in the history
* bump argo images to v3.5.5

* update golang to 1.22 + update dependencies
  • Loading branch information
hendrikKahl authored Mar 12, 2024
1 parent b4fce04 commit 46551fe
Show file tree
Hide file tree
Showing 14 changed files with 170 additions and 184 deletions.
2 changes: 1 addition & 1 deletion .test-defs/conformanceTestgrid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
export E2E_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH/shoot.config &&
export GARDEN_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH/gardener.config &&
go run -mod=mod ./integration-tests/e2e --cleanUpAfterwards=true --flakeAttempts=1
image: golang:1.21
image: golang:1.22
resources:
requests:
memory: "500Mi"
Expand Down
2 changes: 1 addition & 1 deletion .test-defs/conformanceTestgridParallel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
export E2E_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH/shoot.config &&
export GARDEN_KUBECONFIG_PATH=$TM_KUBECONFIG_PATH/gardener.config &&
go run -mod=mod ./integration-tests/e2e --cleanUpAfterwards=true --flakeAttempts=5 --retryFailedTestcases=true
image: golang:1.21
image: golang:1.22
resources:
requests:
memory: "500Mi"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0

############# builder #############
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /go/src/github.com/gardener/test-infra

Expand All @@ -29,7 +29,7 @@ WORKDIR /
ENTRYPOINT ["/testmachinery-controller"]

############# tm-base-step #############
FROM golang:1.21-alpine AS base-step
FROM golang:1.22-alpine AS base-step

ENV HELM_TILLER_VERSION=v2.16.12
ENV KUBECTL_VERSION=v1.26.6
Expand Down
6 changes: 3 additions & 3 deletions charts/testmachinery/charts/argo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

# overriden in images.yaml
images:
argo-workflow-controller: quay.io/argoproj/workflow-controller:v3.5.4
argo-executor: quay.io/argoproj/argoexec:v3.5.4
argo-server: quay.io/argoproj/argocli:v3.5.4
argo-workflow-controller: quay.io/argoproj/workflow-controller:v3.5.5
argo-executor: quay.io/argoproj/argoexec:v3.5.5
argo-server: quay.io/argoproj/argocli:v3.5.5

argo:
name: workflow-controller
Expand Down
6 changes: 3 additions & 3 deletions charts/testmachinery/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ reserve-excess-capacity:

argo:
images:
argo-workflow-controller: quay.io/argoproj/workflow-controller:v3.5.4
argo-executor: quay.io/argoproj/argoexec:v3.5.4
argo-server: quay.io/argoproj/argocli:v3.5.4
argo-workflow-controller: quay.io/argoproj/workflow-controller:v3.5.5
argo-executor: quay.io/argoproj/argoexec:v3.5.5
argo-server: quay.io/argoproj/argocli:v3.5.5

argo:
name: workflow-controller
Expand Down
2 changes: 1 addition & 1 deletion cmd/cncf-conformance-pr-creator/gardener_readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Set the `KUBECONFIG` as path to the kubeconfig file of your newly created cluste

```bash
#first set KUBECONFIG to your cluster
docker run -ti -e --rm -v $KUBECONFIG:/mye2e/shoot.config golang:1.21 bash
docker run -ti -e --rm -v $KUBECONFIG:/mye2e/shoot.config golang:1.22 bash
# run all commands below within container
go get github.com/gardener/test-infra; cd /go/src/github.com/gardener/test-infra
export GO111MODULE=on; export E2E_EXPORT_PATH=/tmp/export; export KUBECONFIG=/mye2e/shoot.config; export GINKGO_PARALLEL=false
Expand Down
4 changes: 2 additions & 2 deletions docs/testmachinery/GetStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
# Arguments to the entrypoint. The docker image's CMD is used if this is not provided.
args: ["test.sh"]

image: golang:1.21 # optional, default image is "europe-docker.pkg.dev/gardener-project/releases/testmachinery/base-step:latest"
image: golang:1.22 # optional, default image is "europe-docker.pkg.dev/gardener-project/releases/testmachinery/base-step:latest"

# optional; Configuration of a TestDefinition.
# Environment Variables can be configured per TestDefinition
Expand Down Expand Up @@ -159,7 +159,7 @@ The Testmachinery provides some images to run your Integration Tests (Dockerfile

#### Golang image (europe-docker.pkg.dev/gardener-project/releases/testmachinery/golang:latest) <!-- omit in toc -->
- FROM base image
- Golang v1.21
- Golang v1.22
- ginkgo test suite at $GOPATH/src/github.com/onsi/ginkgo
- Go project setup script
- automatically setup test repository at the provided gopath and cd's into it
Expand Down
87 changes: 43 additions & 44 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
module github.com/gardener/test-infra

go 1.21
go 1.22.1

require (
cloud.google.com/go/storage v1.36.0
cloud.google.com/go/storage v1.38.0
github.com/Masterminds/semver/v3 v3.2.1
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/Masterminds/sprig/v3 v3.2.3
github.com/argoproj/argo-workflows/v3 v3.5.4
github.com/argoproj/argo-workflows/v3 v3.5.5
github.com/bradleyfalzon/ghinstallation/v2 v2.8.0
github.com/fsnotify/fsnotify v1.7.0
github.com/gardener/gardener v1.88.0
github.com/gardener/gardener v1.90.1
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v1.4.1
github.com/go-logr/zapr v1.3.0
github.com/golang/mock v1.6.0
github.com/google/go-github/v54 v54.0.0
github.com/google/uuid v1.5.0
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.1
github.com/gorilla/sessions v1.2.2
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
Expand All @@ -25,19 +25,19 @@ require (
github.com/mandelsoft/logging v0.0.0-20230905123808-7042ee3aae45
github.com/minio/minio-go v6.0.14+incompatible
github.com/olekukonko/tablewriter v0.0.5
github.com/onsi/ginkgo/v2 v2.14.0
github.com/onsi/gomega v1.30.0
github.com/onsi/ginkgo/v2 v2.15.0
github.com/onsi/gomega v1.31.1
github.com/open-component-model/ocm v0.5.0
github.com/peterbourgon/diskv v2.0.1+incompatible
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.17.0
go.uber.org/mock v0.3.0
go.uber.org/zap v1.26.0
github.com/spf13/viper v1.18.2
go.uber.org/mock v0.4.0
go.uber.org/zap v1.27.0
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/oauth2 v0.17.0
golang.org/x/oauth2 v0.18.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.14.2
k8s.io/api v0.29.2
Expand All @@ -47,14 +47,14 @@ require (
k8s.io/code-generator v0.29.2
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1
k8s.io/metrics v0.29.2
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
sigs.k8s.io/controller-runtime v0.17.2
sigs.k8s.io/yaml v1.4.0
)

require (
cloud.google.com/go v0.112.0 // indirect
cloud.google.com/go/compute v1.23.4 // indirect
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/compute v1.24.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
filippo.io/edwards25519 v1.0.0 // indirect
Expand Down Expand Up @@ -121,15 +121,14 @@ require (
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231024185945-8841054dbdb8 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/bronze1man/yaml2json v0.0.0-20211227013850-8972abeaea25 // indirect
github.com/buildkite/agent/v3 v3.58.0 // indirect
github.com/buildkite/interpolate v0.0.0-20200526001904-07f35b4ae251 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
github.com/clbanning/mxj/v2 v2.7.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
github.com/containerd/containerd v1.7.11 // indirect
github.com/containerd/containerd v1.7.13 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/containers/image/v5 v5.21.1 // indirect
Expand All @@ -156,10 +155,10 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/ebitengine/purego v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.11.3 // indirect
github.com/evanphx/json-patch v5.8.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fvbommel/sortorder v1.1.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
Expand All @@ -170,13 +169,13 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.21.4 // indirect
github.com/go-openapi/errors v0.20.4 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/loads v0.21.2 // indirect
github.com/go-openapi/runtime v0.26.0 // indirect
github.com/go-openapi/spec v0.20.9 // indirect
github.com/go-openapi/strfmt v0.21.7 // indirect
github.com/go-openapi/swag v0.22.9 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-openapi/validate v0.22.1 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
Expand All @@ -188,7 +187,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/certificate-transparency-go v1.1.7 // indirect
Expand All @@ -204,7 +203,7 @@ require (
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/googleapis/gax-go/v2 v2.12.1 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gowebpki/jcs v1.0.1 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
Expand All @@ -219,7 +218,7 @@ require (
github.com/imdario/mergo v0.3.16 // indirect
github.com/in-toto/in-toto-golang v0.9.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/ironcore-dev/vgopath v0.1.3 // indirect
github.com/ironcore-dev/vgopath v0.1.4 // indirect
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand Down Expand Up @@ -263,7 +262,7 @@ require (
github.com/oklog/ulid v1.3.1 // indirect
github.com/oleiade/reflections v1.0.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/outcaste-io/ristretto v0.2.3 // indirect
github.com/pborman/uuid v1.2.1 // indirect
Expand All @@ -278,7 +277,7 @@ require (
github.com/rivo/uniseg v0.4.4 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sassoftware/relic v7.2.1+incompatible // indirect
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
Expand All @@ -293,8 +292,8 @@ require (
github.com/sigstore/timestamp-authority v1.2.0 // indirect
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spiffe/go-spiffe/v2 v2.1.6 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
Expand All @@ -318,11 +317,11 @@ require (
github.com/zeebo/errs v1.3.0 // indirect
go.mongodb.org/mongo-driver v1.12.1 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
go.opentelemetry.io/otel v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.22.0 // indirect
go.opentelemetry.io/otel/trace v1.22.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
go.opentelemetry.io/otel v1.23.0 // indirect
go.opentelemetry.io/otel/metric v1.23.0 // indirect
go.opentelemetry.io/otel/trace v1.23.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.step.sm/crypto v0.36.1 // indirect
go.uber.org/atomic v1.11.0 // indirect
Expand All @@ -331,23 +330,23 @@ require (
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.16.1 // indirect
golang.org/x/tools v0.18.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/api v0.160.0 // indirect
google.golang.org/api v0.166.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240205150955-31a09d347014 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
google.golang.org/genproto v0.0.0-20240308144416-29370a3891b7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240308144416-29370a3891b7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240308144416-29370a3891b7 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/DataDog/dd-trace-go.v1 v1.56.1 // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand All @@ -362,7 +361,7 @@ require (
k8s.io/klog/v2 v2.120.1 // indirect
oras.land/oras-go v1.2.4 // indirect
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231015215740-bf15e44028f9 // indirect
sigs.k8s.io/controller-tools v0.13.0 // indirect
sigs.k8s.io/controller-tools v0.14.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
Expand Down
Loading

0 comments on commit 46551fe

Please sign in to comment.