From 97ef50fc30d12e3129c93c885cbc596eeb5067ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 9 Jun 2024 10:39:19 +0000 Subject: [PATCH 1/2] fix(deps): update grouped non-major updates --- Dockerfile | 2 +- Makefile | 6 +++--- go.mod | 6 +++--- go.sum | 6 ++++++ site/package-lock.json | 10 +++++----- site/package.json | 2 +- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ebd1746..f3175bcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.22.3 AS builder +FROM golang:1.22.4 AS builder ARG TARGETOS TARGETARCH WORKDIR /workspace diff --git a/Makefile b/Makefile index 664eee78..2bf8aead 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ IMG ?= ghcr.io/aenix-io/etcd-operator:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. # renovate: datasource=github-tags depName=kubernetes/kubernetes -ENVTEST_K8S_VERSION ?= v1.30.0 +ENVTEST_K8S_VERSION ?= v1.30.1 ENVTEST_K8S_VERSION_TRIMMED_V = $(subst v,,$(ENVTEST_K8S_VERSION)) # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) @@ -164,7 +164,7 @@ NAMESPACE ?= etcd-operator-system # renovate: datasource=github-tags depName=prometheus-operator/prometheus-operator PROMETHEUS_OPERATOR_VERSION ?= v0.74.0 # renovate: datasource=github-tags depName=jetstack/cert-manager -CERT_MANAGER_VERSION ?= v1.14.5 +CERT_MANAGER_VERSION ?= v1.15.0 ifndef ignore-not-found ignore-not-found = false @@ -256,7 +256,7 @@ KIND_VERSION ?= v0.23.0 # renovate: datasource=github-tags depName=helm/helm HELM_VERSION ?= v3.15.1 # renovate: datasource=github-tags depName=losisin/helm-values-schema-json -HELM_SCHEMA_VERSION ?= v1.3.0 +HELM_SCHEMA_VERSION ?= v1.4.0 # renovate: datasource=github-tags depName=norwoodj/helm-docs HELM_DOCS_VERSION ?= v1.13.1 # renovate: datasource=github-tags depName=mikefarah/yq diff --git a/go.mod b/go.mod index a63b0ddf..59d56a50 100644 --- a/go.mod +++ b/go.mod @@ -3,20 +3,20 @@ module github.com/aenix-io/etcd-operator go 1.22.3 require ( - github.com/go-logr/logr v1.4.1 + github.com/go-logr/logr v1.4.2 github.com/google/uuid v1.6.0 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 go.etcd.io/etcd/client/v3 v3.5.14 - go.uber.org/zap v1.26.0 + go.uber.org/zap v1.27.0 go.uber.org/zap/exp v0.2.0 k8s.io/api v0.30.1 k8s.io/apimachinery v0.30.1 k8s.io/client-go v0.30.1 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 - sigs.k8s.io/controller-runtime v0.18.3 + sigs.k8s.io/controller-runtime v0.18.4 ) require ( diff --git a/go.sum b/go.sum index 0bb10b44..3ef30131 100644 --- a/go.sum +++ b/go.sum @@ -23,6 +23,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= @@ -150,6 +152,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go.uber.org/zap/exp v0.2.0 h1:FtGenNNeCATRB3CmB/yEUnjEFeJWpB/pMcy7e2bKPYs= go.uber.org/zap/exp v0.2.0/go.mod h1:t0gqAIdh1MfKv9EwN/dLwfZnJxe9ITAZN78HEWPFWDQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -250,6 +254,8 @@ k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCI k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.18.3 h1:B5Wmmo8WMWK7izei+2LlXLVDGzMwAHBNLX68lwtlSR4= sigs.k8s.io/controller-runtime v0.18.3/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= +sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/site/package-lock.json b/site/package-lock.json index 3554c225..8abd072f 100644 --- a/site/package-lock.json +++ b/site/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "autoprefixer": "^10.4.14", "cross-env": "^7.0.3", - "hugo-extended": "0.126.2", + "hugo-extended": "0.127.0", "postcss-cli": "^11.0.0" } }, @@ -1150,9 +1150,9 @@ } }, "node_modules/hugo-extended": { - "version": "0.126.2", - "resolved": "https://registry.npmjs.org/hugo-extended/-/hugo-extended-0.126.2.tgz", - "integrity": "sha512-NkARDBKMAcl9ClVW4KHCl7Q8S+bZUgX8HyScsMv2V7OwriHUMBT+aGlF5NMARuyOUjiQ8ygTnOaqZW71NnWMXA==", + "version": "0.127.0", + "resolved": "https://registry.npmjs.org/hugo-extended/-/hugo-extended-0.127.0.tgz", + "integrity": "sha512-TDjizLf8cUpkRPkHXeDq3rZJKSAUdguV7KPddOZrclNcnL1QQh/9BgKddCZP0+4/nolPOb6GI+2LhIehfjrUHw==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -1166,7 +1166,7 @@ "hugo-extended": "lib/cli.js" }, "engines": { - "node": ">=14.14" + "node": ">=16.14" } }, "node_modules/ieee754": { diff --git a/site/package.json b/site/package.json index 499833bb..dd2efc72 100644 --- a/site/package.json +++ b/site/package.json @@ -36,7 +36,7 @@ "devDependencies": { "autoprefixer": "^10.4.14", "cross-env": "^7.0.3", - "hugo-extended": "0.126.2", + "hugo-extended": "0.127.0", "postcss-cli": "^11.0.0" } } From 1547e6240ff49980bb99994a9104c4033537f6bd Mon Sep 17 00:00:00 2001 From: Hidden Marten Date: Sun, 9 Jun 2024 15:03:52 +0200 Subject: [PATCH 2/2] Reverk kubernetes because of envtest, bump golang everywhere --- .github/workflows/make-test-e2e.yaml | 2 +- .github/workflows/make-test.yaml | 2 +- .github/workflows/nilaway-lint.yaml | 2 +- .github/workflows/pre-commit.yaml | 2 +- .github/workflows/release-assets.yaml | 2 +- Makefile | 2 +- go.mod | 2 +- go.sum | 6 ------ 8 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/make-test-e2e.yaml b/.github/workflows/make-test-e2e.yaml index c982a607..669ee2bc 100644 --- a/.github/workflows/make-test-e2e.yaml +++ b/.github/workflows/make-test-e2e.yaml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v4.1.6 - uses: actions/setup-go@v5.0.1 with: - go-version: 1.22.3 + go-version: 1.22.4 - uses: docker/setup-buildx-action@v3.3.0 - uses: tale/kubectl-action@v1.4.0 with: diff --git a/.github/workflows/make-test.yaml b/.github/workflows/make-test.yaml index 94c4fe1c..09c1594c 100644 --- a/.github/workflows/make-test.yaml +++ b/.github/workflows/make-test.yaml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v4.1.6 - uses: actions/setup-go@v5.0.1 with: - go-version: 1.22.3 + go-version: 1.22.4 - run: | if [ "${{ matrix.k8s.version }}" = "default" ]; then # For latest version use default from Makefile diff --git a/.github/workflows/nilaway-lint.yaml b/.github/workflows/nilaway-lint.yaml index c50fc4d5..3da57c48 100644 --- a/.github/workflows/nilaway-lint.yaml +++ b/.github/workflows/nilaway-lint.yaml @@ -10,5 +10,5 @@ jobs: - uses: actions/checkout@v4.1.6 - uses: actions/setup-go@v5.0.1 with: - go-version: 1.22.3 + go-version: 1.22.4 - run: make nilaway-lint diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml index 33bd64d1..d5479a01 100644 --- a/.github/workflows/pre-commit.yaml +++ b/.github/workflows/pre-commit.yaml @@ -10,5 +10,5 @@ jobs: - uses: actions/checkout@v4.1.6 - uses: actions/setup-go@v5.0.1 with: - go-version: 1.22.3 + go-version: 1.22.4 - uses: pre-commit/action@v3.0.1 diff --git a/.github/workflows/release-assets.yaml b/.github/workflows/release-assets.yaml index fe726c59..8d58970d 100644 --- a/.github/workflows/release-assets.yaml +++ b/.github/workflows/release-assets.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4.1.6 - uses: actions/setup-go@v5.0.1 with: - go-version: 1.22.3 + go-version: 1.22.4 - name: Get tag from current run run: | TAG=${{ github.ref_name }} diff --git a/Makefile b/Makefile index 2bf8aead..11972429 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ IMG ?= ghcr.io/aenix-io/etcd-operator:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. # renovate: datasource=github-tags depName=kubernetes/kubernetes -ENVTEST_K8S_VERSION ?= v1.30.1 +ENVTEST_K8S_VERSION ?= v1.30.0 ENVTEST_K8S_VERSION_TRIMMED_V = $(subst v,,$(ENVTEST_K8S_VERSION)) # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) diff --git a/go.mod b/go.mod index 59d56a50..c4454997 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aenix-io/etcd-operator -go 1.22.3 +go 1.22.4 require ( github.com/go-logr/logr v1.4.2 diff --git a/go.sum b/go.sum index 3ef30131..ed763278 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,6 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= @@ -150,8 +148,6 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= go.uber.org/zap/exp v0.2.0 h1:FtGenNNeCATRB3CmB/yEUnjEFeJWpB/pMcy7e2bKPYs= @@ -252,8 +248,6 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.18.3 h1:B5Wmmo8WMWK7izei+2LlXLVDGzMwAHBNLX68lwtlSR4= -sigs.k8s.io/controller-runtime v0.18.3/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=