Skip to content

Commit c7b54a0

Browse files
committed
fix
1 parent 1166f81 commit c7b54a0

2 files changed

Lines changed: 10 additions & 23 deletions

File tree

internal/openstackassistant/funcs.go

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ fi
106106
# Combine CA bundles if MCP CA is present alongside Lightspeed CA
107107
if [ -f /etc/ssl/certs/mcp-ca-bundle.crt ]; then
108108
if [ -f /etc/ssl/certs/ca-certificates.crt ]; then
109-
cp /etc/ssl/certs/ca-certificates.crt /tmp/workdir/combined-ca.crt
110-
cat /etc/ssl/certs/mcp-ca-bundle.crt >> /tmp/workdir/combined-ca.crt
111-
export SSL_CERT_FILE=/tmp/workdir/combined-ca.crt
109+
cp /etc/ssl/certs/ca-certificates.crt $HOME/.config/goose/combined-ca.crt
110+
cat /etc/ssl/certs/mcp-ca-bundle.crt >> $HOME/.config/goose/combined-ca.crt
111+
export SSL_CERT_FILE=$HOME/.config/goose/combined-ca.crt
112112
else
113113
export SSL_CERT_FILE=/etc/ssl/certs/mcp-ca-bundle.crt
114114
fi
@@ -209,10 +209,6 @@ func assistantPodVolumeMounts(instance *assistantv1.OpenStackAssistant, mcpCaBun
209209
MountPath: "/tmp/lightspeed-provider",
210210
ReadOnly: true,
211211
},
212-
{
213-
Name: "workdir",
214-
MountPath: "/tmp/workdir",
215-
},
216212
}
217213

218214
if instance.Spec.Goose != nil {
@@ -274,12 +270,6 @@ func assistantPodVolumes(instance *assistantv1.OpenStackAssistant, mcpCaBundleSe
274270
},
275271
},
276272
},
277-
{
278-
Name: "workdir",
279-
VolumeSource: corev1.VolumeSource{
280-
EmptyDir: &corev1.EmptyDirVolumeSource{},
281-
},
282-
},
283273
}
284274

285275
if instance.Spec.Goose != nil {

internal/openstackassistant/funcs_test.go

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,19 +147,19 @@ func TestAssistantPodSpec_MinimalVolumes(t *testing.T) {
147147

148148
spec := AssistantPodSpec(instance, "hash", nil, "")
149149

150-
g.Expect(spec.Volumes).To(HaveLen(3))
150+
g.Expect(spec.Volumes).To(HaveLen(2))
151151

152152
volumeNames := make([]string, len(spec.Volumes))
153153
for i, v := range spec.Volumes {
154154
volumeNames[i] = v.Name
155155
}
156-
g.Expect(volumeNames).To(ContainElements("entrypoint", "lightspeed-provider", "workdir"))
156+
g.Expect(volumeNames).To(ContainElements("entrypoint", "lightspeed-provider"))
157157

158158
mountNames := make([]string, len(spec.Containers[0].VolumeMounts))
159159
for i, m := range spec.Containers[0].VolumeMounts {
160160
mountNames[i] = m.Name
161161
}
162-
g.Expect(mountNames).To(ContainElements("entrypoint", "lightspeed-provider", "workdir"))
162+
g.Expect(mountNames).To(ContainElements("entrypoint", "lightspeed-provider"))
163163
}
164164

165165
func TestAssistantPodSpec_WithRecipesAndHints(t *testing.T) {
@@ -172,12 +172,12 @@ func TestAssistantPodSpec_WithRecipesAndHints(t *testing.T) {
172172

173173
spec := AssistantPodSpec(instance, "hash", nil, "")
174174

175-
g.Expect(spec.Volumes).To(HaveLen(5))
175+
g.Expect(spec.Volumes).To(HaveLen(4))
176176
volumeNames := make([]string, len(spec.Volumes))
177177
for i, v := range spec.Volumes {
178178
volumeNames[i] = v.Name
179179
}
180-
g.Expect(volumeNames).To(ContainElements("entrypoint", "lightspeed-provider", "workdir", "recipes", "hints"))
180+
g.Expect(volumeNames).To(ContainElements("entrypoint", "lightspeed-provider", "recipes", "hints"))
181181

182182
mountNames := make([]string, len(spec.Containers[0].VolumeMounts))
183183
for i, m := range spec.Containers[0].VolumeMounts {
@@ -193,7 +193,7 @@ func TestAssistantPodSpec_WithCaBundle(t *testing.T) {
193193

194194
spec := AssistantPodSpec(instance, "hash", nil, "")
195195

196-
g.Expect(spec.Volumes).To(HaveLen(4))
196+
g.Expect(spec.Volumes).To(HaveLen(3))
197197

198198
var caBundleVolume *corev1.Volume
199199
for i := range spec.Volumes {
@@ -292,9 +292,6 @@ func TestAssistantPodSpec_AllVolumeMountsReadOnly(t *testing.T) {
292292
spec := AssistantPodSpec(instance, "hash", nil, "")
293293

294294
for _, mount := range spec.Containers[0].VolumeMounts {
295-
if mount.Name == "workdir" {
296-
continue
297-
}
298295
g.Expect(mount.ReadOnly).To(BeTrue(), "VolumeMount %s should be read-only", mount.Name)
299296
}
300297
}
@@ -308,7 +305,7 @@ func TestAssistantPodSpec_RecipesOnlyNoHints(t *testing.T) {
308305

309306
spec := AssistantPodSpec(instance, "hash", nil, "")
310307

311-
g.Expect(spec.Volumes).To(HaveLen(4))
308+
g.Expect(spec.Volumes).To(HaveLen(3))
312309
volumeNames := make([]string, len(spec.Volumes))
313310
for i, v := range spec.Volumes {
314311
volumeNames[i] = v.Name

0 commit comments

Comments
 (0)