Mergig with Damien

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>/mapserver-operator:tag
+make docker-build docker-push IMG=<some-registry>/configmap_files-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>/mapserver-operator:tag
+make deploy IMG=<some-registry>/configmap_files-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>/mapserver-operator:tag
+make build-installer IMG=<some-registry>/configmap_files-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>/mapserver-operator/<tag or branch>/dist/install.yaml
+kubectl apply -f https://raw.githubusercontent.com/<org>/configmap_files-operator/<tag or branch>/dist/install.yaml
 ```
 
 ### By providing a Helm Chart

api/v2beta1/shared_conversion.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	pdoknlv3 "github.com/pdok/mapserver-operator/api/v3"
 	shared_model "github.com/pdok/smooth-operator/model"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta1"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -60,8 +60,11 @@ func ConverseAutoscaling(src Autoscaling) *autoscalingv2.HorizontalPodAutoscaler
 		metrics = append(metrics, autoscalingv2.MetricSpec{
 			Type: autoscalingv2.ResourceMetricSourceType,
 			Resource: &autoscalingv2.ResourceMetricSource{
-				Name:                     corev1.ResourceCPU,
-				TargetAverageUtilization: Pointer(int32(*src.AverageCPUUtilization)),
+				Name: corev1.ResourceCPU,
+				Target: autoscalingv2.MetricTarget{
+					Type:               autoscalingv2.UtilizationMetricType,
+					AverageUtilization: Pointer(int32(*src.AverageCPUUtilization)),
+				},
 			},
 		})
 	}
@@ -215,7 +218,7 @@ func NewV2KubernetesObject(lifecycle *shared_model.Lifecycle, podSpecPatch *core
 
 		if scalingSpec.Metrics != nil {
 			kub.Autoscaling.AverageCPUUtilization = Pointer(
-				int(*scalingSpec.Metrics[0].Resource.TargetAverageUtilization),
+				int(*scalingSpec.Metrics[0].Resource.Target.AverageUtilization),
 			)
 		}
 	}

api/v2beta1/wfs_conversion.go

@@ -61,7 +61,7 @@ func (src *WFS) ConvertTo(dstRaw conversion.Hub) error {
 
 	service := pdoknlv3.WFSService{
 		Prefix:            "",
-		BaseURL:           CreateBaseURL("https://service.pdok.nl", "wfs", src.Spec.General),
+		URL:               CreateBaseURL("https://service.pdok.nl", "wfs", src.Spec.General),
 		OwnerInfoRef:      "pdok",
 		Title:             src.Spec.Service.Title,
 		Abstract:          src.Spec.Service.Abstract,

api/v2beta1/wms_conversion.go

@@ -65,7 +65,7 @@ func (src *WMS) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Options = ConverseOptionsV2ToV3(src.Spec.Options)
 
 	service := pdoknlv3.WMSService{
-		BaseURL:           CreateBaseURL("https://service.pdok.nl", "wms", src.Spec.General),
+		URL:               CreateBaseURL("https://service.pdok.nl", "wms", src.Spec.General),
 		OwnerInfoRef:      "pdok",
 		Title:             src.Spec.Service.Title,
 		Abstract:          src.Spec.Service.Abstract,

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 that are relevant
+// ConfigMapRef contains all the config map name and all keys in that configmap_files 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

@@ -2,10 +2,11 @@ package v3
 
 import (
 	corev1 "k8s.io/api/core/v1"
+	"net/url"
 	"strings"
 )
 
-var baseURL string
+var host string
 
 type Mapfile struct {
 	ConfigMapKeyRef corev1.ConfigMapKeySelector `json:"configMapKeyRef"`
@@ -73,10 +74,27 @@ type Columns struct {
 	Alias *string `json:"alias,omitempty"`
 }
 
-func SetBaseURL(url string) {
-	baseURL = strings.TrimSuffix(url, "/")
+func SetHost(url string) {
+	host = strings.TrimSuffix(url, "/")
 }
 
-func GetBaseURL() string {
-	return baseURL
+func GetHost() string {
+	return host
+}
+
+func GetBaseURLPath[T *WFS | *WMS](o T) string {
+	var serviceUrl string
+	switch any(o).(type) {
+	case *WFS:
+		if WFS, ok := any(o).(*WFS); ok {
+			serviceUrl = WFS.Spec.Service.URL
+		}
+	case *WMS:
+		if WMS, ok := any(o).(*WMS); ok {
+			serviceUrl = WMS.Spec.Service.URL
+		}
+	}
+
+	parsed, _ := url.Parse(serviceUrl)
+	return strings.TrimPrefix(parsed.Path, "/")
 }

api/v3/wfs_types.go

@@ -26,7 +26,7 @@ package v3
 
 import (
 	shared_model "github.com/pdok/smooth-operator/model"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta1"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -79,7 +79,7 @@ type WFSSpec struct {
 
 type WFSService struct {
 	Prefix            string   `json:"prefix"`
-	BaseURL           string   `json:"baseUrl"`
+	URL               string   `json:"url"`
 	Inspire           *Inspire `json:"inspire,omitempty"`
 	Mapfile           *Mapfile `json:"mapfile,omitempty"`
 	OwnerInfoRef      string   `json:"ownerInfoRef"`

api/v3/wfs_validation.go

@@ -35,7 +35,7 @@ func (wfs *WFS) ValidateUpdate(wfsOld *WFS) ([]string, error) {
 	}
 
 	// Check service.baseURL did not change
-	if wfs.Spec.Service.BaseURL != wfsOld.Spec.Service.BaseURL {
+	if wfs.Spec.Service.URL != wfsOld.Spec.Service.URL {
 		reasons = append(reasons, fmt.Sprintf("service.baseURL is immutable"))
 	}
 
@@ -59,7 +59,7 @@ func validateWFS(wfs *WFS, warnings *[]string, reasons *[]string) {
 
 	service := wfs.Spec.Service
 
-	err := sharedValidation.ValidateBaseURL(service.BaseURL)
+	err := sharedValidation.ValidateBaseURL(service.URL)
 	if err != nil {
 		*reasons = append(*reasons, fmt.Sprintf("%v", err))
 	}

api/v3/wms_types.go

@@ -26,7 +26,7 @@ package v3
 
 import (
 	shared_model "github.com/pdok/smooth-operator/model"
-	autoscalingv2 "k8s.io/api/autoscaling/v2beta1"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"maps"
@@ -52,7 +52,7 @@ type WMSSpec struct {
 }
 
 type WMSService struct {
-	BaseURL           string         `json:"baseUrl"`
+	URL               string         `json:"url"`
 	Title             string         `json:"title"`
 	Abstract          string         `json:"abstract"`
 	Keywords          []string       `json:"keywords"`