Skip to content

Commit 45a3390

Browse files
committed
Fixes & improvements
1 parent b6dde4c commit 45a3390

5 files changed

Lines changed: 15 additions & 3 deletions

File tree

‎api/v1alpha1/minecraftbackup.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ type MinecraftBackupStatus struct {
3434
//+kubebuilder:object:root=true
3535
//+kubebuilder:subresource:status
3636

37+
// +kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state`
38+
// +kubebuilder:printcolumn:name="Server",type=string,JSONPath=`.spec.server.name`
3739
type MinecraftBackup struct {
3840
metav1.TypeMeta `json:",inline"`
3941
metav1.ObjectMeta `json:"metadata,omitempty"`

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controller/backup_controller.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package controller
33
import (
44
"context"
55

6+
batchv1 "k8s.io/api/batch/v1"
7+
68
rbacv1 "k8s.io/api/rbac/v1"
79

810
"github.com/go-logr/logr"
@@ -71,7 +73,7 @@ func (r *MinecraftBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
7173
func (r *MinecraftBackupReconciler) SetupWithManager(mgr ctrl.Manager) error {
7274
return ctrl.NewControllerManagedBy(mgr).
7375
For(&minecraftv1alpha1.MinecraftBackup{}).
74-
Owns(&corev1.Pod{}).
76+
Owns(&batchv1.Job{}).
7577
Owns(&corev1.ServiceAccount{}).
7678
Owns(&rbacv1.Role{}).
7779
Owns(&rbacv1.RoleBinding{}).

‎crd/minecraft.jameslaverack.com_minecraftbackups.yaml‎

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/reconcile/backup_job.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ func jobForBackup(backup *minecraftv1alpha1.MinecraftBackup, server *minecraftv1
7272
Spec: batchv1.JobSpec{
7373
Template: corev1.PodTemplateSpec{
7474
Spec: corev1.PodSpec{
75+
RestartPolicy: corev1.RestartPolicyNever,
7576
ServiceAccountName: backup.Name,
7677
Containers: []corev1.Container{
7778
{

0 commit comments

Comments
 (0)