Skip to content

Commit eb6c88b

Browse files
committed
Merge source/main into implement-kopia branch
1 parent e66a7fd commit eb6c88b

16 files changed

+38
-36
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ exclude: |
1717
)$
1818
repos:
1919
- repo: https://github.com/pre-commit/pre-commit-hooks
20-
rev: "v5.0.0"
20+
rev: "v6.0.0"
2121
hooks:
2222
- id: check-added-large-files # Prevents giant files from being committed
2323
- id: check-json # Check that JSON files are valid
@@ -55,6 +55,6 @@ repos:
5555
args: ["--style", ".ci-scripts/mdl-style.rb"]
5656

5757
- repo: https://github.com/renovatebot/pre-commit-hooks
58-
rev: "41.40.0"
58+
rev: "41.76.0"
5959
hooks:
6060
- id: renovate-config-validator

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ include ./version.mk
1010

1111
# Helper software versions
1212
CONTROLLER_TOOLS_VERSION := v0.16.3
13-
GOLANGCI_VERSION := v2.3.1
13+
GOLANGCI_VERSION := v2.4.0
1414
HELM_VERSION := v3.18.2
1515
KUBECTL_VERSION := v1.32.3
16-
KUSTOMIZE_VERSION := v5.7.0
16+
KUSTOMIZE_VERSION := v5.7.1
1717
OPERATOR_SDK_VERSION := v1.33.0
1818
PIPENV_VERSION := 2025.0.4
19-
YQ_VERSION := v4.45.4
19+
YQ_VERSION := v4.47.1
2020
#ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script (i.e. release-0.20)
2121
ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
2222
#ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)

OWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ reviewers:
55
- jnpacker
66
- tesshuflower
77
- birsanv
8+
- falconizmi
89

910
approvers:
1011
- cooktheryan
@@ -13,3 +14,4 @@ approvers:
1314
- jnpacker
1415
- tesshuflower
1516
- birsanv
17+
- falconizmi

api/v1alpha1/replicationdestination_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ type ReplicationDestinationRsyncSpec struct {
125125
//+kubebuilder:validation:Maximum=65535
126126
//+optional
127127
Port *int32 `json:"port,omitempty"`
128-
// path is the remote path to rsync from. Defaults to "/"
128+
// This field is not used and will be ignored
129129
//+optional
130130
Path *string `json:"path,omitempty"`
131131
// sshUser is the username for outgoing SSH connections. Defaults to "root".

api/v1alpha1/replicationsource_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ type ReplicationSourceRsyncSpec struct {
111111
//+kubebuilder:validation:Maximum=65535
112112
//+optional
113113
Port *int32 `json:"port,omitempty"`
114-
// path is the remote path to rsync to. Defaults to "/"
114+
// This field is not used and will be ignored
115115
//+optional
116116
Path *string `json:"path,omitempty"`
117117
// sshUser is the username for outgoing SSH connections. Defaults to "root".

bundle/manifests/volsync.backube_replicationdestinations.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4351,8 +4351,7 @@ spec:
43514351
The service account needs to exist in the same namespace as the ReplicationDestination.
43524352
type: string
43534353
path:
4354-
description: path is the remote path to rsync from. Defaults to
4355-
"/"
4354+
description: This field is not used and will be ignored
43564355
type: string
43574356
port:
43584357
description: port is the SSH port to connect to for replication.

bundle/manifests/volsync.backube_replicationsources.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4320,8 +4320,7 @@ spec:
43204320
The service account needs to exist in the same namespace as the ReplicationSource.
43214321
type: string
43224322
path:
4323-
description: path is the remote path to rsync to. Defaults to
4324-
"/"
4323+
description: This field is not used and will be ignored
43254324
type: string
43264325
port:
43274326
description: port is the SSH port to connect to for replication.

bundle/manifests/volsync.clusterserviceversion.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ metadata:
5555
}
5656
]
5757
capabilities: Basic Install
58-
createdAt: "2025-08-14T23:12:42Z"
58+
createdAt: "2025-08-20T15:32:39Z"
5959
olm.skipRange: '>=0.4.0 <0.14.0'
6060
operators.operatorframework.io/builder: operator-sdk-v1.33.0
6161
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
@@ -162,25 +162,26 @@ spec:
162162
- apiGroups:
163163
- ""
164164
resources:
165-
- persistentvolumes
165+
- persistentvolumeclaims/finalizers
166+
- secrets
167+
- serviceaccounts
168+
- services
166169
verbs:
170+
- create
171+
- delete
167172
- get
168173
- list
169174
- patch
175+
- update
170176
- watch
171177
- apiGroups:
172178
- ""
173179
resources:
174-
- secrets
175-
- serviceaccounts
176-
- services
180+
- persistentvolumes
177181
verbs:
178-
- create
179-
- delete
180182
- get
181183
- list
182184
- patch
183-
- update
184185
- watch
185186
- apiGroups:
186187
- ""
@@ -285,7 +286,9 @@ spec:
285286
- volsync.backube
286287
resources:
287288
- replicationdestinations
289+
- replicationdestinations/finalizers
288290
- replicationsources
291+
- replicationsources/finalizers
289292
verbs:
290293
- create
291294
- delete

config/crd/bases/volsync.backube_replicationdestinations.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4351,8 +4351,7 @@ spec:
43514351
The service account needs to exist in the same namespace as the ReplicationDestination.
43524352
type: string
43534353
path:
4354-
description: path is the remote path to rsync from. Defaults to
4355-
"/"
4354+
description: This field is not used and will be ignored
43564355
type: string
43574356
port:
43584357
description: port is the SSH port to connect to for replication.

config/crd/bases/volsync.backube_replicationsources.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4320,8 +4320,7 @@ spec:
43204320
The service account needs to exist in the same namespace as the ReplicationSource.
43214321
type: string
43224322
path:
4323-
description: path is the remote path to rsync to. Defaults to
4324-
"/"
4323+
description: This field is not used and will be ignored
43254324
type: string
43264325
port:
43274326
description: port is the SSH port to connect to for replication.

0 commit comments

Comments
 (0)