Merge branch 'main' into feat/service-catalog-registration-design

Author: JoseSzycho

.github/workflows/publish.yaml

@@ -16,7 +16,7 @@ jobs:
       contents: read
       packages: write
       attestations: write
-    uses: datum-cloud/actions/.github/workflows/publish-docker.yaml@v1.13.1
+    uses: datum-cloud/actions/.github/workflows/publish-docker.yaml@v1.14.0
     with:
       image-name: network-services-operator
       platforms: linux/amd64,linux/arm64
@@ -27,8 +27,10 @@ jobs:
       id-token: write
       contents: read
       packages: write
-    uses: datum-cloud/actions/.github/workflows/publish-kustomize-bundle.yaml@v1.5.1
+    uses: datum-cloud/actions/.github/workflows/publish-kustomize-bundle.yaml@v1.14.0
     with:
       bundle-name: ghcr.io/datum-cloud/network-services-operator-kustomize
       bundle-path: config
+      image-name: ghcr.io/datum-cloud/network-services-operator
+      image-overlays: config/manager
     secrets: inherit

PROJECT

@@ -64,7 +64,7 @@ resources:
   version: v1alpha
 - api:
     crdVersion: v1
-    namespaced: true
+    namespaced: false
   domain: datumapis.com
   group: networking
   kind: Location

api/v1alpha/location_types.go

@@ -69,6 +69,7 @@ type LocationStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:resource:scope=Cluster
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Class",type="string",JSONPath=".spec.locationClassName"
 // +kubebuilder:printcolumn:name="City",type="string",JSONPath=`.spec.topology.topology\.datum\.net/city-code`

api/v1alpha/locationbinding_types.go

@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+
+package v1alpha
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// LocationBindingSpec defines the desired state of LocationBinding.
+type LocationBindingSpec struct {
+	// LocationRef references the canonical cluster-scoped Location object.
+	LocationRef corev1.LocalObjectReference `json:"locationRef"`
+
+	// LocationClassName mirrors spec.locationClassName from the referenced Location.
+	LocationClassName string `json:"locationClassName,omitempty"`
+
+	// DisplayName is a human-readable label for the location.
+	// +optional
+	DisplayName string `json:"displayName,omitempty"`
+
+	// Topology mirrors spec.topology from the referenced Location, containing
+	// well-known keys like topology.datum.net/city-code and topology.datum.net/region.
+	// +optional
+	Topology map[string]string `json:"topology,omitempty"`
+}
+
+// LocationBindingStatus defines the observed state of LocationBinding.
+type LocationBindingStatus struct {
+	// +listType=map
+	// +listMapKey=type
+	// +patchStrategy=merge
+	// +patchMergeKey=type
+	// +optional
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:printcolumn:name="Location",type="string",JSONPath=".spec.locationRef.name"
+// +kubebuilder:printcolumn:name="Class",type="string",JSONPath=".spec.locationClassName"
+// +kubebuilder:printcolumn:name="Available",type="string",JSONPath=`.status.conditions[?(@.type=="Available")].status`
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+
+// LocationBinding is the Schema for the locationbindings API. It is a
+// cluster-scoped projection of a cluster-scoped Location into a project's
+// virtual control plane, created once the location's class is supported, the
+// Location is Ready, and the corresponding ServiceAvailability is Available.
+type LocationBinding struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   LocationBindingSpec   `json:"spec,omitempty"`
+	Status LocationBindingStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// LocationBindingList contains a list of LocationBinding.
+type LocationBindingList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []LocationBinding `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&LocationBinding{}, &LocationBindingList{})
+}

api/v1alpha/zz_generated.deepcopy.go

@@ -0,0 +1,158 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.4
+  name: locationbindings.networking.datumapis.com
+spec:
+  group: networking.datumapis.com
+  names:
+    kind: LocationBinding
+    listKind: LocationBindingList
+    plural: locationbindings
+    singular: locationbinding
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.locationRef.name
+      name: Location
+      type: string
+    - jsonPath: .spec.locationClassName
+      name: Class
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Available")].status
+      name: Available
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha
+    schema:
+      openAPIV3Schema:
+        description: |-
+          LocationBinding is the Schema for the locationbindings API. It is a
+          cluster-scoped projection of a cluster-scoped Location into a project's
+          virtual control plane, created once the location's class is supported, the
+          Location is Ready, and the corresponding ServiceAvailability is Available.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: LocationBindingSpec defines the desired state of LocationBinding.
+            properties:
+              displayName:
+                description: DisplayName is a human-readable label for the location.
+                type: string
+              locationClassName:
+                description: LocationClassName mirrors spec.locationClassName from
+                  the referenced Location.
+                type: string
+              locationRef:
+                description: LocationRef references the canonical cluster-scoped Location
+                  object.
+                properties:
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              topology:
+                additionalProperties:
+                  type: string
+                description: |-
+                  Topology mirrors spec.topology from the referenced Location, containing
+                  well-known keys like topology.datum.net/city-code and topology.datum.net/region.
+                type: object
+            required:
+            - locationRef
+            type: object
+          status:
+            description: LocationBindingStatus defines the observed state of LocationBinding.
+            properties:
+              conditions:
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

config/crd/bases/networking.datumapis.com_locationbindings.yaml

@@ -12,7 +12,7 @@ spec:
     listKind: LocationList
     plural: locations
     singular: location
-  scope: Namespaced
+  scope: Cluster
   versions:
   - additionalPrinterColumns:
     - jsonPath: .spec.locationClassName

config/crd/bases/networking.datumapis.com_locations.yaml

@@ -9,6 +9,7 @@ resources:
 - bases/networking.datumapis.com_subnets.yaml
 - bases/networking.datumapis.com_subnetclaims.yaml
 - bases/networking.datumapis.com_locations.yaml
+- bases/networking.datumapis.com_locationbindings.yaml
 - bases/networking.datumapis.com_domains.yaml
 - bases/networking.datumapis.com_httpproxies.yaml
 - bases/networking.datumapis.com_trafficprotectionpolicies.yaml