WMS/WFS generics

Author: Jelle Dijkstra

README.md

@@ -16,7 +16,7 @@
 **Build and push your image to the location specified by `IMG`:**
 
 ```sh
-make docker-build docker-push IMG=<some-registry>/configmap_files-operator:tag
+make docker-build docker-push IMG=<some-registry>/mapserver-operator:tag
 ```
 
 **NOTE:** This image ought to be published in the personal registry you specified.
@@ -32,7 +32,7 @@ make install
 **Deploy the Manager to the cluster with the image specified by `IMG`:**
 
 ```sh
-make deploy IMG=<some-registry>/configmap_files-operator:tag
+make deploy IMG=<some-registry>/mapserver-operator:tag
 ```
 
 > **NOTE**: If you encounter RBAC errors, you may need to grant yourself cluster-admin
@@ -75,7 +75,7 @@ Following the options to release and provide this solution to the users.
 1. Build the installer for the image built and published in the registry:
 
 ```sh
-make build-installer IMG=<some-registry>/configmap_files-operator:tag
+make build-installer IMG=<some-registry>/mapserver-operator:tag
 ```
 
 **NOTE:** The makefile target mentioned above generates an 'install.yaml'
@@ -89,7 +89,7 @@ Users can just run 'kubectl apply -f <URL for YAML BUNDLE>' to install
 the project, i.e.:
 
 ```sh
-kubectl apply -f https://raw.githubusercontent.com/<org>/configmap_files-operator/<tag or branch>/dist/install.yaml
+kubectl apply -f https://raw.githubusercontent.com/<org>/mapserver-operator/<tag or branch>/dist/install.yaml
 ```
 
 ### By providing a Helm Chart

api/v2beta1/wms_types.go

@@ -109,7 +109,7 @@ type StylingAssets struct {
 	BlobKeys      []string       `json:"blobKeys,omitempty"`
 }
 
-// ConfigMapRef contains all the config map name and all keys in that configmap_files that are relevant
+// ConfigMapRef contains all the config map name and all keys in that mapserver that are relevant
 // the Keys can be empty, so that the v1 WMS can convert to the v2beta1 WMS
 type ConfigMapRef struct {
 	Name string   `json:"name"`

api/v3/shared_types.go

@@ -1,13 +1,33 @@
 package v3
 
 import (
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"net/url"
 	"strings"
 )
 
 var host string
 
+type ServiceType string
+
+const (
+	ServiceTypeWMS ServiceType = "WMS"
+	ServiceTypeWFS ServiceType = "WFS"
+)
+
+type WMSWFS interface {
+	*WFS | *WMS
+	metav1.Object
+
+	Mapfile() *Mapfile
+	PodSpecPatch() *corev1.PodSpec
+	HorizontalPodAutoscalerPatch() *autoscalingv2.HorizontalPodAutoscalerSpec
+	Type() ServiceType
+	Options() *Options
+}
+
 type Mapfile struct {
 	ConfigMapKeyRef corev1.ConfigMapKeySelector `json:"configMapKeyRef"`
 }

api/v3/wfs_types.go

@@ -126,3 +126,23 @@ func (wfs *WFS) HasPostgisData() bool {
 	}
 	return false
 }
+
+func (wfs *WFS) Mapfile() *Mapfile {
+	return wfs.Spec.Service.Mapfile
+}
+
+func (wfs *WFS) Type() ServiceType {
+	return ServiceTypeWFS
+}
+
+func (wfs *WFS) PodSpecPatch() *corev1.PodSpec {
+	return wfs.Spec.PodSpecPatch
+}
+
+func (wfs *WFS) HorizontalPodAutoscalerPatch() *autoscalingv2.HorizontalPodAutoscalerSpec {
+	return wfs.Spec.HorizontalPodAutoscalerPatch
+}
+
+func (wfs *WFS) Options() *Options {
+	return wfs.Spec.Options
+}

api/v3/wms_types.go

@@ -233,3 +233,23 @@ func (wms *WMS) GetAuthority() *Authority {
 
 	return nil
 }
+
+func (wms *WMS) Mapfile() *Mapfile {
+	return wms.Spec.Service.Mapfile
+}
+
+func (wms *WMS) Type() ServiceType {
+	return ServiceTypeWMS
+}
+
+func (wms *WMS) PodSpecPatch() *corev1.PodSpec {
+	return wms.Spec.PodSpecPatch
+}
+
+func (wms *WMS) HorizontalPodAutoscalerPatch() *autoscalingv2.HorizontalPodAutoscalerSpec {
+	return wms.Spec.HorizontalPodAutoscalerPatch
+}
+
+func (wms *WMS) Options() *Options {
+	return wms.Spec.Options
+}

cmd/main.go

@@ -95,7 +95,7 @@ func main() {
 	flag.StringVar(&metricsCertKey, "metrics-cert-key", "tls.key", "The name of the metrics server key file.")
 	flag.BoolVar(&enableHTTP2, "enable-http2", false,
 		"If set, HTTP/2 will be enabled for the metrics and webhook servers")
-	flag.StringVar(&host, "baseurl", "", "The host which is used in the configmap_files service.")
+	flag.StringVar(&host, "baseurl", "", "The host which is used in the mapserver service.")
 	flag.StringVar(&multitoolImage, "multitool-image", defaultMultitoolImage, "The image to use in the blob download init-container.")
 	flag.StringVar(&mapfileGeneratorImage, "mapfile-generator-image", defaultMapfileGeneratorImage, "The image to use in the mapfile generator init-container.")
 	flag.StringVar(&capabilitiesGeneratorImage, "capabilities-generator-image", defaultCapabilitiesGeneratorImage, "The image to use in the capabilities generator init-container.")

config/crd/bases/pdok.nl_wms.yaml

@@ -383,7 +383,7 @@ spec:
                       configMapRefs:
                         items:
                           description: |-
-                            ConfigMapRef contains all the config map name and all keys in that configmap_files that are relevant
+                            ConfigMapRef contains all the config map name and all keys in that mapserver that are relevant
                             the Keys can be empty, so that the v1 WMS can convert to the v2beta1 WMS
                           properties:
                             keys:

config/default/kustomization.yaml

@@ -6,7 +6,7 @@ namespace: services
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: configmap_files-operator-
+namePrefix: mapserver-operator-
 
 # Labels to add to all resources and selectors.
 #labels:

config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: local-registry:5000/configmap_files-operator
+  newName: local-registry:5000/mapserver-operator
   newTag: v3.0.10

config/prometheus/monitor.yaml

@@ -24,4 +24,4 @@ spec:
   selector:
     matchLabels:
       control-plane: controller-manager
-      app.kubernetes.io/name: configmap_files-operator
+      app.kubernetes.io/name: mapserver-operator