Skip to content

Commit 4a4272a

Browse files
jokuniewpbartosikMikolajKasprzakadorney99jdanieck
authored andcommitted
fix: response code for cluster template deletion webhook (#278)
Co-authored-by: pbartosik <pawelbrtsk@gmail.com> Co-authored-by: Kasprzak, Mikolaj <mikolaj.kasprzak@intel.com> Co-authored-by: Aaron Dorney <85556203+adorney99@users.noreply.github.com> Co-authored-by: Jozef Daniecki <jozef.daniecki@intel.com> Co-authored-by: Togashi, Denisio <denisio.togashi@intel.com> Co-authored-by: Paulina-Osikoya <Paulina.Osikoya@intel.com>
1 parent 426ba67 commit 4a4272a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

argocd/applications/templates/cluster-manager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
sources:
2222
- repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
2323
chart: cluster/charts/{{$appName}}
24-
targetRevision: 2.1.0
24+
targetRevision: 2.1.1-dev-ddee31c6
2525
helm:
2626
releaseName: {{$appName}}
2727
valuesObject:
@@ -33,7 +33,7 @@ spec:
3333
{{- mergeOverwrite $baseConfig $customConfig $overwrite | toYaml | nindent 10 }}
3434
- repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
3535
chart: cluster/charts/cluster-template-crd
36-
targetRevision: 2.1.0
36+
targetRevision: 2.1.1-dev-ddee31c6
3737
destination:
3838
namespace: {{$namespace}}
3939
server: {{ required "A valid targetServer entry required!" .Values.argo.targetServer }}

e2e-tests/orchestrator/clusterorch_smoke_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,9 @@ var _ = Describe("Cluster Orch Smoke Test", Ordered, Label(clusterOrchSmoke), fu
456456
Expect(err).ToNot(HaveOccurred())
457457
fmt.Println(string(body))
458458

459-
// Expect the request to fail with a 500 Internal Server Error status code
460-
Expect(resp.StatusCode).To(Equal(http.StatusInternalServerError), "Expected 500 Internal Server Error when deleting a template in use")
461-
Expect(body).To(ContainSubstring("denied the request: clusterTemplate is in use"))
459+
// Expect the request to fail with a 409 Conflict status code
460+
Expect(resp.StatusCode).To(Equal(http.StatusConflict), "Expected 409 Conflict when deleting a template in use")
461+
Expect(body).To(ContainSubstring("clusterTemplate is in use"))
462462
fmt.Printf("Failed to delete template %s-%s as expected, HTTP status code: %d\n", defaultTemplateName, defaultTemplateVersion, resp.StatusCode)
463463
})
464464
})

0 commit comments

Comments
 (0)