✨ Add Extensions to the capsule types (#1202)

This required some fixing in the proto-gen script.
Also added a hacky crdcopy script to copy generated crd into
the helm charts.

cmd/rig/cmd/capsule/deploy/deploy.go

@@ -198,6 +198,7 @@ func (c *Cmd) getChanges(cmd *cobra.Command, args []string) ([]*capsule.Change,
 			removeAnnotations != nil ||
 			cmd.Flag("replicas").Changed ||
 			configFiles != nil ||
+			configFileRefs != nil ||
 			removeConfigFiles != nil ||
 			networkInterfaces != nil ||
 			removeNetworkInterfaces != nil {
@@ -209,7 +210,7 @@ func (c *Cmd) getChanges(cmd *cobra.Command, args []string) ([]*capsule.Change,
 		}
 		spec, err := v1.YAMLToCapsuleProto(bytes)
 		if err != nil {
-			return nil, "", "", "", err
+			return nil, "", "", "", fmt.Errorf("oof: %s", err)
 		}
 		return []*capsule.Change{{
 			Field: &capsule.Change_Spec{

deploy/charts/rig-operator/templates/crd.yaml

@@ -490,6 +490,9 @@ spec:
                       type: object
                     type: array
                 type: object
+              extensions:
+                type: object
+                x-kubernetes-preserve-unknown-fields: true
               files:
                 description: Files is a list of files to mount in the container. These
                   can either be based on ConfigMaps or Secrets.

docs/docs/api/platform-api.md

@@ -1680,6 +1680,7 @@ A reference to a kubernetes object.
 | scale | [Scale](#platform-v1-Scale) |  |  |
 | cronJobs | [CronJob](#platform-v1-CronJob) | repeated |  |
 | autoAddRigServiceAccounts | [bool](#bool) |  |  |
+| extensions | [CapsuleSpec.ExtensionsEntry](#platform-v1-CapsuleSpec-ExtensionsEntry) | repeated |  |
 
 
 
@@ -1702,6 +1703,22 @@ A reference to a kubernetes object.
 
 
 
+<a name="platform-v1-CapsuleSpec-ExtensionsEntry"></a>
+
+### CapsuleSpec.ExtensionsEntry
+
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| key | [string](#string) |  |  |
+| value | [google.protobuf.Struct](#google-protobuf-Struct) |  |  |
+
+
+
+
+
+
 <a name="platform-v1-CronJob"></a>
 
 ### CronJob

docs/docs/api/platformv1.md

@@ -116,6 +116,7 @@ _Appears in:_
 | `scale` _[Scale](#scale)_ | Scale specifies the scaling of the Capsule. |
 | `cronJobs` _[CronJob](#cronjob) array_ |  |
 | `autoAddRigServiceAccounts` _boolean_ | TODO Move to plugin |
+| `extensions` _object (keys:string, values:RawMessage)_ | Extensions json.RawMessage `json:"extensions,omitempty" protobuf:"14"` |
 
 
 ### CronJob

docs/docs/api/v1alpha2.md

@@ -135,6 +135,7 @@ _Appears in:_
 | `nodeSelector` _object (keys:string, values:string)_ | NodeSelector is a selector for what nodes the Capsule should live on. |
 | `env` _[Env](#env)_ | Env specifies configuration for how the container should obtain environment variables. |
 | `cronJobs` _[CronJob](#cronjob) array_ |  |
+| `extensions` _object (keys:string, values:RawMessage)_ |  |
 
 
 ### CronJob

pkg/api/platform/v1/decode.go

@@ -33,7 +33,7 @@ func YAMLToCapsuleSetProto(bytes []byte) (*platformv1.CapsuleSet, error) {
 
 func YAMLToSpecProto[T interface{ GetKind() string }](bs []byte, o T, expectedKind string) error {
 	if err := yaml.Unmarshal(bs, o, yaml.DisallowUnknownFields); err != nil {
-		return err
+		return fmt.Errorf("unmarshal: %s", err)
 	}
 	if o.GetKind() != "" && o.GetKind() != expectedKind {
 		return fmt.Errorf("kind was %s, not the expected %s", o.GetKind(), expectedKind)

pkg/api/platform/v1/types.go

@@ -3,6 +3,7 @@
 package v1
 
 import (
+	"encoding/json"
 	"maps"
 	"slices"
 
@@ -137,6 +138,12 @@ type CapsuleSpec struct {
 
 	// TODO Move to plugin
 	AutoAddRigServiceAccounts bool `json:"autoAddRigServiceAccounts" protobuf:"13"`
+
+	// +kubebuilder:validation:Schemaless
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +kubebuilder:validation:Type=object
+	// Extensions json.RawMessage `json:"extensions,omitempty" protobuf:"14"`
+	Extentions map[string]json.RawMessage `json:"extensions,omitempty" protobuf:"14"`
 }
 
 // EnvironmentVariables defines the environment variables injected into a Capsule.

pkg/api/v1alpha2/capsule_types.go

@@ -1,6 +1,8 @@
 package v1alpha2
 
 import (
+	"encoding/json"
+
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -42,6 +44,11 @@ type CapsuleSpec struct {
 	Env Env `json:"env,omitempty"`
 
 	CronJobs []CronJob `json:"cronJobs,omitempty"`
+
+	// +kubebuilder:validation:Schemaless
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +kubebuilder:validation:Type=object
+	Extensions map[string]json.RawMessage `json:"extensions,omitempty"`
 }
 
 type CronJob struct {

proto/rig/platform/v1/generated.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package platform.v1;
 
+import "google/protobuf/struct.proto";
 import "k8s.io/api/autoscaling/v2/generated.proto";
 
 message CapsuleSet {
@@ -27,6 +28,7 @@ message CapsuleSpec {
   Scale scale = 8;
   repeated CronJob cronJobs = 10;
   bool autoAddRigServiceAccounts = 13;
+  map<string, google.protobuf.Struct> extensions = 14;
 }
 
 message CapsuleInterface {

scripts/crdcopy.py

@@ -0,0 +1,15 @@
+s = "\n  versions:\n"
+
+with open("deploy/charts/rig-operator/templates/crd.yaml") as f:
+    helm_data = f.read()
+helm_idx = helm_data.find(s) + len(s)
+helm_data = helm_data[:helm_idx]
+
+with open("deploy/kustomize/crd/bases/rig.dev_capsules.yaml") as f:
+    crd_data = f.read()
+crd_idx = crd_data.find(s) + len(s)
+crd_data = crd_data[crd_idx:]
+
+result = helm_data + crd_data + "{{- end }}\n"
+with open("deploy/charts/rig-operator/templates/crd.yaml", "w") as f:
+    f.write(result)

taskfile.yaml

@@ -140,6 +140,7 @@ tasks:
           output:rbac:dir=deploy/kustomize/rbac \
           output:webhook:dir=deploy/kustomize/webhook \
           output:crd:dir=deploy/kustomize/crd/bases
+      - python3 ./scripts/crdcopy.py
 
   generate-k8s:
     desc: "🪄 Run runtime.Object implementaion generation"