Switch template to cluster scoped

Author: barney-s

api/v1alpha1/sandboxclaim_types.go

@@ -33,10 +33,6 @@ type SandboxClaimSpec struct {
 	// Template refers to the SandboxTemplate to be used for creating a Sandbox
 	// +kubebuilder:validation:Required
 	TemplateName string `json:"templateName,omitempty" protobuf:"bytes,3,name=templateName"`
-
-	// TemplateNamespace refers to the SandboxTemplate namespace
-	// +kubebuilder:validation:Optional
-	TemplateNamespace string `json:"templateNamespace,omitempty" protobuf:"bytes,4,opt,name=templateNamespace"`
 }
 
 // SandboxClaimStatus defines the observed state of Sandbox.

api/v1alpha1/sandboxtemplate_types.go

@@ -33,7 +33,7 @@ type SandboxTemplateSpec struct {
 	// template is the object that describes the pod spec that will be used to create
 	// an agent sandbox.
 	// +kubebuilder:validation:Required
-	Template corev1.PodTemplateSpec `json:"template" protobuf:"bytes,3,opt,name=template"`
+	Template corev1.PodTemplateSpec `json:"podTemplate" protobuf:"bytes,3,opt,name=template"`
 }
 
 // SandboxTemplateStatus defines the observed state of Sandbox.
@@ -42,7 +42,7 @@ type SandboxTemplateStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=Namespaced,shortName=sandboxtemplate
+// +kubebuilder:resource:scope=Cluster,shortName=sandboxtemplate
 // SandboxTemplate is the Schema for the sandboxe template API
 type SandboxTemplate struct {
 	metav1.TypeMeta `json:",inline"`

manifest/crds/agents.x-k8s.io_sandboxclaims.yaml

@@ -30,8 +30,6 @@ spec:
             properties:
               templateName:
                 type: string
-              templateNamespace:
-                type: string
               ttlSeconds:
                 format: int32
                 type: integer

manifest/crds/agents.x-k8s.io_sandboxtemplates.yaml

@@ -14,7 +14,7 @@ spec:
     shortNames:
     - sandboxtemplate
     singular: sandboxtemplate
-  scope: Namespaced
+  scope: Cluster
   versions:
   - name: v1alpha1
     schema:
@@ -28,7 +28,7 @@ spec:
             type: object
           spec:
             properties:
-              template:
+              podTemplate:
                 properties:
                   metadata:
                     type: object
@@ -3666,7 +3666,7 @@ spec:
                 format: int32
                 type: integer
             required:
-            - template
+            - podTemplate
             type: object
           status:
             type: object