Skip to content

Commit

Permalink
test/helpers: remove unused functions and consts
Browse files Browse the repository at this point in the history
These are unused since commit 5373657 ("test: Remove deprecated
Nightly tests"). Also remove the corresponding mainfest YAML files which
are now unused.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
  • Loading branch information
tklauser authored and kkourt committed Mar 11, 2021
1 parent 508b2de commit 7719c2d
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 151 deletions.
6 changes: 1 addition & 5 deletions test/helpers/cons.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

k8sConst "github.com/cilium/cilium/pkg/k8s/apis/cilium.io"
"github.com/cilium/cilium/pkg/versioncheck"
"github.com/cilium/cilium/test/ginkgo-ext"
ginkgoext "github.com/cilium/cilium/test/ginkgo-ext"
)

var (
Expand Down Expand Up @@ -178,10 +178,6 @@ const (
CiliumDockerDaemonName = "cilium-docker"
AgentDaemon = "cilium-agent"

GeneratedHTMLManifest = "html.yaml"
GeneratedServerManifest = "server.yaml"
GeneratedClientManifest = "client.yaml"

KubectlCreate = ResourceLifeCycleAction("create")
KubectlDelete = ResourceLifeCycleAction("delete")
KubectlApply = ResourceLifeCycleAction("apply")
Expand Down
10 changes: 0 additions & 10 deletions test/helpers/kubectl.go
Original file line number Diff line number Diff line change
Expand Up @@ -2642,16 +2642,6 @@ func (kub *Kubectl) CiliumEndpointsList(ctx context.Context, pod string) *CmdRes
return kub.CiliumExecContext(ctx, pod, "cilium endpoint list -o json")
}

// CiliumEndpointsStatus returns a mapping of a pod name to it is corresponding
// endpoint's status
func (kub *Kubectl) CiliumEndpointsStatus(pod string) map[string]string {
filter := `{range [*]}{@.status.external-identifiers.pod-name}{"="}{@.status.state}{"\n"}{end}`
ctx, cancel := context.WithTimeout(context.Background(), ShortCommandTimeout)
defer cancel()
return kub.CiliumExecContext(ctx, pod, fmt.Sprintf(
"cilium endpoint list -o jsonpath='%s'", filter)).KVOutput()
}

// CiliumEndpointIPv6 returns the IPv6 address of each endpoint which matches
// the given endpoint selector.
func (kub *Kubectl) CiliumEndpointIPv6(pod string, endpoint string) map[string]string {
Expand Down
82 changes: 0 additions & 82 deletions test/helpers/manifest_generator.go

This file was deleted.

15 changes: 0 additions & 15 deletions test/k8sT/manifests/client.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions test/k8sT/manifests/html.yaml

This file was deleted.

33 changes: 0 additions & 33 deletions test/k8sT/manifests/server.yaml

This file was deleted.

0 comments on commit 7719c2d

Please sign in to comment.