9da206dc7c
PVCs and CloudNativePG Clusters need S3 buckets and backup schedules
provisioned consistently. This operator watches the
backups.unkin.net/{schedule,destination} annotations on those objects and
provisions everything needed to back them up, with no new CRDs.
- Add a PVC controller that provisions cephrgw ObjectStoreUser/Bucket/BucketAccess,
auto-generates a restic repo-password Secret and creates a k8up Schedule scoped
to the PVC via spec.backup.volumes[].persistentVolumeClaim.claimName.
- Add a CNPG Cluster controller that provisions the same bucket stack, idempotently
patches spec.backup.barmanObjectStore (leaving a user-set destinationPath alone
with a Warning event) and creates a ScheduledBackup.
- Resolve destinations through a ConfigMap lookup table; requeue until the
BucketAccess is Ready before creating schedule resources; own-reference created
resources and retain bucket data by default.
- Add schedule-mapping helpers (k8up 5-field/shortcut pass-through, CNPG 6-field
seconds-first) and deterministic, length-bounded name derivation.
- Add unit tests (schedule mapping, name derivation, destination resolution) and
envtest controller tests for both paths, wiring the external CRDs into envtest.
- Add kubebuilder-generated RBAC, a Dockerfile (distroless/nonroot), Woodpecker
lint/test/build pipelines and a tag-triggered image push to the artifactapi
docker-internal registry, plus a version-bump Makefile and deploy manifests.
63 lines
1.7 KiB
Go
63 lines
1.7 KiB
Go
//go:build !usegocmp
|
|
// +build !usegocmp
|
|
|
|
/*
|
|
Copyright 2025 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package diff
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/pmezard/go-difflib/difflib"
|
|
|
|
"k8s.io/apimachinery/pkg/util/dump"
|
|
)
|
|
|
|
// Diff returns a string representation of the difference between two objects.
|
|
// When built without the usegocmp tag, it uses go-difflib/difflib to generate a
|
|
// unified diff of the objects. It attempts to use JSON serialization first,
|
|
// falling back to an object dump via the dump package if JSON marshaling fails.
|
|
func Diff(a, b any) string {
|
|
|
|
aStr, aErr := toPrettyJSON(a)
|
|
bStr, bErr := toPrettyJSON(b)
|
|
if aErr != nil || bErr != nil {
|
|
aStr = dump.Pretty(a)
|
|
bStr = dump.Pretty(b)
|
|
}
|
|
|
|
diff := difflib.UnifiedDiff{
|
|
A: difflib.SplitLines(aStr),
|
|
B: difflib.SplitLines(bStr),
|
|
Context: 3,
|
|
}
|
|
|
|
diffstr, err := difflib.GetUnifiedDiffString(diff)
|
|
if err != nil {
|
|
return fmt.Sprintf("error generating diff: %v", err)
|
|
}
|
|
|
|
return diffstr
|
|
}
|
|
|
|
// toPrettyJSON converts an object to a pretty-printed JSON string.
|
|
func toPrettyJSON(data any) (string, error) {
|
|
jsonData, err := json.MarshalIndent(data, "", " ")
|
|
return string(jsonData), err
|
|
}
|