Skip to content

Commit 6d030fb

Browse files
JamesLaverackJamesLaverack
committed
Move some packages around for clarity
1 parent 9701f8e commit 6d030fb

14 files changed

Lines changed: 56 additions & 53 deletions

File tree

‎cmd/operator/main.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import (
1313
"sigs.k8s.io/controller-runtime/pkg/healthz"
1414

1515
minecraftv1alpha1 "github.com/jameslaverack/kubernetes-minecraft-operator/api/v1alpha1"
16-
"github.com/jameslaverack/kubernetes-minecraft-operator/controller"
16+
"github.com/jameslaverack/kubernetes-minecraft-operator/pkg/controller/minecraftbackup"
17+
"github.com/jameslaverack/kubernetes-minecraft-operator/pkg/controller/minecraftserver"
1718
"github.com/jameslaverack/kubernetes-minecraft-operator/pkg/logutil"
1819
)
1920

@@ -56,14 +57,14 @@ func main() {
5657
log.With(zap.Error(err)).Fatal("Failed to start controller manager")
5758
}
5859

59-
if err = (&controller.MinecraftServerReconciler{
60+
if err = (&minecraftserver.MinecraftServerReconciler{
6061
Client: mgr.GetClient(),
6162
Scheme: mgr.GetScheme(),
6263
}).SetupWithManager(mgr); err != nil {
6364
log.With(zap.Error(err), zap.String("controller", "MinecraftServer")).Fatal("Failed to setup controller")
6465
}
6566

66-
if err = (&controller.MinecraftBackupReconciler{
67+
if err = (&minecraftbackup.MinecraftBackupReconciler{
6768
Client: mgr.GetClient(),
6869
Scheme: mgr.GetScheme(),
6970
}).SetupWithManager(mgr); err != nil {

pkg/reconcile/backup_job.go renamed to pkg/controller/minecraftbackup/backup_job.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package reconcile
1+
package minecraftbackup
22

33
import (
44
"context"
@@ -11,6 +11,7 @@ import (
1111
"sigs.k8s.io/controller-runtime/pkg/client"
1212

1313
minecraftv1alpha1 "github.com/jameslaverack/kubernetes-minecraft-operator/api/v1alpha1"
14+
"github.com/jameslaverack/kubernetes-minecraft-operator/pkg/controller/minecraftserver"
1415
"github.com/jameslaverack/kubernetes-minecraft-operator/pkg/logutil"
1516
)
1617

@@ -60,7 +61,7 @@ func jobForBackup(backup *minecraftv1alpha1.MinecraftBackup, server *minecraftv1
6061
const netherMountName = "world-nether"
6162
const theEndMountName = "world-the-end"
6263
const outputMountName = "world-backup"
63-
rconService := RCONServiceForServer(server)
64+
rconService := minecraftserver.RCONServiceForServer(server)
6465
return &batchv1.Job{
6566
ObjectMeta: metav1.ObjectMeta{
6667
Name: backup.Name,
@@ -74,7 +75,7 @@ func jobForBackup(backup *minecraftv1alpha1.MinecraftBackup, server *minecraftv1
7475
ServiceAccountName: backup.Name,
7576
Containers: []corev1.Container{
7677
{
77-
SecurityContext: securityContext(),
78+
SecurityContext: minecraftserver.SecurityContext(),
7879
Name: "backup-agent",
7980
Image: "ghcr.io/jameslaverack/kubernetes-minecraft-operator-backup-agent@sha256:144e42371621b28f98e6327f8b2879a63827ed0b89464cee36813c2c7df9f4c1",
8081
Env: []corev1.EnvVar{

pkg/reconcile/backup_service_account.go renamed to pkg/controller/minecraftbackup/backup_service_account.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package reconcile
1+
package minecraftbackup
22

33
import (
44
"context"

controller/backup_controller.go renamed to pkg/controller/minecraftbackup/controller.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package controller
1+
package minecraftbackup
22

33
import (
44
"context"
@@ -13,10 +13,8 @@ import (
1313

1414
minecraftv1alpha1 "github.com/jameslaverack/kubernetes-minecraft-operator/api/v1alpha1"
1515
"github.com/jameslaverack/kubernetes-minecraft-operator/pkg/logutil"
16-
"github.com/jameslaverack/kubernetes-minecraft-operator/pkg/reconcile"
1716
)
1817

19-
// MinecraftServerReconciler reconciles a MinecraftServer object
2018
type MinecraftBackupReconciler struct {
2119
client.Client
2220
Scheme *runtime.Scheme
@@ -26,7 +24,7 @@ func (r *MinecraftBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
2624
log := logutil.FromContextOrNew(ctx).With(
2725
zap.String("name", req.Name),
2826
zap.String("namespace", req.Namespace),
29-
zap.String("controller", "MinecraftServer"))
27+
zap.String("controller", "MinecraftBackup"))
3028
ctx = logutil.IntoContext(ctx, log)
3129

3230
log.Info("beginning reconciliation")
@@ -45,15 +43,15 @@ func (r *MinecraftBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
4543
// done we'll do it an exit instantly. This is because this function is triggered on changes to owned resources, so
4644
// the act of creating or modifying an owned resource will cause this function to be called again anyway.
4745

48-
done, err := reconcile.BackupRBAC(ctx, r.Client, &backup)
46+
done, err := BackupRBAC(ctx, r.Client, &backup)
4947
if err != nil {
5048
return ctrl.Result{}, err
5149
}
5250
if done {
5351
return ctrl.Result{}, nil
5452
}
5553

56-
done, err = reconcile.BackupPod(ctx, r.Client, &backup)
54+
done, err = BackupPod(ctx, r.Client, &backup)
5755
if err != nil {
5856
return ctrl.Result{}, err
5957
}
@@ -66,7 +64,6 @@ func (r *MinecraftBackupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
6664
return ctrl.Result{}, nil
6765
}
6866

69-
// SetupWithManager sets up the controller with the Manager.
7067
func (r *MinecraftBackupReconciler) SetupWithManager(mgr ctrl.Manager) error {
7168
return ctrl.NewControllerManagedBy(mgr).
7269
For(&minecraftv1alpha1.MinecraftBackup{}).

‎pkg/controller/minecraftbackup/util.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package minecraftbackup
2+
3+
import (
4+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
6+
minecraftv1alpha1 "github.com/jameslaverack/kubernetes-minecraft-operator/api/v1alpha1"
7+
)
8+
9+
func backupOwnerReference(backup *minecraftv1alpha1.MinecraftBackup) metav1.OwnerReference {
10+
return *metav1.NewControllerRef(backup, minecraftv1alpha1.GroupVersion.WithKind("MinecraftBackup"))
11+
}

pkg/reconcile/config_map.go renamed to pkg/controller/minecraftserver/config_map.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package reconcile
1+
package minecraftserver
22

33
import (
44
"context"
@@ -45,7 +45,7 @@ func ConfigMap(ctx context.Context, k8s client.Client, server *minecraftv1alpha1
4545
ObjectMeta: metav1.ObjectMeta{
4646
Name: expectedName.Name,
4747
Namespace: expectedName.Namespace,
48-
OwnerReferences: []metav1.OwnerReference{ownerReference(server)},
48+
OwnerReferences: []metav1.OwnerReference{serverOwnerReference(server)},
4949
},
5050
Data: data,
5151
}
@@ -56,7 +56,7 @@ func ConfigMap(ctx context.Context, k8s client.Client, server *minecraftv1alpha1
5656

5757
if !hasCorrectOwnerReference(server, &actualConfigMap) {
5858
log.Info("ConfigMap owner references incorrect, updating")
59-
actualConfigMap.OwnerReferences = append(actualConfigMap.OwnerReferences, ownerReference(server))
59+
actualConfigMap.OwnerReferences = append(actualConfigMap.OwnerReferences, serverOwnerReference(server))
6060
return true, k8s.Update(ctx, &actualConfigMap)
6161
}
6262

controller/controller.go renamed to pkg/controller/minecraftserver/controller.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package controller
1+
package minecraftserver
22

33
import (
44
"context"
@@ -12,10 +12,8 @@ import (
1212

1313
minecraftv1alpha1 "github.com/jameslaverack/kubernetes-minecraft-operator/api/v1alpha1"
1414
"github.com/jameslaverack/kubernetes-minecraft-operator/pkg/logutil"
15-
"github.com/jameslaverack/kubernetes-minecraft-operator/pkg/reconcile"
1615
)
1716

18-
// MinecraftServerReconciler reconciles a MinecraftServer object
1917
type MinecraftServerReconciler struct {
2018
client.Client
2119
Scheme *runtime.Scheme
@@ -44,7 +42,7 @@ func (r *MinecraftServerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
4442
// done we'll do it an exit instantly. This is because this function is triggered on changes to owned resources, so
4543
// the act of creating or modifying an owned resource will cause this function to be called again anyway.
4644

47-
done, err := reconcile.ConfigMap(ctx, r.Client, &server)
45+
done, err := ConfigMap(ctx, r.Client, &server)
4846
if err != nil {
4947
return ctrl.Result{}, err
5048
}
@@ -53,14 +51,14 @@ func (r *MinecraftServerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
5351
}
5452

5553
if server.Spec.Dynmap != nil && server.Spec.Dynmap.Enabled {
56-
done, err := reconcile.DynmapConfigMap(ctx, r.Client, &server)
54+
done, err := DynmapConfigMap(ctx, r.Client, &server)
5755
if err != nil {
5856
return ctrl.Result{}, err
5957
}
6058
if done {
6159
return ctrl.Result{}, nil
6260
}
63-
done, err = reconcile.DynmapService(ctx, r.Client, &server)
61+
done, err = DynmapService(ctx, r.Client, &server)
6462
if err != nil {
6563
return ctrl.Result{}, err
6664
}
@@ -69,23 +67,23 @@ func (r *MinecraftServerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
6967
}
7068
}
7169

72-
done, err = reconcile.Service(ctx, r.Client, &server)
70+
done, err = Service(ctx, r.Client, &server)
7371
if err != nil {
7472
return ctrl.Result{}, err
7573
}
7674
if done {
7775
return ctrl.Result{}, nil
7876
}
7977

80-
done, err = reconcile.RCONService(ctx, r.Client, &server)
78+
done, err = RCONService(ctx, r.Client, &server)
8179
if err != nil {
8280
return ctrl.Result{}, err
8381
}
8482
if done {
8583
return ctrl.Result{}, nil
8684
}
8785

88-
done, err = reconcile.ReplicaSet(ctx, r.Client, &server)
86+
done, err = ReplicaSet(ctx, r.Client, &server)
8987
if err != nil {
9088
return ctrl.Result{}, err
9189
}
@@ -98,7 +96,6 @@ func (r *MinecraftServerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
9896
return ctrl.Result{}, nil
9997
}
10098

101-
// SetupWithManager sets up the controller with the Manager.
10299
func (r *MinecraftServerReconciler) SetupWithManager(mgr ctrl.Manager) error {
103100
return ctrl.NewControllerManagedBy(mgr).
104101
For(&minecraftv1alpha1.MinecraftServer{}).

controller/controller_test.go renamed to pkg/controller/minecraftserver/controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package controller
1+
package minecraftserver
22

33
import (
44
"context"

pkg/reconcile/dynmap_config_map.go renamed to pkg/controller/minecraftserver/dynmap_config_map.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package reconcile
1+
package minecraftserver
22

33
import (
44
"context"
@@ -36,7 +36,7 @@ func DynmapConfigMap(ctx context.Context, k8s client.Client, server *minecraftv1
3636
ObjectMeta: metav1.ObjectMeta{
3737
Name: expectedName.Name,
3838
Namespace: expectedName.Namespace,
39-
OwnerReferences: []metav1.OwnerReference{ownerReference(server)},
39+
OwnerReferences: []metav1.OwnerReference{serverOwnerReference(server)},
4040
},
4141
Data: data,
4242
}
@@ -47,7 +47,7 @@ func DynmapConfigMap(ctx context.Context, k8s client.Client, server *minecraftv1
4747

4848
if !hasCorrectOwnerReference(server, &actualConfigMap) {
4949
log.Info("ConfigMap owner references incorrect, updating")
50-
actualConfigMap.OwnerReferences = append(actualConfigMap.OwnerReferences, ownerReference(server))
50+
actualConfigMap.OwnerReferences = append(actualConfigMap.OwnerReferences, serverOwnerReference(server))
5151
return true, k8s.Update(ctx, &actualConfigMap)
5252
}
5353

pkg/reconcile/dynmap_service.go renamed to pkg/controller/minecraftserver/dynmap_service.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package reconcile
1+
package minecraftserver
22

33
import (
44
"context"
@@ -32,7 +32,7 @@ func DynmapService(ctx context.Context, k8s client.Client, server *minecraftv1al
3232
// Check service for integrity
3333
if !hasCorrectOwnerReference(server, &actualService) {
3434
log.Info("Dynmap service owner references incorrect, updating")
35-
actualService.OwnerReferences = append(actualService.OwnerReferences, ownerReference(server))
35+
actualService.OwnerReferences = append(actualService.OwnerReferences, serverOwnerReference(server))
3636
return true, k8s.Update(ctx, &actualService)
3737
}
3838

@@ -82,7 +82,7 @@ func dynmapServiceForServer(server *minecraftv1alpha1.MinecraftServer) corev1.Se
8282
ObjectMeta: metav1.ObjectMeta{
8383
Name: server.Name + "-dynmap",
8484
Namespace: server.Namespace,
85-
OwnerReferences: []metav1.OwnerReference{ownerReference(server)},
85+
OwnerReferences: []metav1.OwnerReference{serverOwnerReference(server)},
8686
},
8787
Spec: corev1.ServiceSpec{
8888
IPFamilyPolicy: &prefer,

0 commit comments

Comments
 (0)