jandre/formolcli
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases 1 Wiki Activity

Compare commits

base: jandre:89b91f66da98fdfb8b28b9c68a68cee215f89ff4
Branches Tags
jandre:master
jandre:snapshots
jandre:steps
jandre:refactor
jandre:initcontainer
jandre:restoresession
jandre:v1.0.0
jandre:0.2.1
jandre:v0.9.0
jandre:v0.8.0
...
compare: jandre:1aa9d9efb51f08f70272e38143c2555711d24804
Branches Tags
jandre:master
jandre:snapshots
jandre:steps
jandre:refactor
jandre:initcontainer
jandre:restoresession
jandre:v1.0.0
jandre:0.2.1
jandre:v0.9.0
jandre:v0.8.0

2 Commits
89b91f66da ... 1aa9d9efb5

Author SHA1 Message Date
Jean-Marc ANDRE
1aa9d9efb5 Makefile/Dockerfile cleanup 2023-04-20 08:34:04 +02:00
Jean-Marc ANDRE
adf2743b19 dead code 2023-04-20 08:33:27 +02:00
3 changed files with 2 additions and 16 deletions
Show Stats Expand all files Collapse all files

2
Dockerfile
View File

@ -1,5 +1,5 @@
# Build a small image # Build a small image
FROM --platform=${BUILDPLATFORM} golang:alpine3 AS builder FROM --platform=${BUILDPLATFORM} golang:alpine3.17 AS builder
ARG TARGETOS ARG TARGETOS
ARG TARGETARCH ARG TARGETARCH
ARG TARGETPLATFORM ARG TARGETPLATFORM

6
Makefile
View File

@ -20,15 +20,11 @@ vet:
.PHONY: docker-build-multiarch .PHONY: docker-build-multiarch
docker-build-multiarch: docker-build-multiarch:
buildah bud --manifest $(MANIFEST) --platform=$(PLATFORMS) . buildah bud --manifest $(MANIFEST) --platform=$(PLATFORMS) --layers .
.PHONY: docker-push .PHONY: docker-push
docker-push: docker-push:
buildah manifest push --all --rm $(MANIFEST) "docker://$(IMG)" buildah manifest push --all --rm $(MANIFEST) "docker://$(IMG)"
.PHONY: docker-build-multiarch
docker-build-multiarch:
buildah bud --manifest $(MANIFEST) --platform linux/amd64,linux/arm64/v8 .
.PHONY: all .PHONY: all
all: formolcli docker-build all: formolcli docker-build

10
standalone/root.go
View File

@ -8,7 +8,6 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme" clientgoscheme "k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
@ -183,15 +182,6 @@ func StartRestore(
func CreateBackupSession(ref corev1.ObjectReference) { func CreateBackupSession(ref corev1.ObjectReference) {
log := session.Log.WithName("CreateBackupSession") log := session.Log.WithName("CreateBackupSession")
log.V(0).Info("CreateBackupSession called") log.V(0).Info("CreateBackupSession called")
backupConf := formolv1alpha1.BackupConfiguration{}
if err := session.Get(session.Context, types.NamespacedName{
Namespace: ref.Namespace,
Name: ref.Name,
}, &backupConf); err != nil {
log.Error(err, "unable to get backupconf")
os.Exit(1)
}
log.V(0).Info("got backupConf", "backupConf", backupConf)
backupSession := &formolv1alpha1.BackupSession{ backupSession := &formolv1alpha1.BackupSession{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{