chore: tweak schema for forwardingRule -> memorystore service attachemnt

Also we finally hit a circular dependency between compute and memorystore,
so we need to move the instance identity and ref into its own package,
that both compute and memorystore can use without creating a circular dependency.

Author: justinsb

apis/compute/v1beta1/forwardingrule_types.go

@@ -15,6 +15,7 @@
 package v1beta1
 
 import (
+	"github.com/GoogleCloudPlatform/k8s-config-connector/apis/memorystore/memorystorerefs"
 	refs "github.com/GoogleCloudPlatform/k8s-config-connector/apis/refs/v1beta1"
 	commonv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/apis/common/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -85,9 +86,9 @@ type Target struct {
 	// +optional
 	GoogleAPIsBundle *string `json:"googleAPIsBundle,omitempty"`
 
-	// The service attachment for a Memorystore for Valkey instance.
+	// Target a serviceAttachment for a Memorystore for Valkey instance.
 	// +optional
-	MemorystoreInstanceServiceAttachmentRef *refs.MemorystoreInstanceServiceAttachmentRef `json:"memorystoreInstanceServiceAttachmentRef,omitempty"`
+	MemorystoreInstanceServiceAttachment *MemorystoreInstanceServiceAttachment `json:"memorystoreInstanceServiceAttachment,omitempty"`
 
 	// +optional
 	ServiceAttachmentRef *refs.ComputeServiceAttachmentRef `json:"serviceAttachmentRef,omitempty"`
@@ -111,6 +112,22 @@ type Target struct {
 	TargetVPNGatewayRef *refs.ComputeTargetVPNGatewayRef `json:"targetVPNGatewayRef,omitempty"`
 }
 
+// MemorystoreInstanceServiceAttachment defines the resource reference to the GCP identifier
+// for the ServiceAttachment managed by the MemorystoreInstance pointed by the MemorystoreInstanceRef.
+// +k8s:deepcopy-gen=true
+type MemorystoreInstanceServiceAttachment struct {
+	// A reference to a MemorystoreInstance resource.
+	// +required
+	MemorystoreInstanceRef *memorystorerefs.InstanceRef `json:"memorystoreInstanceRef,omitempty"`
+
+	// The connection type of the serviceAttachment.
+	// A memorystore instance has multiple serviceAttachments, each with a different connection type.
+	// Use connectionType to control which serviceAttachment to target.
+	// The empty value matches a serviceAttachment with an empty connectionType.
+	// +optional
+	ConnectionType *string `json:"connectionType,omitempty"`
+}
+
 // +kcc:spec:proto=google.cloud.compute.v1.ForwardingRule
 type ComputeForwardingRuleSpec struct {
 	/* Immutable. This field can only be used:

apis/compute/v1beta1/zz_generated.deepcopy.go

@@ -0,0 +1,61 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package memorystorerefs
+
+import (
+	"fmt"
+	"strings"
+)
+
+// InstanceIdentity defines the resource reference to MemorystoreInstance, which "External" field
+// holds the GCP identifier for the KRM object.
+type InstanceIdentity struct {
+	Parent_ *InstanceParent
+	ID_     string
+}
+
+func (i *InstanceIdentity) String() string {
+	return i.Parent_.String() + "/instances/" + i.ID_
+}
+
+func (i *InstanceIdentity) ID() string {
+	return i.ID_
+}
+
+func (i *InstanceIdentity) Parent() *InstanceParent {
+	return i.Parent_
+}
+
+type InstanceParent struct {
+	ProjectID string
+	Location  string
+}
+
+func (p *InstanceParent) String() string {
+	return "projects/" + p.ProjectID + "/locations/" + p.Location
+}
+
+func ParseInstanceExternal(external string) (parent *InstanceParent, resourceID string, err error) {
+	tokens := strings.Split(external, "/")
+	if len(tokens) != 6 || tokens[0] != "projects" || tokens[2] != "locations" || tokens[4] != "instances" {
+		return nil, "", fmt.Errorf("format of MemorystoreInstance external=%q was not known (use projects/{{projectID}}/locations/{{location}}/instances/{{instanceID}})", external)
+	}
+	parent = &InstanceParent{
+		ProjectID: tokens[1],
+		Location:  tokens[3],
+	}
+	resourceID = tokens[5]
+	return parent, resourceID, nil
+}

apis/memorystore/v1beta1/generate.sh apis/memorystore/generate.shapis/memorystore/v1beta1/generate.sh renamed to apis/memorystore/generate.sh

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1beta1
+package memorystorerefs
 
 import (
 	"context"
@@ -22,10 +22,17 @@ import (
 	"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/k8s"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+var MemorystoreInstanceGVK = schema.GroupVersionKind{
+	Group:   "memorystore.cnrm.cloud.google.com",
+	Version: "v1beta1",
+	Kind:    "MemorystoreInstance",
+}
+
 var _ refsv1beta1.ExternalNormalizer = &InstanceRef{}
 
 // InstanceRef defines the resource reference to MemorystoreInstance, which "External" field

apis/memorystore/memorystorerefs/instance_identity.go

@@ -16,7 +16,7 @@ package v1alpha1
 
 import (
 	computev1beta1 "github.com/GoogleCloudPlatform/k8s-config-connector/apis/compute/v1beta1"
-	refsv1beta1 "github.com/GoogleCloudPlatform/k8s-config-connector/apis/refs/v1beta1"
+	"github.com/GoogleCloudPlatform/k8s-config-connector/apis/memorystore/memorystorerefs"
 	"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/apis/k8s/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -28,7 +28,7 @@ var MemorystoreInstanceEndpointGVK = GroupVersion.WithKind("MemorystoreInstanceE
 type MemorystoreInstanceEndpointSpec struct {
 	// Required. The Memorystore instance reference of the endpoint.
 	// +required
-	InstanceRef *refsv1beta1.MemorystoreInstanceRef `json:"instanceRef"`
+	InstanceRef *memorystorerefs.InstanceRef `json:"instanceRef"`
 
 	// Optional. The MemorystoreInstanceEndpoint name. If not given, the metadata.name will be used.
 	// +optional