Get Dynmap using SPIGET

Author: JamesLaverack

api/v1alpha1/minecraftserver_types.go

@@ -64,6 +64,10 @@ type MonitoringSpec struct {
 	Enabled bool `json:"enabled"`
 }
 
+type DynmapSpec struct {
+	Enabled bool `json:"enabled"`
+}
+
 // MinecraftServerSpec defines the desired state of MinecraftServer
 type MinecraftServerSpec struct {
 	EULA              EULAAcceptance  `json:"eula"`
@@ -78,6 +82,7 @@ type MinecraftServerSpec struct {
 	ExternalServiceIP string          `json:"externalServiceIP"`
 	VanillaTweaks     *VanillaTweaks  `json:"vanillaTweaks,omitempty"`
 	Monitoring        *MonitoringSpec `json:"monitoring,omitempty"`
+	Dynmap            *DynmapSpec     `json:"dynmap,omitempty"`
 }
 
 // MinecraftServerStatus defines the observed state of MinecraftServer

api/v1alpha1/zz_generated.deepcopy.go

@@ -53,6 +53,13 @@ spec:
                       type: string
                   type: object
                 type: array
+              dynmap:
+                properties:
+                  enabled:
+                    type: boolean
+                required:
+                - enabled
+                type: object
               eula:
                 enum:
                 - Accepted

config/crd/bases/minecraft.jameslaverack.com_minecraftservers.yaml

@@ -720,3 +720,33 @@ func TestReconcilerFixesServiceOwnerReference(t *testing.T) {
 	require.NoError(t, err)
 	assertOwnerReference(t, &server, &service)
 }
+
+func TestDynmapEnabled(t *testing.T) {
+	ctx := context.Background()
+	k8sClient, teardownFunc := setupTestingEnvironment(ctx, t)
+	defer teardownFunc()
+
+	server := generateTestServer()
+	server.Spec.Dynmap = &minecraftv1alpha1.DynmapSpec{
+		Enabled: true,
+	}
+	err := k8sClient.Create(ctx, &server)
+	require.NoError(t, err)
+
+	// TODO Find a better way to know when the reconciler is done
+	time.Sleep(reconcilerSyncDelay)
+
+	var configMap corev1.ConfigMap
+	err = k8sClient.Get(ctx, client.ObjectKeyFromObject(&server), &configMap)
+	require.NoError(t, err)
+
+	var pod corev1.Pod
+	err = k8sClient.Get(ctx, client.ObjectKeyFromObject(&server), &pod)
+	require.NoError(t, err)
+	assertOwnerReference(t, &server, &pod)
+	spec := pod.Spec
+	require.NotNil(t, spec)
+	container := pod.Spec.Containers[0]
+
+	assertEnv(t, container, "SPIGET_RESOURCES", "274")
+}

controllers/minecraftserver_controller_test.go

@@ -292,7 +292,18 @@ func podForServer(server *v1alpha1.MinecraftServer, configMap *corev1.ConfigMap)
 			})
 	}
 
-	spigetResources := make([]string, 0)
+	var spigetResources []string
+
+	if server.Spec.Dynmap != nil && server.Spec.Dynmap.Enabled {
+		// This magic number is the Spigot plugin ID for Dynmap
+		// https://www.spigotmc.org/resources/dynmap%C2%AE.274/
+		spigetResources = append(spigetResources, "274")
+		container.Ports = append(container.Ports,
+			corev1.ContainerPort{
+				Name:          "http",
+				ContainerPort: 8123,
+			})
+	}
 
 	if server.Spec.Monitoring != nil && server.Spec.Monitoring.Enabled {
 		// This magic number is the Spigot plugin ID for the Prometheus Exporter plugin