Skip to content

Commit

Permalink
Merge pull request #1158 from shajmakh/rm-wa-pkg
Browse files Browse the repository at this point in the history
internal: remove workaround pkg
  • Loading branch information
openshift-merge-bot[bot] authored Jan 20, 2025
2 parents 25f4fa7 + 0b1aede commit a4f1d53
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 311 deletions.
31 changes: 0 additions & 31 deletions internal/workarounds/interface.go

This file was deleted.

139 changes: 0 additions & 139 deletions internal/workarounds/prom.go

This file was deleted.

116 changes: 0 additions & 116 deletions internal/workarounds/prom_test.go

This file was deleted.

25 changes: 0 additions & 25 deletions test/e2e/install/install_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import (
inthelper "github.com/openshift-kni/numaresources-operator/internal/api/annotations/helper"
nropmcp "github.com/openshift-kni/numaresources-operator/internal/machineconfigpools"
nrowait "github.com/openshift-kni/numaresources-operator/internal/wait"
"github.com/openshift-kni/numaresources-operator/internal/workarounds"

e2eclient "github.com/openshift-kni/numaresources-operator/test/utils/clients"
"github.com/openshift-kni/numaresources-operator/test/utils/configuration"
Expand All @@ -62,14 +61,10 @@ const (

var _ = Describe("[Install] continuousIntegration", Serial, func() {
var initialized bool
var wrs []workarounds.Interface

BeforeEach(func() {
if !initialized {
Expect(e2eclient.ClientsEnabled).To(BeTrue(), "failed to create runtime-controller client")
wrs = append(wrs, workarounds.ForPrometheus())

applyWorkarounds(wrs)
}
initialized = true
})
Expand Down Expand Up @@ -155,14 +150,10 @@ var _ = Describe("[Install] continuousIntegration", Serial, func() {

var _ = Describe("[Install] durability", Serial, func() {
var initialized bool
var wrs []workarounds.Interface

BeforeEach(func() {
if !initialized {
Expect(e2eclient.ClientsEnabled).To(BeTrue(), "failed to create runtime-controller client")
wrs = append(wrs, workarounds.ForPrometheus())

applyWorkarounds(wrs)
}
initialized = true
})
Expand Down Expand Up @@ -451,19 +442,3 @@ func logRTEPodsLogs(cli client.Client, k8sCli *kubernetes.Clientset, ctx context
}
}
}

func applyWorkarounds(wrs []workarounds.Interface) {
GinkgoHelper()

if len(wrs) == 0 {
return // nothing to do
}

ctx := context.Background()

By(fmt.Sprintf("applying %d workarounds", len(wrs)))
for idx, wr := range wrs {
By(fmt.Sprintf("%02d: %s (%s)", idx, wr.Describe(), wr.IssueReference()))
Expect(wr.Apply(ctx, e2eclient.Client)).To(Succeed())
}
}

0 comments on commit a4f1d53

Please sign in to comment.