Skip to content

Commit

Permalink
enable all cases
Browse files Browse the repository at this point in the history
  • Loading branch information
leon-inf committed Jul 13, 2023
1 parent 3db6069 commit bcc09e7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
10 changes: 0 additions & 10 deletions internal/controller/component/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,6 @@ func buildComponent(reqCtx intctrlutil.RequestCtx,
// set component.PodSpec.ServiceAccountName
component.PodSpec.ServiceAccountName = component.ServiceAccountName

// TODO: (zhixu.zt) We need to reserve the VolumeMounts of the container for ConfigMap or Secret,
// At present, it is not possible to distinguish between ConfigMap volume and normal volume,
// Compare the VolumeName of configTemplateRef and Name of VolumeMounts
//
// if component.VolumeClaimTemplates == nil {
// for i := range component.PodSpec.Containers {
// component.PodSpec.Containers[i].VolumeMounts = nil
// }
// }

buildMonitorConfig(clusterCompDefObj, &clusterCompSpec, component)
if err = buildProbeContainers(reqCtx, component); err != nil {
reqCtx.Log.Error(err, "build probe container failed.")
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/component/probe_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ var _ = Describe("probe_utils", func() {
Expect(container.ReadinessProbe.HTTPGet).ShouldNot(BeNil())
})

FIt("build volume protection probe container without RBAC", func() {
It("build volume protection probe container without RBAC", func() {
reqCtx := intctrlutil.RequestCtx{
Ctx: ctx,
Log: logger,
Expand All @@ -142,7 +142,7 @@ var _ = Describe("probe_utils", func() {
Expect(len(component.PodSpec.Containers)).Should(Equal(3))
})

FIt("build volume protection probe container with RBAC", func() {
It("build volume protection probe container with RBAC", func() {
reqCtx := intctrlutil.RequestCtx{
Ctx: ctx,
Log: logger,
Expand Down

0 comments on commit bcc09e7

Please sign in to comment.