New Arch almost done

api/v1alpha1/accesstoken_types.go

@@ -17,7 +17,6 @@ limitations under the License.
 package v1alpha1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -40,8 +39,6 @@ const (
 	SuspendedState AccessTokenState = "Suspended"
 )
 
-type WebserviceReference corev1.SecretReference
-
 // AccessTokenSpec defines the desired state of AccessToken
 type AccessTokenSpec struct {
 	// State shows the state of the token (whether you use token or it's just a draft)

api/v1alpha1/webservice_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -100,10 +101,27 @@ type WebServiceList struct {
 	Items           []WebService `json:"items"`
 }
 
-func (w WebService) encodedName() string {
+type LocalWebserviceReference corev1.LocalObjectReference
+type WebserviceReference corev1.SecretReference
+
+func (w WebserviceReference) LocalName() string {
 	return w.Namespace + "/" + w.Name
 }
 
+func (w LocalWebserviceReference) LocalName(ns string) string {
+	return WebserviceReference{
+		Name:      w.Name,
+		Namespace: ns,
+	}.LocalName()
+}
+
+func (w WebService) LocalName() string {
+	return WebserviceReference{
+		Name:      w.Name,
+		Namespace: w.Namespace,
+	}.LocalName()
+}
+
 func init() {
 	SchemeBuilder.Register(&WebService{}, &WebServiceList{})
 }

api/v1alpha1/webserviceaccessbinding_types.go

@@ -29,7 +29,7 @@ type WebserviceAccessBindingSpec struct {
 	Subjects []string `json:"subjects,omitempty"`
 
 	// WebServices are the target service accesses
-	Webservices []string `json:"webservices,omitempty"`
+	Webservices []LocalWebserviceReference `json:"webservices,omitempty"`
 }
 
 // WebserviceAccessBindingStatus defines the observed state of WebserviceAccessBinding