Add Goose model field and update config paths

Add a dedicated Model field to GooseConfig so the Goose AI model can be
set declaratively in the OpenStackAssistant CR spec rather than requiring
it to be passed as a raw env var. When set, the controller injects the
GOOSE_MODEL environment variable into the pod.

Update the entrypoint script to use $HOME/.config/goose/ instead of
~/.goose/ for Goose configuration paths, aligning with the XDG base
directory convention used by newer Goose versions.

Author: dprince

api/assistant/v1beta1/openstackassistant_types.go

@@ -54,6 +54,11 @@ type LightspeedStackSpec struct {
 
 // GooseConfig defines Goose-specific provider configuration
 type GooseConfig struct {
+	// Model is the model identifier for the Goose AI agent
+	// (e.g., "gemini/models/gemini-2.5-flash"). Sets the GOOSE_MODEL env var.
+	// +kubebuilder:validation:Optional
+	Model string `json:"model,omitempty"`
+
 	// Recipes is a ConfigMap name containing Goose recipe YAML files.
 	// Each key in the ConfigMap becomes a recipe file registered as a
 	// Goose slash command (e.g., /cluster-health).

api/bases/assistant.openstack.org_openstackassistants.yaml

@@ -188,6 +188,11 @@ spec:
                       The ConfigMap must have a key "hints" with the content that
                       will be written to ~/.goosehints in the pod.
                     type: string
+                  model:
+                    description: |-
+                      Model is the model identifier for the Goose AI agent
+                      (e.g., "gemini/models/gemini-2.5-flash"). Sets the GOOSE_MODEL env var.
+                    type: string
                   recipes:
                     description: |-
                       Recipes is a ConfigMap name containing Goose recipe YAML files.

bindata/crds/crds.yaml

@@ -187,6 +187,11 @@ spec:
                       The ConfigMap must have a key "hints" with the content that
                       will be written to ~/.goosehints in the pod.
                     type: string
+                  model:
+                    description: |-
+                      Model is the model identifier for the Goose AI agent
+                      (e.g., "gemini/models/gemini-2.5-flash"). Sets the GOOSE_MODEL env var.
+                    type: string
                   recipes:
                     description: |-
                       Recipes is a ConfigMap name containing Goose recipe YAML files.

config/crd/bases/assistant.openstack.org_openstackassistants.yaml

@@ -188,6 +188,11 @@ spec:
                       The ConfigMap must have a key "hints" with the content that
                       will be written to ~/.goosehints in the pod.
                     type: string
+                  model:
+                    description: |-
+                      Model is the model identifier for the Goose AI agent
+                      (e.g., "gemini/models/gemini-2.5-flash"). Sets the GOOSE_MODEL env var.
+                    type: string
                   recipes:
                     description: |-
                       Recipes is a ConfigMap name containing Goose recipe YAML files.

hack/clean_local_webhook.sh

@@ -13,3 +13,5 @@ oc delete validatingwebhookconfiguration/vopenstackdataplaneservice.kb.io --igno
 oc delete mutatingwebhookconfiguration/mopenstackdataplanenodeset.kb.io --ignore-not-found
 oc delete mutatingwebhookconfiguration/mopenstackdataplaneservice.kb.io --ignore-not-found
 oc delete mutatingwebhookconfiguration/mopenstackdataplanedeployment.kb.io --ignore-not-found
+oc delete validatingwebhookconfiguration/vopenstackassistant-v1beta1.kb.io --ignore-not-found
+oc delete mutatingwebhookconfiguration/mopenstackassistant-v1beta1.kb.io --ignore-not-found

internal/openstackassistant/funcs.go

@@ -27,10 +27,10 @@ func EntrypointScript() string {
 set -eu
 
 # Create goose config directory
-mkdir -p ~/.goose/config/profiles/default/custom_providers
+mkdir -p $HOME/.config/goose/custom_providers
 
 # Write goose config.yaml
-cat > ~/.goose/config/profiles/default/config.yaml <<'GOOSE_CONFIG'
+cat > $HOME/.config/goose/config.yaml <<'GOOSE_CONFIG'
 extensions:
   developer:
     enabled: true
@@ -68,10 +68,10 @@ if [ -d /tmp/recipes ]; then
     basename=$(basename "$recipe")
     # Strip extension to get the command name
     cmdname="${basename%.*}"
-    echo "  ${cmdname}:" >> ~/.goose/config/profiles/default/config.yaml
-    echo "    type: recipe" >> ~/.goose/config/profiles/default/config.yaml
-    echo "    enabled: true" >> ~/.goose/config/profiles/default/config.yaml
-    echo "    recipe_source: ${recipe}" >> ~/.goose/config/profiles/default/config.yaml
+    echo "  ${cmdname}:" >> $HOME/.config/goose/config.yaml
+    echo "    type: recipe" >> $HOME/.config/goose/config.yaml
+    echo "    enabled: true" >> $HOME/.config/goose/config.yaml
+    echo "    recipe_source: ${recipe}" >> $HOME/.config/goose/config.yaml
   done
 fi
 
@@ -82,7 +82,7 @@ fi
 
 # Copy lightspeed provider config
 if [ -f /tmp/lightspeed-provider/lightspeed.json ]; then
-  cp /tmp/lightspeed-provider/lightspeed.json ~/.goose/config/profiles/default/custom_providers/lightspeed.json
+  cp /tmp/lightspeed-provider/lightspeed.json $HOME/.config/goose/custom_providers/lightspeed.json
 fi
 
 exec sleep infinity
@@ -100,6 +100,10 @@ func AssistantPodSpec(
 	envVars["GOOSE_TELEMETRY_ENABLED"] = env.SetValue("false")
 	envVars["GOOSE_DISABLE_KEYRING"] = env.SetValue("1")
 
+	if instance.Spec.Goose != nil && instance.Spec.Goose.Model != "" {
+		envVars["GOOSE_MODEL"] = env.SetValue(instance.Spec.Goose.Model)
+	}
+
 	if instance.Spec.Env != nil {
 		for idx := range instance.Spec.Env {
 			e := instance.Spec.Env[idx]

internal/openstackassistant/funcs_test.go

@@ -46,7 +46,7 @@ func TestEntrypointScript(t *testing.T) {
 	script := EntrypointScript()
 
 	g.Expect(script).To(ContainSubstring("#!/bin/sh"))
-	g.Expect(script).To(ContainSubstring("mkdir -p ~/.goose/config/profiles/default/custom_providers"))
+	g.Expect(script).To(ContainSubstring("mkdir -p $HOME/.config/goose/custom_providers"))
 	g.Expect(script).To(ContainSubstring("config.yaml"))
 	g.Expect(script).To(ContainSubstring("developer:"))
 	g.Expect(script).To(ContainSubstring("enabled: true"))
@@ -103,11 +103,29 @@ func TestAssistantPodSpec_DefaultEnvVars(t *testing.T) {
 	g.Expect(envMap).To(HaveKeyWithValue("GOOSE_DISABLE_KEYRING", "1"))
 }
 
+func TestAssistantPodSpec_GooseModel(t *testing.T) {
+	g := NewWithT(t)
+	instance := newTestInstance()
+	instance.Spec.Goose = &assistantv1.GooseConfig{
+		Model: "gemini/models/gemini-2.5-flash",
+	}
+
+	spec := AssistantPodSpec(instance, "hash")
+	envVars := spec.Containers[0].Env
+
+	envMap := make(map[string]string)
+	for _, e := range envVars {
+		envMap[e.Name] = e.Value
+	}
+
+	g.Expect(envMap).To(HaveKeyWithValue("GOOSE_MODEL", "gemini/models/gemini-2.5-flash"))
+	g.Expect(envMap).To(HaveKeyWithValue("GOOSE_PROVIDER", "lightspeed"))
+}
+
 func TestAssistantPodSpec_CustomEnvVars(t *testing.T) {
 	g := NewWithT(t)
 	instance := newTestInstance()
 	instance.Spec.Env = []corev1.EnvVar{
-		{Name: "GOOSE_MODEL", Value: "gemini/models/gemini-2.5-flash"},
 		{Name: "LIGHTSPEED_API_KEY", Value: "dummy"},
 	}
 
@@ -119,7 +137,6 @@ func TestAssistantPodSpec_CustomEnvVars(t *testing.T) {
 		envMap[e.Name] = e.Value
 	}
 
-	g.Expect(envMap).To(HaveKeyWithValue("GOOSE_MODEL", "gemini/models/gemini-2.5-flash"))
 	g.Expect(envMap).To(HaveKeyWithValue("LIGHTSPEED_API_KEY", "dummy"))
 	g.Expect(envMap).To(HaveKeyWithValue("GOOSE_PROVIDER", "lightspeed"))
 }