Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all non-major dependencies (main) - autoclosed #161

Closed
wants to merge 1 commit into from
Closed

Update all non-major dependencies (main) - autoclosed #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/e2e/package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.suse.com/bci/golang:1.20 AS helm
RUN zypper -n install git
RUN git -C / clone --branch release-v3.9.0 --depth=1 https://github.com/rancher/helm
RUN git -C / clone --branch release-3.16 --depth=1 https://github.com/rancher/helm
RUN make -C /helm

FROM registry.suse.com/bci/golang:1.20
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.dapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ ENV ARCH $DAPPER_HOST_ARCH
RUN zypper -n install git docker vim less file curl wget patch
RUN go install golang.org/x/tools/cmd/goimports@latest
RUN if [ "${ARCH}" == "amd64" ]; then \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.2; \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.63.4; \
fi

ENV YQ_VERSION=v4.30.8
ENV YQ_VERSION=v4.45.1
RUN wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${ARCH} -O /usr/bin/yq && chmod +x /usr/bin/yq;

COPY --from=helm ./helm/bin/helm /usr/local/bin/
Expand Down
2 changes: 1 addition & 1 deletion charts/prometheus-federator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ helmProjectOperator:
cleanup:
image:
repository: rancher/shell
tag: v0.1.19
tag: v0.3.0
pullPolicy: IfNotPresent

## Define which Nodes the Pods are scheduled on.
Expand Down
2 changes: 1 addition & 1 deletion examples/helm-locker/helm-locker-chart-example/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ global:

kubectl:
repository: rancher/kubectl
tag: v1.25.16
tag: v1.27.16
pullPolicy: IfNotPresent

rbac:
Expand Down
38 changes: 19 additions & 19 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@ module github.com/rancher/prometheus-federator

go 1.22

toolchain go1.22.8
toolchain go1.23.5

replace (
k8s.io/api => k8s.io/api v0.22.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.3
k8s.io/apimachinery => k8s.io/apimachinery v0.22.3
k8s.io/api => k8s.io/api v0.27.16
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.16
k8s.io/apimachinery => k8s.io/apimachinery v0.27.16
k8s.io/client-go => github.com/rancher/client-go v1.22.3-rancher.1
k8s.io/code-generator => k8s.io/code-generator v0.22.3
k8s.io/code-generator => k8s.io/code-generator v0.27.16
)

require (
github.com/google/uuid v1.2.0
github.com/hashicorp/go-multierror v1.1.0
github.com/k3s-io/helm-controller v0.13.1
github.com/google/uuid v1.6.0
github.com/hashicorp/go-multierror v1.1.1
github.com/k3s-io/helm-controller v0.16.6
github.com/rancher/lasso v0.0.0-20220303220127-8cf5555ec03c
github.com/rancher/wrangler v0.8.11-0.20220217210408-3ecd23dfea3b
github.com/rancher/wrangler v0.8.11
github.com/rancher/wrangler-cli v0.0.0-20211112052728-f172e9bf59af
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.4.0
github.com/stretchr/testify v1.7.0
golang.org/x/text v0.7.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.10.0
golang.org/x/text v0.21.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
helm.sh/helm/v3 v3.8.0
k8s.io/api v0.23.3
k8s.io/apiextensions-apiserver v0.23.1
k8s.io/apimachinery v0.23.3
k8s.io/client-go v0.23.3
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.17.0
k8s.io/api v0.27.16
k8s.io/apiextensions-apiserver v0.27.16
k8s.io/apimachinery v0.27.16
k8s.io/client-go v0.27.16
)

require (
Expand Down
2 changes: 1 addition & 1 deletion package/Dockerfile-helm-project-operator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ARG TARGETARCH
ENV BUILD_TARGET="helm-project-operator"

WORKDIR /usr/src/app
ENV YQ_VERSION=v4.25.1
ENV YQ_VERSION=v4.45.1
RUN zypper -n install git curl wget make
RUN export ARCH=$(go env GOHOSTARCH)
RUN wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH} -O /usr/bin/yq && chmod +x /usr/bin/yq;
Expand Down
66 changes: 33 additions & 33 deletions tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
module example.com

go 1.22.0
go 1.23.0

toolchain go1.23.1
toolchain go1.23.5

require (
github.com/caarlos0/env/v11 v11.0.0
github.com/caarlos0/env/v11 v11.3.1
github.com/kralicky/kmatch v0.0.0-20240530002100-abef8971a37b
github.com/onsi/ginkgo/v2 v2.17.3
github.com/onsi/gomega v1.33.1
github.com/onsi/ginkgo/v2 v2.22.2
github.com/onsi/gomega v1.36.2
github.com/rancher/helm-locker v0.0.1
k8s.io/api v0.30.1
k8s.io/apiextensions-apiserver v0.30.0
k8s.io/apimachinery v0.30.1
k8s.io/client-go v0.30.0
sigs.k8s.io/controller-runtime v0.18.2
k8s.io/api v0.32.0
k8s.io/apiextensions-apiserver v0.32.0
k8s.io/apimachinery v0.32.0
k8s.io/client-go v0.32.0
sigs.k8s.io/controller-runtime v0.20.1
)

require (
emperror.dev/errors v0.8.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -44,23 +44,23 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/rancher/wrangler v0.8.11-0.20220217210408-3ecd23dfea3b // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.21.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.33.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.28.0 // indirect
google.golang.org/protobuf v1.36.1 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.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.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading
Loading