fix(backup): restore-datadir was broken (#317)

Author: androndo

.github/workflows/codegen-drift.yaml

@@ -0,0 +1,50 @@
+name: Codegen Drift Check
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths:
+      - 'api/**'
+      - 'config/crd/bases/**'
+      - 'config/rbac/**'
+      - 'charts/etcd-operator/crds/**'
+      - 'hack/boilerplate.go.txt'
+      - 'Makefile'
+      - 'go.mod'
+      - 'go.sum'
+      - '.github/workflows/codegen-drift.yaml'
+
+concurrency:
+  group: codegen-drift-${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  codegen-drift:
+    name: Verify generated code is up to date
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4.1.7
+      - uses: actions/setup-go@v5.0.1
+        with:
+          go-version-file: go.mod
+          cache: true
+      # Three deterministic codegen targets:
+      #   - manifests: CRD + RBAC + webhook (controller-gen)
+      #   - generate:  zz_generated.deepcopy.go (controller-gen)
+      #   - helm-crd-copy: mirrors config/crd/bases → charts/etcd-operator/crds
+      # generate-docs is intentionally NOT included — it shells out to
+      # crd-ref-docs@latest, which is unpinned in the Makefile and so
+      # produces environment-dependent rendering differences that would
+      # flap this gate. If that ever gets pinned, add `generate-docs`
+      # to the line below and include `site/content/**` in the paths
+      # filter.
+      - name: Run codegen
+        run: make manifests generate helm-crd-copy
+      - name: Fail on drift
+        run: |
+          if [ -n "$(git status --porcelain)" ]; then
+            echo "::error::codegen produced changes. Run 'make manifests generate helm-crd-copy' locally and commit the result."
+            git status --short
+            git diff --color=always
+            exit 1
+          fi

.github/workflows/make-test-e2e.yaml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
       - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.4
+          go-version: 1.23.0
       - uses: docker/setup-buildx-action@v3.3.0
       - uses: tale/kubectl-action@v1.4.0
         with:

.github/workflows/make-test.yaml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
       - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.4
+          go-version: 1.23.0
       - run: |
           if [ "${{ matrix.k8s.version }}" = "default" ]; then
             # For latest version use default from Makefile

.github/workflows/nilaway-lint.yaml

@@ -10,5 +10,5 @@ jobs:
       - uses: actions/checkout@v4.1.7
       - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.4
+          go-version: 1.23.0
       - run: make nilaway-lint

.github/workflows/pre-commit.yaml

@@ -10,5 +10,5 @@ jobs:
       - uses: actions/checkout@v4.1.7
       - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.4
+          go-version: 1.23.0
       - uses: pre-commit/action@v3.0.1

.github/workflows/release-assets.yaml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4.1.7
       - uses: actions/setup-go@v5.0.1
         with:
-          go-version: 1.22.4
+          go-version: 1.23.0
       - name: Get tag from current run
         run: |
           TAG=${{ github.ref_name }}

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22.4 AS builder
+FROM golang:1.23.0 AS builder
 ARG TARGETOS TARGETARCH
 
 WORKDIR /workspace

Makefile

@@ -265,10 +265,10 @@ CRD_REF_DOCS ?= $(LOCALBIN)/crd-ref-docs
 # 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.15.0
+CONTROLLER_TOOLS_VERSION ?= v0.16.5
 ENVTEST_VERSION ?= latest
 # renovate: datasource=github-tags depName=golangci/golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.59.1
+GOLANGCI_LINT_VERSION ?= v1.60.0
 # renovate: datasource=github-tags depName=kubernetes-sigs/kind
 KIND_VERSION ?= v0.23.0
 # renovate: datasource=github-tags depName=helm/helm

api/v1alpha1/zz_generated.deepcopy.go

@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: etcd-operator-system/etcd-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   name: etcdbackupschedules.etcd.aenix.io
 spec:
   conversion:
@@ -64,9 +64,7 @@ spec:
                         This field is effectively required, but due to backwards compatibility is
                         allowed to be empty. Instances of this type with an empty value here are
                         almost certainly wrong.
-                        TODO: Add other useful fields. apiVersion, kind, uid?
                         More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                        TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                       type: string
                   type: object
                   x-kubernetes-map-type: atomic
@@ -103,9 +101,7 @@ spec:
                                 This field is effectively required, but due to backwards compatibility is
                                 allowed to be empty. Instances of this type with an empty value here are
                                 almost certainly wrong.
-                                TODO: Add other useful fields. apiVersion, kind, uid?
                                 More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                               type: string
                           type: object
                           x-kubernetes-map-type: atomic
@@ -155,7 +151,7 @@ spec:
               properties:
                 conditions:
                   items:
-                    description: "Condition contains details for one aspect of the current state of this API Resource.\n---\nThis struct is intended for direct use as an array at the field path .status.conditions.  For example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the observations of a foo's current state.\n\t    // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    // +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t    // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t    // other fields\n\t}"
+                    description: Condition contains details for one aspect of the current state of this API Resource.
                     properties:
                       lastTransitionTime:
                         description: |-
@@ -196,12 +192,7 @@ spec:
                           - Unknown
                         type: string
                       type:
-                        description: |-
-                          type of condition in CamelCase or in foo.example.com/CamelCase.
-                          ---
-                          Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                          useful (see .node.status.conditions), the ability to deconflict is important.
-                          The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        description: type of condition in CamelCase or in foo.example.com/CamelCase.
                         maxLength: 316
                         pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                         type: string