Merge branch 'main' into doc-examples

aenix-io · May 17, 2024 · ade8f73 · ade8f73
2 parents e4b84c7 + 8157aa3
commit ade8f73
Show file tree

Hide file tree

Showing 29 changed files with 172 additions and 267 deletions.
diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.5
 
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer

diff --git a/.github/workflows/helm-publish.yaml b/.github/workflows/helm-publish.yaml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.5
 
       - name: Install Helm
         uses: azure/setup-helm@v4.2.0

diff --git a/.github/workflows/hugo.yaml b/.github/workflows/hugo.yaml
@@ -41,7 +41,7 @@ jobs:
       - name: Install Dart Sass
         run: sudo snap install dart-sass
       - name: Checkout
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.5
         with:
           submodules: recursive
           fetch-depth: 0

diff --git a/.github/workflows/make-test-e2e.yaml b/.github/workflows/make-test-e2e.yaml
@@ -23,10 +23,10 @@ jobs:
             attribute: latest
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4.1.3
-      - uses: actions/setup-go@v5.0.0
+      - uses: actions/checkout@v4.1.5
+      - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.2
+          go-version: 1.22.3
       - 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
@@ -23,8 +23,8 @@ jobs:
             attribute: latest
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4.1.3
-      - uses: actions/setup-go@v5.0.0
+      - uses: actions/checkout@v4.1.5
+      - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.2
+          go-version: 1.22.3
       - run: ENVTEST_K8S_VERSION=${{ matrix.k8s.version }} make test
diff --git a/.github/workflows/nilaway-lint.yaml b/.github/workflows/nilaway-lint.yaml
@@ -7,8 +7,8 @@ jobs:
   nilaway-lint:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4.1.3
-      - uses: actions/setup-go@v5.0.0
+      - uses: actions/checkout@v4.1.5
+      - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.2
+          go-version: 1.22.3
       - run: make nilaway-lint
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -7,8 +7,8 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4.1.3
-      - uses: actions/setup-go@v5.0.0
+      - uses: actions/checkout@v4.1.5
+      - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.2
+          go-version: 1.22.3
       - uses: pre-commit/action@v3.0.1
diff --git a/.github/workflows/release-assets.yaml b/.github/workflows/release-assets.yaml
@@ -11,11 +11,13 @@ env:
 jobs:
   release-assets:
     runs-on: ubuntu-22.04
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v4.1.3
-      - uses: actions/setup-go@v5.0.0
+      - uses: actions/checkout@v4.1.5
+      - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.2
+          go-version: 1.22.3
       - name: Get tag from current run
         run: |
           TAG=${{ github.ref_name }}

diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml
@@ -10,6 +10,9 @@ on:
 jobs:
   release-drafter:
     runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - uses: release-drafter/release-drafter@v6.0.0
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22.2 AS builder
+FROM golang:1.22.3 AS builder
 ARG TARGETOS TARGETARCH
 
 WORKDIR /workspace

diff --git a/Makefile b/Makefile
@@ -157,7 +157,7 @@ NAMESPACE ?= etcd-operator-system
 # renovate: datasource=github-tags depName=prometheus-operator/prometheus-operator
 PROMETHEUS_OPERATOR_VERSION ?= v0.73.2
 # renovate: datasource=github-tags depName=jetstack/cert-manager
-CERT_MANAGER_VERSION ?= v1.14.4
+CERT_MANAGER_VERSION ?= v1.14.5
 
 ifndef ignore-not-found
   ignore-not-found = false
@@ -239,16 +239,16 @@ YQ = $(LOCALBIN)/yq
 # renovate: datasource=github-tags depName=kubernetes-sigs/kustomize
 KUSTOMIZE_VERSION ?= v5.3.0
 # renovate: datasource=github-tags depName=kubernetes-sigs/controller-tools
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+CONTROLLER_TOOLS_VERSION ?= v0.15.0
 ENVTEST_VERSION ?= latest
 # renovate: datasource=github-tags depName=golangci/golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.57.2
+GOLANGCI_LINT_VERSION ?= v1.58.1
 # renovate: datasource=github-tags depName=kubernetes-sigs/kind
 KIND_VERSION ?= v0.22.0
 # renovate: datasource=github-tags depName=helm/helm
 HELM_VERSION ?= v3.14.4
 # renovate: datasource=github-tags depName=losisin/helm-values-schema-json
-HELM_SCHEMA_VERSION ?= v1.2.4
+HELM_SCHEMA_VERSION ?= v1.3.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/OWNERS b/OWNERS
@@ -11,3 +11,4 @@ reviewers:
   - AlexGluck       # Alex Gluck
   - Uburro          # Grigorii Rochev
   - gecube          # George Gaal <gb12335@gmail.com> <george.gaal@aenix.io>
+  - aobort          # Artem Bortnikov <brongineer747@gmail.com>
diff --git a/charts/etcd-operator/values.schema.json b/charts/etcd-operator/values.schema.json
@@ -281,4 +281,4 @@
         }
     },
     "type": "object"
-}
+}
diff --git a/go.mod b/go.mod
@@ -1,17 +1,17 @@
 module github.com/aenix-io/etcd-operator
 
-go 1.22.2
+go 1.22.3
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/onsi/ginkgo/v2 v2.17.1
-	github.com/onsi/gomega v1.33.0
+	github.com/onsi/ginkgo/v2 v2.17.3
+	github.com/onsi/gomega v1.33.1
 	go.etcd.io/etcd/client/v3 v3.5.13
 	k8s.io/api v0.30.0
 	k8s.io/apimachinery v0.30.0
-	k8s.io/client-go v0.29.3
-	k8s.io/utils v0.0.0-20240310230437-4693a0247e57
-	sigs.k8s.io/controller-runtime v0.17.3
+	k8s.io/client-go v0.30.0
+	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
+	sigs.k8s.io/controller-runtime v0.18.2
 )
 
 require (
@@ -21,21 +21,21 @@ require (
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/evanphx/json-patch/v5 v5.8.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // 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-20210720184732-4bb14d4b1be1 // indirect
+	github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -55,13 +55,13 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
-	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
 	golang.org/x/oauth2 v0.12.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.18.0 // indirect
+	golang.org/x/tools v0.20.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
@@ -72,8 +72,7 @@ require (
 	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/apiextensions-apiserver v0.29.2 // indirect
-	k8s.io/component-base v0.29.2 // indirect
+	k8s.io/apiextensions-apiserver v0.30.0 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect