enhancement: Console controller error handling improvements (#1817)

pluralsh · Feb 10, 2025 · f941814 · f941814
1 parent 645f2ee
commit f941814
Show file tree

Hide file tree

Showing 36 changed files with 290 additions and 641 deletions.
diff --git a/charts/controller/crds/deployments.plural.sh_bootstraptokens.yaml b/charts/controller/crds/deployments.plural.sh_bootstraptokens.yaml
@@ -45,8 +45,8 @@ spec:
             description: BootstrapTokenSpec defines the desired state of BootstrapToken
             properties:
               projectRef:
-                description: ProjectRef is the optional project that all clusters
-                  spawned by generated bootstrap token will belong to
+                description: ProjectRef is the project that all clusters spawned by
+                  generated bootstrap token will belong to
                 properties:
                   apiVersion:
                     description: API version of the referent.

diff --git a/go/controller/api/v1alpha1/bootstraptoken_types.go b/go/controller/api/v1alpha1/bootstraptoken_types.go
@@ -38,7 +38,7 @@ type BootstrapTokenSpec struct {
 	// +kubebuilder:validation:Optional
 	User *string `json:"user,omitempty"`
 
-	// ProjectRef is the optional project that all clusters spawned by generated bootstrap token will belong to
+	// ProjectRef is the project that all clusters spawned by generated bootstrap token will belong to
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Project is immutable"
 	// +kubebuilder:validation:Required
 	ProjectRef v1.ObjectReference `json:"projectRef,omitempty"`

diff --git a/go/controller/config/crd/bases/deployments.plural.sh_bootstraptokens.yaml b/go/controller/config/crd/bases/deployments.plural.sh_bootstraptokens.yaml
@@ -45,8 +45,8 @@ spec:
             description: BootstrapTokenSpec defines the desired state of BootstrapToken
             properties:
               projectRef:
-                description: ProjectRef is the optional project that all clusters
-                  spawned by generated bootstrap token will belong to
+                description: ProjectRef is the project that all clusters spawned by
+                  generated bootstrap token will belong to
                 properties:
                   apiVersion:
                     description: API version of the referent.

diff --git a/go/controller/config/samples/catalog.yaml b/go/controller/config/samples/catalog.yaml
@@ -0,0 +1,52 @@
+apiVersion: deployments.plural.sh/v1alpha1
+kind: Project
+metadata:
+  name: default
+spec:
+  name: default
+---
+apiVersion: deployments.plural.sh/v1alpha1
+kind: Catalog
+metadata:
+  labels:
+    app.kubernetes.io/name: base-catalog
+    app.kubernetes.io/instance: catalog-sample
+    app.kubernetes.io/part-of: controller
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: controller
+  name: base-catalog
+spec:
+  author: Plural
+  category: Data
+  description: The new open-source standard to sync data from applications, APIs & databases. One click deploys for data scientists and developers.
+  projectRef:
+    name: default
+---
+apiVersion: deployments.plural.sh/v1alpha1
+kind: Catalog
+metadata:
+  labels:
+    app.kubernetes.io/name: data-catalog
+    app.kubernetes.io/instance: catalog-sample
+    app.kubernetes.io/part-of: controller
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: controller
+  name: data-catalog
+spec:
+  author: Plural
+  category: Data
+  description: The new open-source standard to sync data from applications, APIs & databases. One click deploys for data scientists and developers.
+---
+apiVersion: deployments.plural.sh/v1alpha1
+kind: Catalog
+metadata:
+  labels:
+    app.kubernetes.io/name: uncategorized-catalog
+    app.kubernetes.io/instance: catalog-sample
+    app.kubernetes.io/part-of: controller
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/created-by: controller
+  name: uncategorized-catalog
+spec:
+  author: Plural
+  description: The new open-source standard to sync data from applications, APIs & databases. One click deploys for data scientists and developers.
diff --git a/go/controller/config/samples/deployments_v1alpha1_catalog.yaml b/go/controller/config/samples/deployments_v1alpha1_catalog.yaml
diff --git a/...eployments_v1alpha1_managednamespace.yaml → ...ler/config/samples/managed_namespace.yaml b/...eployments_v1alpha1_managednamespace.yaml → ...ler/config/samples/managed_namespace.yaml
diff --git a/go/controller/docs/api.md b/go/controller/docs/api.md
@@ -205,7 +205,7 @@ _Appears in:_
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
 | `user` _string_ | User is an optional email to the user identity for this bootstrap token in audit logs |  | Optional: {} <br /> |
-| `projectRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | ProjectRef is the optional project that all clusters spawned by generated bootstrap token will belong to |  | Required: {} <br /> |
+| `projectRef` _[ObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#objectreference-v1-core)_ | ProjectRef is the project that all clusters spawned by generated bootstrap token will belong to |  | Required: {} <br /> |
 | `tokenSecretRef` _[SecretReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.29/#secretreference-v1-core)_ | TokenSecretRef points to an output secret where bootstrap token will be stored.<br />It will be created automatically in the same namespace as BootstrapToken and cannot exist. |  | Required: {} <br /> |