Skip to content

Commit 5646035

Browse files
committed
Massive rename of project
massive rename rename of scribe to volsync in . files Signed-off-by: Ryan Cook <[email protected]> resolving commit err Signed-off-by: Ryan Cook <[email protected]> Update README.md missing rename fix of branch Signed-off-by: Ryan Cook <[email protected]> master to main Signed-off-by: Ryan Cook <[email protected]> docs fix Signed-off-by: Ryan Cook <[email protected]>
1 parent fb6a0b1 commit 5646035

File tree

155 files changed

+1141
-1142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1141
-1142
lines changed

.ci-scripts/pre-commit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ run_check '.*\.(ba)?sh' shellcheck
5555
run_check '.*\.ya?ml' yamllint -s -c "${scriptdir}/yamlconfig.yaml"
5656

5757
# CRDs in the Helm chart must match generated CRDs
58-
diff -qr config/crd/bases helm/scribe/crds
58+
diff -qr config/crd/bases helm/volsync/crds
5959

6060
echo "ALL OK."

.ci-scripts/yamlconfig.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extends: default
55
ignore: |
66
config/**
77
hack/crds/*
8-
helm/scribe/**
8+
helm/volsync/**
99
rules:
1010
indentation:
1111
indent-sequences: consistent

.github/workflows/documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
name: Documentation
55
on: # yamllint disable-line rule:truthy
66
push:
7-
branches: [master]
7+
branches: [main]
88
pull_request:
9-
branches: [master]
9+
branches: [main]
1010
schedule:
1111
- cron: "15 4 * * 1" # 4:15 every Monday
1212

.github/workflows/operator.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
name: operator
55
on: # yamllint disable-line rule:truthy
66
push:
7-
branches: ["master", "release*"]
7+
branches: ["main", "release*"]
88
tags: ["*"]
99
pull_request:
10-
branches: ["master", "release*"]
10+
branches: ["main", "release*"]
1111
schedule:
1212
- cron: "15 4 * * 1" # 4:15 every Monday
1313

1414
env:
1515
GO_VERSION: "1.16"
1616
KIND_VERSION: "0.11.1"
1717
GO111MODULE: "on"
18-
OPERATOR_IMAGE: "quay.io/backube/scribe"
19-
RCLONE_IMAGE: "quay.io/backube/scribe-mover-rclone"
20-
RESTIC_IMAGE: "quay.io/backube/scribe-mover-restic"
21-
RSYNC_IMAGE: "quay.io/backube/scribe-mover-rsync"
18+
OPERATOR_IMAGE: "quay.io/backube/volsync"
19+
RCLONE_IMAGE: "quay.io/backube/volsync-mover-rclone"
20+
RESTIC_IMAGE: "quay.io/backube/volsync-mover-restic"
21+
RSYNC_IMAGE: "quay.io/backube/volsync-mover-rsync"
2222

2323
jobs:
2424
lint:
@@ -68,7 +68,7 @@ jobs:
6868
- name: Save container as artifact
6969
uses: actions/upload-artifact@v1
7070
with:
71-
name: scribe-operator
71+
name: volsync-operator
7272
path: /tmp/image.tar
7373

7474
- name: Build cli
@@ -77,8 +77,8 @@ jobs:
7777
- name: Save cli as artifact
7878
uses: actions/upload-artifact@v1
7979
with:
80-
name: kubectl-scribe
81-
path: bin/kubectl-scribe
80+
name: kubectl-volsync
81+
path: bin/kubectl-volsync
8282

8383
build-rclone:
8484
name: Build-mover-rclone
@@ -97,7 +97,7 @@ jobs:
9797
- name: Save container as artifact
9898
uses: actions/upload-artifact@v1
9999
with:
100-
name: scribe-mover-rclone-container
100+
name: volsync-mover-rclone-container
101101
path: /tmp/image.tar
102102

103103
build-restic:
@@ -117,7 +117,7 @@ jobs:
117117
- name: Save container as artifact
118118
uses: actions/upload-artifact@v1
119119
with:
120-
name: scribe-mover-restic-container
120+
name: volsync-mover-restic-container
121121
path: /tmp/image.tar
122122

123123
build-rsync:
@@ -137,7 +137,7 @@ jobs:
137137
- name: Save container as artifact
138138
uses: actions/upload-artifact@v1
139139
with:
140-
name: scribe-mover-rsync-container
140+
name: volsync-mover-rsync-container
141141
path: /tmp/image.tar
142142

143143
e2e:
@@ -189,7 +189,7 @@ jobs:
189189
- name: Load operator container artifact
190190
uses: actions/download-artifact@v1
191191
with:
192-
name: scribe-operator
192+
name: volsync-operator
193193
path: /tmp
194194

195195
- name: Import container image into cluster
@@ -202,7 +202,7 @@ jobs:
202202
- name: Load rclone container artifact
203203
uses: actions/download-artifact@v1
204204
with:
205-
name: scribe-mover-rclone-container
205+
name: volsync-mover-rclone-container
206206
path: /tmp
207207

208208
- name: Import container image into cluster
@@ -215,7 +215,7 @@ jobs:
215215
- name: Load restic container artifact
216216
uses: actions/download-artifact@v1
217217
with:
218-
name: scribe-mover-restic-container
218+
name: volsync-mover-restic-container
219219
path: /tmp
220220

221221
- name: Import container image into cluster
@@ -228,7 +228,7 @@ jobs:
228228
- name: Load rsync container artifact
229229
uses: actions/download-artifact@v1
230230
with:
231-
name: scribe-mover-rsync-container
231+
name: volsync-mover-rsync-container
232232
path: /tmp
233233

234234
- name: Import container image into cluster
@@ -240,22 +240,22 @@ jobs:
240240
241241
- name: Start operator
242242
run: |
243-
helm install --create-namespace -n scribe-system \
243+
helm install --create-namespace -n volsync-system \
244244
--set image.tag=ci-build \
245245
--set rclone.tag=ci-build \
246246
--set rsync.tag=ci-build \
247247
--set restic.tag=ci-build \
248248
--wait --timeout=300s \
249-
scribe-ghaction ./helm/scribe
249+
volsync-ghaction ./helm/volsync
250250
251251
- name: Load cli artifact
252252
uses: actions/download-artifact@v1
253253
with:
254-
name: kubectl-scribe
254+
name: kubectl-volsync
255255
path: bin
256256

257257
- name: Make cli executable
258-
run: chmod a+x bin/kubectl-scribe
258+
run: chmod a+x bin/kubectl-volsync
259259

260260
- name: Run e2e tests
261261
run: |
@@ -279,14 +279,14 @@ jobs:
279279
needs: e2e-success
280280
if: >
281281
(github.event_name == 'push' || github.event_name == 'schedule') &&
282-
(github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
282+
(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
283283
runs-on: ubuntu-20.04
284284

285285
steps:
286286
- name: Load container artifact
287287
uses: actions/download-artifact@v1
288288
with:
289-
name: scribe-operator
289+
name: volsync-operator
290290
path: /tmp
291291

292292
- name: Import container image
@@ -303,7 +303,7 @@ jobs:
303303
- name: Push to registry (latest)
304304
if: >
305305
(github.event_name == 'push' || github.event_name == 'schedule') &&
306-
github.ref == 'refs/heads/master'
306+
github.ref == 'refs/heads/main'
307307
run: |
308308
docker push "${OPERATOR_IMAGE}"
309309
- name: Push to registry (version tag)
@@ -322,14 +322,14 @@ jobs:
322322
needs: e2e-success
323323
if: >
324324
(github.event_name == 'push' || github.event_name == 'schedule') &&
325-
(github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
325+
(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
326326
runs-on: ubuntu-20.04
327327

328328
steps:
329329
- name: Load container artifact
330330
uses: actions/download-artifact@v1
331331
with:
332-
name: scribe-mover-rclone-container
332+
name: volsync-mover-rclone-container
333333
path: /tmp
334334

335335
- name: Import container image
@@ -346,7 +346,7 @@ jobs:
346346
- name: Push to registry (latest)
347347
if: >
348348
(github.event_name == 'push' || github.event_name == 'schedule') &&
349-
github.ref == 'refs/heads/master'
349+
github.ref == 'refs/heads/main'
350350
run: |
351351
docker push "${RCLONE_IMAGE}"
352352
- name: Push to registry (version tag)
@@ -365,14 +365,14 @@ jobs:
365365
needs: e2e-success
366366
if: >
367367
(github.event_name == 'push' || github.event_name == 'schedule') &&
368-
(github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
368+
(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
369369
runs-on: ubuntu-20.04
370370

371371
steps:
372372
- name: Load container artifact
373373
uses: actions/download-artifact@v1
374374
with:
375-
name: scribe-mover-restic-container
375+
name: volsync-mover-restic-container
376376
path: /tmp
377377

378378
- name: Import container image
@@ -389,7 +389,7 @@ jobs:
389389
- name: Push to registry (latest)
390390
if: >
391391
(github.event_name == 'push' || github.event_name == 'schedule') &&
392-
github.ref == 'refs/heads/master'
392+
github.ref == 'refs/heads/main'
393393
run: |
394394
docker push "${RESTIC_IMAGE}"
395395
- name: Push to registry (version tag)
@@ -408,14 +408,14 @@ jobs:
408408
needs: e2e-success
409409
if: >
410410
(github.event_name == 'push' || github.event_name == 'schedule') &&
411-
(github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v'))
411+
(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
412412
runs-on: ubuntu-20.04
413413

414414
steps:
415415
- name: Load container artifact
416416
uses: actions/download-artifact@v1
417417
with:
418-
name: scribe-mover-rsync-container
418+
name: volsync-mover-rsync-container
419419
path: /tmp
420420

421421
- name: Import container image
@@ -432,7 +432,7 @@ jobs:
432432
- name: Push to registry (latest)
433433
if: >
434434
(github.event_name == 'push' || github.event_name == 'schedule') &&
435-
github.ref == 'refs/heads/master'
435+
github.ref == 'refs/heads/main'
436436
run: |
437437
docker push "${RSYNC_IMAGE}"
438438
- name: Push to registry (version tag)

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bin
2828
# Dependency directories (remove the comment below to include it)
2929
vendor/
3030

31-
# Scribe related
31+
# VolSync related
3232
# Secret files to prevent accidental commit of keys
3333
examples/rclone.conf
3434

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1313

1414
- Support for restic backups
1515
- Metrics for monitoring replication
16-
- Scribe CLI (kubectl plugin)
16+
- VolSync CLI (kubectl plugin)
1717
- Support for manually triggering replication instead of via schedule
1818

1919
### Changed
@@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2323

2424
### Fixed
2525

26-
- Fix deployment on OpenShift using Helm w/ deployments not named "scribe"
26+
- Fix deployment on OpenShift using Helm w/ deployments not named "volsync"
2727
- Support retries w/in rsync pod to tolerate Submariner DNS delays (globalnet)
2828
- Custom rsync port number was being ignored
2929
- Don't overwrite annotations on the rsync Service
@@ -35,6 +35,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3535
- Support for rsync & rclone replication
3636
- Helm chart to deploy operator
3737

38-
[Unreleased]: https://github.com/backube/scribe/compare/v0.2.0...HEAD
39-
[0.2.0]: https://github.com/backube/scribe/compare/v0.1.0...v0.2.0
40-
[0.1.0]: https://github.com/backube/scribe/releases/tag/v0.1.0
38+
[Unreleased]: https://github.com/backube/volsync/compare/v0.2.0...HEAD
39+
[0.2.0]: https://github.com/backube/volsync/compare/v0.1.0...v0.2.0
40+
[0.1.0]: https://github.com/backube/volsync/releases/tag/v0.1.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ COPY controllers/ controllers/
1616

1717
# Build
1818
ARG VERSION="(unknown)"
19-
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager -ldflags "-X=main.scribeVersion=${VERSION}" main.go
19+
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager -ldflags "-X=main.volsyncVersion=${VERSION}" main.go
2020

2121
# Final container
2222
FROM registry.access.redhat.com/ubi8-minimal:8.3

Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
3535
# This variable is used to construct full image tags for bundle and catalog images.
3636
#
3737
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
38-
# backube/scribe-bundle:$VERSION and backube/scribe-catalog:$VERSION.
39-
IMAGE_TAG_BASE ?= quay.io/backube/scribe
38+
# backube/volsync-bundle:$VERSION and backube/volsync-catalog:$VERSION.
39+
IMAGE_TAG_BASE ?= quay.io/backube/volsync
4040

4141
# BUNDLE_IMG defines the image:tag used for the bundle.
4242
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
4343
BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
4444

4545
# Image URL to use all building/pushing image targets
46-
IMG ?= quay.io/backube/scribe:latest
46+
IMG ?= quay.io/backube/volsync:latest
4747
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
4848
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
4949

@@ -84,7 +84,7 @@ help: ## Display this help.
8484
.PHONY: manifests
8585
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
8686
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
87-
cp config/crd/bases/* helm/scribe/crds
87+
cp config/crd/bases/* helm/volsync/crds
8888

8989
.PHONY: generate
9090
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -96,7 +96,7 @@ lint: golangci-lint ## Lint source code
9696

9797
.PHONY: helm-lint
9898
helm-lint: helm ## Lint Helm chart
99-
cd helm && $(HELM) lint scribe
99+
cd helm && $(HELM) lint volsync
100100

101101
.PHONY: test
102102
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
@@ -108,25 +108,25 @@ test: manifests generate lint helm-lint ginkgo ## Run tests.
108108
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); $(GINKGO) $(TEST_ARGS) $(TEST_PACKAGES)
109109

110110
.PHONY: test-e2e
111-
test-e2e: kuttl ## Run e2e tests. Requires cluster w/ Scribe already installed
111+
test-e2e: kuttl ## Run e2e tests. Requires cluster w/ VolSync already installed
112112
cd test-kuttl && $(KUTTL) test
113113
rm -f test-kuttl/kubeconfig
114114

115115
##@ Build
116116

117117
.PHONY: build
118118
build: generate lint ## Build manager binary.
119-
go build -o bin/manager -ldflags -X=main.scribeVersion=$(VERSION) main.go
119+
go build -o bin/manager -ldflags -X=main.volsyncVersion=$(VERSION) main.go
120120

121121
.PHONY: cli
122-
cli: bin/kubectl-scribe ## Build Scribe kubectl plugin
122+
cli: bin/kubectl-volsync ## Build VolSync kubectl plugin
123123

124-
bin/kubectl-scribe: lint
125-
go build -o $@ -ldflags -X=main.scribeVersion=$(VERSION) ./cmd/scribe
124+
bin/kubectl-volsync: lint
125+
go build -o $@ -ldflags -X=main.volsyncVersion=$(VERSION) ./cmd/volsync
126126

127127
.PHONY: run
128128
run: manifests generate lint ## Run a controller from your host.
129-
go run -ldflags -X=main.scribeVersion=$(VERSION) ./main.go
129+
go run -ldflags -X=main.volsyncVersion=$(VERSION) ./main.go
130130

131131
.PHONY: docker-build
132132
docker-build: test ## Build docker image with the manager.

0 commit comments

Comments
 (0)