Compare commits
No commits in common. "b6c7add468fa4f6e8badcbf5f1036a89b2df76f2" and "97ac4d5cc44a1a47f4022357e4d9242c2d6f1001" have entirely different histories.
b6c7add468
...
97ac4d5cc4
4
Makefile
4
Makefile
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
# Image URL to use all building/pushing image targets
|
# Image URL to use all building/pushing image targets
|
||||||
IMG ?= desmo999r/formolcontroller:0.2.2
|
IMG ?= desmo999r/formolcontroller:0.2.0
|
||||||
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
|
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
|
||||||
#CRD_OPTIONS ?= "crd:trivialVersions=true"
|
#CRD_OPTIONS ?= "crd:trivialVersions=true"
|
||||||
CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1"
|
CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1"
|
||||||
@ -67,8 +67,6 @@ docker-build: test
|
|||||||
docker-push:
|
docker-push:
|
||||||
podman push ${IMG}
|
podman push ${IMG}
|
||||||
|
|
||||||
docker: docker-build docker-push
|
|
||||||
|
|
||||||
# find or download controller-gen
|
# find or download controller-gen
|
||||||
# download controller-gen if necessary
|
# download controller-gen if necessary
|
||||||
controller-gen:
|
controller-gen:
|
||||||
|
|||||||
@ -313,14 +313,12 @@ func (r *RestoreSessionReconciler) Reconcile(ctx context.Context, req reconcile.
|
|||||||
restoreSession.Status.Targets = append(restoreSession.Status.Targets, targetStatus)
|
restoreSession.Status.Targets = append(restoreSession.Status.Targets, targetStatus)
|
||||||
switch target.Kind {
|
switch target.Kind {
|
||||||
case formolv1alpha1.SidecarKind:
|
case formolv1alpha1.SidecarKind:
|
||||||
log.V(0).Info("Next task is a Sidecard restore", "target", target)
|
|
||||||
if err := createRestoreInitContainer(target, backupSession.Status.Targets[nextTarget].SnapshotId); err != nil {
|
if err := createRestoreInitContainer(target, backupSession.Status.Targets[nextTarget].SnapshotId); err != nil {
|
||||||
log.V(0).Info("unable to create restore init container", "task", target)
|
log.V(0).Info("unable to create restore init container", "task", target)
|
||||||
targetStatus.SessionState = formolv1alpha1.Failure
|
targetStatus.SessionState = formolv1alpha1.Failure
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
case formolv1alpha1.JobKind:
|
case formolv1alpha1.JobKind:
|
||||||
log.V(0).Info("Next task is a Job restore", "target", target)
|
|
||||||
if err := createRestoreJob(target, backupSession.Status.Targets[nextTarget].SnapshotId); err != nil {
|
if err := createRestoreJob(target, backupSession.Status.Targets[nextTarget].SnapshotId); err != nil {
|
||||||
log.V(0).Info("unable to create restore job", "task", target)
|
log.V(0).Info("unable to create restore job", "task", target)
|
||||||
targetStatus.SessionState = formolv1alpha1.Failure
|
targetStatus.SessionState = formolv1alpha1.Failure
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user